From 9c56a99c49f242b80a263a8958c4e10add1d4667 Mon Sep 17 00:00:00 2001
From: icssoa <615206459@qq.com>
Date: Mon, 19 Feb 2024 14:30:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20cl-switch=20=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/base/views/menu/index.vue        |  4 ----
 src/modules/base/views/role.vue              |  6 +-----
 src/plugins/crud/components/switch/index.tsx | 22 +++++++++++++-------
 src/plugins/upload/config.ts                 |  9 +++-----
 4 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/src/modules/base/views/menu/index.vue b/src/modules/base/views/menu/index.vue
index 2c32382..ad0e275 100644
--- a/src/modules/base/views/menu/index.vue
+++ b/src/modules/base/views/menu/index.vue
@@ -33,8 +33,6 @@
 				<template #column-isShow="{ scope }">
 					<cl-switch
 						v-model="scope.row.isShow"
-						:active-value="true"
-						:inactive-value="false"
 						:scope="scope.row"
 						:column="scope.column"
 						v-if="scope.row.type != 2"
@@ -47,8 +45,6 @@
 				<template #column-keepAlive="{ scope }">
 					<cl-switch
 						v-model="scope.row.keepAlive"
-						:active-value="true"
-						:inactive-value="false"
 						:scope="scope.row"
 						:column="scope.column"
 						v-if="scope.row.type == 1"
diff --git a/src/modules/base/views/role.vue b/src/modules/base/views/role.vue
index e5d7270..bdd3b30 100644
--- a/src/modules/base/views/role.vue
+++ b/src/modules/base/views/role.vue
@@ -21,11 +21,7 @@
 			<template #slot-relevance="{ scope }">
 				<div>
 					<el-row>
-						<el-switch
-							v-model="scope.relevance"
-							:active-value="1"
-							:inactive-value="0"
-						/>
+						<cl-switch v-model="scope.relevance" />
 
 						<span
 							:style="{
diff --git a/src/plugins/crud/components/switch/index.tsx b/src/plugins/crud/components/switch/index.tsx
index 74294de..9cbf59c 100644
--- a/src/plugins/crud/components/switch/index.tsx
+++ b/src/plugins/crud/components/switch/index.tsx
@@ -1,6 +1,6 @@
 import { useCrud } from "@cool-vue/crud";
 import { ElMessage } from "element-plus";
-import { defineComponent, ref, watch } from "vue";
+import { defineComponent, nextTick, ref, watch } from "vue";
 import { isBoolean, isFunction } from "lodash-es";
 
 export default defineComponent({
@@ -30,14 +30,20 @@ export default defineComponent({
 		// 状态
 		const status = ref<boolean | number | string>();
 
+		const activeValue = ref();
+		const inactiveValue = ref();
+
 		watch(
 			() => props.modelValue,
-			(val: any) => {
-				if (isBoolean(props.activeValue)) {
-					status.value = Boolean(val);
-				} else {
-					status.value = val;
+			(val) => {
+				if (isBoolean(props.modelValue)) {
+					activeValue.value = true;
+					inactiveValue.value = false;
 				}
+
+				nextTick(() => {
+					status.value = val;
+				});
 			},
 			{
 				immediate: true
@@ -82,8 +88,8 @@ export default defineComponent({
 			return (
 				<el-switch
 					v-model={status.value}
-					active-value={props.activeValue}
-					inactive-value={props.inactiveValue}
+					active-value={activeValue.value}
+					inactive-value={inactiveValue.value}
 					onChange={onChange}
 					onClick={onClick}
 				/>
diff --git a/src/plugins/upload/config.ts b/src/plugins/upload/config.ts
index 978bf96..fc1ecf5 100644
--- a/src/plugins/upload/config.ts
+++ b/src/plugins/upload/config.ts
@@ -3,8 +3,8 @@ export default () => {
 		label: "文件上传",
 		description: "基于 el-upload 封装的文件上传组件",
 		author: "COOL",
-		version: "1.1.0",
-		updateTime: "2024-02-05",
+		version: "1.1.1",
+		updateTime: "2024-02-19",
 		demo: [
 			{
 				name: "基础用法",
@@ -48,10 +48,7 @@ export default () => {
 				size: 100
 			},
 			// 云端上传路径前缀
-			prefixPath: {
-				type: String,
-				default: "app/base"
-			},
+			prefixPath: "app/base",
 			// 规则
 			rules: [
 				{