uview-plus 3.8.55 → 3.8.106

package/components/u-qrcode/qrcode.js

@@ -1032,9 +1032,10 @@ let QRCode = {};
             pdground: '#000000',
             image: '',
             imageSize: 30,
-            canvasId: opt.canvasId,
-			ctx: opt.ctx,
-            isNvue: opt.isNvue,
+            canvasId: opt.canvasId,
+			ctx: opt.ctx,
+            canvasHost: opt.canvasHost,
+            isNvue: opt.isNvue,
             vuectx: opt.vuectx,
             usingComponents: opt.usingComponents,
             showLoading: opt.showLoading,
@@ -1126,11 +1127,7 @@ let QRCode = {};
                         count: count,
                         options: options
                     });
-                    if (options.isNvue) {
-                        ctx.setFillStyle(isDark ? foreground : options.background);
-                    } else {
-                        ctx.fillStyle = isDark ? foreground : options.background;
-                    }
+                    setFillStyle(ctx, isDark ? foreground : options.background);
                     ctx.fillRect(Math.round(col * tileW), Math.round(row * tileH), w, h);
                 }
             }
@@ -1138,19 +1135,12 @@ let QRCode = {};
                 var x = Number(((ratioSize - ratioImgSize) / 2).toFixed(2));
                 var y = Number(((ratioSize - ratioImgSize) / 2).toFixed(2));
                 drawRoundedRect(ctx, x, y, ratioImgSize, ratioImgSize, 2, 6, true, true)
-				options.vuectx.drawImage(options.image, x, y, ratioImgSize, ratioImgSize);
-                // 画圆角矩形
-                function drawRoundedRect(ctxi, x, y, width, height, r, lineWidth, fill, stroke) {
-                    if (options.isNvue || isApp) {
-                        ctxi.setLineWidth(lineWidth);
-                        ctxi.setFillStyle(options.background);
-                        ctxi.setStrokeStyle(options.background);
-                    }
-                    else {
-                        ctxi.lineWidth = lineWidth;
-                        ctxi.fillStyle = options.background;
-                        ctxi.strokeStyle = options.background;
-                    }
+				await options.vuectx.drawImage(options.image, x, y, ratioImgSize, ratioImgSize);
+                // 画圆角矩形
+                function drawRoundedRect(ctxi, x, y, width, height, r, lineWidth, fill, stroke) {
+                    setLineWidth(ctxi, lineWidth);
+                    setFillStyle(ctxi, options.background);
+                    setStrokeStyle(ctxi, options.background);
                     ctxi.beginPath(); // draw top and top right corner
                     ctxi.moveTo(x + r, y);
                     ctxi.lineTo(x + width, y); // move to top-right corner
@@ -1174,72 +1164,69 @@ let QRCode = {};
                     }
                 }
             }
