Skip to content

Commit 471a81b

Browse files
tangjinzhoutangjinzhou
committed
release 1.6.4
1 parent f886f04 commit 471a81b

File tree

7 files changed

+91
-140
lines changed

7 files changed

+91
-140
lines changed

‎CHANGELOG.en-US.md

+10
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,16 @@
1010

1111
---
1212

13+
## 1.6.4
14+
15+
`2020-07-21`
16+
17+
- 🐞 Fix breadcrumb `Breadcrumb` duplicate key problem [#2505](https://github.com/vueComponent/ant-design-vue/issues/2505)
18+
- 🐞 Fix the Tooltip issue when MenuItem title is empty [#2526](https://github.com/vueComponent/ant-design-vue/issues/2505)
19+
- 🐞 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)
20+
- 🌟 Add less variables @select-item-selected-color [#2458](https://github.com/vueComponent/ant-design-vue/issues/2458)
21+
- 🌟 Add flex attribute to Col in Grid [#2558](https://github.com/vueComponent/ant-design-vue/issues/2558)
22+
1323
## 1.6.3
1424

1525
`2020-07-05`

‎CHANGELOG.zh-CN.md

+10
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,16 @@
1010

1111
---
1212

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

1525
`2020-07-05`

‎antdv-demo

‎components/color-picker/__tests__/__snapshots__/index.test.js.snap

+28-28
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

33
exports[`ColorPicker prop locale should works 1`] = `
4-
<div tabindex="0" class="ant-color-picker ant-color-picker-open">
4+
<div tabindex="0" class="ant-color-picker">
55
<div class="ant-color-picker-selection">
66
<div id="color-picker-box25">
77
<div class="pickr">
88
9-
<button type="button" class="pcr-button" role="button" aria-label="toggle color picker dialog" style="color: rgb(205, 2, 0);"></button>
9+
<button type="button" class="pcr-button" role="button" aria-label="toggle color picker dialog"></button>
1010
1111
1212
</div>
1313
</div><i aria-label="icon: down" class="anticon anticon-down ant-color-picker-icon"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class="">
1414
<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>
1515
</svg></i>
1616
</div>
17-
<div class="pcr-app visible" data-theme="monolith" aria-label="color picker dialog" role="window" style="left: 512px; top: 384px;">
17+
<div class="pcr-app" data-theme="monolith" aria-label="color picker dialog" role="window">
1818
<div class="pcr-selection">
1919
<div class="pcr-color-preview">
20-
<button type="button" class="pcr-last-color" aria-label="use previous color" style="color: rgb(205, 2, 0);"></button>
21-
<div class="pcr-current-color" style="color: rgb(205, 2, 0);"></div>
20+
<button type="button" class="pcr-last-color" aria-label="use previous color"></button>
21+
<div class="pcr-current-color"></div>
2222
</div>
2323
2424
<div class="pcr-color-palette">
25-
<div class="pcr-picker" style="background: rgb(205, 2, 0);"></div>
25+
<div class="pcr-picker"></div>
2626
<div class="pcr-palette" tabindex="0" aria-label="color selection area" role="listbox"></div>
2727
</div>
2828
2929
<div class="pcr-color-chooser">
30-
<div class="pcr-picker" style="background-color: hsl(0.5853658536585238, 100%, 50%);"></div>
30+
<div class="pcr-picker"></div>
3131
<div class="pcr-hue pcr-slider" tabindex="0" aria-label="hue selection slider" role="slider"></div>
3232
</div>
3333
@@ -57,33 +57,33 @@ exports[`ColorPicker prop locale should works 1`] = `
5757
`;
5858
5959
exports[`ColorPicker save event should works 1`] = `
60-
<div tabindex="0" class="ant-color-picker ant-color-picker-open">
60+
<div tabindex="0" class="ant-color-picker">
6161
<div class="ant-color-picker-selection">
6262
<div id="color-picker-box31">
6363
<div class="pickr">
6464
65-
<button type="button" class="pcr-button" role="button" aria-label="toggle color picker dialog" style="color: rgb(205, 2, 0);"></button>
65+
<button type="button" class="pcr-button" role="button" aria-label="toggle color picker dialog" style="color: rgb(0, 0, 0);"></button>
6666
6767
6868
</div>
6969
</div><i aria-label="icon: down" class="anticon anticon-down ant-color-picker-icon"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class="">
7070
<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>
7171
</svg></i>
7272
</div>
73-
<div class="pcr-app" data-theme="monolith" aria-label="color picker dialog" role="window" style="left: 512px; top: 384px;">
73+
<div class="pcr-app visible" data-theme="monolith" aria-label="color picker dialog" role="window" style="left: 512px; top: 384px;">
7474
<div class="pcr-selection">
7575
<div class="pcr-color-preview">
76-
<button type="button" class="pcr-last-color" aria-label="use previous color" style="color: rgb(205, 2, 0);"></button>
77-
<div class="pcr-current-color" style="color: rgb(205, 2, 0);"></div>
76+
<button type="button" class="pcr-last-color" aria-label="use previous color" style="color: rgb(0, 0, 0);"></button>
77+
<div class="pcr-current-color"></div>
7878
</div>
7979
8080
<div class="pcr-color-palette">
81-
<div class="pcr-picker" style="background: rgb(205, 2, 0);"></div>
81+
<div class="pcr-picker"></div>
8282
<div class="pcr-palette" tabindex="0" aria-label="color selection area" role="listbox"></div>
8383
</div>
8484
8585
<div class="pcr-color-chooser">
86-
<div class="pcr-picker" style="background-color: hsl(0.5853658536585238, 100%, 50%);"></div>
86+
<div class="pcr-picker"></div>
8787
<div class="pcr-hue pcr-slider" tabindex="0" aria-label="hue selection slider" role="slider"></div>
8888
</div>
8989
@@ -113,33 +113,33 @@ exports[`ColorPicker save event should works 1`] = `
113113
`;
114114
115115
exports[`ColorPicker should support default value 1`] = `
116-
<div tabindex="0" class="ant-color-picker ant-color-picker-open">
116+
<div tabindex="0" class="ant-color-picker">
117117
<div class="ant-color-picker-selection">
118118
<div id="color-picker-box1">
119119
<div class="pickr">
120120
121-
<button type="button" class="pcr-button" role="button" aria-label="toggle color picker dialog" style="color: rgb(205, 2, 0);"></button>
121+
<button type="button" class="pcr-button" role="button" aria-label="toggle color picker dialog"></button>
122122
123123
124124
</div>
125125
</div><i aria-label="icon: down" class="anticon anticon-down ant-color-picker-icon"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class="">
126126
<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>
127127
</svg></i>
128128
</div>
129-
<div class="pcr-app visible" data-theme="monolith" aria-label="color picker dialog" role="window" style="left: 512px; top: 384px;">
129+
<div class="pcr-app" data-theme="monolith" aria-label="color picker dialog" role="window">
130130
<div class="pcr-selection">
131131
<div class="pcr-color-preview">
132-
<button type="button" class="pcr-last-color" aria-label="use previous color" style="color: rgb(205, 2, 0);"></button>
133-
<div class="pcr-current-color" style="color: rgb(205, 2, 0);"></div>
132+
<button type="button" class="pcr-last-color" aria-label="use previous color"></button>
133+
<div class="pcr-current-color"></div>
134134
</div>
135135
136136
<div class="pcr-color-palette">
137-
<div class="pcr-picker" style="background: rgb(205, 2, 0);"></div>
137+
<div class="pcr-picker"></div>
138138
<div class="pcr-palette" tabindex="0" aria-label="color selection area" role="listbox"></div>
139139
</div>
140140
141141
<div class="pcr-color-chooser">
142-
<div class="pcr-picker" style="background-color: hsl(0.5853658536585238, 100%, 50%);"></div>
142+
<div class="pcr-picker"></div>
143143
<div class="pcr-hue pcr-slider" tabindex="0" aria-label="hue selection slider" role="slider"></div>
144144
</div>
145145
@@ -174,15 +174,15 @@ exports[`ColorPicker should support disabled 1`] = `
174174
<div id="color-picker-box13">
175175
<div class="pickr">
176176
177-
<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>
177+
<button type="button" class="pcr-button disabled" role="button" aria-label="toggle color picker dialog"></button>
178178
179179
180180
</div>
181181
</div><i aria-label="icon: down" class="anticon anticon-down ant-color-picker-icon"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class="">
182182
<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>
183183
</svg></i>
184184
</div>
185-
<div class="pcr-app" data-theme="monolith" aria-label="color picker dialog" role="window" style="left: 512px; top: 384px;">
185+
<div class="pcr-app" data-theme="monolith" aria-label="color picker dialog" role="window">
186186
<div class="pcr-selection">
187187
<div class="pcr-color-preview">
188188
<button type="button" class="pcr-last-color" aria-label="use previous color"></button>
@@ -225,20 +225,20 @@ exports[`ColorPicker should support disabled 1`] = `
225225
`;
226226
227227
exports[`ColorPicker should support format 1`] = `
228-
<div tabindex="0" class="ant-color-picker">
228+
<div tabindex="0" class="ant-color-picker ant-color-picker-open">
229229
<div class="ant-color-picker-selection">
230230
<div id="color-picker-box19">
231231
<div class="pickr">
232232
233-
<button type="button" class="pcr-button clear" role="button" aria-label="toggle color picker dialog" style="color: rgba(0, 0, 0, 0.15);"></button>
233+
<button type="button" class="pcr-button" role="button" aria-label="toggle color picker dialog" style="color: rgb(0, 0, 0);"></button>
234234
235235
236236
</div>
237237
</div><i aria-label="icon: down" class="anticon anticon-down ant-color-picker-icon"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class="">
238238
<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>
239239
</svg></i>
240240
</div>
241-
<div class="pcr-app" data-theme="monolith" aria-label="color picker dialog" role="window" style="left: 512px; top: 384px;">
241+
<div class="pcr-app visible" data-theme="monolith" aria-label="color picker dialog" role="window" style="left: 512px; top: 384px;">
242242
<div class="pcr-selection">
243243
<div class="pcr-color-preview">
244244
<button type="button" class="pcr-last-color" aria-label="use previous color" style="color: rgb(0, 0, 0);"></button>
@@ -286,15 +286,15 @@ exports[`ColorPicker should support v-model 1`] = `
286286
<div id="color-picker-box7">
287287
<div class="pickr">
288288
289-
<button type="button" class="pcr-button clear" role="button" aria-label="toggle color picker dialog" style="color: rgba(0, 0, 0, 0.15);"></button>
289+
<button type="button" class="pcr-button" role="button" aria-label="toggle color picker dialog"></button>
290290
291291
292292
</div>
293293
</div><i aria-label="icon: down" class="anticon anticon-down ant-color-picker-icon"><svg viewBox="64 64 896 896" data-icon="down" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class="">
294294
<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>
295295
</svg></i>
296296
</div>
297-
<div class="pcr-app" data-theme="monolith" aria-label="color picker dialog" role="window" style="left: 512px; top: 384px;">
297+
<div class="pcr-app" data-theme="monolith" aria-label="color picker dialog" role="window">
298298
<div class="pcr-selection">
299299
<div class="pcr-color-preview">
300300
<button type="button" class="pcr-last-color" aria-label="use previous color"></button>

‎components/grid/__tests__/__snapshots__/demo.test.js.snap

+26
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,32 @@ exports[`renders ./antdv-demo/docs/grid/demo/flex-align.md correctly 1`] = `
192192
</div>
193193
`;
194194

195+
exports[`renders ./antdv-demo/docs/grid/demo/flex-fill.md correctly 1`] = `
196+
<div>
197+
<div role="separator" class="ant-divider ant-divider-horizontal ant-divider-with-text-left"><span class="ant-divider-inner-text">
198+
Percentage columns
199+
</span></div>
200+
<div class="ant-row-flex">
201+
<div class="ant-col" style="flex: 2 2 auto;">2 / 5</div>
202+
<div class="ant-col" style="flex: 3 3 auto;">3 / 5</div>
203+
</div>
204+
<div role="separator" class="ant-divider ant-divider-horizontal ant-divider-with-text-left"><span class="ant-divider-inner-text">
205+
Fill rest
206+
</span></div>
207+
<div class="ant-row-flex">
208+
<div class="ant-col" style="flex: 0 0 100px;">100px</div>
209+
<div class="ant-col" style="flex-basis: auto;">auto</div>
210+
</div>
211+
<div role="separator" class="ant-divider ant-divider-horizontal ant-divider-with-text-left"><span class="ant-divider-inner-text">
212+
Raw flex style
213+
</span></div>
214+
<div class="ant-row-flex">
215+
<div class="ant-col" style="flex: 1 1 200px;">1 1 200px</div>
216+
<div class="ant-col" style="flex: 0 1 300px;">0 1 300px</div>
217+
</div>
218+
</div>
219+
`;
220+
195221
exports[`renders ./antdv-demo/docs/grid/demo/flex-order.md correctly 1`] = `
196222
<div>
197223
<div class="ant-row-flex">

‎examples/App.vue

+15-110
Original file line numberDiff line numberDiff line change
@@ -1,119 +1,24 @@
11
<template>
2-
<a-config-provider :locale="locale">
3-
<div>
4-
<a-radio-group :value="locale" @change="changeLocale">
5-
<a-radio-button key="en" :value="enUS">
6-
English
7-
</a-radio-button>
8-
<a-radio-button key="cn" :value="zhCN">
9-
中文
10-
</a-radio-button>
11-
</a-radio-group>
12-
<div><h4>v-model: <input v-model="color" type="text"></h4><a-color-picker v-model="color" style="width:130px" @show="changeHandler" /></div>
13-
<div><h4>v-model:{{ color }}</h4><a-color-picker v-model="color" style="width:130px" @show="changeHandler" /></div>
14-
<div><h4>备选颜色</h4><a-color-picker :config="config1" /></div>
15-
<div><h4>多种输入格式</h4><a-color-picker :config="config2" :get-popup-container="node=>node.parentNode" /></div>
16-
<div>
17-
<button @click="config2.components.preview = !config2.components.preview">
18-
修改config
19-
</button>
20-
</div>
21-
<div><h4>多种尺寸</h4><a-color-picker size="large" /></div>
22-
<div><a-color-picker size="small" /></div>
23-
<div><h4>切换禁用</h4><a-color-picker :disabled="disabled" /></div>
24-
<div>
25-
<button @click="disabled = !disabled">
26-
切换
27-
</button>
28-
</div>
29-
<div><h4>切换格式 [color:{{ color2 }}]</h4><a-color-picker v-model="color2" :locale="zhCN" :format="format" /></div>
30-
<div>
31-
<button @click="format = 'HEX'">
32-
HEX
33-
</button>
34-
<button @click="format = 'RGBA'">
35-
RGBA
36-
</button>
37-
<button @click="format = 'HSVA'">
38-
HSVA
39-
</button>
40-
<button @click="format = 'HSLA'">
41-
HSLA
42-
</button>
43-
<button @click="format = 'CMYK'">
44-
CMYK
45-
</button>
46-
</div>
47-
</div>
48-
</a-config-provider>
2+
<div>
3+
<a-collapse :accordion="true" default-active-key="2" :bordered="false">
4+
<a-collapse-panel key="1" header="This is panel header 1">
5+
<p>{{ text }}</p>
6+
</a-collapse-panel>
7+
<a-collapse-panel key="2" header="This is panel header 2" :disabled="false">
8+
<p>{{ text }}</p>
9+
</a-collapse-panel>
10+
<a-collapse-panel key="3" header="This is panel header 3">
11+
<p>{{ text }}</p>
12+
</a-collapse-panel>
13+
</a-collapse>
14+
</div>
4915
</template>
50-
5116
<script>
52-
import enUS from 'ant-design-vue/../components/locale/en_US';
53-
import zhCN from 'ant-design-vue/../components/locale/zh_CN';
5417
export default {
55-
name: 'Demo',
56-
data () {
18+
data() {
5719
return {
58-
color:'#ccc',
59-
color2:'#ccc',
60-
disabled:false,
61-
format:'',
62-
locale: enUS,
63-
enUS,
64-
zhCN,
65-
config1:{
66-
swatches: [
67-
'rgba(244, 67, 54, 1)',
68-
'rgba(233, 30, 99, 0.95)',
69-
'rgba(156, 39, 176, 0.9)',
70-
'rgba(103, 58, 183, 0.85)',
71-
'rgba(63, 81, 181, 0.8)',
72-
'rgba(33, 150, 243, 0.75)',
73-
'rgba(3, 169, 244, 0.7)',
74-
'rgba(0, 188, 212, 0.7)',
75-
'rgba(0, 150, 136, 0.75)',
76-
'rgba(76, 175, 80, 0.8)',
77-
'rgba(139, 195, 74, 0.85)',
78-
'rgba(205, 220, 57, 0.9)',
79-
'rgba(255, 235, 59, 0.95)',
80-
'rgba(255, 193, 7, 1)',
81-
],
82-
},
83-
config2:{
84-
components: {
85-
// Main components
86-
preview: true,
87-
opacity: true,
88-
hue: true,
89-
interaction: {
90-
hex: true,
91-
rgba: true,
92-
hsla: true,
93-
hsva: true,
94-
cmyk: true,
95-
input: true,
96-
clear: true,
97-
save: true,
98-
},
99-
strings: {
100-
save: 'Save',
101-
clear: 'Clear',
102-
cancel: 'Cancel',
103-
},
104-
},
105-
},
20+
text: `A dog is a type of domesticated animal. Known for its loyalty and faithfulness, it can be found as a welcome guest in many households across the world.`,
10621
};
10722
},
108-
methods:{
109-
changeHandler(...arg){
110-
arg;
111-
// console.log(arg);
112-
},
113-
changeLocale(e) {
114-
const localeValue = e.target.value;
115-
this.locale = localeValue;
116-
},
117-
},
11823
};
11924
</script>

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ant-design-vue",
3-
"version": "1.6.3",
3+
"version": "1.6.4",
44
"title": "Ant Design Vue",
55
"description": "An enterprise-class UI design language and Vue-based implementation",
66
"keywords": [

0 commit comments

Comments
 (0)