Skip to content

Commit 9a24484

Browse files
committed
同步至Element UI 2.4.8版本
Merge branch 'master' into current * master: (56 commits) [release] 2.4.8 [build] 2.4.8 changelog for 2.4.8 (ElemeFE#12950) Tabs: scroll to active tab (ElemeFE#12948) Tree: fix type definition (ElemeFE#12941) Table: fix table column default alignment (ElemeFE#12578) Table: called render header in index column (ElemeFE#12914) Input: s autocomplete on textarea (ElemeFE#12917) DatePicker: validate input date (ElemeFE#12898) chore: update date-picker comment notes (ElemeFE#12899) test: update test case for form (ElemeFE#12886) ButtonGroup: fix Dropdown style in ButtonGroup(ElemeFE#12815) (ElemeFE#12819) Form: emits error message on validate event (ElemeFE#12860) doc: update i18n doc for Serbian language (ElemeFE#12867) Tabs: fix order of TabNav when array is sorted (ElemeFE#12846) i18n: add Serbian translation (ElemeFE#12863) Tree: show indicator in drop node (ElemeFE#12854) Upload: add missing definition (ElemeFE#12839) i18n: update Greek translation (ElemeFE#12830) Dialog: add opened event (ElemeFE#12828) ... # Conflicts: # CHANGELOG.zh-CN.md # README.md # examples/docs/zh-CN/form.md # examples/versions.json # package.json # packages/date-picker/src/basic/date-table.vue # packages/date-picker/src/basic/month-table.vue # packages/date-picker/src/panel/date-range.vue # packages/form/src/form-item.vue # packages/theme-chalk/package.json # packages/theme-chalk/src/button.scss # src/index.js
2 parents 2dcbf6b + e3480e7 commit 9a24484

Some content is hidden

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

75 files changed

+784
-353
lines changed

CHANGELOG.en-US.md

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,40 @@
11
## Changelog
22

3+
### 2.4.8
4+
5+
- Not displaying outline when Switch is focused, #12771
6+
- Fixed Dropdown's style in ButtonGroup, #12819 (by @bluejfox)
7+
- Added opened event for Dialog, #12828
8+
- Fixed the incorrect display order of TabNav, #12846
9+
- Fixed the problem that Tabs did not scroll to the selected tab, #12948
10+
- Fixed the problem that the identifier does not display when the Tree node is dragged, #12854
11+
- The validate event parameter of Form contains the validation message, #12860 (by @YamenSharaf)
12+
- Fixed DatePicker not to verify the validity of user input time, #12898
13+
- Fixed the problem that `render-header` attribute of Table header doesn't work, #12914
14+
15+
### 2.4.7
16+
17+
*2018-09-14*
18+
19+
- Fixed DatePicker not triggering form validation, #12328 #12348
20+
- Fixed DatePicker throwing errors in multiple mode, #12347
21+
- Fixed incorrect position of DatePicker spinner, #12415 (by @rang-ali)
22+
- Fixed automatic filling of DatePicker input box, #12521 (by @abdallanayer)
23+
- Fixed Input not highlighted in Cascader, #12341
24+
- Fixed wrong order of Tabpane, #12346
25+
- Fixed incorrect position of ColorPicker cursor, #12376 (by @cnwhy)
26+
- Fixed the style of Submenu, #2457
27+
- Fixed not highlighted after Submenu is selected, #12479
28+
- Fixed incorrect values selected by Cascader, #12508 (by @huangjinqiang)
29+
- Fixed incorrect value of Pagination input box, #12525
30+
- Fixed order that Pagination triggers events, #12530
31+
- Fixed Table Filter not displayed, #12539
32+
- Fixed Tree unable to delete nodes, #12684
33+
- Fixed height of Select Input changing in single mode, #12719
34+
- Fixed style of FormItem label in nested Form, #12748
35+
- Added `autocomplete` attribute for Input, deprecated `auto-complete`, #12514 (by @axetroy)
36+
- Added slots-scope for Form to display validation information, #12715 (by @YamenSharaf)
37+
338
### 2.4.6
439

540
*2018-08-09*
@@ -660,4 +695,4 @@
660695
- The params of `row-class-name` and `row-style` method is now an object
661696

662697
##
663-
<i><sup>*</sup> Dynamically rendering arbitrary HTML on your website can be very dangerous because it can easily lead to [XSS attacks](https://en.wikipedia.org/wiki/Cross-site_scripting). So when `dangerouslyUseHTMLString` is on, please make sure the content of `message` is trusted, and **never** assign `message` to user-provided content.</i>
698+
<i><sup>*</sup> Dynamically rendering arbitrary HTML on your website can be very dangerous because it can easily lead to [XSS attacks](https://en.wikipedia.org/wiki/Cross-site_scripting). So when `dangerouslyUseHTMLString` is on, please make sure the content of `message` is trusted, and **never** assign `message` to user-provided content.</i>

CHANGELOG.es.md

Lines changed: 51 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,59 @@
11
## Changelog
22

3+
### 2.4.8
4+
5+
- Not displaying outline when Switch is focused, #12771
6+
- Fixed Dropdown's style in ButtonGroup, #12819 (by @bluejfox)
7+
- Added opened event for Dialog, #12828
8+
- Fixed the incorrect display order of TabNav, #12846
9+
- Fixed the problem that Tabs did not scroll to the selected tab, #12948
10+
- Fixed the problem that the identifier does not display when the Tree node is dragged, #12854
11+
- The validate event parameter of Form contains the validation message, #12860 (by @YamenSharaf)
12+
- Fixed DatePicker not to verify the validity of user input time, #12898
13+
- Fixed the problem that `render-header` attribute of Table header doesn't work, #12914
14+
15+
### 2.4.7
16+
17+
*2018-09-14*
18+
19+
- Corregido que DatePicker no activaba la validación del Form, #12328 #12348
20+
- Corregidos el lanzamiento de errores del DatePicker en modo múltiple, #12347
21+
- Corregida la posición incorrecta del spinner del DatePicker, #12415 (por @rang-ali)
22+
- Se ha corregido el llenado automático del input del DatePicker, #12521 (por @abdallanayer)
23+
- Corregida el input no resaltada en Cascader, #12341
24+
- Corregido el orden incorrecto de Tabpane, #12346
25+
- Corregida la posición incorrecta del cursor de ColorPicker, #12376 (por @cnwhy)
26+
- Corregido el estilo del Submenú, #2457
27+
- Corregido el resaltado después de seleccionar el Submenú, #12479
28+
- Corregidos los valores incorrectos seleccionados por Cascader, #12508 (por @huangjinqiang)
29+
- Corregido el valor incorrecto del input de Paginación, #12525
30+
- Se ha corregido el orden en que la paginación desencadena los eventos, #12530
31+
- Corregido que no se mostraba el Table Filter, #12539
32+
- Corregido Tree que era incapaz de borrar nodos, #12684
33+
- Corregida la altura de los Select Input que cambiaba en modo simple, #12719
34+
- Arreglado el estilo de la etiqueta FormItem en Form anidado, #12748
35+
- Añadido el atributo `autocomplete` para Input, obsoleto `auto-complete`, #12514 (por @axetroy)
36+
- Añadido el slots-scope de Form para mostrar la información de validación, #12715 (por @YamenSharaf)
37+
338
### 2.4.6
439

540
*2018-08-09*
641

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
42+
- Arreglada la tabla que no mostraba el ícono del filtro cuando a `filter` se les asignaba un array vacío, #12165
43+
- Arreglado Menu que no guardaba el estado activo cuando cambiaba `collapse` #12178 (por @elfman)
44+
- Se ha corregido que Cascader no escapaba a los caracteres especiales para Regexp, #12248
45+
- Se ha corregido que el RadioBotón deshabilitado mostraba la sombra de la caja cuando se hacía clic, #12262
46+
- Arreglado el efecto de la tecla de flecha en Select cuando el valor por defecto es `undefined`,#12322
47+
- Corregida la función de consulta de Select not debounced en modo multi, #12181
48+
- Corregida que la palabra clave de consulta de Select desaparecía en modo multi, #12304
49+
- Corregido el ancho incorrecto de Dialog cuando se muestra a pantalla completa, #12203
50+
- Corregida la visualización incorrecta de Main en IE, #12237
51+
- Corregido el trigger de Input con dos validaciones de Form, #12260
52+
- Arreglado el añadir un nuevo nodo de árbol que causaba que los nodos desaparecieran, #12256
53+
- Arreglado el nodo Tree no se borraba después de arrastrar, #12279
54+
- Popover corregido porque no era visible cuando InputNumber no enfocaba, #12284
55+
- Añadido el atributo `popper-append-to-body` para Autocompletar, #12241
56+
- Añadido el modificador `sync` para el atributo `page-size` de Pagination, #12281
2257

2358
### 2.4.5
2459

@@ -665,4 +700,4 @@
665700

666701
# #
667702

668-
<i><sup>*</sup> El procesamiento dinámico de HTML arbitrario en su sitio web puede ser muy peligroso porque puede conducir fácilmente a [ataques XSS](https://en.wikipedia.org/wiki/Cross-site_scripting). Por lo tanto, cuando `dangerouslyUseHTMLString` está encendido, por favor asegúrese de que el contenido de `message` es confiable, y **nunca** asigne el `message` al contenido proporcionado por el usuario.</i>
703+
<i><sup>*</sup> El procesamiento dinámico de HTML arbitrario en su sitio web puede ser muy peligroso porque puede conducir fácilmente a [ataques XSS](https://en.wikipedia.org/wiki/Cross-site_scripting). Por lo tanto, cuando `dangerouslyUseHTMLString` está encendido, por favor asegúrese de que el contenido de `message` es confiable, y **nunca** asigne el `message` al contenido proporcionado por el usuario.</i>

CHANGELOG.zh-CN.md

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

3+
### 1.4.26
4+
*2018-10-10*
5+
6+
同步至Element-UI 2.4.8版本
7+
8+
### 新特性
9+
10+
- Dialog
11+
- 新增 `opened` 事件,#12828
12+
- Form
13+
- 新增 `slot-scope` 展示表单校验信息,#12715 (by @YamenSharaf
14+
- Form 的 validate 事件参数中新增校验的信息,#12860 (by @YamenSharaf
15+
- Input
16+
- 新增 `autocomplete` 属性,废弃 `auto-complete` 属性,#12514 (by @axetroy
17+
18+
### 修复
19+
20+
- Cascader
21+
- 修复 Input 未高亮的问题,#12341
22+
- 修复选择值不正确的问题,#12508 (by @huangjinqiang
23+
- ColorPicker
24+
- 修复取色光标位置不正确的问题,#12376 (by @cnwhy
25+
- DatePicker
26+
- 修复未触发表单检验的问题,#12328#12348
27+
- 修复多选时报错的问题,#12347
28+
- 修复选择时间时 spinner 位置不正确的问题,#12415 (by @rang-ali
29+
- 修复输入框自动填充的问题,#12521 (by @abdallanayer
30+
- 修复没有校验用户输入时间的合法性问题,#12898
31+
- Dropdown
32+
- 修复 Dropdown 在 ButtonGroup 中样式问题,#12819 (by @bluejfox
33+
- Form
34+
- 修复Form在嵌套时 label 显示不正确的问题,#12748
35+
- Menu
36+
- 调整 Submenu 的样式,#12457
37+
- 修复 Submenu 选中后没有高亮的问题,#12479
38+
- Pagination
39+
- 修复输入框值不正确的问题,#12525
40+
- 调整触发事件的顺序,#12530
41+
- Select
42+
- 修复在单选时 Input 高度变化的问题,#12719
43+
- Switch
44+
- 修复Switch 聚焦时不显示轮廓,#12771
45+
- Table
46+
- 修复 `filter` 不显示的问题,#12539
47+
- 修复表头的 `render-header` 属性不生效的问题,#12914
48+
- Tab
49+
- 修复 Tabpane 顺序不正确的问题,#12346
50+
- 修复 TabNav 显示顺序不正确的问题,#12846
51+
- 修复 Tabs 没有滑动到选中 tab 的问题,#12948
52+
- Tree
53+
- 修复无法删除节点的问题,#12684
54+
- 修复 Tree 节点在拖拽时标识符不显示的问题,#12854
55+
356
### 1.4.25
457
*2018-09-25*
558

LICENSE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2016 ElemeFE
3+
Copyright (c) 2016-present ElemeFE
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal
@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
1818
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
1919
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
2020
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21-
SOFTWARE.
21+
SOFTWARE.

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.6**
6+
**同步至Element-UI 2.4.8**
77

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

examples/docs/en-US/date-picker.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@
6666
value10: '',
6767
value11: '',
6868
value12: '',
69-
value13: [],
70-
value14: []
69+
value13: '',
70+
value14: ''
7171
};
7272
}
7373
};
@@ -232,7 +232,7 @@ You can choose week, month, year or multiple dates by extending the standard dat
232232
value3: '',
233233
value4: '',
234234
value5: '',
235-
value14: []
235+
value14: ''
236236
};
237237
}
238238
};
@@ -463,7 +463,7 @@ When picking a date range, you can assign the time part for start date and end d
463463
export default {
464464
data() {
465465
return {
466-
value13: []
466+
value13: ''
467467
};
468468
}
469469
};

