uview-plus 3.8.49 → 3.8.86

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

@@ -4,36 +4,20 @@
           :style="{
               width: useRootHeightAndWidth ? '100%' : 'auto',
               height: useRootHeightAndWidth ? '100%' : 'auto',
-          }"
-          @longpress="longpress">
-        <view class="u-qrcode__content" @click="preview">
-            <!-- #ifdef MP || H5 -->
-            <canvas
-                class="u-qrcode__canvas"
-                :id="cid"
-                :canvas-id="cid"
-                type="2d"
-                :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 -->
-			<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"
-                  :style="{ width: sizeLocal + unit, height: sizeLocal + unit }">
+        }"
+          @longpress="longpress">
+        <view class="u-qrcode__content" @click="preview">
+            <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 }" />
+            <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>
             </view>
         </view>
@@ -41,22 +25,10 @@
     </view>
 </template>
 
-<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,
-	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 {
+<script>
+import QRCode from "./qrcode.js"
+let qrcode
+export default {
     name: "u-qrcode",
     props: {
         cid: {
@@ -149,34 +121,26 @@ export default {
                 {
                     name: '保存二维码',
                 }
-            ],
-            rootId: `rootId${Number(Math.random() * 100).toFixed(0)}`,
-            ganvas: null,
-            canvasObj: {},
-            sizeLocal: this.size,
-            ctx: null,
-			_ready: false
-        }
-    },
-    async mounted(){
-        // 如果使用根节点的宽高 则 重新设置 size
-        if(this.useRootHeightAndWidth){
-            await this.setNewSize()
-        }
-		canvas = await this.getCanvasNode(this.cid)
-
-		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) {
+            ],
+            rootId: `rootId${Number(Math.random() * 100).toFixed(0)}`,
+            canvasObj: {},
+            sizeLocal: this.size,
+            ctx: null,
+            isNvue: false,
+            canvasHost: null
+        }
+    },
+    async mounted(){
+        // 如果使用根节点的宽高 则 重新设置 size
+        if(this.useRootHeightAndWidth){
+            await this.setNewSize()
+        }
+        // #ifdef APP-NVUE
+		this.isNvue = true
+		// #endif
+		await this.initCanvas()
+
+        if (this.loadMake) {
             if (!this._empty(this.val)) {
                 setTimeout(() => {
                     setTimeout(()=>{
@@ -185,56 +149,43 @@ export default {
                 }, 0);
             }
         }
-    },
-    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)) {
+    },
+    methods: {
+        async _makeCode() {
+            let that = this
+			if (!this.ctx) {
+                await this.initCanvas(true)
+            }
+			if (!this.ctx) return
+            if (!this._empty(this.val)) {
                 // #ifndef APP-NVUE
                 this.loading = true
 				// #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, // 定位角点颜色
-						quietZone: that.quietZone, // 静区宽度
-						correctLevel: that.lv, // 容错级别
-						image: that.icon, // 二维码图标
-						imageSize: that.iconSize,// 二维码图标大小
-						cbResult: function (res) { // 生成二维码的回调
-							that._result(res)
-						},
-					});
-				}
-            } else {
+                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',
@@ -242,10 +193,10 @@ export default {
                 });
             }
         },
-        _clearCode() {
-            this._result('')
-            qrcode.clear()
-        },
+        _clearCode() {
+            this._result('')
+            if (qrcode) qrcode.clear()
+        },
         _saveCode() {
             let that = this;
             if (this.result != "") {
@@ -305,42 +256,25 @@ export default {
                 url: this.result
             }, e)
         },
