uview-plus 3.6.29 → 3.7.13

package/components/u-calendar/calendar.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 16:52:43
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/calendar.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/calendar.js
  */
 import { t } from '../../libs/i18n'
 export default {

package/components/u-canvas/u-canvas.vue

@@ -0,0 +1,423 @@
+<template>
+    <view class="u-canvas"
+        :id="rootId"
+        :style="{
+            width: useRootHeightAndWidth ? '100%' : 'auto',
+            height: useRootHeightAndWidth ? '100%' : 'auto',
+        }">
+        <!-- #ifdef MP || H5 -->
+        <canvas
+            class="u-canvas__canvas"
+            :id="canvasId"
+            :canvas-id="canvasId"
+            type="2d"
+            :style="{ width: width + unit, height: height + unit }"
+            @touchstart="onTouchStart"
+            @touchmove="onTouchMove"
+            @touchend="onTouchEnd"/>
+        <!-- #endif -->
+
+        <!-- #ifdef APP-PLUS -->
+        <canvas
+            class="u-canvas__canvas"
+            :id="canvasId"
+            :canvas-id="canvasId"
+            :style="{ width: width + unit, height: height + unit }" 
+            @touchstart="onTouchStart"
+            @touchmove="onTouchMove"
+            @touchend="onTouchEnd"/>
+        <!-- #endif -->
+
+        <!-- #ifdef APP-NVUE -->
+        <gcanvas class="u-canvas__canvas" ref="gcanvess"
+            :style="{ width: width + unit, height: height + unit }"
+            @touchstart="onTouchStart"
+            @touchmove="onTouchMove"
+            @touchend="onTouchEnd">
+        </gcanvas>
+        <!-- #endif -->
+    </view>
+</template>
+
+<script>
+// #ifdef APP-NVUE
+// https://github.com/dcloudio/NvueCanvasDemo/blob/master/README.md
+import {
+    enable,
+    WeexBridge,
+	Image as GImage
+} from '../../libs/util/gcanvas/index.js';
+// #endif
+let canvasNode = null;
+export default {
+    name: "u-canvas",
+    props: {
+        canvasId: {
+            type: String,
+            default: () => {
+				return `u-canvas${Math.floor(Math.random() * 1000000)}`
+			}
+        },
+        width: {
+            type: [String, Number],
+            default: 300
+        },
+        height: {
+            type: [String, Number],
+            default: 300
+        },
+        unit: {
+            type: String,
+            default: 'px'
+        },
+        useRootHeightAndWidth: {
+            type: Boolean,
+            default: false
+        },
+        // 背景色
+        bgColor: {
+            type: String,
+            default: '#ffffff'
+        }
+    },
+    data() {
+        return {
+            rootId: `rootId${Number(Math.random() * 100).toFixed(0)}`,
+            ganvas: null,
+            canvasContext: null,
+            widthLocal: this.width,
+            heightLocal: this.height,
+            ctx: null
+        };
+    },
+    computed: {
+        // 计算实际画布尺寸
+        actualWidth() {
+            return this.useRootHeightAndWidth ? this.widthLocal : Number(this.width);
+        },
+        actualHeight() {
+            return this.useRootHeightAndWidth ? this.heightLocal : Number(this.height);
+        }
+    },
+    methods: {
+        // 添加触摸事件处理方法
+        onTouchStart(e) {
+            this.$emit('touchstart', e);
+        },
+        onTouchMove(e) {
+            this.$emit('touchmove', e);
+        },
+        onTouchEnd(e) {
+            this.$emit('touchend', e);
+        },
+
+        /**
+         * 获取节点
+         * @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)
+        		}
+        	})
+        },
+		
+        /**
+         * 获取Canvas上下文
+         */
+        getCanvasContext() {
+            // #ifdef APP-PLUS
+            return uni.createCanvasContext(this.canvasId, this);
+            // #endif
+            // #ifdef APP-PLUS-NVUE || MP || H5
+            return canvasNode.getContext('2d');
+            // #endif
+        },
+
+        /**
+         * 初始化Canvas
+         */
+        async initCanvas() {
+            try {
+                canvasNode = await this.getCanvasNode(this.canvasId);
+                
+                // #ifdef MP-WEIXIN
+                // 在微信小程序中，为了提高清晰度，需要考虑设备像素比
+                const dpr = uni.getSystemInfoSync().pixelRatio;
+                if(canvasNode) {
+                    // 设置canvas实际绘制尺寸为显示尺寸的dpr倍
+                    canvasNode.width = this.actualWidth * dpr;
+                    canvasNode.height = this.actualHeight * dpr;
+                }
+                // #endif
+                
+                this.ctx = this.getCanvasContext();
+                
+                // #ifdef MP-WEIXIN
+                if(this.ctx) {
+                    this.ctx.scale(dpr, dpr);
+                }
+                // #endif
+                
+                // 初始化背景，但不在微信小程序中调用draw
+                this.clearCanvas();
+            } catch (error) {
+                console.error("初始化Canvas失败:", error);
+            }
+        },
+
+        /**
+         * 清空画布
+         */
+        clearCanvas() {
+            if (!this.ctx) return;
+
+            this.clearRect(0, 0, this.actualWidth, this.actualHeight);
+
+            // 填充背景色
+            this.beginPath();
+            this.rect(0, 0, this.actualWidth, this.actualHeight);
+
+            this.setFillStyle(this.bgColor);
+            this.fill();
+            
+            this.draw();
+        },
+        rect(x, y, width, height) {
+            if (!this.ctx) return;
+            this.ctx.rect(x, y, width, height);
+        },
+        clearRect(x, y, width, height) {
+            if (!this.ctx) return;
+            this.ctx.clearRect(x, y, width, height);
+        },
+        fill() {
+            if (!this.ctx) return;
+            this.ctx.fill();
+        },
+        setFillStyle(color) {
+            if (!this.ctx) return;
+
+            // #ifndef APP-PLUS-NVUE
+            if (this.ctx.setFillStyle) {
+                this.ctx.setFillStyle(color);
+            } else {
+                this.ctx.fillStyle = color;
+            }
+            // #endif
+            // #ifdef APP-PLUS-NVUE
+            this.ctx.setFillStyle(color);
+            // #endif
+        },
+
+        /**
+         * 设置线条样式
+         */
+        setLineStyle(lineColor, lineWidth) {
+            if (!this.ctx) return;
+            this.setLineCap('round');
+            this.setLineJoin('round');
+            this.setStrokeStyle(lineColor);
+            this.setLineWidth(lineWidth);
+        },
+        setLineCap(lineCap = 'round') {
+            if (!this.ctx) return;
+            if (this.ctx.setLineCap) {
+                this.ctx.setLineCap(lineCap);
+            } else {
+                this.ctx.lineCap = lineCap;
+            }
+        },
+        setLineJoin(lineJoin = 'round') {
+            if (!this.ctx) return;
+            if (this.ctx.setLineJoin) {
+                this.ctx.setLineJoin(lineJoin);
+            } else {
+                this.ctx.lineJoin = lineJoin;
+            }
+        },
+        setStrokeStyle(color) {
+            if (!this.ctx) return;
+            if (this.ctx.setStrokeStyle) {
+                this.ctx.setStrokeStyle(color);
+            } else {
+                this.ctx.strokeStyle = color;
+            }
+        },
+        setLineWidth(width) {
+            if (!this.ctx) return;
+            if (this.ctx.setLineWidth) {
+                this.ctx.setLineWidth(width);
+            } else {
+                this.ctx.lineWidth = width;
+            }
+        },
+
+        /**
+         * 开始路径
+         */
+        beginPath() {
+            if (!this.ctx) return;
+            this.ctx.beginPath();
+        },
+
+        /**
+         * 移动到某点
+         */
+        moveTo(x, y) {
+            if (!this.ctx) return;
+            this.ctx.moveTo(x, y);
+        },
+
+        /**
+         * 画线到某点
+         */
+        lineTo(x, y) {
+            if (!this.ctx) return;
+            this.ctx.lineTo(x, y);
+        },
+
+        /**
+         * 描边
+         */
+        stroke() {
+            if (!this.ctx) return;
+            this.ctx.stroke();
+        },
+
+        /**
+         * 关闭路径
+         */
+        closePath() {
+            if (!this.ctx) return;
+            this.ctx.closePath();
+        },
+
+        /**
+         * 绘制操作
+         */
+        draw(isLastDraw = false) {
+            // #ifndef MP-WEIXIN
+            if (this.ctx && typeof this.ctx.draw === 'function') {
+                this.ctx.draw(isLastDraw);
+            }
+            // #endif
+        },
+
+        /**
+         * 导出图片
+         */
+        exportImage(fileType = 'png', quality = 1) {
+            return new Promise((resolve, reject) => {
+                // #ifdef MP-WEIXIN
+                // 微信小程序中需要先完成绘制，然后导出图片
+                setTimeout(() => {
+                    uni.canvasToTempFilePath({
+                        x: 0,
+                        y: 0,
+                        width: this.actualWidth,
+                        height: this.actualHeight,
+                        destWidth: this.actualWidth * 2, // 使用双倍尺寸以提高清晰度
+                        destHeight: this.actualHeight * 2,
+                        canvas: canvasNode, // 2d必须
+                        canvasId: this.canvasId,
+                        fileType: fileType,
+                        quality: quality,
+                        success: (res) => {
+                            resolve(res.tempFilePath);
+                        },
+                        fail: (err) => {
+                            console.error('导出图片失败:', err);
+                            reject(err);
+                        }
+                    }, this);
+                }, 50); // 等待50毫秒确保绘制完成
+                // #endif
+
+                // #ifndef MP-WEIXIN
+                uni.canvasToTempFilePath({
+                    canvas: canvasNode, // 2d必须
+                    canvasId: this.canvasId,
+                    fileType: fileType,
+                    quality: quality,
+                    success: (res) => {
+                        resolve(res.tempFilePath);
+                    },
+                    fail: (err) => {
+                        console.error('导出图片失败:', err);
+                        reject(err);
+                    }
+                }, this);
+                // #endif
+            });
+        },
+
+        /**
+         * 使用根节点宽高 设置新的size
+         * @return {Promise<void>}
+         */
+        async setNewSize(){
+            const rootNode = await this.getCanvasNode(this.rootId, false);
+            const { width , height } = rootNode;
+            this.widthLocal = height;
+            this.heightLocal = width;
+        }
+    },
+    
+    async mounted() {
+        // 如果使用根节点的宽高 则 重新设置 size
+        if(this.useRootHeightAndWidth){
+            await this.setNewSize();
+        }
+        
+        // 初始化Canvas
+        await this.initCanvas();
+    }
+};
+</script>
+
+<style lang="scss" scoped>
+    .u-canvas {
+        position: relative;
+        overflow: hidden;
+    }
+
+    .u-canvas__canvas {
+        display: block;
+    }
+</style>