examples/docs/en-US/dialog.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ The content of Dialog can be anything, even a table or a form. This example show
147147
<el-dialog title="Shipping address" :visible.sync="dialogFormVisible">
148148
<el-form :model="form">
149149
<el-form-item label="Promotion name" :label-width="formLabelWidth">
150-
<el-input v-model="form.name" auto-complete="off"></el-input>
150+
<el-input v-model="form.name" autocomplete="off"></el-input>
151151
</el-form-item>
152152
<el-form-item label="Zones" :label-width="formLabelWidth">
153153
<el-select v-model="form.region" placeholder="Please select a zone">
@@ -309,5 +309,6 @@ If the variable bound to `visible` is managed in Vuex store, the `.sync` can not
309309
| Event Name | Description | Parameters |
310310
|---------- |-------- |---------- |
311311
| open | triggers when the Dialog opens ||
312+
| opened | triggers when the Dialog opening animation ends ||
312313
| close | triggers when the Dialog closes ||
313314
| closed | triggers when the Dialog closing animation ends ||

examples/docs/en-US/form.md

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -538,10 +538,10 @@ This example shows how to customize your own validation rules to finish a two-fa
538538
```html
539539
<el-form :model="ruleForm2" status-icon :rules="rules2" ref="ruleForm2" label-width="120px" class="demo-ruleForm">
540540
<el-form-item label="Password" prop="pass">
541-
<el-input type="password" v-model="ruleForm2.pass" auto-complete="off"></el-input>
541+
<el-input type="password" v-model="ruleForm2.pass" autocomplete="off"></el-input>
542542
</el-form-item>
543543
<el-form-item label="Confirm" prop="checkPass">
544-
<el-input type="password" v-model="ruleForm2.checkPass" auto-complete="off"></el-input>
544+
<el-input type="password" v-model="ruleForm2.checkPass" autocomplete="off"></el-input>
545545
</el-form-item>
546546
<el-form-item label="Age" prop="age">
547547
<el-input v-model.number="ruleForm2.age"></el-input>
@@ -719,7 +719,7 @@ This example shows how to customize your own validation rules to finish a two-fa
719719
{ type: 'number', message: 'age must be a number'}
720720
]"
721721
>
722-
<el-input type="age" v-model.number="numberValidateForm.age" auto-complete="off"></el-input>
722+
<el-input type="age" v-model.number="numberValidateForm.age" autocomplete="off"></el-input>
723723
</el-form-item>
724724
<el-form-item>
725725
<el-button type="primary" @click="submitForm('numberValidateForm')">Submit</el-button>
@@ -835,9 +835,10 @@ All components in a Form inherit their `size` attribute from that Form. Similarl
835835
| model| data of form component | object |||
836836
| rules | validation rules of form | object |||
837837
| inline | whether the form is inline | boolean || false |
838-
| label-position | position of label | string | left / right / top | right |
838+
| label-position | position of label. If set to 'left' or 'right', `label-width` prop is also required | string | left / right / top | right |
839839
| label-width | width of label, and all its direct child form items will inherit this value | string |||
840840
| label-suffix | suffix of the label | string |||
841+
| hide-required-asterisk | whether required fields should have a red asterisk (star) beside their labels | boolean || false |
841842
| show-message | whether to show the error message | boolean || true |
842843
| inline-message | whether to display the error message inline with the form item | boolean || false |
843844
| status-icon | whether to display an icon indicating the validation result | boolean || false |
@@ -857,7 +858,7 @@ All components in a Form inherit their `size` attribute from that Form. Similarl
857858
### Form Events
858859
| Event Name | Description | Parameters |
859860
|----------- |------------ |----------- |
860-
| validate | triggers after a form item is validated | prop name of the form item being validated, whether validation is passed |
861+
| validate | triggers after a form item is validated | prop name of the form item being validated, whether validation is passed and the error message if not |
861862

862863
### Form-Item Attributes
863864

@@ -879,9 +880,14 @@ All components in a Form inherit their `size` attribute from that Form. Similarl
879880
|| content of Form Item |
880881
| label | content of label |
881882

883+
### Form-Item Scoped Slot
884+
| Name | Description |
885+
|---------------|-------------|
886+
| error | Custom content to display validation message. The scope parameter is { error } |
887+
882888
### Form-Item Methods
883889

884890
| Method | Description | Parameters |
885891
| ---- | ---- | ---- |
886892
| resetField | reset current field and remove validation result ||
887-
| clearValidate | remove validation status of the field | -
893+
| clearValidate | remove validation status of the field | - |

examples/docs/en-US/i18n.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,7 @@ Currently Element ships with the following languages:
215215
<li>Kurdish (ku)</li>
216216
<li>Uighur (ug-CN)</li>
217217
<li>Khmer (km)</li>
218+
<li>Serbian (sr)</li>
218219
</ul>
219220

220221
If your target language is not included, you are more than welcome to contribute: just add another language config [here](https://github.com/ElemeFE/element/tree/dev/src/locale/lang) and create a pull request.

examples/docs/en-US/input.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -654,7 +654,8 @@ Search data from server-side.
654654
| suffix-icon | suffix icon class | string |||
655655
|rows | number of rows of textarea, only works when `type` is 'textarea' | number || 2 |
656656
|autosize | whether textarea has an adaptive height, only works when `type` is 'textarea'. Can accept an object, e.g. { minRows: 2, maxRows: 6 } | boolean / object || false |
657-
|auto-complete | same as `auto-complete` in native input | string | on/off | off |
657+
|autocomplete | same as `autocomplete` in native input | string | on/off | off |
658+
|auto-complete | @DEPRECATED in next major version | string | on/off | off |
658659
|name | same as `name` in native input | string |||
659660
| readonly | same as `readonly` in native input | boolean || false |
660661
|max | same as `max` in native input ||||

0 commit comments

Comments
 (0)