From 3cac94ef8ce5688b46e7b297165b96125ac7a334 Mon Sep 17 00:00:00 2001
From: panda <1565636758@qq.com>
Date: Mon, 24 Mar 2025 15:47:48 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=B4=E9=83=A8?=
 =?UTF-8?q?=E4=B8=BB=E9=A2=98=E6=B7=B1=E8=89=B2=E6=A8=A1=E5=BC=8F=E4=B8=8B?=
 =?UTF-8?q?=EF=BC=8C=E9=A1=B6=E9=83=A8=E5=B7=A5=E5=85=B7=E6=A0=8F=E7=9A=84?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E3=80=81=E6=B6=88=E6=81=AF=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E4=BC=A0=E4=B8=BB=E9=A2=98=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/RouterSearch/index.vue         | 6 ++++--
 src/layout/components/Message/src/Message.vue | 7 ++++++-
 src/layout/components/ToolHeader.vue          | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/components/RouterSearch/index.vue b/src/components/RouterSearch/index.vue
index 42a41744d..52425ec99 100644
--- a/src/components/RouterSearch/index.vue
+++ b/src/components/RouterSearch/index.vue
@@ -18,7 +18,7 @@
     </el-select>
   </ElDialog>
   <div v-else class="custom-hover" @click.stop="showTopSearch = !showTopSearch">
-    <Icon icon="ep:search" />
+    <Icon icon="ep:search" :color="color"/>
     <el-select
       @click.stop
       filterable
@@ -41,11 +41,13 @@
 </template>
 
 <script lang="ts" setup>
+import { propTypes } from '@/utils/propTypes'
 defineProps({
   isModal: {
     type: Boolean,
     default: true
-  }
+  },
+  color: propTypes.string.def('')
 })
 
 const router = useRouter() // 路由对象
diff --git a/src/layout/components/Message/src/Message.vue b/src/layout/components/Message/src/Message.vue
index d769d88c8..d33b3b640 100644
--- a/src/layout/components/Message/src/Message.vue
+++ b/src/layout/components/Message/src/Message.vue
@@ -2,9 +2,14 @@
 import { formatDate } from '@/utils/formatTime'
 import * as NotifyMessageApi from '@/api/system/notify/message'
 import { useUserStoreWithOut } from '@/store/modules/user'
+import { propTypes } from '@/utils/propTypes'
 
 defineOptions({ name: 'Message' })
 
+defineProps({
+  color: propTypes.string.def('')
+})
+
 const { push } = useRouter()
 const userStore = useUserStoreWithOut()
 const activeName = ref('notice')
