FIX: 修复进度点没有显示完整的问题

lucaszhu2zgf · Jun 7, 2020 · af4f20a · af4f20a
1 parent 57535d6
commit af4f20a
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/dist/progress.js b/dist/progress.js
@@ -273,12 +273,12 @@ var MpProgress = /*#__PURE__*/function () {
               if (this._options.dotStyle.length > 0) {
                 var circleR = this._options.dotStyle[0].r;
 
-                if (circleR > maxBarWidth) {
-                  var diff = circleR - maxBarWidth + (this._options.dotStyle[0].shadow ? circleR / 2 : 0);
-                  _r -= diff;
+                if (circleR * 2 > maxBarWidth) {
+                  var shadowDiff = this._options.dotStyle[0].shadow ? circleR / 4 : 0;
+                  _r -= circleR - maxBarWidth + shadowDiff;
 
                   if (this._percent !== 100) {
-                    originY -= diff;
+                    originY -= circleR + shadowDiff;
                   }
                 }
               } else {

diff --git a/dist/progress.min.js b/dist/progress.min.js
diff --git a/src/index.js b/src/index.js
@@ -135,11 +135,11 @@ class MpProgress {
                         // 考虑剔除进度点的宽度差以及进度点阴影的宽度查
                         if (this._options.dotStyle.length > 0) {
                             const circleR = this._options.dotStyle[0].r;
-                            if (circleR > maxBarWidth) {
-                                const diff = circleR - maxBarWidth + (this._options.dotStyle[0].shadow ? circleR / 2 : 0);
-                                _r -= diff;
+                            if (circleR*2 > maxBarWidth) {
+                                const shadowDiff = this._options.dotStyle[0].shadow ? circleR / 4 : 0;
+                                _r -= circleR - maxBarWidth + shadowDiff;
                                 if (this._percent !== 100) {
-                                    originY -= diff;
+                                    originY -= circleR + shadowDiff;
                                 }
                             }
                         } else {