Skip to content

Commit e3d7e0e

Browse files
bluejfoxbluejfox
committed
[Merged]同步ElementUI至2.4.0版本
Merge commit '0ba788b3a9b0978467f05aebe9de374b90af3d6c' into current * commit '0ba788b3a9b0978467f05aebe9de374b90af3d6c': (124 commits) Chore: update donation QR codes [release] 2.4.0 [build] 2.4.0 Chore: fix deploy-ci.sh (ElemeFE#11379) Changelog: update for 2.4.0 (ElemeFE#11378) Tree: fix markNodeData error when data is falsy (ElemeFE#11376) MessageBox: remove hidden class when using MessageBox twice (ElemeFE#11371) Table: retain currently selected row when sorting the table. (ElemeFE#11348) Tooltip: add min-width (ElemeFE#11335) Radio & Checkbox: replace cubic-bezier with ease-in (ElemeFE#11331) Autocomplete: fix suggestions data bug (ElemeFE#11323) Table: support manually sorting. Resolves ElemeFE#9495 (ElemeFE#11311) Radio: support switching radio with keyborard in ff. Fixes ElemeFE#8198 (ElemeFE#11325) Table: fix oversized filter list. Resolves ElemeFE#11314 (ElemeFE#11320) add support of tab penl lazy render(ElemeFE#11022) (ElemeFE#11167) ColorPicker: prevent active-change event when picker is closed (ElemeFE#11304) InputNumber: add precision attribute (ElemeFE#11281) Radio: prevent changing value when radio is disabled. resolves ElemeFE#11296 (ElemeFE#11303) Upload: fix Error when `beforeUpload` hook return promise of file object (ElemeFE#11297) Button: circle button supports size (ElemeFE#11275) ... # Conflicts: # .gitignore # CHANGELOG.zh-CN.md # README.md # build/bin/version.js # build/cooking.common.js # build/cooking.demo.js # build/deploy-ci.sh # build/deploy-faas.sh # examples/docs/en-US/quickstart.md # examples/docs/es/quickstart.md # examples/docs/zh-CN/quickstart.md # examples/versions.json # package.json # packages/input/src/input.vue # packages/table/src/table-body.js # packages/table/src/table-store.js # packages/theme-chalk/package.json # src/index.js # yarn.lock
2 parents 203a9c6 + 0ba788b commit e3d7e0e

File tree

170 files changed

+3337
-1832
lines changed

Some content is hidden

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

170 files changed

+3337
-1832
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ npm-debug.log.*
66
lerna-debug.log.*
77
lib
88
.idea
9+
.vscode
910
examples/setaria-ui
1011
examples/pages/en-US
1112
examples/pages/zh-CN

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
sudo: false
22
language: node_js
3-
node_js: stable
3+
node_js: lts/*
44
before_install:
55
- export CHROME_BIN=chromium-browser
66
- export DISPLAY=:99.0

‎CHANGELOG.en-US.md

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

3+
### 2.4.0 Fullerene
4+
5+
*2018-05-28*
6+
7+
#### New features
8+
- General
9+
- Dev tool and bundler is switched to native webpack, #11216
10+
- Now you can globally set the initial z-index of popups, #11257
11+
- Autocomplete
12+
- Added `hide-loading` attribute, #11260
13+
- Button
14+
- Now you can use the `size` attribute on circle buttons to control their sizes, #11275
15+
- InputNumber
16+
- Added `precision` attribute, #11281
17+
- Tabs
18+
- Added `before-leave` attribute, #11259
19+
- Added `lazy` attribute, #11167（by @Kingwl）
20+
- Table
21+
- Added `sort` method to manually sort the table, #11311
22+
23+
#### Bug fixes
24+
- Input
25+
- Fixed an issue that causes a re-render when using the Chinese IME to quickly input text, #11235 (by @STLighter)
26+
- Popover
27+
- Fixed the console error when the triggering element is Radio or Checkbox, #11265
28+
- Breadcrumb
29+
- Fixed the `to` attribute not supporting dynamic update, #11286
30+
- Upload
31+
- Fixed the console error when a File is resolved in the returned Promise of the `beforeUpload` method, #11297 (by @qusiba)
32+
- Tooltip
33+
- Fixed arrow not positioned correctly when content is empty, #11335
34+
- Autocomplete
35+
- Fixed incorrect input suggestions after deleting keyword quickly, #11323
36+
- ColorPicker
37+
- Fixed `active-change` event incorrectly triggering when picker dropdown is closed, #11304
38+
- Table
39+
- Fixed style error of oversized filter panel, #11314
40+
- Fixed currently selected row not retained when the table is sorted, #11348
41+
- Checkbox
42+
- Fixed single checkbox not supporting validation, #11271
43+
- Radio
44+
- Fixed disabled Radio still being selected when pressing space key, #11303
45+
- MessageBox
46+
- Fixed the `el-popup-parent--hidden` class not removed when opening MessageBox in succession, #11371
47+
48+
### 2.3.9
49+
50+
*2018-05-18*
51+
52+
- Fixed when the source data does not have the field specified by a TableColumn's `prop` attribute, an error would occur when the mouse moves into that column's cells, #11137
53+
- The `lockScroll` attribute of pop up components no longer adds an inline style to the parent element, but instead adds a class name, #11114
54+
- Fixed the icon of Progress not displaying when its `status` is exception, #11172
55+
- Fixed options' `disabled` attribute not working in filterable Cascader's filter result list, #11185
56+
- Fixed an issue where Table's expanded row cannot be collapsed if the data source is updated after its expansion, #11186
57+
- `setCurrentKey` of Tree now accepts `null` as its param to cancel the currently highlighted node, #11205
58+
59+
### 2.3.8
60+
61+
*2018-05-11*
62+
63+
- Fixed DatePicker panel jumping to the current month after picking a date in a non-current month when `type` is dates, #10973
64+
- Fixed clearable Input still displaying the clear icon when readonly, #10912
65+
- Fixed closing the DatePicker panel without changing the value incorrectly triggering the `change` event, #11017
66+
- Fixed keyboard navigation not working properly when Select has grouped options, #11058
67+
- Added `prefix` named slot for Select, #11063
68+
- Added 'clearValidate` method for FormItem, #11076
69+
- Added `checkOnClickNode` attribute for Tree, #11111
70+
71+
### 2.3.7
72+
73+
*2018-04-29*
74+
75+
- Fixed Table not updating its header widths when the scroll bar disappears due to filtering, #10834
76+
- Fixed clearable Input still showing the clear icon when its initial value is `null`, #10912
77+
- Fixed incorrect trigger of the `active-change` event after changing ColorPicker's binding value programatically, #10903 (by @zhangbobell)
78+
- Fixed filterable Select causing an infinite loop when navigating options using keyboard if all options are disabled, #10945
79+
80+
### 2.3.6
81+
82+
*2018-04-21*
83+
84+
- Fixed wrong behavior of Tree's `allow-drop` callback when `type` parameter is used, #10821
85+
- Now you can properly enter keywords in filterable single Select in IE11, #10822
86+
- Fixed single Select incorrectly triggering `blur` event after clicking an option, #10822
87+
88+
### 2.3.5
89+
90+
*2018-04-20*
91+
92+
- Fixed incorrect highlights in DatePicker panel when `type` is week, #10712
93+
- Fixed InputNumber being empty when its initial value is 0, #10714
94+
- Added `automatic-dropdown` attribute for Select, #10042 (by @Seebiscuit)
95+
- Fixed disabled Rate's value still being updated by navigation keys, #10726 (by @Richard-Choooou)
96+
- Now DatePicker's `type` attribute can be `'dates'`, where you can pick multiple dates in one picker, #10650 (by @Mini256)
97+
- Added `prev-click` and `next-click` events for Pagination, #10755
98+
- Added `pager-count` attribute for Pagination, #10493 (by @chongjohn716)
99+
- Added `type` as the 3rd param of Tree's `allow-drop` attribute callback, #10792
100+
- Now we use ResizeObserver to detect DOM element resizing, #10779
101+
3102
### 2.3.4
4103

5104
*2018-04-12*

‎CHANGELOG.es.md

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

3+
### 2.4.0 Fullerene
4+
5+
*2018-05-28*
6+
7+
#### New features
8+
- General
9+
- Dev tool and bundler is switched to native webpack, #11216
10+
- Now you can globally set the initial z-index of popups, #11257
11+
- Autocomplete
12+
- Added `hide-loading` attribute, #11260
13+
- Button
14+
- Now you can use the `size` attribute on circle buttons to control their sizes, #11275
15+
- InputNumber
16+
- Added `precision` attribute, #11281
17+
- Tabs
18+
- Added `before-leave` attribute, #11259
19+
- Added `lazy` attribute, #11167（by @Kingwl）
20+
- Table
21+
- Added `sort` method to manually sort the table, #11311
22+
23+
#### Bug fixes
24+
- Input
25+
- Fixed an issue that causes a re-render when using the Chinese IME to quickly input text, #11235 (by @STLighter)
26+
- Popover
27+
- Fixed the console error when the triggering element is Radio or Checkbox, #11265
28+
- Breadcrumb
29+
- Fixed the `to` attribute not supporting dynamic update, #11286
30+
- Upload
31+
- Fixed the console error when a File is resolved in the returned Promise of the `beforeUpload` method, #11297 (by @qusiba)
32+
- Tooltip
33+
- Fixed arrow not positioned correctly when content is empty, #11335
34+
- Autocomplete
35+
- Fixed incorrect input suggestions after deleting keyword quickly, #11323
36+
- ColorPicker
37+
- Fixed `active-change` event incorrectly triggering when picker dropdown is closed, #11304
38+
- Table
39+
- Fixed style error of oversized filter panel, #11314
40+
- Fixed currently selected row not retained when the table is sorted, #11348
41+
- Checkbox
42+
- Fixed single checkbox not supporting validation, #11271
43+
- Radio
44+
- Fixed disabled Radio still being selected when pressing space key, #11303
45+
- MessageBox
46+
- Fixed the `el-popup-parent--hidden` class not removed when opening MessageBox in succession, #11371
47+
48+
### 2.3.9
49+
50+
*2018-05-18*
51+
52+
- Corregido que cuando los datos de origen no tenian el campo especificado por el atributo `prop` de una TableColumn, se producía un error al moverse el ratón dentro de las celdas de esa columna, #11137.
53+
- El atributo `lockScroll` de los componentes pop-up ya no añade un inline style al elemento padre, sino que añade un nombre de clase, #1111114.
54+
- Arreglado el icono de Progreso que no se mostraba cuando su `status` era `exception`, #11172
55+
- El atributo `disabled` no funcionaba en la lista de resultados del filtro de Cascader, #11185
56+
- Se ha corregido un problema por el que la fila expandida de la Tabla no se podía contraer si los datos de origen se actualizaban después de su expansión, #11186.
57+
- `setCurrentKey` de Tree ahora acepta `null` como parámetro para cancelar el nodo actualmente resaltado, #11205
58+
59+
### 2.3.8
60+
61+
*2018-05-11*
62+
63+
- Corregido que el panel DatePicker saltaba al mes actual después de escoger una fecha en un mes diferente cuando el tipo era `dates`, #10973
64+
- Arreglado que el `clearable Input` seguía mostrando el icono de borrado cuando era sólo de lectura, #10912
65+
- Arreglado que al cerrar el panel DatePicker sin modificar el valor se desencadenaba incorrectamente el evento `change`, #11017
66+
- Arreglado que la navegación por el teclado no funcionaba correctamente cuando Select tenia opciones agrupadas, #11058
67+
- Agregado el `slot named` `prefix` para Select, #11063
68+
- Agregado el metodo `clearValidate` para FormItem, #11076
69+
- Agregado el atributo `checkOnClickNode` para Tree, #11111
70+
71+
### 2.3.7
72+
73+
*2018-04-29*
74+
75+
- Corregido que Table no actualizaba el ancho de encabezado cuando la barra de desplazamiento desaparecia debido al filtrado, #10834
76+
- Corregido input borrable que mostraba el icono de borrado cuando su valor inicial era `nulo`, #10912
77+
- Corregido el disparador incorrecto del evento `active-change` después de cambiar el valor enlazado de ColorPicker programáticamente, #10903 (por @zhangbobell)
78+
- Corregido filterable Select que causaba un bucle infinito al navegar por las opciones usando el teclado si todas las opciones estában deshabilitadas, #10945
79+
80+
### 2.3.6
81+
82+
*2018-04-21*
83+
84+
- Corregido el comportamiento incorrecto del callback `allow-drop` de Tree cuando se usaba el parámetro `type`, #10821
85+
- Ahora puede introducir correctamente las palabras clave en filterable Single Select en IE11, #10822
86+
- Corregido Single Select activaba incorrectamente el evento `blur` después de hacer clic en una opción, #10822
87+
88+
### 2.3.5
89+
90+
*2018-04-20*
91+
92+
- Arreglado los incorrectos realces en el panel de DatePicker cuando `type` es week, #10712
93+
- Arreglado que InputNumber comenzaba vacio cuando el valor inicial era 0, #10714
94+
- Agregado el atributo `automatic-dropdown` para Select, #10042 (by @Seebiscuit)
95+
- Arreglado que el valor del Rate pasaba a `disabled` cuando se comenzaba a actualizar con las teclas de navegacion, #10726 (by @Richard-Choooou)
96+
- Ahora el atributo `type` de DatePicker's puede ser `'dates'`, donde puede elegir varias fechas en un solo picker, #10650 (by @Mini256)
97+
- Agregados los eventos `prev-click` y `next-click` para Pagination, #10755
98+
- Agregado el atributo `pager-count` para Pagination, #10493 (by @chongjohn716)
99+
- Agregado `type` como 3rd parametro del atributo `allow-drop` de Tree, #10792
100+
- Ahora usamos ResizeObserver para detectar el redimensionamiento de elementos DOM, #10779
101+
3102
### 2.3.4
4103

5104
*2018-04-12*

‎CHANGELOG.zh-CN.md

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

3+
### 1.4.0
4+
*2018-05-29*
5+
6+
同步至Element-UI 2.4.0版本
7+
#### 新特性
8+
9+
- 综合
10+
- 使用原生 webpack 作为构建和打包工具，#11216
11+
- 可以全局配置弹出层的初始 z-index，#11257
12+
- Autocomplete
13+
- 新增 `hide-loading` 属性，#11260
14+
- Button
15+
- 现在圆形按钮也支持通过 `size` 属性改变其尺寸了，#11275
16+
- DatePicker
17+
- 现在 `type` 属性可以接收 `'dates'`，用于选择多个日期，#10650（by @Mini256）
18+
- FormItem
19+
- 新增 `clearValidate` 方法，#11076
20+
- InputNumber
21+
- 新增 `precision` 属性，#11281
22+
- Pagination
23+
- 新增 `prev-click` 和 `next-click` 事件，#10755
24+
- 新增 `pager-count` 属性，#10493（by @chongjohn716）
25+
- Select
26+
- 新增 `prefix` 具名 slot，#11063
27+
- 新增 `automatic-dropdown` 属性，#10042（by @Seebiscuit）
28+
- Table
29+
- 新增 `sort` 方法，支持手动排序，#11311
30+
- Tabs
31+
- 新增 `before-leave` 钩子，#11259
32+
- 新增 `lazy` 属性，#11167（by @Kingwl）
33+
- Tree
34+
- `setCurrentKey` 方法支持传入 `null`，可取消当前高亮的节点，#11205
35+
- `checkOnClickNode` 属性，#11111
36+
- 新增 `type` 作为 Tree 的 `allow-drop` 属性回调的第三个参数，#10792
37+
38+
#### 修复
39+
40+
- 综合
41+
- 弹出类组件的 `lockScroll` 属性不再为父元素添加内联样式，而是添加相应类名，#11114
42+
- 改用 ResizeObserver 对元素的尺寸变化进行监测，#10779
43+
- Autocomplete
44+
- 修复在快速删除搜索内容后输入建议不正确的问题，#11323
45+
- Breadcrumb
46+
- 修复 `to` 属性不支持动态更新的问题，#11286
47+
- Cascader
48+
- 修复可搜索的 Cascader 在输入关键词后，选项的 `disabled` 属性失效的问题，#11185
49+
- Checkbox
50+
- 修复单个 Checkbox 不支持表单验证的问题，#11271
51+
- ColorPicker
52+
- 修复关闭选色器时触发 `active-change` 事件的问题，#11304
53+
- 修复在通过代码改变 ColorPicker 的绑定值后错误地触发 `active-change` 事件的问题，#10903（by @zhangbobell）
54+
- DatePicker
55+
- 修复 `type` 为 dates 的 DatePicker 在选择非当前月的日期后，面板会跳转至当前月的问题，#10973
56+
- 修复范围选择的 DatePicker 在未改变值的情况下关闭下拉面板仍会触发 `change` 事件的问题，#11017
57+
- 修复 DatePicker 的 `type` 为 week 时面板错误高亮的问题，#10712
58+
- Input
59+
- 修复使用中文输入法快速输入文字时会导致视图重新渲染的问题，#11235（by @STLighter）
60+
- 修复可清空的只读 Input 仍会显示清空图标的问题，#10912
61+
- 修复可清空的 Input 在初始值为 `null` 时仍然显示清空图标的问题，#10912
62+
- InputNumber
63+
- 修复 InputNumber 初始值为 0 时输入框为空的问题，#10714
64+
- MessageBox
65+
- 修复连续打开两个 MessageBox 时 `el-popup-parent--hidden` 无法移除的问题，#11371
66+
- Popover
67+
- 修复当触发元素为 Radio 或 Checkbox 时控制台报错的问题，#11265
68+
- Progress
69+
- 修复在 `status` 为 exception 时图标不显示的问题，#11172
70+
- Radio
71+
- 修复通过空格可以选中被禁用的 Radio 的问题，#11303
72+
- Rate
73+
- 修复 `disabled` 的 Rate 仍能通过键盘左右键改变组件值的问题，#10726（by @Richard-Choooou）
74+
- Select
75+
- 修复 Select 在有分组选项时不能正确通过键盘导航的问题，#11058
76+
- 修复可搜索的 Select 在备选项均被禁用时，通过键盘导航会造成无限循环的问题，#10945
77+
- 修复可搜索的单选 Select 在 IE11 中无法输入搜索关键词的问题，#10822
78+
- 修复单选 Select 在使用鼠标选中某个选项后错误地触发 `blur` 事件的问题，#10822
79+
- Tooltip
80+
- 修复内容为空时箭头错位的问题，#11335
81+
- Table
82+
- 修复筛选列表过长导致样式超出的问题，#11314
83+
- 修复排序后导致无法正常显示选中行样式的问题，#11348
84+
- 修复当 TableColumn 的 `prop` 属性指定的字段在数据源中不存在时，鼠标移入该列单元格会报错的问题，#11137
85+
- 修复可展开的 Table 在展开某一行后更新数据源会造成该行无法收起的问题，#11186
86+
- 修复在由于筛选而使原有的滚动条消失后表头各列宽度未及时更新的问题，#10834
87+
- Tree
88+
- 修复 Tree 的 `allow-drop` 回调在使用 `type` 参数后的错误行为，#10821
89+
- Upload
90+
- 修复在 `beforeUpload` 方法返回的 Promise 中 resolve 一个 File 时控制台报错的问题，#11297（by @qusiba）
91+
392
### 1.3.4
493
*2018-05-04*
594

‎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.3.4**
6+
**同步至Element-UI 2.4.0**
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: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,10 @@ const install = function(Vue, opts = {}) {
2929
3030
Vue.use(Loading.directive);
3131
32-
const ELEMENT = {};
33-
ELEMENT.size = opts.size || '';
32+
Vue.prototype.$SETARIA = {
33+
size: opts.size || '',
34+
zIndex: opts.zIndex || 2000
35+
};
3436
3537
Vue.prototype.$loading = Loading.service;
3638
Vue.prototype.$msgbox = MessageBox;
@@ -40,7 +42,6 @@ const install = function(Vue, opts = {}) {
4042
Vue.prototype.$notify = Notification;
4143
Vue.prototype.$message = Message;
4244
43-
Vue.prototype.$ELEMENT = ELEMENT;
4445
};
4546
4647
/* istanbul ignore if */

‎build/bin/iconInit.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ nodes.forEach((node) => {
1717
}
1818
});
1919

20-
fs.writeFile(path.resolve(__dirname, '../../examples/icon.json'), JSON.stringify(classList));
20+
fs.writeFile(path.resolve(__dirname, '../../examples/icon.json'), JSON.stringify(classList), () => {});

‎build/bin/version.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ var fs = require('fs');
22
var path = require('path');
33
var version = process.env.VERSION || require('../../package.json').version;
44
var content = {};
5-
if (!content[version]) content[version] = '1.3';
5+
if (!content[version]) content[version] = '1.4';
66
fs.writeFileSync(path.resolve(__dirname, '../../examples/versions.json'), JSON.stringify(content));

‎build/cooking.common.js

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)