From 90e45f6c23ef756a36eb64b39911e70bb4d0e307 Mon Sep 17 00:00:00 2001 From: MTrun <1262327911@qq.com> Date: Sat, 18 Dec 2021 16:36:43 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=A6=96=E9=A1=B5=E6=9E=B6=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 28 +++-- src/components/Doc/index.ts | 3 + src/components/Doc/index.vue | 16 +++ src/components/ThemeSelect/index.vue | 2 +- src/components/UserInfo/index.ts | 3 + src/components/UserInfo/index.vue | 103 ++++++++++++++++++ src/enums/pageEnum.ts | 12 +- src/layout/components/Header/index.vue | 15 ++- src/router/modules/project.router.ts | 13 ++- src/settings/designSetting.ts | 8 +- src/settings/pathConst.ts | 4 + src/styles/common/_dark.scss | 5 +- src/styles/common/_light.scss | 8 +- src/styles/common/mixins/mixins.scss | 9 +- src/styles/common/style.scss | 28 +++++ src/styles/common/var.scss | 2 +- src/utils/index.ts | 4 +- src/utils/page.ts | 58 +++++++--- src/utils/style.ts | 5 + src/views/login/index.vue | 8 +- src/views/project/index.vue | 34 +++++- .../layout/components/AsideFooter/index.ts | 3 + .../layout/components/AsideFooter/index.vue | 44 ++++++++ .../project/layout/components/Create/index.ts | 3 + .../layout/components/Create/index.vue | 25 +++++ .../project/layout/components/Header/index.ts | 3 + .../layout/components/Header/index.vue | 13 +++ .../project/layout/components/Sider/index.ts | 3 + .../project/layout/components/Sider/index.vue | 82 ++++++++++++++ .../project/layout/components/Sider/menu.ts | 58 ++++++++++ src/views/redirect/index.vue | 8 -- 31 files changed, 548 insertions(+), 62 deletions(-) create mode 100644 src/components/Doc/index.ts create mode 100644 src/components/Doc/index.vue create mode 100644 src/components/UserInfo/index.ts create mode 100644 src/components/UserInfo/index.vue create mode 100644 src/settings/pathConst.ts create mode 100644 src/views/project/layout/components/AsideFooter/index.ts create mode 100644 src/views/project/layout/components/AsideFooter/index.vue create mode 100644 src/views/project/layout/components/Create/index.ts create mode 100644 src/views/project/layout/components/Create/index.vue create mode 100644 src/views/project/layout/components/Header/index.ts create mode 100644 src/views/project/layout/components/Header/index.vue create mode 100644 src/views/project/layout/components/Sider/index.ts create mode 100644 src/views/project/layout/components/Sider/index.vue create mode 100644 src/views/project/layout/components/Sider/menu.ts diff --git a/src/App.vue b/src/App.vue index 9d9b4c3d..984be9a4 100644 --- a/src/App.vue +++ b/src/App.vue @@ -2,8 +2,8 @@ @@ -18,7 +18,7 @@ import { dateZhCN, darkTheme, NConfigProvider, - GlobalThemeOverrides, + GlobalThemeOverrides } from 'naive-ui' import { AppProvider } from '@/components/Application' import { useDesignStore } from '@/store/modules/designStore/designStore' @@ -26,22 +26,36 @@ import { borderRadius } from '@/settings/designSetting' const designStore = useDesignStore() +// 返回暗黑主题 +const getDarkTheme = computed(() => + designStore.getDarkTheme ? darkTheme : undefined +) + +// 主题配置 const getThemeOverrides = computed( (): GlobalThemeOverrides => { - return { + const commonObj = { + common: { + borderRadius + } + } + const lightObject = { + common: { + ...commonObj.common + } + } + const dartObject = { common: { primaryColor: designStore.appTheme, - borderRadius + ...commonObj.common }, LoadingBar: { colorLoading: designStore.appTheme } } + return designStore.getDarkTheme ? dartObject : lightObject } ) -const getDarkTheme = computed(() => - designStore.getDarkTheme ? darkTheme : undefined -) diff --git a/src/components/Doc/index.ts b/src/components/Doc/index.ts new file mode 100644 index 00000000..36008f11 --- /dev/null +++ b/src/components/Doc/index.ts @@ -0,0 +1,3 @@ +import Doc from './index.vue'; + +export { Doc }; diff --git a/src/components/Doc/index.vue b/src/components/Doc/index.vue new file mode 100644 index 00000000..1ad8e2af --- /dev/null +++ b/src/components/Doc/index.vue @@ -0,0 +1,16 @@ + + + diff --git a/src/components/ThemeSelect/index.vue b/src/components/ThemeSelect/index.vue index fb96c063..ac53cf63 100644 --- a/src/components/ThemeSelect/index.vue +++ b/src/components/ThemeSelect/index.vue @@ -1,5 +1,5 @@