fix: hideLoading 问题

chuyun · Dec 1, 2019 · 38714e0 · 38714e0 · chuyun · Dec 1, 2019
1 parent f9548f0
commit 38714e0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/dist/weapp/component/taro-plugin-canvas/index.jsx b/dist/weapp/component/taro-plugin-canvas/index.jsx
@@ -72,13 +72,15 @@ export default class CanvasDrawer extends Component {
         };
         this.onCreate = () => {
             const { onCreateFail, config } = this.props;
-            Taro.showLoading({ mask: true, title: '生成中...' });
+            if (config['hide-loading'] === false) {
+                Taro.showLoading({ mask: true, title: '生成中...' });
+            }
             return this.downloadResourceTransit()
                 .then(() => {
                 this.create(config);
             })
                 .catch((err) => {
-                Taro.hideLoading();
+                config['hide-loading'] && Taro.hideLoading();
                 Taro.showToast({ icon: 'none', title: err.errMsg || '下载图片失败' });
                 console.error(err);
                 if (!onCreateFail) {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "taro-plugin-canvas",
-  "version": "1.0.8-beta.2",
+  "version": "1.0.9",
   "description": "基于 Taro 框架的微信小程序 canvas 绘图组件，封装了常用的操作，通过配置的方式生成分享图片",
   "keywords": [
     "taro",

diff --git a/src/component/taro-plugin-canvas/index.tsx b/src/component/taro-plugin-canvas/index.tsx
@@ -170,13 +170,15 @@ export default class CanvasDrawer extends Component<ICanvasDrawerProps, ICanvasD
 
   onCreate = () => {
     const { onCreateFail, config } = this.props;
-    Taro.showLoading({ mask: true, title: '生成中...' });
+    if (config['hide-loading'] === false) {
+      Taro.showLoading({ mask: true, title: '生成中...' });
+    }
     return this.downloadResourceTransit()
       .then(() => {
         this.create(config);
       })
       .catch((err) => {
-        Taro.hideLoading();
+        config['hide-loading'] && Taro.hideLoading();
         Taro.showToast({ icon: 'none', title: err.errMsg || '下载图片失败' });
         console.error(err);
         if (!onCreateFail) {