From 7c7704c07884a0832ce6492d43d168857c19f78d Mon Sep 17 00:00:00 2001
From: rd <1344903914@qq.com>
Date: Mon, 18 Aug 2025 10:09:41 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20layout=E7=BB=84=E4=BB=B6=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E7=9B=AE=E5=BD=95=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/_base/breadcrumb/index.vue     |  52 ------------------
 src/components/_base/index.ts                 |   3 -
 src/layouts/Basic.vue                         |  18 +++---
 .../exit-account-modal/img/icon1.png          | Bin
 .../components}/exit-account-modal/index.vue  |   0
 .../navbar/components/middle-side/index.vue   |   0
 .../navbar/components/middle-side/style.scss  |   0
 .../navbar/components/right-side/index.vue    |   2 +-
 .../navbar/components/right-side/style.scss   |   0
 .../components/export-task/constants.ts       |   0
 .../export-task/delete-task-modal.vue         |   0
 .../components/export-task/index.vue          |   0
 .../components/export-task/style.scss         |   0
 .../components/import-task/constants.ts       |   0
 .../import-task/delete-task-modal.vue         |   0
 .../components/import-task/index.vue          |   0
 .../components/import-task/style.scss         |   0
 .../components/task-center-modal/constants.ts |   0
 .../components/task-center-modal/index.vue    |   0
 .../components/task-center-modal/style.scss   |   0
 .../components}/navbar/index.vue              |   0
 .../components/siderBar}/index.vue            |   1 +
 .../components/siderBar}/use-menu-tree.ts     |   1 +
 23 files changed, 11 insertions(+), 66 deletions(-)
 delete mode 100644 src/components/_base/breadcrumb/index.vue
 rename src/{components/_base => layouts/components/navbar/components}/exit-account-modal/img/icon1.png (100%)
 rename src/{components/_base => layouts/components/navbar/components}/exit-account-modal/index.vue (100%)
 rename src/{components/_base => layouts/components}/navbar/components/middle-side/index.vue (100%)
 rename src/{components/_base => layouts/components}/navbar/components/middle-side/style.scss (100%)
 rename src/{components/_base => layouts/components}/navbar/components/right-side/index.vue (98%)
 rename src/{components/_base => layouts/components}/navbar/components/right-side/style.scss (100%)
 rename src/{components/_base => layouts/components}/navbar/components/task-center-modal/components/export-task/constants.ts (100%)
 rename src/{components/_base => layouts/components}/navbar/components/task-center-modal/components/export-task/delete-task-modal.vue (100%)
 rename src/{components/_base => layouts/components}/navbar/components/task-center-modal/components/export-task/index.vue (100%)
 rename src/{components/_base => layouts/components}/navbar/components/task-center-modal/components/export-task/style.scss (100%)
 rename src/{components/_base => layouts/components}/navbar/components/task-center-modal/components/import-task/constants.ts (100%)
 rename src/{components/_base => layouts/components}/navbar/components/task-center-modal/components/import-task/delete-task-modal.vue (100%)
 rename src/{components/_base => layouts/components}/navbar/components/task-center-modal/components/import-task/index.vue (100%)
 rename src/{components/_base => layouts/components}/navbar/components/task-center-modal/components/import-task/style.scss (100%)
 rename src/{components/_base => layouts/components}/navbar/components/task-center-modal/constants.ts (100%)
 rename src/{components/_base => layouts/components}/navbar/components/task-center-modal/index.vue (100%)
 rename src/{components/_base => layouts/components}/navbar/components/task-center-modal/style.scss (100%)
 rename src/{components/_base => layouts/components}/navbar/index.vue (100%)
 rename src/{components/_base/menu => layouts/components/siderBar}/index.vue (99%)
 rename src/{components/_base/menu => layouts/components/siderBar}/use-menu-tree.ts (98%)

