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 @@