FORMAT CODE

lucaszhu2zgf · May 19, 2020 · 83768b1 · 83768b1
1 parent 878f516
commit 83768b1
Show file tree

Hide file tree

Showing 7 changed files with 5,418 additions and 5,390 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,13 +1,13 @@
 {
     "presets": [
-      [
-        "@babel/preset-env",
-        {
-          "targets": {
-            "uglify": true
-          },
-          "modules": false
-        }
-      ]
+        [
+            "@babel/preset-env",
+            {
+                "targets": {
+                    "uglify": true
+                },
+                "modules": false
+            }
+        ]
     ]
-  }
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "editor.tabSize": 4,
+}
diff --git a/dist/progress.js b/dist/progress.js
@@ -223,9 +223,12 @@ var MpProgress = /*#__PURE__*/function () {
                   var circleR = _this._options.dotStyle[0].r;
 
                   if (circleR > maxBarWidth) {
-                    var diff = circleR - maxBarWidth + (_this._options.dotStyle[0].shadow ? circleR : 0);
+                    var diff = circleR - maxBarWidth + (_this._options.dotStyle[0].shadow ? circleR / 2 : 0);
                     _r -= diff;
-                    originY -= diff;
+
+                    if (_this._percent !== 100) {
+                      originY -= diff;
+                    }
                   }
                 } else {
                   console.warn('参数dotStyle不完整，请检查');
@@ -237,6 +240,8 @@ var MpProgress = /*#__PURE__*/function () {
                 }
               }
 
+              console.log(originX, originY);
+
               _this._context.translate(_this.convertLength(originX), _this.convertLength(originY)); // arc原点默认为3点钟方向，需要调整到12点
 
 

diff --git a/dist/progress.min.js b/dist/progress.min.js