{{ langConfig.community }}
@@ -27,8 +28,17 @@ width="120" popper-class="footer-popover" trigger="hover"> -{{ langConfig.eleme }} UED
- 
+ {{ langConfig.elemeTech }}
+ 
+
+ {{ langConfig.elemeDesign }}
+ 
- 您正在浏览基于 Vue 2.x 的 Element UI 文档;
- 点击这里 查看 Vue 3.x 的升级版本
+ 您正在浏览基于 Vue 2.x 的文档;
+ 点击查看 Vue 3.x 版本。
+ 饿了么开源了自研多端框架 MorJS，
+ 欢迎点击查看或试用 👏🏻
You’re browsing the documentation of Element UI for Vue 2.x version.
@@ -326,7 +328,7 @@
:to="`/${ lang }/component`">{{ langConfig.components }}
-
diff --git a/examples/docs/en-US/image.md b/examples/docs/en-US/image.md
index 92dc90a82..637511200 100644
--- a/examples/docs/en-US/image.md
+++ b/examples/docs/en-US/image.md
@@ -147,6 +147,7 @@ Besides the native features of img, support lazy load, custom placeholder and lo
| scroll-container | The container to add scroll listener when using lazy load | string / HTMLElement | — | The nearest parent container whose overflow property is auto or scroll |
| preview-src-list | allow big image preview | Array | — | - |
| z-index | set image preview z-index | Number | — | 2000 |
+| initial-index | set image preview array index | Number | — | - |
### Events
| Event Name | Description | Parameters |
diff --git a/examples/docs/en-US/statistic.md b/examples/docs/en-US/statistic.md
index d4072a124..11e25af62 100644
--- a/examples/docs/en-US/statistic.md
+++ b/examples/docs/en-US/statistic.md
@@ -1,216 +1,252 @@
-## Statistic
+## Statistic
Used to highlight a certain number or group of numbers, such as showing a numerical value, such as a dollar amount, ranking, etc.
Countdown mode
-
### Basic usage
+
The component provides a thousandth place display, but you can use rate to set the 10,000th place, and so on
:::demo
+
```html
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
- 456/2
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
```
+
:::
+### Count down
-### 倒计时
:::warning
Suspend is tentative, it ** just pauses the countdown, not the time, because value points to a future time node **
If you need to add time to the original, please note that the overall time (the amount of time added and the original time) must be a ** future ** time node, otherwise it is still the end of the countdown
:::
:::demo Providing a future time via 'value' will enable the countdown function
+
```html
-
+
+
+
+
+ 456/2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
```
+
:::
-
-
-
### Statistic Attributes
-| Attribute | Description | Type | Accepted Values | Default |
-|------------- |---------------- |---------------- |---------------------- |-------- |
-| value | Numerical content | string \| number | - | - |
-| decimal-separator | Setting the decimal point | string | - | . |
-| formatter | Custom numerical presentation| v-slot \|({value}) => VNode | - | - |
-| group-separator | Sets the thousandth identifier | string | - | , |
-| precision | numerical precision | number | - | 0 |
-| prefix | Sets the prefix of a number | string \| v-slot | - | - |
-| suffix |Sets the suffix of a number | string \| v-slot | - | - |
-| title | Numeric titles | string \| v-slot | - | - |
-| value-style | Styles numeric values | style | - | - |
-| rate | Set the ratio | number | - | 1000 |
-
+| Attribute | Description | Type | Accepted Values | Default |
+| ----------------- | ------------------------------ | --------------------------- | --------------- | ------- |
+| value | Numerical content | string \| number | - | - |
+| decimal-separator | Setting the decimal point | string | - | . |
+| formatter | Custom numerical presentation | v-slot \|({value}) => VNode | - | - |
+| group-separator | Sets the thousandth identifier | string | - | , |
+| precision | numerical precision | number | - | - |
+| prefix | Sets the prefix of a number | string \| v-slot | - | - |
+| suffix | Sets the suffix of a number | string \| v-slot | - | - |
+| title | Numeric titles | string \| v-slot | - | - |
+| value-style | Styles numeric values | style | - | - |
+| rate | Set the ratio | number | - | 1000 |
### Statistic Slots
-| Name | Description |
-|------|--------|
-| prefix | Numeric prefix |
-| suffix | Suffixes for numeric values |
-| formatter | Numerical content |
-| title | Numeric titles |
+| Name | Description |
+| --------- | --------------------------- |
+| prefix | Numeric prefix |
+| suffix | Suffixes for numeric values |
+| formatter | Numerical content |
+| title | Numeric titles |
-### Statistic.Countdown Attributes
+### Statistic.Countdown Attributes
+
+| Attribute | Description | Type | Options | Default |
+| ------------ | ---------------------------------------- | ------- | ----------- | ---------- |
+| time-indices | Whether to enable the countdown function | boolean | true\|false | false |
+| value | Required value, enter the bound value | string | — | — |
+| format | Formatting the countdown display | string | — | 'HH:mm:ss' |
-| Attribute | Description | Type | Options | Default |
-|------------- |---------------- |---------------- |---------------------- |-------- |
-| time-indices | Whether to enable the countdown function | boolean | true\|false | false |
-| value | Required value, enter the bound value | string | — | — |
-| format | Formatting the countdown display | string | — | 'HH:mm:ss' |
### Statistic.Countdown Events
-| Method | Description | Parameters |
-|---------|--------|---------|
-| change | Enable in the 'countdown' function | (value: Date) |
+
+| Method | Description | Parameters |
+| ------ | ------------------------------------------ | ---------------- |
+| change | Enable in the 'countdown' function | (value: Date) |
| finish | Launched after the 'countdown' is complete | (value: boolean) |
### Statistic Methods
-| Method | Description | Parameters |CallBack|
-| ---- | ---- | ---- |---- |
-| suspend | Pause the countdown|(value:boolean) |(value: Date) |
-
+| Method | Description | Parameters | CallBack |
+| ------- | ------------------- | --------------- | ------------- |
+| suspend | Pause the countdown | (value:boolean) | (value: Date) |
diff --git a/examples/docs/en-US/table.md b/examples/docs/en-US/table.md
index 173309633..3d78fe665 100644
--- a/examples/docs/en-US/table.md
+++ b/examples/docs/en-US/table.md
@@ -1817,6 +1817,7 @@ You can customize row index in `type=index` columns.
| fit | whether width of column automatically fits its container | boolean | — | true |
| show-header | whether Table header is visible | boolean | — | true |
| highlight-current-row | whether current row is highlighted | boolean | — | false |
+| highlight-selection-row | whether selection row is highlighted | boolean | — | false |
| current-row-key | key of current row, a set only prop | string,number | — | — |
| row-class-name | function that returns custom class names for a row, or a string assigning class names for every row | Function({row, rowIndex})/String | — | — |
| row-style | function that returns custom style for a row, or an object assigning custom style for every row | Function({row, rowIndex})/Object | — | — |
diff --git a/examples/docs/en-US/tooltip.md b/examples/docs/en-US/tooltip.md
index 9820c03f9..a1511bef0 100644
--- a/examples/docs/en-US/tooltip.md
+++ b/examples/docs/en-US/tooltip.md
@@ -187,7 +187,7 @@ Disabled form elements are not supported for Tooltip, more information can be fo
| offset | offset of the Tooltip | number | — | 0 |
| transition | animation name | string | — | el-fade-in-linear |
| visible-arrow | whether an arrow is displayed. For more information, check [Vue-popper](https://github.com/element-component/vue-popper) page | boolean | — | true |
-| popper-options | [popper.js](https://popper.js.org/documentation.html) parameters | Object | refer to [popper.js](https://popper.js.org/documentation.html) doc | `{ boundariesElement: 'body', gpuAcceleration: false }` |
+| popper-options | [popper.js](https://popper.js.org/docs/v2/) parameters | Object | refer to [popper.js](https://popper.js.org/docs/v2/) doc | `{ boundariesElement: 'body', gpuAcceleration: false }` |
| open-delay | delay of appearance, in millisecond | number | — | 0 |
| manual | whether to control Tooltip manually. `mouseenter` and `mouseleave` won't have effects if set to `true` | boolean | — | false |
| popper-class | custom class name for Tooltip's popper | string | — | — |
diff --git a/examples/docs/es/image.md b/examples/docs/es/image.md
index 7d8d78d76..18e6b534e 100644
--- a/examples/docs/es/image.md
+++ b/examples/docs/es/image.md
@@ -149,6 +149,7 @@ Además de las características nativas de img, soporte de carga perezosa, marca
| scroll-container | El contenedor para añadir el scroll listener cuando se utiliza lazy load | string / HTMLElement | — | El contenedor padre más cercano cuya propiedad de desbordamiento es auto o scroll |
| preview-src-list | permitir una vista previa grande de la imagen | Array | — | - |
| z-index | establecer el z-index de la vista previa de la imagen | Number | — | 2000 |
+| initial-index | set image preview array index | Number | — | - |
### Eventos
| Nombre del evento | Descripción | Parámetros |
diff --git a/examples/docs/es/input.md b/examples/docs/es/input.md
index f88a9deff..ded0e86e5 100644
--- a/examples/docs/es/input.md
+++ b/examples/docs/es/input.md
@@ -617,7 +617,6 @@ export default {
| ------ | ------------------------------------------------------------ | ------------------------- |
| blur | Se dispara cuando se pierde el foco | (event: Event) |
| focus | Se dispara cuando se obtiene el foco | (event: Event) |
-| change | se activa cuando cambia el valor de entrada | (value: string \| number) |
| change | se activa solo cuando el cuadro de entrada pierde el foco o el usuario presiona Enter | (value: string \| number) |
| input | se activa cuando cambia el valor de entrada | (value: string \| number) |
| clear | se dispara cuando la entrada es borrada por el botón generado por el atributo `clearable`. | — |
diff --git a/examples/docs/es/statistic.md b/examples/docs/es/statistic.md
index ed8405daf..4e5962a98 100644
--- a/examples/docs/es/statistic.md
+++ b/examples/docs/es/statistic.md
@@ -1,216 +1,252 @@
-## Statistic
+## Statistic
Used to highlight a certain number or group of numbers, such as showing a numerical value, such as a dollar amount, ranking, etc.
Countdown mode
-
### Basic usage
+
The component provides a thousandth place display, but you can use rate to set the 10,000th place, and so on
:::demo
+
```html
-
-
-
- The rush is about to begin
-
-
-
-
-
-
- add 10 second
-
-
-
-
-
- 文嘉《明日歌》
- 暂停
-
- 明日复明日
- 明日何其多
-
- 我生待明日
-
- 万事成蹉跎
-
-
+
+
+ panic purchase
+
+
+
+
+
+
+ add 10s
+
+
+
+
+ Henry·Wadsworth·Longfellow
+ suspend
+
+
+ Don't sigh in the past, it is no longer back
+
+
+ Be wise to improve the present
+
+
+ To not worry not afraid of the firm will into the complicated future
+
+
+
-
-
-
-
-
-
-
-
-
+
-
-
-
-
- 456/2
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
```
+
:::
+### Count down
-### 倒计时
:::warning
Suspend is tentative, it ** just pauses the countdown, not the time, because value points to a future time node **
-If you need to add time to the original, please note that the overall time (the amount of time added and the original time) must be a ** future ** time node, otherwise it is still the end of the countdown
+If you need to add time to the original, please note that the overall time (the amount of time added and the original time) must be a **future** time node, otherwise it is still the end of the countdown
:::
:::demo Providing a future time via 'value' will enable the countdown function
+
```html
-
+
+
+
+
+ 456/2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
```
+
:::
-
-
-
### Statistic Attributes
-| Attribute | Description | Type | Accepted Values | Default |
-|------------- |---------------- |---------------- |---------------------- |-------- |
-| value | Numerical content | string \| number | - | - |
-| decimal-separator | Setting the decimal point | string | - | . |
-| formatter | Custom numerical presentation| v-slot \|({value}) => VNode | - | - |
-| group-separator | Sets the thousandth identifier | string | - | , |
-| precision | numerical precision | number | - | 0 |
-| prefix | Sets the prefix of a number | string \| v-slot | - | - |
-| suffix |Sets the suffix of a number | string \| v-slot | - | - |
-| title | Numeric titles | string \| v-slot | - | - |
-| value-style | Styles numeric values | style | - | - |
-| rate | Set the ratio | number | - | 1000 |
-
+| Attribute | Description | Type | Accepted Values | Default |
+| ----------------- | ------------------------------ | --------------------------- | --------------- | ------- |
+| value | Numerical content | string \| number | - | - |
+| decimal-separator | Setting the decimal point | string | - | . |
+| formatter | Custom numerical presentation | v-slot \|({value}) => VNode | - | - |
+| group-separator | Sets the thousandth identifier | string | - | , |
+| precision | numerical precision | number | - | - |
+| prefix | Sets the prefix of a number | string \| v-slot | - | - |
+| suffix | Sets the suffix of a number | string \| v-slot | - | - |
+| title | Numeric titles | string \| v-slot | - | - |
+| value-style | Styles numeric values | style | - | - |
+| rate | Set the ratio | number | - | 1000 |
### Statistic Slots
-| Name | Description |
-|------|--------|
-| prefix | Numeric prefix |
-| suffix | Suffixes for numeric values |
-| formatter | Numerical content |
-| title | Numeric titles |
+| Name | Description |
+| --------- | --------------------------- |
+| prefix | Numeric prefix |
+| suffix | Suffixes for numeric values |
+| formatter | Numerical content |
+| title | Numeric titles |
-### Statistic.Countdown Attributes
+### Statistic.Countdown Attributes
+
+| Attribute | Description | Type | Options | Default |
+| ------------ | ---------------------------------------- | ------- | ----------- | ---------- |
+| time-indices | Whether to enable the countdown function | boolean | true\|false | false |
+| value | Required value, enter the bound value | string | — | — |
+| format | Formatting the countdown display | string | — | 'HH:mm:ss' |
-| Attribute | Description | Type | Options | Default |
-|------------- |---------------- |---------------- |---------------------- |-------- |
-| time-indices | Whether to enable the countdown function | boolean | true\|false | false |
-| value | Required value, enter the bound value | string | — | — |
-| format | Formatting the countdown display | string | — | 'HH:mm:ss' |
### Statistic.Countdown Events
-| Method | Description | Parameters |
-|---------|--------|---------|
-| change | Enable in the 'countdown' function | (value: Date) |
+
+| Method | Description | Parameters |
+| ------ | ------------------------------------------ | ---------------- |
+| change | Enable in the 'countdown' function | (value: Date) |
| finish | Launched after the 'countdown' is complete | (value: boolean) |
### Statistic Methods
-| Method | Description | Parameters |CallBack|
-| ---- | ---- | ---- |---- |
-| suspend | Pause the countdown|(value:boolean) |(value: Date) |
-
+| Method | Description | Parameters | CallBack |
+| ------- | ------------------- | --------------- | ------------- |
+| suspend | Pause the countdown | (value:boolean) | (value: Date) |
diff --git a/examples/docs/es/table.md b/examples/docs/es/table.md
index 36f32ffd8..140b05e81 100644
--- a/examples/docs/es/table.md
+++ b/examples/docs/es/table.md
@@ -1822,6 +1822,7 @@ Puede personalizar el índice de la fila con la propiedad `type=index` de las co
| fit | especifica si el ancho de la columna se adapta automáticamente a su contenedor | boolean | — | true |
| show-header | especifica si la cabecera de la tabla es visible | boolean | — | true |
| highlight-current-row | especifica si la fila actual es resaltado | boolean | — | false |
+| highlight-selection-row | resaltar la selección de líneas de verificación | boolean | — | false |
| current-row-key | clave de la fila actual, un ajuste de propiedad única | string,number | — | — |
| row-class-name | función que devuelve nombres de clases personalizadas para una fila, o una cadena asignando nombres de clases para cada fila | Function({row, rowIndex})/String | — | — |
| row-style | función que devuelve el estilo personalizado para una fila, o un objeto asignando estilos personalizado para cada fila | Function({row, rowIndex})/Object | — | — |
diff --git a/examples/docs/es/tooltip.md b/examples/docs/es/tooltip.md
index 15ed6c518..7982ab760 100644
--- a/examples/docs/es/tooltip.md
+++ b/examples/docs/es/tooltip.md
@@ -187,7 +187,7 @@ Es necesario envolver los elementos de forma deshabilitados en un elemento conte
| offset | offset del Tooltip | number | — | 0 |
| transition | nombre de animación | string | — | el-fade-in-linear |
| visible-arrow | si una flecha es mostrada. Para mayor información, revisar la página de [Vue-popper](https://github.com/element-component/vue-popper) | boolean | — | true |
-| popper-options | parámetros de [popper.js](https://popper.js.org/documentation.html) | Object | referirse a la documentación de [popper.js](https://popper.js.org/documentation.html) | `{ boundariesElement: 'body', gpuAcceleration: false }` |
+| popper-options | parámetros de [popper.js](https://popper.js.org/docs/v2/) | Object | referirse a la documentación de [popper.js](https://popper.js.org/docs/v2/) | `{ boundariesElement: 'body', gpuAcceleration: false }` |
| open-delay | retraso de la apariencia, en mili segundos | number | — | 0 |
| manual | si el Tooltipo será controlado de forma manual. `mouseenter` y `mouseleave` no tendrán efecto si fue establecido como `true` | boolean | — | false |
| popper-class | nombre de clase personalizada para el popper del Tooltip | string | — | — |
diff --git a/examples/docs/fr-FR/image.md b/examples/docs/fr-FR/image.md
index 569f91a17..9f37ad91f 100644
--- a/examples/docs/fr-FR/image.md
+++ b/examples/docs/fr-FR/image.md
@@ -148,6 +148,7 @@ En plus des propriétés natives de img, ce composant supporte le lazy loading,
| scroll-container | Le conteneur auquel ajouter le listener du scroll en mode lazy loading. | string / HTMLElement | — | Le conteneur parent le plus proche avec la propriété overflow à auto ou scroll. |
| preview-src-list | allow big image preview | Array | — | - |
| z-index | set image preview z-index | Number | — | 2000 |
+| initial-index | set image preview array index | Number | — | - |
### Évènements
| Nom | Description | Paramètres |
diff --git a/examples/docs/fr-FR/input.md b/examples/docs/fr-FR/input.md
index 661b72b3e..21ce6573d 100644
--- a/examples/docs/fr-FR/input.md
+++ b/examples/docs/fr-FR/input.md
@@ -603,7 +603,6 @@ export default {
|----| ----| ----|
| blur | Se déclenche quand Input perds le focus. | (event: Event) |
| focus | Se déclenche quand Input a le focus. | (event: Event) |
-| change | Se déclenche quand la valeur change. | (value: string \ number) |
| change | Déclenché uniquement lorsque la zone de saisie perd le focus ou que l'utilisateur appuie sur Entrée. | (value: string \| number) |
| input | Déclenché lorsque la valeur d'entrée change. | (value: string \| number) |
| clear | Se déclenche quand le champ est effacé par le bouton de reset. | — |
diff --git a/examples/docs/fr-FR/statistic.md b/examples/docs/fr-FR/statistic.md
index d4072a124..4f2f06c09 100644
--- a/examples/docs/fr-FR/statistic.md
+++ b/examples/docs/fr-FR/statistic.md
@@ -1,216 +1,252 @@
-## Statistic
+## Statistic
Used to highlight a certain number or group of numbers, such as showing a numerical value, such as a dollar amount, ranking, etc.
Countdown mode
-
### Basic usage
+
The component provides a thousandth place display, but you can use rate to set the 10,000th place, and so on
:::demo
+
```html
-
-
-
- The rush is about to begin
-
-
-
-
-
-
- add 10 second
-
-
-
-
-
- 文嘉《明日歌》
- 暂停
-
- 明日复明日
- 明日何其多
-
- 我生待明日
-
- 万事成蹉跎
-
-
+
+
+ panic purchase
+
+
+
+
+
+
+ add 10s
+
+
+
+
+ Henry·Wadsworth·Longfellow
+ suspend
+
+
+ Don't sigh in the past, it is no longer back
+
+
+ Be wise to improve the present
+
+
+ To not worry not afraid of the firm will into the complicated future
+
+
+
-
-
-
-
-
-
-
-
-
+
-
-
-
-
- 456/2
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
```
+
:::
+### Count down
-### 倒计时
:::warning
Suspend is tentative, it ** just pauses the countdown, not the time, because value points to a future time node **
If you need to add time to the original, please note that the overall time (the amount of time added and the original time) must be a ** future ** time node, otherwise it is still the end of the countdown
:::
:::demo Providing a future time via 'value' will enable the countdown function
+
```html
-
+
+
+
+
+ 456/2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
```
+
:::
-
-
-
### Statistic Attributes
-| Attribute | Description | Type | Accepted Values | Default |
-|------------- |---------------- |---------------- |---------------------- |-------- |
-| value | Numerical content | string \| number | - | - |
-| decimal-separator | Setting the decimal point | string | - | . |
-| formatter | Custom numerical presentation| v-slot \|({value}) => VNode | - | - |
-| group-separator | Sets the thousandth identifier | string | - | , |
-| precision | numerical precision | number | - | 0 |
-| prefix | Sets the prefix of a number | string \| v-slot | - | - |
-| suffix |Sets the suffix of a number | string \| v-slot | - | - |
-| title | Numeric titles | string \| v-slot | - | - |
-| value-style | Styles numeric values | style | - | - |
-| rate | Set the ratio | number | - | 1000 |
-
+| Attribute | Description | Type | Accepted Values | Default |
+| ----------------- | ------------------------------ | --------------------------- | --------------- | ------- |
+| value | Numerical content | string \| number | - | - |
+| decimal-separator | Setting the decimal point | string | - | . |
+| formatter | Custom numerical presentation | v-slot \|({value}) => VNode | - | - |
+| group-separator | Sets the thousandth identifier | string | - | , |
+| precision | numerical precision | number | - | - |
+| prefix | Sets the prefix of a number | string \| v-slot | - | - |
+| suffix | Sets the suffix of a number | string \| v-slot | - | - |
+| title | Numeric titles | string \| v-slot | - | - |
+| value-style | Styles numeric values | style | - | - |
+| rate | Set the ratio | number | - | 1000 |
### Statistic Slots
-| Name | Description |
-|------|--------|
-| prefix | Numeric prefix |
-| suffix | Suffixes for numeric values |
-| formatter | Numerical content |
-| title | Numeric titles |
+| Name | Description |
+| --------- | --------------------------- |
+| prefix | Numeric prefix |
+| suffix | Suffixes for numeric values |
+| formatter | Numerical content |
+| title | Numeric titles |
-### Statistic.Countdown Attributes
+### Statistic.Countdown Attributes
+
+| Attribute | Description | Type | Options | Default |
+| ------------ | ---------------------------------------- | ------- | ----------- | ---------- |
+| time-indices | Whether to enable the countdown function | boolean | true\|false | false |
+| value | Required value, enter the bound value | string | — | — |
+| format | Formatting the countdown display | string | — | 'HH:mm:ss' |
-| Attribute | Description | Type | Options | Default |
-|------------- |---------------- |---------------- |---------------------- |-------- |
-| time-indices | Whether to enable the countdown function | boolean | true\|false | false |
-| value | Required value, enter the bound value | string | — | — |
-| format | Formatting the countdown display | string | — | 'HH:mm:ss' |
### Statistic.Countdown Events
-| Method | Description | Parameters |
-|---------|--------|---------|
-| change | Enable in the 'countdown' function | (value: Date) |
+
+| Method | Description | Parameters |
+| ------ | ------------------------------------------ | ---------------- |
+| change | Enable in the 'countdown' function | (value: Date) |
| finish | Launched after the 'countdown' is complete | (value: boolean) |
### Statistic Methods
-| Method | Description | Parameters |CallBack|
-| ---- | ---- | ---- |---- |
-| suspend | Pause the countdown|(value:boolean) |(value: Date) |
-
+| Method | Description | Parameters | CallBack |
+| ------- | ------------------- | --------------- | ------------- |
+| suspend | Pause the countdown | (value:boolean) | (value: Date) |
diff --git a/examples/docs/fr-FR/table.md b/examples/docs/fr-FR/table.md
index a9d873ac1..1142df6ea 100644
--- a/examples/docs/fr-FR/table.md
+++ b/examples/docs/fr-FR/table.md
@@ -1824,6 +1824,7 @@ Vous pouvez personnaliser les indices des colonnes de type `index`.
| fit | Si la largeur des colonnes s'adapte au conteneur. | boolean | — | true |
| show-header | Si le header de la table est visible. | boolean | — | true |
| highlight-current-row | Si la ligne courante est mise en valeur. | boolean | — | false |
+| highlight-selection-row | Sélectionner la ligne à cocher en surbrillance | boolean | — | false |
| current-row-key | Clé de la ligne actuelle. Propriété set-only. | string,number | — | — |
| row-class-name | Fonction qui retourne un nom de classe pour chaque ligne. Peut aussi être une simple chaîne de caractères assignant une classe à chaque ligne. | Function({row, rowIndex})/String | — | — |
| row-style | Fonction qui retourne un style pour chaque ligne. Peut aussi être un objet assignant un style à chaque ligne. | Function({row, rowIndex})/Object | — | — |
diff --git a/examples/docs/fr-FR/tooltip.md b/examples/docs/fr-FR/tooltip.md
index b28343a5e..76d40b721 100644
--- a/examples/docs/fr-FR/tooltip.md
+++ b/examples/docs/fr-FR/tooltip.md
@@ -188,7 +188,7 @@ Les éléments de formulaire désactivés ne sont pas supportés par Tooltip, pl
| offset | Décalage du Tooltip. | number | — | 0 |
| transition | Animation de transition. | string | — | el-fade-in-linear |
| visible-arrow | Si une flèche doit être affichée. Pour plus d'information, voir [Vue-popper](https://github.com/element-component/vue-popper). | boolean | — | true |
-| popper-options | Paramètres [popper.js](https://popper.js.org/documentation.html). | Object | Se référer à [popper.js](https://popper.js.org/documentation.html). | `{ boundariesElement: 'body', gpuAcceleration: false }` |
+| popper-options | Paramètres [popper.js](https://popper.js.org/docs/v2/). | Object | Se référer à [popper.js](https://popper.js.org/docs/v2/). | `{ boundariesElement: 'body', gpuAcceleration: false }` |
| open-delay | Délai avant l'apparition en millisecondes. | number | — | 0 |
| manual | Si le contrôle du Tooltip doit être manuel. `mouseenter` et `mouseleave` n'auront pas d'effet si `true`. | boolean | — | false |
| popper-class | Classe du popper de Tooltip. | string | — | — |
diff --git a/examples/docs/zh-CN/image.md b/examples/docs/zh-CN/image.md
index 7698798b6..d01d3eede 100644
--- a/examples/docs/zh-CN/image.md
+++ b/examples/docs/zh-CN/image.md
@@ -147,6 +147,7 @@
| scroll-container | 开启懒加载后，监听 scroll 事件的容器 | string / HTMLElement | — | 最近一个 overflow 值为 auto 或 scroll 的父元素 |
| preview-src-list | 开启图片预览功能 | Array | — | - |
| z-index | 设置图片预览的 z-index | Number | — | 2000 |
+| initial-index | 图片预览初始图片index | Number | — | - |
### Events
| 事件名称 | 说明 | 回调参数 |
diff --git a/examples/docs/zh-CN/pagination.md b/examples/docs/zh-CN/pagination.md
index f9a2b4163..d5170905f 100644
--- a/examples/docs/zh-CN/pagination.md
+++ b/examples/docs/zh-CN/pagination.md
@@ -4,7 +4,7 @@
### 基础用法
-:::demo 设置`layout`，表示需要显示的内容，用逗号分隔，布局元素会依次显示。`prev`表示上一页，`next`为下一页，`pager`表示页码列表，除此以外还提供了`jumper`和`total`，`size`和特殊的布局符号`->`，`->`后的元素会靠右显示，`jumper`表示跳页元素，`total`表示总条目数，`size`用于设置每页显示的页码数量。
+:::demo 设置`layout`，表示需要显示的内容，用逗号分隔，布局元素会依次显示。`prev`表示上一页，`next`为下一页，`pager`表示页码列表，除此以外还提供了`jumper`和`total`，`sizes`和特殊的布局符号`->`，`->`后的元素会靠右显示，`jumper`表示跳页元素，`total`表示总条目数，`sizes`用于设置每页显示的页码数量。
```html
-
-
- The rush is about to begin
-
-
-
-
-
-
- add 10 second
-
-
-
-
-
- 文嘉《明日歌》
- 暂停
-
- 明日复明日
- 明日何其多
-
- 我生待明日
-
- 万事成蹉跎
-
-
+
+
+ panic purchase
+
+
+
+
+
+
+ add 10s
+
+
+
+
+ Henry·Wadsworth·Longfellow
+ suspend
+
+
+ Don't sigh in the past, it is no longer back
+
+
+ Be wise to improve the present
+
+
+ To not worry not afraid of the firm will into the complicated future
+
+
+
页数较少时的效果
diff --git a/examples/docs/zh-CN/statistic.md b/examples/docs/zh-CN/statistic.md
index 62402f986..f3a495a55 100644
--- a/examples/docs/zh-CN/statistic.md
+++ b/examples/docs/zh-CN/statistic.md
@@ -1,216 +1,254 @@
-## Statistic 统计数值
+## Statistic 统计数值
用于突出某个或某组数字时，如显示数值，如金额，排名等。
倒计时模式
+### 基础用法
-### 基础用法
- 组件提供千分位的展示，不过可以通过rate来设置相应万分位等
+组件提供千分位的展示，不过可以通过 rate 来设置相应万分位等
:::demo
+
```html
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
- 456/2
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
```
+
:::
-
### 倒计时
-:::warning
-suspend 暂定，它**只是暂停倒计时，并非暂停了时间，因为value指向的是未来的时间节点**。
+:::warning
如果需要在原基础上添加时间，请注意：整体的时间（添加的时间量和原定时间）必须是**未来**的时间节点，否则依旧是倒计时结束
:::
:::demo 通过 `value` 提供未来的时间，将开启倒计时功能
+
```html
-
+
+
+
+
+ 456/2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
```
+
:::
-
-
-
### Statistic Attributes
-| 参数 | 说明 | 类型 | 可选值 | 默认值 |
-|------------- |---------------- |---------------- |---------------------- |-------- |
-| value | 数值内容 | string \| number | - | - |
-| decimal-separator | 设置小数点 | string | - | . |
-| formatter | 自定义数值展示| v-slot \|({value}) => VNode | - | - |
-| group-separator | 设置千分位标识符 | string | - | , |
-| precision | 数值精度 | number | - | 0 |
-| prefix | 设置数值的前缀 | string \| v-slot | - | - |
-| suffix |设置数值的后缀 | string \| v-slot | - | - |
-| title | 数值的标题 | string \| v-slot | - | - |
-| value-style | 设置数值的样式 | style | - | - |
-| rate | 设置倍率 | number | - | 1000 |
-
+| 参数 | 说明 | 类型 | 可选值 | 默认值 |
+| ----------------- | ---------------- | --------------------------- | ------ | ------ |
+| value | 数值内容 | string \| number | — | — |
+| decimal-separator | 设置小数点 | string | — | . |
+| formatter | 自定义数值展示 | v-slot \|({value}) => VNode | — | — |
+| group-separator | 设置千分位标识符 | string | — | , |
+| precision | 数值精度 | number | — | — |
+| prefix | 设置数值的前缀 | string \| v-slot | — | — |
+| suffix | 设置数值的后缀 | string \| v-slot | — | — |
+| title | 数值的标题 | string \| v-slot | — | — |
+| value-style | 设置数值的样式 | object | — | — |
+| rate | 设置倍率 | number | — | 1000 |
### Statistic Slots
-| name | 说明 |
-|------|--------|
-| prefix | 数值的前缀 |
-| suffix | 数值的后缀 |
-| formatter | 数值内容 |
-| title | 数值的标题 |
+| name | 说明 |
+| --------- | ---------- |
+| prefix | 数值的前缀 |
+| suffix | 数值的后缀 |
+| formatter | 数值内容 |
+| title | 数值的标题 |
-### Statistic.Countdown Attributes
+### Statistic.Countdown Attributes
+
+| 参数 | 说明 | 类型 | 可选值 | 默认值 |
+| ------------ | ------------------ | ------- | ----------- | ---------- |
+| time-indices | 是否开启倒计时功能 | boolean | true\|false | false |
+| value | 必填值，输入绑定值 | string | — | — |
+| format | 格式化倒计时展示 | string | — | 'HH:mm:ss' |
-| 参数 | 说明 | 类型 | 可选值 | 默认值 |
-|------------- |---------------- |---------------- |---------------------- |-------- |
-| time-indices | 是否开启倒计时功能 | boolean | true\|false | false |
-| value | 必填值，输入绑定值 | string | — | — |
-| format | 格式化倒计时展示 | string | — | 'HH:mm:ss' |
### Statistic.Countdown Events
-| 事件名称 | 说明 | 回调参数 |
-|---------|--------|---------|
-| change | 在`倒计时`的功能中开启 | (value: Date) |
-| finish | 在`倒计时` 完成后启动 | (value: boolean) |
+
+| 事件名称 | 说明 | 回调参数 |
+| -------- | ---------------------- | ---------------- |
+| change | 在`倒计时`的功能中开启 | (value: Date) |
+| finish | 在`倒计时` 完成后启动 | (value: boolean) |
### Statistic Methods
-| 方法名 | 说明 | 参数 |回调参数|
-| ---- | ---- | ---- |---- |
-| suspend | 暂停倒计时|(value:boolean) |(value: Date) |
-
+| 方法名 | 说明 | 参数 | 回调参数 |
+| ------- | ---------- | --------------- | ------------- |
+| suspend | 暂停倒计时 | (value:boolean) | (value: Date) |
diff --git a/examples/docs/zh-CN/table.md b/examples/docs/zh-CN/table.md
index 21eb413f4..5a99dde39 100644
--- a/examples/docs/zh-CN/table.md
+++ b/examples/docs/zh-CN/table.md
@@ -1860,6 +1860,7 @@
| fit | 列的宽度是否自撑开 | boolean | — | true |
| show-header | 是否显示表头 | boolean | — | true |
| highlight-current-row | 是否要高亮当前行 | boolean | — | false |
+| highlight-selection-row | 是否要高亮复选框选中行（仅针对开启 `selection` 有效） | boolean | — | false |
| current-row-key | 当前行的 key，只写属性 | String,Number | — | — |
| row-class-name | 行的 className 的回调方法，也可以使用字符串为所有行设置一个固定的 className。 | Function({row, rowIndex})/String | — | — |
| row-style | 行的 style 的回调方法，也可以使用一个固定的 Object 为所有行设置一样的 Style。 | Function({row, rowIndex})/Object | — | — |
diff --git a/examples/docs/zh-CN/tooltip.md b/examples/docs/zh-CN/tooltip.md
index 8176b775f..523b4bea2 100644
--- a/examples/docs/zh-CN/tooltip.md
+++ b/examples/docs/zh-CN/tooltip.md
@@ -168,7 +168,7 @@ tooltip 内不支持 disabled form 元素，参考[MDN](https://developer.mozill
| offset | 出现位置的偏移量 | Number | — | 0 |
| transition | 定义渐变动画 | String | — | el-fade-in-linear |
| visible-arrow | 是否显示 Tooltip 箭头，更多参数可见[Vue-popper](https://github.com/element-component/vue-popper) | Boolean | — | true |
-| popper-options | [popper.js](https://popper.js.org/documentation.html) 的参数 | Object | 参考 [popper.js](https://popper.js.org/documentation.html) 文档 | { boundariesElement: 'body', gpuAcceleration: false } |
+| popper-options | [popper.js](https://popper.js.org/docs/v2/) 的参数 | Object | 参考 [popper.js](https://popper.js.org/docs/v2/) 文档 | { boundariesElement: 'body', gpuAcceleration: false } |
| open-delay | 延迟出现，单位毫秒 | Number | — | 0 |
| manual | 手动控制模式，设置为 true 后，mouseenter 和 mouseleave 事件将不会生效 | Boolean | — | false |
| popper-class | 为 Tooltip 的 popper 添加类名 | String | — | — |
diff --git a/examples/i18n/component.json b/examples/i18n/component.json
index 1b7c553d0..64f131299 100644
--- a/examples/i18n/component.json
+++ b/examples/i18n/component.json
@@ -18,7 +18,9 @@
"starter": "脚手架",
"feedback": "反馈建议",
"contribution": "贡献指南",
- "eleme": "饿了么"
+ "eleme": "饿了么",
+ "elemeTech": "饿了么技术",
+ "elemeDesign": "饿了么设计"
},
"header": {
"guide": "指南",
@@ -49,7 +51,9 @@
"starter": "Starter kit",
"feedback": "Feedback",
"contribution": "Contribution",
- "eleme": "Eleme"
+ "eleme": "Eleme",
+ "elemeTech": "Eleme Tech",
+ "elemeDesign": "Eleme Design"
},
"header": {
"guide": "Guide",
@@ -80,7 +84,9 @@
"starter": "Kit de inicio",
"feedback": "Comentarios",
"contribution": "Contribución",
- "eleme": "Eleme"
+ "eleme": "Eleme",
+ "elemeTech": "Eleme Tecnología",
+ "elemeDesign": "Eleme Diseño"
},
"header": {
"guide": "Guía",
@@ -111,7 +117,9 @@
"starter": "Kit de démarrage",
"feedback": "Commentaires",
"contribution": "Contribution",
- "eleme": "Eleme"
+ "eleme": "Eleme",
+ "elemeTech": "Eleme Technologie",
+ "elemeDesign": "Eleme Conception"
},
"header": {
"guide": "Guide",
diff --git a/examples/nav.config.json b/examples/nav.config.json
index f648024cd..bd42684a5 100644
--- a/examples/nav.config.json
+++ b/examples/nav.config.json
@@ -506,6 +506,10 @@
{
"path": "/result",
"title": "Result"
+ },
+ {
+ "path": "/statistic",
+ "title": "Statistic"
}
]
},
@@ -625,10 +629,6 @@
{
"path": "/drawer",
"title": "Drawer"
- },
- {
- "path": "/statistic",
- "title": "Statistic"
}
]
}
@@ -824,6 +824,10 @@
{
"path": "/result",
"title": "Result"
+ },
+ {
+ "path": "/statistic",
+ "title": "Statistic"
}
]
},
@@ -943,10 +947,6 @@
{
"path": "/drawer",
"title": "Drawer"
- },
- {
- "path": "/statistic",
- "title": "Statistic"
}
]
}
@@ -1142,6 +1142,10 @@
{
"path": "/result",
"title": "Result"
+ },
+ {
+ "path": "/statistic",
+ "title": "Statistic"
}
]
},
@@ -1261,10 +1265,6 @@
{
"path": "/drawer",
"title": "Drawer"
- },
- {
- "path": "/statistic",
- "title": "Statistic"
}
]
}
diff --git a/examples/versions.json b/examples/versions.json
index fc2abfae8..c67b6f474 100644
--- a/examples/versions.json
+++ b/examples/versions.json
@@ -1 +1 @@
-{"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","2.12.0":"2.12","2.13.2":"2.13","2.14.1":"2.14","2.15.12":"2.15"}
\ No newline at end of file
+{"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","2.12.0":"2.12","2.13.2":"2.13","2.14.1":"2.14","2.15.14":"2.15"}
\ No newline at end of file
diff --git a/package.json b/package.json
index 3b26605e2..95b92a208 100644
--- a/package.json
+++ b/package.json
@@ -1,13 +1,14 @@
{
"name": "element-ui",
- "version": "2.15.12",
+ "version": "2.15.14",
"description": "A Component Library for Vue.js.",
"main": "lib/element-ui.common.js",
"files": [
"lib",
"src",
"packages",
- "types"
+ "types",
+ "web-types.json"
],
"typings": "types/index.d.ts",
"scripts": {
diff --git a/packages/image/src/main.vue b/packages/image/src/main.vue
index 5598bde8a..c6786b848 100644
--- a/packages/image/src/main.vue
+++ b/packages/image/src/main.vue
@@ -62,7 +62,8 @@
zIndex: {
type: Number,
default: 2000
- }
+ },
+ initialIndex: Number
},
data() {
@@ -95,9 +96,15 @@
},
imageIndex() {
let previewIndex = 0;
+ const initialIndex = this.initialIndex;
+ if (initialIndex >= 0) {
+ previewIndex = initialIndex;
+ return previewIndex;
+ }
const srcIndex = this.previewSrcList.indexOf(this.src);
if (srcIndex >= 0) {
previewIndex = srcIndex;
+ return previewIndex;
}
return previewIndex;
}
diff --git a/packages/statistic/src/main.vue b/packages/statistic/src/main.vue
index 1d7a6130c..25525b744 100644
--- a/packages/statistic/src/main.vue
+++ b/packages/statistic/src/main.vue
@@ -1,6 +1,6 @@
-
-
- 抢购即将开始
-
-
-
-
-
-
- add 10 second
-
-
-
-
-
- 文嘉《明日歌》
- 暂停
-
- 明日复明日
- 明日何其多
-
- 我生待明日
-
- 万事成蹉跎
-
-
+
+
+ 抢购即将开始
+
+
+
+
+
+
+ add 10s
+
+
+
+
+
+
+
+
+ 文嘉《明日歌》
+ 暂停
+
+
+ 明日复明日
+
+ 明日何其多
+ 我生待明日
+ 万事成蹉跎
+
+
-
+
{{ title }}
@@ -8,15 +8,15 @@
-
-
+
+
{{ prefix }}
{{ disposeValue }}
-
+
{{ suffix }}
@@ -26,7 +26,7 @@
\ No newline at end of file
+
diff --git a/packages/table/src/table-body.js b/packages/table/src/table-body.js
index cd22348ff..4aea1e6b1 100644
--- a/packages/table/src/table-body.js
+++ b/packages/table/src/table-body.js
@@ -1,5 +1,5 @@
import { arrayFindIndex } from 'element-ui/src/utils/util';
-import { getCell, getColumnByCell, getRowIdentity } from './util';
+import { getCell, getColumnByCell, getRowIdentity, objectEquals } from './util';
import { getStyle, hasClass, removeClass, addClass } from 'element-ui/src/utils/dom';
import ElCheckbox from 'element-ui/packages/checkbox';
import ElTooltip from 'element-ui/packages/tooltip';
@@ -168,11 +168,20 @@ export default {
},
getRowClass(row, rowIndex) {
+ let selection = this.store.states.selection;
const classes = ['el-table__row'];
if (this.table.highlightCurrentRow && row === this.store.states.currentRow) {
classes.push('current-row');
}
+ if (this.table.highlightSelectionRow) {
+ for (let i = 0; i < selection.length; i++) {
+ if (objectEquals(row, selection[i])) {
+ classes.push('selection-row');
+ }
+ };
+ }
+
if (this.stripe && rowIndex % 2 === 1) {
classes.push('el-table__row--striped');
}
diff --git a/packages/table/src/table.vue b/packages/table/src/table.vue
index 2fa3c93ad..6fe658e9e 100644
--- a/packages/table/src/table.vue
+++ b/packages/table/src/table.vue
@@ -295,6 +295,11 @@
highlightCurrentRow: Boolean,
+ highlightSelectionRow: {
+ type: Boolean,
+ default: false
+ },
+
currentRowKey: [String, Number],
emptyText: String,
diff --git a/packages/table/src/util.js b/packages/table/src/util.js
index 7bbec8d64..995784216 100644
--- a/packages/table/src/util.js
+++ b/packages/table/src/util.js
@@ -253,3 +253,21 @@ export function walkTreeNode(root, cb, childrenKey = 'children', lazyKey = 'hasC
}
});
}
+
+export const objectEquals = function(objectA, objectB) {
+ // 取对象a和b的属性名
+ let aProps = Object.getOwnPropertyNames(objectA);
+ let bProps = Object.getOwnPropertyNames(objectB);
+ // 判断属性名的length是否一致
+ if (aProps.length !== bProps.length) {
+ return false;
+ }
+ // 循环取出属性名，再判断属性值是否一致
+ for (let i = 0; i < aProps.length; i++) {
+ let propName = aProps[i];
+ if (objectA[propName] !== objectB[propName]) {
+ return false;
+ }
+ }
+ return true;
+};
diff --git a/packages/theme-chalk/package.json b/packages/theme-chalk/package.json
index 7797ba453..30f48dca4 100644
--- a/packages/theme-chalk/package.json
+++ b/packages/theme-chalk/package.json
@@ -1,6 +1,6 @@
{
"name": "element-theme-chalk",
- "version": "2.15.12",
+ "version": "2.15.14",
"description": "Element component chalk theme.",
"main": "lib/index.css",
"style": "lib/index.css",
diff --git a/packages/theme-chalk/src/statistic.scss b/packages/theme-chalk/src/statistic.scss
index 5c9364ec9..16a3c65f6 100644
--- a/packages/theme-chalk/src/statistic.scss
+++ b/packages/theme-chalk/src/statistic.scss
@@ -2,36 +2,37 @@
@import "common/var";
@include b(statistic) {
- width: 100%;
- box-sizing: border-box;
- margin: 0;
- padding: 0;
- color: $--color-black;
- font-size: 14px;
- font-variant: tabular-nums;
- line-height: 1.5715;
- list-style: none;
- font-feature-settings: "tnum";
- text-align: center;
- .head {
- margin-bottom: 4px;
- color: #00000073;
- font-size: 14px;
+ $statistic-justify: center;
+ $statistic-align: center;
+ width: 100%;
+ box-sizing: border-box;
+ margin: 0;
+ padding: 0;
+ color: $--color-black;
+ font-variant: tabular-nums;
+ list-style: none;
+ font-feature-settings: "tnum";
+ text-align: center;
+ .head {
+ margin-bottom: 4px;
+ color: $--color-text-regular;
+ font-size: $--font-size-small;
+ }
+ .con {
+ font-family: Sans-serif;
+ display: flex;
+ justify-content: $statistic-justify;
+ align-items: $statistic-align;
+ color: $--color-text-primary;
+ .number {
+ font-size: $--font-size-extra-large;
+ padding: 0 4px;
}
-
- .con{
- font-family: Sans-serif;
- display: flex;
- justify-content :center;
- align-items: center ;
- .number{
- font-size: 20px;
- padding: 0 4px;
- }
- span{ display: inline-block;
- margin: 0;
- line-height: 100%;
- }
+ span {
+ display: inline-block;
+ margin: 0;
+ line-height: 100%;
}
-}
\ No newline at end of file
+ }
+}
diff --git a/packages/theme-chalk/src/table.scss b/packages/theme-chalk/src/table.scss
index b7e66d5a1..876702981 100644
--- a/packages/theme-chalk/src/table.scss
+++ b/packages/theme-chalk/src/table.scss
@@ -486,7 +486,7 @@
background: #FAFAFA;
}
- &.current-row td.el-table__cell {
+ &.current-row td.el-table__cell, &.selection-row td.el-table__cell {
background-color: $--table-current-row-background-color;
}
}
@@ -496,7 +496,7 @@
@include e(body) {
tr.hover-row {
&, &.el-table__row--striped {
- &, &.current-row {
+ &, &.current-row, &.selection-row {
> td.el-table__cell {
background-color: $--table-row-hover-background-color;
}
@@ -504,7 +504,7 @@
}
}
- tr.current-row > td.el-table__cell {
+ tr.current-row > td.el-table__cell, tr.selection-row > td.el-table__cell {
background-color: $--table-current-row-background-color;
}
}
diff --git a/src/directives/repeat-click.js b/src/directives/repeat-click.js
index 9aaef3add..f80d4cb48 100644
--- a/src/directives/repeat-click.js
+++ b/src/directives/repeat-click.js
@@ -1,12 +1,14 @@
import { once, on } from 'element-ui/src/utils/dom';
+import { isMac } from 'element-ui/src/utils/util';
export default {
bind(el, binding, vnode) {
let interval = null;
let startTime;
+ const maxIntervals = isMac() ? 100 : 200;
const handler = () => vnode.context[binding.expression].apply();
const clear = () => {
- if (Date.now() - startTime < 100) {
+ if (Date.now() - startTime < maxIntervals) {
handler();
}
clearInterval(interval);
@@ -18,7 +20,7 @@ export default {
startTime = Date.now();
once(document, 'mouseup', clear);
clearInterval(interval);
- interval = setInterval(handler, 100);
+ interval = setInterval(handler, maxIntervals);
});
}
};
diff --git a/src/index.js b/src/index.js
index 55b2922e6..a56bf9f87 100644
--- a/src/index.js
+++ b/src/index.js
@@ -212,7 +212,7 @@ if (typeof window !== 'undefined' && window.Vue) {
}
export default {
- version: '2.15.12',
+ version: '2.15.14',
locale: locale.use,
i18n: locale.i18n,
install,
diff --git a/src/locale/lang/es.js b/src/locale/lang/es.js
index cb118fbaf..3de78d5cd 100644
--- a/src/locale/lang/es.js
+++ b/src/locale/lang/es.js
@@ -2,7 +2,7 @@ export default {
el: {
colorpicker: {
confirm: 'Confirmar',
- clear: 'Despejar'
+ clear: 'Limpiar'
},
datepicker: {
now: 'Ahora',
diff --git a/src/locale/lang/sr-Latn.js b/src/locale/lang/sr-Latn.js
new file mode 100644
index 000000000..86cbdbc8f
--- /dev/null
+++ b/src/locale/lang/sr-Latn.js
@@ -0,0 +1,123 @@
+export default {
+ el: {
+ colorpicker: {
+ confirm: 'OK',
+ clear: 'Poništi'
+ },
+ datepicker: {
+ now: 'Sad',
+ today: 'Danas',
+ cancel: 'Otkaži',
+ clear: 'Briši',
+ confirm: 'OK',
+ selectDate: 'Izaberi datum',
+ selectTime: 'Izaberi vreme',
+ startDate: 'Datum početka',
+ startTime: 'Vreme početka',
+ endDate: 'Datum završetka',
+ endTime: 'Vreme završetka',
+ prevYear: 'Prethodna godina',
+ nextYear: 'Sledeća godina',
+ prevMonth: 'Prethodni mesec',
+ nextMonth: 'Sledeći mesec',
+ year: 'godina',
+ month1: 'januar',
+ month2: 'februar',
+ month3: 'mart',
+ month4: 'april',
+ month5: 'maj',
+ month6: 'jun',
+ month7: 'jul',
+ month8: 'avgust',
+ month9: 'septembar',
+ month10: 'oktobar',
+ month11: 'novembar',
+ month12: 'decembar',
+ week: 'sedmica',
+ weeks: {
+ sun: 'Ned',
+ mon: 'Pon',
+ tue: 'Uto',
+ wed: 'Sre',
+ thu: 'Čet',
+ fri: 'Pet',
+ sat: 'Sub'
+ },
+ months: {
+ jan: 'jan',
+ feb: 'feb',
+ mar: 'mar',
+ apr: 'apr',
+ may: 'maj',
+ jun: 'jun',
+ jul: 'jul',
+ aug: 'avg',
+ sep: 'sep',
+ oct: 'okt',
+ nov: 'nov',
+ dec: 'dev'
+ }
+ },
+ select: {
+ loading: 'Učitavanje',
+ noMatch: 'Nema rezultata',
+ noData: 'Nema podataka',
+ placeholder: 'Izaberi'
+ },
+ cascader: {
+ noMatch: 'Nema rezultata',
+ loading: 'Učitavanje',
+ placeholder: 'Izaberi',
+ noData: 'Nema podataka'
+ },
+ pagination: {
+ goto: 'Idi na',
+ pagesize: '/strani',
+ total: 'Ukupno {total}',
+ pageClassifier: ''
+ },
+ messagebox: {
+ title: 'Poruka',
+ confirm: 'OK',
+ cancel: 'Otkaži',
+ error: 'Neisravan unos'
+ },
+ upload: {
+ deleteTip: 'pritisni BRIŠI da obrišeš',
+ delete: 'Briši',
+ preview: 'Vidi',
+ continue: 'Nastavi'
+ },
+ table: {
+ emptyText: 'Nema podataka',
+ confirmFilter: 'Potvrdi',
+ resetFilter: 'Resetuj',
+ clearFilter: 'Sve',
+ sumText: 'Zbir'
+ },
+ tree: {
+ emptyText: 'Nema podataka'
+ },
+ transfer: {
+ noMatch: 'Nema rezultata',
+ noData: 'Nema podataka',
+ titles: ['Lista 1', 'Lista 2'],
+ filterPlaceholder: 'Unesi ključnu reč',
+ noCheckedFormat: '{total} stavki',
+ hasCheckedFormat: '{checked}/{total} obeleženih'
+ },
+ image: {
+ error: 'NEUSPEŠNO'
+ },
+ pageHeader: {
+ title: 'Nazad'
+ },
+ popconfirm: {
+ confirmButtonText: 'Da',
+ cancelButtonText: 'Ne'
+ },
+ empty: {
+ description: 'Nema podataka'
+ }
+ }
+};
diff --git a/src/locale/lang/uz-UZ.js b/src/locale/lang/uz-UZ.js
index de06bf1ef..fb5924b52 100644
--- a/src/locale/lang/uz-UZ.js
+++ b/src/locale/lang/uz-UZ.js
@@ -62,7 +62,7 @@ export default {
loading: 'Yuklanmoqda',
noMatch: 'Mos maʼlumot yoʻq',
noData: 'Maʼlumot yoʻq',
- placeholder: 'Tanladizngiz'
+ placeholder: 'Tanlang'
},
cascader: {
noMatch: 'Mos maʼlumot topilmadi',
@@ -85,8 +85,8 @@ export default {
upload: {
deleteTip: 'Oʻchirish tugmasini bosib oʻchiring',
delete: 'Oʻchirish',
- preview: 'Oldin koʻrish',
- continue: 'Davom qilish'
+ preview: 'Oldindan koʻrish',
+ continue: 'Davom etish'
},
table: {
emptyText: 'Boʻsh',
@@ -113,8 +113,8 @@ export default {
title: 'Orqaga'
},
popconfirm: {
- confirmButtonText: 'Yes', // to be translated
- cancelButtonText: 'No' // to be translated
+ confirmButtonText: 'Tasdiqlash',
+ cancelButtonText: 'Bekor qilish'
},
empty: {
description: 'Boʻsh'
diff --git a/src/utils/util.js b/src/utils/util.js
index eab95814a..a9634d7ad 100644
--- a/src/utils/util.js
+++ b/src/utils/util.js
@@ -239,3 +239,7 @@ export function objToArray(obj) {
}
return isEmpty(obj) ? [] : [obj];
}
+
+export const isMac = function() {
+ return !Vue.prototype.$isServer && /macintosh|mac os x/i.test(navigator.userAgent);
+};
diff --git a/temp_web/element b/temp_web/element
new file mode 160000
index 000000000..2a8ac9bc8
--- /dev/null
+++ b/temp_web/element
@@ -0,0 +1 @@
+Subproject commit 2a8ac9bc83472e13f0325d13db686fc50739d187
diff --git a/types/element-ui.d.ts b/types/element-ui.d.ts
index 1521ae69e..62c4f2ad4 100644
--- a/types/element-ui.d.ts
+++ b/types/element-ui.d.ts
@@ -1,352 +1,3 @@
-
-import Vue, { PluginObject } from 'vue'
-import { ElementUIComponent, ElementUIComponentSize, ElementUIHorizontalAlignment } from './component'
-
-import { ElAlert } from './alert'
-import { ElAside } from './aside'
-import { ElAutocomplete } from './autocomplete'
-import { ElBadge } from './badge'
-import { ElBreadcrumb } from './breadcrumb'
-import { ElBreadcrumbItem } from './breadcrumb-item'
-import { ElButton } from './button'
-import { ElButtonGroup } from './button-group'
-import { ElCard } from './card'
-import { ElCarousel } from './carousel'
-import { ElCarouselItem } from './carousel-item'
-import { ElCascader } from './cascader'
-import { ElCheckbox } from './checkbox'
-import { ElCheckboxButton } from './checkbox-button'
-import { ElCheckboxGroup } from './checkbox-group'
-import { ElCol } from './col'
-import { ElCollapse } from './collapse'
-import { ElCollapseItem } from './collapse-item'
-import { ElColorPicker } from './color-picker'
-import { ElContainer } from './container'
-import { ElDatePicker } from './date-picker'
-import { ElDialog } from './dialog'
-import { ElDropdown } from './dropdown'
-import { ElDropdownItem } from './dropdown-item'
-import { ElDropdownMenu } from './dropdown-menu'
-import { ElFooter } from './footer'
-import { ElForm } from './form'
-import { ElFormItem } from './form-item'
-import { ElHeader } from './header'
-import { ElInput } from './input'
-import { ElInputNumber } from './input-number'
-import { ElLoading } from './loading'
-import { ElMain } from './main'
-import { ElMenu } from './menu'
-import { ElMenuItem } from './menu-item'
-import { ElMenuItemGroup } from './menu-item-group'
-import { ElMessage } from './message'
-import { ElMessageBox } from './message-box'
-import { ElNotification } from './notification'
-import { ElOption } from './option'
-import { ElOptionGroup } from './option-group'
-import { ElPagination } from './pagination'
-import { ElPopover } from './popover'
-import { ElProgress } from './progress'
-import { ElRate } from './rate'
-import { ElRadio } from './radio'
-import { ElRadioButton } from './radio-button'
-import { ElRadioGroup } from './radio-group'
-import { ElRow } from './row'
-import { ElSelect } from './select'
-import { ElSlider } from './slider'
-import { ElStep } from './step'
-import { ElSteps } from './steps'
-import { ElSubmenu } from './submenu'
-import { ElSwitch } from './switch'
-import { ElTable } from './table'
-import { ElTableColumn } from './table-column'
-import { ElTag } from './tag'
-import { ElTabs } from './tabs'
-import { ElTabPane } from './tab-pane'
-import { ElTimeline } from './timeline'
-import { ElTimelineItem } from './timeline-item'
-import { ElTimePicker } from './time-picker'
-import { ElTimeSelect } from './time-select'
-import { ElTooltip } from './tooltip'
-import { ElTransfer } from './transfer'
-import { ElTree, TreeData } from './tree'
-import { ElUpload } from './upload'
-import { ElLink } from './link'
-import { ElDivider } from './divider'
-import { ElIcon } from './icon'
-import { ElCalendar } from './calendar'
-import { ElImage } from './image'
-import { ElBacktop } from './backtop'
-import { ElInfiniteScroll } from './infinite-scroll'
-import { ElPageHeader } from './page-header'
-import { ElAvatar } from './avatar'
-import { ElDrawer } from './drawer'
-
-import { ElStatistic } from './statistic'
-
-export interface InstallationOptions {
- locale: any,
- i18n: any,
- size: string
-}
-
-/** The version of element-ui */
-export const version: string
-
-/**
- * Install all element-ui components into Vue.
- * Please do not invoke this method directly.
- * Call `Vue.use(ElementUI)` to install.
- */
-export function install (vue: typeof Vue, options: InstallationOptions): void
-
-/** ElementUI component common definition */
-export type Component = ElementUIComponent
-
-/** Component size definition for button, input, etc */
-export type ComponentSize = ElementUIComponentSize
-
-/** Horizontal alignment */
-export type HorizontalAlignment = ElementUIHorizontalAlignment
-
-/** Show animation while loading data */
-export const Loading: ElLoading
-
-/** Used to show feedback after an activity. The difference with Notification is that the latter is often used to show a system level passive notification. */
-export const Message: ElMessage
-
-/** A set of modal boxes simulating system message box, mainly for message prompt, success tips, error messages and query information */
-export const MessageBox: ElMessageBox
-
-/** Displays a global notification message at the upper right corner of the page */
-export const Notification: ElNotification
-
-// TS cannot merge imported class with namespace, so declare subclasses instead
-
-/** Alert Component */
-export class Alert extends ElAlert {}
-
-/** Aside Component */
-export class Aside extends ElAside {}
-
-/** Autocomplete Component */
-export class Autocomplete extends ElAutocomplete {}
-
-/** Bagde Component */
-export class Badge extends ElBadge {}
-
-/** Breadcrumb Component */
-export class Breadcrumb extends ElBreadcrumb {}
-
-/** Breadcrumb Item Component */
-export class BreadcrumbItem extends ElBreadcrumbItem {}
-
-/** Button Component */
-export class Button extends ElButton {}
-
-/** Button Group Component */
-export class ButtonGroup extends ElButtonGroup {}
-
-/** Card Component */
-export class Card extends ElCard {}
-
-/** Cascader Component */
-export class Cascader extends ElCascader {}
-
-/** Carousel Component */
-export class Carousel extends ElCarousel {}
-
-/** Carousel Item Component */
-export class CarouselItem extends ElCarouselItem {}
-
-/** Checkbox Component */
-export class Checkbox extends ElCheckbox {}
-
-/** Checkbox Button Component */
-export class CheckboxButton extends ElCheckboxButton {}
-
-/** Checkbox Group Component */
-export class CheckboxGroup extends ElCheckboxGroup {}
-
-/** Colunm Layout Component */
-export class Col extends ElCol {}
-
-/** Collapse Component */
-export class Collapse extends ElCollapse {}
-
-/** Collapse Item Component */
-export class CollapseItem extends ElCollapseItem {}
-
-/** Color Picker Component */
-export class ColorPicker extends ElColorPicker {}
-
-/** Container Component */
-export class Container extends ElContainer {}
-
-/** Date Picker Component */
-export class DatePicker extends ElDatePicker {}
-
-/** Dialog Component */
-export class Dialog extends ElDialog {}
-
-/** Dropdown Component */
-export class Dropdown extends ElDropdown {}
-
-/** Dropdown Item Component */
-export class DropdownItem extends ElDropdownItem {}
-
-/** Dropdown Menu Component */
-export class DropdownMenu extends ElDropdownMenu {}
-
-/** Footer Component */
-export class Footer extends ElFooter {}
-
-/** Form Component */
-export class Form extends ElForm {}
-
-/** Form Item Component */
-export class FormItem extends ElFormItem {}
-
-/** Header Component */
-export class Header extends ElHeader {}
-
-/** Input Component */
-export class Input extends ElInput {}
-
-/** Input Number Component */
-export class InputNumber extends ElInputNumber {}
-
-/** Main Component */
-export class Main extends ElMain {}
-
-/** Menu that provides navigation for your website */
-export class Menu extends ElMenu {}
-
-/** Menu Item Component */
-export class MenuItem extends ElMenuItem {}
-
-/** Menu Item Group Component */
-export class MenuItemGroup extends ElMenuItemGroup {}
-
-/** Dropdown Select Option Component */
-export class Option extends ElOption {}
-
-/** Dropdown Select Option Group Component */
-export class OptionGroup extends ElOptionGroup {}
-
-/** Pagination Component */
-export class Pagination extends ElPagination {}
-
-/** Popover Component */
-export class Popover extends ElPopover {}
-
-/** Progress Component */
-export class Progress extends ElProgress {}
-
-/** Rate Component */
-export class Rate extends ElRate {}
-
-/** Radio Component */
-export class Radio extends ElRadio {}
-
-/** Radio Button Component */
-export class RadioButton extends ElRadioButton {}
-
-/** Radio Group Component */
-export class RadioGroup extends ElRadioGroup {}
-
-/** Row Layout Component */
-export class Row extends ElRow {}
-
-/** Dropdown Select Component */
-export class Select extends ElSelect {}
-
-/** Slider Component */
-export class Slider extends ElSlider {}
-
-/** Step Component */
-export class Step extends ElStep {}
-
-/** Steps Component */
-export class Steps extends ElSteps {}
-
-/** Submenu Component */
-export class Submenu extends ElSubmenu {}
-
-/** Switch Component */
-export class Switch extends ElSwitch {}
-
-/** Table Component */
-export class Table extends ElTable {}
-
-/** Table Column Component */
-export class TableColumn extends ElTableColumn {}
-
-/** Tabs Component */
-export class Tabs extends ElTabs {}
-
-/** Tab Pane Component */
-export class TabPane extends ElTabPane {}
-
-/** Tag Component */
-export class Tag extends ElTag {}
-
-/** Timeline Component */
-export class Timeline extends ElTimeline {}
-
-/** Timeline Item Component */
-export class TimelineItem extends ElTimelineItem {}
-
-/** TimePicker Component */
-export class TimePicker extends ElTimePicker {}
-
-/** TimeSelect Component */
-export class TimeSelect extends ElTimeSelect {}
-
-/** Tooltip Component */
-export class Tooltip extends ElTooltip {}
-
-/** Transfer Component */
-export class Transfer extends ElTransfer {}
-
-/** Tree Component */
-export class Tree extends ElTree {}
-
-/** Upload Component */
-export class Upload extends ElUpload {}
-
-/** Divider Component */
-export class Divider extends ElDivider {}
-
-/** Link Component */
-export class Link extends ElLink {}
-
-/** Image Component */
-export class Image extends ElImage {}
-
-/** Icon Component */
-export class Icon extends ElIcon {}
-
-/** Calendar Component */
-export class Calendar extends ElCalendar {}
-
-/** Backtop Component */
-export class Backtop extends ElBacktop {}
-
-/** InfiniteScroll Directive */
-export const InfiniteScroll: PluginObject;
-
-/** PageHeader Component */
-export class PageHeader extends ElPageHeader {}
-
-/** Avatar Component */
-export class Avatar extends ElAvatar {}
-
-/** Drawer Component */
-export class Drawer extends ElDrawer {}
-
-/** Statistic Component */
-export class Statistic extends ElStatistic {}
-
import Vue, { PluginObject } from 'vue'
import { ElementUIComponent, ElementUIComponentSize, ElementUIHorizontalAlignment } from './component'
@@ -437,6 +88,7 @@ import { ElSpinner } from './spinner'
import { ElDescriptions } from './descriptions'
import { ElDescriptionsItem } from './descriptions-item'
import { ElResult } from './result'
+import { ElStatistic } from './statistic'
export interface InstallationOptions {
locale: any,
@@ -725,3 +377,6 @@ export class DescriptionsItem extends ElDescriptionsItem {}
/** Result Component */
export class Result extends ElResult {}
+
+/** Statistic Component */
+export class Statistic extends ElStatistic {}
\ No newline at end of file
diff --git a/types/image.d.ts b/types/image.d.ts
index 82b18dce9..8640e4bd7 100644
--- a/types/image.d.ts
+++ b/types/image.d.ts
@@ -38,4 +38,6 @@ export declare class ElImage extends ElementUIComponent {
previewSrcList: string[]
zIndex: number
+
+ initialIndex: number
}
diff --git a/types/statistic.d.ts b/types/statistic.d.ts
index 9f9b1fbc7..1221a4c92 100644
--- a/types/statistic.d.ts
+++ b/types/statistic.d.ts
@@ -2,26 +2,36 @@ import { ElementUIComponent } from './component'
/** Statistic Component */
export declare class ElStatistic extends ElementUIComponent {
- /** Set the decimal point */
- decimalSeparator:string
- /** Sets the thousandth identifier */
- groupSeparator:string
- /** numerical precision */
- precision:number
+ /** Set the decimal point */
+ decimalSeparator: string
+
+ /** Sets the thousandth identifier */
+ groupSeparator: string
+
+ /** numerical precision */
+ precision: number
+
/** Numerical content */
- value:string|number
- /** Title of numerical value */
- title:string|number
- /**Whether to enable the countdown function */
- timeIndices:boolean
- /** Sets the style of the value */
- valueStyle:object
- /** Numeric content formatting countdown display*/
- format:string
- /** Set the ratio */
- rate:number
- /** Set the suffix of the value*/
- suffix:string
- /** Set the prefix of the value*/
- prefix:string
+ value: string | number
+
+ /** Title of numerical value */
+ title: string | number
+
+ /** Whether to enable the countdown function */
+ timeIndices: boolean
+
+ /** Sets the style of the value */
+ valueStyle: object
+
+ /** Numeric content formatting countdown display */
+ format: string
+
+ /** Set the ratio */
+ rate: number
+
+ /** Set the suffix of the value */
+ suffix: string
+
+ /** Set the prefix of the value */
+ prefix: string
}
diff --git a/types/table.d.ts b/types/table.d.ts
index da5bb3806..860c2f9af 100644
--- a/types/table.d.ts
+++ b/types/table.d.ts
@@ -63,6 +63,9 @@ export declare class ElTable extends ElementUIComponent {
/** Whether current row is highlighted */
highlightCurrentRow: boolean
+ /** Whether selection row is highlighted */
+ highlightSelectionRow: boolean
+
/** Key of current row, a set only prop */
currentRowKey: string | number
diff --git a/web-types.json b/web-types.json
index 22c289d9b..5b6201b27 100644
--- a/web-types.json
+++ b/web-types.json
@@ -371,7 +371,7 @@
{
"name": "type",
"description": "Button type",
- "type": "'primary' | 'success' | 'warning' | 'danger' | 'info' | 'text"
+ "type": "'primary' | 'success' | 'warning' | 'danger' | 'info' | 'text'"
},
{
"name": "plain",