From cf394b4b7570c7afd3e57fa24ac70b512a8d326f Mon Sep 17 00:00:00 2001
From: KAI <1373639299@qq.com>
Date: Sun, 8 Dec 2024 17:59:16 +0800
Subject: [PATCH 1/5] =?UTF-8?q?style:=20=E8=8F=9C=E5=8D=95=E6=A0=91?=
 =?UTF-8?q?=E5=9C=B0=E4=B8=89=E5=B1=82=E6=A8=AA=E5=90=91=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/role/RoleAddModal.vue     | 12 +++++++++++-
 src/views/system/role/RoleUpdateDrawer.vue | 11 ++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/views/system/role/RoleAddModal.vue b/src/views/system/role/RoleAddModal.vue
index dba78ce..8e107b3 100644
--- a/src/views/system/role/RoleAddModal.vue
+++ b/src/views/system/role/RoleAddModal.vue
@@ -45,7 +45,7 @@
             <a-tree
               ref="menuTreeRef"
               v-model:checked-keys="form.menuIds"
-              class="w-full"
+              class="w-full menu-tree"
               :data="menuList"
               :default-expand-all="isMenuExpanded"
               :check-strictly="!form.menuCheckStrictly"
@@ -283,7 +283,17 @@ fieldset legend {
 :deep(.arco-form-item-extra) {
   width: 100%;
 }
+
 :deep(.arco-modal-footer){
   margin-top: -20px;
 }
+
+.menu-tree{
+  :deep(.arco-tree-node-is-leaf) {
+    display: inline-flex;
+  }
+  :deep(.arco-tree-node-indent-block){
+    width: 10px;
+  }
+}
 </style>
diff --git a/src/views/system/role/RoleUpdateDrawer.vue b/src/views/system/role/RoleUpdateDrawer.vue
index 95dd74e..e070999 100644
--- a/src/views/system/role/RoleUpdateDrawer.vue
+++ b/src/views/system/role/RoleUpdateDrawer.vue
@@ -15,7 +15,7 @@
           <a-input v-model.trim="form.name" placeholder="请输入名称" />
         </a-form-item>
         <a-form-item label="编码" field="code">
-          <a-input v-model.trim="form.code" placeholder="请输入编码" :disabled="isUpdate" />
+          <a-input v-model.trim="form.code" placeholder="请输入编码" :disabled="true" />
         </a-form-item>
         <a-form-item label="排序" field="sort">
           <a-input-number v-model="form.sort" placeholder="请输入排序" :min="1" mode="button" />
@@ -41,6 +41,7 @@
           <template #extra>
             <a-tree
               ref="menuTreeRef"
+              class="menu-tree"
               :data="menuList"
               :default-expand-all="isMenuExpanded"
               :check-strictly="!form.menuCheckStrictly"
@@ -235,4 +236,12 @@ fieldset legend {
   border: 1px solid var(--color-neutral-3);
   border-radius: 3px;
 }
+.menu-tree{
+  :deep(.arco-tree-node-is-leaf) {
+    display: inline-flex;
+  }
+  :deep(.arco-tree-node-indent-block){
+    width: 10px;
+  }
+}
 </style>
-- 
Gitee


From c62bc4cf298a225ee6c6c7da92208488322c5b6e Mon Sep 17 00:00:00 2001
From: MoChou <1373639299@qq.com>
Date: Sun, 8 Dec 2024 22:19:36 +0800
Subject: [PATCH 2/5] =?UTF-8?q?fix:=20AccountLogin=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E5=88=9D=E5=A7=8B=E5=8C=96=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/index.vue | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 498a4ec..ee4afa0 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="login pc">
+  <div v-if="isDesktop" class="login pc">
     <h3 class="login-logo">
       <img v-if="logo" :src="logo" alt="logo" />
       <img v-else src="/logo.svg" alt="logo" />
@@ -15,13 +15,13 @@
       <a-col :xs="24" :sm="12" :md="11">
         <div class="login-right">
           <h3 v-if="isEmailLogin" class="login-right__title">邮箱登录</h3>
-          <EmailLogin v-show="isEmailLogin" />
-          <a-tabs v-show="!isEmailLogin" class="login-right__form">
+          <EmailLogin v-if="isEmailLogin" />
+          <a-tabs v-else v-model:activeKey="activeTab" class="login-right__form">
             <a-tab-pane key="1" title="账号登录">
-              <AccountLogin />
+              <component :is="AccountLogin" v-if="activeTab === '1'" />
             </a-tab-pane>
             <a-tab-pane key="2" title="手机号登录">
-              <PhoneLogin />
+              <component :is="PhoneLogin" v-if="activeTab === '2'" />
             </a-tab-pane>
           </a-tabs>
           <div class="login-right__oauth">
@@ -50,7 +50,8 @@
     <GiThemeBtn class="theme-btn" />
     <Background />
   </div>
-  <div class="login h5">
+
+  <div v-else class="login h5">
     <div class="login-logo">
       <img v-if="logo" :src="logo" alt="logo" />
       <img v-else src="/logo.svg" alt="logo" />
@@ -60,13 +61,13 @@
       <a-col :xs="24" :sm="12" :md="11">
         <div class="login-right">
           <h3 v-if="isEmailLogin" class="login-right__title">邮箱登录</h3>
-          <EmailLogin v-show="isEmailLogin" />
-          <a-tabs v-show="!isEmailLogin" class="login-right__form">
+          <EmailLogin v-if="isEmailLogin" />
+          <a-tabs v-else v-model:activeKey="activeTab" class="login-right__form">
             <a-tab-pane key="1" title="账号登录">
-              <AccountLogin />
+              <component :is="AccountLogin" v-if="activeTab === '1'" />
             </a-tab-pane>
             <a-tab-pane key="2" title="手机号登录">
-              <PhoneLogin />
+              <component :is="PhoneLogin" v-if="activeTab === '2'" />
             </a-tab-pane>
           </a-tabs>
         </div>
@@ -89,6 +90,7 @@
 </template>
 
 <script setup lang="ts">
+import { computed, ref } from 'vue'
 import Background from './components/background/index.vue'
 import AccountLogin from './components/account/index.vue'
 import PhoneLogin from './components/phone/index.vue'
@@ -105,6 +107,8 @@ const title = computed(() => appStore.getTitle())
 const logo = computed(() => appStore.getLogo())
 
 const isEmailLogin = ref(false)
+const activeTab = ref('1')
+
 // 切换登录模式
 const toggleLoginMode = () => {
   isEmailLogin.value = !isEmailLogin.value
-- 
Gitee


From 7d5d67aee5ef07d2155b35d78a67d5ffdd4757da Mon Sep 17 00:00:00 2001
From: KAI <1373639299@qq.com>
Date: Tue, 10 Dec 2024 19:10:51 +0800
Subject: [PATCH 3/5] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E9=85=8D=E7=BD=AE=E5=BC=80=E5=85=B3=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=EF=BC=8C=E8=BF=81=E7=A7=BB=E4=B8=BB=E9=A2=98=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E8=87=B3=20`src/config/setting.ts`=EF=BC=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E8=89=B2=E5=BC=B1=E6=A8=A1=E5=BC=8F=E4=B8=8E=E5=93=80=E6=82=BC?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  5 +-
 .env.production                               |  5 +-
 .env.test                                     |  5 +-
 src/config/setting.json                       | 13 -----
 src/config/setting.ts                         | 40 ++++++++++++++
 .../HeaderRightBar/SettingDrawer.vue          | 54 +++++++++++++++++++
 .../components/HeaderRightBar/index.vue       |  4 +-
 src/stores/modules/app.ts                     | 25 ++++++++-
 src/types/app.d.ts                            | 16 ------
 src/types/env.d.ts                            |  1 +
 10 files changed, 132 insertions(+), 36 deletions(-)
 delete mode 100644 src/config/setting.json
 create mode 100644 src/config/setting.ts

diff --git a/.env.development b/.env.development
index e9224a1..24a66be 100644
--- a/.env.development
+++ b/.env.development
@@ -12,4 +12,7 @@ VITE_API_WS_URL = 'ws://localhost:8000'
 VITE_BASE = '/'
 
 # 是否开启开发者工具
-VITE_OPEN_DEVTOOLS = false
\ No newline at end of file
+VITE_OPEN_DEVTOOLS = false
+
+# 应用配置面板
+VITE_APP_SETTING = true
\ No newline at end of file
diff --git a/.env.production b/.env.production
index 7236d2e..1c5abb9 100644
--- a/.env.production
+++ b/.env.production
@@ -8,4 +8,7 @@ VITE_API_BASE_URL = 'https://api.continew.top'
 VITE_API_WS_URL = 'wss://api.continew.top'
 
 # 地址前缀
-VITE_BASE = '/'
\ No newline at end of file
+VITE_BASE = '/'
+
+# 应用配置面板
+VITE_APP_SETTING = false
\ No newline at end of file
diff --git a/.env.test b/.env.test
index 3660da1..68c14e1 100644
--- a/.env.test
+++ b/.env.test
@@ -13,4 +13,7 @@ VITE_API_BASE_URL = 'http://localhost:8000'
 VITE_BASE = '/test'
 
 # 是否开启开发者工具
-VITE_OPEN_DEVTOOLS = true
\ No newline at end of file
+VITE_OPEN_DEVTOOLS = true
+
+# 应用配置面板
+VITE_APP_SETTING = false
\ No newline at end of file
diff --git a/src/config/setting.json b/src/config/setting.json
deleted file mode 100644
index 77c77d3..0000000
--- a/src/config/setting.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "theme": "light",
-  "themeColor": "#165DFF",
-  "tab": true,
-  "tabMode": "card-gutter",
-  "animate": false,
-  "animateMode": "zoom-fade",
-  "menuCollapse": true,
-  "menuAccordion": true,
-  "menuDark": false,
-  "copyrightDisplay": true,
-  "layout": "left"
-}
diff --git a/src/config/setting.ts b/src/config/setting.ts
new file mode 100644
index 0000000..8c77ecf
--- /dev/null
+++ b/src/config/setting.ts
@@ -0,0 +1,40 @@
+interface AppSettings {
+  theme: 'light' | 'dark'
+  themeColor: string
+  tab: boolean
+  tabMode: 'card' | 'card-gutter' | 'rounded'
+  animate: boolean
+  animateMode: 'zoom-fade' | 'slide-dynamic-origin' | 'fade-slide' | 'fade' | 'fade-bottom' | 'fade-scale'
+  menuCollapse: boolean
+  menuAccordion: boolean
+  menuDark: boolean
+  copyrightDisplay: boolean
+  layout: 'left' | 'mix'
+  isOpenWatermark?: boolean
+  watermark?: string
+  enableColorWeaknessMode?: boolean
+  enableMourningMode?: boolean
+}
+
+// 默认配置
+export const defaultSettings: AppSettings = {
+  theme: 'light',
+  themeColor: '#165DFF',
+  tab: true,
+  tabMode: 'card-gutter',
+  animate: false,
+  animateMode: 'zoom-fade',
+  menuCollapse: true,
+  menuAccordion: true,
+  menuDark: false,
+  copyrightDisplay: true,
+  layout: 'left',
+  enableColorWeaknessMode: false,
+  enableMourningMode: false,
+}
+// 根据环境返回配置
+export const getSettings = (): AppSettings => {
+  return defaultSettings
+}
+
+export type { AppSettings }
diff --git a/src/layout/components/HeaderRightBar/SettingDrawer.vue b/src/layout/components/HeaderRightBar/SettingDrawer.vue
index 3ed98e8..3cb80c0 100644
--- a/src/layout/components/HeaderRightBar/SettingDrawer.vue
+++ b/src/layout/components/HeaderRightBar/SettingDrawer.vue
@@ -1,6 +1,9 @@
 <template>
   <a-drawer v-model:visible="visible" title="项目配置" width="300px" unmount-on-close :footer="false">
     <a-space :size="15" direction="vertical" fill>
+      <a-alert :show-icon="false" type="info">
+        「复制配置」按钮，并将配置粘贴到 src/config/settings.ts 文件中。
+      </a-alert>
       <a-divider orientation="center">系统布局</a-divider>
       <a-row justify="center">
         <a-space>
@@ -74,6 +77,24 @@
           <a-input v-model="appStore.watermark" placeholder="留空则显示用户名" />
         </a-descriptions-item>
       </a-descriptions>
+
+      <a-divider orientation="center">其它</a-divider>
+      <a-descriptions :column="1" :align="{ value: 'right' }" :value-style="{ paddingRight: 0 }">
+        <a-descriptions-item label="色弱模式">
+          <a-switch v-model="appStore.enableColorWeaknessMode" />
+        </a-descriptions-item>
+        <a-descriptions-item label="哀悼模式">
+          <a-switch v-model="appStore.enableMourningMode" />
+        </a-descriptions-item>
+      </a-descriptions>
+      <a-space direction="vertical" fill>
+        <a-button type="primary" long @click="copySettings">
+          <template #icon>
+            <icon-copy />
+          </template>
+          复制配置
+        </a-button>
+      </a-space>
     </a-space>
   </a-drawer>
 </template>
@@ -81,8 +102,11 @@
 <script setup lang="ts">
 import { ColorPicker } from 'vue-color-kit'
 import 'vue-color-kit/dist/vue-color-kit.css'
+import { useClipboard } from '@vueuse/core'
+import { Message } from '@arco-design/web-vue'
 import LayoutItem from './components/LayoutItem.vue'
 import { useAppStore } from '@/stores'
+import type { AppSettings } from '@/config/setting'
 
 defineOptions({ name: 'SettingDrawer' })
 const appStore = useAppStore()
@@ -138,6 +162,36 @@ const changeColor = (colorObj: ColorObj) => {
   appStore.setThemeColor(colorObj.hex)
 }
 
+// 复制配置
+const copySettings = () => {
+  const settings: AppSettings = {
+    theme: 'light',
+    themeColor: appStore.themeColor,
+    tab: appStore.tab,
+    tabMode: appStore.tabMode,
+    animate: appStore.animate,
+    animateMode: appStore.animateMode,
+    menuCollapse: appStore.menuCollapse,
+    menuAccordion: appStore.menuAccordion,
+    menuDark: appStore.menuDark,
+    copyrightDisplay: appStore.copyrightDisplay,
+    layout: appStore.layout,
+    isOpenWatermark: appStore.isOpenWatermark,
+    watermark: appStore.watermark,
+    enableColorWeaknessMode: appStore.enableColorWeaknessMode,
+    enableMourningMode: appStore.enableMourningMode,
+  }
+
+  const settingJson = JSON.stringify(settings, null, 2)
+  const { isSupported, copy } = useClipboard({ source: settingJson })
+  if (isSupported) {
+    copy(settingJson)
+    Message.success({ content: '复制成功!' })
+  } else {
+    Message.error({ content: '请检查浏览器权限是否开启' })
+  }
+}
+
 defineExpose({ open })
 </script>
 
diff --git a/src/layout/components/HeaderRightBar/index.vue b/src/layout/components/HeaderRightBar/index.vue
index 10bdabd..8c4a8e8 100644
--- a/src/layout/components/HeaderRightBar/index.vue
+++ b/src/layout/components/HeaderRightBar/index.vue
@@ -2,7 +2,7 @@
   <a-row justify="end" align="center">
     <a-space size="medium">
       <!-- 项目配置 -->
-      <a-tooltip content="项目配置" position="bl">
+      <a-tooltip v-if="settingOpen" content="项目配置" position="bl">
         <a-button size="mini" class="gi_hover_btn" @click="SettingDrawerRef?.open">
           <template #icon>
             <icon-settings :size="18" />
@@ -80,7 +80,7 @@ import { isMobile } from '@/utils'
 import { getToken } from '@/utils/auth'
 
 defineOptions({ name: 'HeaderRight' })
-
+const settingOpen = JSON.parse(import.meta.env.VITE_APP_SETTING)
 let socket: WebSocket
 onBeforeUnmount(() => {
   if (socket) {
diff --git a/src/stores/modules/app.ts b/src/stores/modules/app.ts
index 1d5c13b..9d19fe5 100644
--- a/src/stores/modules/app.ts
+++ b/src/stores/modules/app.ts
@@ -2,11 +2,11 @@ import { defineStore } from 'pinia'
 import { computed, reactive, toRefs } from 'vue'
 import { generate, getRgbStr } from '@arco-design/color'
 import { type BasicConfig, listSiteOptionDict } from '@/apis'
-import defaultSettings from '@/config/setting.json'
+import { type AppSettings, getSettings } from '@/config/setting'
 
 const storeSetup = () => {
   // App配置
-  const settingConfig = reactive({ ...defaultSettings }) as App.SettingConfig
+  const settingConfig = reactive({ ...getSettings() }) as AppSettings
   // 页面切换动画类名
   const transitionName = computed(() => (settingConfig.animate ? settingConfig.animateMode : ''))
 
@@ -81,6 +81,27 @@ const storeSetup = () => {
     document.title = config.SITE_TITLE || ''
     document.querySelector('link[rel="shortcut icon"]')?.setAttribute('href', config.SITE_FAVICON || '/favicon.ico')
   }
+  // 监听 色弱模式 和 哀悼模式
+  watch([
+    () => settingConfig.enableMourningMode,
+    () => settingConfig.enableColorWeaknessMode,
+  ], ([mourningMode, colorWeaknessMode]) => {
+    const filters = [] as string[]
+    if (mourningMode) {
+      filters.push('grayscale(100%)')
+    }
+    if (colorWeaknessMode) {
+      filters.push('invert(80%)')
+    }
+    // 如果没有任何滤镜条件，移除 `filter` 样式
+    if (filters.length === 0) {
+      document.documentElement.style.removeProperty('filter')
+    } else {
+      document.documentElement.style.setProperty('filter', filters.join(' '))
+    }
+  }, {
+    immediate: true,
+  })
 
   const getFavicon = () => {
     return siteConfig.SITE_FAVICON
diff --git a/src/types/app.d.ts b/src/types/app.d.ts
index 0cbb8f8..30a75eb 100644
--- a/src/types/app.d.ts
+++ b/src/types/app.d.ts
@@ -1,20 +1,4 @@
 declare namespace App {
-  /** 系统配置 */
-  interface SettingConfig {
-    theme: 'light' | 'dark' // 主题
-    themeColor: string // 主题色
-    tab: boolean // 是否显示页签
-    tabMode: TabType // 页签风格
-    animate: boolean // 是否显示动画
-    animateMode: AnimateType // 动画类名
-    menuCollapse: boolean // 左侧菜单折叠状态
-    menuAccordion: boolean // 左侧菜单手风琴效果
-    copyrightDisplay: boolean // 是否显示底部版权信息
-    menuDark: boolean // 菜单深色模式
-    layout: 'left' | 'mix'
-    isOpenWatermark: boolean // 是否开启水印
-    watermark: string // 水印
-  }
   /** 导航页签的样式类型 */
   type TabType = 'card' | 'card-gutter' | 'rounded'
   interface TabItem {
diff --git a/src/types/env.d.ts b/src/types/env.d.ts
index 72a6327..97c8118 100644
--- a/src/types/env.d.ts
+++ b/src/types/env.d.ts
@@ -5,6 +5,7 @@ interface ImportMetaEnv {
   readonly VITE_API_PREFIX: string
   readonly VITE_API_BASE_URL: string
   readonly VITE_BASE: string
+  readonly VITE_APP_SETTING: string
 }
 
 interface ImportMeta {
-- 
Gitee


From 05af60128022c684f87c82fbe28dd8855d7de7fd Mon Sep 17 00:00:00 2001
From: KAI <1373639299@qq.com>
Date: Tue, 10 Dec 2024 19:15:20 +0800
Subject: [PATCH 4/5] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E5=BA=94?=
 =?UTF-8?q?=E7=94=A8=E9=85=8D=E7=BD=AE=E5=BC=80=E5=85=B3=E5=B1=9E=E6=80=A7?=
 =?UTF-8?q?=EF=BC=8C=E8=BF=81=E7=A7=BB=E4=B8=BB=E9=A2=98=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E8=87=B3=20`src/config/setting.ts`=EF=BC=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E8=89=B2=E5=BC=B1=E6=A8=A1=E5=BC=8F=E4=B8=8E=E5=93=80=E6=82=BC?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/setting.ts                         | 25 ++-----------------
 .../HeaderRightBar/SettingDrawer.vue          |  3 +--
 src/stores/modules/app.ts                     |  4 +--
 src/types/app.d.ts                            | 18 +++++++++++++
 4 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/src/config/setting.ts b/src/config/setting.ts
index 8c77ecf..a9f81ee 100644
--- a/src/config/setting.ts
+++ b/src/config/setting.ts
@@ -1,23 +1,4 @@
-interface AppSettings {
-  theme: 'light' | 'dark'
-  themeColor: string
-  tab: boolean
-  tabMode: 'card' | 'card-gutter' | 'rounded'
-  animate: boolean
-  animateMode: 'zoom-fade' | 'slide-dynamic-origin' | 'fade-slide' | 'fade' | 'fade-bottom' | 'fade-scale'
-  menuCollapse: boolean
-  menuAccordion: boolean
-  menuDark: boolean
-  copyrightDisplay: boolean
-  layout: 'left' | 'mix'
-  isOpenWatermark?: boolean
-  watermark?: string
-  enableColorWeaknessMode?: boolean
-  enableMourningMode?: boolean
-}
-
-// 默认配置
-export const defaultSettings: AppSettings = {
+export const defaultSettings: App.AppSettings = {
   theme: 'light',
   themeColor: '#165DFF',
   tab: true,
@@ -33,8 +14,6 @@ export const defaultSettings: AppSettings = {
   enableMourningMode: false,
 }
 // 根据环境返回配置
-export const getSettings = (): AppSettings => {
+export const getSettings = (): App.AppSettings => {
   return defaultSettings
 }
-
-export type { AppSettings }
diff --git a/src/layout/components/HeaderRightBar/SettingDrawer.vue b/src/layout/components/HeaderRightBar/SettingDrawer.vue
index 3cb80c0..25aa942 100644
--- a/src/layout/components/HeaderRightBar/SettingDrawer.vue
+++ b/src/layout/components/HeaderRightBar/SettingDrawer.vue
@@ -106,7 +106,6 @@ import { useClipboard } from '@vueuse/core'
 import { Message } from '@arco-design/web-vue'
 import LayoutItem from './components/LayoutItem.vue'
 import { useAppStore } from '@/stores'
-import type { AppSettings } from '@/config/setting'
 
 defineOptions({ name: 'SettingDrawer' })
 const appStore = useAppStore()
@@ -164,7 +163,7 @@ const changeColor = (colorObj: ColorObj) => {
 
 // 复制配置
 const copySettings = () => {
-  const settings: AppSettings = {
+  const settings: App.AppSettings = {
     theme: 'light',
     themeColor: appStore.themeColor,
     tab: appStore.tab,
diff --git a/src/stores/modules/app.ts b/src/stores/modules/app.ts
index 9d19fe5..286834f 100644
--- a/src/stores/modules/app.ts
+++ b/src/stores/modules/app.ts
@@ -2,11 +2,11 @@ import { defineStore } from 'pinia'
 import { computed, reactive, toRefs } from 'vue'
 import { generate, getRgbStr } from '@arco-design/color'
 import { type BasicConfig, listSiteOptionDict } from '@/apis'
-import { type AppSettings, getSettings } from '@/config/setting'
+import { getSettings } from '@/config/setting'
 
 const storeSetup = () => {
   // App配置
-  const settingConfig = reactive({ ...getSettings() }) as AppSettings
+  const settingConfig = reactive({ ...getSettings() }) as App.AppSettings
   // 页面切换动画类名
   const transitionName = computed(() => (settingConfig.animate ? settingConfig.animateMode : ''))
 
diff --git a/src/types/app.d.ts b/src/types/app.d.ts
index 30a75eb..989d92d 100644
--- a/src/types/app.d.ts
+++ b/src/types/app.d.ts
@@ -1,4 +1,22 @@
 declare namespace App {
+  interface AppSettings {
+    theme: 'light' | 'dark'
+    themeColor: string
+    tab: boolean
+    tabMode: 'card' | 'card-gutter' | 'rounded'
+    animate: boolean
+    animateMode: 'zoom-fade' | 'slide-dynamic-origin' | 'fade-slide' | 'fade' | 'fade-bottom' | 'fade-scale'
+    menuCollapse: boolean
+    menuAccordion: boolean
+    menuDark: boolean
+    copyrightDisplay: boolean
+    layout: 'left' | 'mix'
+    isOpenWatermark?: boolean
+    watermark?: string
+    enableColorWeaknessMode?: boolean
+    enableMourningMode?: boolean
+  }
+
   /** 导航页签的样式类型 */
   type TabType = 'card' | 'card-gutter' | 'rounded'
   interface TabItem {
-- 
Gitee


From c847bbb6f7bab6dbe0bd22e089525c7bd22fbf52 Mon Sep 17 00:00:00 2001
From: MoChou <1373639299@qq.com>
Date: Tue, 10 Dec 2024 22:00:04 +0800
Subject: [PATCH 5/5] =?UTF-8?q?style:=20=E8=B0=83=E6=95=B4=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=9D=A2=E6=9D=BF=E6=98=BE=E7=A4=BA=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HeaderRightBar/SettingDrawer.vue           | 18 +++++++++---------
 src/layout/components/HeaderRightBar/index.vue |  3 +--
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/layout/components/HeaderRightBar/SettingDrawer.vue b/src/layout/components/HeaderRightBar/SettingDrawer.vue
index 25aa942..df7a8fc 100644
--- a/src/layout/components/HeaderRightBar/SettingDrawer.vue
+++ b/src/layout/components/HeaderRightBar/SettingDrawer.vue
@@ -1,11 +1,11 @@
 <template>
   <a-drawer v-model:visible="visible" title="项目配置" width="300px" unmount-on-close :footer="false">
     <a-space :size="15" direction="vertical" fill>
-      <a-alert :show-icon="false" type="info">
+      <a-alert v-if="settingOpen" :show-icon="false" type="info">
         「复制配置」按钮，并将配置粘贴到 src/config/settings.ts 文件中。
       </a-alert>
-      <a-divider orientation="center">系统布局</a-divider>
-      <a-row justify="center">
+      <a-divider v-if="settingOpen" orientation="center">系统布局</a-divider>
+      <a-row v-if="settingOpen" justify="center">
         <a-space>
           <a-badge>
             <template #content>
@@ -38,9 +38,9 @@
         ></ColorPicker>
       </a-row>
 
-      <a-divider orientation="center">界面显示</a-divider>
+      <a-divider v-if="settingOpen" orientation="center">界面显示</a-divider>
 
-      <a-descriptions :column="1" :align="{ value: 'right' }" :value-style="{ paddingRight: 0 }">
+      <a-descriptions v-if="settingOpen" :column="1" :align="{ value: 'right' }" :value-style="{ paddingRight: 0 }">
         <a-descriptions-item label="页签显示">
           <a-switch v-model="appStore.tab" />
         </a-descriptions-item>
@@ -73,7 +73,7 @@
         <a-descriptions-item label="水印">
           <a-switch v-model="appStore.isOpenWatermark" />
         </a-descriptions-item>
-        <a-descriptions-item v-if="appStore.isOpenWatermark" label="水印信息">
+        <a-descriptions-item label="水印信息">
           <a-input v-model="appStore.watermark" placeholder="留空则显示用户名" />
         </a-descriptions-item>
       </a-descriptions>
@@ -83,11 +83,11 @@
         <a-descriptions-item label="色弱模式">
           <a-switch v-model="appStore.enableColorWeaknessMode" />
         </a-descriptions-item>
-        <a-descriptions-item label="哀悼模式">
+        <a-descriptions-item v-if="settingOpen" label="哀悼模式">
           <a-switch v-model="appStore.enableMourningMode" />
         </a-descriptions-item>
       </a-descriptions>
-      <a-space direction="vertical" fill>
+      <a-space v-if="settingOpen" direction="vertical" fill>
         <a-button type="primary" long @click="copySettings">
           <template #icon>
             <icon-copy />
@@ -110,7 +110,7 @@ import { useAppStore } from '@/stores'
 defineOptions({ name: 'SettingDrawer' })
 const appStore = useAppStore()
 const visible = ref(false)
-
+const settingOpen = JSON.parse(import.meta.env.VITE_APP_SETTING)
 const tabModeList: App.TabItem[] = [
   { label: '卡片', value: 'card' },
   { label: '间隔卡片', value: 'card-gutter' },
diff --git a/src/layout/components/HeaderRightBar/index.vue b/src/layout/components/HeaderRightBar/index.vue
index 8c4a8e8..4ca4b59 100644
--- a/src/layout/components/HeaderRightBar/index.vue
+++ b/src/layout/components/HeaderRightBar/index.vue
@@ -2,7 +2,7 @@
   <a-row justify="end" align="center">
     <a-space size="medium">
       <!-- 项目配置 -->
-      <a-tooltip v-if="settingOpen" content="项目配置" position="bl">
+      <a-tooltip content="项目配置" position="bl">
         <a-button size="mini" class="gi_hover_btn" @click="SettingDrawerRef?.open">
           <template #icon>
             <icon-settings :size="18" />
@@ -80,7 +80,6 @@ import { isMobile } from '@/utils'
 import { getToken } from '@/utils/auth'
 
 defineOptions({ name: 'HeaderRight' })
-const settingOpen = JSON.parse(import.meta.env.VITE_APP_SETTING)
 let socket: WebSocket
 onBeforeUnmount(() => {
   if (socket) {
-- 
Gitee