github
/
ant-design-vue
mirror of https://github.com/vueComponent/ant-design-vue
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

merge master

pull/2682/head
tanjinzhou 2020-07-24 11:34:01 +08:00
parent efb714e572 471a81beda
commit f2a0feebee
16 changed files with 122 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CHANGELOG.en-US.md
View File

@ -10,6 +10,16 @@
---
## 1.6.4
`2020-07-21`
- 🐞 Fix breadcrumb `Breadcrumb` duplicate key problem [#2505](https://github.com/vueComponent/ant-design-vue/issues/2505)
- 🐞 Fix the Tooltip issue when MenuItem title is empty [#2526](https://github.com/vueComponent/ant-design-vue/issues/2505)
- 🐞 Fix the problem that Input textarea cannot be dragged up when allow-clear is activated. [#2563](https://github.com/vueComponent/ant-design-vue/issues/2563)
- 🌟 Add less variables @select-item-selected-color [#2458](https://github.com/vueComponent/ant-design-vue/issues/2458)
- 🌟 Add flex attribute to Col in Grid [#2558](https://github.com/vueComponent/ant-design-vue/issues/2558)
## 1.6.3
`2020-07-05`

10
CHANGELOG.zh-CN.md
View File

@ -10,6 +10,16 @@
---
## 1.6.4
`2020-07-21`
- 🐞 修复面包屑 `Breadcrumb` 重复 key 问题 [#2505](https://github.com/vueComponent/ant-design-vue/issues/2505)
- 🐞 修复 MenuItem title 为空时，依然有 Tooltip 问题 [#2526](https://github.com/vueComponent/ant-design-vue/issues/2505)
- 🐞 修复 Input textarea 激活 allow-clear 时无法向上拖动的问题。[#2563](https://github.com/vueComponent/ant-design-vue/issues/2563)
- 🌟 添加 less 变量 @select-item-selected-color [#2458](https://github.com/vueComponent/ant-design-vue/issues/2458)
- 🌟 Grid 中 Col 添加 flex 属性 [#2558](https://github.com/vueComponent/ant-design-vue/issues/2558)
## 1.6.3
`2020-07-05`

1
antd-tools/cli/index.js
View File

@ -3,6 +3,7 @@
'use strict';
require('colorful').colorful();
require('colorful').isatty = true;
const program = require('commander');
const packageInfo = require('../../package.json');

1
antd-tools/cli/run.js
View File

@ -3,6 +3,7 @@
'use strict';
require('colorful').colorful();
require('colorful').isatty = true;
const gulp = require('gulp');
const program = require('commander');

56
components/color-picker/__tests__/__snapshots__/index.test.js.snap
View File

@ -1,12 +1,12 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`ColorPicker prop locale should works 1`] = `
<div tabindex="0" class="ant-color-picker ant-color-picker-open">
<div tabindex="0" class="ant-color-picker">
<div class="ant-color-picker-selection">
<div id="color-picker-box25">
<div class="pickr">
<button type="button" class="pcr-button" role="button" aria-label="toggle color picker dialog" style="color: rgb(205, 2, 0);"></button>
<button type="button" class="pcr-button" role="button" aria-label="toggle color picker dialog"></button>
</div>
@ -14,20 +14,20 @@ exports[`ColorPicker prop locale should works 1`] = `
<path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path>
</svg></i>
</div>
<div class="pcr-app visible" data-theme="monolith" aria-label="color picker dialog" role="window" style="left: 512px; top: 384px;">
<div class="pcr-app" data-theme="monolith" aria-label="color picker dialog" role="window">
<div class="pcr-selection">
<div class="pcr-color-preview">
<button type="button" class="pcr-last-color" aria-label="use previous color" style="color: rgb(205, 2, 0);"></button>
<div class="pcr-current-color" style="color: rgb(205, 2, 0);"></div>
<button type="button" class="pcr-last-color" aria-label="use previous color"></button>
<div class="pcr-current-color"></div>
</div>
<div class="pcr-color-palette">
<div class="pcr-picker" style="background: rgb(205, 2, 0);"></div>
<div class="pcr-picker"></div>
<div class="pcr-palette" tabindex="0" aria-label="color selection area" role="listbox"></div>
</div>
<div class="pcr-color-chooser">
<div class="pcr-picker" style="background-color: hsl(0.5853658536585238, 100%, 50%);"></div>
<div class="pcr-picker"></div>
<div class="pcr-hue pcr-slider" tabindex="0" aria-label="hue selection slider" role="slider"></div>
</div>
@ -57,12 +57,12 @@ exports[`ColorPicker prop locale should works 1`] = `
`;
exports[`ColorPicker save event should works 1`] = `
<div tabindex="0" class="ant-color-picker ant-color-picker-open">
<div tabindex="0" class="ant-color-picker">
<div class="ant-color-picker-selection">
<div id="color-picker-box31">
<div class="pickr">
<button type="button" class="pcr-button" role="button" aria-label="toggle color picker dialog" style="color: rgb(205, 2, 0);"></button>
<button type="button" class="pcr-button" role="button" aria-label="toggle color picker dialog" style="color: rgb(0, 0, 0);"></button>
</div>
@ -70,20 +70,20 @@ exports[`ColorPicker save event should works 1`] = `
<path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path>
</svg></i>
</div>
<div class="pcr-app" data-theme="monolith" aria-label="color picker dialog" role="window" style="left: 512px; top: 384px;">
<div class="pcr-app visible" data-theme="monolith" aria-label="color picker dialog" role="window" style="left: 512px; top: 384px;">
<div class="pcr-selection">
<div class="pcr-color-preview">
<button type="button" class="pcr-last-color" aria-label="use previous color" style="color: rgb(205, 2, 0);"></button>
<div class="pcr-current-color" style="color: rgb(205, 2, 0);"></div>
<button type="button" class="pcr-last-color" aria-label="use previous color" style="color: rgb(0, 0, 0);"></button>
<div class="pcr-current-color"></div>
</div>
<div class="pcr-color-palette">
<div class="pcr-picker" style="background: rgb(205, 2, 0);"></div>
<div class="pcr-picker"></div>
<div class="pcr-palette" tabindex="0" aria-label="color selection area" role="listbox"></div>
</div>
<div class="pcr-color-chooser">
<div class="pcr-picker" style="background-color: hsl(0.5853658536585238, 100%, 50%);"></div>
<div class="pcr-picker"></div>
<div class="pcr-hue pcr-slider" tabindex="0" aria-label="hue selection slider" role="slider"></div>
</div>
@ -113,12 +113,12 @@ exports[`ColorPicker save event should works 1`] = `
`;
exports[`ColorPicker should support default value 1`] = `
<div tabindex="0" class="ant-color-picker ant-color-picker-open">
<div tabindex="0" class="ant-color-picker">
<div class="ant-color-picker-selection">
<div id="color-picker-box1">
<div class="pickr">
<button type="button" class="pcr-button" role="button" aria-label="toggle color picker dialog" style="color: rgb(205, 2, 0);"></button>
<button type="button" class="pcr-button" role="button" aria-label="toggle color picker dialog"></button>
</div>
@ -126,20 +126,20 @@ exports[`ColorPicker should support default value 1`] = `
<path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path>
</svg></i>
</div>
<div class="pcr-app visible" data-theme="monolith" aria-label="color picker dialog" role="window" style="left: 512px; top: 384px;">
<div class="pcr-app" data-theme="monolith" aria-label="color picker dialog" role="window">
<div class="pcr-selection">
<div class="pcr-color-preview">
<button type="button" class="pcr-last-color" aria-label="use previous color" style="color: rgb(205, 2, 0);"></button>
<div class="pcr-current-color" style="color: rgb(205, 2, 0);"></div>
<button type="button" class="pcr-last-color" aria-label="use previous color"></button>
<div class="pcr-current-color"></div>
</div>
<div class="pcr-color-palette">
<div class="pcr-picker" style="background: rgb(205, 2, 0);"></div>
<div class="pcr-picker"></div>
<div class="pcr-palette" tabindex="0" aria-label="color selection area" role="listbox"></div>
</div>
<div class="pcr-color-chooser">
<div class="pcr-picker" style="background-color: hsl(0.5853658536585238, 100%, 50%);"></div>
<div class="pcr-picker"></div>
<div class="pcr-hue pcr-slider" tabindex="0" aria-label="hue selection slider" role="slider"></div>
</div>
@ -174,7 +174,7 @@ exports[`ColorPicker should support disabled 1`] = `
<div id="color-picker-box13">
<div class="pickr">
<button type="button" class="pcr-button disabled clear" role="button" aria-label="toggle color picker dialog" style="color: rgba(0, 0, 0, 0.15);"></button>
<button type="button" class="pcr-button disabled" role="button" aria-label="toggle color picker dialog"></button>
</div>
@ -182,7 +182,7 @@ exports[`ColorPicker should support disabled 1`] = `
<path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path>
</svg></i>
</div>
<div class="pcr-app" data-theme="monolith" aria-label="color picker dialog" role="window" style="left: 512px; top: 384px;">
<div class="pcr-app" data-theme="monolith" aria-label="color picker dialog" role="window">
<div class="pcr-selection">
<div class="pcr-color-preview">
<button type="button" class="pcr-last-color" aria-label="use previous color"></button>
@ -225,12 +225,12 @@ exports[`ColorPicker should support disabled 1`] = `
`;
exports[`ColorPicker should support format 1`] = `
<div tabindex="0" class="ant-color-picker">
<div tabindex="0" class="ant-color-picker ant-color-picker-open">
<div class="ant-color-picker-selection">
<div id="color-picker-box19">
<div class="pickr">
<button type="button" class="pcr-button clear" role="button" aria-label="toggle color picker dialog" style="color: rgba(0, 0, 0, 0.15);"></button>
<button type="button" class="pcr-button" role="button" aria-label="toggle color picker dialog" style="color: rgb(0, 0, 0);"></button>
</div>
@ -238,7 +238,7 @@ exports[`ColorPicker should support format 1`] = `
<path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path>
</svg></i>
</div>
<div class="pcr-app" data-theme="monolith" aria-label="color picker dialog" role="window" style="left: 512px; top: 384px;">
<div class="pcr-app visible" data-theme="monolith" aria-label="color picker dialog" role="window" style="left: 512px; top: 384px;">
<div class="pcr-selection">
<div class="pcr-color-preview">
<button type="button" class="pcr-last-color" aria-label="use previous color" style="color: rgb(0, 0, 0);"></button>
@ -286,7 +286,7 @@ exports[`ColorPicker should support v-model 1`] = `
<div id="color-picker-box7">
<div class="pickr">
<button type="button" class="pcr-button clear" role="button" aria-label="toggle color picker dialog" style="color: rgba(0, 0, 0, 0.15);"></button>
<button type="button" class="pcr-button" role="button" aria-label="toggle color picker dialog"></button>
</div>
@ -294,7 +294,7 @@ exports[`ColorPicker should support v-model 1`] = `
<path d="M884 256h-75c-5.1 0-9.9 2.5-12.9 6.6L512 654.2 227.9 262.6c-3-4.1-7.8-6.6-12.9-6.6h-75c-6.5 0-10.3 7.4-6.5 12.7l352.6 486.1c12.8 17.6 39 17.6 51.7 0l352.6-486.1c3.9-5.3.1-12.7-6.4-12.7z"></path>
</svg></i>
</div>
<div class="pcr-app" data-theme="monolith" aria-label="color picker dialog" role="window" style="left: 512px; top: 384px;">
<div class="pcr-app" data-theme="monolith" aria-label="color picker dialog" role="window">
<div class="pcr-selection">
<div class="pcr-color-preview">
<button type="button" class="pcr-last-color" aria-label="use previous color"></button>

26
components/grid/Col.jsx
View File

@ -28,6 +28,7 @@ export const ColProps = {
xl: objectOrNumber,
xxl: objectOrNumber,
prefixCls: PropTypes.string,
flex: stringOrNumber,
};
export default {
@ -39,8 +40,28 @@ export default {
rowContext: inject('rowContext', null),
};
},
methods: {
parseFlex(flex) {
if (typeof flex === 'number') {
return `${flex} ${flex} auto`;
}
if (/^\d+(\.\d+)?(px|em|rem|%)$/.test(flex)) {
return `0 0 ${flex}`;
}
return flex;
},
},
render() {
const { span, order, offset, push, pull, prefixCls: customizePrefixCls, rowContext } = this;
const {
span,
order,
offset,
push,
pull,
flex,
prefixCls: customizePrefixCls,
rowContext,
} = this;
const getPrefixCls = this.configProvider.getPrefixCls;
const prefixCls = getPrefixCls('col', customizePrefixCls);
@ -96,6 +117,9 @@ export default {
};
}
}
if (flex) {
divProps.style.flex = this.parseFlex(flex);
}
return <div {...divProps}>{getSlot(this)}</div>;
},
};

26
components/grid/__tests__/__snapshots__/demo.test.js.snap
View File

@ -192,6 +192,32 @@ exports[`renders ./antdv-demo/docs/grid/demo/flex-align.md correctly 1`] = `
</div>
`;
exports[`renders ./antdv-demo/docs/grid/demo/flex-fill.md correctly 1`] = `
<div>
<div role="separator" class="ant-divider ant-divider-horizontal ant-divider-with-text-left"><span class="ant-divider-inner-text">
Percentage columns
</span></div>
<div class="ant-row-flex">
<div class="ant-col" style="flex: 2 2 auto;">2 / 5</div>
<div class="ant-col" style="flex: 3 3 auto;">3 / 5</div>
</div>
<div role="separator" class="ant-divider ant-divider-horizontal ant-divider-with-text-left"><span class="ant-divider-inner-text">
Fill rest
</span></div>
<div class="ant-row-flex">
<div class="ant-col" style="flex: 0 0 100px;">100px</div>
<div class="ant-col" style="flex-basis: auto;">auto</div>
</div>
<div role="separator" class="ant-divider ant-divider-horizontal ant-divider-with-text-left"><span class="ant-divider-inner-text">
Raw flex style
</span></div>
<div class="ant-row-flex">
<div class="ant-col" style="flex: 1 1 200px;">1 1 200px</div>
<div class="ant-col" style="flex: 0 1 300px;">0 1 300px</div>
</div>
</div>
`;
exports[`renders ./antdv-demo/docs/grid/demo/flex-order.md correctly 1`] = `
<div>
<div class="ant-row-flex">

5
components/input/style/index.less
View File

@ -24,11 +24,6 @@
.@{ant-prefix}-input-affix-wrapper {
.reset-component;
.input-affix-wrapper(~'@{ant-prefix}-input');
// https://github.com/ant-design/ant-design/issues/6144
.@{ant-prefix}-input {
min-height: 100%; // use min-height, assume that no smaller height to override
}
}
.@{ant-prefix}-input-password-icon {

8
components/menu/MenuItem.jsx
View File

@ -24,8 +24,14 @@ export default {
const { level, title, rootPrefixCls } = props;
const { getInlineCollapsed, $attrs: attrs } = this;
const inlineCollapsed = getInlineCollapsed();
let tooltipTitle = title;
if (typeof title === 'undefined') {
tooltipTitle = level === 1 ? getSlot(this) : '';
} else if (title === false) {
tooltipTitle = '';
}
const tooltipProps = {
title: title || (level === 1 ? getSlot(this) : ''),
title: tooltipTitle,
};
const siderCollapsed = this.layoutSiderContext.sCollapsed;
if (!siderCollapsed && !inlineCollapsed) {

2
components/select/style/index.less
View File

@ -529,7 +529,7 @@
}
&-selected {
color: @text-color;
color: @select-item-selected-color;
font-weight: @select-item-selected-font-weight;
background-color: @select-item-selected-bg;
}

1
components/style/themes/default.less
View File

@ -336,6 +336,7 @@
// Select
// ---
@select-border-color: @border-color-base;
@select-item-selected-color: @text-color;
@select-item-selected-font-weight: 600;
@select-dropdown-bg: @component-background;
@select-dropdown-vertical-padding: @dropdown-vertical-padding;

2
components/vc-pagination/Pagination.jsx
View File

@ -257,8 +257,8 @@ export default {
});
}
// this.$emit('input', page)
this.$emit('change', page, this.statePageSize);
this.$emit('update:current', page);
this.$emit('change', page, this.statePageSize);
return page;
}
return this.stateCurrent;

2
components/vc-resize-observer/index.jsx
View File

@ -65,7 +65,7 @@ const VueResizeObserver = {
if (this.width !== fixedWidth || this.height !== fixedHeight) {
const size = { width: fixedWidth, height: fixedHeight };
this.width = fixedWidth;
this.fixedHeight = fixedHeight;
this.height = fixedHeight;
this.$emit('resize', size);
}
},

4
package.json
View File

@ -1,6 +1,6 @@
{
"name": "ant-design-vue",
"version": "1.6.3",
"version": "1.6.4",
"title": "Ant Design Vue",
"description": "An enterprise-class UI design language and Vue-based implementation",
"keywords": [
@ -119,7 +119,7 @@
"jest": "^25.4.0",
"jest-serializer-vue": "^2.0.0",
"jest-transform-stub": "^2.0.0",
"js-base64": "^2.4.8",
"js-base64": "^3.0.0",
"json-templater": "^1.2.0",
"jsonp": "^0.2.1",
"less": "^3.9.0",

1
scripts/run.js
View File

@ -3,6 +3,7 @@
'use strict';
require('colorful').colorful();
require('colorful').isatty = true;
const gulp = require('gulp');
const program = require('commander');

7
types/grid/col.d.ts vendored
View File

@ -19,6 +19,13 @@ export declare class Col extends AntdComponent {
*/
order: ColSpanType;
/**
* the layout fill of flex
* @default none
* @type ColSpanType
*/
flex: ColSpanType;
/**
* the number of cells to offset Col from the left
* @default 0