diff --git a/src/components/_base/breadcrumb/index.vue b/src/components/_base/breadcrumb/index.vue
deleted file mode 100644
index b5539c7..0000000
--- a/src/components/_base/breadcrumb/index.vue
+++ /dev/null
@@ -1,52 +0,0 @@
-<!--
- * @Author: 田鑫
- * @Date: 2023-03-05 18:14:16
- * @LastEditors: 田鑫
- * @LastEditTime: 2023-03-05 19:17:52
- * @Description: 
--->
-<script lang="ts" setup>
-import type { RouteLocationNormalized } from 'vue-router';
-
-const router = useRouter();
-const route = useRoute();
-
-const matched = computed(() => {
-  if (route.matched.length === 1 && route.matched[0].path === '/') {
-    return [];
-  } else {
-    return route.matched.reduce((t: RouteLocationNormalized[], o) => {
-      const isExist = t.find((c) => c.name === o.name);
-      return isExist ? t : [...t, router.resolve(o)];
-    }, []);
-  }
-});
-</script>
-
-<template>
-  <view></view>
-  <!-- <a-breadcrumb class="container-breadcrumb">
-    <a-breadcrumb-item v-for="{ meta, name } in matched" :key="name">
-      <router-link v-slot="{ href, navigate }" :to="{ name }" custom>
-        <a-link v-if="meta.needNavigate" :href="href" @click="navigate">{{
-          meta.locale ? meta.locale : '主页'
-        }}</a-link>
-        <a-link v-else disabled>{{ meta.locale ? meta.locale : '主页' }}</a-link>
-      </router-link>
-    </a-breadcrumb-item>
-  </a-breadcrumb> -->
-</template>
-
-<style scoped lang="scss">
-.container-breadcrumb {
-  margin: 16px 0;
-  :deep(.arco-breadcrumb-item) {
-    > a {
-      color: rgb(var(--gray-6));
-    }
-    &:last-child {
-      color: rgb(var(--gray-8));
-    }
-  }
-}
-</style>
diff --git a/src/components/_base/index.ts b/src/components/_base/index.ts
index 69530d5..72e9e7e 100644
--- a/src/components/_base/index.ts
+++ b/src/components/_base/index.ts
@@ -1,5 +1,2 @@
-export { default as Navbar } from './navbar/index.vue';
-export { default as Menu } from './menu/index.vue';
 export { default as TabBar } from './tab-bar/index.vue';
-export { default as Breadcrumb } from './breadcrumb/index.vue';
 export { default as ModalSimple } from './modal/index.vue';
diff --git a/src/layouts/Basic.vue b/src/layouts/Basic.vue
index 789fb11..12c1e69 100644
--- a/src/layouts/Basic.vue
+++ b/src/layouts/Basic.vue
@@ -1,5 +1,7 @@
 <script setup>
 import { Layout } from 'ant-design-vue';
+import Navbar from "./components/navbar"
+import SiderBar from "./components/siderBar"
 
 import { useAppStore } from '@/stores';
 import { useResponsive } from '@/hooks';
@@ -17,10 +19,6 @@ const userStore = useUserStore();
 const router = useRouter();
 const route = useRoute();
 
-const Header = Layout.Header;
-const Sider = Layout.Sider;
-const Content = Layout.Content;
-
 useResponsive(true);
 const navbarHeight = `52px`;
 // const renderMenu = computed(() => appStore.menu && !appStore.topMenu);
