diff --git a/src/circle/README.md b/src/circle/README.md index 896a0e108..2c13f51e3 100644 --- a/src/circle/README.md +++ b/src/circle/README.md @@ -114,7 +114,7 @@ export default { |------|------|------|------| | v-model | Current rate | `number` | - | | rate | Target rate | `number` | `100` | -| size | Circle size | `string` | `100px` | +| size | Circle size | `string | number` | `100px` | | color | Progress color, passing object to render gradient | `string | object` | `#1989fa` | | layer-color | Layer color | `string` | `#fff` | | fill | Fill color | `string` | `none` | diff --git a/src/circle/README.zh-CN.md b/src/circle/README.zh-CN.md index abd671fb7..1f2413e1e 100644 --- a/src/circle/README.zh-CN.md +++ b/src/circle/README.zh-CN.md @@ -126,7 +126,7 @@ export default { |------|------|------|------|------| | v-model | 当前进度 | `number` | - | - | | rate | 目标进度 | `number` | `100` | - | -| size | 圆环直径 | `string` | `100px` | - | +| size | 圆环直径,默认单位为 `px` | `string | number` | `100px` | - | | color | 进度条颜色,传入对象格式可以定义渐变色 | `string | object` | `#1989fa` | 2.1.4 | | layer-color | 轨道颜色 | `string` | `#fff` | - | | fill | 填充颜色 | `string` | `none` | - | diff --git a/src/circle/index.js b/src/circle/index.js index f3bab8f13..a61aa7e56 100644 --- a/src/circle/index.js +++ b/src/circle/index.js @@ -1,4 +1,4 @@ -import { createNamespace, isObj } from '../utils'; +import { createNamespace, isObj, addUnit } from '../utils'; import { raf, cancelRaf } from '../utils/dom/raf'; import { BLUE, WHITE } from '../utils/constant'; @@ -29,8 +29,8 @@ export default createComponent({ default: 0 }, size: { - type: String, - default: '100px' + type: [String, Number], + default: 100 }, fill: { type: String, @@ -64,9 +64,10 @@ export default createComponent({ computed: { style() { + const size = addUnit(this.size); return { - width: this.size, - height: this.size + width: size, + height: size }; }, diff --git a/src/circle/test/__snapshots__/index.spec.js.snap b/src/circle/test/__snapshots__/index.spec.js.snap index d3e0afa57..81802911a 100644 --- a/src/circle/test/__snapshots__/index.spec.js.snap +++ b/src/circle/test/__snapshots__/index.spec.js.snap @@ -1,5 +1,12 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP +exports[`size prop 1`] = ` +
+`; + exports[`speed is 0 1`] = `