diff --git a/src/circle/README.md b/src/circle/README.md index 25ce9c548..a39eec954 100644 --- a/src/circle/README.md +++ b/src/circle/README.md @@ -113,14 +113,14 @@ export default { | Attribute | Description | Type | Default | |------|------|------|------| | v-model | Current rate | *number* | - | -| rate | Target rate | *number* | `100` | +| rate | Target rate | *string \| number* | `100` | | size | Circle size | *string \| number* | `100px` | | color `v2.1.4` | Progress color, passing object to render gradient | *string \| object* | `#1989fa` | | layer-color | Layer color | *string* | `#fff` | | fill | Fill color | *string* | `none` | -| speed | Animate speed(rate/s)| *number* | `0` | +| speed | Animate speed(rate/s)| *string \| number* | `0` | | text | Text | *string* | - | -| stroke-width | Stroke width | *number* | `40` | +| stroke-width | Stroke width | *string \| number* | `40` | | stroke-linecap `v2.2.15` | Stroke linecap,can be set to `sqaure` `butt` | *string* | `round` | | clockwise | Whether to be clockwise | *boolean* | `true` | diff --git a/src/circle/README.zh-CN.md b/src/circle/README.zh-CN.md index d2c0ebf86..6ba585440 100644 --- a/src/circle/README.zh-CN.md +++ b/src/circle/README.zh-CN.md @@ -125,14 +125,14 @@ export default { | 参数 | 说明 | 类型 | 默认值 | |------|------|------|------| | v-model | 当前进度 | *number* | - | -| rate | 目标进度 | *number* | `100` | +| rate | 目标进度 | *string \| number* | `100` | | size | 圆环直径,默认单位为 `px` | *string \| number* | `100px` | | color `v2.1.4` | 进度条颜色,传入对象格式可以定义渐变色 | *string \| object* | `#1989fa` | | layer-color | 轨道颜色 | *string* | `#fff` | | fill | 填充颜色 | *string* | `none` | -| speed | 动画速度(单位为 rate/s)| *number* | `0` | +| speed | 动画速度(单位为 rate/s)| *string \| number* | `0` | | text | 文字 | *string* | - | -| stroke-width | 进度条宽度 | *number* | `40` | +| stroke-width | 进度条宽度 | *string \| number* | `40` | | stroke-linecap `v2.2.15` | 进度条端点的形状,可选值为`sqaure` `butt` | *string* | `round` | | clockwise | 是否顺时针增加 | *boolean* | `true` | diff --git a/src/circle/index.js b/src/circle/index.js index 2e70ef031..9e06f9a15 100644 --- a/src/circle/index.js +++ b/src/circle/index.js @@ -27,11 +27,11 @@ export default createComponent({ default: 0, }, speed: { - type: Number, + type: [Number, String], default: 0, }, size: { - type: [String, Number], + type: [Number, String], default: 100, }, fill: { @@ -39,7 +39,7 @@ export default createComponent({ default: 'none', }, rate: { - type: Number, + type: [Number, String], default: 100, }, layerColor: { @@ -51,7 +51,7 @@ export default createComponent({ default: BLUE, }, strokeWidth: { - type: Number, + type: [Number, String], default: 40, }, clockwise: { @@ -78,7 +78,7 @@ export default createComponent({ }, viewBoxSize() { - return 1000 + this.strokeWidth; + return +this.strokeWidth + 1000; }, layerStyle() { @@ -86,7 +86,7 @@ export default createComponent({ return { stroke: `${this.color}`, - strokeWidth: `${this.strokeWidth + 1}px`, + strokeWidth: `${+this.strokeWidth + 1}px`, strokeLinecap: this.strokeLinecap, strokeDasharray: `${offset}px ${PERIMETER}px`, }; diff --git a/src/progress/index.js b/src/progress/index.js index cafbb5d1e..85f6a7d6d 100644 --- a/src/progress/index.js +++ b/src/progress/index.js @@ -10,7 +10,7 @@ export default createComponent({ textColor: String, pivotColor: String, trackColor: String, - strokeWidth: [String, Number], + strokeWidth: [Number, String], percentage: { type: Number, required: true, diff --git a/src/switch/shared.ts b/src/switch/shared.ts index 9ac4b4913..0b4c269d0 100644 --- a/src/switch/shared.ts +++ b/src/switch/shared.ts @@ -14,7 +14,7 @@ export type SharedSwitchProps = { }; export const switchProps = { - size: [String, Number], + size: [Number, String], value: null as any, loading: Boolean, disabled: Boolean,