ZaiZai 2 jaren geleden
bovenliggende
commit
fab2fee533

+ 5 - 0
uni_modules/uv-checkbox/changelog.md

@@ -1,3 +1,8 @@
+## 1.0.11(2023-09-01)
+1. 修复点击空隙处无效的问题
+2. label支持插槽下可点击
+## 1.0.10(2023-08-27)
+1. 修复label设置布尔值不生效的BUG
 ## 1.0.9(2023-08-16)
 1. 解决数据多不换行的BUG
 ## 1.0.8(2023-07-13)

+ 1 - 1
uni_modules/uv-checkbox/components/uv-checkbox/props.js

@@ -47,7 +47,7 @@ export default {
 		},
 		// label提示文字,因为nvue下,直接slot进来的文字,由于特殊的结构,无法修改样式
 		label: {
-			type: [String, Number],
+			type: [String, Number, Boolean],
 			default: ''
 		},
 		// label的字体大小,px单位

+ 19 - 13
uni_modules/uv-checkbox/components/uv-checkbox/uv-checkbox.vue

@@ -20,16 +20,20 @@
 				/>
 			</slot>
 		</view>
-		<slot>
-			<text
-			  @tap.stop="labelClickHandler"
-			  :style="{
-					color: elDisabled ? elInactiveColor : elLabelColor,
-					fontSize: elLabelSize,
-					lineHeight: elLabelSize
-				}"
-			>{{label}}</text>
-		</slot>
+		<view 
+			class="uv-checkbox__label-wrap" 
+			@tap.stop="labelClickHandler">
+			<slot>
+				<text
+				  :style="{
+						color: elDisabled ? elInactiveColor : elLabelColor,
+						fontSize: elLabelSize,
+						lineHeight: elLabelSize
+					}"
+				>{{label}}</text>
+			</slot>
+		</view>
+		
 	</view>
 </template>
 
@@ -260,7 +264,7 @@
 	@import '@/uni_modules/uv-ui-tools/libs/css/variable.scss';
 	@import '@/uni_modules/uv-ui-tools/libs/css/components.scss';
 	@import '@/uni_modules/uv-ui-tools/libs/css/color.scss';
-	$uv-checkbox-icon-wrap-margin-right:6px !default;
+	$uv-checkbox-label-wrap-padding-right:6px !default;
 	$uv-checkbox-icon-wrap-font-size:6px !default;
 	$uv-checkbox-icon-wrap-border-width:1px !default;
 	$uv-checkbox-icon-wrap-border-color:#c8c9cc !default;
@@ -308,8 +312,6 @@
 			justify-content: center;
 			color: transparent;
 			text-align: center;
-			margin-right: $uv-checkbox-icon-wrap-margin-right;
-
 			font-size: $uv-checkbox-icon-wrap-font-size;
 			border-width: $uv-checkbox-icon-wrap-border-width;
 			border-color: $uv-checkbox-icon-wrap-border-color;
@@ -359,5 +361,9 @@
 				color: $uv-checkbox-label-disabled-color;
 			}
 		}
+		
+		&__label-wrap {
+			padding-left: $uv-checkbox-label-wrap-padding-right;
+		}
 	}
 </style>

+ 1 - 1
uni_modules/uv-checkbox/package.json

@@ -1,7 +1,7 @@
 {
   "id": "uv-checkbox",
   "displayName": "uv-checkbox 复选框 全面兼容vue3+2、app、h5、小程序等多端",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "复选框组件一般用于需要多个选择的场景,该组件功能完整,使用方便。",
   "keywords": [
     "uv-checkbox",

+ 2 - 0
uni_modules/uv-ui-tools/changelog.md

@@ -1,3 +1,5 @@
+## 1.1.10(2023-08-31)
+1. 修复customStyle和customClass存在冲突的问题
 ## 1.1.9(2023-08-27)
 1. 版本升级
 2. 优化

+ 4 - 1
uni_modules/uv-ui-tools/index.js

@@ -48,7 +48,10 @@ const $uv = {
 uni.$uv = $uv;
 const install = (Vue,options={}) => {
 		// #ifndef APP-NVUE
-		Vue.mixin(mixin);
+		const cloneMixin = index.deepClone(mixin);
+		delete cloneMixin?.props?.customClass;
+		delete cloneMixin?.props?.customStyle;
+		Vue.mixin(cloneMixin);
 		// #ifdef MP
 		if(options.mpShare){
 			Vue.mixin(mpShare);

+ 2 - 2
uni_modules/uv-ui-tools/libs/config/config.js

@@ -1,5 +1,5 @@
-// 此版本发布于2023-08-27
-const version = '1.1.9'
+// 此版本发布于2023-08-30
+const version = '1.1.10'
 
 // 开发环境才提示,生产环境不会提示
 if (process.env.NODE_ENV === 'development') {

+ 1 - 1
uni_modules/uv-ui-tools/package.json

@@ -1,7 +1,7 @@
 {
   "id": "uv-ui-tools",
   "displayName": "uv-ui-tools 工具集 全面兼容vue3+2、app、h5、小程序等多端",
-  "version": "1.1.9",
+  "version": "1.1.10",
   "description": "uv-ui-tools,集成工具库,强大的Http请求封装,清晰的文档说明,开箱即用。方便使用,可以全局使用",
   "keywords": [
     "uv-ui-tools,uv-ui组件库,工具集,uvui,uView2.x"