uview-plus 3.8.86 → 3.8.108

package/components/u-qrcode/qrcode.js

@@ -1164,60 +1164,67 @@ let QRCode = {};
                     }
                 }
             }
-            setTimeout(() => {
-                // canvas2 绘制是自动的不需要手动绘制
-                if(options.isNvue || isApp){
-                    const exportCode = () => {
-                        // 保存到临时区域
-                        setTimeout(() => {
-                            if (options.canvasHost && typeof options.canvasHost.toTempFilePath === 'function') {
-                                options.canvasHost.toTempFilePath({
-                                    width: options.width || options.size,
-                                    height: options.height || options.size,
-                                    destWidth: options.width || options.size,
-                                    destHeight: options.height || options.size,
-                                    quality: Number(1),
-                                    success: function (res) {
-                                        if (options.cbResult) {
-                                            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();
-                                    },
-                                }).catch(function(res) {
-                                    console.log('绘制失败', res)
-                                });
-                            }
-                        }, options.text.length + 100);
-                    };
+            // 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') {
-                        options.canvasHost.draw(true, exportCode);
+                        drawResult = options.canvasHost.draw(true, exportCode);
                     } else if (ctx && typeof ctx.draw === 'function') {
-                        ctx.draw(true, exportCode);
+                        drawResult = ctx.draw(true, exportCode);
                     } else {
                         exportCode();
                     }
-                }
-                else{
-                    options.cbResult("")
-                }
-
-            }, options.usingComponents ? 100 : 200);
-        }
-        createCanvas(this.options);
+                    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 tp = typeof v,

package/components/u-qrcode/u-qrcode.vue

@@ -6,7 +6,11 @@
               height: useRootHeightAndWidth ? '100%' : 'auto',
         }"
           @longpress="longpress">
-        <view class="u-qrcode__content" @click="preview">
+        <view
+            class="u-qrcode__content"
+            :style="{ width: sizeLocal + unit, height: sizeLocal + unit }"
+            @click="preview">
+            <!-- #ifdef APP-NVUE -->
             <up-canvas
                 ref="qrcodeCanvas"
                 class="u-qrcode__canvas"
@@ -16,6 +20,18 @@
                 :unit="unit"
                 bg-color="transparent"
                 :style="{ width: sizeLocal + unit, height: sizeLocal + unit }" />
+            <!-- #endif -->
+            <!-- #ifndef APP-NVUE -->
+            <up-canvas
+                ref="qrcodeCanvas"
+                class="u-qrcode__canvas"
+                :canvas-id="cid"
+                :width="sizeLocal"
+                :height="sizeLocal"
+                :unit="unit"
+                bg-color="transparent"
+                :style="{ width: sizeLocal + unit, height: sizeLocal + unit }" />
+            <!-- #endif -->
             <view v-if="showLoading && loading" class="u-qrcode__loading"
                   :style="{ width: sizeLocal + unit, height: sizeLocal + unit }">
                 <up-loading-icon vertical :text="loadingText" textSize="14px"></up-loading-icon>
@@ -27,7 +43,6 @@
 
 <script>
 import QRCode from "./qrcode.js"
