diff --git a/.pnpm-debug.log b/.pnpm-debug.log deleted file mode 100644 index 70ace8d..0000000 --- a/.pnpm-debug.log +++ /dev/null @@ -1,20 +0,0 @@ -{ - "0 debug pnpm:scope": { - "selected": 1 - }, - "1 error pnpm": { - "errno": 1, - "code": "ELIFECYCLE", - "pkgid": "vben-admin@2.8.0", - "stage": "dev", - "script": "vite", - "pkgname": "vben-admin", - "err": { - "name": "pnpm", - "message": "vben-admin@2.8.0 dev: `vite`\nExit status 1", - "code": "ELIFECYCLE", - "stack": "pnpm: vben-admin@2.8.0 dev: `vite`\nExit status 1\n at EventEmitter. (C:\\Users\\Zexy\\AppData\\Roaming\\npm\\node_modules\\pnpm\\dist\\pnpm.cjs:103336:20)\n at EventEmitter.emit (events.js:400:28)\n at ChildProcess. (C:\\Users\\Zexy\\AppData\\Roaming\\npm\\node_modules\\pnpm\\dist\\pnpm.cjs:91276:18)\n at ChildProcess.emit (events.js:400:28)\n at maybeClose (internal/child_process.js:1058:16)\n at Process.ChildProcess._handle.onexit (internal/child_process.js:293:5)" - } - }, - "2 warn pnpm:global": " Local package.json exists, but node_modules missing, did you mean to install?" -} \ No newline at end of file diff --git a/src/enums/menuEnum.ts b/src/enums/menuEnum.ts index 89cfa9f..5f9753a 100644 --- a/src/enums/menuEnum.ts +++ b/src/enums/menuEnum.ts @@ -48,3 +48,30 @@ export enum MixSidebarTriggerEnum { HOVER = 'hover', CLICK = 'click', } + +export class MenuThemeInfo { + background: string; + color: string; + hover: string; + active: string; + + constructor(background: string, hover: string, color: string, active: string) { + this.background = background; + this.hover = hover; + this.color = color; + this.active = active; + } +} + +export const MenuThemeEnum = { + CLASSIC_BLUE : new MenuThemeInfo('#2563eb', '#1d4ed8','#ffffff','#fef3c7'), + MINT_GREEN: new MenuThemeInfo('#10b981', '#059669', '#ffffff', '#ecfeff'), + ELEGANT_GRAY : new MenuThemeInfo('#1f2937', '#374151', '#e5e7eb', '#ffffff'), + WARM_ORANGE:new MenuThemeInfo('#f97316', '#ea580c', '#ffffff', '#fffbeb'), + ELEGANT_PURPLE: new MenuThemeInfo('#8b5cf6', '#7c3aed', '#ffffff', '#f3e8ff'), + CALM_CYAN: new MenuThemeInfo('#0891b2', '#0e7490', '#ffffff', '#ccfbf1'), + SOFT_PINK: new MenuThemeInfo('#f472b6', '#ec4899', '#ffffff', '#fff1f7'), + VIBRANT_LIME : new MenuThemeInfo('#84cc16', '#65a30d', '#1f2937', '#ffffff'), + MINIMAL_WHITE : new MenuThemeInfo('#ffffff', '#f9fafb', '#4b5563', '#2563eb'), + DEEP_NAVY: new MenuThemeInfo('#0f172a', '#1e293b', '#cbd5e1', '#38bdf8'), +} diff --git a/src/layouts/default/footer/index.vue b/src/layouts/default/footer/index.vue index 5ba6467..6416a36 100644 --- a/src/layouts/default/footer/index.vue +++ b/src/layouts/default/footer/index.vue @@ -1,13 +1,13 @@ diff --git a/src/layouts/default/setting/SettingDrawer.tsx b/src/layouts/default/setting/SettingDrawer.tsx index 42fd2a2..9800512 100644 --- a/src/layouts/default/setting/SettingDrawer.tsx +++ b/src/layouts/default/setting/SettingDrawer.tsx @@ -5,7 +5,7 @@ import { TypePicker, ThemeColorPicker, SettingFooter, SwitchItem, SelectItem, In // import { AppDarkModeToggle } from '/@/components/Application'; -import { MenuTypeEnum, TriggerEnum } from '/@/enums/menuEnum'; +import { MenuTypeEnum, TriggerEnum, MenuThemeEnum } from '/@/enums/menuEnum'; import { useRootSetting } from '/@/hooks/setting/useRootSetting'; import { useMenuSetting } from '/@/hooks/setting/useMenuSetting'; @@ -22,6 +22,8 @@ import { HEADER_PRESET_BG_COLOR_LIST, SIDE_BAR_BG_COLOR_LIST, APP_PRESET_COLOR_L const { t } = useI18n(); +const THEME_COLOR = Object.keys(MenuThemeEnum).map((item) => MenuThemeEnum[item].background); + export default defineComponent({ name: 'SettingDrawer', setup(_, { attrs }) { @@ -93,7 +95,7 @@ export default defineComponent({ } function renderSiderTheme() { - return ; + return ; } function renderMainTheme() { @@ -114,17 +116,17 @@ export default defineComponent({ return ( <> - + {/* - + */} - + {/* */} - + {/* */} @@ -170,8 +172,8 @@ export default defineComponent({ - - +{/* + */} @@ -197,12 +199,12 @@ export default defineComponent({ {/* {unref(getShowDarkModeToggle) && {() => t('layout.setting.darkMode')}} {unref(getShowDarkModeToggle) && } */} - {() => t('导航栏模式')} - {renderSidebar()} + { /*{() => t('导航栏模式')} + {renderSidebar()} */} {() => t('系统主题')} {renderMainTheme()} - {() => t('顶栏主题')} - {renderHeaderTheme()} +{/* {() => t('顶栏主题')} + {renderHeaderTheme()} */} {() => t('菜单主题')} {renderSiderTheme()} {() => t('界面功能')} diff --git a/src/layouts/default/setting/components/ThemeColorPicker.vue b/src/layouts/default/setting/components/ThemeColorPicker.vue index f9a1d5b..1052318 100644 --- a/src/layouts/default/setting/components/ThemeColorPicker.vue +++ b/src/layouts/default/setting/components/ThemeColorPicker.vue @@ -1,8 +1,8 @@