uview-plus 3.6.28 → 3.7.0

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-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 组件

package/components/u-code/code.js

@@ -1,10 +1,10 @@
 /*
  * @Author       : LQ
  * @Description  :
- * @version      : 1.0
+ * @version      : 3.0
  * @Date         : 2021-08-20 16:44:21
- * @LastAuthor   : LQ
- * @lastTime     : 2021-08-20 16:55:27
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
  * @FilePath     : /uview-plus/libs/config/props/code.js
  */
 import { t } from '../../libs/i18n'

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

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

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

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

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

package/components/u-count-down/countDown.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:11:29
- * @FilePath     : /u-view2.0/uview-ui/libs/config/props/countDown.js
+ * @LastAuthor   : jry
+ * @lastTime     : 2025-12-19 08:55:21
+ * @FilePath     : /uview-plus/libs/config/props/countDown.js
  */
 export default {
     // u-count-down 计时器组件

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

package/components/u-cropper/u-cropper.vue

@@ -76,7 +76,8 @@
 				expHeight: '',
 				// 是否允许调整裁剪框大小
 				letChangeSize: false,
-				
+				// 底部安全区大小
+				safeAreaInsetsBottom: 0,
 			};
 		},
 		watch: {
@@ -151,6 +152,7 @@
 				this.platform = sysInfo.platform;
 				this.pixelRatio = sysInfo.pixelRatio;
 				this.windowWidth = sysInfo.windowWidth;
+				this.safeAreaInsetsBottom = sysInfo.safeAreaInsets.bottom;
 				// #ifdef H5
 				this.drawTop = sysInfo.windowTop;
 				this.windowHeight = sysInfo.windowHeight + sysInfo.windowBottom;
@@ -162,12 +164,12 @@
 					this.cvsStyleHeight = this.windowHeight - tabHeight + 'px';
 				} else {
 					this.windowHeight = sysInfo.windowHeight + this.moreHeight;
-					this.cvsStyleHeight = this.windowHeight - tabHeight + 6 + 'px';
+					this.cvsStyleHeight = this.windowHeight - tabHeight - this.safeAreaInsetsBottom + 6 + 'px';
 				}
 				// #endif
 				// #ifdef MP
 				this.windowHeight = sysInfo.windowHeight + this.moreHeight;
-				this.cvsStyleHeight = this.windowHeight - tabHeight - 2 + 'px';
+				this.cvsStyleHeight = this.windowHeight - tabHeight - this.safeAreaInsetsBottom - 2 + 'px';
 				// #endif
 				this.pxRatio = this.windowWidth/750;
 
@@ -1226,3 +1228,4 @@
 	}
 }
 </style>
+

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

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