同步至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
setariajs · Oct 10, 2018 · 9a24484 · 9a24484
2 parents 2dcbf6b + e3480e7
commit 9a24484
Show file tree

Hide file tree

Showing 75 changed files with 784 additions and 353 deletions.
diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
@@ -1,5 +1,40 @@
 ## Changelog
 
+### 2.4.8
+
+- Not displaying outline when Switch is focused, #12771
+- Fixed Dropdown's style in ButtonGroup, #12819 (by @bluejfox)
+- Added opened event for Dialog, #12828
+- Fixed the incorrect display order of TabNav, #12846
+- Fixed the problem that Tabs did not scroll to the selected tab, #12948
+- Fixed the problem that the identifier does not display when the Tree node is dragged, #12854
+- The validate event parameter of Form contains the validation message, #12860 (by @YamenSharaf)
+- Fixed DatePicker not to verify the validity of user input time, #12898
+- Fixed the problem that `render-header` attribute of Table header doesn't work, #12914
+
+### 2.4.7
+
+*2018-09-14*
+
+- Fixed DatePicker not triggering form validation, #12328 #12348 
+- Fixed DatePicker throwing errors in multiple mode, #12347 
+- Fixed incorrect position of DatePicker spinner, #12415 (by @rang-ali)
+- Fixed automatic filling of DatePicker input box, #12521 (by @abdallanayer)
+- Fixed Input not highlighted in Cascader, #12341
+- Fixed wrong order of Tabpane, #12346 
+- Fixed incorrect position of ColorPicker cursor, #12376 (by @cnwhy)
+- Fixed the style of Submenu, #2457
+- Fixed not highlighted after Submenu is selected, #12479
+- Fixed incorrect values selected by Cascader, #12508 (by @huangjinqiang)
+- Fixed incorrect value of Pagination input box, #12525 
+- Fixed order that Pagination triggers events, #12530
+- Fixed Table Filter not displayed, #12539
+- Fixed Tree unable to delete nodes, #12684
+- Fixed height of Select Input changing in single mode, #12719
+- Fixed style of FormItem label in nested Form, #12748
+- Added `autocomplete` attribute for Input, deprecated `auto-complete`, #12514 (by @axetroy)
+- Added slots-scope for Form to display validation information, #12715 (by @YamenSharaf)
+
 ### 2.4.6
 
 *2018-08-09*
@@ -660,4 +695,4 @@
   - The params of `row-class-name` and `row-style` method is now an object
 
 ##
-<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>
+<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>
diff --git a/CHANGELOG.es.md b/CHANGELOG.es.md
@@ -1,24 +1,59 @@
 ## Changelog
 
+### 2.4.8
+
+- Not displaying outline when Switch is focused, #12771
+- Fixed Dropdown's style in ButtonGroup, #12819 (by @bluejfox)
+- Added opened event for Dialog, #12828
+- Fixed the incorrect display order of TabNav, #12846
+- Fixed the problem that Tabs did not scroll to the selected tab, #12948
+- Fixed the problem that the identifier does not display when the Tree node is dragged, #12854
+- The validate event parameter of Form contains the validation message, #12860 (by @YamenSharaf)
+- Fixed DatePicker not to verify the validity of user input time, #12898
+- Fixed the problem that `render-header` attribute of Table header doesn't work, #12914
+
+### 2.4.7
+
+*2018-09-14*
+
+- Corregido que DatePicker no activaba la validación del Form, #12328 #12348 
+- Corregidos el lanzamiento de errores del DatePicker en modo múltiple, #12347 
+- Corregida la posición incorrecta del spinner del DatePicker, #12415 (por @rang-ali)
+- Se ha corregido el llenado automático del input del DatePicker, #12521 (por @abdallanayer)
+- Corregida el input no resaltada en Cascader, #12341
+- Corregido el orden incorrecto de Tabpane, #12346 
+- Corregida la posición incorrecta del cursor de ColorPicker, #12376 (por @cnwhy)
+- Corregido el estilo del Submenú, #2457
+- Corregido el resaltado después de seleccionar el Submenú, #12479
+- Corregidos los valores incorrectos seleccionados por Cascader, #12508 (por @huangjinqiang)
+- Corregido el valor incorrecto del input de Paginación, #12525 
+- Se ha corregido el orden en que la paginación desencadena los eventos, #12530
+- Corregido que no se mostraba el Table Filter, #12539
+- Corregido Tree que era incapaz de borrar nodos, #12684
+- Corregida la altura de los Select Input que cambiaba en modo simple, #12719
+- Arreglado el estilo de la etiqueta FormItem en Form anidado, #12748
+- Añadido el atributo `autocomplete` para Input, obsoleto `auto-complete`, #12514 (por @axetroy)
+- Añadido el slots-scope de Form para mostrar la información de validación, #12715 (por @YamenSharaf)
+
 ### 2.4.6
 
 *2018-08-09*
 
