From b8159a0d73d9aef870779ac3dc6652705719b3b2 Mon Sep 17 00:00:00 2001
From: xiaoming <1923740402@qq.com>
Date: Tue, 30 Apr 2024 22:27:54 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84`layout`=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=91=BD=E5=90=8D=E8=A7=84=E8=8C=83=EF=BC=8C=E6=9B=B4?=
 =?UTF-8?q?=E6=98=93=E8=AF=BB=20(#1110)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locales/en.yaml                               |   5 +
 locales/zh-CN.yaml                            |   5 +
 .../ReAnimateSelector/src/index.vue           |   4 +-
 src/components/ReCropperPreview/src/index.vue |   4 +-
 src/components/ReFlowChart/src/DataDialog.vue |   4 +-
 src/components/ReFlowChart/src/NodePanel.vue  |   2 +-
 src/components/ReSeamlessScroll/src/index.vue |   6 +-
 .../{appMain.vue => lay-content/index.vue}    |  20 +--
 .../{footer => lay-footer}/index.vue          |   0
 .../{keepAliveFrame => lay-frame}/index.vue   |   8 +-
 .../{navbar.vue => lay-navbar/index.vue}      |  31 ++--
 .../components/NoticeItem.vue}                |  24 +--
 .../lay-notice/components/NoticeList.vue      |  24 +++
 src/layout/components/lay-notice/data.ts      |  99 ++++++++++++
 .../{notice => lay-notice}/index.vue          |  34 ++--
 .../components/{panel => lay-panel}/index.vue |   4 +-
 .../components/SearchFooter.vue               |  15 +-
 .../components/SearchHistory.vue              |   0
 .../components/SearchHistoryItem.vue          |   8 +-
 .../components/SearchModal.vue                |   4 +-
 .../components/SearchResult.vue               |   4 +-
 .../{search => lay-search}/index.vue          |   2 +-
 .../{search => lay-search}/types.ts           |   0
 .../{setting => lay-setting}/index.vue        |  18 +--
 .../NavHorizontal.vue}                        |  23 +--
 .../mixNav.vue => lay-sidebar/NavMix.vue}     |  21 +--
 .../NavVertical.vue}                          |  16 +-
 .../components/SidebarBreadCrumb.vue}         |   0
 .../components/SidebarCenterCollapse.vue}     |   4 +-
 .../components/SidebarExtraIcon.vue}          |   4 +-
 .../components/SidebarFullScreen.vue}         |   0
 .../components/SidebarItem.vue}               |  50 +++---
 .../components/SidebarLeftCollapse.vue}       |   4 +-
 .../components/SidebarLinkItem.vue}           |   4 -
 .../components/SidebarLogo.vue}               |   6 +-
 .../components/SidebarTopCollapse.vue}        |   6 +-
 .../components/{tag => lay-tag}/index.scss    |   0
 .../components/{tag => lay-tag}/index.vue     |   0
 src/layout/components/notice/data.ts          | 146 ------------------
 src/layout/components/notice/noticeList.vue   |  26 ----
 .../components/search/components/index.ts     |   3 -
 src/layout/{frameView.vue => frame.vue}       |   2 +-
 .../keepAliveFrame => hooks}/useMultiFrame.ts |   0
 src/layout/index.vue                          |  37 ++---
 src/router/modules/board.ts                   |   2 +-
 src/router/modules/formdesign.ts              |   2 +-
 src/router/modules/mind.ts                    |   2 +-
 src/router/modules/ppt.ts                     |   2 +-
 src/router/utils.ts                           |   2 +-
 src/views/account-settings/index.vue          |   4 +-
 src/views/monitor/logs/system/detail.vue      |   7 +-
 src/views/system/user/tree.vue                |   6 +-
 src/views/table/base/fixColumn.vue            |   6 +-
 53 files changed, 332 insertions(+), 378 deletions(-)
 rename src/layout/components/{appMain.vue => lay-content/index.vue} (91%)
 rename src/layout/components/{footer => lay-footer}/index.vue (100%)
 rename src/layout/components/{keepAliveFrame => lay-frame}/index.vue (88%)
 rename src/layout/components/{navbar.vue => lay-navbar/index.vue} (85%)
 rename src/layout/components/{notice/noticeItem.vue => lay-notice/components/NoticeItem.vue} (88%)
 create mode 100644 src/layout/components/lay-notice/components/NoticeList.vue
 create mode 100644 src/layout/components/lay-notice/data.ts
 rename src/layout/components/{notice => lay-notice}/index.vue (69%)
 rename src/layout/components/{panel => lay-panel}/index.vue (97%)
 rename src/layout/components/{search => lay-search}/components/SearchFooter.vue (78%)
 rename src/layout/components/{search => lay-search}/components/SearchHistory.vue (100%)
 rename src/layout/components/{search => lay-search}/components/SearchHistoryItem.vue (88%)
 rename src/layout/components/{search => lay-search}/components/SearchModal.vue (99%)
 rename src/layout/components/{search => lay-search}/components/SearchResult.vue (96%)
 rename src/layout/components/{search => lay-search}/index.vue (88%)
 rename src/layout/components/{search => lay-search}/types.ts (100%)
 rename src/layout/components/{setting => lay-setting}/index.vue (98%)
 rename src/layout/components/{sidebar/horizontal.vue => lay-sidebar/NavHorizontal.vue} (89%)
 rename src/layout/components/{sidebar/mixNav.vue => lay-sidebar/NavMix.vue} (90%)
 rename src/layout/components/{sidebar/vertical.vue => lay-sidebar/NavVertical.vue} (87%)
 rename src/layout/components/{sidebar/breadCrumb.vue => lay-sidebar/components/SidebarBreadCrumb.vue} (100%)
 rename src/layout/components/{sidebar/centerCollapse.vue => lay-sidebar/components/SidebarCenterCollapse.vue} (93%)
 rename src/layout/components/{sidebar/extraIcon.vue => lay-sidebar/components/SidebarExtraIcon.vue} (71%)
 rename src/layout/components/{sidebar/fullScreen.vue => lay-sidebar/components/SidebarFullScreen.vue} (100%)
 rename src/layout/components/{sidebar/sidebarItem.vue => lay-sidebar/components/SidebarItem.vue} (79%)
 rename src/layout/components/{sidebar/leftCollapse.vue => lay-sidebar/components/SidebarLeftCollapse.vue} (93%)
 rename src/layout/components/{sidebar/linkItem.vue => lay-sidebar/components/SidebarLinkItem.vue} (93%)
 rename src/layout/components/{sidebar/logo.vue => lay-sidebar/components/SidebarLogo.vue} (91%)
 rename src/layout/components/{sidebar/topCollapse.vue => lay-sidebar/components/SidebarTopCollapse.vue} (81%)
 rename src/layout/components/{tag => lay-tag}/index.scss (100%)
 rename src/layout/components/{tag => lay-tag}/index.vue (100%)
 delete mode 100644 src/layout/components/notice/data.ts
 delete mode 100644 src/layout/components/notice/noticeList.vue
 delete mode 100644 src/layout/components/search/components/index.ts
 rename src/layout/{frameView.vue => frame.vue} (98%)
 rename src/layout/{components/keepAliveFrame => hooks}/useMultiFrame.ts (100%)

diff --git a/locales/en.yaml b/locales/en.yaml
index 6f829fcf05..37b95a9407 100644
--- a/locales/en.yaml
+++ b/locales/en.yaml
@@ -182,7 +182,12 @@ menus:
   pureChildMenuOverflow: Child Menu Overflow Show Tooltip Text
 status:
   pureLoad: Loading...
+  pureMessage: Message
+  pureNotify: Notify
+  pureTodo: Todo
   pureNoMessage: No Message
+  pureNoNotify: No Notify
+  pureNoTodo: No Todo
 login:
   pureUsername: Username
   purePassword: Password
diff --git a/locales/zh-CN.yaml b/locales/zh-CN.yaml
index ddf6ffe909..086ca107f6 100644
--- a/locales/zh-CN.yaml
+++ b/locales/zh-CN.yaml
@@ -182,7 +182,12 @@ menus:
   pureChildMenuOverflow: 菜单超出显示 Tooltip 文字提示
 status:
   pureLoad: 加载中...
+  pureMessage: 消息
+  pureNotify: 通知
+  pureTodo: 待办
   pureNoMessage: 暂无消息
+  pureNoNotify: 暂无通知
+  pureNoTodo: 暂无待办
 login:
   pureUsername: 账号
   purePassword: 密码
diff --git a/src/components/ReAnimateSelector/src/index.vue b/src/components/ReAnimateSelector/src/index.vue
index 2a5ce617da..e10056b84d 100644
--- a/src/components/ReAnimateSelector/src/index.vue
+++ b/src/components/ReAnimateSelector/src/index.vue
@@ -7,7 +7,7 @@ defineOptions({
   name: "ReAnimateSelector"
 });
 