package/components/u-car-keyboard/carKeyboard.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 16:53:20
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/carKeyboard.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/carKeyboard.js
  */
 export default {
     // 车牌号键盘

package/components/u-cascader/u-cascader.vue

@@ -1,6 +1,6 @@
 <template>
 	<up-popup :show="popupShow" mode="bottom" :popup="false"
-		:mask="true" :closeable="true" :safe-area-inset-bottom="true"
+		:mask="true" :closeable="closeable" :safe-area-inset-bottom="true"
 		close-icon-color="#ffffff" :z-index="uZIndex"
 		:maskCloseAble="maskCloseAble" @close="close">
 		<view class="up-p-t-30 up-p-l-20 up-m-b-10" v-if="headerDirection =='column'">
@@ -61,6 +61,7 @@
 	 * @property {String} labelKey 指定选项标签为选项对象中的哪个属性值
 	 * @property {String} childrenKey 指定选项的子选项为选项对象中的哪个属性值
 	 * @property {Boolean} autoClose 是否在选择最后一级时自动关闭并触发confirm（默认false）
+	 * @property {Boolean} closeable 是否显示关闭图标（默认true）
 	 */
 	import { t } from '../../libs/i18n'
 	export default {
@@ -124,6 +125,11 @@
 			optionsCols: {
 				type: [Number],
 				default: 2
+			},
+			// 是否显示关闭图标
+			closeable: {
+				type: Boolean,
+				default: true
 			}
 		},
 		data() {
@@ -142,6 +148,7 @@
 			data: {
 				handler() {
 					this.initLevelList();
+					this.setDefaultValue();
 				},
 				immediate: true
 			},
@@ -150,7 +157,8 @@
 			},
 			modelValue: {
 				handler() {
-					this.init();
+					// 初始化选中值
+					this.setDefaultValue();
 				},
 				immediate: true
 			}
@@ -192,15 +200,9 @@
 			}
 		},
 		// 新增confirm事件
