Skip to content

Commit c978e0f

Browse files
committed
同步至Element UI 2.4.6版本
Merge commit 'ceee9bcad11ac8a7bee05dfefdd0f0f45f3bef84' into current * commit 'ceee9bcad11ac8a7bee05dfefdd0f0f45f3bef84': (86 commits) [release] 2.4.6 [build] 2.4.6 Changelog: update for 2.4.6 (ElemeFE#12325) Tree: fix add node bug in lazy mode (ElemeFE#12265) Select & Cascader: add default value for query string (ElemeFE#12322) Select: not clear text when filtering (ElemeFE#12304) Menu: fix docs (ElemeFE#12299) Pagination: make page-size attribute supports .sync (ElemeFE#12281) Popover: show popper when InputNumber focused (ElemeFE#12284) Tree: register node after dragging (ElemeFE#12279) Input: not trigger form validation when input (ElemeFE#12260) Radio: fix focus style (ElemeFE#12262) Slider: avoid NaN when min and max values ​​are equal (ElemeFE#12256) Cascader: escape special characters for regexp (ElemeFE#12248) Autocomplete: add `popper-append-to-body` attribute (ElemeFE#12241) Menu: make font-size constant into variable (ElemeFE#12239) Main: fix IE compatibility issues (ElemeFE#12237) Tree & MessageBox: fix type definition (ElemeFE#12214) Select: debounce query (ElemeFE#12181) Table: fix async filters (ElemeFE#12165) ... # Conflicts: # CHANGELOG.zh-CN.md # README.md # examples/versions.json # package.json # packages/cascader/src/main.vue # packages/form/src/form-item.vue # packages/select/src/option.vue # packages/theme-chalk/package.json # src/index.js
2 parents 3482873 + ceee9bc commit c978e0f

File tree

113 files changed

+1256
-524
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

113 files changed

+1256
-524
lines changed

CHANGELOG.en-US.md

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,61 @@
11
## Changelog
22

3+
### 2.4.6
4+
5+
*2018-08-09*
6+
7+
- Fixed Table not showing filter icon when `filters` is assigned empty array, #12165
8+
- Fixed Menu not saving active state when `collapse` is changed, #12178 (by @elfman)
9+
- Fixed Cascader not escaping special characters for Regexp, #12248
10+
- Fixed disabled RadioButton showing box-shadow when clicked, #12262
11+
- Fixed arrow key not effect when default value is `undefined`,#12322
12+
- Fixed query function of Select not debounced in multi mode, #12181
13+
- Fixed query keyword of Select disappearing in multi mode, #12304
14+
- Fixed incorrect width of Dialog when it is displayed in full screen, #12203
15+
- Fixed incorrect display of Main on IE, #12237
16+
- Fixed Input triggering two form validations, #12260
17+
- Fixed adding new Tree node causing nodes to disappear, #12256
18+
- Fixed Tree node not deleted after dragging, #12279
19+
- Fixed Popover not visible when InputNumber focuses, #12284
20+
- Added `popper-append-to-body` attribute for Autocomplete, #12241
21+
- Added `sync` modifier support for Pagination's `page-size` attribute, #12281
22+
23+
### 2.4.5
24+
25+
*2018-07-26*
26+
27+
- Fixed Table setting `class-name` does not work for `expand` column, #12006
28+
- Added `toggleAllSelection` method for Table, #12047
29+
- Fixed wrong position of suffix slot when Input contains Select, #12108
30+
- Fixed `line-height` of Option unable to set, #12120
31+
- Fixed TimeSelect with default value of `null` could not be assigned after executing `resetField`, #12010
32+
- Fixed keydown event which is not arrow key does not work in Tree, #12008
33+
- Fixed parent node checked in lazy mode, #12106
34+
- Added `includeHalfChecked` parameter for getCheckedNodes of Tree, #12014
35+
36+
### 2.4.4
37+
38+
*2018-07-13*
39+
40+
- Fixed triggering Select validation after Form resetting, #11837
41+
- Fixed wrong position of Input `suffix` slot when `suffix` slot with `append` slot, #11951
42+
- Fixed clearable Input still displaying the clear icon when readonly, #11967
43+
- Fixed Tree node checked when it's disabled, #11847
44+
- Fixed Tree's `default-checked-keys` not working, #11971
45+
- Fixed `empty-text` not visible when Tree node filtered, #11971
46+
- Fixed the position of oversized `empty-text` in Table, #11965
47+
- Fixed Table row not be unhighlighted when `current-row-key` is assigned to `null`, #11866
48+
- Fixed showing filter dropdown when `filters` is an empty array, #11864
49+
- Fixed Radio's label does not stop event propagation, #11912
50+
51+
### 2.4.3
52+
53+
*2018-07-03*
54+
55+
- Fixed `allow-drop` not working properly when Tree nodes have a custom height, #11797
56+
- Now you can pass a parameter to the `clearValidate` method of Form, specifying which FormItems' validation results need to be cleared, #11821
57+
- Added `distinguishCancelAndClose` attribute for MessageBox, #11831
58+
359
### 2.4.2
460

561
*2018-06-26*

CHANGELOG.es.md

Lines changed: 65 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,74 @@
11
## Changelog
22

3+
### 2.4.6
4+
5+
*2018-08-09*
6+
7+
- Fixed Table not showing filter icon when `filters` is assigned empty array, #12165
8+
- Fixed Menu not saving active state when `collapse` is changed, #12178 (by @elfman)
9+
- Fixed Cascader not escaping special characters for Regexp, #12248
10+
- Fixed disabled RadioButton showing box-shadow when clicked, #12262
11+
- Fixed arrow key not effect when default value is `undefined`,#12322
12+
- Fixed query function of Select not debounced in multi mode, #12181
13+
- Fixed query keyword of Select disappearing in multi mode, #12304
14+
- Fixed incorrect width of Dialog when it is displayed in full screen, #12203
15+
- Fixed incorrect display of Main on IE, #12237
16+
- Fixed Input triggering two form validations, #12260
17+
- Fixed adding new Tree node causing nodes to disappear, #12256
18+
- Fixed Tree node not deleted after dragging, #12279
19+
- Fixed Popover not visible when InputNumber focuses, #12284
20+
- Added `popper-append-to-body` attribute for Autocomplete, #12241
21+
- Added `sync` modifier support for Pagination's `page-size` attribute, #12281
22+
23+
### 2.4.5
24+
25+
*2018-07-26*
26+
27+
- Se ha corregido en Table que `class-name` no funcionaba para las columnas `expand`, #12006
28+
- Se ha añadido el método `toggleAllSelection` para Table, #12047
29+
- Corregida la posición incorrecta del `suffix slot` cuando Input contiene Select, #12108
30+
- Corregido que el `line-height` de Option no se establecia, #12120
31+
- Corregido que TimeSelect con valor por defecto `null` no podia ser asignado después de ejecutar `resetField`, #12010
32+
- Arreglado el evento `keydown` que cuando no era una tecla de flecha no funciona en Tree, #12008
33+
- Corregido nodo padre checked en modo lazy, #12106
34+
- Añadido el parámetro `includeHalfChecked` para getCheckedNodes de Tree, #12014
35+
36+
### 2.4.4
37+
38+
*2018-07-13*
39+
40+
- Corregido que se disparaba la validacion del Select después de reajustar el formulario, #11837
41+
- Corregida la posición incorrecta del slot Input `suffix` cuando se usaba el slot `suffix` con el slot `append` , #11951
42+
- Corregido el clearable Input que muestraba el icono de borrado cuando era readonly, #11967
43+
- Arreglado el nodo Tree checked cuando estaba disabled, #11847
44+
- Corregido que `default-checked-keys` no funcionaba en Tree, #11971
45+
- Corregido que el `empty-text` no era visible cuando el nodo Tree se filtraba, #11971
46+
- Arreglada la posición de texto vacío sobredimensionado en Table, #11965
47+
- Corregido que la fila de la tabla no se modificado el resaltado cuando `current-row-key` era asignada a null, #11866
48+
- Arreglado que mostraba el filtro del dropdown cuando los filtros eran un array vacío, #11864
49+
- Corregido que el cambio de label de Radio no detenia propagacion de eventos, #11912
50+
51+
### 2.4.3
52+
53+
*2018-07-03*
54+
55+
- Corregido `allow-drop` que no funcionaba correctamente cuando los nodos de árbol tenian una altura personalizada, #11797
56+
- Ahora puede pasar un parámetro al método `clearValidate` de Form, especificando qué resultados de validación de `FormItems` necesita borrar, #11821
57+
- Añadido el atributo `distinguishCancelAndClose` para MessageBox, #11831
58+
359
### 2.4.2
460

561
*2018-06-26*
662

7-
- Now `class-name` and `label-class-name` of Table are reactive, #11626
8-
- Fixed Table still highlighting clicked row when `highlight-current-row` is `false`, #11646
9-
- Fixed a style bug of ButtonGroup when it has only one `round` or `circle` Button, #11605
10-
- Fixed style of page size Select of Pagination, #11622
11-
- Fixed Menu's `open` method error when `collapse` is dynamically changed, #11646
12-
- Added `activeName` and `oldActiveName` parameters to the before-leave hook of Tabs, #11713
13-
- Fixed Cascader focused after outside clicked, #11588
14-
- Fixed Cascader not closing when option is clicked when `change-on-select` is true, #11623
15-
- Now updating Select's value programmatically will trigger form validation, #11672
63+
- Ahora el `class-name` y el `label-class-name` de la tabla son reactivos, #11626
64+
- Arreglado que Table seguia resaltando la fila en la que se había hecho clic cuando `highlight-current-row` era `false`, #11646
65+
- Corregido un error de estilo de ButtonGroup cuando sólo habia un botón `round` o `circle`, #11605
66+
- Arreglado estilo del tamaño de página del Select de Pagination, #11622
67+
- Corregido un error del método `open` de los Menús cuando se cambiaba dinámicamente `collapse`, #11646
68+
- Añadidos los parámetros `activeName` y `oldActiveName` al gancho before-leave de Tabs, #11713
69+
- Arreglado el focus en Cascader después de hacer clic fuera, #11588
70+
- Arreglado que Cascader no se cerraba cuando se hacia clic en la opción estando `change-on-select` como `true`, #11623
71+
- Ahora la actualización del valor de Select programáticamente activará la validación de formulario, #11672
1672

1773
### 2.4.1
1874

CHANGELOG.zh-CN.md

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,70 @@
11
## 更新日志
22

3+
### 1.4.10
4+
*2018-08-10*
5+
6+
同步至Element-UI 2.4.6版本
7+
8+
#### 新特性
9+
10+
- Autocomplete
11+
- 添加 `popper-append-to-body` 属性,#12241
12+
- Form
13+
- 现在 Form 的 `clearValidate` 方法支持传入参数,指定需要清空校验结果的 FormItem,#11821
14+
- MessageBox
15+
- 新增 MessageBox 的 `distinguishCancelAndClose` 属性,#11831
16+
- Pagination
17+
- 添加 `page-size` 属性 `sync` 修饰符的支持,#12281
18+
- Table
19+
- 新增 `toggleAllSelection` 方法,#12047
20+
21+
#### 修复
22+
23+
- Cascader
24+
- 修复 Cascader 未转义特殊字符的问题,#12248
25+
- DatePicker
26+
- 修复初始值为 `null` 的 TimeSelect 在执行 `resetField` 后无法再赋值的问题,#12010
27+
- Dialog
28+
- 修复 Dialog 在全屏显示时宽度不正确的问题,#12203
29+
- Input
30+
- 修复 Input 触发两次表单校验的问题,#12260
31+
- 修复 Input 包含 Select 时,suffix 插槽位置显示不正确的问题,#12108
32+
- 修复 Input 组件 `suffix``append` 共存时样式错乱问题,#11951
33+
- 修复可清空的只读 Input 仍会显示清空图标的问题,#11967
34+
- Menu
35+
- 修复 Menu 在更改 `collapse` 时不保存菜单激活状态的问题,#12178 (by @elfman)
36+
- Popover
37+
- 修复 Popover 在 InputNumber 聚焦时不显示的问题,#12284
38+
- Radio
39+
- 修复禁用的 RadioButton 在点击时显示 box-shadow 的问题,#12262
40+
- 修复 Radio 的 label 不阻止事件冒泡的问题,#11912
41+
- Select
42+
- 修复 Select 初始值为 `undefined` 时方向键失效的问题,#12322
43+
- 修复 Select 多选时输入的关键字消失的问题,#12304
44+
- 修复 Select 多选时查询函数没有去抖的问题,#12181
45+
- 修复 Option 的 `line-height` 无法设置的问题,#12120
46+
- 修复重置表单后触发 Select 组件校验问题,#11837
47+
- Table
48+
- 修复 Table 的 filter 初始值为空数组时不显示筛选图标的问题,#12165
49+
- 修复 Table 设置 `class-name``expand` 列不生效的问题,#12006
50+
- 修复 Table 的 `empty-text` 过长时的位置样式问题,#11965
51+
- 修复 Table 的 `current-row-key` 设置为 `null` 时高亮行不清除的问题,#11866
52+
- 修复当 `filters` 为空数组时显示过滤器下拉列表的问题,#11864
53+
- Tree
54+
- 修复 Tree 在懒加载时添加节点导致节点消失的问题,#12256
55+
- 修复 Tree 节点在拖拽后无法删除的问题,#12279
56+
- 修复 Tree 组件中不响应方向键以外 keydown 事件的问题,#12008
57+
- 修复 Tree 在懒加载情况下选中父节点的问题,#12106
58+
- 修复 Tree 节点禁用时仍可以选中的问题,#11847
59+
- 修复 Tree `default-checked-keys` 属性不生效的问题,#11971
60+
- 修复 Tree 在过滤节点时下 `empty-text` 不显示的问题,#11971
61+
- 修复当自定义 Tree 节点高度时,`allow-drop` 不能正常工作的问题,#11797
62+
63+
#### 其他
64+
65+
- ThemeChalk
66+
- 修复 Main 在 IE 下的显示不正确的问题,#12237
67+
368
### 1.4.9
469
*2018-08-10*
570

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
44
Fork自[element-ui](https://github.com/ElemeFE/element)
55

6-
**同步至Element-UI 2.4.2**
6+
**同步至Element-UI 2.4.6**
77

88
基于Vue和Element UI,结合其他优秀组件库([Ant Design](https://ant.design/index-cn)[Material Deisgn](https://material.angular.io/)等),加速业务级应用页面开发。
99

build/bin/build-entry.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const install = function(Vue, opts = {}) {
2323
locale.use(opts.locale);
2424
locale.i18n(opts.i18n);
2525
26-
components.map(component => {
26+
components.forEach(component => {
2727
Vue.component(component.name, component);
2828
});
2929

build/bin/gen-indices.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const algoliasearch = require('algoliasearch');
66
const slugify = require('transliteration').slugify;
77
const key = require('./algolia-key');
88

9-
const client = algoliasearch('9NLTR1QH8B', key);
9+
const client = algoliasearch('4C63BTGP6S', key);
1010
const langs = {
1111
'zh-CN': 'element-zh',
1212
'en-US': 'element-en',

build/bin/new.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ export default {
4949
filename: path.join('../../examples/docs/en-US', `${componentname}.md`),
5050
content: `## ${ComponentName}`
5151
},
52+
{
53+
filename: path.join('../../examples/docs/es', `${componentname}.md`),
54+
content: `## ${ComponentName}`
55+
},
5256
{
5357
filename: path.join('../../test/unit/specs', `${componentname}.spec.js`),
5458
content: `import { createTest, destroyVM } from '../util';

examples/components/search.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163
164164
methods: {
165165
initIndex() {
166-
const client = algoliasearch('9NLTR1QH8B', 'a75cbec97cda75ab7334fed9219ecc57');
166+
const client = algoliasearch('4C63BTGP6S', '0729c3c7f4dc8db7395ad0b19c0748d2');
167167
this.index = client.initIndex(`element-${ this.lang ? this.langs[this.lang].index : 'zh' }`);
168168
},
169169

examples/components/side-nav.vue

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,10 @@
142142
</li>
143143
</ul>
144144
</li>
145-
<li class="nav-item" v-for="item in data">
145+
<li
146+
class="nav-item"
147+
v-for="(item, key) in data"
148+
:key="key">
146149
<a v-if="!item.path && !item.href" @click="expandMenu">{{item.name}}</a>
147150
<a v-if="item.href" :href="item.href" target="_blank">{{item.name}}</a>
148151
<router-link
@@ -153,7 +156,10 @@
153156
v-text="item.title || item.name">
154157
</router-link>
155158
<ul class="pure-menu-list sub-nav" v-if="item.children">
156-
<li class="nav-item" v-for="navItem in item.children">
159+
<li
160+
class="nav-item"
161+
v-for="(navItem, key) in item.children"
162+
:key="key">
157163
<router-link
158164
class=""
159165
active-class="active"
@@ -164,13 +170,18 @@
164170
</li>
165171
</ul>
166172
<template v-if="item.groups">
167-
<div class="nav-group" v-for="group in item.groups">
173+
<div
174+
class="nav-group"
175+
v-for="(group, key) in item.groups"
176+
:key="key"
177+
>
168178
<div class="nav-group__title" @click="expandMenu">{{group.groupName}}</div>
169179
<ul class="pure-menu-list">
170180
<li
171181
class="nav-item"
172-
v-for="navItem in group.list"
173-
v-if="!navItem.disabled">
182+
v-for="(navItem, key) in group.list"
183+
v-if="!navItem.disabled"
184+
:key="key">
174185
<router-link
175186
active-class="active"
176187
:to="base + navItem.path"

examples/docs/en-US/cascader.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1694,6 +1694,6 @@ Search and select options with a keyword.
16941694
| Event Name | Description | Parameters |
16951695
|---------- |-------- |---------- |
16961696
| change | triggers when the binding value changes | value |
1697-
| active-item-change | triggers when active option changes, only works when `change-on-select` is `false` | an array of active options |
1697+
| active-item-change | triggers when active option of its parent changes, only works when `change-on-select` is `false` | an array of active options |
16981698
| blur | triggers when Cascader blurs | (event: Event) |
16991699
| focus | triggers when Cascader focuses | (event: Event) |

0 commit comments

Comments
 (0)