fix: antdesign dark not work

This commit is contained in:
vben 2024-06-22 00:25:13 +08:00
parent a06c8f039f
commit 65ba45fdc0
3 changed files with 14 additions and 6 deletions

View File

@ -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(() => {
<template>
<GlobalProvider>
<ConfigProvider :locale="zhCN" :theme="tokenTheme">
<RouterView />
<App>
<RouterView />
</App>
</ConfigProvider>
</GlobalProvider>
</template>

View File

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

View File

@ -7,6 +7,10 @@ html {
overscroll-behavior: none;
}
.ant-app {
color: inherit;
}
*,
::after,
::before {