@@ -59,11 +57,11 @@ const checkHasInviteCode = () => {
 <template>
   <Layout :class="['layout-wrap', { mobile: appStore.hideMenu }]" class="h-full flex flex-col w-full">
     <JoinModal v-model:visible="joinEnterpriseVisible" ref="joinModalRef" />
-    <Header class="layout-header-wrap">
-      <base-navbar />
-    </Header>
+    <Layout.Header class="layout-header-wrap">
+      <Navbar />
+    </Layout.Header>
     <Layout class="flex layout-content-wrap">
-      <Sider
+      <Layout.Sider
         v-if="showSider"
         class="layout-sider"
         v-model="collapsed"
@@ -73,9 +71,9 @@ const checkHasInviteCode = () => {
         @collapse="setCollapsed"
       >
         <section class="menu-wrapper">
-          <base-menu />
+          <SiderBar />
         </section>
-      </Sider>
+      </Layout.Sider>
       <Layout class="flex-1 layout-content">
         <div class="px-24px py-16px">
           <layout-page />
diff --git a/src/components/_base/exit-account-modal/img/icon1.png b/src/layouts/components/navbar/components/exit-account-modal/img/icon1.png
similarity index 100%
rename from src/components/_base/exit-account-modal/img/icon1.png
rename to src/layouts/components/navbar/components/exit-account-modal/img/icon1.png
diff --git a/src/components/_base/exit-account-modal/index.vue b/src/layouts/components/navbar/components/exit-account-modal/index.vue
similarity index 100%
rename from src/components/_base/exit-account-modal/index.vue
rename to src/layouts/components/navbar/components/exit-account-modal/index.vue
diff --git a/src/components/_base/navbar/components/middle-side/index.vue b/src/layouts/components/navbar/components/middle-side/index.vue
similarity index 100%
rename from src/components/_base/navbar/components/middle-side/index.vue
rename to src/layouts/components/navbar/components/middle-side/index.vue
diff --git a/src/components/_base/navbar/components/middle-side/style.scss b/src/layouts/components/navbar/components/middle-side/style.scss
similarity index 100%
rename from src/components/_base/navbar/components/middle-side/style.scss
rename to src/layouts/components/navbar/components/middle-side/style.scss
diff --git a/src/components/_base/navbar/components/right-side/index.vue b/src/layouts/components/navbar/components/right-side/index.vue
similarity index 98%
rename from src/components/_base/navbar/components/right-side/index.vue
rename to src/layouts/components/navbar/components/right-side/index.vue
index a4824df..1ab142d 100644
--- a/src/components/_base/navbar/components/right-side/index.vue
+++ b/src/layouts/components/navbar/components/right-side/index.vue
@@ -84,7 +84,7 @@ import { useEnterpriseStore } from '@/stores/modules/enterprise';
 import { useSidebarStore } from '@/stores/modules/side-bar';
 import { useUserStore } from '@/stores';
 
-import ExitAccountModal from '@/components/_base/exit-account-modal';
+import ExitAccountModal from '../exit-account-modal';
 import DownloadCenterModal from '../task-center-modal';
 
 import icon1 from '@/assets/option.svg';
diff --git a/src/components/_base/navbar/components/right-side/style.scss b/src/layouts/components/navbar/components/right-side/style.scss
similarity index 100%
rename from src/components/_base/navbar/components/right-side/style.scss
rename to src/layouts/components/navbar/components/right-side/style.scss
diff --git a/src/components/_base/navbar/components/task-center-modal/components/export-task/constants.ts b/src/layouts/components/navbar/components/task-center-modal/components/export-task/constants.ts
similarity index 100%
rename from src/components/_base/navbar/components/task-center-modal/components/export-task/constants.ts
rename to src/layouts/components/navbar/components/task-center-modal/components/export-task/constants.ts
diff --git a/src/components/_base/navbar/components/task-center-modal/components/export-task/delete-task-modal.vue b/src/layouts/components/navbar/components/task-center-modal/components/export-task/delete-task-modal.vue
similarity index 100%
rename from src/components/_base/navbar/components/task-center-modal/components/export-task/delete-task-modal.vue
rename to src/layouts/components/navbar/components/task-center-modal/components/export-task/delete-task-modal.vue
diff --git a/src/components/_base/navbar/components/task-center-modal/components/export-task/index.vue b/src/layouts/components/navbar/components/task-center-modal/components/export-task/index.vue
similarity index 100%
rename from src/components/_base/navbar/components/task-center-modal/components/export-task/index.vue
rename to src/layouts/components/navbar/components/task-center-modal/components/export-task/index.vue
diff --git a/src/components/_base/navbar/components/task-center-modal/components/export-task/style.scss b/src/layouts/components/navbar/components/task-center-modal/components/export-task/style.scss
similarity index 100%
rename from src/components/_base/navbar/components/task-center-modal/components/export-task/style.scss
rename to src/layouts/components/navbar/components/task-center-modal/components/export-task/style.scss
diff --git a/src/components/_base/navbar/components/task-center-modal/components/import-task/constants.ts b/src/layouts/components/navbar/components/task-center-modal/components/import-task/constants.ts
similarity index 100%
rename from src/components/_base/navbar/components/task-center-modal/components/import-task/constants.ts
rename to src/layouts/components/navbar/components/task-center-modal/components/import-task/constants.ts
diff --git a/src/components/_base/navbar/components/task-center-modal/components/import-task/delete-task-modal.vue b/src/layouts/components/navbar/components/task-center-modal/components/import-task/delete-task-modal.vue
similarity index 100%
rename from src/components/_base/navbar/components/task-center-modal/components/import-task/delete-task-modal.vue
rename to src/layouts/components/navbar/components/task-center-modal/components/import-task/delete-task-modal.vue
diff --git a/src/components/_base/navbar/components/task-center-modal/components/import-task/index.vue b/src/layouts/components/navbar/components/task-center-modal/components/import-task/index.vue
similarity index 100%
rename from src/components/_base/navbar/components/task-center-modal/components/import-task/index.vue
rename to src/layouts/components/navbar/components/task-center-modal/components/import-task/index.vue
diff --git a/src/components/_base/navbar/components/task-center-modal/components/import-task/style.scss b/src/layouts/components/navbar/components/task-center-modal/components/import-task/style.scss
similarity index 100%
rename from src/components/_base/navbar/components/task-center-modal/components/import-task/style.scss
rename to src/layouts/components/navbar/components/task-center-modal/components/import-task/style.scss
diff --git a/src/components/_base/navbar/components/task-center-modal/constants.ts b/src/layouts/components/navbar/components/task-center-modal/constants.ts
similarity index 100%
rename from src/components/_base/navbar/components/task-center-modal/constants.ts
rename to src/layouts/components/navbar/components/task-center-modal/constants.ts
diff --git a/src/components/_base/navbar/components/task-center-modal/index.vue b/src/layouts/components/navbar/components/task-center-modal/index.vue
similarity index 100%
rename from src/components/_base/navbar/components/task-center-modal/index.vue
rename to src/layouts/components/navbar/components/task-center-modal/index.vue
diff --git a/src/components/_base/navbar/components/task-center-modal/style.scss b/src/layouts/components/navbar/components/task-center-modal/style.scss
similarity index 100%
rename from src/components/_base/navbar/components/task-center-modal/style.scss
rename to src/layouts/components/navbar/components/task-center-modal/style.scss
diff --git a/src/components/_base/navbar/index.vue b/src/layouts/components/navbar/index.vue
similarity index 100%
rename from src/components/_base/navbar/index.vue
rename to src/layouts/components/navbar/index.vue
diff --git a/src/components/_base/menu/index.vue b/src/layouts/components/siderBar/index.vue
similarity index 99%
rename from src/components/_base/menu/index.vue
rename to src/layouts/components/siderBar/index.vue
index e78ad55..5dfd934 100644
--- a/src/components/_base/menu/index.vue
+++ b/src/layouts/components/siderBar/index.vue
@@ -1,4 +1,5 @@
 <script lang="tsx">
+import { Menu } from 'ant-design-vue';
 import type { RouteMeta, RouteRecordRaw } from 'vue-router';
 
 import { useAppStore } from '@/stores';
diff --git a/src/components/_base/menu/use-menu-tree.ts b/src/layouts/components/siderBar/use-menu-tree.ts
similarity index 98%
rename from src/components/_base/menu/use-menu-tree.ts
rename to src/layouts/components/siderBar/use-menu-tree.ts
index 9b18626..6918005 100644
--- a/src/components/_base/menu/use-menu-tree.ts
+++ b/src/layouts/components/siderBar/use-menu-tree.ts
@@ -9,6 +9,7 @@ import { useSidebarStore } from '@/stores/modules/side-bar';
 export default function useMenuTree() {
   const router  = useRouter();
   const appRoutes = router.options?.routes ?? [];
+  console.log({appRoutes})
 
   const sidebarStore = useSidebarStore();
   const appRoute = computed(() => {