Skip to content

Commit

Permalink
更新Element-UI至2.4.9版本
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bluejfox committed Nov 1, 2018
2 parents da679b6 + 6316889 commit 7a037a8
Show file tree
Hide file tree
Showing 49 changed files with 656 additions and 139 deletions.
19 changes: 19 additions & 0 deletions CHANGELOG.en-US.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,24 @@
## Changelog

### 2.4.9

*2018-10-26*

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

### 2.4.8

- Not displaying outline when Switch is focused, #12771
Expand Down
39 changes: 30 additions & 9 deletions CHANGELOG.es.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,35 @@
## Changelog

### 2.4.9

*2018-10-26*

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

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

### 2.4.7

Expand Down Expand Up @@ -351,8 +370,10 @@
- Corregido el layout que no se actualizaba cuando el ancho de columna era cambiado por el usuario arrastrando, #9668
- Corregido problema de estilo cuando la fila de resumen coexistia con columnas fijas, #9667
- Container

- Corregido componentes del Container que no se estiraban en IE11, #9655
- Loading

- Corregido Loading no se mostraba cuando el valor de `v-loading` era cambiado a true en el `hook` `mounted`, #9722
- Switch
- Corregido se disparaban los dos eventos nativos de click cuando se hacia click en el Switch, #9760
Expand Down
38 changes: 38 additions & 0 deletions CHANGELOG.zh-CN.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,43 @@
## 更新日志

### 1.4.29
*2018-11-01*

同步至Element-UI 2.4.9版本

### 新特性

- Alert
- 新增 `title slot`#13082(by @Kingwl
- Badge
- 新增 `type` 属性,#12991
- Select
- 多选时可以清除 Select 已选中的值,#13049(by @ZSkycat
- Table
- 用户可以使用 scoped-slot 来自定义表头,#13012(by @ivanseidel

### 修复

- Form
- `clearValidate` 方法参数支持字符串,#12990 (by @codinglobster
- InputNumber
- 当 InputNumber 控制按钮不显示时,调整了边距,#13052
- List
- 加载时不显示 `Empty` 内容
- loading区域背景色改为透明
- Select
- 修复 IE 下 Select 输入框不能输入的问题,#13034(by @GaliMU
- Select 多选时,选项不换行,#12329 (by @akki-jat
- Select 下拉列表展开后,箭头图标也可以正确显示,#12353(by @firesh
- 修复 Select 的 size 属性不生效的问题,#13070
- Tab
- 修复最后一个 TabNav 不能删除的问题,#13039
- 修复 TabNav 中 label 显示不正确的问题,#13178
- Table
- 修复 Table 中的 tooltip 内容不正确的问题,#13159(by @elfman
- Upload
- 优化 Upload 文件列表删除时的动画,#12987

### 1.4.28
*2018-10-26*

Expand Down
5 changes: 5 additions & 0 deletions examples/docs/en-US/alert.md
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,11 @@ Description includes a message with more detailed information.
| close-text | customized close button text | string |||
| show-icon | if a type icon is displayed | boolean || false |

### Slot

| Name | Description |
|------|--------|
| title | content of the Alert title |

### Events
| Event Name | Description | Parameters |
Expand Down
17 changes: 12 additions & 5 deletions examples/docs/en-US/badge.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ Displays the amount of new messages.
<el-badge :value="3" class="item">
<el-button size="small">replies</el-button>
</el-badge>
<el-badge :value="1" class="item" type="primary">
<el-button size="small">comments</el-button>
</el-badge>
<el-badge :value="2" class="item" type="warning">
<el-button size="small">replies</el-button>
</el-badge>

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

