Skip to content

Commit b23c9b1

Browse files
committed
Merge branch 'dev' of https://github.com/MBearo/element into dev
2 parents 4630058 + 93e0a43 commit b23c9b1

Some content is hidden

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

43 files changed

+488
-104
lines changed

CHANGELOG.en-US.md

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

3+
### 2.12.0
4+
5+
*2019-08-29*
6+
7+
#### New features
8+
9+
- Popover
10+
- Add close-delay prop (#16671 by @LachlanStuart)
11+
- Theme
12+
- Add Chrome Extension: Element Theme Extension (#16686 by @iamkun)
13+
- Icon
14+
- Add font-display to @font-face declaration (#16805 by @iamfaizalandyka)
15+
16+
#### Bug fixes
17+
18+
- Carousel
19+
- Fix onChange emit value (#16705 by @iamkun)
20+
- Notification
21+
- Fix modifying incoming option object (#16704 by @iamkun)
22+
- DatePicker
23+
- Add className for picker option (#16632 by @iamkun)
24+
- DateTimePicker
25+
- Fix time-spinner not scroll to right position (#16854 by @jesse-li)
26+
- Table
27+
- Prevent click handler after drag (#16850 by @ziyoung)
28+
- Fix chrome crash when set thead css display to none (#16956 by @luckyCao)
29+
- Fix wrong empty block height (#16861 by @ziyoung)
30+
- Not throw error when calling toggleExpansion (#16304 by @yyjjqq94)
31+
- Not trigger sort-change event when mounted (#17113 by @a631807682)
32+
- Fix setCurrentRow unable to clear highlight row (#16879 by @ziyoung)
33+
- Fix expand-row-keys not work when data is loaded asynchronously (#16899 by @ziyoung)
34+
- set toggleAllSelection as instance property (#17137 by @ziyoung)
35+
- Tree
36+
- Fix distance between label and checkbox (#16799 by @Hazlank)
37+
- Tabs
38+
- Fix incorrect TabItem's position (#16520 by @victorting)
39+
- Fix activated tab is out of visual range bug (#17033 by @nullptru)
40+
- Calendar
41+
- Fix weekdays i18n issue (#16772 by @ubitoffee)
42+
- fix locale error (#17208 by @iamkun)
43+
- Cascader
44+
- Fix CascaderPanel display error (#16716 by @zhangHongEn)
45+
- Fix disable status and close button issue (#16224 by @yyjjqq94)
46+
- Input
47+
- Fix Korean composition event (#15069 by @MoonHyuk)
48+
- Fix click event of clear button not trigger when using v-loading (#16576 by @a631807682)
49+
- Select
50+
- Not toggle dropdown when filtering (#17205 by @luckyCao)
51+
- Transfer
52+
- Fix style error (#17206 by @iamkun)
53+
- Dialog
54+
- update sass var (#16365 by @haoranyu)
55+
- RadioGroup
56+
- Not produce invalid HTML in table if "is" attribute is specify (#17070 by @nullptru)
57+
- Divider
58+
- Support custom classes (#17078 by @island205)
59+
60+
#### Optimization
61+
62+
- Checkbox
63+
- Improve screen reader experience (#16575 by @tylertrotter)
64+
- Docs
65+
- Update changelog (#16773 by @SimonaliaChen)
66+
- Update contributing guide (#14800 by @sinchang)
67+
- Fix typo in Drawer docs (#16848 by @winkay)
68+
- Update custom theme (#16983 by @iamkun)
69+
- Add Esperanto translation (#16955 by @maxkoryukov)
70+
- Update input-number document about change event (#16316 by @luckyCao)
71+
- Update spanish doc 2.11.1 (#16961 by @Gonzalo2310)
72+
- I18n
73+
- Remove translation of 'year' in catalan language as in the other languages (#14722 by @oscaralbareda)
74+
- Update spanish changelog 2.10.0 and 2.10.1 (#16548 by @Gonzalo2310)
75+
- Update ar.js (#16653 by @l3op)
76+
- Test
77+
- Correct spelling error (#16672 by @boomler)
78+
- Refactor unit test to use data-uri (#16847 by @a631807682)
79+
- Types
80+
- Fix httprequest type (#16633 by @luckyCao)
81+
382
### 2.11.1
483

584
*2019-07-26*

CHANGELOG.es.md

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

3+
### 2.12.0
4+
5+
*2019-08-29*
6+
7+
#### Nuevas características
8+
9+
- Popover
10+
- Agregada la prop close-delay (#16671 by @LachlanStuart)
11+
- Theme
12+
- Añadida la extensión Chrome: Element Theme Extensión (#16686 by @iamkun)
13+
- Icon
14+
- Añadido font-display a la declaración @font-face (#16805 by @iamfaizalandyka)
15+
16+
#### Corrección de errores
17+
18+
- Carousel
19+
- Corregido el valor emitido por onChange (#16705 by @iamkun)
20+
- Notification
21+
- Corrección de la modificación del objeto de opción entrante (#16704 by @iamkun)
22+
- DatePicker
23+
- Agregado el className para la opción picker (#16632 by @iamkun)
24+
- DateTimePicker
25+
- Corrección del time-spinner que no se desplazaba a la posición correcta (#16854 by @jesse-li)
26+
- Table
27+
- Evitar la propagación del click después del arrastre (#16850 by @ziyoung)
28+
- Corregido una error en chrome que se producía cuando el css de thead tenia display: none (#16956 by @luckyCao)
29+
- Corregida la altura incorrecta de los bloques vacíos (#16861 by @ziyoung)
30+
- No hay lanzamiento de error cuando se llama a toggleExpansion (#16304 by @yyjjqq94)
31+
- No se lanza el evento sort-change cuando esta montado (#17113 by @a631807682)
32+
- Corregido que el setCurrentRow no borraba la linea resaltada (#16879 by @ziyoung)
33+
- Corregido que expand-row-keys no funcionaba cuando los datos eran cargados asincrónicamente (#16899 by @ziyoung)
34+
- Establecido toggleAllSelection como propiedad instanciada (#17137 by @ziyoung)
35+
- Tree
36+
- Corregida la distancia entre label y checkbox (#16799 by @Hazlank)
37+
- Tabs
38+
- Corregida la posición incorrecta de los item's del Tab (#16520 by @victorting)
39+
- Corregido el error de que la pestaña activada estaba fuera del rango visual (#17033 by @nullptru)
40+
- Calendar
41+
- Arreglado el problema de los días de la semana con i18n (#16772 by @ubitoffee)
42+
- Corregido el error de localización (#17208 by @iamkun)
43+
- Cascader
44+
- Corregido un error de visualización del CascaderPanel (#16716 by @zhangHongEn)
45+
- Corregido el problema de disable status y close button (#16224 by @yyjjqq94)
46+
- Input
47+
- Arreglado el evento de composición coreana (#15069 by @MoonHyuk)
48+
- Arreglado el evento click del botón clear que no se lanzaba cuando se usaba v-loading (#16576 by @a631807682)
49+
- Select
50+
- No cambiaba el dropdown cuando se filtraba (#17205 by @luckyCao)
51+
- Transfer
52+
- Arreglado un error de estilo (#17206 by @iamkun)
53+
- Dialog
54+
- Actualizada las variables Sass (#16365 by @haoranyu)
55+
- RadioGroup
56+
- No produce HTML invalido en la tabla si el atributo 'is' es especificado (#17070 by @nullptru)
57+
- Divider
58+
- Soporta clases personalizadas (#17078 by @island205)
59+
60+
#### Optimización
61+
62+
- Checkbox
63+
- Mejorada la experiencia del lector de pantalla (#16575 by @tylertrotter)
64+
- Docs
65+
- Actualizado changelog (#16773 by @SimonaliaChen)
66+
- Actualizada la guía de contribución (#14800 by @sinchang)
67+
- Arreglado typo en la documentación de Drawer (#16848 by @winkay)
68+
- Actualizado el tema personalizado (#16983 by @iamkun)
69+
- Agregada traducción en Esperanto (#16955 by @maxkoryukov)
70+
- Actualizada la documentación de input-number sobre el evento change (#16316 by @luckyCao)
71+
- Actualizada la documentación en Español 2.11.1 (#16961 by @Gonzalo2310)
72+
- I18n
73+
- Eliminada la traducción de 'year' en idioma Catalán como en otros idiomas (#14722 by @oscaralbareda)
74+
- Actualizado el changelog de las versiones 2.10.0 y 2.10.1 en Español (#16548 by @Gonzalo2310)
75+
- Actualizado ar.js (#16653 by @l3op)
76+
- Test
77+
- Corregir error ortográfico (#16672 by @boomler)
78+
- Refractorizacion del unit test para usar data-uri (#16847 by @a631807682)
79+
- Types
80+
- Corrección del tipo httprequest (#16633 by @luckyCao)
81+
382
### 2.11.1
483

584
*2019-07-26*

CHANGELOG.fr-FR.md

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

3+
### 2.12.0
4+
5+
*2019-08-29*
6+
7+
#### New features
8+
9+
- Popover
10+
- Add close-delay prop (#16671 by @LachlanStuart)
11+
- Theme
12+
- Add Chrome Extension: Element Theme Extension (#16686 by @iamkun)
13+
- Icon
14+
- Add font-display to @font-face declaration (#16805 by @iamfaizalandyka)
15+
16+
#### Bug fixes
17+
18+
- Carousel
19+
- Fix onChange emit value (#16705 by @iamkun)
20+
- Notification
21+
- Fix modifying incoming option object (#16704 by @iamkun)
22+
- DatePicker
23+
- Add className for picker option (#16632 by @iamkun)
24+
- DateTimePicker
25+
- Fix time-spinner not scroll to right position (#16854 by @jesse-li)
26+
- Table
27+
- Prevent click handler after drag (#16850 by @ziyoung)
28+
- Fix chrome crash when set thead css display to none (#16956 by @luckyCao)
29+
- Fix wrong empty block height (#16861 by @ziyoung)
30+
- Not throw error when calling toggleExpansion (#16304 by @yyjjqq94)
31+
- Not trigger sort-change event when mounted (#17113 by @a631807682)
32+
- Fix setCurrentRow unable to clear highlight row (#16879 by @ziyoung)
33+
- Fix expand-row-keys not work when data is loaded asynchronously (#16899 by @ziyoung)
34+
- set toggleAllSelection as instance property (#17137 by @ziyoung)
35+
- Tree
36+
- Fix distance between label and checkbox (#16799 by @Hazlank)
37+
- Tabs
38+
- Fix incorrect TabItem's position (#16520 by @victorting)
39+
- Fix activated tab is out of visual range bug (#17033 by @nullptru)
40+
- Calendar
41+
- Fix weekdays i18n issue (#16772 by @ubitoffee)
42+
- fix locale error by (#17208 by @iamkun)
43+
- Cascader
44+
- Fix CascaderPanel display error (#16716 by @zhangHongEn)
45+
- Fix disable status and close button issue (#16224 by @yyjjqq94)
46+
- Input
47+
- Fix Korean composition event (#15069 by @MoonHyuk)
48+
- Fix click event of clear button not trigger when using v-loading (#16576 by @a631807682)
49+
- Select
50+
- Not toggle dropdown when filtering (#17205 by @luckyCao)
51+
- Transfer
52+
- Fix style error (#17206 by @iamkun)
53+
- Dialog
54+
- update sass var (#16365 by @haoranyu)
55+
- RadioGroup
56+
- Not produce invalid HTML in table if "is" attribute is specify (#17070 by @nullptru)
57+
- Divider
58+
- Support custom classes (#17078 by @island205)
59+
60+
#### Optimization
61+
62+
- Checkbox
63+
- Improve screen reader experience (#16575 by @tylertrotter)
64+
- Docs
65+
- Update changelog (#16773 by @SimonaliaChen)
66+
- Update contributing guide (#14800 by @sinchang)
67+
- Fix typo in Drawer docs (#16848 by @winkay)
68+
- Update custom theme (#16983 by @iamkun)
69+
- Add Esperanto translation (#16955 by @maxkoryukov)
70+
- Update input-number document about change event (#16316 by @luckyCao)
71+
- Update spanish doc 2.11.1 (#16961 by @Gonzalo2310)
72+
- I18n
73+
- Remove translation of 'year' in catalan language as in the other languages (#14722 by @oscaralbareda)
74+
- Update spanish changelog 2.10.0 and 2.10.1 (#16548 by @Gonzalo2310)
75+
- Update ar.js (#16653 by @l3op)
76+
- Test
77+
- Correct spelling error (#16672 by @boomler)
78+
- Refactor unit test to use data-uri (#16847 by @a631807682)
79+
- Types
80+
- Fix httprequest type (#16633 by @luckyCao)
81+
382
### 2.11.1
483

584
*2019-07-26*

CHANGELOG.zh-CN.md

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

3+
### 2.12.0
4+
5+
*2019-08-29*
6+
7+
#### 新特性
8+
9+
- Popover
10+
- 添加 close-delay 属性 (#16671 by @LachlanStuart)
11+
- Theme
12+
- 增加 Chrome 插件: Element Theme Extension (#16686 by @iamkun)
13+
- Icon
14+
- 支持 font-display 属性的配置 (#16805 by @iamfaizalandyka)
15+
16+
#### Bug fixes
17+
18+
- Table
19+
- 在表头拖拽后阻止 click 事件的触发 (#16850 by @ziyoung)
20+
- 修复表头 display 为 none 造成浏览器崩溃的问题 (#16956 by @luckyCao)
21+
- 修复没有数据的时表格高度问题 (#16861 by @ziyoung)
22+
- 调用 toggleExpansion 不再抛出异常 (#16304 by @yyjjqq94)
23+
- 挂载时不再触发 sort-change 事件 (#17113 by @a631807682)
24+
- 修复 setCurrentRow 方法不生效的问题 (#16879 by @ziyoung)
25+
- 修复当数据异步加载时,expand-row-keys 不生效的问题 (#16899 by @ziyoung)
26+
- 把 toggleAllSelection 设置为 Table 示例的属性 (#17137 by @ziyoung)
27+
- Tree
28+
- 修复文字与复选框之间的距离 (#16799 by @Hazlank)
29+
- Tabs
30+
- 修复 TabItem 位置不正确的问题 (#16520 by @victorting)
31+
- 修复高亮的 Tab 不在可视区的问题 (#17033 by @nullptru)
32+
- Calendar
33+
- 修复日期的显示问题 (#16772 by @ubitoffee)
34+
- 修复在夏令时的显示问题 (#17208 by @iamkun)
35+
- Cascader
36+
- 修复 CascaderPanel 的显示问题 (#16716 by @zhangHongEn)
37+
- 禁用状态下,关闭按钮不显示 (#16224 by @yyjjqq94)
38+
- Input
39+
- 修复韩语输入问题 (#15069 by @MoonHyuk)
40+
- 触发清楚按钮的点击事件 (#16576 by @a631807682)
41+
- Select
42+
- 过滤时,不收起下拉框 (#17205 by @luckyCao)
43+
- Transfer
44+
- 修复样式问题 (#17206 by @iamkun)
45+
- Dialog
46+
- 添加 SCSS 变量 (#16365 by @haoranyu)
47+
- RadioGroup
48+
- is 指定时,不产生非法的 HTML 片段 (#17070 by @nullptru)
49+
- Divider
50+
- 支持自定义类 (#17078 by @island205)
51+
- Carousel
52+
- 修复 change 的触发时机 (#16705 by @iamkun)
53+
- Notification
54+
- 不修改传入的 option (#16704 by @iamkun)
55+
- DatePicker
56+
- 给 picker-option 添加 className 属性 (#16632 by @iamkun)
57+
- DateTimePicker
58+
- 修复时间选择滚动条的问题 (#16854 by @jesse-li)
59+
60+
#### Optimization
61+
62+
- Checkbox
63+
- 提高可访问性 (#16575 by @tylertrotter)
64+
- Docs
65+
- 更新 changelog (#16773 by @SimonaliaChen)
66+
- 更新贡献指南 (#14800 by @sinchang)
67+
- 修复 Drawer 文档中的拼写错误 (#16848 by @winkay)
68+
- 更新自定义主题 (#16983 by @iamkun)
69+
- 新增 Esperanto 翻译 (#16955 by @maxkoryukov)
70+
- 更新 input-number 文档 (#16316 by @luckyCao)
71+
- 更新 Spanish 文档 (#16961 #16548 by @Gonzalo2310)
72+
- I18n
73+
- 更新加泰罗尼亚语翻译 (#14722 by @oscaralbareda)
74+
- 更新阿拉伯语翻译 (#16653 by @l3op)
75+
- Test
76+
- 修复拼写错误 (#16672 by @boomler)
77+
- 优化 image 的单元测试 (#16847 by @a631807682)
78+
- Types
79+
- 修复 httprequest 的类型 (#16633 by @luckyCao)
80+
381
### 2.11.1
482

583
*2019-07-26*

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -233,11 +233,11 @@ Become a sponsor and get your logo on our README on Github with a link to your s
233233
<a href="https://opencollective.com/element/sponsor/28/website" target="_blank"><img src="https://opencollective.com/element/sponsor/28/avatar.svg"></a>
234234
<a href="https://opencollective.com/element/sponsor/29/website" target="_blank"><img src="https://opencollective.com/element/sponsor/29/avatar.svg"></a>
235235

236-
## Join Discusion Group
236+
## Join Discussion Group
237237

238-
Scan the QR code using [Dingtalk App](https://www.dingtalk.com/) to join in discusion group :
238+
Scan the QR code using [Dingtalk App](https://www.dingtalk.com/) to join in discussion group :
239239

240-
<img alt="Join Discusion Group" src="https://user-images.githubusercontent.com/17680888/60150281-95183f80-980a-11e9-88a8-d324c5e8d83b.png" width="300">
240+
<img alt="Join Discusion Group" src="https://user-images.githubusercontent.com/17680888/66537329-9a4b9100-eb52-11e9-9d99-65469cfdae58.jpeg" width="300">
241241

242242

243243
## LICENSE

build/bin/version.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
var fs = require('fs');
22
var path = require('path');
33
var version = process.env.VERSION || require('../../package.json').version;
4-
var content = { '1.4.13': '1.4', '2.0.11': '2.0', '2.1.0': '2.1', '2.2.2': '2.2', '2.3.9': '2.3', '2.4.11': '2.4', '2.5.4': '2.5', '2.6.3': '2.6', '2.7.2': '2.7', '2.8.2': '2.8', '2.9.2': '2.9', '2.10.1': '2.10' };
5-
if (!content[version]) content[version] = '2.11';
4+
var content = { '1.4.13': '1.4', '2.0.11': '2.0', '2.1.0': '2.1', '2.2.2': '2.2', '2.3.9': '2.3', '2.4.11': '2.4', '2.5.4': '2.5', '2.6.3': '2.6', '2.7.2': '2.7', '2.8.2': '2.8', '2.9.2': '2.9', '2.10.1': '2.10', '2.11.1': '2.11' };
5+
if (!content[version]) content[version] = '2.12';
66
fs.writeFileSync(path.resolve(__dirname, '../../examples/versions.json'), JSON.stringify(content));

build/deploy-ci.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ if [ "$TRAVIS_TAG" ]; then
4040
# build sub folder
4141
echo $TRAVIS_TAG
4242

43-
SUB_FOLDER='2.11'
43+
SUB_FOLDER='2.12'
4444
mkdir $SUB_FOLDER
4545
rm -rf *.js *.css *.map static
4646
rm -rf $SUB_FOLDER/**

build/deploy-faas.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ cd temp_web
66
git clone --depth 1 -b gh-pages --single-branch https://github.com/ElemeFE/element.git && cd element
77

88
# build sub folder
9-
SUB_FOLDER='2.11'
9+
SUB_FOLDER='2.12'
1010
mkdir -p $SUB_FOLDER
1111
rm -rf *.js *.css *.map static
1212
rm -rf $SUB_FOLDER/**

0 commit comments

Comments
 (0)