From 11591eefcf552a9ea7db2c69fe66c4493c2d520d Mon Sep 17 00:00:00 2001
From: wangxuefeng <wangxuefeng@shiyue.com>
Date: Thu, 13 Mar 2025 16:36:57 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E6=9E=84=E5=BB=BA=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/platform/src/layouts/basic.vue           |  8 ++---
 .../platform/src/router/routes/modules/acl.ts |  4 +--
 .../src/router/routes/modules/micro.ts        | 33 +++++++++----------
 .../src/router/routes/modules/project.ts      | 19 +++++++----
 4 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/apps/platform/src/layouts/basic.vue b/apps/platform/src/layouts/basic.vue
index f9f800d..d746bf8 100644
--- a/apps/platform/src/layouts/basic.vue
+++ b/apps/platform/src/layouts/basic.vue
@@ -124,10 +124,10 @@ watch(
   <BasicLayout @clear-preferences-and-logout="handleLogout">
     <template #user-dropdown>
       <UserDropdown
-        :avatar
-        :menus
-        :text="userStore.userInfo?.realName"
-        description="ann.vben@gmail.com"
+        :menus="menus"
+        :avatar="avatar"
+        :text="userStore.userInfo?.alias"
+        :description="userStore.userInfo?.username"
         tag-text="Pro"
         @logout="handleLogout"
       />
diff --git a/apps/platform/src/router/routes/modules/acl.ts b/apps/platform/src/router/routes/modules/acl.ts
index b3faf87..8f23f51 100644
--- a/apps/platform/src/router/routes/modules/acl.ts
+++ b/apps/platform/src/router/routes/modules/acl.ts
@@ -33,7 +33,6 @@ const routes: Array<RouteRecordRaw> = [
         },
         component: () => {
           const userStore = useUserStore();
-          console.log('userStore.token', userStore.token);
           return h(RendererAdapter, {
             url: VITE_RENDERER_URL,
             name: 'y-code-platform-project-list',
@@ -49,12 +48,11 @@ const routes: Array<RouteRecordRaw> = [
         name: `${moduleName}-user`,
         meta: {
           title: '用户列表',
-          keepAlive: true,
+          keepAlive: false,
           icon: 'ant-design:list',
         },
         component: () => {
           const userStore = useUserStore();
-          console.log('userStore.token', userStore.token);
           return h(RendererAdapter, {
             url: VITE_RENDERER_URL,
             name: 'y-code-platform-user-list',
diff --git a/apps/platform/src/router/routes/modules/micro.ts b/apps/platform/src/router/routes/modules/micro.ts
index 865ffcc..af70b39 100644
--- a/apps/platform/src/router/routes/modules/micro.ts
+++ b/apps/platform/src/router/routes/modules/micro.ts
@@ -41,27 +41,24 @@ const routes: Array<RouteRecordRaw> = [
         name: `${moduleName}-y-code-v1`,
         meta: {
           title: '悦码 1.0',
-          keepAlive: true,
-          // hideInMenu: true,
+          keepAlive: false,
           icon: 'ant-design:delete-outlined',
-          app: {
-            url: VITE_V1_URL,
-            name: 'y-code-v1',
-            // sync: true,
-            // alive: true,
-            degrade: true,
-          },
         },
         component: () => {
-          const userStore = useUserStore();
-          return h(RendererAdapter, {
-            url: VITE_V1_URL,
-            name: 'y-code-v1',
-            accessToken: userStore.token,
-            // sync: true,
-            // alive: true,
-            degrade: true,
-          });
+          try {
+            const userStore = useUserStore();
+            return h(RendererAdapter, {
+              url: VITE_V1_URL,
+              name: 'y-code-v1',
+              accessToken: userStore.token,
+              // sync: true,
+              // alive: true,
+              degrade: true,
+            });
+          } catch (error) {
+            console.error(error);
+            return null;
+          }
         },
       },
     ],
diff --git a/apps/platform/src/router/routes/modules/project.ts b/apps/platform/src/router/routes/modules/project.ts
index 368571a..f69dc33 100644
--- a/apps/platform/src/router/routes/modules/project.ts
+++ b/apps/platform/src/router/routes/modules/project.ts
@@ -9,6 +9,7 @@ import {
   LOW_CODE_APPLICATION_ID,
   LOW_CODE_PROJECT_ID,
 } from '#/constants/low-code';
+import { useUserStore } from '#/store/user';
 
 // 微前端路由
 const moduleName = 'project';
@@ -30,14 +31,17 @@ const routes: Array<RouteRecordRaw> = [
           keepAlive: true,
           icon: 'ant-design:list',
         },
-        component: () =>
-          h(RendererAdapter, {
+        component: () => {
+          const userStore = useUserStore();
+          return h(RendererAdapter, {
             url: VITE_RENDERER_URL,
             name: 'y-code-platform-project-list',
             applicationId: LOW_CODE_APPLICATION_ID,
             projectId: LOW_CODE_PROJECT_ID,
             fileId: '4g4mz6qi8u',
-          }),
+            accessToken: userStore.token,
+          });
+        },
       },
       {
         path: 'file',
@@ -47,14 +51,17 @@ const routes: Array<RouteRecordRaw> = [
           keepAlive: false,
           icon: 'ant-design:file',
         },
-        component: () =>
-          h(RendererAdapter, {
+        component: () => {
+          const userStore = useUserStore();
+          return h(RendererAdapter, {
             url: VITE_RENDERER_URL,
             name: 'y-code-platform-project-file',
             applicationId: LOW_CODE_APPLICATION_ID,
             projectId: LOW_CODE_PROJECT_ID,
             fileId: '7pftwojzu',
-          }),
+            accessToken: userStore.token,
+          });
+        },
       },
     ],
   },