diff --git a/apps/web-antd/src/app.vue b/apps/web-antd/src/app.vue index 0671a3ba..4ab49aa8 100644 --- a/apps/web-antd/src/app.vue +++ b/apps/web-antd/src/app.vue @@ -4,7 +4,7 @@ import { computed } from 'vue'; import { GlobalProvider } from '@vben/universal-ui'; import { preferences, usePreferences } from '@vben-core/preferences'; -import { ConfigProvider, theme } from 'ant-design-vue'; +import { App, ConfigProvider, theme } from 'ant-design-vue'; import zhCN from 'ant-design-vue/es/locale/zh_CN'; import dayjs from 'dayjs'; @@ -17,16 +17,17 @@ dayjs.locale(zhCN.locale); const { isDark } = usePreferences(); const tokenTheme = computed(() => { - const algorithms = isDark.value + const algorithm = isDark.value ? [theme.darkAlgorithm] : [theme.defaultAlgorithm]; // antd 紧凑模式算法 if (preferences.app.compact) { - algorithms.push(theme.compactAlgorithm); + algorithm.push(theme.compactAlgorithm); } + return { - algorithms, + algorithm, token: { colorPrimary: preferences.theme.colorPrimary }, }; }); @@ -35,7 +36,9 @@ const tokenTheme = computed(() => { diff --git a/apps/web-antd/src/views/_essential/authentication/login.vue b/apps/web-antd/src/views/_essential/authentication/login.vue index 33a2af50..5357920d 100644 --- a/apps/web-antd/src/views/_essential/authentication/login.vue +++ b/apps/web-antd/src/views/_essential/authentication/login.vue @@ -9,7 +9,7 @@ import { AuthenticationLogin } from '@vben/universal-ui'; import { useRequest } from '@vben-core/request'; import { useAccessStore } from '@vben-core/stores'; -import { notification } from 'ant-design-vue'; +import { App } from 'ant-design-vue'; import { getUserInfo, userLogin } from '#/apis'; @@ -17,6 +17,7 @@ defineOptions({ name: 'Login' }); const router = useRouter(); const accessStore = useAccessStore(); +const { notification } = App.useApp(); const { loading, runAsync: runUserLogin } = useRequest(userLogin, { manual: true, diff --git a/packages/@core/shared/design/src/scss/common/base.scss b/packages/@core/shared/design/src/scss/common/base.scss index 443b0333..3cdac23a 100644 --- a/packages/@core/shared/design/src/scss/common/base.scss +++ b/packages/@core/shared/design/src/scss/common/base.scss @@ -7,6 +7,10 @@ html { overscroll-behavior: none; } +.ant-app { + color: inherit; +} + *, ::after, ::before {