Merge branch 'v2-dev' of https://github.com/jdf2e/nutui into v2-dev

Author: yangkaixuan

src/packages/circleprogress/circleprogress.vue

@@ -10,8 +10,7 @@
         :stroke-dasharray="arcLength"
         :stroke-width="strokeInnerWidth"
         fill="none"
-        transform="rotate(-90)"
-        transform-origin="center"
+        :transform="option.startPosition"
         stroke-linecap="round"
         style="transition: stroke-dasharray 0.6s ease 0s, stroke 0.6s ease 0s;"
       />
@@ -72,6 +71,7 @@ export default {
       // 圆心位置自动生成
       baseOption.cy = baseOption.cx = baseOption.radius + baseOption.strokeOutWidth;
       baseOption.size = (baseOption.radius + baseOption.strokeOutWidth) * 2;
+      baseOption.startPosition = 'rotate(-90,' + baseOption.cx + ',' + baseOption.cy + ')';
       return baseOption;
     }
   }

src/packages/uploader/uploader.vue

@@ -147,13 +147,12 @@ export default {
         }
       };
     },
-    // 测试
     preventMoreClick() {
       setTimeout(() => {
         this.newdisabled = true;
       }, 0);
       setTimeout(() => {
-        this.newdisabled = false; //点击一次时隔50豪秒后才能再次点击
+        this.newdisabled = false;
       }, 500);
     },
     uploadData($event, selfData = {}, fileBlob = undefined) {