From f9030a5636169a3a53dadd5f35faccd478bcf905 Mon Sep 17 00:00:00 2001
From: icssoa <615206459@qq.com>
Date: Mon, 1 Aug 2022 11:03:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=8F=9C=E5=8D=95=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                     |  4 ++--
 src/modules/base/views/components/dept/check.vue |  2 +-
 src/modules/base/views/components/menu/check.vue |  6 +++---
 yarn.lock                                        | 12 ++++++------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index 0d4e610..6a2c990 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "front-next",
-	"version": "5.7.5",
+	"version": "5.7.6",
 	"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.3.1",
+		"@cool-vue/crud": "^5.3.2",
 		"@element-plus/icons-vue": "^2.0.6",
 		"@vueuse/core": "^8.9.4",
 		"axios": "^0.27.2",
diff --git a/src/modules/base/views/components/dept/check.vue b/src/modules/base/views/components/dept/check.vue
index 7c3eacd..33a6e09 100644
--- a/src/modules/base/views/components/dept/check.vue
+++ b/src/modules/base/views/components/dept/check.vue
@@ -23,7 +23,7 @@
 	</div>
 </template>
 
-<script lang="ts" setup>
+<script lang="ts" name="dept-check" setup>
 import { onMounted, ref, watch } from "vue";
 import { deepTree } from "/@/cool/utils";
 import { ElMessage } from "element-plus";
diff --git a/src/modules/base/views/components/menu/check.vue b/src/modules/base/views/components/menu/check.vue
index 572abf2..df3ee69 100644
--- a/src/modules/base/views/components/menu/check.vue
+++ b/src/modules/base/views/components/menu/check.vue
@@ -68,8 +68,8 @@ function filterNode(val: string, data: any) {
 }
 
 // 值改变
-function onCheckChange(_: any, { checkedKeys }: any) {
-	emit("update:modelValue", checkedKeys);
+function onCheckChange(_: any, { checkedKeys, halfCheckedKeys }: any) {
+	emit("update:modelValue", [...checkedKeys, ...halfCheckedKeys]);
 }
 
 // 过滤监听
@@ -81,7 +81,7 @@ watch(keyword, (val: string) => {
 watch(
 	() => props.modelValue,
 	(val) => {
-		checked.value = val || [];
+		checked.value = (val || []).filter((e) => Tree.value.getNode(e)?.isLeaf);
 	}
 );
 
diff --git a/yarn.lock b/yarn.lock
index 86db5a3..e07040b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1052,14 +1052,14 @@
     style-mod "^4.0.0"
     w3c-keyname "^2.2.4"
 
-"@cool-vue/crud@^5.3.1":
-  version "5.3.1"
-  resolved "https://registry.npmjs.org/@cool-vue/crud/-/crud-5.3.1.tgz#932fe9d382053a8259a5204b0d746d1e7fbb49b6"
-  integrity sha512-GfmBP1xMumz5NKDLOZgVJqkhEhiHTZsXxTTn4gaTe+vq3VesGWhhbfT71WL2U9SSTroTSJOdIHBG+xE4Wo9lFg==
+"@cool-vue/crud@^5.3.2":
+  version "5.3.2"
+  resolved "https://registry.npmjs.org/@cool-vue/crud/-/crud-5.3.2.tgz#61b01eb012688a0539e5939958cd9fb2bf60513a"
+  integrity sha512-tHmF6OGjGvoOCPTSzgFKv6x3UvFLDKq5NIneHx1jeoJwPE422lWHd/CeBr/tLq7pvFrRMsKWhlvD6moyfZDiQA==
   dependencies:
     array.prototype.flat "^1.2.4"
     core-js "^3.21.1"
-    element-plus "^2.2.6"
+    element-plus "^2.2.11"
     merge "^2.1.1"
     mitt "^3.0.0"
     vue "^3.2.31"
@@ -2446,7 +2446,7 @@ electron-to-chromium@^1.4.202:
   resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.206.tgz#580ff85b54d7ec0c05f20b1e37ea0becdd7b0ee4"
   integrity sha512-h+Fadt1gIaQ06JaIiyqPsBjJ08fV5Q7md+V8bUvQW/9OvXfL2LRICTz2EcnnCP7QzrFTS6/27MRV6Bl9Yn97zA==
 
-element-plus@^2.2.11, element-plus@^2.2.6:
+element-plus@^2.2.11:
   version "2.2.11"
   resolved "https://registry.npmjs.org/element-plus/-/element-plus-2.2.11.tgz#c242bd5ff10aea02cfc70c0b8c54cbc9b732e7ba"
   integrity sha512-JjOvz5DLBc4Jp9OHKXNcK/Cys4NX5/vxpZ+gYmH2V+pLkwJnyIOrNZ3QxfdyG6yE4+NkpoA6koEgUB7T+0Z5vQ==