### Attributes
| Attribute | Description | Type | Accepted Values | Default |
| Attribute | Description | Type | Accepted Values | Default |
|------------- |---------------- |---------------- |---------------------- |-------- |
| value | display value | string, number |||
| max | maximum value, shows '{max}+' when exceeded. Only works if `value` is a `Number` | number |||
| is-dot | if a little dot is displayed | boolean || false |
| hidden | hidden badge | boolean || false |
| value | display value | string, number |||
| max | maximum value, shows '{max}+' when exceeded. Only works if `value` is a `Number` | number |||
| is-dot | if a little dot is displayed | boolean || false |
| hidden | hidden badge | boolean || false |
| type | button type | string | primary / success / warning / danger / info ||
7 changes: 7 additions & 0 deletions examples/docs/en-US/dropdown.md
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,13 @@ Besides default size, Dropdown component provides three additional sizes for you
| show-timeout | Delay time before show a dropdown (only works when trigger is `hover`) | number || 250 |
| hide-timeout | Delay time before hide a dropdown (only works when trigger is `hover`) | number || 150 |

### Dropdown Slots

| Name | Description |
|------|--------|
|| content of Dropdown. Notice: Must be a valid html dom element (ex. `<span>, <button> etc.`) or `el-component`, to attach the trigger listener |
| dropdown | content of the Dropdown Menu, usually a `<el-dropdown-menu>` element |

### Dropdown Events
| Event Name | Description | Parameters |
|---------- |-------- |---------- |
Expand Down
2 changes: 1 addition & 1 deletion examples/docs/en-US/menu.md
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ Vertical NavMenu could be collapsed.
| collapse-transition | whether to enable the collapse transition | boolean || true |

### Menu Methods
| Event Name | Description | Parameters |
| Methods Name | Description | Parameters |
|---------- |-------- |---------- |
| open | open a specific sub-menu | index: index of the sub-menu to open |
| close | close a specific sub-menu | index: index of the sub-menu to close |
Expand Down
2 changes: 1 addition & 1 deletion examples/docs/en-US/select.md
Original file line number Diff line number Diff line change
Expand Up @@ -666,7 +666,7 @@ If the binding value of Select is an object, make sure to assign `value-key` as
| disabled | whether Select is disabled | boolean || false |
| value-key | unique identity key name for value, required when value is an object | string || value |
| size | size of Input | string | large/small/mini ||
| clearable | whether single select can be cleared | boolean || false |
| clearable | whether select can be cleared | boolean || false |
| 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 |||
Expand Down
92 changes: 91 additions & 1 deletion examples/docs/en-US/table.md
Original file line number Diff line number Diff line change
Expand Up @@ -185,8 +185,26 @@
amount2: '4.1',
amount3: 15
}],
tableData7: [{
date: '2016-05-02',
name: 'Tom',
address: 'No. 189, Grove St, Los Angeles',
}, {
date: '2016-05-04',
name: 'John',
address: 'No. 189, Grove St, Los Angeles',
}, {
date: '2016-05-01',
name: 'Morgan',
address: 'No. 189, Grove St, Los Angeles',
}, {
date: '2016-05-03',
name: 'Jessy',
address: 'No. 189, Grove St, Los Angeles',
}],
currentRow: null,
multipleSelection: []
multipleSelection: [],
search: '',
};
},

Expand Down Expand Up @@ -1500,6 +1518,77 @@ Customize table column so it can be integrated with other components.
```
:::

### Table with custom header

Customize table header so it can be even more customized.
:::demo You can customize how the header looks by [Default slot content](https://vuejs.org/v2/guide/components-slots.html#Default-Slot-Content).
```html
<template>
<el-table
:data="tableData7.filter(data => !search || data.name.toLowerCase().includes(search.toLowerCase()))"
style="width: 100%">
<el-table-column
label="Date"
prop="date">
</el-table-column>
<el-table-column
label="Name"
prop="name">
</el-table-column>
<el-table-column
align="right">
<template slot="header" slot-scope="slot">
<el-input
v-model="search"
size="mini"
placeholder="Type to search"/>
</template>
<template slot-scope="scope">
<el-button
size="mini"
@click="handleEdit(scope.$index, scope.row)">Edit</el-button>
<el-button
size="mini"
type="danger"
@click="handleDelete(scope.$index, scope.row)">Delete</el-button>
</template>
</el-table-column>
</el-table>
</template>

