fix(Circle): README.md size type mistaken (#2694)

* fix(Circle): size support unit * fix(Circle): README.md size type mistaken
youzan · Feb 5, 2020 · b85187a · b85187a
1 parent 3f550d4
commit b85187a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git a/packages/circle/README.md b/packages/circle/README.md
@@ -89,7 +89,7 @@ Page({
 | 参数         | 说明                                   | 类型               | 默认值    | 版本 |
 | ------------ | -------------------------------------- | ------------------ | --------- | ---- |
 | value        | 目标进度                               | *number*          | `0`     | -    |
-| size         | 圆环直径，默认单位为 `px`              | *string \| number* | `100`     | -    |
+| size         | 圆环直径，默认单位为 `px`              | *number* | `100`     | -    |
 | color        | 进度条颜色，传入对象格式可以定义渐变色 | *string \| object* | `#1989fa` | -    |
 | layer-color  | 轨道颜色                               | *string*           | `#fff`    | -    |
 | fill         | 填充颜色                               | *string*           | -    | -    |

diff --git a/packages/circle/index.ts b/packages/circle/index.ts
@@ -28,7 +28,6 @@ VantComponent({
     size: {
       type: Number,
       value: 100,
-      observer: 'setStyle'
     },
     fill: String,
     layerColor: {
@@ -51,7 +50,6 @@ VantComponent({
   },
 
   data: {
-    style: 'width: 100px; height: 100px;',
     hoverColor: BLUE
   },
 
@@ -78,14 +76,6 @@ VantComponent({
 
       this.setData({ hoverColor });
     },
-
-    setStyle() {
-      const { size } = this.data;
-      const style = `width: ${size}px; height: ${size}px;`;
-
-      this.setData({ style });
-    },
-
     presetCanvas(context, strokeStyle, beginAngle, endAngle, fill) {
       const { strokeWidth, lineCap, clockwise, size } = this.data;
       const position = size / 2;

diff --git a/packages/circle/index.wxml b/packages/circle/index.wxml
@@ -1,5 +1,7 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
 <view class="van-circle">
-  <canvas class="van-circle__canvas" style="{{ style }}" canvas-id="van-circle"></canvas>
+  <canvas class="van-circle__canvas" style="width: {{ utils.addUnit(size) }};height:{{ utils.addUnit(size) }}" canvas-id="van-circle"></canvas>
   <view wx:if="{{ !text }}" class="van-circle__text">
     <slot></slot>
   </view>