diff --git a/dist/progress.js b/dist/progress.js index 560d8c0..37a2600 100644 --- a/dist/progress.js +++ b/dist/progress.js @@ -1,4 +1,4 @@ -/*! mp-progress.js v1.2.7 https://www.npmjs.com/package/mp-progress */ +/*! mp-progress.js v1.2.8 https://www.npmjs.com/package/mp-progress */ (function webpackUniversalModuleDefinition(root, factory) { if(typeof exports === 'object' && typeof module === 'object') module.exports = factory(); @@ -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 index 2e62ab8..8453b84 100644 --- a/dist/progress.min.js +++ b/dist/progress.min.js @@ -1,2 +1,2 @@ -/*! mp-progress.js v1.2.7 https://www.npmjs.com/package/mp-progress */ -var t,e;t=window,e=function(){return i={},o.m=n=[function(t,e,n){"use strict";function i(e,t){var n,i=Object.keys(e);return Object.getOwnPropertySymbols&&(n=Object.getOwnPropertySymbols(e),t&&(n=n.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),i.push.apply(i,n)),i}function o(o){for(var t=1;t100]: 已自动调整为100")),this._options.percentage=+t||0,this._context?this.drawFn():wx.createSelectorQuery().in(this._options.target).select("#".concat(this._options.canvasId)).fields({node:!0,size:!0}).exec(function(t){var e=t[0].node;o._requestAnimationFrame=e.requestAnimationFrame.bind(e);var n=e.getContext("2d"),i=wx.getSystemInfoSync().pixelRatio;e.width=t[0].width*i,e.height=t[0].height*i,n.scale(i,i),o._context=n,o.drawFn()})):console.warn("[绘图过程出现错误]: 调用draw方法必须传入百分比参数")}},{key:"drawFn",value:function(){var n=this;try{var t=this._options.barStyle;if(0100]: 已自动调整为100")),this._options.percentage=+t||0,this._context?this.drawFn():wx.createSelectorQuery().in(this._options.target).select("#".concat(this._options.canvasId)).fields({node:!0,size:!0}).exec(function(t){var e=t[0].node;o._requestAnimationFrame=e.requestAnimationFrame.bind(e);var n=e.getContext("2d"),i=wx.getSystemInfoSync().pixelRatio;e.width=t[0].width*i,e.height=t[0].height*i,n.scale(i,i),o._context=n,o.drawFn()})):console.warn("[绘图过程出现错误]: 调用draw方法必须传入百分比参数")}},{key:"drawFn",value:function(){var n=this;try{var t=this._options.barStyle;if(0 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 {