-- Fixed Table not showing filter icon when `filters` is assigned empty array, #12165
-- Fixed Menu not saving active state when `collapse` is changed, #12178 (by @elfman)
-- Fixed Cascader not escaping special characters for Regexp, #12248
-- Fixed disabled RadioButton showing box-shadow when clicked, #12262
-- Fixed arrow key not effect when default value is `undefined`,#12322
-- Fixed query function of Select not debounced in multi mode, #12181
-- Fixed query keyword of Select disappearing in multi mode, #12304
-- Fixed incorrect width of Dialog when it is displayed in full screen, #12203
-- Fixed incorrect display of Main on IE, #12237
-- Fixed Input triggering two form validations, #12260
-- Fixed adding new Tree node causing nodes to disappear, #12256
-- Fixed Tree node not deleted after dragging, #12279
-- Fixed Popover not visible when InputNumber focuses, #12284
-- Added `popper-append-to-body` attribute for Autocomplete, #12241
-- Added `sync` modifier support for Pagination's `page-size` attribute, #12281
+- Arreglada la tabla que no mostraba el ícono del filtro cuando a  `filter` se les asignaba un array vacío, #12165
+- Arreglado Menu que no guardaba el estado activo cuando cambiaba `collapse` #12178 (por @elfman)
+- Se ha corregido que Cascader no escapaba a los caracteres especiales para Regexp, #12248
+- Se ha corregido que el RadioBotón deshabilitado mostraba la sombra de la caja cuando se hacía clic, #12262
+- Arreglado el efecto de la tecla de flecha en Select cuando el valor por defecto es `undefined`,#12322
+- Corregida la función de consulta de Select not debounced en modo multi, #12181
+- Corregida que la palabra clave de consulta de Select desaparecía en modo multi, #12304
+- Corregido el ancho incorrecto de Dialog cuando se muestra a pantalla completa, #12203
+- Corregida la visualización incorrecta de Main en IE, #12237
+- Corregido el trigger de Input con dos validaciones de Form, #12260
+- Arreglado el añadir un nuevo nodo de árbol que causaba que los nodos desaparecieran, #12256
+- Arreglado el nodo Tree no se borraba después de arrastrar, #12279
+- Popover corregido porque no era visible cuando InputNumber no enfocaba, #12284
+- Añadido el atributo `popper-append-to-body` para Autocompletar, #12241
+- Añadido el modificador `sync` para el atributo `page-size` de Pagination, #12281
 
 ### 2.4.5
 
@@ -665,4 +700,4 @@
 
 # #
 
-<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>
+<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>
diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
@@ -1,5 +1,58 @@
 ## 更新日志
 
+### 1.4.26
+*2018-10-10*
+
+同步至Element-UI 2.4.8版本
+
+### 新特性
+
+- Dialog
+  - 新增 `opened` 事件，#12828
+- Form
+  - 新增 `slot-scope` 展示表单校验信息，#12715 （by @YamenSharaf）
+  - Form 的 validate 事件参数中新增校验的信息，#12860 （by @YamenSharaf）
+- Input
+  - 新增 `autocomplete` 属性，废弃 `auto-complete` 属性，#12514 （by @axetroy）
+
+### 修复
+
+- Cascader
+  - 修复 Input 未高亮的问题，#12341
+  - 修复选择值不正确的问题，#12508 （by @huangjinqiang）
+- ColorPicker
+  - 修复取色光标位置不正确的问题，#12376 （by @cnwhy）
+- DatePicker
+  - 修复未触发表单检验的问题，#12328，#12348
+  - 修复多选时报错的问题，#12347
+  - 修复选择时间时 spinner 位置不正确的问题，#12415 （by @rang-ali）
+  - 修复输入框自动填充的问题，#12521 （by @abdallanayer）
+  - 修复没有校验用户输入时间的合法性问题，#12898
+- Dropdown
+  - 修复 Dropdown 在 ButtonGroup 中样式问题，#12819 （by @bluejfox）
+- Form
+  - 修复Form在嵌套时 label 显示不正确的问题，#12748
+- Menu
+  - 调整 Submenu 的样式，#12457
+  - 修复 Submenu 选中后没有高亮的问题，#12479
+- Pagination
+  - 修复输入框值不正确的问题，#12525
+  - 调整触发事件的顺序，#12530
+- Select
+  - 修复在单选时 Input 高度变化的问题，#12719
+- Switch
+  - 修复Switch 聚焦时不显示轮廓，#12771
+- Table
+  - 修复 `filter` 不显示的问题，#12539
+  - 修复表头的 `render-header` 属性不生效的问题，#12914
+- Tab
+  - 修复 Tabpane 顺序不正确的问题，#12346
+  - 修复 TabNav 显示顺序不正确的问题，#12846
+  - 修复 Tabs 没有滑动到选中 tab 的问题，#12948
+- Tree
+  - 修复无法删除节点的问题，#12684
+  - 修复 Tree 节点在拖拽时标识符不显示的问题，#12854
+
 ### 1.4.25
 *2018-09-25*
 

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 ElemeFE
+Copyright (c) 2016-present ElemeFE
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 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
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 
 Fork自[element-ui](https://github.com/ElemeFE/element)
 
-**同步至Element-UI 2.4.6**
+**同步至Element-UI 2.4.8**
 
 基于Vue和Element UI，结合其他优秀组件库（[Ant Design](https://ant.design/index-cn)，[Material Deisgn](https://material.angular.io/)等)，加速业务级应用页面开发。
 

diff --git a/examples/docs/en-US/date-picker.md b/examples/docs/en-US/date-picker.md
@@ -66,8 +66,8 @@
         value10: '',
         value11: '',
         value12: '',
-        value13: [],
-        value14: []
+        value13: '',
+        value14: ''
       };
     }
   };