-            setTimeout(() => {
-                // canvas2 绘制是自动的不需要手动绘制
-                if(options.isNvue || isApp){
-                    ctx.draw(true, () => {
-                        // 保存到临时区域
-                        setTimeout(() => {
-                            if (options.isNvue) {
-                                ctx.toTempFilePath(
-                                    0,
-                                    0,
-                                    options.width,
-                                    options.height,
-                                    options.width,
-                                    options.height,
-                                    "",
-                                    1,
-                                    function(res) {
-                                        if (options.cbResult) {
-                                            options.cbResult(res.tempFilePath)
-                                        }
-                                    }
-                                );
-                            } else {
-                                uni.canvasToTempFilePath({
-                                    width: options.width,
-                                    height: options.height,
-                                    destWidth: options.width,
-                                    destHeight: options.height,
-                                    canvasId: options.canvasId,
-                                    quality: Number(1),
-                                    success: function (res) {
-										// console.log('绘制成功', res)
-                                        if (options.cbResult) {
-                                            // 由于官方还没有统一此接口的输出字段，所以先判定下  支付宝为 res.apFilePath
-                                            if (!empty(res.tempFilePath)) {
-                                                options.cbResult(res.tempFilePath)
-                                            } else if (!empty(res.apFilePath)) {
-                                                options.cbResult(res.apFilePath)
-                                            } else {
-                                                options.cbResult(res.tempFilePath)
-                                            }
-                                        }
-                                    },
-                                    fail: function (res) {
-										console.log('绘制失败', res)
-                                        if (options.cbResult) {
-                                            options.cbResult(res)
-                                        }
-                                    },
-                                    complete: function () {
-                                        uni.hideLoading();
-                                    },
-                                }, options.vuectx);
-                            }
-                        }, options.text.length + 100);
-                    });
-                }
-                else{
-                    options.cbResult("")
-                }
-
-            }, options.usingComponents ? 100 : 200);
-        }
-        createCanvas(this.options);
+            // canvas2 绘制是自动的不需要手动绘制
+            if(options.isNvue || isApp){
+                let exportStarted = false;
+                const reportFailure = function(error) {
+                    uni.hideLoading();
+                    if (options.cbResult) {
+                        options.cbResult(error instanceof Error ? error : new Error(String(error || '绘制失败')))
+                    }
+                };
+                const exportCode = async function() {
+                    if (exportStarted) return;
+                    exportStarted = true;
+                    try {
+                        if (!options.canvasHost || typeof options.canvasHost.toTempFilePath !== 'function') {
+                            throw new Error('无法获取二维码画布导出方法');
+                        }
+                        const res = await options.canvasHost.toTempFilePath({
+                            width: options.width || options.size,
+                            height: options.height || options.size,
+                            quality: Number(1)
+                        });
+                        const tempFilePath = res && (res.tempFilePath || res.apFilePath);
+                        if (empty(tempFilePath)) {
+                            throw new Error('二维码导出未返回文件路径');
+                        }
+                        if (options.cbResult) {
+                            options.cbResult(tempFilePath)
+                        }
+                        uni.hideLoading();
+                    } catch (error) {
+                        reportFailure(error);
+                    }
+                };
+                try {
+                    let drawResult;
+                    if (options.canvasHost && typeof options.canvasHost.draw === 'function') {
+                        drawResult = options.canvasHost.draw(true, exportCode);
+                    } else if (ctx && typeof ctx.draw === 'function') {
+                        drawResult = ctx.draw(true, exportCode);
+                    } else {
+                        exportCode();
+                    }
+                    if (drawResult && typeof drawResult.then === 'function') {
+                        drawResult.then(exportCode, reportFailure);
+                    }
+                } catch (error) {
+                    reportFailure(error);
+                }
+            }
+            else{
+                setTimeout(function() {
+                    options.cbResult("")
+                }, options.usingComponents ? 100 : 200);
+            }
+        }
+        createCanvas(this.options).catch(function(error) {
+            uni.hideLoading();
+            if (opt.cbResult) {
+                opt.cbResult(error instanceof Error ? error : new Error(String(error || '二维码绘制失败')))
+            }
+        });
         // 空判定
-        let empty = function (v) {
+        let empty = function (v) {
             let tp = typeof v,
                 rt = false;
             if (tp == "number" && String(v) == "") {
@@ -1253,17 +1240,38 @@ let QRCode = {};
             } else if (tp == "function") {
                 rt = false
             }
-            return rt
-        }
-    };
-    QRCode.prototype.clear = function (fn) {
-        var ctx = '';
-        if (options.isNvue) {
-            ctx = options.ctx;
-        } else {
-            uni.createCanvasContext(this.options.canvasId, this.options.vuectx)
-        }
-        ctx.clearRect(0, 0, this.options.size, this.options.size)
+            return rt
+        }
+        function setFillStyle(ctx, value) {
+            if (ctx && typeof ctx.setFillStyle === 'function') {
+                ctx.setFillStyle(value);
+            } else if (ctx) {
+                ctx.fillStyle = value;
+            }
+        }
+        function setStrokeStyle(ctx, value) {
+            if (ctx && typeof ctx.setStrokeStyle === 'function') {
+                ctx.setStrokeStyle(value);
+            } else if (ctx) {
+                ctx.strokeStyle = value;
+            }
+        }
+        function setLineWidth(ctx, value) {
+            if (ctx && typeof ctx.setLineWidth === 'function') {
+                ctx.setLineWidth(value);
+            } else if (ctx) {
+                ctx.lineWidth = value;
+            }
+        }
+    };
+    QRCode.prototype.clear = function (fn) {
+        if (this.options.canvasHost && typeof this.options.canvasHost.clearCanvas === 'function') {
+            this.options.canvasHost.clearCanvas()
+            if (fn) fn()
+            return
+        }
+        var ctx = this.options.ctx;
+        ctx.clearRect(0, 0, this.options.size, this.options.size)
         ctx.draw(false, () => {
             if (fn) {
                 fn()