-const props = defineProps({
+defineProps({
   placeholder: {
     type: String,
     default: "请选择动画"
@@ -81,7 +81,7 @@ function onMouseleave() {
   <el-select
     clearable
     filterable
-    :placeholder="props.placeholder"
+    :placeholder="placeholder"
     popper-class="pure-animate-popper"
     :model-value="inputValue"
     :filter-method="filterMethod"
diff --git a/src/components/ReCropperPreview/src/index.vue b/src/components/ReCropperPreview/src/index.vue
index d567a3521f..c34cc94e45 100644
--- a/src/components/ReCropperPreview/src/index.vue
+++ b/src/components/ReCropperPreview/src/index.vue
@@ -7,7 +7,7 @@ defineOptions({
   name: "ReCropperPreview"
 });
 
-const props = defineProps({
+defineProps({
   imgSrc: String
 });
 
@@ -44,7 +44,7 @@ defineExpose({ hidePopover });
         <div class="w-[18vw]">
           <ReCropper
             ref="refCropper"
-            :src="props.imgSrc"
+            :src="imgSrc"
             circled
             @cropper="onCropper"
             @readied="showPopover = true"
diff --git a/src/components/ReFlowChart/src/DataDialog.vue b/src/components/ReFlowChart/src/DataDialog.vue
index dabd3731a5..5740527e28 100644
--- a/src/components/ReFlowChart/src/DataDialog.vue
+++ b/src/components/ReFlowChart/src/DataDialog.vue
@@ -2,7 +2,7 @@
 import VueJsonPretty from "vue-json-pretty";
 import "vue-json-pretty/lib/styles.css";
 
-const props = defineProps({
+defineProps({
   graphData: Object
 });
 </script>
@@ -12,6 +12,6 @@ const props = defineProps({
     :path="'res'"
     :deep="3"
     :showLength="true"
-    :data="props.graphData"
+    :data="graphData"
   />
 </template>
diff --git a/src/components/ReFlowChart/src/NodePanel.vue b/src/components/ReFlowChart/src/NodePanel.vue
index abe07308e7..53d0d5c1ff 100644
--- a/src/components/ReFlowChart/src/NodePanel.vue
+++ b/src/components/ReFlowChart/src/NodePanel.vue
@@ -35,7 +35,7 @@ const nodeDragNode = item => {
   <!-- 左侧bpmn元素选择器 -->
   <div class="node-panel">
     <div
-      v-for="item in props.nodeList"
+      v-for="item in nodeList"
       :key="item.text"
       class="node-item dark:text-bg_color"
       @mousedown="nodeDragNode(item)"
diff --git a/src/components/ReSeamlessScroll/src/index.vue b/src/components/ReSeamlessScroll/src/index.vue
index 6f5a2a37c8..37dda0ff4a 100644
--- a/src/components/ReSeamlessScroll/src/index.vue
+++ b/src/components/ReSeamlessScroll/src/index.vue
@@ -502,7 +502,7 @@ defineExpose({
 </script>
 
 <template>
-  <div :ref="'wrap' + props.classOption['key']">
+  <div :ref="'wrap' + classOption['key']">
     <div
       v-if="navigation"
       :style="leftSwitch"
@@ -520,7 +520,7 @@ defineExpose({
       <slot name="right-switch" />
     </div>
     <div
-      :ref="'realBox' + props.classOption['key']"
+      :ref="'realBox' + classOption['key']"
       :style="pos"
       @mouseenter="enter"
       @mouseleave="leave"
@@ -529,7 +529,7 @@ defineExpose({
       @touchend="touchEnd"
       @mousewheel.passive="wheel"
     >
-      <div :ref="'slotList' + props.classOption['key']" :style="float">
+      <div :ref="'slotList' + classOption['key']" :style="float">
         <slot />
       </div>
       <div :style="float" v-html="copyHtml" />
diff --git a/src/layout/components/appMain.vue b/src/layout/components/lay-content/index.vue
similarity index 91%
rename from src/layout/components/appMain.vue
rename to src/layout/components/lay-content/index.vue
index 9f8d767c18..56bdd136c4 100644
--- a/src/layout/components/appMain.vue
+++ b/src/layout/components/lay-content/index.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
 import { useI18n } from "vue-i18n";
-import Footer from "./footer/index.vue";
+import LayFrame from "../lay-frame/index.vue";
+import LayFooter from "../lay-footer/index.vue";
 import { useGlobal, isNumber } from "@pureadmin/utils";
-import KeepAliveFrame from "./keepAliveFrame/index.vue";
-import backTop from "@/assets/svg/back_top.svg?component";
+import BackTopIcon from "@/assets/svg/back_top.svg?component";
 import { h, computed, Transition, defineComponent } from "vue";
 import { usePermissionStoreHook } from "@/store/modules/permission";
 
@@ -99,15 +99,15 @@ const transitionMain = defineComponent({
 
 <template>
   <section
-    :class="[props.fixedHeader ? 'app-main' : 'app-main-nofixed-header']"
+    :class="[fixedHeader ? 'app-main' : 'app-main-nofixed-header']"
     :style="getSectionStyle"
   >
     <router-view>
       <template #default="{ Component, route }">
-        <KeepAliveFrame :currComp="Component" :currRoute="route">
+        <LayFrame :currComp="Component" :currRoute="route">
           <template #default="{ Comp, fullPath, frameInfo }">
             <el-scrollbar
-              v-if="props.fixedHeader"
+              v-if="fixedHeader"
               :wrap-style="{
                 display: 'flex',
                 'flex-wrap': 'wrap',
@@ -126,7 +126,7 @@ const transitionMain = defineComponent({
                 :title="t('buttons.pureBackTop')"
                 target=".app-main .el-scrollbar__wrap"
               >
-                <backTop />
+                <BackTopIcon />
               </el-backtop>
               <div class="grow">
                 <transitionMain :route="route">
@@ -150,7 +150,7 @@ const transitionMain = defineComponent({
                   />
                 </transitionMain>
               </div>
-              <Footer v-if="!hideFooter" />
+              <LayFooter v-if="!hideFooter" />
             </el-scrollbar>
             <div v-else class="grow">
               <transitionMain :route="route">
@@ -175,12 +175,12 @@ const transitionMain = defineComponent({
               </transitionMain>
             </div>
           </template>
-        </KeepAliveFrame>
+        </LayFrame>
       </template>
     </router-view>
 
     <!-- 页脚 -->
-    <Footer v-if="!hideFooter && !props.fixedHeader" />
+    <LayFooter v-if="!hideFooter && !fixedHeader" />
   </section>
 </template>
 
diff --git a/src/layout/components/footer/index.vue b/src/layout/components/lay-footer/index.vue
similarity index 100%
rename from src/layout/components/footer/index.vue
rename to src/layout/components/lay-footer/index.vue
diff --git a/src/layout/components/keepAliveFrame/index.vue b/src/layout/components/lay-frame/index.vue
similarity index 88%
rename from src/layout/components/keepAliveFrame/index.vue
rename to src/layout/components/lay-frame/index.vue
index da0d468e3d..b2bb9d5168 100644
--- a/src/layout/components/keepAliveFrame/index.vue
+++ b/src/layout/components/lay-frame/index.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
 import { getConfig } from "@/config";
+import { useMultiFrame } from "@/layout/hooks/useMultiFrame";
 import { useMultiTagsStoreHook } from "@/store/modules/multiTags";
 import { type Component, shallowRef, watch, computed } from "vue";
 import { type RouteRecordRaw, RouteLocationNormalizedLoaded } from "vue-router";
-import { useMultiFrame } from "@/layout/components/keepAliveFrame/useMultiFrame";
 
 const props = defineProps<{
   currRoute: RouteLocationNormalizedLoaded;
@@ -20,7 +20,7 @@ const keep = computed(() => {
     !!props.currRoute.meta?.frameSrc
   );
 });
-// 避免重新渲染 frameView
+// 避免重新渲染 LayFrame
 const normalComp = computed(() => !keep.value && props.currComp);
 
 watch(useMultiTagsStoreHook().multiTags, (tags: any) => {
@@ -65,7 +65,7 @@ watch(
 </script>
 <template>
   <template v-for="[fullPath, Comp] in compList" :key="fullPath">
-    <div v-show="fullPath === props.currRoute.fullPath" class="w-full h-full">
+    <div v-show="fullPath === currRoute.fullPath" class="w-full h-full">
       <slot
         :fullPath="fullPath"
         :Comp="Comp"
@@ -74,6 +74,6 @@ watch(
     </div>
   </template>
   <div v-show="!keep" class="w-full h-full">
-    <slot :Comp="normalComp" :fullPath="props.currRoute.fullPath" frameInfo />
+    <slot :Comp="normalComp" :fullPath="currRoute.fullPath" frameInfo />
   </div>
 </template>
diff --git a/src/layout/components/navbar.vue b/src/layout/components/lay-navbar/index.vue
similarity index 85%
rename from src/layout/components/navbar.vue
rename to src/layout/components/lay-navbar/index.vue
index 4c148419c3..691d880efa 100644
--- a/src/layout/components/navbar.vue
+++ b/src/layout/components/lay-navbar/index.vue
@@ -1,13 +1,14 @@
 <script setup lang="ts">
-import Search from "./search/index.vue";
-import Notice from "./notice/index.vue";
-import mixNav from "./sidebar/mixNav.vue";
 import { useNav } from "@/layout/hooks/useNav";
-import FullScreen from "./sidebar/fullScreen.vue";
-import Breadcrumb from "./sidebar/breadCrumb.vue";
-import topCollapse from "./sidebar/topCollapse.vue";
-import { useTranslationLang } from "../hooks/useTranslationLang";
-import globalization from "@/assets/svg/globalization.svg?component";
+import LaySearch from "../lay-search/index.vue";
+import LayNotice from "../lay-notice/index.vue";
+import LayNavMix from "../lay-sidebar/NavMix.vue";
+import { useTranslationLang } from "@/layout/hooks/useTranslationLang";
+import LaySidebarFullScreen from "../lay-sidebar/components/SidebarFullScreen.vue";
+import LaySidebarBreadCrumb from "../lay-sidebar/components/SidebarBreadCrumb.vue";
+import LaySidebarTopCollapse from "../lay-sidebar/components/SidebarTopCollapse.vue";
+
+import GlobalizationIcon from "@/assets/svg/globalization.svg?component";
 import AccountSettingsIcon from "@iconify-icons/ri/user-settings-line";
 import LogoutCircleRLine from "@iconify-icons/ri/logout-circle-r-line";
 import Setting from "@iconify-icons/ri/settings-3-line";
@@ -33,26 +34,26 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
 
 <template>
   <div class="navbar bg-[#fff] shadow-sm shadow-[rgba(0,21,41,0.08)]">
-    <topCollapse
+    <LaySidebarTopCollapse
       v-if="device === 'mobile'"
       class="hamburger-container"
       :is-active="pureApp.sidebar.opened"
       @toggleClick="toggleSideBar"
     />
 
-    <Breadcrumb
+    <LaySidebarBreadCrumb
       v-if="layout !== 'mix' && device !== 'mobile'"
       class="breadcrumb-container"
     />
 
-    <mixNav v-if="layout === 'mix'" />
+    <LayNavMix v-if="layout === 'mix'" />
 
     <div v-if="layout === 'vertical'" class="vertical-header-right">
       <!-- 菜单搜索 -->
-      <Search id="header-search" />
+      <LaySearch id="header-search" />
       <!-- 国际化 -->
       <el-dropdown id="header-translation" trigger="click">
-        <globalization
+        <GlobalizationIcon
           class="navbar-bg-hover w-[40px] h-[48px] p-[11px] cursor-pointer outline-none"
         />
         <template #dropdown>
@@ -83,9 +84,9 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
         </template>
       </el-dropdown>
       <!-- 全屏 -->
-      <FullScreen id="full-screen" />
+      <LaySidebarFullScreen id="full-screen" />
       <!-- 消息通知 -->
-      <Notice id="header-notice" />
+      <LayNotice id="header-notice" />
       <!-- 退出登录 -->
       <el-dropdown trigger="click">
         <span class="el-dropdown-link navbar-bg-hover select-none">
diff --git a/src/layout/components/notice/noticeItem.vue b/src/layout/components/lay-notice/components/NoticeItem.vue
similarity index 88%
rename from src/layout/components/notice/noticeItem.vue
rename to src/layout/components/lay-notice/components/NoticeItem.vue
index b7a2b14c6c..6fb2d371a4 100644
--- a/src/layout/components/notice/noticeItem.vue
+++ b/src/layout/components/lay-notice/components/NoticeItem.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ListItem } from "./data";
+import { ListItem } from "../data";
 import { ref, PropType, nextTick } from "vue";
 import { useNav } from "@/layout/hooks/useNav";
 import { deviceDetection } from "@pureadmin/utils";
@@ -52,9 +52,9 @@ function hoverDescription(event, description) {
     class="notice-container border-b-[1px] border-solid border-[#f0f0f0] dark:border-[#303030]"
   >
     <el-avatar
-      v-if="props.noticeItem.avatar"
+      v-if="noticeItem.avatar"
       :size="30"
-      :src="props.noticeItem.avatar"
+      :src="noticeItem.avatar"
       class="notice-container-avatar"
     />
     <div class="notice-container-text">
@@ -63,7 +63,7 @@ function hoverDescription(event, description) {
           popper-class="notice-title-popper"
           :effect="tooltipEffect"
           :disabled="!titleTooltip"
-          :content="props.noticeItem.title"
+          :content="noticeItem.title"
           placement="top-start"
           :enterable="!isMobile"
         >
@@ -72,16 +72,16 @@ function hoverDescription(event, description) {
             class="notice-title-content"
             @mouseover="hoverTitle"
           >
-            {{ props.noticeItem.title }}
+            {{ noticeItem.title }}
           </div>
         </el-tooltip>
         <el-tag
-          v-if="props.noticeItem?.extra"
-          :type="props.noticeItem?.status"
+          v-if="noticeItem?.extra"
+          :type="noticeItem?.status"
           size="small"
           class="notice-title-extra"
         >
-          {{ props.noticeItem?.extra }}
+          {{ noticeItem?.extra }}
         </el-tag>
       </div>
 
@@ -89,19 +89,19 @@ function hoverDescription(event, description) {
         popper-class="notice-title-popper"
         :effect="tooltipEffect"
         :disabled="!descriptionTooltip"
-        :content="props.noticeItem.description"
+        :content="noticeItem.description"
         placement="top-start"
       >
         <div
           ref="descriptionRef"
           class="notice-text-description"
-          @mouseover="hoverDescription($event, props.noticeItem.description)"
+          @mouseover="hoverDescription($event, noticeItem.description)"
         >
-          {{ props.noticeItem.description }}
+          {{ noticeItem.description }}
         </div>
       </el-tooltip>
       <div class="notice-text-datetime text-[#00000073] dark:text-white">
-        {{ props.noticeItem.datetime }}
+        {{ noticeItem.datetime }}
       </div>
     </div>
   </div>
diff --git a/src/layout/components/lay-notice/components/NoticeList.vue b/src/layout/components/lay-notice/components/NoticeList.vue
new file mode 100644
index 0000000000..7bc9922ccc
--- /dev/null
+++ b/src/layout/components/lay-notice/components/NoticeList.vue
@@ -0,0 +1,24 @@
+<script setup lang="ts">
+import { PropType } from "vue";
+import { ListItem } from "../data";
+import NoticeItem from "./NoticeItem.vue";
+import { transformI18n } from "@/plugins/i18n";
+
+defineProps({
+  list: {
+    type: Array as PropType<Array<ListItem>>,
+    default: () => []
+  },
+  emptyText: {
+    type: String,
+    default: ""
+  }
+});
+</script>
+
+<template>
+  <div v-if="list.length">
+    <NoticeItem v-for="(item, index) in list" :key="index" :noticeItem="item" />
+  </div>
+  <el-empty v-else :description="transformI18n(emptyText)" />
+</template>
diff --git a/src/layout/components/lay-notice/data.ts b/src/layout/components/lay-notice/data.ts
new file mode 100644
index 0000000000..bd49f5e5d0
--- /dev/null
+++ b/src/layout/components/lay-notice/data.ts
@@ -0,0 +1,99 @@
+import { $t } from "@/plugins/i18n";
+
+export interface ListItem {
+  avatar: string;
+  title: string;
+  datetime: string;
+  type: string;
+  description: string;
+  status?: "primary" | "success" | "warning" | "info" | "danger";
+  extra?: string;
+}
+
+export interface TabItem {
+  key: string;
+  name: string;
+  list: ListItem[];
+  emptyText: string;
+}
+
+export const noticesData: TabItem[] = [
+  {
+    key: "1",
+    name: $t("status.pureNotify"),
+    list: [],
+    emptyText: $t("status.pureNoNotify")
+  },
+  {
+    key: "2",
+    name: $t("status.pureMessage"),
+    list: [
+      {
+        avatar: "https://xiaoxian521.github.io/hyperlink/svg/smile1.svg",
+        title: "小铭 评论了你",
+        description: "诚在于心，信在于行，诚信在于心行合一。",
+        datetime: "今天",
+        type: "2"
+      },
+      {
+        avatar: "https://xiaoxian521.github.io/hyperlink/svg/smile2.svg",
+        title: "李白 回复了你",
+        description: "长风破浪会有时，直挂云帆济沧海。",
+        datetime: "昨天",
+        type: "2"
+      },
+      {
+        avatar: "https://xiaoxian521.github.io/hyperlink/svg/smile5.svg",
+        title: "标题",
+        description:
+          "请将鼠标移动到此处，以便测试超长的消息在此处将如何处理。本例中设置的描述最大行数为2，超过2行的描述内容将被省略并且可以通过tooltip查看完整内容",
+        datetime: "时间",
+        type: "2"
+      }
+    ],
+    emptyText: $t("status.pureNoMessage")
+  },
+  {
+    key: "3",
+    name: $t("status.pureTodo"),
+    list: [
+      {
+        avatar: "",
+        title: "第三方紧急代码变更",
+        description:
+          "小林提交于 2024-05-10，需在 2024-05-11 前完成代码变更任务",
+        datetime: "",
+        extra: "马上到期",
+        status: "danger",
+        type: "3"
+      },
+      {
+        avatar: "",
+        title: "版本发布",
+        description: "指派小铭于 2024-06-18 前完成更新并发布",
+        datetime: "",
+        extra: "已耗时 8 天",
+        status: "warning",
+        type: "3"
+      },
+      {
+        avatar: "",
+        title: "新功能开发",
+        description: "开发多租户管理",
+        datetime: "",
+        extra: "进行中",
+        type: "3"
+      },
+      {
+        avatar: "",
+        title: "任务名称",
+        description: "任务需要在 2030-10-30 10:00 前启动",
+        datetime: "",
+        extra: "未开始",
+        status: "info",
+        type: "3"
+      }
+    ],
+    emptyText: $t("status.pureNoTodo")
+  }
+];
diff --git a/src/layout/components/notice/index.vue b/src/layout/components/lay-notice/index.vue
similarity index 69%
rename from src/layout/components/notice/index.vue
rename to src/layout/components/lay-notice/index.vue
index 93bd9a4bab..d85cf0f73e 100644
--- a/src/layout/components/notice/index.vue
+++ b/src/layout/components/lay-notice/index.vue
@@ -1,24 +1,36 @@
 <script setup lang="ts">
-import { ref } from "vue";
 import { useI18n } from "vue-i18n";
+import { ref, computed } from "vue";
 import { noticesData } from "./data";
-import NoticeList from "./noticeList.vue";
-import Bell from "@iconify-icons/ep/bell";
+import NoticeList from "./components/NoticeList.vue";
+import BellIcon from "@iconify-icons/ep/bell";
 
 const { t } = useI18n();
 const noticesNum = ref(0);
 const notices = ref(noticesData);
-const activeKey = ref(noticesData[0].key);
+const activeKey = ref(noticesData[0]?.key);
 
 notices.value.map(v => (noticesNum.value += v.list.length));
+
+const getLabel = computed(
+  () => item =>
+    t(item.name) + (item.list.length > 0 ? `(${item.list.length})` : "")
+);
 </script>
 
 <template>
   <el-dropdown trigger="click" placement="bottom-end">
-    <span class="dropdown-badge navbar-bg-hover select-none">
-      <el-badge :value="noticesNum" :max="99">
+    <span
+      :class="[
+        'dropdown-badge',
+        'navbar-bg-hover',
+        'select-none',
+        Number(noticesNum) !== 0 && 'mr-[10px]'
+      ]"
+    >
+      <el-badge :value="Number(noticesNum) === 0 ? '' : noticesNum" :max="99">
         <span class="header-notice-icon">
-          <IconifyIconOffline :icon="Bell" />
+          <IconifyIconOffline :icon="BellIcon" />
         </span>
       </el-badge>
     </span>
@@ -37,13 +49,10 @@ notices.value.map(v => (noticesNum.value += v.list.length));
           />
           <span v-else>
             <template v-for="item in notices" :key="item.key">
-              <el-tab-pane
-                :label="`${item.name}(${item.list.length})`"
-                :name="`${item.key}`"
-              >
+              <el-tab-pane :label="getLabel(item)" :name="`${item.key}`">
                 <el-scrollbar max-height="330px">
                   <div class="noticeList-container">
-                    <NoticeList :list="item.list" />
+                    <NoticeList :list="item.list" :emptyText="item.emptyText" />
                   </div>
                 </el-scrollbar>
               </el-tab-pane>
@@ -62,7 +71,6 @@ notices.value.map(v => (noticesNum.value += v.list.length));
   justify-content: center;
   width: 40px;
   height: 48px;
-  margin-right: 10px;
   cursor: pointer;
 
   .header-notice-icon {
diff --git a/src/layout/components/panel/index.vue b/src/layout/components/lay-panel/index.vue
similarity index 97%
rename from src/layout/components/panel/index.vue
rename to src/layout/components/lay-panel/index.vue
index ff08bd376c..fb4fb20a42 100644
--- a/src/layout/components/panel/index.vue
+++ b/src/layout/components/lay-panel/index.vue
@@ -4,7 +4,7 @@ import { emitter } from "@/utils/mitt";
 import { onClickOutside } from "@vueuse/core";
 import { ref, computed, onMounted, onBeforeUnmount } from "vue";
 import { useDataThemeChange } from "@/layout/hooks/useDataThemeChange";
-import Close from "@iconify-icons/ep/close";
+import CloseIcon from "@iconify-icons/ep/close";
 
 const target = ref(null);
 const show = ref<Boolean>(false);
@@ -68,7 +68,7 @@ onBeforeUnmount(() => {
             class="dark:text-white"
             width="18px"
             height="18px"
-            :icon="Close"
+            :icon="CloseIcon"
             @click="show = !show"
           />
         </span>
diff --git a/src/layout/components/search/components/SearchFooter.vue b/src/layout/components/lay-search/components/SearchFooter.vue
similarity index 78%
rename from src/layout/components/search/components/SearchFooter.vue
rename to src/layout/components/lay-search/components/SearchFooter.vue
index ed605b0f60..762e909791 100644
--- a/src/layout/components/search/components/SearchFooter.vue
+++ b/src/layout/components/lay-search/components/SearchFooter.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import { useI18n } from "vue-i18n";
 import { useNav } from "@/layout/hooks/useNav";
-import mdiKeyboardEsc from "@/assets/svg/keyboard_esc.svg?component";
-import enterOutlined from "@/assets/svg/enter_outlined.svg?component";
+import MdiKeyboardEsc from "@/assets/svg/keyboard_esc.svg?component";
+import EnterOutlined from "@/assets/svg/enter_outlined.svg?component";
 import ArrowUpLine from "@iconify-icons/ri/arrow-up-line";
 import ArrowDownLine from "@iconify-icons/ri/arrow-down-line";
 
@@ -17,7 +17,7 @@ const { device } = useNav();
 <template>
   <div class="search-footer text-[#333] dark:text-white">
     <span class="search-footer-item">
-      <enterOutlined class="icon" />
+      <EnterOutlined class="icon" />
       {{ t("buttons.pureConfirm") }}
     </span>
     <span class="search-footer-item">
@@ -26,14 +26,11 @@ const { device } = useNav();
       {{ t("buttons.pureSwitch") }}
     </span>
     <span class="search-footer-item">
-      <mdiKeyboardEsc class="icon" />
+      <MdiKeyboardEsc class="icon" />
       {{ t("buttons.pureClose") }}
     </span>
-    <p
-      v-if="device !== 'mobile' && props.total > 0"
-      class="search-footer-total"
-    >
-      {{ `${t("search.pureTotal")} ${props.total}` }}
+    <p v-if="device !== 'mobile' && total > 0" class="search-footer-total">
+      {{ `${t("search.pureTotal")} ${total}` }}
     </p>
   </div>
 </template>
diff --git a/src/layout/components/search/components/SearchHistory.vue b/src/layout/components/lay-search/components/SearchHistory.vue
similarity index 100%
rename from src/layout/components/search/components/SearchHistory.vue
rename to src/layout/components/lay-search/components/SearchHistory.vue
diff --git a/src/layout/components/search/components/SearchHistoryItem.vue b/src/layout/components/lay-search/components/SearchHistoryItem.vue
similarity index 88%
rename from src/layout/components/search/components/SearchHistoryItem.vue
rename to src/layout/components/lay-search/components/SearchHistoryItem.vue
index bc838467d3..0ee9f19407 100644
--- a/src/layout/components/search/components/SearchHistoryItem.vue
+++ b/src/layout/components/lay-search/components/SearchHistoryItem.vue
@@ -2,8 +2,8 @@
 import type { optionsItem } from "../types";
 import { transformI18n } from "@/plugins/i18n";
 import { useRenderIcon } from "@/components/ReIcon/src/hooks";
-import Star from "@iconify-icons/ep/star";
-import Close from "@iconify-icons/ep/close";
+import StarIcon from "@iconify-icons/ep/star";
+import CloseIcon from "@iconify-icons/ep/close";
 
 interface Props {
   item: optionsItem;
@@ -33,12 +33,12 @@ function handleDelete(item) {
   </span>
   <IconifyIconOffline
     v-show="item.type === 'history'"
-    :icon="Star"
+    :icon="StarIcon"
     class="w-[18px] h-[18px] mr-2 hover:text-[#d7d5d4]"
     @click.stop="handleCollect(item)"
   />
   <IconifyIconOffline
-    :icon="Close"
+    :icon="CloseIcon"
     class="w-[18px] h-[18px] hover:text-[#d7d5d4] cursor-pointer"
     @click.stop="handleDelete(item)"
   />
diff --git a/src/layout/components/search/components/SearchModal.vue b/src/layout/components/lay-search/components/SearchModal.vue
similarity index 99%
rename from src/layout/components/search/components/SearchModal.vue
rename to src/layout/components/lay-search/components/SearchModal.vue
index 1b5162382c..f6993f6f66 100644
--- a/src/layout/components/search/components/SearchModal.vue
+++ b/src/layout/components/lay-search/components/SearchModal.vue
@@ -13,7 +13,7 @@ import { ref, computed, shallowRef, watch } from "vue";
 import { useDebounceFn, onKeyStroke } from "@vueuse/core";
 import { usePermissionStoreHook } from "@/store/modules/permission";
 import { cloneDeep, isAllEmpty, storageLocal } from "@pureadmin/utils";
-import Search from "@iconify-icons/ri/search-line";
+import SearchIcon from "@iconify-icons/ri/search-line";
 
 interface Props {
   /** 弹窗显隐 */
@@ -298,7 +298,7 @@ onKeyStroke("ArrowDown", handleDown);
     >
       <template #prefix>
         <IconifyIconOffline
-          :icon="Search"
+          :icon="SearchIcon"
           class="text-primary w-[24px] h-[24px]"
         />
       </template>
diff --git a/src/layout/components/search/components/SearchResult.vue b/src/layout/components/lay-search/components/SearchResult.vue
similarity index 96%
rename from src/layout/components/search/components/SearchResult.vue
rename to src/layout/components/lay-search/components/SearchResult.vue
index 7c1b89e939..12507b1505 100644
--- a/src/layout/components/search/components/SearchResult.vue
+++ b/src/layout/components/lay-search/components/SearchResult.vue
@@ -5,7 +5,7 @@ import { useResizeObserver } from "@pureadmin/utils";
 import { useEpThemeStoreHook } from "@/store/modules/epTheme";
 import { useRenderIcon } from "@/components/ReIcon/src/hooks";
 import { ref, computed, getCurrentInstance, onMounted } from "vue";
-import enterOutlined from "@/assets/svg/enter_outlined.svg?component";
+import EnterOutlined from "@/assets/svg/enter_outlined.svg?component";
 
 interface Emits {
   (e: "update:value", val: string): void;
@@ -84,7 +84,7 @@ defineExpose({ handleScroll });
       <span class="result-item-title">
         {{ transformI18n(item.meta?.title) }}
       </span>
-      <enterOutlined />
+      <EnterOutlined />
     </div>
   </div>
 </template>
diff --git a/src/layout/components/search/index.vue b/src/layout/components/lay-search/index.vue
similarity index 88%
rename from src/layout/components/search/index.vue
rename to src/layout/components/lay-search/index.vue
index 2a13dae8ee..123d6a664a 100644
--- a/src/layout/components/search/index.vue
+++ b/src/layout/components/lay-search/index.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import { SearchModal } from "./components";
 import { useBoolean } from "../../hooks/useBoolean";
+import SearchModal from "./components/SearchModal.vue";
 
 const { bool: show, toggle } = useBoolean();
 function handleSearch() {
diff --git a/src/layout/components/search/types.ts b/src/layout/components/lay-search/types.ts
similarity index 100%
rename from src/layout/components/search/types.ts
rename to src/layout/components/lay-search/types.ts
diff --git a/src/layout/components/setting/index.vue b/src/layout/components/lay-setting/index.vue
similarity index 98%
rename from src/layout/components/setting/index.vue
rename to src/layout/components/lay-setting/index.vue
index ee3ef2b01f..b4c8b7fa0b 100644
--- a/src/layout/components/setting/index.vue
+++ b/src/layout/components/lay-setting/index.vue
@@ -10,8 +10,8 @@ import {
   onBeforeMount
 } from "vue";
 import { useI18n } from "vue-i18n";
-import panel from "../panel/index.vue";
 import { emitter } from "@/utils/mitt";
+import LayPanel from "../lay-panel/index.vue";
 import { useNav } from "@/layout/hooks/useNav";
 import { useAppStoreHook } from "@/store/modules/app";
 import { toggleTheme } from "@pureadmin/theme/dist/browser-utils";
@@ -23,9 +23,9 @@ import { useDark, useGlobal, debounce, isNumber } from "@pureadmin/utils";
 import Check from "@iconify-icons/ep/check";
 import LeftArrow from "@iconify-icons/ri/arrow-left-s-line";
 import RightArrow from "@iconify-icons/ri/arrow-right-s-line";
-import dayIcon from "@/assets/svg/day.svg?component";
-import darkIcon from "@/assets/svg/dark.svg?component";
-import systemIcon from "@/assets/svg/system.svg?component";
+import DayIcon from "@/assets/svg/day.svg?component";
+import DarkIcon from "@/assets/svg/dark.svg?component";
+import SystemIcon from "@/assets/svg/system.svg?component";
 
 const { t } = useI18n();
 const { device } = useNav();
@@ -199,21 +199,21 @@ const themeOptions = computed<Array<OptionsType>>(() => {
   return [
     {
       label: t("panel.pureOverallStyleLight"),
-      icon: dayIcon,
+      icon: DayIcon,
       theme: "light",
       tip: t("panel.pureOverallStyleLightTip"),
       iconAttrs: { fill: isDark.value ? "#fff" : "#000" }
     },
     {
       label: t("panel.pureOverallStyleDark"),
-      icon: darkIcon,
+      icon: DarkIcon,
       theme: "dark",
       tip: t("panel.pureOverallStyleDarkTip"),
       iconAttrs: { fill: isDark.value ? "#fff" : "#000" }
     },
     {
       label: t("panel.pureOverallStyleSystem"),
-      icon: systemIcon,
+      icon: SystemIcon,
       theme: "system",
       tip: t("panel.pureOverallStyleSystemTip"),
       iconAttrs: { fill: isDark.value ? "#fff" : "#000" }
@@ -313,7 +313,7 @@ onUnmounted(() => removeMatchMedia);
 </script>
 
 <template>
-  <panel>
+  <LayPanel>
     <div class="p-5">
       <p :class="pClass">{{ t("panel.pureOverallStyle") }}</p>
       <Segmented
@@ -517,7 +517,7 @@ onUnmounted(() => removeMatchMedia);
         </li>
       </ul>
     </div>
-  </panel>
+  </LayPanel>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/layout/components/sidebar/horizontal.vue b/src/layout/components/lay-sidebar/NavHorizontal.vue
similarity index 89%
rename from src/layout/components/sidebar/horizontal.vue
rename to src/layout/components/lay-sidebar/NavHorizontal.vue
index a6f5322fbb..a334e179ff 100644
--- a/src/layout/components/sidebar/horizontal.vue
+++ b/src/layout/components/lay-sidebar/NavHorizontal.vue
@@ -1,14 +1,15 @@
 <script setup lang="ts">
-import Search from "../search/index.vue";
-import Notice from "../notice/index.vue";
-import FullScreen from "./fullScreen.vue";
-import SidebarItem from "./sidebarItem.vue";
 import { isAllEmpty } from "@pureadmin/utils";
 import { ref, nextTick, computed } from "vue";
 import { useNav } from "@/layout/hooks/useNav";
+import LaySearch from "../lay-search/index.vue";
+import LayNotice from "../lay-notice/index.vue";
 import { useTranslationLang } from "../../hooks/useTranslationLang";
 import { usePermissionStoreHook } from "@/store/modules/permission";
-import globalization from "@/assets/svg/globalization.svg?component";
+import LaySidebarItem from "../lay-sidebar/components/SidebarItem.vue";
+import LaySidebarFullScreen from "../lay-sidebar/components/SidebarFullScreen.vue";
+
+import GlobalizationIcon from "@/assets/svg/globalization.svg?component";
 import AccountSettingsIcon from "@iconify-icons/ri/user-settings-line";
 import LogoutCircleRLine from "@iconify-icons/ri/logout-circle-r-line";
 import Setting from "@iconify-icons/ri/settings-3-line";
@@ -21,11 +22,11 @@ const { t, route, locale, translationCh, translationEn } =
 const {
   title,
   logout,
-  backTopMenu,
   onPanel,
   getLogo,
   username,
   userAvatar,
+  backTopMenu,
   avatarsStyle,
   toAccountSettings,
   getDropdownItemStyle,
@@ -58,7 +59,7 @@ nextTick(() => {
       class="horizontal-header-menu"
       :default-active="defaultActive"
     >
-      <sidebar-item
+      <LaySidebarItem
         v-for="route in usePermissionStoreHook().wholeMenus"
         :key="route.path"
         :item="route"
@@ -67,10 +68,10 @@ nextTick(() => {
     </el-menu>
     <div class="horizontal-header-right">
       <!-- 菜单搜索 -->
-      <Search id="header-search" />
+      <LaySearch id="header-search" />
       <!-- 国际化 -->
       <el-dropdown id="header-translation" trigger="click">
-        <globalization
+        <GlobalizationIcon
           class="navbar-bg-hover w-[40px] h-[48px] p-[11px] cursor-pointer outline-none"
         />
         <template #dropdown>
@@ -99,9 +100,9 @@ nextTick(() => {
         </template>
       </el-dropdown>
       <!-- 全屏 -->
-      <FullScreen id="full-screen" />
+      <LaySidebarFullScreen id="full-screen" />
       <!-- 消息通知 -->
-      <Notice id="header-notice" />
+      <LayNotice id="header-notice" />
       <!-- 退出登录 -->
       <el-dropdown trigger="click">
         <span class="el-dropdown-link navbar-bg-hover">
diff --git a/src/layout/components/sidebar/mixNav.vue b/src/layout/components/lay-sidebar/NavMix.vue
similarity index 90%
rename from src/layout/components/sidebar/mixNav.vue
rename to src/layout/components/lay-sidebar/NavMix.vue
index 3d7d99e738..c1562f2bce 100644
--- a/src/layout/components/sidebar/mixNav.vue
+++ b/src/layout/components/lay-sidebar/NavMix.vue
@@ -1,17 +1,18 @@
 <script setup lang="ts">
-import extraIcon from "./extraIcon.vue";
-import Search from "../search/index.vue";
-import Notice from "../notice/index.vue";
-import FullScreen from "./fullScreen.vue";
 import { isAllEmpty } from "@pureadmin/utils";
 import { useNav } from "@/layout/hooks/useNav";
 import { transformI18n } from "@/plugins/i18n";
+import LaySearch from "../lay-search/index.vue";
+import LayNotice from "../lay-notice/index.vue";
 import { ref, toRaw, watch, onMounted, nextTick } from "vue";
 import { useRenderIcon } from "@/components/ReIcon/src/hooks";
 import { getParentPaths, findRouteByPath } from "@/router/utils";
 import { useTranslationLang } from "../../hooks/useTranslationLang";
 import { usePermissionStoreHook } from "@/store/modules/permission";
-import globalization from "@/assets/svg/globalization.svg?component";
+import LaySidebarExtraIcon from "../lay-sidebar/components/SidebarExtraIcon.vue";
+import LaySidebarFullScreen from "../lay-sidebar/components/SidebarFullScreen.vue";
+
+import GlobalizationIcon from "@/assets/svg/globalization.svg?component";
 import AccountSettingsIcon from "@iconify-icons/ri/user-settings-line";
 import LogoutCircleRLine from "@iconify-icons/ri/logout-circle-r-line";
 import Setting from "@iconify-icons/ri/settings-3-line";
@@ -93,17 +94,17 @@ watch(
             <span class="select-none">
               {{ transformI18n(route.meta.title) }}
             </span>
-            <extraIcon :extraIcon="route.meta.extraIcon" />
+            <LaySidebarExtraIcon :extraIcon="route.meta.extraIcon" />
           </div>
         </template>
       </el-menu-item>
     </el-menu>
     <div class="horizontal-header-right">
       <!-- 菜单搜索 -->
-      <Search id="header-search" />
+      <LaySearch id="header-search" />
       <!-- 国际化 -->
       <el-dropdown id="header-translation" trigger="click">
-        <globalization
+        <GlobalizationIcon
           class="navbar-bg-hover w-[40px] h-[48px] p-[11px] cursor-pointer outline-none"
         />
         <template #dropdown>
@@ -132,9 +133,9 @@ watch(
         </template>
       </el-dropdown>
       <!-- 全屏 -->
-      <FullScreen id="full-screen" />
+      <LaySidebarFullScreen id="full-screen" />
       <!-- 消息通知 -->
-      <Notice id="header-notice" />
+      <LayNotice id="header-notice" />
       <!-- 退出登录 -->
       <el-dropdown trigger="click">
         <span class="el-dropdown-link navbar-bg-hover select-none">
diff --git a/src/layout/components/sidebar/vertical.vue b/src/layout/components/lay-sidebar/NavVertical.vue
similarity index 87%
rename from src/layout/components/sidebar/vertical.vue
rename to src/layout/components/lay-sidebar/NavVertical.vue
index 0e2174b8db..27b3b073be 100644
--- a/src/layout/components/sidebar/vertical.vue
+++ b/src/layout/components/lay-sidebar/NavVertical.vue
@@ -1,16 +1,16 @@
 <script setup lang="ts">
-import Logo from "./logo.vue";
 import { useRoute } from "vue-router";
 import { emitter } from "@/utils/mitt";
-import SidebarItem from "./sidebarItem.vue";
-import LeftCollapse from "./leftCollapse.vue";
 import { useNav } from "@/layout/hooks/useNav";
-import CenterCollapse from "./centerCollapse.vue";
 import { responsiveStorageNameSpace } from "@/config";
 import { storageLocal, isAllEmpty } from "@pureadmin/utils";
 import { findRouteByPath, getParentPaths } from "@/router/utils";
 import { usePermissionStoreHook } from "@/store/modules/permission";
 import { ref, computed, watch, onMounted, onBeforeUnmount } from "vue";
+import LaySidebarLogo from "../lay-sidebar/components/SidebarLogo.vue";
+import LaySidebarItem from "../lay-sidebar/components/SidebarItem.vue";
+import LaySidebarLeftCollapse from "../lay-sidebar/components/SidebarLeftCollapse.vue";
+import LaySidebarCenterCollapse from "../lay-sidebar/components/SidebarCenterCollapse.vue";
 
 const route = useRoute();
 const isShow = ref(false);
@@ -93,7 +93,7 @@ onBeforeUnmount(() => {
     @mouseenter.prevent="isShow = true"
     @mouseleave.prevent="isShow = false"
   >
-    <Logo v-if="showLogo" :collapse="isCollapse" />
+    <LaySidebarLogo v-if="showLogo" :collapse="isCollapse" />
     <el-scrollbar
       wrap-class="scrollbar-wrapper"
       :class="[device === 'mobile' ? 'mobile' : 'pc']"
@@ -109,7 +109,7 @@ onBeforeUnmount(() => {
         :popper-effect="tooltipEffect"
         :default-active="defaultActive"
       >
-        <sidebar-item
+        <LaySidebarItem
           v-for="routes in menuData"
           :key="routes.path"
           :item="routes"
@@ -118,12 +118,12 @@ onBeforeUnmount(() => {
         />
       </el-menu>
     </el-scrollbar>
-    <CenterCollapse
+    <LaySidebarCenterCollapse
       v-if="device !== 'mobile' && (isShow || isCollapse)"
       :is-active="pureApp.sidebar.opened"
       @toggleClick="toggleSideBar"
     />
-    <LeftCollapse
+    <LaySidebarLeftCollapse
       v-if="device !== 'mobile'"
       :is-active="pureApp.sidebar.opened"
       @toggleClick="toggleSideBar"
diff --git a/src/layout/components/sidebar/breadCrumb.vue b/src/layout/components/lay-sidebar/components/SidebarBreadCrumb.vue
similarity index 100%
rename from src/layout/components/sidebar/breadCrumb.vue
rename to src/layout/components/lay-sidebar/components/SidebarBreadCrumb.vue
diff --git a/src/layout/components/sidebar/centerCollapse.vue b/src/layout/components/lay-sidebar/components/SidebarCenterCollapse.vue
similarity index 93%
rename from src/layout/components/sidebar/centerCollapse.vue
rename to src/layout/components/lay-sidebar/components/SidebarCenterCollapse.vue
index fd39f43683..1733e692d2 100644
--- a/src/layout/components/sidebar/centerCollapse.vue
+++ b/src/layout/components/lay-sidebar/components/SidebarCenterCollapse.vue
@@ -36,7 +36,7 @@ const toggleClick = () => {
 <template>
   <div
     v-tippy="{
-      content: props.isActive
+      content: isActive
         ? t('buttons.pureClickCollapse')
         : t('buttons.pureClickExpand'),
       theme: tooltipEffect,
@@ -49,7 +49,7 @@ const toggleClick = () => {
     <IconifyIconOffline
       :icon="ArrowLeft"
       :class="[iconClass, themeColor === 'light' ? '' : 'text-primary']"
-      :style="{ transform: props.isActive ? 'none' : 'rotateY(180deg)' }"
+      :style="{ transform: isActive ? 'none' : 'rotateY(180deg)' }"
     />
   </div>
 </template>
diff --git a/src/layout/components/sidebar/extraIcon.vue b/src/layout/components/lay-sidebar/components/SidebarExtraIcon.vue
similarity index 71%
rename from src/layout/components/sidebar/extraIcon.vue
rename to src/layout/components/lay-sidebar/components/SidebarExtraIcon.vue
index 6bb82e90f2..7cdc2a362c 100644
--- a/src/layout/components/sidebar/extraIcon.vue
+++ b/src/layout/components/lay-sidebar/components/SidebarExtraIcon.vue
@@ -11,9 +11,9 @@ const props = defineProps({
 </script>
 
 <template>
-  <div v-if="props.extraIcon" class="flex justify-center items-center">
+  <div v-if="extraIcon" class="flex justify-center items-center">
     <component
-      :is="useRenderIcon(toRaw(props.extraIcon))"
+      :is="useRenderIcon(toRaw(extraIcon))"
       class="w-[30px] h-[30px]"
     />
   </div>
diff --git a/src/layout/components/sidebar/fullScreen.vue b/src/layout/components/lay-sidebar/components/SidebarFullScreen.vue
similarity index 100%
rename from src/layout/components/sidebar/fullScreen.vue
rename to src/layout/components/lay-sidebar/components/SidebarFullScreen.vue
diff --git a/src/layout/components/sidebar/sidebarItem.vue b/src/layout/components/lay-sidebar/components/SidebarItem.vue
similarity index 79%
rename from src/layout/components/sidebar/sidebarItem.vue
rename to src/layout/components/lay-sidebar/components/SidebarItem.vue
index f9d16018af..e664ce06ed 100644
--- a/src/layout/components/sidebar/sidebarItem.vue
+++ b/src/layout/components/lay-sidebar/components/SidebarItem.vue
@@ -1,12 +1,12 @@
 <script setup lang="ts">
 import path from "path";
 import { getConfig } from "@/config";
-import LinkItem from "./linkItem.vue";
-import { menuType } from "../../types";
-import extraIcon from "./extraIcon.vue";
+import { menuType } from "@/layout/types";
 import { ReText } from "@/components/ReText";
 import { useNav } from "@/layout/hooks/useNav";
 import { transformI18n } from "@/plugins/i18n";
+import SidebarLinkItem from "./SidebarLinkItem.vue";
+import SidebarExtraIcon from "./SidebarExtraIcon.vue";
 import { useRenderIcon } from "@/components/ReIcon/src/hooks";
 import {
   type PropType,
@@ -106,9 +106,9 @@ function resolvePath(routePath) {
 </script>
 
 <template>
-  <link-item
+  <SidebarLinkItem
     v-if="
-      hasOneShowingChild(props.item.children, props.item) &&
+      hasOneShowingChild(item.children, item) &&
       (!onlyOneChild.children || onlyOneChild.noShowingChildren)
     "
     :to="item"
@@ -120,7 +120,7 @@ function resolvePath(routePath) {
       v-bind="attrs"
     >
       <div
-        v-if="toRaw(props.item.meta.icon)"
+        v-if="toRaw(item.meta.icon)"
         class="sub-menu-icon"
         :style="getSubMenuIconStyle"
       >
@@ -128,21 +128,21 @@ function resolvePath(routePath) {
           :is="
             useRenderIcon(
               toRaw(onlyOneChild.meta.icon) ||
-                (props.item.meta && toRaw(props.item.meta.icon))
+                (item.meta && toRaw(item.meta.icon))
             )
           "
         />
       </div>
       <el-text
         v-if="
-          (!props.item?.meta.icon &&
+          (!item?.meta.icon &&
             isCollapse &&
             layout === 'vertical' &&
-            props.item?.pathList?.length === 1) ||
+            item?.pathList?.length === 1) ||
           (!onlyOneChild.meta.icon &&
             isCollapse &&
             layout === 'mix' &&
-            props.item?.pathList?.length === 2)
+            item?.pathList?.length === 2)
         "
         truncated
         class="!w-full !px-4 !text-inherit"
@@ -161,37 +161,35 @@ function resolvePath(routePath) {
           >
             {{ transformI18n(onlyOneChild.meta.title) }}
           </ReText>
-          <extraIcon :extraIcon="onlyOneChild.meta.extraIcon" />
+          <SidebarExtraIcon :extraIcon="onlyOneChild.meta.extraIcon" />
         </div>
       </template>
     </el-menu-item>
-  </link-item>
+  </SidebarLinkItem>
   <el-sub-menu
     v-else
     ref="subMenu"
     teleported
-    :index="resolvePath(props.item.path)"
+    :index="resolvePath(item.path)"
     v-bind="expandCloseIcon"
   >
     <template #title>
       <div
-        v-if="toRaw(props.item.meta.icon)"
+        v-if="toRaw(item.meta.icon)"
         :style="getSubMenuIconStyle"
         class="sub-menu-icon"
       >
-        <component
-          :is="useRenderIcon(props.item.meta && toRaw(props.item.meta.icon))"
-        />
+        <component :is="useRenderIcon(item.meta && toRaw(item.meta.icon))" />
       </div>
       <ReText
         v-if="
-          layout === 'mix' && toRaw(props.item.meta.icon)
-            ? !isCollapse || props.item?.pathList?.length !== 2
+          layout === 'mix' && toRaw(item.meta.icon)
+            ? !isCollapse || item?.pathList?.length !== 2
             : !(
                 layout === 'vertical' &&
                 isCollapse &&
-                toRaw(props.item.meta.icon) &&
-                props.item.parentId === null
+                toRaw(item.meta.icon) &&
+                item.parentId === null
               )
         "
         :tippyProps="{
@@ -204,17 +202,17 @@ function resolvePath(routePath) {
           '!px-4':
             layout !== 'horizontal' &&
             isCollapse &&
-            !toRaw(props.item.meta.icon) &&
-            props.item.parentId === null
+            !toRaw(item.meta.icon) &&
+            item.parentId === null
         }"
       >
-        {{ transformI18n(props.item.meta.title) }}
+        {{ transformI18n(item.meta.title) }}
       </ReText>
-      <extraIcon v-if="!isCollapse" :extraIcon="props.item.meta.extraIcon" />
+      <SidebarExtraIcon v-if="!isCollapse" :extraIcon="item.meta.extraIcon" />
     </template>
 
     <sidebar-item
-      v-for="child in props.item.children"
+      v-for="child in item.children"
       :key="child.path"
       :is-nest="true"
       :item="child"
diff --git a/src/layout/components/sidebar/leftCollapse.vue b/src/layout/components/lay-sidebar/components/SidebarLeftCollapse.vue
similarity index 93%
rename from src/layout/components/sidebar/leftCollapse.vue
rename to src/layout/components/lay-sidebar/components/SidebarLeftCollapse.vue
index cd475ab905..dc3a6cc33e 100644
--- a/src/layout/components/sidebar/leftCollapse.vue
+++ b/src/layout/components/lay-sidebar/components/SidebarLeftCollapse.vue
@@ -46,7 +46,7 @@ const toggleClick = () => {
   <div class="left-collapse">
     <IconifyIconOffline
       v-tippy="{
-        content: props.isActive
+        content: isActive
           ? t('buttons.pureClickCollapse')
           : t('buttons.pureClickExpand'),
         theme: tooltipEffect,
@@ -55,7 +55,7 @@ const toggleClick = () => {
       }"
       :icon="MenuFold"
       :class="[iconClass, themeColor === 'light' ? '' : 'text-primary']"
-      :style="{ transform: props.isActive ? 'none' : 'rotateY(180deg)' }"
+      :style="{ transform: isActive ? 'none' : 'rotateY(180deg)' }"
       @click="toggleClick"
     />
   </div>
diff --git a/src/layout/components/sidebar/linkItem.vue b/src/layout/components/lay-sidebar/components/SidebarLinkItem.vue
similarity index 93%
rename from src/layout/components/sidebar/linkItem.vue
rename to src/layout/components/lay-sidebar/components/SidebarLinkItem.vue
index 2e0254a0ee..8911c122f8 100644
--- a/src/layout/components/sidebar/linkItem.vue
+++ b/src/layout/components/lay-sidebar/components/SidebarLinkItem.vue
@@ -3,10 +3,6 @@ import { computed } from "vue";
 import { isUrl } from "@pureadmin/utils";
 import { menuType } from "@/layout/types";
 
-defineOptions({
-  name: "LinkItem"
-});
-
 const props = defineProps<{
   to: menuType;
 }>();
diff --git a/src/layout/components/sidebar/logo.vue b/src/layout/components/lay-sidebar/components/SidebarLogo.vue
similarity index 91%
rename from src/layout/components/sidebar/logo.vue
rename to src/layout/components/lay-sidebar/components/SidebarLogo.vue
index e02f5cc711..ab1a4b4383 100644
--- a/src/layout/components/sidebar/logo.vue
+++ b/src/layout/components/lay-sidebar/components/SidebarLogo.vue
@@ -10,11 +10,11 @@ const { title, getLogo } = useNav();
 </script>
 
 <template>
-  <div class="sidebar-logo-container" :class="{ collapses: props.collapse }">
+  <div class="sidebar-logo-container" :class="{ collapses: collapse }">
     <transition name="sidebarLogoFade">
       <router-link
-        v-if="props.collapse"
-        key="props.collapse"
+        v-if="collapse"
+        key="collapse"
         :title="title"
         class="sidebar-logo-link"
         :to="getTopMenu()?.path ?? '/'"
diff --git a/src/layout/components/sidebar/topCollapse.vue b/src/layout/components/lay-sidebar/components/SidebarTopCollapse.vue
similarity index 81%
rename from src/layout/components/sidebar/topCollapse.vue
rename to src/layout/components/lay-sidebar/components/SidebarTopCollapse.vue
index 278da07f70..351182294d 100644
--- a/src/layout/components/sidebar/topCollapse.vue
+++ b/src/layout/components/lay-sidebar/components/SidebarTopCollapse.vue
@@ -26,14 +26,12 @@ const toggleClick = () => {
   <div
     class="px-3 mr-1 navbar-bg-hover"
     :title="
-      props.isActive
-        ? t('buttons.pureClickCollapse')
-        : t('buttons.pureClickExpand')
+      isActive ? t('buttons.pureClickCollapse') : t('buttons.pureClickExpand')
     "
     @click="toggleClick"
   >
     <IconifyIconOffline
-      :icon="props.isActive ? MenuFold : MenuUnfold"
+      :icon="isActive ? MenuFold : MenuUnfold"
       class="inline-block align-middle hover:text-primary dark:hover:!text-white"
     />
   </div>
diff --git a/src/layout/components/tag/index.scss b/src/layout/components/lay-tag/index.scss
similarity index 100%
rename from src/layout/components/tag/index.scss
rename to src/layout/components/lay-tag/index.scss
diff --git a/src/layout/components/tag/index.vue b/src/layout/components/lay-tag/index.vue
similarity index 100%
rename from src/layout/components/tag/index.vue
rename to src/layout/components/lay-tag/index.vue
diff --git a/src/layout/components/notice/data.ts b/src/layout/components/notice/data.ts
deleted file mode 100644
index 0fbb6be563..0000000000
--- a/src/layout/components/notice/data.ts
+++ /dev/null
@@ -1,146 +0,0 @@
-export interface ListItem {
-  avatar: string;
-  title: string;
-  datetime: string;
-  type: string;
-  description: string;
-  status?: "primary" | "success" | "warning" | "info" | "danger";
-  extra?: string;
-}
-
-export interface TabItem {
-  key: string;
-  name: string;
-  list: ListItem[];
-}
-
-export const noticesData: TabItem[] = [
-  {
-    key: "1",
-    name: "通知",
-    list: [
-      {
-        avatar:
-          "https://gw.alipayobjects.com/zos/rmsportal/ThXAXghbEsBCCSDihZxY.png",
-        title: "你收到了 12 份新周报",
-        datetime: "一年前",
-        description: "",
-        type: "1"
-      },
-      {
-        avatar:
-          "https://gw.alipayobjects.com/zos/rmsportal/OKJXDXrmkNshAMvwtvhu.png",
-        title: "你推荐的 前端高手 已通过第三轮面试",
-        datetime: "一年前",
-        description: "",
-        type: "1"
-      },
-      {
-        avatar:
-          "https://gw.alipayobjects.com/zos/rmsportal/kISTdvpyTAhtGxpovNWd.png",
-        title: "这种模板可以区分多种通知类型",
-        datetime: "一年前",
-        description: "",
-        type: "1"
-      },
-      {
-        avatar:
-          "https://gw.alipayobjects.com/zos/rmsportal/GvqBnKhFgObvnSGkDsje.png",
-        title:
-          "展示标题内容超过一行后的处理方式，如果内容超过1行将自动截断并支持tooltip显示完整标题。",
-        datetime: "一年前",
-        description: "",
-        type: "1"
-      },
-      {
-        avatar:
-          "https://gw.alipayobjects.com/zos/rmsportal/GvqBnKhFgObvnSGkDsje.png",
-        title: "左侧图标用于区分不同的类型",
-        datetime: "一年前",
-        description: "",
-        type: "1"
-      },
-      {
-        avatar:
-          "https://gw.alipayobjects.com/zos/rmsportal/GvqBnKhFgObvnSGkDsje.png",
-        title: "左侧图标用于区分不同的类型",
-        datetime: "一年前",
-        description: "",
-        type: "1"
-      }
-    ]
-  },
-  {
-    key: "2",
-    name: "消息",
-    list: [
-      {
-        avatar:
-          "https://gw.alipayobjects.com/zos/rmsportal/fcHMVNCjPOsbUGdEduuv.jpeg",
-        title: "李白 评论了你",
-        description: "长风破浪会有时,直挂云帆济沧海",
-        datetime: "一年前",
-        type: "2"
-      },
-      {
-        avatar:
-          "https://gw.alipayobjects.com/zos/rmsportal/fcHMVNCjPOsbUGdEduuv.jpeg",
-        title: "李白 回复了你",
-        description: "行路难，行路难，多歧路，今安在。",
-        datetime: "一年前",
-        type: "2"
-      },
-      {
-        avatar:
-          "https://gw.alipayobjects.com/zos/rmsportal/fcHMVNCjPOsbUGdEduuv.jpeg",
-        title: "标题",
-        description:
-          "请将鼠标移动到此处，以便测试超长的消息在此处将如何处理。本例中设置的描述最大行数为2，超过2行的描述内容将被省略并且可以通过tooltip查看完整内容",
-        datetime: "一年前",
-        type: "2"
-      }
-    ]
-  },
-  {
-    key: "3",
-    name: "待办",
-    list: [
-      {
-        avatar: "",
-        title: "任务名称",
-        description: "任务需要在 2022-11-16 20:00 前启动",
-        datetime: "",
-        extra: "未开始",
-        status: "info",
-        type: "3"
-      },
-      {
-        avatar: "",
-        title: "第三方紧急代码变更",
-        description:
-          "一拳提交于 2022-11-16，需在 2022-11-18 前完成代码变更任务",
-        datetime: "",
-        extra: "马上到期",
-        status: "danger",
-        type: "3"
-      },
-      {
-        avatar: "",
-        title: "信息安全考试",
-        description: "指派小仙于 2022-12-12 前完成更新并发布",
-        datetime: "",
-        extra: "已耗时 8 天",
-        status: "warning",
-        type: "3"
-      },
-      {
-        avatar: "",
-        title: "vue-pure-admin 版本发布",
-        description: "vue-pure-admin 版本发布",
-        datetime: "",
-        extra: "进行中",
-        type: "3"
-      }
-    ]
-  }
-];
diff --git a/src/layout/components/notice/noticeList.vue b/src/layout/components/notice/noticeList.vue
deleted file mode 100644
index 54bdf2f7de..0000000000
--- a/src/layout/components/notice/noticeList.vue
+++ /dev/null
@@ -1,26 +0,0 @@
-<script setup lang="ts">
-import { PropType } from "vue";
-import { ListItem } from "./data";
-import { useI18n } from "vue-i18n";
-import NoticeItem from "./noticeItem.vue";
-
-const props = defineProps({
-  list: {
-    type: Array as PropType<Array<ListItem>>,
-    default: () => []
-  }
-});
-
-const { t } = useI18n();
-</script>
-
-<template>
-  <div v-if="props.list.length">
-    <NoticeItem
-      v-for="(item, index) in props.list"
-      :key="index"
-      :noticeItem="item"
-    />
-  </div>
-  <el-empty v-else :description="t('status.pureNoMessage')" />
-</template>
diff --git a/src/layout/components/search/components/index.ts b/src/layout/components/search/components/index.ts
deleted file mode 100644
index 6e895d94d2..0000000000
--- a/src/layout/components/search/components/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import SearchModal from "./SearchModal.vue";
-
-export { SearchModal };
diff --git a/src/layout/frameView.vue b/src/layout/frame.vue
similarity index 98%
rename from src/layout/frameView.vue
rename to src/layout/frame.vue
index 0ca9609b57..4243b57d56 100644
--- a/src/layout/frameView.vue
+++ b/src/layout/frame.vue
@@ -4,7 +4,7 @@ import { useRoute } from "vue-router";
 import { ref, unref, watch, onMounted, nextTick } from "vue";
 
 defineOptions({
-  name: "FrameView"
+  name: "LayFrame"
 });
 
 const props = defineProps<{
diff --git a/src/layout/components/keepAliveFrame/useMultiFrame.ts b/src/layout/hooks/useMultiFrame.ts
similarity index 100%
rename from src/layout/components/keepAliveFrame/useMultiFrame.ts
rename to src/layout/hooks/useMultiFrame.ts
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 0cd73a844f..7baea6772c 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -24,13 +24,13 @@ import {
   useResizeObserver
 } from "@pureadmin/utils";
 
-import navbar from "./components/navbar.vue";
-import tag from "./components/tag/index.vue";
-import appMain from "./components/appMain.vue";
-import setting from "./components/setting/index.vue";
-import Vertical from "./components/sidebar/vertical.vue";
-import Horizontal from "./components/sidebar/horizontal.vue";
-import backTop from "@/assets/svg/back_top.svg?component";
+import LayTag from "./components/lay-tag/index.vue";
+import LayNavbar from "./components/lay-navbar/index.vue";
+import LayContent from "./components/lay-content/index.vue";
+import LaySetting from "./components/lay-setting/index.vue";
+import NavVertical from "./components/lay-sidebar/NavVertical.vue";
+import NavHorizontal from "./components/lay-sidebar/NavHorizontal.vue";
+import BackTopIcon from "@/assets/svg/back_top.svg?component";
 
 const { t } = useI18n();
 const appWrapperRef = ref();
@@ -126,7 +126,8 @@ onBeforeMount(() => {
   useDataThemeChange().dataThemeChange($storage.layout?.overallStyle);
 });
 
-const layoutHeader = defineComponent({
+const LayHeader = defineComponent({
+  name: "LayHeader",
   render() {
     return h(
       "div",
@@ -144,12 +145,12 @@ const layoutHeader = defineComponent({
         default: () => [
           !pureSetting.hiddenSideBar &&
           (layout.value.includes("vertical") || layout.value.includes("mix"))
-            ? h(navbar)
+            ? h(LayNavbar)
             : null,
           !pureSetting.hiddenSideBar && layout.value.includes("horizontal")
-            ? h(Horizontal)
+            ? h(NavHorizontal)
             : null,
-          h(tag)
+          h(LayTag)
         ]
       }
     );
@@ -168,7 +169,7 @@ const layoutHeader = defineComponent({
       class="app-mask"
       @click="useAppStoreHook().toggleSideBar()"
     />
-    <Vertical
+    <NavVertical
       v-show="
         !pureSetting.hiddenSideBar &&
         (layout.includes('vertical') || layout.includes('mix'))
@@ -181,24 +182,24 @@ const layoutHeader = defineComponent({
       ]"
     >
       <div v-if="set.fixedHeader">
-        <layout-header />
+        <LayHeader />
         <!-- 主体内容 -->
-        <app-main :fixed-header="set.fixedHeader" />
+        <LayContent :fixed-header="set.fixedHeader" />
       </div>
       <el-scrollbar v-else>
         <el-backtop
           :title="t('buttons.pureBackTop')"
           target=".main-container .el-scrollbar__wrap"
         >
-          <backTop />
+          <BackTopIcon />
         </el-backtop>
-        <layout-header />
+        <LayHeader />
         <!-- 主体内容 -->
-        <app-main :fixed-header="set.fixedHeader" />
+        <LayContent :fixed-header="set.fixedHeader" />
       </el-scrollbar>
     </div>
     <!-- 系统设置 -->
-    <setting />
+    <LaySetting />
   </div>
 </template>
 
diff --git a/src/router/modules/board.ts b/src/router/modules/board.ts
index 3e7713d0aa..afac346753 100644
--- a/src/router/modules/board.ts
+++ b/src/router/modules/board.ts
@@ -1,6 +1,6 @@
 import { $t } from "@/plugins/i18n";
 import { board } from "@/router/enums";
-const IFrame = () => import("@/layout/frameView.vue");
+const IFrame = () => import("@/layout/frame.vue");
 
 export default {
   path: "/board",
diff --git a/src/router/modules/formdesign.ts b/src/router/modules/formdesign.ts
index 03ca9370e9..d6891279d5 100644
--- a/src/router/modules/formdesign.ts
+++ b/src/router/modules/formdesign.ts
@@ -1,6 +1,6 @@
 import { $t } from "@/plugins/i18n";
 import { formdesign } from "@/router/enums";
-const IFrame = () => import("@/layout/frameView.vue");
+const IFrame = () => import("@/layout/frame.vue");
 
 export default {
   path: "/form-design",
diff --git a/src/router/modules/mind.ts b/src/router/modules/mind.ts
index 629cde34d2..49109c704e 100644
--- a/src/router/modules/mind.ts
+++ b/src/router/modules/mind.ts
@@ -1,6 +1,6 @@
 import { $t } from "@/plugins/i18n";
 import { mind } from "@/router/enums";
-const IFrame = () => import("@/layout/frameView.vue");
+const IFrame = () => import("@/layout/frame.vue");
 
 export default {
   path: "/mind-map",
diff --git a/src/router/modules/ppt.ts b/src/router/modules/ppt.ts
index fcf292dd38..4d7f9fea32 100644
--- a/src/router/modules/ppt.ts
+++ b/src/router/modules/ppt.ts
@@ -1,5 +1,5 @@
 import { ppt } from "@/router/enums";
-const IFrame = () => import("@/layout/frameView.vue");
+const IFrame = () => import("@/layout/frame.vue");
 
 export default {
   path: "/ppt",
diff --git a/src/router/utils.ts b/src/router/utils.ts
index 7df59d74cc..1f68d241dc 100644
--- a/src/router/utils.ts
+++ b/src/router/utils.ts
@@ -22,7 +22,7 @@ import { userKey, type DataInfo } from "@/utils/auth";
 import { type menuType, routerArrays } from "@/layout/types";
 import { useMultiTagsStoreHook } from "@/store/modules/multiTags";
 import { usePermissionStoreHook } from "@/store/modules/permission";
-const IFrame = () => import("@/layout/frameView.vue");
+const IFrame = () => import("@/layout/frame.vue");
 // https://cn.vitejs.dev/guide/features.html#glob-import
 const modulesRoutes = import.meta.glob("/src/views/**/*.{vue,tsx}");
 
diff --git a/src/views/account-settings/index.vue b/src/views/account-settings/index.vue
index d218044089..47486e3646 100644
--- a/src/views/account-settings/index.vue
+++ b/src/views/account-settings/index.vue
@@ -8,8 +8,8 @@ import Preferences from "./components/Preferences.vue";
 import SecurityLog from "./components/SecurityLog.vue";
 import { useGlobal, deviceDetection } from "@pureadmin/utils";
 import AccountManagement from "./components/AccountManagement.vue";
-import TopCollapse from "@/layout/components/sidebar/topCollapse.vue";
 import { useDataThemeChange } from "@/layout/hooks/useDataThemeChange";
+import LaySidebarTopCollapse from "@/layout/components/lay-sidebar/components/SidebarTopCollapse.vue";
 
 import leftLine from "@iconify-icons/ri/arrow-left-s-line";
 import ProfileIcon from "@iconify-icons/ri/user-3-line";
@@ -115,7 +115,7 @@ getMine().then(res => {
       </el-menu>
     </el-aside>
     <el-main>
-      <TopCollapse
+      <LaySidebarTopCollapse
         v-if="deviceDetection()"
         class="px-0"
         :is-active="isOpen"
diff --git a/src/views/monitor/logs/system/detail.vue b/src/views/monitor/logs/system/detail.vue
index 14be4dfceb..14334d4233 100644
--- a/src/views/monitor/logs/system/detail.vue
+++ b/src/views/monitor/logs/system/detail.vue
@@ -82,12 +82,7 @@ const dataList = ref([
 <template>
   <div>
     <el-scrollbar>
-      <PureDescriptions
-        border
-        :data="props.data"
-        :columns="columns"
-        :column="5"
-      />
+      <PureDescriptions border :data="data" :columns="columns" :column="5" />
     </el-scrollbar>
     <el-tabs :modelValue="'responseBody'" type="border-card" class="mt-4">
       <el-tab-pane
diff --git a/src/views/system/user/tree.vue b/src/views/system/user/tree.vue
index bcfa774b3c..2e9e82c17d 100644
--- a/src/views/system/user/tree.vue
+++ b/src/views/system/user/tree.vue
@@ -17,7 +17,7 @@ interface Tree {
   children?: Tree[];
 }
 
-const props = defineProps({
+defineProps({
   treeLoading: Boolean,
   treeData: Array
 });
@@ -95,7 +95,7 @@ defineExpose({ onTreeReset });
 
 <template>
   <div
-    v-loading="props.treeLoading"
+    v-loading="treeLoading"
     class="h-full bg-bg_color overflow-auto"
     :style="{ minHeight: `calc(100vh - 141px)` }"
   >
@@ -153,7 +153,7 @@ defineExpose({ onTreeReset });
     <el-divider />
     <el-tree
       ref="treeRef"
-      :data="props.treeData"
+      :data="treeData"
       node-key="id"
       size="small"
       :props="defaultProps"
diff --git a/src/views/table/base/fixColumn.vue b/src/views/table/base/fixColumn.vue
index 5691cbdf95..0b62c30771 100644
--- a/src/views/table/base/fixColumn.vue
+++ b/src/views/table/base/fixColumn.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { tableDataMore } from "./data";
 
-const props = withDefaults(
+withDefaults(
   defineProps<{
     height?: string;
   }>(),
@@ -62,12 +62,12 @@ function handleClick(row) {
 <template>
   <pure-table
     :data="
-      props.height
+      height
         ? tableDataMore.concat(tableDataMore).concat(tableDataMore)
         : tableDataMore
     "
     :columns="columns"
-    :height="props.height"
+    :height="height"
   >
     <template #operation="{ row }">
       <el-button link type="primary" size="small" @click="handleClick(row)">