[Release]同步 Element UI 至2.4.2版本

Merge commit 'b4ec3069cca414b912b9939898b1a5fe5b76c3e8' into current

* commit 'b4ec3069cca414b912b9939898b1a5fe5b76c3e8': (59 commits)
  [release] 2.4.2
  Changelog: update for 2.4.2
  Loading: add missing definition of directive (ElemeFE#11749)
  DatePicker: guards common but incorrect usage (ElemeFE#11673)
  Chore: eslint ignore font files (ElemeFE#11696)
  Tabs: add activeName and oldActiveName parameters to before-leave hook (ElemeFE#11713)
  i18n: update ee.js (ElemeFE#11709)
  Select: remove empty option item when default value is null in single mode (ElemeFE#11731)
  Docs: fix link of element react (ElemeFE#11718)
  Table: fix highlightCurrentRow regression (ElemeFE#11691)
  Select: fix form change validation (ElemeFE#11672)
  Chore: add missing file when create new component (ElemeFE#11663)
  Menu: fix open method error when collapse is changed (ElemeFE#11646)
  Autocomplete: passes id to nested native input (ElemeFE#11643)
  Chore: delete unused file (ElemeFE#11641)
  Pagination: use setCurrentValue when reassigning input value (ElemeFE#11608)
  Tree: optimize not-allowed dropping cursor (ElemeFE#11631)
  Cascader: close when option clicked (ElemeFE#11623)
  Table: fix class-name & label-class-name prop not reactive (ElemeFE#11626)
  Pagination: add size to nested select (ElemeFE#11622)
  ...

# Conflicts:
#	CHANGELOG.zh-CN.md
#	README.md
#	build/bin/new.js
#	examples/app.vue
#	examples/docs/zh-CN/dialog.md
#	examples/nav.config.json
#	examples/versions.json
#	package.json
#	packages/dialog/src/component.vue
#	packages/tabs/src/tabs.vue
#	packages/theme-chalk/package.json
#	packages/upload/src/index.vue
#	src/index.js
#	test/unit/specs/sync.spec.js

Author: bluejfox

.eslintignore

@@ -7,3 +7,5 @@ lib
 coverage
 *.md
 *.scss
+*.woff
+*.ttf

.github/CONTRIBUTING.en-US.md

@@ -50,7 +50,7 @@ npm run dist
 ```
 
 ## Component Developing Guidelines
-- Run `make new <component-name>` to create project directory for a new component. Test codes, entry file, cooking config, documentation and `package.json` are included.
+- Run `make new <component-name>` to create project directory for a new component. Test codes, entry file and documentation are included.
 - Refer to `Button` for nested components.
 - Refer to `Select` for components that depend on other components.
 

.github/CONTRIBUTING.es.md

@@ -55,7 +55,7 @@ npm run dist
 ```
 
 ## Guía Para Desarrollo de Componentes
-- Corra el comando `make new <component-name>` para crear el directorio de su proyecto para un componente nuevo. Verifique su código fuente test, configuración para armar, documentación y `package.json` están incluidos.
+- Corra el comando `make new <component-name>` para crear el directorio de su proyecto para un componente nuevo. Verifique su código fuente test, archivo de entrada y documentación están incluidos.
 - Refiérase al `Button` para componentes anidados.
 - Refiérase al `Select` para componentes que dependen de otros componentes.
 

.github/CONTRIBUTING.zh-CN.md

@@ -48,7 +48,7 @@ npm run dist
 ```
 
 ## 组件开发规范
-- 通过 `make new` 创建组件目录结构，包含测试代码、入口文件、cooking 配置、package.json、文档
+- 通过 `make new` 创建组件目录结构，包含测试代码、入口文件、文档
 - 如果包含父子组件，需要更改目录结构，参考 `Button`
 - 组件内如果依赖了其他组件，需要在当前组件内引入，参考 `Select`
 

CHANGELOG.en-US.md

@@ -1,5 +1,36 @@
 ## Changelog
 
+### 2.4.2
+
+*2018-06-26*
+
+- Now `class-name` and `label-class-name` of Table are reactive, #11626
+- Fixed Table still highlighting clicked row when `highlight-current-row` is `false`, #11646
+- Fixed a style bug of ButtonGroup when it has only one `round` or `circle` Button, #11605
+- Fixed style of page size Select of Pagination, #11622
+- Fixed Menu's `open` method error when `collapse` is dynamically changed, #11646
+- Added `activeName` and `oldActiveName` parameters to the before-leave hook of Tabs, #11713
+- Fixed Cascader focused after outside clicked, #11588
+- Fixed Cascader not closing when option is clicked when `change-on-select` is true, #11623
+- Now updating Select's value programmatically will trigger form validation, #11672
+
+### 2.4.1
+
+*2018-06-08*
+
+- Removed Autocomplete's duplicate type declaration, #11388
+- Fixed Select's dropdown arrow style in FireFox when nested in Form, #11427
+- Fixed clear icon of Select still showing when the initial value is `null`, #11460
+- Fixed disabled radio showing box-shadow when clicked, #11462
+- Added `iconClass` attribute for MessageBox, #11499
+- Added `stretch` attribute for Tabs, #11476
+- Fixed rendering order issue of TabPane when Tabs is `lazy`, #11461
+- Fixed Table not retaining current highlight row when expanded, #11464
+- Fixed focusing state when `before-leave` returns a resolved promise, #11386
+- Fixed disabled Popover still creating poppers, #11426
+- Fixed Tree's endless loop when a new node is added in lazy mode, #11430 (by @wangjingf)
+- Added `closed` event for Dialog, #11490
+
 ### 2.4.0 Fullerene
 
 *2018-05-28*

CHANGELOG.es.md

@@ -1,49 +1,80 @@
 ## Changelog
 
+### 2.4.2
+
+*2018-06-26*
+
+- Now `class-name` and `label-class-name` of Table are reactive, #11626
+- Fixed Table still highlighting clicked row when `highlight-current-row` is `false`, #11646
+- Fixed a style bug of ButtonGroup when it has only one `round` or `circle` Button, #11605
+- Fixed style of page size Select of Pagination, #11622
+- Fixed Menu's `open` method error when `collapse` is dynamically changed, #11646
+- Added `activeName` and `oldActiveName` parameters to the before-leave hook of Tabs, #11713
+- Fixed Cascader focused after outside clicked, #11588
+- Fixed Cascader not closing when option is clicked when `change-on-select` is true, #11623
+- Now updating Select's value programmatically will trigger form validation, #11672
+
+### 2.4.1
+
+*2018-06-08*
+
+- Removida la declaración duplicada de type en Autocompletar, #11388
+- Corregido el estilo de flecha en el dropdown de Select en FireFox cuando se anidaba en el formulario, #11427
+- Corregido que el ícono `clear` de Select seguia apareciendo cuando el valor inicial era `null`, #11460
+- Arreglado que cuando el radio estaba `disabled` mostraba el box-shadow al hacer click, #11462
+- Añadido el atributo `iconClass` para MessageBox, #11499
+- Añadido el atributo `stretch` para Tabs, #11476
+- Arreglado el problema de orden de renderizado de TabPane cuando Tabs es `lazy`, #11461
+- Arreglado que Table no retenia la fila actual de resaltados cuando se expandia, #11464
+- Arreglado que  focusing state cuando `before-leave` devolvia una promesa resuelta, #11386
+- Arreglado que Popover deshabilitado seguia creando poppers, #11426
+- Arreglado el bucle sin fin de Tree cuando se añadia un nuevo nodo en modo `lazy`, #11430 (por @wangjingf)
+- Añadido el evento `closed` para Dialog, #11490
+
 ### 2.4.0 Fullerene
 
 *2018-05-28*
 
-#### New features
-- General
-  - Dev tool and bundler is switched to native webpack, #11216
-  - Now you can globally set the initial z-index of popups, #11257
+#### Nuevas características
+- Generalidades
+  - La herramienta de desarrollo y el empaquetador se cambiaron a webpack nativo, #11216
+  - Ahora puede configurar globalmente el z-index inicial de los popups, #11257
 - Autocomplete
-  - Added `hide-loading` attribute, #11260
+  - Añadido el atributo `hide-loading`, #11260
 - Button
-  - Now you can use the `size` attribute on circle buttons to control their sizes, #11275
+  - Ahora se puede usar el atributo `size` en los botones circulares para controlar sus tamaños, #11275
 - InputNumber
-  - Added `precision` attribute, #11281
+  - Añadido el atributo `precision`, #11281
 - Tabs
-  - Added `before-leave` attribute, #11259
-  - Added `lazy` attribute, #11167（by @Kingwl）
+  - Añadido el atributo `before-leave`, #11259
+  - Añadido el atributo `lazy`, #11167（by @Kingwl）
 - Table
-  - Added `sort` method to manually sort the table, #11311
+  - Añadido el método `sort` para ordenar manualmente la tabla, #11311
 
-#### Bug fixes
+#### Corrección de errores
 - Input
-  - Fixed an issue that causes a re-render when using the Chinese IME to quickly input text, #11235 (by @STLighter)
+  - Se ha corregido un problema que provocaba que se volviera a procesar al utilizar el IME chino para introducir texto rápidamente, #11235 (por @STLighter).
 - Popover
-  - Fixed the console error when the triggering element is Radio or Checkbox, #11265
+  - Corregido el error de la consola cuando el elemento disparador es Radio o Checkbox, #11265
 - Breadcrumb
-  - Fixed the `to` attribute not supporting dynamic update, #11286
+  - Arreglado el atributo `to` que no soportaba la actualización dinámica, #11286
 - Upload
-  - Fixed the console error when a File is resolved in the returned Promise of the `beforeUpload` method, #11297 (by @qusiba)
+  - Corregido el error de la consola cuando se resolvia el Archivo en la Promesa devuelta del método `beforeUpload`, #11297 (por @qusiba)
 - Tooltip
-  - Fixed arrow not positioned correctly when content is empty, #11335
-- Autocomplete
-  - Fixed incorrect input suggestions after deleting keyword quickly, #11323
+  - Solucionado que la flecha no se  posicionaba correctamente cuando el contenido estaba vacío, #11335
+- Autocompletar
+  - Corregido que  las sugerencias de entrada eran  incorrectas después de eliminar la palabra clave rápidamente, #11323
 - ColorPicker
-  - Fixed `active-change` event incorrectly triggering when picker dropdown is closed, #11304
+  - Corregido el evento `active-change` que se disparaba incorrectamente cuando el menú desplegable del picker estaba cerrado, #11304
 - Table
-  - Fixed style error of oversized filter panel, #11314
-  - Fixed currently selected row not retained when the table is sorted, #11348
-- Checkbox
-  - Fixed single checkbox not supporting validation, #11271
+  - Corregido el error de estilo del panel de filtro cuando se sobredimensionaba, #11314
+  - Corregida que la fila seleccionada actualmente no se retenia cuando se ordenaba la tabla, #11348
+- CheckBox
+  - Arreglado que cuando el checkbox era único no soportaba validación, #11271
 - Radio
-  - Fixed disabled Radio still being selected when pressing space key, #11303
+  - Arreglado que el Radio desactivado seguia estando seleccionada cuando se pulsaba la tecla espaciadora, #11303
 - MessageBox
-  - Fixed the `el-popup-parent--hidden` class not removed when opening MessageBox in succession, #11371
+  - Corregida la clase `el-popup-parent--hidden` que no se eliminaba al abrir MessageBox sucesivamente, #11371
 
 ### 2.3.9
 

CHANGELOG.zh-CN.md

@@ -1,5 +1,51 @@
 ## 更新日志
 
+### 1.4.3
+*2018-07-03*
+
+同步至Element-UI 2.4.2版本
+
+#### 新特性
+
+- Dialog
+  - 新增 `closed` 事件，#11490
+- MessageBox
+  - 新增 `iconClass` 属性
+- Tabs
+  - 新增 `stretch` 属性
+  - Tabs 的 `before-leave` 钩子添加了 `activeName` 和 `oldActiveName` 参数，#11713
+
+#### 修复：
+
+- Autocomplete
+  - 移除 Autocomplete 的重复类型声明
+- ButtonGroup
+  - 修复 ButtonGroup 中只有一个 `round` 或 `circle` 的 Button 时的样式错误，#11605
+- Cascader
+  - 修复在 `change-on-select` 状态下点击选项不关闭的问题，#11623
+  - 修复 Cascader 关闭后的聚焦问题，#11588
+- Menu
+  - 修复 `collapse` 属性变化后无法使用 `open` 方法的问题，#11646
+- Pagination
+  - 修复在某些情况下 Pagination 的条目数选择器的样式错误，#11622
+- Popover
+  - 修复禁用状态下创建弹出框的问题，#11426
+- Radio
+  - 修复禁用的 Radio 在点击时显示 box-shadow 的问题，#11462
+- Select
+  - 修复初始值为 `null` 时仍然显示清除图标的问题，#11460
+  - 修复嵌套在 Form 内的 Select 在 FireFox 浏览器中下拉箭头错位的问题，#11427
+  - 现在通过代码改变 Select 的值后会触发表单校验，与 Input 行为一致，#11672
+- Table
+  - 修复展开行时无法保留选中行样式的问题，#11464
+  - 修复 Table 在 `highlight-current-row` 为 `false` 时点击行也会触发高亮的问题，#11691 #11563
+  - 修复 Table 的 `class-name` 和 `label-class-name` 属性不支持动态更新的问题，#11626
+- Tabs
+  - 修复调用 `before-leave` 并返回 Promise 的时候，Tabs 会存在 focus 状态的问题，#11386
+  - 修复开启 `lazy` 时渲染顺序异常的问题，#11461
+- Tree
+  - 修复在懒加载状态下添加新节点造成无限循环的问题，#11430 （by @wangjingf）
+
 ### 1.4.2
 *2018-06-01*
 

Makefile

@@ -26,18 +26,12 @@ new-lang:
 dist: install
 	npm run dist
 
-dist-all:
-	npm run dist:all
-
 deploy:
 	@npm run deploy
 
 pub:
 	npm run pub
 
-pub-all:
-	npm run pub:all
-
 test:
 	npm run test:watch
 
@@ -47,8 +41,6 @@ help:
 	@echo "   \033[35mmake new <component-name> [中文名]\033[0m\t---  创建新组件 package. 例如 'make new button 按钮'"
 	@echo "   \033[35mmake dev\033[0m\t\033[0m\t\033[0m\t\033[0m\t---  开发模式"
 	@echo "   \033[35mmake dist\033[0m\t\033[0m\t\033[0m\t\033[0m\t---  编译项目，生成目标文件"
-	@echo "   \033[35mmake dist-all\033[0m\t\033[0m\t\033[0m\t---  分别编译每个组件项目"
 	@echo "   \033[35mmake deploy\033[0m\t\033[0m\t\033[0m\t\033[0m\t---  部署 demo"
 	@echo "   \033[35mmake pub\033[0m\t\033[0m\t\033[0m\t\033[0m\t---  发布到 npm 上"
-	@echo "   \033[35mmake pub-all\033[0m\t\033[0m\t\033[0m\t\033[0m\t---  发布各组件到 npm 上"
 	@echo "   \033[35mmake new-lang <lang>\033[0m\t\033[0m\t\033[0m\t---  为网站添加新语言. 例如 'make new-lang fr'"

README.md

@@ -3,17 +3,19 @@
 
 Fork自[element-ui](https://github.com/ElemeFE/element)
 
-**同步至Element-UI 2.4.0**
+**同步至Element-UI 2.4.2**
 
 基于Vue和Element UI，结合其他优秀组件库（[Ant Design](https://ant.design/index-cn)，[Material Deisgn](https://material.angular.io/)等)，加速业务级应用页面开发。
 
 ## Feature
-* [New]JSON Schema Dynamic Form [链接](https://bluejfox.github.io/setaria-ui/#/zh-CN/component/dynamic-form)
-* [New]Enterprise Base Search Template [链接](https://bluejfox.github.io/setaria-ui/#/zh-CN/component/template-base-search)
-* [New]List [链接](https://bluejfox.github.io/setaria-ui/#/zh-CN/component/list)
-* [New]JsonViewer [链接](https://bluejfox.github.io/setaria-ui/#/zh-CN/component/json-viewer)
-* [Update]Card [链接](https://bluejfox.github.io/setaria-ui/#/zh-CN/component/card)
-_增加标签支持_
+- [New]JSON Schema Dynamic Form [链接](https://bluejfox.github.io/setaria-ui/#/zh-CN/component/dynamic-form)
+- [New]Enterprise Base Search Template [链接](https://bluejfox.github.io/setaria-ui/#/zh-CN/component/template-base-search)
+- [New]List [链接](https://bluejfox.github.io/setaria-ui/#/zh-CN/component/list)
+- [New]JsonViewer [链接](https://bluejfox.github.io/setaria-ui/#/zh-CN/component/json-viewer)
+- [Update]Card [链接](https://bluejfox.github.io/setaria-ui/#/zh-CN/component/card)
+  - 支持标签
+- [Update]Dialog [链接](https://bluejfox.github.io/setaria-ui/#/zh-CN/component/dialog)
+  - 支持拖动
 
 ## Install
 ```shell

build/bin/build-all.js

@@ -28,34 +28,6 @@ ${ComponentName}.install = function(Vue) {
 };
 
 export default ${ComponentName};`
-  },
-  {
-    filename: 'cooking.conf.js',
-    content: `var cooking = require('cooking');
-var gen = require('../../build/gen-single-config');
-
-cooking.set(gen(__dirname, 'El${ComponentName}'));
-
-module.exports = cooking.resolve();
-`
-  },
-  {
-    filename: 'package.json',
-    content: `{
-  "name": "setaria-${componentname}",
-  "version": "0.0.0",
-  "description": "A ${componentname} component for Vue.js.",
-  "keywords": [
-    "setaria",
-    "vue",
-    "component"
-  ],
-  "main": "./lib/index.js",
-  "repository": "https://github.com/bluejfox/setaria-ui/tree/master/packages/${componentname}",
-  "author": "elemefe",
-  "license": "MIT",
-  "dependencies": {}
-}`
   },
   {
     filename: 'src/main.vue',
@@ -94,6 +66,22 @@ describe('${ComponentName}', () => {
   });
 });
 `
+  },
+  {
+    filename: path.join('../../packages/theme-chalk/src', `${componentname}.scss`),
+    content: `@import "mixins/mixins";
+@import "common/var";
+
+@include b(${componentname}) {
+}`
+  },
+  {
+    filename: path.join('../../types', `${componentname}.d.ts`),
+    content: `import { SetariaUIComponent } from './component'
+
+/** ${ComponentName} Component */
+export declare class El${ComponentName} extends SetariaUIComponent {
+}`
   }
 ];
 

build/bin/new.js

@@ -9,7 +9,7 @@
         <a href="https://github.com/ElementUI/element-starter" class="footer-main-link" target="_blank">{{ langConfig.starter }}</a>
         <a href="https://github.com/ElementUI/element-theme" class="footer-main-link" target="_blank">{{ langConfig.theme }}</a>
         <a href="https://github.com/ElementUI/theme-chalk-preview" class="footer-main-link" target="_blank">{{ langConfig.preview }}</a>
-        <a href="https://github.com/eleme/element-react" class="footer-main-link" target="_blank">Element-React</a>
+        <a href="https://github.com/elemefe/element-react" class="footer-main-link" target="_blank">Element-React</a>
         <a href="https://github.com/ElemeFE/element-angular" class="footer-main-link" target="_blank">Element-Angular</a>
       </div>
       <div class="footer-main">

examples/components/footer.vue

@@ -310,3 +310,4 @@ If the variable bound to `visible` is managed in Vuex store, the `.sync` can not
 |---------- |-------- |---------- |
 | open | triggers when the Dialog opens | — |
 | close | triggers when the Dialog closes | — |
+| closed | triggers when the Dialog closing animation ends | — |

examples/docs/en-US/dialog.md

@@ -382,6 +382,7 @@ The corresponding methods are: `MessageBox`, `MessageBox.alert`, `MessageBox.con
 | message | content of the MessageBox | string | — | — |
 | dangerouslyUseHTMLString | whether `message` is treated as HTML string | boolean | — | false |
 | type | message type, used for icon display | string | success / info / warning / error | — |
+| iconClass | custom icon's class, overrides `type` | string | — | — |
 | customClass | custom class name for MessageBox | string | — | — |
 | callback | MessageBox closing callback if you don't prefer Promise | function(action), where action can be 'confirm' or 'cancel', and `instance` is the MessageBox instance. You can access to that instance's attributes and methods | — | — |
 | showClose | whether to show close icon of MessageBox | boolean | — | true |

examples/docs/en-US/message-box.md

@@ -376,7 +376,8 @@ Only card type Tabs support addable & closeable.
 | editable  | whether Tab is addable and closable | boolean   | — |  false  |
 | value  | name of the selected tab  | string   |  —  |  name of first tab |
 | tab-position  | position of tabs | string   |  top/right/bottom/left  |  top |
-| before-leave | hook function before switching tab. If `false` is returned or a `Promise` is returned and then is rejected, switching will be prevented | function | — | — |
+| stretch  | whether width of tab automatically fits its container | boolean   |  -  |  false |
+| before-leave | hook function before switching tab. If `false` is returned or a `Promise` is returned and then is rejected, switching will be prevented | Function(activeName, oldActiveName) | — | — |
 
 ### Tabs Events
 | Event Name | Description | Parameters |