Skip to content

Commit 7a037a8

Browse files
committed
更新Element-UI至2.4.9版本
Merge commit '631688905dbfdc9430d7e39e7ef1d9aae356bfaa' into current * commit '631688905dbfdc9430d7e39e7ef1d9aae356bfaa': (28 commits) [release] 2.4.9 [build] 2.4.9 changelog for 2.4.9 (ElemeFE#13182) Tabs: set TabNav key (ElemeFE#13178) Table: update Chinese doc (ElemeFE#13177) Table: tooltip content prefer innerText instead of textContent (ElemeFE#13159) Table: Adds header rendering slot (ElemeFE#13012) Alert: add support for title slot (ElemeFE#13082) aria: add role dialog (ElemeFE#13084) Select: fix option wrap in multiple mode (ElemeFE#12329) Tag: optimize code (ElemeFE#13069) Select: fix readonly problem in edge (ElemeFE#13034) Select: fix size attribute not working (ElemeFE#13070) NavMenu: fix typo (ElemeFE#13060) i18n: Add missing Slovenian translations (ElemeFE#13059) Upload: use uid as upload-list key (ElemeFE#13054) Select: make clearable work for multi select (ElemeFE#13049) Form: clearValidate supports string type param (ElemeFE#12990) InputNumber: fix style when `controls-position` is right (ElemeFE#13052) Tabs: fixed last TabNav unable to be deleted (ElemeFE#13039) ... # Conflicts: # CHANGELOG.zh-CN.md # examples/docs/zh-CN/badge.md # examples/versions.json # package.json # packages/badge/src/main.vue # packages/cascader/src/main.vue # packages/date-picker/src/basic/time-spinner.vue # packages/select/src/select.vue # packages/theme-chalk/package.json # src/index.js
2 parents da679b6 + 6316889 commit 7a037a8

Some content is hidden

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

49 files changed

+656
-139
lines changed

CHANGELOG.en-US.md

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

3+
### 2.4.9
4+
5+
*2018-10-26*
6+
7+
- The parameter of Form's `clearValidate` supports string, #12990 (by @codinglobster)
8+
- Added type attribute for Badge, #12991
9+
- Users can use scoped-slot to customize table column header #13012 (by @ivanseidel)
10+
- Fixed the input box of Select unable to type text under IE, #13034 (by @GaliMU)
11+
- Select option does not wrap when space is enough, #12329 (by @akki-jat)
12+
- When dropdown list of Select is expanded, the arrow icon will also display correctly, #12353 (by @firesh)
13+
- Fixed that the size attribute of Select does not work, #13070
14+
- Select multiple values can be cleared, #13049 (by @ZSkycat)
15+
- Fixed the last TabNav unable be deleted, #13039
16+
- Fixed that TabNav label is not displayed correctly, #13178
17+
- Added title slot for Alert, #13082 (by @Kingwl)
18+
- Fixed an issue where the tooltip content in Table was incorrect, #13159 (by @elfman)
19+
- Optimize the animation of Upload when file is deleted, #12987
20+
- Adjusted style of InputNumber when control button is not displayed, #13052
21+
322
### 2.4.8
423

524
- Not displaying outline when Switch is focused, #12771

CHANGELOG.es.md

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,35 @@
11
## Changelog
22

3+
### 2.4.9
4+
5+
*2018-10-26*
6+
7+
- The parameter of Form's `clearValidate` supports string, #12990 (by @codinglobster)
8+
- Added type attribute for Badge, #12991
9+
- Users can use scoped-slot to customize table column header #13012 (by @ivanseidel)
10+
- Fixed the input box of Select unable to type text under IE, #13034 (by @GaliMU)
11+
- Select option does not wrap when space is enough, #12329 (by @akki-jat)
12+
- When dropdown list of Select is expanded, the arrow icon will also display correctly, #12353 (by @firesh)
13+
- Fixed that the size attribute of Select does not work, #13070
14+
- Select multiple values can be cleared, #13049 (by @ZSkycat)
15+
- Fixed the last TabNav unable be deleted, #13039
16+
- Fixed that TabNav label is not displayed correctly, #13178
17+
- Added title slot for Alert, #13082 (by @Kingwl)
18+
- Fixed an issue where the tooltip content in Table was incorrect, #13159 (by @elfman)
19+
- Optimize the animation of Upload when file is deleted, #12987
20+
- Adjusted style of InputNumber when control button is not displayed, #13052
21+
322
### 2.4.8
423

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
24+
- No se muestra el contorno cuando Switch está enfocado, #12771
25+
- Arreglado el estilo del Dropdown en ButtonGroup, #12819 (por @bluejfox)
26+
- Añadido evento opened para Dialog, #12828
27+
- Corregido el orden incorrecto de visualización de TabNav, #12846
28+
- Corregido el problema de que Tabs no se desplazaba a la pestaña seleccionada, #12948
29+
- Corregido el problema de que el identificador no se mostraba cuando se arrastraba el Tree node, #12854
30+
- El parámetro validar evento de Form contiene el mensaje de validación, #12860 (por @YamenSharaf)
31+
- Se ha corregido el DatePicker que no verificaba la validez de la hora de entrada del usuario, #12898
32+
- Arreglado el problema de que el atributo `render-header` del encabezado de Table no funcionaba, #12914
1433

1534
### 2.4.7
1635

@@ -351,8 +370,10 @@
351370
- Corregido el layout que no se actualizaba cuando el ancho de columna era cambiado por el usuario arrastrando, #9668
352371
- Corregido problema de estilo cuando la fila de resumen coexistia con columnas fijas, #9667
353372
- Container
373+
354374
- Corregido componentes del Container que no se estiraban en IE11, #9655
355375
- Loading
376+
356377
- Corregido Loading no se mostraba cuando el valor de `v-loading` era cambiado a true en el `hook` `mounted`, #9722
357378
- Switch
358379
- Corregido se disparaban los dos eventos nativos de click cuando se hacia click en el Switch, #9760

CHANGELOG.zh-CN.md

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

3+
### 1.4.29
4+
*2018-11-01*
5+
6+
同步至Element-UI 2.4.9版本
7+
8+
### 新特性
9+
10+
- Alert
11+
- 新增 `title slot`#13082(by @Kingwl
12+
- Badge
13+
- 新增 `type` 属性,#12991
14+
- Select
15+
- 多选时可以清除 Select 已选中的值,#13049(by @ZSkycat
16+
- Table
17+
- 用户可以使用 scoped-slot 来自定义表头,#13012(by @ivanseidel
18+
19+
### 修复
20+
21+
- Form
22+
- `clearValidate` 方法参数支持字符串,#12990 (by @codinglobster
23+
- InputNumber
24+
- 当 InputNumber 控制按钮不显示时,调整了边距,#13052
25+
- List
26+
- 加载时不显示 `Empty` 内容
27+
- loading区域背景色改为透明
28+
- Select
29+
- 修复 IE 下 Select 输入框不能输入的问题,#13034(by @GaliMU
30+
- Select 多选时,选项不换行,#12329 (by @akki-jat
31+
- Select 下拉列表展开后,箭头图标也可以正确显示,#12353(by @firesh
32+
- 修复 Select 的 size 属性不生效的问题,#13070
33+
- Tab
34+
- 修复最后一个 TabNav 不能删除的问题,#13039
35+
- 修复 TabNav 中 label 显示不正确的问题,#13178
36+
- Table
37+
- 修复 Table 中的 tooltip 内容不正确的问题,#13159(by @elfman
38+
- Upload
39+
- 优化 Upload 文件列表删除时的动画,#12987
40+
341
### 1.4.28
442
*2018-10-26*
543

examples/docs/en-US/alert.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,11 @@ Description includes a message with more detailed information.
216216
| close-text | customized close button text | string |||
217217
| show-icon | if a type icon is displayed | boolean || false |
218218

219+
### Slot
220+
221+
| Name | Description |
222+
|------|--------|
223+
| title | content of the Alert title |
219224

220225
### Events
221226
| Event Name | Description | Parameters |

examples/docs/en-US/badge.md

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@ Displays the amount of new messages.
1515
<el-badge :value="3" class="item">
1616
<el-button size="small">replies</el-button>
1717
</el-badge>
18+
<el-badge :value="1" class="item" type="primary">
19+
<el-button size="small">comments</el-button>
20+
</el-badge>
21+
<el-badge :value="2" class="item" type="warning">
22+
<el-button size="small">replies</el-button>
23+
</el-badge>
1824

1925
<el-dropdown trigger="click">
2026
<span class="el-dropdown-link">
@@ -130,9 +136,10 @@ Use a red dot to mark content that needs to be noticed.
130136
</style>
131137

132138
### Attributes
133-
| Attribute | Description | Type | Accepted Values | Default |
139+
| Attribute | Description | Type | Accepted Values | Default |
134140
|------------- |---------------- |---------------- |---------------------- |-------- |
135-
| value | display value | string, number |||
136-
| max | maximum value, shows '{max}+' when exceeded. Only works if `value` is a `Number` | number |||
137-
| is-dot | if a little dot is displayed | boolean || false |
138-
| hidden | hidden badge | boolean || false |
141+
| value | display value | string, number |||
142+
| max | maximum value, shows '{max}+' when exceeded. Only works if `value` is a `Number` | number |||
143+
| is-dot | if a little dot is displayed | boolean || false |
144+
| hidden | hidden badge | boolean || false |
145+
| type | button type | string | primary / success / warning / danger / info ||

examples/docs/en-US/dropdown.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,13 @@ Besides default size, Dropdown component provides three additional sizes for you
331331
| show-timeout | Delay time before show a dropdown (only works when trigger is `hover`) | number || 250 |
332332
| hide-timeout | Delay time before hide a dropdown (only works when trigger is `hover`) | number || 150 |
333333

334+
### Dropdown Slots
335+
336+
| Name | Description |
337+
|------|--------|
338+
|| content of Dropdown. Notice: Must be a valid html dom element (ex. `<span>, <button> etc.`) or `el-component`, to attach the trigger listener |
339+
| dropdown | content of the Dropdown Menu, usually a `<el-dropdown-menu>` element |
340+
334341
### Dropdown Events
335342
| Event Name | Description | Parameters |
336343
|---------- |-------- |---------- |

examples/docs/en-US/menu.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ Vertical NavMenu could be collapsed.
311311
| collapse-transition | whether to enable the collapse transition | boolean || true |
312312

313313
### Menu Methods
314-
| Event Name | Description | Parameters |
314+
| Methods Name | Description | Parameters |
315315
|---------- |-------- |---------- |
316316
| open | open a specific sub-menu | index: index of the sub-menu to open |
317317
| close | close a specific sub-menu | index: index of the sub-menu to close |

examples/docs/en-US/select.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ If the binding value of Select is an object, make sure to assign `value-key` as
666666
| disabled | whether Select is disabled | boolean || false |
667667
| value-key | unique identity key name for value, required when value is an object | string || value |
668668
| size | size of Input | string | large/small/mini ||
669-
| clearable | whether single select can be cleared | boolean || false |
669+
| clearable | whether select can be cleared | boolean || false |
670670
| collapse-tags | whether to collapse tags to a text when multiple selecting | boolean || false |
671671
| multiple-limit | maximum number of options user can select when `multiple` is `true`. No limit when set to 0 | number || 0 |
672672
| name | the name attribute of select input | string |||

examples/docs/en-US/table.md

Lines changed: 91 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,26 @@
185185
amount2: '4.1',
186186
amount3: 15
187187
}],
188+
tableData7: [{
189+
date: '2016-05-02',
190+
name: 'Tom',
191+
address: 'No. 189, Grove St, Los Angeles',
192+
}, {
193+
date: '2016-05-04',
194+
name: 'John',
195+
address: 'No. 189, Grove St, Los Angeles',
196+
}, {
197+
date: '2016-05-01',
198+
name: 'Morgan',
199+
address: 'No. 189, Grove St, Los Angeles',
200+
}, {
201+
date: '2016-05-03',
202+
name: 'Jessy',
203+
address: 'No. 189, Grove St, Los Angeles',
204+
}],
188205
currentRow: null,
189-
multipleSelection: []
206+
multipleSelection: [],
207+
search: '',
190208
};
191209
},
192210

