From 8679c3bf9cd237f42bbfbd292820b523d71da6cb Mon Sep 17 00:00:00 2001 From: h_mo <596417202@qq.com> Date: Thu, 17 Nov 2022 17:54:14 +0800 Subject: [PATCH 01/21] =?UTF-8?q?perf:=20Header=E6=A0=B7=E5=BC=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/breadcrumb/index.vue | 38 +++++++++---------- packages/layouts/src/left-menu.vue | 17 +++++---- 2 files changed, 28 insertions(+), 27 deletions(-) diff --git a/packages/layouts/src/components/breadcrumb/index.vue b/packages/layouts/src/components/breadcrumb/index.vue index c57daf6f..87d22e72 100644 --- a/packages/layouts/src/components/breadcrumb/index.vue +++ b/packages/layouts/src/components/breadcrumb/index.vue @@ -107,27 +107,27 @@ const handleClick = (path: string, route: Recordable) => { From c02e2232263c0909dcdc37a6a5d6ee7c4e8732b4 Mon Sep 17 00:00:00 2001 From: h_mo <596417202@qq.com> Date: Tue, 22 Nov 2022 18:08:19 +0800 Subject: [PATCH 05/21] =?UTF-8?q?wip:=20=E9=A1=B9=E7=9B=AE=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/admin/init-components.ts | 2 + apps/admin/src/init-application.ts | 8 +- apps/admin/src/setting/design.ts | 57 +- apps/admin/src/setting/project.ts | 2 +- apps/admin/src/store/config.ts | 1 + packages/constants/src/designSetting.ts | 43 + packages/constants/src/index.ts | 1 + packages/constants/src/menuEnum.ts | 2 +- .../layouts/src/components/darkMode/index.vue | 13 +- .../src/components/setting/constant.ts | 178 + .../layouts/src/components/setting/index.vue | 141 +- .../settingItem/InputNumberItem.vue | 35 + .../settingItem/NavigationBarPicker.vue | 115 + .../src/components/settingItem/SelectItem.vue | 32 + .../src/components/settingItem/SwitchItem.vue | 37 + .../settingItem/ThemeColorPicker.vue | 46 + .../vbenComponents/src/iconify/src/index.vue | 17 +- packages/vbenComponents/src/tooltip/index.ts | 0 .../src/tooltip/src/Tooltip.vue | 12 + pnpm-lock.yaml | 22209 +++++++++------- 20 files changed, 13626 insertions(+), 9325 deletions(-) create mode 100644 packages/constants/src/designSetting.ts create mode 100644 packages/layouts/src/components/setting/constant.ts create mode 100644 packages/layouts/src/components/settingItem/InputNumberItem.vue create mode 100644 packages/layouts/src/components/settingItem/NavigationBarPicker.vue create mode 100644 packages/layouts/src/components/settingItem/SelectItem.vue create mode 100644 packages/layouts/src/components/settingItem/SwitchItem.vue create mode 100644 packages/layouts/src/components/settingItem/ThemeColorPicker.vue create mode 100644 packages/vbenComponents/src/tooltip/index.ts create mode 100644 packages/vbenComponents/src/tooltip/src/Tooltip.vue diff --git a/apps/admin/init-components.ts b/apps/admin/init-components.ts index 7a089412..376bbb8a 100644 --- a/apps/admin/init-components.ts +++ b/apps/admin/init-components.ts @@ -87,6 +87,7 @@ import naive, { NTime, NScrollbar, NEl, + NTooltip } from 'naive-ui' import { initVbenComponent, setNotice, setMessage } from '@vben/vbencomponents' @@ -175,6 +176,7 @@ export async function registerComponents(app) { Scrollbar: NScrollbar, DarkTheme: darkTheme, El: NEl, + Tooltip: NTooltip, }) setMessage(useMessage) setNotice(useNotification) diff --git a/apps/admin/src/init-application.ts b/apps/admin/src/init-application.ts index 814366c3..1e533c3c 100644 --- a/apps/admin/src/init-application.ts +++ b/apps/admin/src/init-application.ts @@ -19,6 +19,7 @@ import { listenerRouteChange } from '@/logics/mitt/routeChange' import { useAppStore } from '@/store/modules/app' import Logo from '@/layout/components/logo.vue' import { useMenuSetting } from '@/hooks/setting/useMenuSetting' +import {unref} from "vue"; // To decouple the modules below `packages/*`, they no longer depend on each other // If the modules are heavily dependent on each other, you need to provide a decoupling method, and the caller will pass the parameters // Each module needs to provide `bridge` file as a decoupling method @@ -97,9 +98,14 @@ async function initPackages() { // Initial project configuration function initAppConfigStore() { + + // console.log('projectSetting',projectSetting) const appStore = useAppStoreWithOut() - const projectConfig = appStore.getProjectConfig + const projectConfig = unref(appStore.getProjectConfig) + // console.log('projectConfig',projectConfig) + // console.log('type',projectConfig.menuSetting.type) const projCfg = deepMerge(projectSetting, projectConfig || {}) + // console.log('projCfg',projCfg) appStore.setProjectConfig(projCfg) } diff --git a/apps/admin/src/setting/design.ts b/apps/admin/src/setting/design.ts index 99efb8ea..6ec88ce9 100644 --- a/apps/admin/src/setting/design.ts +++ b/apps/admin/src/setting/design.ts @@ -1,4 +1,10 @@ -import { ThemeEnum } from '@vben/constants' +import { + ThemeEnum, + SIDE_BAR_BG_COLOR_LIST, + HEADER_PRESET_BG_COLOR_LIST, + APP_PRESET_COLOR_LIST +} from '@vben/constants' + export const namespace = 'vben' @@ -6,45 +12,12 @@ export const primaryColor = '#0960bd' export const darkMode = ThemeEnum.LIGHT -// app theme preset color -export const APP_PRESET_COLOR_LIST: string[] = [ - '#0960bd', - '#0084f4', - '#009688', - '#536dfe', - '#ff5c93', - '#ee4f12', - '#0096c7', - '#9c27b0', - '#ff9800', -] - -// header preset color -export const HEADER_PRESET_BG_COLOR_LIST: string[] = [ - '#ffffff', - '#151515', - '#009688', - '#5172DC', - '#018ffb', - '#409eff', - '#e74c3c', - '#24292e', - '#394664', - '#001529', - '#383f45', -] -// sider preset color -export const SIDE_BAR_BG_COLOR_LIST: string[] = [ - '#001529', - '#212121', - '#273352', - '#ffffff', - '#191b24', - '#191a23', - '#304156', - '#001628', - '#28333E', - '#344058', - '#383f45', -] +export { + // app theme preset color + SIDE_BAR_BG_COLOR_LIST, + // header preset color + HEADER_PRESET_BG_COLOR_LIST, + // sider preset color + APP_PRESET_COLOR_LIST +} diff --git a/apps/admin/src/setting/project.ts b/apps/admin/src/setting/project.ts index 8cdd2483..e82c160b 100644 --- a/apps/admin/src/setting/project.ts +++ b/apps/admin/src/setting/project.ts @@ -9,7 +9,7 @@ import { SessionTimeoutProcessingEnum, SettingButtonPositionEnum, ThemeEnum, - TriggerEnum, + TriggerEnum } from '@vben/constants' import { diff --git a/apps/admin/src/store/config.ts b/apps/admin/src/store/config.ts index aba2be5e..a5117b94 100644 --- a/apps/admin/src/store/config.ts +++ b/apps/admin/src/store/config.ts @@ -44,6 +44,7 @@ export const useConfigStore = defineStore({ return this.beforeMiniInfo }, getProjectConfig(): ProjectConfig { + console.log('useConfigStore',this.projectConfig); return this.projectConfig || ({} as ProjectConfig) }, getHeaderSetting(): HeaderSetting { diff --git a/packages/constants/src/designSetting.ts b/packages/constants/src/designSetting.ts new file mode 100644 index 00000000..ae60968f --- /dev/null +++ b/packages/constants/src/designSetting.ts @@ -0,0 +1,43 @@ + +// app theme preset color +export const APP_PRESET_COLOR_LIST: string[] = [ + '#0960bd', + '#0084f4', + '#009688', + '#536dfe', + '#ff5c93', + '#ee4f12', + '#0096c7', + '#9c27b0', + '#ff9800', +]; + +// header preset color +export const HEADER_PRESET_BG_COLOR_LIST: string[] = [ + '#ffffff', + '#151515', + '#009688', + '#5172DC', + '#018ffb', + '#409eff', + '#e74c3c', + '#24292e', + '#394664', + '#001529', + '#383f45', +]; + +// sider preset color +export const SIDE_BAR_BG_COLOR_LIST: string[] = [ + '#001529', + '#212121', + '#273352', + '#ffffff', + '#191b24', + '#191a23', + '#304156', + '#001628', + '#28333E', + '#344058', + '#383f45', +]; diff --git a/packages/constants/src/index.ts b/packages/constants/src/index.ts index 021f07f6..314689ae 100644 --- a/packages/constants/src/index.ts +++ b/packages/constants/src/index.ts @@ -4,3 +4,4 @@ export * from './sidebar' export * from './appEnum' export * from './cacheEnum' export * from './menuEnum' +export * from './designSetting' diff --git a/packages/constants/src/menuEnum.ts b/packages/constants/src/menuEnum.ts index 215c8499..5903c3e1 100644 --- a/packages/constants/src/menuEnum.ts +++ b/packages/constants/src/menuEnum.ts @@ -4,7 +4,7 @@ export enum MenuTypeEnum { // left menu SIDEBAR = 'sidebar', - + // mix-sidebar MIX_SIDEBAR = 'mix-sidebar', // mixin menu MIX = 'mix', diff --git a/packages/layouts/src/components/darkMode/index.vue b/packages/layouts/src/components/darkMode/index.vue index 6856fb5d..79ed4542 100644 --- a/packages/layouts/src/components/darkMode/index.vue +++ b/packages/layouts/src/components/darkMode/index.vue @@ -1,14 +1,7 @@