-		emits: ['update:modelValue', 'change', 'confirm'],
+		emits: ['update:modelValue', 'update:show', 'change', 'confirm', 'cancel'],
 		methods: {
 			t,
-			init() {
-				// 初始化选中值
-				if (this.modelValue && this.modelValue.length > 0) {
-					this.setDefaultValue();
-				}
-			},
 			initLevelList() {
 				// 初始化第一级数据
 				if (this.data && this.data.length > 0) {
@@ -209,14 +211,20 @@
 				}
 			},
 			setDefaultValue() {
+				// 检查data是否为空
+				if (!this.data || this.data.length == 0) return;
+				// 检查modelValue是否为空
+				if (!this.modelValue || this.modelValue.length == 0) return;
 				// 根据默认值设置选中项
 				// 根据modelValue获取indexs给selectedValueIndexs
 				this.selectedValueIndexs = [];
+				this.levelList = []; // 设置层级数据为空
 				let currentLevelData = this.data;
 				
 				for (let i = 0; i < this.modelValue.length; i++) {
 					const value = this.modelValue[i];
 					const index = currentLevelData.findIndex(item => item[this.valueKey] === value);
+					this.levelList[i] = currentLevelData; // 设置每一层级的数据
 					
 					if (index !== -1) {
 						this.selectedValueIndexs.push(index);
@@ -234,6 +242,7 @@
 				}
 			},
 			close() {
+				this.$emit('cancel');
 				this.$emit('update:show', false);
 			},
 			tabsChange(item) {
@@ -332,4 +341,4 @@
 	.u-cascader-action {
 		border-top: 1px solid #eee;
 	}
-</style>
+</style>

package/components/u-cate-tab/u-cate-tab.vue

@@ -83,14 +83,18 @@
 				deep: true,
 				handler(newVal, oldVal) {
 					// this.observer();
-					sleep(30);
-					this.getMenuItemTop();
-					this.leftMenuStatus(this.innerCurrent);
+					sleep(30).then(() => {
+						this.getMenuItemTop();
+						this.leftMenuStatus(this.innerCurrent);
+					})
 				}
 			},
 			current(nval) {
 				this.innerCurrent = nval;
 				this.leftMenuStatus(this.innerCurrent);
+				sleep(30).then(() => {
+					this.swichMenu(this.innerCurrent)
+				})
 			},
 			height() {
 				// console.log('height change');
@@ -120,6 +124,10 @@
 			this.innerCurrent = this.current;
 			this.leftMenuStatus(this.innerCurrent);
 			this.getMenuItemTop()
+			// 设置默认index
+			sleep(50).then(() => {
+				this.swichMenu(this.innerCurrent)
+			})
 		},
 		methods: {
 			addUnit,
@@ -129,7 +137,9 @@
 					if(this.arr.length == 0) {
 						await this.getMenuItemTop();
 					}
-					this.scrollIntoView = 'item' + index;
+					if (this.scrollIntoView != 'item' + index) {
+						this.scrollIntoView = 'item' + index;
+					}
 				}
 
 				if (index == this.innerCurrent) return;

package/components/u-cell/cell.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-23 20:53:09
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/cell.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/cell.js
  */
 export default {
 	// cell组件的props

package/components/u-cell-group/cellGroup.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 16:54:16
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/cellGroup.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/cellGroup.js
  */
 export default {
     // cell-group组件的props

package/components/u-checkbox/checkbox.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-23 21:06:59
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/checkbox.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/checkbox.js
  */
 export default {
     // checkbox组件

package/components/u-checkbox-group/checkboxGroup.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 16:54:47
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/checkboxGroup.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/checkboxGroup.js
  */
 export default {
     // checkbox-group组件

package/components/u-checkbox-group/u-checkbox-group.vue

@@ -109,7 +109,10 @@
 				this.$emit("input", values);
 				// #endif
        			// 放在最后更新，否则change事件传出去的values不会更新
-				this.$emit('change', values)
+				this.$emit('change', values, {
+					isChecked: childInstance.$data['isChecked'],
+					name: childInstance.$props['name'] // 当前变动的checkbox的name值
+				})
 			},
 		}
 	}

package/components/u-circle-progress/circleProgress.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 16:55:02
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/circleProgress.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/circleProgress.js
  */
 export default {
     // circleProgress 组件