From d50b4fa47c0cf332f297fe3b14c63c0d4b1ad495 Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Mon, 6 Jan 2025 10:48:28 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E8=B0=83=E6=95=B4=E9=97=B4=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/components/tree/src/data.tsx      |  3 ++-
 apps/web-antd/src/components/tree/src/helper.tsx    |  5 +++--
 .../src/components/tree/src/menu-select-table.vue   | 13 ++++++++-----
 .../src/components/tree/src/tree-select-panel.vue   |  8 +++++---
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/apps/web-antd/src/components/tree/src/data.tsx b/apps/web-antd/src/components/tree/src/data.tsx
index 4bc846d4..2bbaf317 100644
--- a/apps/web-antd/src/components/tree/src/data.tsx
+++ b/apps/web-antd/src/components/tree/src/data.tsx
@@ -2,9 +2,10 @@ import type { VxeGridProps } from '#/adapter/vxe-table';
 import type { ID } from '#/api/common';
 import type { MenuOption } from '#/api/system/menu/model';
 
-import { FolderIcon, MenuIcon, OkButtonIcon, VbenIcon } from '@vben/icons';
 import { h, markRaw } from 'vue';
 
+import { FolderIcon, MenuIcon, OkButtonIcon, VbenIcon } from '@vben/icons';
+
 export interface Permission {
   checked: boolean;
   id: ID;
diff --git a/apps/web-antd/src/components/tree/src/helper.tsx b/apps/web-antd/src/components/tree/src/helper.tsx
index 625cdede..39a6a71f 100644
--- a/apps/web-antd/src/components/tree/src/helper.tsx
+++ b/apps/web-antd/src/components/tree/src/helper.tsx
@@ -1,8 +1,9 @@
-import type { MenuOption } from '#/api/system/menu/model';
-
 import type { MenuPermissionOption } from './data';
 
+import type { MenuOption } from '#/api/system/menu/model';
+
 import { eachTree } from '@vben/utils';
+
 import { difference } from 'lodash-es';
 
 /**
diff --git a/apps/web-antd/src/components/tree/src/menu-select-table.vue b/apps/web-antd/src/components/tree/src/menu-select-table.vue
index 33e208fc..43643fbf 100644
--- a/apps/web-antd/src/components/tree/src/menu-select-table.vue
+++ b/apps/web-antd/src/components/tree/src/menu-select-table.vue
@@ -1,14 +1,17 @@
 <script setup lang="tsx">
+import type { MenuPermissionOption } from './data';
+
 import type { VxeGridProps } from '#/adapter/vxe-table';
 import type { MenuOption } from '#/api/system/menu/model';
 
-import type { MenuPermissionOption } from './data';
+import { nextTick, onMounted, ref, watch } from 'vue';
 
-import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { cloneDeep, findGroupParentIds } from '@vben/utils';
+
 import { Alert, Checkbox, RadioGroup, Space } from 'ant-design-vue';
 import { uniq } from 'lodash-es';
-import { nextTick, onMounted, ref, watch } from 'vue';
+
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
 
 import { columns, nodeOptions } from './data';
 import { menusWithPermissions, rowAndChildrenChecked } from './helper';
@@ -339,7 +342,7 @@ defineExpose({
         />
         <Alert class="mx-2" type="info">
           <template #message>
-            <div v-if="tableApi?.grid">
+            <div>
               已选中
               <span class="text-primary mx-1 font-semibold">
                 {{ checkedNum }}
@@ -361,7 +364,7 @@ defineExpose({
         </Space>
       </template>
       <template #permissions="{ row }">
-        <div class="flex flex-wrap gap-3">
+        <div class="flex flex-wrap gap-x-3 gap-y-1">
           <Checkbox
             v-for="permission in row.permissions"
             :key="permission.id"
diff --git a/apps/web-antd/src/components/tree/src/tree-select-panel.vue b/apps/web-antd/src/components/tree/src/tree-select-panel.vue
index 9a2a7744..0e478084 100644
--- a/apps/web-antd/src/components/tree/src/tree-select-panel.vue
+++ b/apps/web-antd/src/components/tree/src/tree-select-panel.vue
@@ -3,7 +3,9 @@ import type { CheckboxChangeEvent } from 'ant-design-vue/es/checkbox/interface';
 import type { DataNode } from 'ant-design-vue/es/tree';
 import type { CheckInfo } from 'ant-design-vue/es/vc-tree/props';
 
-import { computed, nextTick, onMounted, type PropType, ref, watch } from 'vue';
+import type { PropType } from 'vue';
+
+import { computed, nextTick, onMounted, ref, watch } from 'vue';
 
 import { findGroupParentIds, treeToList } from '@vben/utils';
 
@@ -108,8 +110,8 @@ const stop = watch([checkedKeys, () => props.treeData], () => {
  * @param info info.halfCheckedKeys为父节点的ID
  */
 type CheckedState<T = number | string> =
-  | { checked: T[]; halfChecked: T[] }
-  | T[];
+  | T[]
+  | { checked: T[]; halfChecked: T[] };
 function handleChecked(checkedStateKeys: CheckedState, info: CheckInfo) {
   // 数组的话为节点关联
   if (Array.isArray(checkedStateKeys)) {