diff --git a/examples/docs/en-US/progress.md b/examples/docs/en-US/progress.md index 58ca755ce..c8c24a0f8 100644 --- a/examples/docs/en-US/progress.md +++ b/examples/docs/en-US/progress.md @@ -48,7 +48,8 @@ In this case the percentage takes no additional space. -``` +Done +``` ::: ### Attributes @@ -58,7 +59,7 @@ In this case the percentage takes no additional space. | type | the type of progress bar | string | line/circle | line | | stroke-width | the width of progress bar | number | — | 6 | | text-inside | whether to place the percentage inside progress bar, only works when `type` is 'line' | boolean | — | false | -| status | the current status of progress bar | string | success/exception | — | +| status | the current status of progress bar | string | success/exception/text | — | | color | background color of progress bar. Overrides `status` prop | string | — | — | | width | the canvas width of circle progress bar | number | — | 126 | | show-text | whether to show percentage | boolean | — | true | diff --git a/examples/docs/es/progress.md b/examples/docs/es/progress.md index 3ed961bc5..788382299 100644 --- a/examples/docs/es/progress.md +++ b/examples/docs/es/progress.md @@ -46,6 +46,7 @@ En este caso el porcentage no toma espacio adicional. +Done ``` ::: @@ -56,7 +57,7 @@ En este caso el porcentage no toma espacio adicional. | type | tipo de barra de progreso | string | line/circle | line | | stroke-width | ancho de la barra de progreso | number | — | 6 | | text-inside | mostrar el porcentaje dentro de la barra de progreso, solo funciona cuando `type` es 'line' | boolean | — | false | -| status | estado actual de la barra de progreso | string | success/exception | — | +| status | estado actual de la barra de progreso | string | success/exception/text | — | | color | color de fondo de la barra de progreso. Sobreescribe la propiedad `status` | string | — | — | | width | ancho del canvas que contiene la barra de progreso circula | number | — | 126 | | show-text | mostrar porcentaje | boolean | — | true | diff --git a/examples/docs/zh-CN/progress.md b/examples/docs/zh-CN/progress.md index a6b1b9c9f..d00aca7c3 100644 --- a/examples/docs/zh-CN/progress.md +++ b/examples/docs/zh-CN/progress.md @@ -52,6 +52,7 @@ +Done ``` ::: @@ -62,7 +63,7 @@ | type | 进度条类型 | string | line/circle | line | | stroke-width | 进度条的宽度,单位 px | number | — | 6 | | text-inside | 进度条显示文字内置在进度条内(只在 type=line 时可用) | boolean | — | false | -| status | 进度条当前状态 | string | success/exception | — | +| status | 进度条当前状态 | string | success/exception/text | — | | color | 进度条背景色(会覆盖 status 状态颜色) | string | — | — | | width | 环形进度条画布宽度(只在 type=circle 时可用) | number | | 126 | | show-text | 是否显示进度条文字内容 | boolean | — | true | diff --git a/packages/progress/src/progress.vue b/packages/progress/src/progress.vue index e1337d851..2417eba06 100644 --- a/packages/progress/src/progress.vue +++ b/packages/progress/src/progress.vue @@ -27,13 +27,12 @@ -
+
- +
@@ -53,7 +52,8 @@ validator: val => val >= 0 && val <= 100 }, status: { - type: String + type: String, + validator: val => ['text', 'success', 'exception'].indexOf(val) > -1 }, strokeWidth: { type: Number, diff --git a/test/unit/specs/progress.spec.js b/test/unit/specs/progress.spec.js index 3bb3f25b1..16a3380a7 100644 --- a/test/unit/specs/progress.spec.js +++ b/test/unit/specs/progress.spec.js @@ -33,6 +33,7 @@ describe('Progress', () => { + Done ` }, true); @@ -45,6 +46,7 @@ describe('Progress', () => { expect(vm.$refs.circleSuccess.$el.querySelector('.el-progress__text .el-icon-check')).to.be.exist; expect(vm.$refs.circleException.$el.classList.contains('is-exception')).to.be.true; expect(vm.$refs.circleException.$el.querySelector('.el-progress__text .el-icon-close')).to.be.exist; + expect(vm.$refs.textException.$el.querySelector('.el-progress__text').innerText).to.be.equal('Done'); }); it('text inside', () => { vm = createVue({ diff --git a/types/progress.d.ts b/types/progress.d.ts index 933347c4b..aff7f183a 100644 --- a/types/progress.d.ts +++ b/types/progress.d.ts @@ -1,7 +1,7 @@ import { ElementUIComponent } from './component' export type ProgressType = 'line' | 'circle' -export type ProgressStatus = 'success' | 'exception' +export type ProgressStatus = 'success' | 'exception' | 'text' /** Progress Component */ export declare class ElProgress extends ElementUIComponent {