@@ -232,7 +232,7 @@ You can choose week, month, year or multiple dates by extending the standard dat
         value3: '',
         value4: '',
         value5: '',
-        value14: []
+        value14: ''
       };
     }
   };
@@ -463,7 +463,7 @@ When picking a date range, you can assign the time part for start date and end d
   export default {
     data() {
       return {
-        value13: []
+        value13: ''
       };
     }
   };

diff --git a/examples/docs/en-US/dialog.md b/examples/docs/en-US/dialog.md
@@ -147,7 +147,7 @@ The content of Dialog can be anything, even a table or a form. This example show
 <el-dialog title="Shipping address" :visible.sync="dialogFormVisible">
   <el-form :model="form">
     <el-form-item label="Promotion name" :label-width="formLabelWidth">
-      <el-input v-model="form.name" auto-complete="off"></el-input>
+      <el-input v-model="form.name" autocomplete="off"></el-input>
     </el-form-item>
     <el-form-item label="Zones" :label-width="formLabelWidth">
       <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
 | Event Name | Description | Parameters |
 |---------- |-------- |---------- |
 | open | triggers when the Dialog opens | — |
+| opened | triggers when the Dialog opening animation ends | — |
 | close | triggers when the Dialog closes | — |
 | closed | triggers when the Dialog closing animation ends | — |
