Merge pull request #21 from lucaszhu2zgf/wepy

支持wepy

README.md

@@ -11,8 +11,17 @@
 $ npm install mp-progress --save
 ```
 
+## 基础库要求
+
+根据文档要求，支持 2.7.0 及以上的基础库版本，使用最新基础库效果最佳
+
+
 ## 组件方式的调用（简单易用）
+
 在对应页面引入组件，初始化data并在wxml中使用组件
+
+> 由于组件实现差异，该方式在wepy中不适用
+
 ```
 {
   "navigationBarTitleText": "首页",
@@ -33,7 +42,7 @@ data = {
     needDot: true,
     dotStyle: [{r: 20, fillStyle: '#ffffff', shadow: 'rgba(0,0,0,.15)'}, {r: 10, fillStyle: '#56B37F'}]
   },
-  percentage: 0
+  percentage: 10
 }
 ...
 <mpProgress config="{{config}}" percentage="{{percentage}}"></mpProgress>
@@ -42,11 +51,14 @@ data = {
 
 ## API方式调用（适合需要在mp-progress上层构建新组件的需求）
 
+> 该方式适用于wepy，但必须在onReady回调函数里面进行初始化
+
 传入的单位是`rpx`，即如果canvas宽度为400rpx，则传入400，后续会自动计算真实尺寸
 ```
 import MpProgress from 'mp-progress';
 ...
 // 初始化
+// 注意：在wepy中必须在onReady里调用
 const mprogress = new MpProgress({
   target: this,
   canvasId: 'progress',

dist/progress.js

@@ -1,4 +1,4 @@
-/*! mp-progress.js v1.2.10 https://www.npmjs.com/package/mp-progress */
+/*! mp-progress.js v1.2.12 https://www.npmjs.com/package/mp-progress */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory();
@@ -193,22 +193,31 @@ var MpProgress = /*#__PURE__*/function () {
         // context初始化完毕
         this.drawFn();
       } else {
-        wx.createSelectorQuery()["in"](this._options.target).select("#".concat(this._options.canvasId)).fields({
-          node: true,
-          size: true
-        }).exec(function (res) {
-          console.log(res);
-          var canvas = res[0].node;
-          _this._requestAnimationFrame = canvas.requestAnimationFrame.bind(canvas);
-          var ctx = canvas.getContext('2d');
-          var dpr = wx.getSystemInfoSync().pixelRatio;
-          canvas.width = res[0].width * dpr;
-          canvas.height = res[0].height * dpr;
-          ctx.scale(dpr, dpr);
-          _this._context = ctx;
-
-          _this.drawFn();
-        });
+        try {
+          var _target = this._options.target;
+          var query = wx.createSelectorQuery()["in"](_target);
+
+          if (_target.$wx && _target.$wx.$wepy) {
+            // wepy不支持in的方式去查找
+            query = wx.createSelectorQuery();
+          }
+
+          query.select("#".concat(this._options.canvasId)).node(function (res) {
+            console.log(res);
+            var canvas = res.node;
+            _this._requestAnimationFrame = canvas.requestAnimationFrame.bind(canvas);
+            var ctx = canvas.getContext('2d');
+            var dpr = wx.getSystemInfoSync().pixelRatio;
+            canvas.width = canvas._width * dpr;
+            canvas.height = canvas._height * dpr;
+            ctx.scale(dpr, dpr);
+            _this._context = ctx;
+
+            _this.drawFn();
+          }).exec();
+        } catch (err) {
+          console.warn(err);
+        }
       }
     }
   }, {

package.json

@@ -1,6 +1,6 @@
 {
     "name": "mp-progress",
-    "version": "1.2.10",
+    "version": "1.2.12",
     "description": "circle progress for wechat miniprogram",
     "main": "dist/progress.min.js",
     "miniprogram": "dist",