uview-plus 3.6.29 → 3.7.13

package/components/u-qrcode/qrcode.js

@@ -18,6 +18,7 @@ let QRCode = {};
             return [c0, c1];
             // 3 bytes
         } else {
+			
             c0 = 224 + (code >> 12);
             c1 = 128 + (code >> 6 & 63);
             c2 = 128 + (code & 63);
@@ -1031,15 +1032,14 @@ let QRCode = {};
             image: '',
             imageSize: 30,
             canvasId: opt.canvasId,
-            nvueContext: opt.nvueContext,
-            context: opt.context,
+			ctx: opt.ctx,
+            isNvue: opt.isNvue,
+            vuectx: opt.vuectx,
             usingComponents: opt.usingComponents,
             showLoading: opt.showLoading,
             loadingText: opt.loadingText,
         };
 
-        let canvas = null;
-
         if (typeof opt === 'string') { // 只编码ASCII字符串
             opt = {
                 text: opt
@@ -1087,21 +1087,6 @@ let QRCode = {};
             return options.foreground;
         }
 
-        let getCanvas = async (id) => {
-            return new Promise((resolve, reject)=>{
-                try {
-                    const query = uni.createSelectorQuery().in(this.options.context);
-                    query.select(`#${id}`)
-                    .fields({ node: true, size: true })
-                    .exec((res) => {
-                        resolve(res[0].node)
-                    })
-                }
-                catch (e) {
-                    console.error("createCanvasContextFail",e)
-                }
-            })
-        }
         // 创建canvas
         let createCanvas = async function (options) {
             let isApp = false;
@@ -1116,28 +1101,7 @@ let QRCode = {};
                 });
             }
             var ctx = '';
-            if (options.nvueContext) {
-                ctx = options.nvueContext;
-            }
-            else {
-                // 获取canvas node节点
-                canvas = await getCanvas(options.canvasId);
-                // #ifdef MP
-                // 不清楚是小程序的bug还是什么原因，canvas的node节点宽高和设置的宽高不一致 重新设置下
-                canvas.width = options.size;
-                canvas.height = options.size;
-                // #endif
-                // #ifdef APP
-                ctx = uni.createCanvasContext(options.canvasId, options.context);
-                // #endif
-                // #ifndef APP
-                ctx = canvas.getContext('2d');
-                // #endif
-
-            }
-            // 设置组件中data里面的ctx
-            options.context.ctx = ctx;
-            options.context.canvas = canvas;
+			ctx = options.ctx;
 
             var count = qrCodeAlg.getModuleCount();
             var ratioSize = options.size;
@@ -1156,7 +1120,7 @@ let QRCode = {};
                         count: count,
                         options: options
                     });
