From 31fa1f43b30ae39d990d00021b2293c3522318bd Mon Sep 17 00:00:00 2001
From: icssoa <615206459@qq.com>
Date: Sun, 21 Aug 2022 02:03:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=20crud=20=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=86=99=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  4 +-
 src/modules/base/components/editor/wang.vue   |  2 +
 .../base/views/components/dept/check.vue      | 36 ++++---------
 .../base/views/components/menu/check.vue      | 44 ++++++----------
 src/modules/base/views/param.vue              | 17 +++----
 src/modules/base/views/role.vue               | 17 +++++--
 src/modules/base/views/user.vue               | 51 ++++++++-----------
 src/modules/demo/views/crud.vue               |  8 +--
 src/modules/dict/store/dict.ts                |  6 ++-
 yarn.lock                                     |  8 +--
 10 files changed, 84 insertions(+), 109 deletions(-)

diff --git a/package.json b/package.json
index f1e6b6d..a204ab5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "front-next",
-	"version": "5.8.1",
+	"version": "5.9.0",
 	"scripts": {
 		"dev": "vite --host",
 		"build": "vite build",
@@ -11,7 +11,7 @@
 	"dependencies": {
 		"@codemirror/lang-javascript": "^6.0.1",
 		"@codemirror/theme-one-dark": "^6.0.0",
-		"@cool-vue/crud": "^5.4.0",
+		"@cool-vue/crud": "^5.5.4",
 		"@element-plus/icons-vue": "^2.0.6",
 		"@vueuse/core": "^9.1.0",
 		"@wangeditor/editor": "^5.1.14",
diff --git a/src/modules/base/components/editor/wang.vue b/src/modules/base/components/editor/wang.vue
index 2de724d..4f13798 100644
--- a/src/modules/base/components/editor/wang.vue
+++ b/src/modules/base/components/editor/wang.vue
@@ -136,7 +136,9 @@ onBeforeUnmount(() => {
 <style lang="scss" scoped>
 .cl-editor-wang {
 	border: 1px solid var(--el-border-color);
+	border-radius: var(--el-border-radius-base);
 	box-sizing: border-box;
+	overflow: hidden;
 
 	:deep(.w-e-toolbar) {
 		border-bottom: 1px solid var(--el-border-color);
diff --git a/src/modules/base/views/components/dept/check.vue b/src/modules/base/views/components/dept/check.vue
index e92c1ff..33e003e 100644
--- a/src/modules/base/views/components/dept/check.vue
+++ b/src/modules/base/views/components/dept/check.vue
@@ -14,7 +14,6 @@
 					label: 'name',
 					children: 'children'
 				}"
-				:default-checked-keys="checked"
 				:filter-node-method="filterNode"
 				:check-strictly="checkStrictly"
 				@check="onCheckChange"
@@ -24,10 +23,10 @@
 </template>
 
 <script lang="ts" name="dept-check" setup>
-import { onMounted, ref, watch } from "vue";
+import { ref, watch } from "vue";
 import { deepTree } from "/@/cool/utils";
-import { ElMessage } from "element-plus";
 import { useCool } from "/@/cool";
+import { useUpsert } from "@cool-vue/crud";
 
 const props = defineProps({
 	modelValue: {
@@ -45,24 +44,16 @@ const { service } = useCool();
 const Tree = ref();
 
 // 树形列表
-const list = ref<any[]>([]);
-
-// 已选列表
-const checked = ref();
+const list = ref();
 
 // 关键字搜素
 const keyword = ref("");
 
 // 刷新树形列表
-function refresh() {
-	service.base.sys.department
-		.list()
-		.then((res) => {
-			list.value = deepTree(res);
-		})
-		.catch((err) => {
-			ElMessage.error(err.message);
-		});
+async function refresh() {
+	return service.base.sys.department.list().then((res) => {
+		list.value = deepTree(res);
+	});
 }
 
 // 过滤节点
@@ -81,16 +72,11 @@ watch(keyword, (val: string) => {
 	Tree.value.filter(val);
 });
 
-// 监听值
-watch(
-	() => props.modelValue,
-	(val) => {
-		checked.value = val || [];
+useUpsert({
+	async onOpened() {
+		await refresh();
+		Tree.value.setCheckedKeys(props.modelValue || []);
 	}
-);
-
-onMounted(() => {
-	refresh();
 });
 </script>
 
diff --git a/src/modules/base/views/components/menu/check.vue b/src/modules/base/views/components/menu/check.vue
index 717a29d..06c666c 100644
--- a/src/modules/base/views/components/menu/check.vue
+++ b/src/modules/base/views/components/menu/check.vue
@@ -12,7 +12,6 @@
 					label: 'name',
 					children: 'children'
 				}"
-				:default-checked-keys="checked"
 				:filter-node-method="filterNode"
 				@check="onCheckChange"
 			/>
@@ -21,10 +20,10 @@
 </template>
 
 <script lang="ts" name="menu-check" setup>
-import { onMounted, ref, watch } from "vue";
-import { ElMessage } from "element-plus";
+import { ref, watch } from "vue";
 import { deepTree } from "/@/cool/utils";
 import { useCool } from "/@/cool";
+import { useUpsert } from "@cool-vue/crud";
 
 const props = defineProps({
 	modelValue: {
@@ -37,28 +36,20 @@ const emit = defineEmits(["update:modelValue"]);
 
 const { service } = useCool();
 
-// 树形列表
-const list = ref<any[]>([]);
+// el-tree 组件
+const Tree = ref();
 
-// 已选列表
-const checked = ref<any[]>([]);
+// 树形列表
+const list = ref();
 
 // 搜索关键字
 const keyword = ref("");
 
-// el-tree 组件
-const Tree = ref();
-
 // 刷新列表
-function refresh() {
-	service.base.sys.menu
-		.list()
-		.then((res) => {
-			list.value = deepTree(res);
-		})
-		.catch((err) => {
-			ElMessage.error(err.message);
-		});
+async function refresh() {
+	return service.base.sys.menu.list().then((res) => {
+		list.value = deepTree(res);
+	});
 }
 
 // 过滤节点
@@ -77,16 +68,13 @@ watch(keyword, (val: string) => {
 	Tree.value.filter(val);
 });
 
-// 刷新监听
-watch(
-	() => props.modelValue,
-	(val) => {
-		checked.value = (val || []).filter((e) => Tree.value.getNode(e)?.isLeaf);
+useUpsert({
+	async onOpened() {
+		await refresh();
+		Tree.value.setCheckedKeys(
+			(props.modelValue || []).filter((e) => Tree.value.getNode(e)?.isLeaf)
+		);
 	}
-);
-
-onMounted(() => {
-	refresh();
 });
 </script>
 
diff --git a/src/modules/base/views/param.vue b/src/modules/base/views/param.vue
index 60623a0..61b8dfc 100644
--- a/src/modules/base/views/param.vue
+++ b/src/modules/base/views/param.vue
@@ -114,24 +114,21 @@ const Upsert = useUpsert({
 			prop: "name",
 			label: "名称",
 			span: 12,
+			required: true,
 			component: {
 				name: "el-input"
-			},
-			required: true
+			}
 		},
 		{
 			prop: "keyName",
 			label: "keyName",
 			span: 12,
+			required: true,
 			component: {
 				name: "el-input",
 				props: {
 					placeholder: "请输入Key"
 				}
-			},
-			rules: {
-				required: true,
-				message: "Key不能为空"
 			}
 		},
 		{
@@ -155,14 +152,14 @@ const Upsert = useUpsert({
 		}
 	],
 
-	onOpened(isEdit, data) {
+	onOpened(data) {
 		tab.index = null;
 
 		nextTick(() => {
-			if (isEdit) {
-				tab.index = /<*>/g.test(data.data) ? 1 : 0;
-			} else {
+			if (Upsert.value?.mode == "add") {
 				tab.index = 1;
+			} else {
+				tab.index = /<*>/g.test(data.data) ? 1 : 0;
 			}
 		});
 	}
diff --git a/src/modules/base/views/role.vue b/src/modules/base/views/role.vue
index 1f8ad81..e795cb2 100644
--- a/src/modules/base/views/role.vue
+++ b/src/modules/base/views/role.vue
@@ -103,19 +103,26 @@ const Upsert = useUpsert({
 		},
 		{
 			label: "数据权限",
+			prop: "relevance",
+			flex: false,
+			component: {
+				name: "slot-relevance"
+			}
+		},
+		{
+			label: "",
 			prop: "departmentIdList",
 			value: [],
 			component: {
 				vm: DeptCheck,
-				props: {}
-			},
-			append: {
-				name: "slot-relevance"
+				style: {
+					marginTop: "-10px"
+				}
 			}
 		}
 	],
 
-	onOpened(_, data) {
+	onOpened(data) {
 		onRelevanceChange(data.relevance || 0);
 	}
 });
diff --git a/src/modules/base/views/user.vue b/src/modules/base/views/user.vue
index 5fd83d1..c3658b9 100644
--- a/src/modules/base/views/user.vue
+++ b/src/modules/base/views/user.vue
@@ -214,24 +214,26 @@ const Upsert = useUpsert({
 				name: "el-input"
 			}
 		},
-		{
-			prop: "password",
-			label: "密码",
-			span: 12,
-			required: true,
-			component: {
-				name: "el-input",
-				props: {
-					type: "password"
-				}
-			},
-			rules: [
-				{
-					min: 6,
-					max: 16,
-					message: "密码长度在 6 到 16 个字符"
-				}
-			]
+		() => {
+			return {
+				prop: "password",
+				label: "密码",
+				span: 12,
+				required: Upsert.value?.mode == "add",
+				component: {
+					name: "el-input",
+					props: {
+						type: "password"
+					}
+				},
+				rules: [
+					{
+						min: 6,
+						max: 16,
+						message: "密码长度在 6 到 16 个字符"
+					}
+				]
+			};
 		},
 		{
 			prop: "roleIdList",
@@ -294,14 +296,14 @@ const Upsert = useUpsert({
 		}
 	],
 
-	onSubmit(_, data, { next }) {
+	onSubmit(data, { next }) {
 		next({
 			...data,
 			departmentId: selects.dept?.id
 		});
 	},
 
-	async onOpen(isEdit) {
+	async onOpen() {
 		const list = await service.base.sys.role.list();
 
 		// 设置权限列表
@@ -314,15 +316,6 @@ const Upsert = useUpsert({
 				};
 			})
 		);
-
-		// 编辑密码不必填
-		if (isEdit) {
-			Upsert.value?.setData("password", {
-				rules: {
-					required: false
-				}
-			});
-		}
 	}
 });
 
diff --git a/src/modules/demo/views/crud.vue b/src/modules/demo/views/crud.vue
index a508f46..d6e6e4e 100644
--- a/src/modules/demo/views/crud.vue
+++ b/src/modules/demo/views/crud.vue
@@ -119,13 +119,13 @@ const Upsert = useUpsert({
 		// done({ name: "🐑" });
 		// close();
 	},
-	onSubmit(isEdit, data, { next }) {
-		console.log(isEdit, data);
+	onSubmit(data, { next }) {
+		console.log(data);
 		next(data);
 		// Upsert.value?.close();
 	},
-	onOpen(isEdit, data) {
-		console.log(isEdit, data);
+	onOpen(data) {
+		console.log(data);
 	},
 	onClose(done) {
 		console.log("onclose");
diff --git a/src/modules/dict/store/dict.ts b/src/modules/dict/store/dict.ts
index 73f9a8a..1c10da1 100644
--- a/src/modules/dict/store/dict.ts
+++ b/src/modules/dict/store/dict.ts
@@ -1,5 +1,5 @@
 import { defineStore } from "pinia";
-import { computed, reactive } from "vue";
+import { computed, reactive, toRaw } from "vue";
 import { isDev, service } from "/@/cool";
 
 declare interface Data {
@@ -36,7 +36,9 @@ export const useDictStore = defineStore("dict", () => {
 				Object.assign(data, d);
 
 				if (isDev) {
-					console.log("字典数据", data);
+					console.group("字典数据");
+					console.log(toRaw(data));
+					console.groupEnd();
 				}
 
 				return data;
diff --git a/yarn.lock b/yarn.lock
index f3df6de..cb0001b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1052,10 +1052,10 @@
     style-mod "^4.0.0"
     w3c-keyname "^2.2.4"
 
-"@cool-vue/crud@^5.4.0":
-  version "5.4.0"
-  resolved "https://registry.npmjs.org/@cool-vue/crud/-/crud-5.4.0.tgz#2c174c9184ad7bd34fb4faf981e3406d3ef05bf0"
-  integrity sha512-7su1XhOMaRZbwbmVb9UOxxsyUB5bug7BRtu3Gpz/2sOVkolCsJJBqDqF8K5wiLmx1/ZXtjbzK797AywoMIpzyA==
+"@cool-vue/crud@^5.5.4":
+  version "5.5.4"
+  resolved "https://registry.npmjs.org/@cool-vue/crud/-/crud-5.5.4.tgz#f6874c46fa76494a9255249d64656ab9f22c7554"
+  integrity sha512-Z5s+OL/DQiFfKmhSns6g84MdVKlnatLnlGXFFJr9Y/WpCsbnLzdjIQsA7YKNzVGWuKVCPxc2Zd18QjYwWu97WA==
   dependencies:
     array.prototype.flat "^1.2.4"
     core-js "^3.21.1"