<script>
export default {
data() {
return {
tableData: [{
date: '2016-05-03',
name: 'Tom',
address: 'No. 189, Grove St, Los Angeles'
}, {
date: '2016-05-02',
name: 'John',
address: 'No. 189, Grove St, Los Angeles'
}, {
date: '2016-05-04',
name: 'Morgan',
address: 'No. 189, Grove St, Los Angeles'
}, {
date: '2016-05-01',
name: 'Jessy',
address: 'No. 189, Grove St, Los Angeles'
}],
search: '',
}
},
methods: {
handleEdit(){},
handleDelete(){}
},
}
</script>
```
:::

### Expandable row

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.
Expand Down Expand Up @@ -2051,3 +2140,4 @@ You can customize row index in `type=index` columns.
| Name | Description |
|------|--------|
|| Custom content for table columns. The scope parameter is { row, column, $index } |
| header | Custom content for table header. The scope parameter is { column, $index } |
5 changes: 5 additions & 0 deletions examples/docs/es/alert.md
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,11 @@ Descripción incluye un mensaje con información más detallada.
| close-text | texto de cerrado personalizado | string |||
| show-icon | si un icono del tipo de alerta se debe mostrar | boolean || false |

### Slot

| Name | Description |
|------|--------|
| title | El contenido del título de alerta. |

### Eventos
| Nombre del evento | Descripción | Parámetros |
Expand Down
7 changes: 7 additions & 0 deletions examples/docs/es/badge.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@ Muestra la cantidad de mensajes nuevos.
<el-badge :value="3" class="item">
<el-button size="small">replies</el-button>
</el-badge>
<el-badge :value="1" class="item" type="primary">
<el-button size="small">comments</el-button>
</el-badge>
<el-badge :value="2" class="item" type="warning">
<el-button size="small">replies</el-button>
</el-badge>

<el-dropdown trigger="click">
<span class="el-dropdown-link">
Expand Down Expand Up @@ -136,3 +142,4 @@ Puede utilizar un punto rojo para marcar contenido que debe ser notado.
| max | valor máximo, Muestra '{max}+' cuando se excede. Solo funciona si `value` es un `Number` | number |||
| is-dot | si se debe mostrar un pequeño punto | boolean || false |
| hidden | hidden badge | boolean || false |
| type | tipo de botón | string | primary / success / warning / danger / info ||
2 changes: 1 addition & 1 deletion examples/docs/es/dialog.md
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ Si la variable ligada a `visible` se gestiona en el Vuex store, el `.sync` no pu
| Nombre de Evento | Descripcíon | Parámetros |
| ---------------- | ---------------------------------------- | ---------- |
| open | se activa cuando se abre el cuadro de Diálogo ||
| opened | triggers when the Dialog opening animation ends ||
| opened | se activa cuando la animacion de apertura del Dialog termina. ||
| close | se dispara cuando el Diálogo se cierra ||
| closed | se activa cuando finaliza la animación de cierre del Diálog ||

7 changes: 7 additions & 0 deletions examples/docs/es/dropdown.md
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,13 @@ Además del tamaño predeterminado, el componente Dropdown proporciona tres tama
| show-timeout | Tiempo de retardo antes de mostrar un dropdown (solamente trabaja cuando se dispara `hover`) | number || 250 |
| hide-timeout | Tiempo de retardo antes de ocultar un dropdown (solamente trabaja cuando se dispara `hover`) | number || 150 |

### Dropdown Slots

| Nombre | Descripción |
|------|--------|
|| content of Dropdown. Notice: Must be a valid html dom element (ex. `<span>, <button> etc.`) or `el-component`, to attach the trigger listener |
| dropdown | content of the Dropdown Menu, usually a `<el-dropdown-menu>` element |

### Dropdown Eventos
| Nombre | Descripción | Parametros |
| -------------- | ---------------------------------------- | ---------------------------------------- |
Expand Down
Loading

0 comments on commit 7a037a8

Please sign in to comment.