@@ -1500,6 +1518,77 @@ Customize table column so it can be integrated with other components.
15001518
```
15011519
:::
15021520

1521+
### Table with custom header
1522+
1523+
Customize table header so it can be even more customized.
1524+
:::demo You can customize how the header looks by [Default slot content](https://vuejs.org/v2/guide/components-slots.html#Default-Slot-Content).
1525+
```html
1526+
<template>
1527+
<el-table
1528+
:data="tableData7.filter(data => !search || data.name.toLowerCase().includes(search.toLowerCase()))"
1529+
style="width: 100%">
1530+
<el-table-column
1531+
label="Date"
1532+
prop="date">
1533+
</el-table-column>
1534+
<el-table-column
1535+
label="Name"
1536+
prop="name">
1537+
</el-table-column>
1538+
<el-table-column
1539+
align="right">
1540+
<template slot="header" slot-scope="slot">
1541+
<el-input
1542+
v-model="search"
1543+
size="mini"
1544+
placeholder="Type to search"/>
1545+
</template>
1546+
<template slot-scope="scope">
1547+
<el-button
1548+
size="mini"
1549+
@click="handleEdit(scope.$index, scope.row)">Edit</el-button>
1550+
<el-button
1551+
size="mini"
1552+
type="danger"
1553+
@click="handleDelete(scope.$index, scope.row)">Delete</el-button>
1554+
</template>
1555+
</el-table-column>
1556+
</el-table>
1557+
</template>
1558+
1559+
<script>
1560+
export default {
1561+
data() {
1562+
return {
1563+
tableData: [{
1564+
date: '2016-05-03',
1565+
name: 'Tom',
1566+
address: 'No. 189, Grove St, Los Angeles'
1567+
}, {
1568+
date: '2016-05-02',
1569+
name: 'John',
1570+
address: 'No. 189, Grove St, Los Angeles'
1571+
}, {
1572+
date: '2016-05-04',
1573+
name: 'Morgan',
1574+
address: 'No. 189, Grove St, Los Angeles'
1575+
}, {
1576+
date: '2016-05-01',
1577+
name: 'Jessy',
1578+
address: 'No. 189, Grove St, Los Angeles'
1579+
}],
1580+
search: '',
1581+
}
1582+
},
1583+
methods: {
1584+
handleEdit(){},
1585+
handleDelete(){}
1586+
},
1587+
}
1588+
</script>
1589+
```
1590+
:::
1591+
15031592
### Expandable row
15041593

15051594
When the row content is too long and you do not want to display the horizontal scroll bar, you can use the expandable row feature.
@@ -2051,3 +2140,4 @@ You can customize row index in `type=index` columns.
20512140
| Name | Description |
20522141
|------|--------|
20532142
|| Custom content for table columns. The scope parameter is { row, column, $index } |
2143+
| header | Custom content for table header. The scope parameter is { column, $index } |

examples/docs/es/alert.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,11 @@ Descripción incluye un mensaje con información más detallada.
218218
| close-text | texto de cerrado personalizado | string |||
219219
| show-icon | si un icono del tipo de alerta se debe mostrar | boolean || false |
220220

221+
### Slot
222+
223+
| Name | Description |
224+
|------|--------|
225+
| title | El contenido del título de alerta. |
221226

222227
### Eventos
223228
| Nombre del evento | Descripción | Parámetros |

0 commit comments

Comments
 (0)