From 40c2870d765750f3fa2a69ee32458a499b314e97 Mon Sep 17 00:00:00 2001
From: cKey <35512826+colinin@users.noreply.github.com>
Date: Tue, 28 Feb 2023 14:43:47 +0800
Subject: [PATCH] Fix bugs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 修复组件缓存无效.
2. 修复Table设置点击无效.
---
 .../Table/src/components/settings/ColumnSetting.vue           | 2 +-
 apps/vue/src/layouts/page/index.vue                           | 4 +---
 apps/vue/src/utils/helper/treeHelper.ts                       | 3 +++
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/apps/vue/src/components/Table/src/components/settings/ColumnSetting.vue b/apps/vue/src/components/Table/src/components/settings/ColumnSetting.vue
index 1d669a50d..24912b1fc 100644
--- a/apps/vue/src/components/Table/src/components/settings/ColumnSetting.vue
+++ b/apps/vue/src/components/Table/src/components/settings/ColumnSetting.vue
@@ -145,6 +145,7 @@
   const emits = defineEmits(['columns-change']);
 
   const { t } = useI18n();
+  const attrs = useAttrs();
   const table = useTableContext();
 
   const defaultRowSelection = omit(table.getRowSelection(), 'selectedRowKeys');
@@ -379,7 +380,6 @@
   }
 
   function getPopupContainer() {
-    const attrs = useAttrs();
     return isFunction(attrs.getPopupContainer)
       ? attrs.getPopupContainer()
       : getParentContainer();
diff --git a/apps/vue/src/layouts/page/index.vue b/apps/vue/src/layouts/page/index.vue
index 5fd9327ba..4f07853e1 100644
--- a/apps/vue/src/layouts/page/index.vue
+++ b/apps/vue/src/layouts/page/index.vue
@@ -15,9 +15,7 @@
         appear
       >
         <keep-alive v-if="openCache" :include="getCaches">
-          <div :key="route.name!">
-            <component :is="Component" :key="route.fullPath" />
-          </div>
+          <component :is="Component" :key="route.fullPath" />
         </keep-alive>
         <div v-else :key="route.name!">
           <component :is="Component" :key="route.fullPath" />
diff --git a/apps/vue/src/utils/helper/treeHelper.ts b/apps/vue/src/utils/helper/treeHelper.ts
index d905a224b..62e21a4fa 100644
--- a/apps/vue/src/utils/helper/treeHelper.ts
+++ b/apps/vue/src/utils/helper/treeHelper.ts
@@ -25,6 +25,9 @@ export function listToTree<T = any>(list: any[], config: Partial<TreeHelperConfi
   for (const node of list) {
     const parent = nodeMap.get(node[pid]);
     (parent ? parent[children] : result).push(node);
+    if (parent) {
+      parent.hasChildren = true;
+    }
   }
   return result;
 }