-let qrcode
 export default {
     name: "u-qrcode",
     props: {
@@ -130,6 +145,9 @@ export default {
             canvasHost: null
         }
     },
+    created() {
+        this._qrcode = null
+    },
     async mounted(){
         // 如果使用根节点的宽高 则 重新设置 size
         if(this.useRootHeightAndWidth){
@@ -144,7 +162,9 @@ export default {
             if (!this._empty(this.val)) {
                 setTimeout(() => {
                     setTimeout(()=>{
-                        this._makeCode()
+                        this._makeCode().catch(error => {
+                            console.error('二维码生成失败', error)
+                        })
                     })
                 }, 0);
             }
@@ -153,49 +173,60 @@ export default {
     methods: {
         async _makeCode() {
             let that = this
+			if (this._empty(this.val)) {
+                uni.showToast({
+                    title: '二维码内容不能为空',
+                    icon: 'none',
+                    duration: 2000
+                });
+                return ''
+            }
 			if (!this.ctx) {
                 await this.initCanvas(true)
             }
-			if (!this.ctx) return
-            if (!this._empty(this.val)) {
-                // #ifndef APP-NVUE
-                this.loading = true
-				// #endif
-                qrcode = new QRCode({
-                    vuectx: that, // 上下文环境
-                    canvasId: that.cid, // canvas-id
-                    ctx: that.ctx,
-                    canvasHost: that.canvasHost,
-                    isNvue: that.isNvue,
-                    usingComponents: that.usingComponents, // 是否是自定义组件
-                    showLoading: false, // 是否显示loading
-                    loadingText: that.loadingText, // loading文字
-                    text: that.val, // 生成内容
-                    size: that.sizeLocal, // 二维码大小
-                    width: that.sizeLocal,
-                    height: that.sizeLocal,
-                    background: that.background, // 背景色
-                    foreground: that.foreground, // 前景色
-                    pdground: that.pdground, // 定位角点颜色
-                    quietZone: that.quietZone, // 静区宽度
-                    correctLevel: that.lv, // 容错级别
-                    image: that.icon, // 二维码图标
-                    imageSize: that.iconSize,// 二维码图标大小
-                    cbResult: function (res) { // 生成二维码的回调
-                        that._result(res)
-                    },
-                });
-            } else {
-                uni.showToast({
-                    title: '二维码内容不能为空',
-                    icon: 'none',
-                    duration: 2000
-                });
-            }
+			if (!this.ctx) throw new Error('无法获取二维码画布实例')
+            return new Promise((resolve, reject) => {
+                this.loading = true
+                try {
+                    this._qrcode = new QRCode({
+                        vuectx: that, // 上下文环境
+                        canvasId: that.cid, // canvas-id
+                        ctx: that.ctx,
+                        canvasHost: that.canvasHost,
+                        isNvue: that.isNvue,
+                        usingComponents: that.usingComponents, // 是否是自定义组件
+                        showLoading: false, // 是否显示loading
+                        loadingText: that.loadingText, // loading文字
+                        text: that.val, // 生成内容
+                        size: that.sizeLocal, // 二维码大小
+                        width: that.sizeLocal,
+                        height: that.sizeLocal,
+                        background: that.background, // 背景色
+                        foreground: that.foreground, // 前景色
+                        pdground: that.pdground, // 定位角点颜色
+                        quietZone: that.quietZone, // 静区宽度
+                        correctLevel: that.lv, // 容错级别
+                        image: that.icon, // 二维码图标
+                        imageSize: that.iconSize,// 二维码图标大小
+                        cbResult: function (res) { // 生成二维码的回调
+                            if (typeof res === 'string') {
+                                that._result(res)
+                                resolve(res)
+                            } else {
+                                that.loading = false
+                                reject(res instanceof Error ? res : new Error(`二维码生成失败: ${JSON.stringify(res)}`))
+                            }
+                        },
+                    });
+                } catch (error) {
+                    that.loading = false
+                    reject(error)
+                }
+            })
         },
         _clearCode() {
             this._result('')
-            if (qrcode) qrcode.clear()
+            if (this._qrcode) this._qrcode.clear()
         },
         _saveCode() {
             let that = this;
@@ -256,24 +287,27 @@ export default {
                 url: this.result
             }, e)
         },
-        async toTempFilePath({success, fail}) {
-            if (!this.canvasHost) {
-                await this.initCanvas(true)
-            }
-            if (!this.canvasHost) {
-                if (fail) fail(new Error('无法获取二维码画布实例'))
-                return
+        async toTempFilePath({success, fail} = {}) {
+            try {
+                if (!this.canvasHost) {
+                    await this.initCanvas(true)
+                }
+                if (!this.canvasHost) {
+                    throw new Error('无法获取二维码画布实例')
+                }
+                const res = await this.canvasHost.toTempFilePath({
+                    width: this.sizeLocal,
+                    height: this.sizeLocal
+                })
+                if (success) success(res)
+                return res
+            } catch (error) {
+                if (fail) {
+                    fail(error)
+                    return false
+                }
+                throw error
             }
-            this.canvasHost.toTempFilePath({
-                width: this.sizeLocal,
-                height: this.sizeLocal,
-                destWidth: this.sizeLocal,
-                destHeight: this.sizeLocal,
-                success,
-                fail
-            }).catch(err => {
-                if (fail) fail(err)
-            })
         },
         async longpress() {
             this.toTempFilePath({
@@ -322,26 +356,48 @@ export default {
             await this.$nextTick()
             const canvasRef = this.$refs.qrcodeCanvas
             if (!canvasRef) return false
-            await canvasRef.initCanvas(force)
+            const initialized = await canvasRef.initCanvas(force)
+            if (!initialized) {
+                this.canvasHost = null
+                this.ctx = null
+                return false
+            }
             this.canvasHost = canvasRef
             this.ctx = canvasRef.getRawContext()
             return !!this.ctx
+        },
+        async refreshCanvas(force = false) {
+            await this.$nextTick()
+            return this.initCanvas(force)
         },
 		getUPCanvasContext() {
             return this.canvasHost ? this.canvasHost.getRawContext() : null
 		},
-		async drawImage(url, x, y, w, h) {
-			try {
+        async drawImage(url, x, y, w, h) {
+            try {
                 if (!this.canvasHost) {
-                    await this.initCanvas(true)
+                    const initialized = await this.initCanvas(true)
+                    if (!initialized) {
+                        throw new Error('无法初始化二维码画布')
+                    }
                 }
-                if (this.canvasHost) {
-                    await this.canvasHost.drawImage(url, x, y, w, h)
+                if (!this.canvasHost || !this.ctx) {
+                    throw new Error('无法获取二维码画布实例')
                 }
-			} catch (error) {
-				console.log('drawImage绘制出错', error)
+                await this.canvasHost.drawImage(url, x, y, w, h)
+            } catch (error) {
+                console.error('drawImage绘制出错', error)
+                throw error
 			}
-		},
+		},
+        _queueMakeCode(delay = 0) {
+            if (this._empty(this.val)) return
+            setTimeout(() => {
+                this._makeCode().catch(error => {
+                    console.error('二维码生成失败', error)
+                })
+            }, delay)
+        },
 
         selectClick(index) {
             switch (index) {
@@ -374,33 +430,48 @@ export default {
         },
     },
     watch: {
-        size: function (n, o) {
-            if (n != o && !this._empty(n)) {
-                this.cSize = n
-                if (!this._empty(this.val)) {
-                    setTimeout(() => {
-                        this._makeCode()
-                    }, 100);
-                }
-            }
-        },
-        val: function (n, o) {
-            if (this.onval) {
-                if (n != o && !this._empty(n)) {
-                    setTimeout(() => {
-                        this._makeCode()
-                    }, 0);
-                }
-            }
-        }
+        size: function (n, o) {
+            if (n != o && !this._empty(n)) {
+                this.sizeLocal = n
+                if (this.onval) {
+                    this._queueMakeCode(100)
+                }
+            }
+        },
+        val: function (n, o) {
+            if (this.onval) {
+                if (n != o && !this._empty(n)) {
+                    this._queueMakeCode()
+                }
+            }
+        },
+        icon: function (n, o) {
+            if (n === o) return
+            this._queueMakeCode(100)
+        },
+        background: function () {
+            this._queueMakeCode()
+        },
+        foreground: function () {
+            this._queueMakeCode()
+        },
+        iconSize: function () {
+            this._queueMakeCode()
+        },
+        quietZone: function () {
+            this._queueMakeCode()
+        },
+        lv: function () {
+            this._queueMakeCode()
+        }
     },
     computed: {
     }
 }
 </script>
-<style lang="scss" scoped>
-.u-qrcode {
-    &__loading {
+<style lang="scss" scoped>
+.u-qrcode {
+    &__loading {
         display: flex;
         justify-content: center;
         align-items: center;

package/components/u-scroll-list/scrollWxs.wxs

@@ -17,7 +17,7 @@ function scroll(event, ownerInstance) {
 	setBarStyle(ownerInstance, x)
 }
 
-// 由于webview的无能，无法保证scroll-view在滑动过程中，一直触发scroll事件，会导致
+// 由于webview的问题，无法保证scroll-view在滑动过程中，一直触发scroll事件，会导致
 // 无法监听到某些滚动值，当在首尾临界值无法监听到时，这是致命的，因为错失这些值会导致滑块无法回到起点和终点
 // 所以这里需要对临界值做监听并处理
 function scrolltolower(event, ownerInstance) {

package/components/u-slider/u-slider.vue

@@ -180,7 +180,7 @@
 		},
 		async mounted() {
 			if (this.height != '') {
-				this.sizeLocal = val
+				this.sizeLocal = this.height
 			} else {
 				this.sizeLocal = this.size
 			}

package/components/u-swipe-action-item/index.wxs

@@ -40,11 +40,12 @@ function touchmove(event, ownerInstance) {
 	if (Math.abs(moveX) > Math.abs(moveY) || Math.abs(moveX) > state.threshold) {
 		event.preventDefault && event.preventDefault()
 		event.stopPropagation && event.stopPropagation()
-	}
-	// 如果移动的X轴距离小于Y轴距离，也即终点位置与起点位置连线，与Y轴夹角小于45度时，认为是页面上下滑动，而不是左右滑动单元格
-	if (Math.abs(moveX) < Math.abs(moveY)) return
-
-	// 限制右滑的距离，不允许内容部分往右偏移，右滑会导致X轴偏移值大于0，以此做判断
+	}
+	// 如果移动的X轴距离小于Y轴距离，也即终点位置与起点位置连线，与Y轴夹角小于45度时，认为是页面上下滑动，而不是左右滑动单元格
+	if (Math.abs(moveX) < Math.abs(moveY)) return
+	ownerInstance.callMethod('setScrolling', true)
+
+	// 限制右滑的距离，不允许内容部分往右偏移，右滑会导致X轴偏移值大于0，以此做判断
 	// 此处不能直接return，因为滑动过程中会缺失某些关键点坐标，会导致错乱，最好的办法就是
 	// 在超出后，设置为0
 	if (state.status === 'open') {
@@ -68,11 +69,16 @@ function touchmove(event, ownerInstance) {
 function touchend(event, ownerInstance) {
 	// 触发事件的组件的ComponentDescriptor实例
 	var instance = event.instance
-	// wxs内的局部变量快照
-	var state = instance.getState()
-	if (!state.moving || state.disabled) return
-	var touches = event.changedTouches ? event.changedTouches[0] : {}
-	var pageX = touches.pageX
+	// wxs内的局部变量快照
+	var state = instance.getState()
+	if (!state.moving || state.disabled) {
+		ownerInstance.callMethod('setScrolling', false)
+		return
+	}
+	state.moving = false
+	ownerInstance.callMethod('setScrolling', false)
+	var touches = event.changedTouches ? event.changedTouches[0] : {}
+	var pageX = touches.pageX
 	var pageY = touches.pageY
 	var moveX = pageX - state.startX
 	if (state.status === 'open') {
@@ -98,11 +104,21 @@ function touchend(event, ownerInstance) {
 		} else {
 			openSwipeAction(instance, ownerInstance)
 		}
-	}
-}
-
-// 获取过渡时间
-function getDuration(value) {
+	}
+}
+
+// 触摸取消
+function touchcancel(event, ownerInstance) {
+	var instance = event.instance
+	var state = instance.getState()
+	if (state) {
+		state.moving = false
+	}
+	ownerInstance.callMethod('setScrolling', false)
+}
+
+// 获取过渡时间
+function getDuration(value) {
 	if (value.toString().indexOf('s') >= 0) return value
 	return value > 30 ? value + 'ms' : value + 's'
 }
@@ -157,10 +173,11 @@ function setStatus(status, instance, ownerInstance) {
 }
 
 // 一次性收起滑动菜单
-function closeSwipeAction(instance, ownerInstance) {
-	var state = instance.getState()
-	// 获取所有按钮的实例，需要通过它去设置按钮的位移
-	var buttons = ownerInstance.selectAllComponents('.u-swipe-action-item__right__button')
+function closeSwipeAction(instance, ownerInstance) {
+	var state = instance.getState()
+	ownerInstance.callMethod('setScrolling', false)
+	// 获取所有按钮的实例，需要通过它去设置按钮的位移
+	var buttons = ownerInstance.selectAllComponents('.u-swipe-action-item__right__button')
 	var len = buttons.length
 	// 处理duration单位问题
 	var duration = getDuration(state.duration)
@@ -226,9 +243,10 @@ function sizeChange(newValue, oldValue, ownerInstance, instance) {
 }
 
 module.exports = {
-	touchstart: touchstart,
-	touchmove: touchmove,
-	touchend: touchend,
-	sizeChange: sizeChange,
-	statusChange: statusChange
-}
+	touchstart: touchstart,
+	touchmove: touchmove,
+	touchend: touchend,
+	touchcancel: touchcancel,
+	sizeChange: sizeChange,
+	statusChange: statusChange
+}

package/components/u-swipe-action-item/nvue.js

@@ -43,6 +43,7 @@ export default {
 		},
 		// 关闭单元格，用于打开一个，自动关闭其他单元格的场景
 		closeHandler() {
+			this.setScrolling(false)
 			if(this.status === 'open') {
 				// 如果在打开状态下，进行点击的话，直接关闭单元格
 				return this.moveCellByAnimation('close') && this.unbindBindingX()
@@ -55,6 +56,7 @@ export default {
 			// 尝试关闭其他打开的单元格
 			this.parent && this.parent.closeOther(this)
 			if(this.status === 'open') {
+				this.setScrolling(false)
 				// 如果在打开状态下，进行点击的话，直接关闭单元格
 				return this.moveCellByAnimation('close') && this.unbindBindingX()
 			}
@@ -63,9 +65,11 @@ export default {
 		onTouchstart(e) {
 			// 如果当前正在移动中，或者disabled状态，则返回
 			if(this.moving || this.disabled) { 
+				this.setScrolling(false)
 				return this.unbindBindingX()   
 			}
 			if(this.status === 'open') {
+				this.setScrolling(false)
 				// 如果在打开状态下，进行点击的话，直接关闭单元格
 				return this.moveCellByAnimation('close') && this.unbindBindingX()
 			}
@@ -73,6 +77,7 @@ export default {
 			e?.stopPropagation && e.stopPropagation() 
 			e?.preventDefault && e.preventDefault()
 			this.moving = true
+			this.setScrolling(true)
 			// 获取元素ref
 			const content = this.getContentRef()
 			let expression = `min(max(${-this.buttonsWidth}, x), 0)`
@@ -92,6 +97,7 @@ export default {
 			}, (res) => {
 				this.moving = false
 				if (res.state === 'end' || res.state === 'exit') {
+					this.setScrolling(false)
 					const deltaX = res.deltaX
 					if(deltaX <= -this.buttonsWidth || deltaX >= 0) {
 						// 如果触摸滑动的过程中，大于单元格的总宽度，或者大于0，意味着已经动过滑动达到了打开或者关闭的状态
@@ -114,6 +120,7 @@ export default {
 		},
 		// 释放bindingX
 		unbindBindingX() {
+			this.setScrolling(false)
 			// 释放上一次的资源
 			if (this?.panEvent?.token != 0) {
 				bindingX.unbind({
@@ -159,6 +166,7 @@ export default {
 				timingFunction: 'ease-in-out'
 			}, () => {
 				this.moving = false
+				this.setScrolling(false)
 				this.status = status
 				this.unbindBindingX()
 			})
@@ -168,6 +176,7 @@ export default {
 			return this.$refs['u-swipe-action-item__content'].ref
 		},
 		beforeUnmount() {
+			this.setScrolling(false)
 			this.unbindBindingX()
 		}
 	}