@@ -54,7 +59,7 @@ onMounted(() => {
     <ElPopover :width="400" placement="bottom" trigger="click">
       <template #reference>
         <ElBadge :is-dot="unreadCount > 0" class="item">
-          <Icon :size="18" class="cursor-pointer" icon="ep:bell" @click="getList" />
+          <Icon :size="18" class="cursor-pointer" icon="ep:bell" :color="color" @click="getList" />
         </ElBadge>
       </template>
       <ElTabs v-model="activeName">
diff --git a/src/layout/components/ToolHeader.vue b/src/layout/components/ToolHeader.vue
index 0b8d00d57..02b27bf16 100644
--- a/src/layout/components/ToolHeader.vue
+++ b/src/layout/components/ToolHeader.vue
@@ -65,7 +65,7 @@ export default defineComponent({
           {screenfull.value ? (
             <Screenfull class="custom-hover" color="var(--top-header-text-color)"></Screenfull>
           ) : undefined}
-          {search.value ? <RouterSearch isModal={false} /> : undefined}
+          {search.value ? <RouterSearch isModal={false} color="var(--top-header-text-color)"/> : undefined}
           {size.value ? (
             <SizeDropdown class="custom-hover" color="var(--top-header-text-color)"></SizeDropdown>
           ) : undefined}
-- 
Gitee


From 565fad6cc58c969a48a5d9dabb6df5ad61df8e28 Mon Sep 17 00:00:00 2001
From: panda <1565636758@qq.com>
Date: Mon, 24 Mar 2025 17:30:59 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E9=9D=99=E6=80=81=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E8=87=AA=E5=8A=A8=E5=AF=BC=E5=85=A5modules?=
 =?UTF-8?q?=E4=B8=8B=E7=9A=84=E6=89=80=E6=9C=89ts=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=8C=E4=BE=BF=E4=BA=8E=E9=A1=B9=E7=9B=AE=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E8=B7=AF=E7=94=B1=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=EF=BC=8C=E9=81=BF=E5=85=8D=E4=B8=8E=E9=A1=B9=E7=9B=AE=E4=BA=A7?=
 =?UTF-8?q?=E7=94=9F=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.ts | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/router/index.ts b/src/router/index.ts
index b818421c2..f3771add2 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,13 +1,40 @@
 import type { App } from 'vue'
 import type { RouteRecordRaw } from 'vue-router'
 import { createRouter, createWebHistory } from 'vue-router'
-import remainingRouter from './modules/remaining'
+
+// 自动导入modules目录下的所有静态路由，项目可以按模块分类增加路由文件
+// by panda 25.03.21
+const loadRouters = async (): Promise<RouteRecordRaw[]> => {
+  const modules: any = import.meta.glob('./modules/*.ts')
+  const allRouters: RouteRecordRaw[] = []
+
+  try {
+    // 等待所有模块加载完成
+    const loadedModules = await Promise.all(
+      Object.values(modules).map((importFn: () => Promise<any>) => importFn())
+    )
+
+    loadedModules.forEach((module) => {
+      if (Array.isArray(module.default)) {
+        allRouters.push(...module.default)
+      } else {
+        console.warn('Module does not export an array of routes:', module)
+      }
+    })
+  } catch (error) {
+    console.error('Error loading route modules:', error)
+  }
+
+  return allRouters
+}
+
+const allRouters = await loadRouters()
 
 // 创建路由实例
 const router = createRouter({
   history: createWebHistory(import.meta.env.VITE_BASE_PATH), // createWebHashHistory URL带#，createWebHistory URL不带#
   strict: true,
-  routes: remainingRouter as RouteRecordRaw[],
+  routes: allRouters, //自动导入的所有静态路由 by panda 25.03.21
   scrollBehavior: () => ({ left: 0, top: 0 })
 })
 
-- 
Gitee


From 1132f4a16c130dff9f5ec2416dea2d0768a03d2a Mon Sep 17 00:00:00 2001
From: panda <1565636758@qq.com>
Date: Wed, 7 May 2025 09:22:09 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.ts | 31 ++-----------------------------
 1 file changed, 2 insertions(+), 29 deletions(-)

diff --git a/src/router/index.ts b/src/router/index.ts
index f3771add2..b818421c2 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,40 +1,13 @@
 import type { App } from 'vue'
 import type { RouteRecordRaw } from 'vue-router'
 import { createRouter, createWebHistory } from 'vue-router'
-
-// 自动导入modules目录下的所有静态路由，项目可以按模块分类增加路由文件
-// by panda 25.03.21
-const loadRouters = async (): Promise<RouteRecordRaw[]> => {
-  const modules: any = import.meta.glob('./modules/*.ts')
-  const allRouters: RouteRecordRaw[] = []
-
-  try {
-    // 等待所有模块加载完成
-    const loadedModules = await Promise.all(
-      Object.values(modules).map((importFn: () => Promise<any>) => importFn())
-    )
-
-    loadedModules.forEach((module) => {
-      if (Array.isArray(module.default)) {
-        allRouters.push(...module.default)
-      } else {
-        console.warn('Module does not export an array of routes:', module)
-      }
-    })
-  } catch (error) {
-    console.error('Error loading route modules:', error)
-  }
-
-  return allRouters
-}
-
-const allRouters = await loadRouters()
+import remainingRouter from './modules/remaining'
 
 // 创建路由实例
 const router = createRouter({
   history: createWebHistory(import.meta.env.VITE_BASE_PATH), // createWebHashHistory URL带#，createWebHistory URL不带#
   strict: true,
-  routes: allRouters, //自动导入的所有静态路由 by panda 25.03.21
+  routes: remainingRouter as RouteRecordRaw[],
   scrollBehavior: () => ({ left: 0, top: 0 })
 })
 
-- 
Gitee