diff --git a/examples/docs/en-US/form.md b/examples/docs/en-US/form.md
@@ -538,10 +538,10 @@ This example shows how to customize your own validation rules to finish a two-fa
 ```html
 <el-form :model="ruleForm2" status-icon :rules="rules2" ref="ruleForm2" label-width="120px" class="demo-ruleForm">
   <el-form-item label="Password" prop="pass">
-    <el-input type="password" v-model="ruleForm2.pass" auto-complete="off"></el-input>
+    <el-input type="password" v-model="ruleForm2.pass" autocomplete="off"></el-input>
   </el-form-item>
   <el-form-item label="Confirm" prop="checkPass">
-    <el-input type="password" v-model="ruleForm2.checkPass" auto-complete="off"></el-input>
+    <el-input type="password" v-model="ruleForm2.checkPass" autocomplete="off"></el-input>
   </el-form-item>
   <el-form-item label="Age" prop="age">
     <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
       { type: 'number', message: 'age must be a number'}
     ]"
   >
-    <el-input type="age" v-model.number="numberValidateForm.age" auto-complete="off"></el-input>
+    <el-input type="age" v-model.number="numberValidateForm.age" autocomplete="off"></el-input>
   </el-form-item>
   <el-form-item>
     <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
 | model| data of form component | object | — | — |
 | rules | validation rules of form | object | — | — |
 | inline | whether the form is inline | boolean | — | false |
-| label-position | position of label | string | left / right / top | right |
+| label-position | position of label. If set to 'left' or 'right', `label-width` prop is also required | string | left / right / top | right |
 | label-width | width of label, and all its direct child form items will inherit this value | string | — | — |
 | label-suffix | suffix of the label | string | — | — |
+| hide-required-asterisk | whether required fields should have a red asterisk (star) beside their labels | boolean | — | false |
 | show-message  | whether to show the error message | boolean | — | true |
 | inline-message  | whether to display the error message inline with the form item | boolean | — | false |
 | 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
 ### Form Events
 | Event Name | Description | Parameters |
 |----------- |------------ |----------- |
-| validate   | triggers after a form item is validated | prop name of the form item being validated, whether validation is passed |
+| 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 |
 
 ### Form-Item Attributes
 
@@ -879,9 +880,14 @@ All components in a Form inherit their `size` attribute from that Form. Similarl
 | — | content of Form Item |
 | label | content of label |
 
+### Form-Item Scoped Slot
+|      Name     | Description |
+|---------------|-------------|
+|      error    | Custom content to display validation message. The scope parameter is { error } |
+
 ### Form-Item Methods
 
 | Method | Description | Parameters |
 | ---- | ---- | ---- |
 | resetField | reset current field and remove validation result | — |
-| clearValidate | remove validation status of the field | -
+| clearValidate | remove validation status of the field | - |
diff --git a/examples/docs/en-US/i18n.md b/examples/docs/en-US/i18n.md
@@ -215,6 +215,7 @@ Currently Element ships with the following languages:
   <li>Kurdish (ku)</li>
   <li>Uighur (ug-CN)</li>
   <li>Khmer (km)</li>
+  <li>Serbian (sr)</li>
 </ul>
 
 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.
diff --git a/examples/docs/en-US/input.md b/examples/docs/en-US/input.md
@@ -654,7 +654,8 @@ Search data from server-side.
 | suffix-icon   | suffix icon class  | string          | — | — |
 |rows | number of rows of textarea, only works when `type` is 'textarea' | number | — | 2 |
 |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 |
-|auto-complete | same as `auto-complete` in native input | string | on/off | off |
+|autocomplete | same as `autocomplete` in native input | string | on/off | off |
+|auto-complete | @DEPRECATED in next major version | string | on/off | off |
 |name | same as `name` in native input | string | — | — |
 | readonly | same as `readonly` in native input | boolean | — | false |
 |max | same as `max` in native input | — | — | — |

diff --git a/examples/docs/en-US/message-box.md b/examples/docs/en-US/message-box.md
@@ -239,7 +239,7 @@ Prompt is used when user input is required.
           cancelButtonText: 'Cancel',
           inputPattern: /[\w!#$%&'*+/=?^_`{|}~-]+(?:\.[\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\w](?:[\w-]*[\w])?\.)+[\w](?:[\w-]*[\w])?/,
           inputErrorMessage: 'Invalid Email'
-        }).then(value => {
+        }).then(({ value }) => {
           this.$message({
             type: 'success',
             message: 'Your email is:' + value

diff --git a/examples/docs/en-US/quickstart.md b/examples/docs/en-US/quickstart.md
@@ -262,7 +262,7 @@ Now you have implemented Vue and Element to your project, and it's time to write
 
 ### Use Nuxt.js
 
-We can also start a project using [Nuxt.js](nuxtjs.org):
+We can also start a project using [Nuxt.js](https://nuxtjs.org/):
 
 <div class="glitch-embed-wrap" style="height: 420px; width: 100%;">
   <iframe src="https://glitch.com/embed/#!/embed/nuxt-with-element?path=nuxt.config.js&previewSize=0&attributionHidden=true" alt="nuxt-with-element on glitch" style="height: 100%; width: 100%; border: 0;"></iframe>

diff --git a/examples/docs/en-US/select.md b/examples/docs/en-US/select.md
@@ -670,7 +670,8 @@ If the binding value of Select is an object, make sure to assign `value-key` as
 | collapse-tags | whether to collapse tags to a text when multiple selecting | boolean | — | false |
 | multiple-limit | maximum number of options user can select when `multiple` is `true`. No limit when set to 0 | number | — | 0 |
 | name | the name attribute of select input | string | — | — |
-| auto-complete | the autocomplete attribute of select input | string | — | off |
+| autocomplete | the autocomplete attribute of select input | string | — | off |
+| auto-complete | @DEPRECATED in next major version | string | — | off |
 | placeholder | placeholder | string | — | Select |
 | filterable | whether Select is filterable | boolean | — | false |
 | allow-create | whether creating new items is allowed. To use this, `filterable` must be true | boolean | — | false |

diff --git a/examples/docs/en-US/upload.md b/examples/docs/en-US/upload.md
@@ -429,4 +429,5 @@ on-exceed | hook function when limit is exceeded | function(files, fileList) |
 | Methods Name | Description | Parameters |
 |---------- |-------- |---------- |
 | clearFiles | clear the uploaded file list (this method is not supported in the `before-upload` hook) | — |
-| abort | cancel upload request | （ file: fileList's item ） |
+| abort      | cancel upload request                    | （ file: fileList's item ） |
+| submit     | upload the file list manually            |  —                         |