-                    if (options.nvueContext) {
+                    if (options.isNvue) {
                         ctx.setFillStyle(qrCodeAlg.modules[row][col] ? foreground : options.background);
                     } else {
                         ctx.fillStyle = qrCodeAlg.modules[row][col] ? foreground : options.background;
@@ -1168,26 +1132,10 @@ 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)
-                if (options.nvueContext) {
-                    ctx.drawImage(options.image, x, y, ratioImgSize, ratioImgSize);
-                }
-                else {
-                    // #ifdef H5 || APP
-                    const img = new Image();
-                    // #endif
-
-                    // #ifndef H5 || APP
-                    const img = canvas.createImage();
-                    // #endif
-
-                    img.onload = () => {
-                        ctx.drawImage(img, x, y, ratioImgSize, ratioImgSize);
-                    };
-                    img.src = options.image;
-                }
+				options.vuectx.drawImage(options.image, x, y, ratioImgSize, ratioImgSize);
                 // 画圆角矩形
                 function drawRoundedRect(ctxi, x, y, width, height, r, lineWidth, fill, stroke) {
-                    if (options.nvueContext || isApp) {
+                    if (options.isNvue || isApp) {
                         ctxi.setLineWidth(lineWidth);
                         ctxi.setFillStyle(options.background);
                         ctxi.setStrokeStyle(options.background);
@@ -1222,11 +1170,11 @@ let QRCode = {};
             }
             setTimeout(() => {
                 // canvas2 绘制是自动的不需要手动绘制
-                if(options.nvueContext || isApp){
+                if(options.isNvue || isApp){
                     ctx.draw(true, () => {
                         // 保存到临时区域
                         setTimeout(() => {
-                            if (options.nvueContext) {
+                            if (options.isNvue) {
                                 ctx.toTempFilePath(
                                     0,
                                     0,
@@ -1251,6 +1199,7 @@ let QRCode = {};
                                     canvasId: options.canvasId,
                                     quality: Number(1),
                                     success: function (res) {
+										// console.log('绘制成功', res)
                                         if (options.cbResult) {
                                             // 由于官方还没有统一此接口的输出字段，所以先判定下  支付宝为 res.apFilePath
                                             if (!empty(res.tempFilePath)) {
@@ -1263,6 +1212,7 @@ let QRCode = {};
                                         }
                                     },
                                     fail: function (res) {
+										console.log('绘制失败', res)
                                         if (options.cbResult) {
                                             options.cbResult(res)
                                         }
@@ -1270,7 +1220,7 @@ let QRCode = {};
                                     complete: function () {
                                         uni.hideLoading();
                                     },
-                                }, options.context);
+                                }, options.vuectx);
                             }
                         }, options.text.length + 100);
                     });
@@ -1279,7 +1229,7 @@ let QRCode = {};
                     options.cbResult("")
                 }
 
-            }, options.usingComponents ? 0 : 150);
+            }, options.usingComponents ? 100 : 200);
         }
         createCanvas(this.options);
         // 空判定
@@ -1302,10 +1252,10 @@ let QRCode = {};
     };
     QRCode.prototype.clear = function (fn) {
         var ctx = '';
-        if (options.nvueContext) {
-            ctx = options.nvueContext;
+        if (options.isNvue) {
+            ctx = options.ctx;
         } else {
-            uni.createCanvasContext(this.options.canvasId, this.options.context)
+            uni.createCanvasContext(this.options.canvasId, this.options.vuectx)
         }
         ctx.clearRect(0, 0, this.options.size, this.options.size)
         ctx.draw(false, () => {

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

@@ -7,8 +7,7 @@
           }"
           @longpress="longpress">
         <view class="u-qrcode__content" @click="preview">
-
-            <!-- #ifndef APP-NVUE || APP-PLUS -->
+            <!-- #ifdef MP || H5 -->
             <canvas
                 class="u-qrcode__canvas"
                 :id="cid"
@@ -25,17 +24,12 @@
                 :style="{ width: sizeLocal + unit, height: sizeLocal + unit }" />
             <!-- #endif -->
 
-            <!-- #ifdef APP-PLUS -->
-            <canvas
-                class="u-qrcode__canvas"
-                :id="cid"
-                :canvas-id="cid"
-                :style="{ width: sizeLocal + unit, height: sizeLocal + unit }" />
-            <!-- #endif -->
-
             <!-- #ifdef APP-NVUE -->
-            <gcanvas class="u-qrcode__canvas" ref="gcanvess"
-                     :style="{ width: sizeLocal + unit, height: sizeLocal + unit }">
+			<web-view v-if="icon != ''" ref="web" src="/static/app-plus/up-canvas/local.html"
+				:style="'width:' + sizeLocal + 'px;height:' + sizeLocal + 'px'"
+				@onPostMessage="_onMessage" />
+            <gcanvas v-else class="u-qrcode__canvas" ref="gcanvess"
+                :style="{ width: sizeLocal + unit, height: sizeLocal + unit }">
             </gcanvas>
             <!-- #endif -->
             <view v-if="showLoading && loading" class="u-qrcode__loading"
@@ -49,20 +43,27 @@
 
 <script>
 import QRCode from "./qrcode.js"
+import { sleep } from '../../libs/function/index';
 // #ifdef APP-NVUE
 // https://github.com/dcloudio/NvueCanvasDemo/blob/master/README.md
 import {
     enable,
-    WeexBridge
+    WeexBridge,
+	Image as GImage
 } from '../../libs/util/gcanvas/index.js';
+import { nextTick } from "vue";
 // #endif
 let qrcode
+// 20260201不能在data中存储canvas，否则会导致在微信小程序getContext获取不到canvas对象报错Cannot read property 'type'
+let canvas = null
 export default {
     name: "u-qrcode",
     props: {
         cid: {
             type: String,
-            default: () => `u-qrcode-canvas${Math.floor(Math.random() * 1000000)}`
+            default: () => {
+				return `u-qrcode-canvas${Math.floor(Math.random() * 1000000)}`
+			}
         },
         size: {
             type: Number,
@@ -134,7 +135,7 @@ export default {
             default: () => false
         },
     },
-    emits: ['result', 'longpressCallback'],
+    emits: ['preview', 'result', 'longpressCallback'],
     data() {
         return {
             loading: false,
@@ -147,11 +148,10 @@ export default {
             ],
             rootId: `rootId${Number(Math.random() * 100).toFixed(0)}`,
             ganvas: null,
-            context: '',
             canvasObj: {},
             sizeLocal: this.size,
-            ctx: null, // ctx 在new Qrcode 时js文件内部设置
-            canvas: null, // ctx 在new Qrcode 时js文件内部设置
+            ctx: null,
+			_ready: false
         }
     },
     async mounted(){
@@ -159,17 +159,18 @@ export default {
         if(this.useRootHeightAndWidth){
             await this.setNewSize()
         }
+		canvas = await this.getCanvasNode(this.cid)
 
-        // #ifdef APP-NVUE
-        /*获取元素引用*/
-        this.ganvas = this.$refs["gcanvess"]
-        /*通过元素引用获取canvas对象*/
-        this.canvasObj = enable(this.ganvas, {
-            bridge: WeexBridge
-        })
-        /*获取绘图所需的上下文，目前不支持3d*/
-        this.context = this.canvasObj.getContext('2d')
-        // #endif
+		if (!canvas) return
+		// #ifdef MP
+		// 不清楚是小程序的bug还是什么原因，canvas的node节点宽高和设置的宽高不一致 重新设置下
+		canvas.width = this.sizeLocal
+		canvas.height = this.sizeLocal
+		// #endif
+        // #ifdef APP-PLUS-NVUE
+		this.isNvue = true
+		// #endif
+		this.ctx = this.getUPCanvasContext('2d')
 
         if (this.loadMake) {
             if (!this._empty(this.val)) {
@@ -182,31 +183,52 @@ export default {
         }
     },
     methods: {
+		_onMessage(e) {
+			// console.log('post message', e)
+			const message = e.detail.data[0]
+			switch (message.action) {
+				// web-view 初始化完毕
+				case 'onJSBridgeReady':
+					this._ready = true
+					this.$refs.web.evalJs('setContent('+JSON.stringify(this.$props) +')')
+					break
+				// qrcodeOk
+				case 'qrcodeOk':
+					this._result(message.imageData)
+					// this.$emit('load')
+					break
+			}
+		},
         _makeCode() {
             let that = this
+			if (!canvas) return
             if (!this._empty(this.val)) {
                 // #ifndef APP-NVUE
                 this.loading = true
-                // #endif
-                qrcode = new QRCode({
-                    context: that, // 上下文环境
-                    canvasId: that.cid, // canvas-id
-                    nvueContext: that.context,
-                    usingComponents: that.usingComponents, // 是否是自定义组件
-                    showLoading: false, // 是否显示loading
-                    loadingText: that.loadingText, // loading文字
-                    text: that.val, // 生成内容
-                    size: that.sizeLocal, // 二维码大小
-                    background: that.background, // 背景色
-                    foreground: that.foreground, // 前景色
-                    pdground: that.pdground, // 定位角点颜色
-                    correctLevel: that.lv, // 容错级别
-                    image: that.icon, // 二维码图标
-                    imageSize: that.iconSize,// 二维码图标大小
-                    cbResult: function (res) { // 生成二维码的回调
-                        that._result(res)
-                    },
-                });
+				// #endif
+				// nvue下时因为gcanvas的GImage不生效，因此icon模式会采用webview
+				if ((this.icon == '' && that.isNvue) || !that.isNvue) {
+					qrcode = new QRCode({
+						vuectx: that, // 上下文环境
+						canvasId: that.cid, // canvas-id
+						ctx: that.ctx,
+						isNvue: that.isNvue,
+						usingComponents: that.usingComponents, // 是否是自定义组件
+						showLoading: false, // 是否显示loading
+						loadingText: that.loadingText, // loading文字
+						text: that.val, // 生成内容
+						size: that.sizeLocal, // 二维码大小
+						background: that.background, // 背景色
+						foreground: that.foreground, // 前景色
+						pdground: that.pdground, // 定位角点颜色
+						correctLevel: that.lv, // 容错级别
+						image: that.icon, // 二维码图标
+						imageSize: that.iconSize,// 二维码图标大小
+						cbResult: function (res) { // 生成二维码的回调
+							that._result(res)
+						},
+					});
+				}
             } else {
                 uni.showToast({
                     title: '二维码内容不能为空',
@@ -232,7 +254,25 @@ export default {
                         });
                     }
                 });
-            }
+            } else {
+				this.toTempFilePath({
+				    success: res => {
+						that.result = res.tempFilePath
+						uni.saveImageToPhotosAlbum({
+						    filePath: that.result,
+						    success: function () {
+						        uni.showToast({
+						            title: '二维码保存成功',
+						            icon: 'success',
+						            duration: 2000
+						        });
+						    }
+						});
+				    },
+				    fail: err => {
+				    }
+				})
+			}
         },
         preview(e) {
             // 预览图片
@@ -261,7 +301,7 @@ export default {
             }, e)
         },
         async toTempFilePath({success, fail}) {
-            if (this.context) {
+            if (this.ct) {
                 this.ctx.toTempFilePath(
                     0,
                     0,
@@ -277,13 +317,13 @@ export default {
                 );
             }
             else {
-                // #ifdef MP-TOUTIAO || H5
+                // #ifdef H5
                 success({
                     tempFilePath: this.ctx.canvas.toDataURL("image/png", 1)
                 })
                 // #endif
 
-                // #ifdef APP-PLUS
+                // #ifndef H5
                 uni.canvasToTempFilePath(
                     {
                         canvasId: this.cid,
@@ -294,19 +334,6 @@ export default {
                     },
                     this)
                 // #endif
-
-                // #ifndef MP-TOUTIAO || H5 || APP-PLUS
-                const canvas = await this.getNode(this.cid,true);
-                uni.canvasToTempFilePath(
-                    {
-                        canvas,
-                        success :res => {
-                            success(res)
-                        },
-                        fail: fail
-                    },
-                    this)
-                // #endif
             }
         },
         async longpress() {
@@ -324,7 +351,7 @@ export default {
          * @return {Promise<void>}
          */
         async setNewSize(){
-            const rootNode = await this.getNode(this.rootId,false);
+            const rootNode = await this.getCanvasNode(this.rootId, false);
             const { width , height } = rootNode;
             // 将最短的设置为二维码 的size
             if(width > height){
@@ -341,27 +368,93 @@ export default {
          * @param isCanvas 是否为Canvas节点
          * @return {Promise<unknown>}
          */
-        async getNode(id,isCanvas){
-            return new Promise((resolve, reject)=>{
-                try {
-                    const query = uni.createSelectorQuery().in(this);
-                    query.select(`#${id}`)
-                    .fields({ node: true, size: true })
-                    .exec((res) => {
-                        if(isCanvas){
-                            resolve(res[0].node)
-                        }
-                        else{
-                            resolve(res[0])
-                        }
-
-                    })
-                }
-                catch (e) {
-                    console.error("获取节点失败",e)
-                }
-            })
+        async getCanvasNode(id, isCanvas = true) {
+			let that = this
+        	return new Promise((resolve, reject) => {
+        		try {
+        			// #ifdef APP-NVUE
+        			setTimeout(() => {
+        				/*获取元素引用*/
+        				this.ganvas = this.$refs["gcanvess"]
+        				/*通过元素引用获取canvas对象*/
+        				let canvasNode = enable(this.ganvas, {
+        				    bridge: WeexBridge
+        				})
+        				resolve(canvasNode)
+        			}, 200)
+        			// #endif
+        			// #ifndef APP-PLUS-NVUE
+                    const query = uni.createSelectorQuery().in(that).select(`#${id}`);
+                    query.fields({
+                            node: true,
+                            size: true
+                        })
+                        .exec((res) => {
+                            if (isCanvas) {
+                                if (res[0]?.node) {
+                                    resolve(res[0].node)
+                                } else {
+                                    resolve(false)
+                                    console.error("获取节点出错", res)
+                                }
+                            } else {
+                                resolve(res[0])
+                            }
+                        })
+        			// #endif
+        		} catch (e) {
+        			console.error("获取节点失败", e)
+        		}
+        	})
         },
+		getUPCanvasContext() {
+			// #ifdef APP-PLUS
+			return uni.createCanvasContext(this.cid, this);
+			// #endif
+			// #ifdef APP-PLUS-NVUE || MP || H5
+			return canvas.getContext('2d');
+			// #endif
+		},
+		drawImage(url, x, y, w, h) {
+			try {
+				let img = {}
+				// #ifdef APP-NVUE
+				img = new GImage();
+				// #endif
+				
+				// #ifdef H5
+				// APP下不支持会一直卡住
+				img = new Image();
+				// #endif
+				
+				// #ifdef MP
+				// 小程序2d
+				// https://developers.weixin.qq.com/miniprogram/dev/api/canvas/Canvas.createImage.html
+				img = canvas.createImage();
+				// #endif
+				// #ifdef APP-NVUE
+				let that = this
+				// console.log(img)
+				img.onload = function(){
+					if (process.env.NODE_ENV === 'development') {
+						console.log('drawImage绘制2...')
+					}
+					that.cxt.drawImage(img, x, y, w, h);
+				}
+				// #endif
+				// #ifdef H5 || MP
+				img.onload = () => {
+					this.ctx.drawImage(img, x, y, w, h);
+				};
+				// #endif
+				img.src = url;
+				// #ifdef APP-VUE
+				this.ctx.drawImage(url, x, y, w, h);
+				// #endif
+			} catch (error) {
+				console.log('drawImage绘制出错', error)
+			}
+		},
 
         selectClick(index) {
             switch (index) {

package/components/u-radio/radio.js

@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:02:34
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/radio.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/radio.js
  */
 export default {
     // radio组件

package/components/u-radio-group/radioGroup.js

@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
  * @LastAuthor   : CPS
- * @lastTime     : 2024-11-05 16:01:12
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/radioGroup.js
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/radioGroup.js
  */
 export default {
     // radio-group组件

package/components/u-rate/rate.js

@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:05:09
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/rate.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-18 22:43:09
+ * @FilePath     : /uview-plus/libs/config/props/rate.js
  */
 export default {
     // rate组件

package/components/u-read-more/readMore.js

@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:18:41
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/readMore.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/readMore.js
  */
 import { t } from '../../libs/i18n'
 export default {

package/components/u-row/row.js

@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:18:58
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/row.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/row.js
  */
 export default {
     // row

package/components/u-row-notice/rowNotice.js

@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:19:13
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/rowNotice.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/rowNotice.js
  */
 export default {
     // rowNotice

package/components/u-scroll-list/scrollList.js

@@ -1,11 +1,11 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 17:19:28
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/scrollList.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/scrollList.js
  */
 export default {
     // scrollList