-        async toTempFilePath({success, fail}) {
-            if (this.ct) {
-                this.ctx.toTempFilePath(
-                    0,
-                    0,
-                    this.sizeLocal,
-                    this.sizeLocal,
-                    this.sizeLocal,
-                    this.sizeLocal,
-                    "",
-                    1,
-                    res => {
-                        success(res)
-                    }
-                );
-            }
-            else {
-                // #ifdef H5
-                success({
-                    tempFilePath: this.ctx.canvas.toDataURL("image/png", 1)
-                })
-                // #endif
-
-                // #ifndef H5
-                uni.canvasToTempFilePath(
-                    {
-                        canvasId: this.cid,
-                        success :res => {
-                            success(res)
-                        },
-                        fail: fail
-                    },
-                    this)
-                // #endif
-            }
-        },
+        async toTempFilePath({success, fail}) {
+            if (!this.canvasHost) {
+                await this.initCanvas(true)
+            }
+            if (!this.canvasHost) {
+                if (fail) fail(new Error('无法获取二维码画布实例'))
+                return
+            }
+            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({
                 success: res => {
@@ -355,9 +289,10 @@ export default {
          * 使用根节点宽高 设置新的size
          * @return {Promise<void>}
          */
-        async setNewSize(){
-            const rootNode = await this.getCanvasNode(this.rootId, false);
-            const { width , height } = rootNode;
+        async setNewSize(){
+            const rootNode = await this.getRootNode();
+            if (!rootNode) return
+            const { width , height } = rootNode;
             // 将最短的设置为二维码 的size
             if(width > height){
                 this.sizeLocal = height
@@ -367,98 +302,45 @@ export default {
             }
         },
 
-        /**
-         * 获取节点
-         * @param id 节点id
-         * @param isCanvas 是否为Canvas节点
-         * @return {Promise<unknown>}
-         */
-        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)
-			}
+        async getRootNode() {
+            return new Promise((resolve, reject) => {
+                try {
+                    const query = uni.createSelectorQuery().in(this).select(`#${this.rootId}`);
+                    query.fields({
+                            size: true
+                        })
+                        .exec((res) => {
+                            resolve(res[0] || false)
+                        })
+                } catch (e) {
+                    console.error("获取二维码根节点失败", e)
+                    resolve(false)
+                }
+            })
+        },
+        async initCanvas(force = false) {
+            await this.$nextTick()
+            const canvasRef = this.$refs.qrcodeCanvas
+            if (!canvasRef) return false
+            await canvasRef.initCanvas(force)
+            this.canvasHost = canvasRef
+            this.ctx = canvasRef.getRawContext()
+            return !!this.ctx
+        },
+		getUPCanvasContext() {
+            return this.canvasHost ? this.canvasHost.getRawContext() : null
+		},
+		async drawImage(url, x, y, w, h) {
+			try {
+                if (!this.canvasHost) {
+                    await this.initCanvas(true)
+                }
+                if (this.canvasHost) {
+                    await this.canvasHost.drawImage(url, x, y, w, h)
+                }
+			} catch (error) {
+				console.log('drawImage绘制出错', error)
+			}
 		},
 
         selectClick(index) {

package/components/u-radio/props.js

@@ -1,5 +1,8 @@
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
+import RadioDefaultProps from './radio'
+import { registerComponentProps } from '../../libs/config/props.js'
+
+const defProps = registerComponentProps(RadioDefaultProps)
 export const props = defineMixin({
     props: {
         // radio的名称

package/components/u-radio/u-radio.vue

@@ -11,7 +11,7 @@
 		    :class="iconClasses"
 		    :style="[iconWrapStyle]"
 		>
-			<slot name="icon" :elIconSize="elIconSize" :elIconColor="elIconColor">
+			<slot name="icon" :elIconSize="elIconSize" :elIconColor="elIconColor" :checked="checked" :elDisabled="elDisabled">
 				<up-icon
 				    class="u-radio__icon-wrap__icon"
 				    name="checkbox-mark"
@@ -145,8 +145,12 @@
 				if (this.elDisabled) {
 					classes.push('u-radio__icon-wrap--disabled')
 				}
-				if (this.checked && this.elDisabled) {
-					classes.push('u-radio__icon-wrap--disabled--checked')
+				if (this.checked) {
+				    if (this.elDisabled) {
+						classes.push('u-radio__icon-wrap--disabled--checked')
+					} else {
+						classes.push('u-radio__icon-wrap--checked')
+					}
 				}
 				// 支付宝，头条小程序无法动态绑定一个数组类名，否则解析出来的结果会带有","，而导致失效
 				// #ifdef MP-ALIPAY || MP-TOUTIAO

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

@@ -1,5 +1,8 @@
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
+import RadioGroupDefaultProps from './radioGroup'
+import { registerComponentProps } from '../../libs/config/props.js'
+
+const defProps = registerComponentProps(RadioGroupDefaultProps)
 export const props = defineMixin({
     props: {
         // #ifdef VUE3

package/components/u-rate/props.js

@@ -1,5 +1,8 @@
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
+import RateDefaultProps from './rate'
+import { registerComponentProps } from '../../libs/config/props.js'
+
+const defProps = registerComponentProps(RateDefaultProps)
 export const props = defineMixin({
     props: {
         // #ifdef VUE3

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

@@ -1,5 +1,8 @@
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
+import ReadMoreDefaultProps from './readMore'
+import { registerComponentProps } from '../../libs/config/props.js'
+
+const defProps = registerComponentProps(ReadMoreDefaultProps)
 export const props = defineMixin({
     props: {
         // 默认的显示占位高度

package/components/u-row/props.js

@@ -1,5 +1,8 @@
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
+import RowDefaultProps from './row'
+import { registerComponentProps } from '../../libs/config/props.js'
+
+const defProps = registerComponentProps(RowDefaultProps)
 export const props = defineMixin({
     props: {
         // 给col添加间距，左右边距各占一半

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

@@ -1,5 +1,8 @@
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
+import RowNoticeDefaultProps from './rowNotice'
+import { registerComponentProps } from '../../libs/config/props.js'
+
+const defProps = registerComponentProps(RowNoticeDefaultProps)
 export const props = defineMixin({
     props: {
         // 显示的内容，字符串

package/components/u-safe-bottom/props.js

@@ -1,6 +1,7 @@
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
+import { registerComponentProps } from '../../libs/config/props.js'
 
+const defProps = registerComponentProps({ safeBottom: {} })
 export const props = defineMixin({
     props: {
     }

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

@@ -1,5 +1,8 @@
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
+import ScrollListDefaultProps from './scrollList'
+import { registerComponentProps } from '../../libs/config/props.js'
+
+const defProps = registerComponentProps(ScrollListDefaultProps)
 export const props = defineMixin({
     props: {
         // 指示器的整体宽度

package/components/u-search/props.js

@@ -1,6 +1,8 @@
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
+import SearchDefaultProps from './search'
+import { registerComponentProps } from '../../libs/config/props.js'
 
+const defProps = registerComponentProps(SearchDefaultProps)
 export const props = defineMixin({
 	props: {
 		// #ifdef VUE3

package/components/u-skeleton/props.js

@@ -1,5 +1,8 @@
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
+import SkeletonDefaultProps from './skeleton'
+import { registerComponentProps } from '../../libs/config/props.js'
+
+const defProps = registerComponentProps(SkeletonDefaultProps)
 export const props = defineMixin({
     props: {
         // 是否展示骨架组件

package/components/u-slider/props.js

@@ -1,6 +1,8 @@
 import { defineMixin } from '../../libs/vue'
-import defProps from '../../libs/config/props.js'
+import SliderDefaultProps from './slider'
+import { registerComponentProps } from '../../libs/config/props.js'
 
+const defProps = registerComponentProps(SliderDefaultProps)
 export const props = defineMixin({
     props: {
         // 最小可选值