From e02de8ba05b17e0a900647ce104e440dea074243 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=97=E5=AD=90?= Date: Thu, 10 Oct 2024 02:46:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=89=8D=E7=AB=AF=E7=BC=96=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/store/modules/theme/helpers.ts | 4 ++-- web/vite.config.ts | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/web/src/store/modules/theme/helpers.ts b/web/src/store/modules/theme/helpers.ts index 6ccbdf85..8ec432e3 100644 --- a/web/src/store/modules/theme/helpers.ts +++ b/web/src/store/modules/theme/helpers.ts @@ -30,8 +30,8 @@ export function initThemeSettings(): Theme.Setting { warning: '#faad14', error: '#f5222d' } - const language = themeSetting.language || 'zh_CN' - return { isMobile, darkMode, sider, header, tab, primaryColor, otherColor, language } + const locale = themeSetting.locale || 'zh_CN' + return { isMobile, darkMode, sider, header, tab, primaryColor, otherColor, locale } } /** 获取naive的主题颜色 */ diff --git a/web/vite.config.ts b/web/vite.config.ts index a8e0e32d..db4d0f55 100644 --- a/web/vite.config.ts +++ b/web/vite.config.ts @@ -1,9 +1,9 @@ import type { ConfigEnv } from 'vite' import { defineConfig, loadEnv } from 'vite' -import { convertEnv, getRootPath, getSrcPath } from './build/utils' import { createViteProxy, viteDefine } from './build/config' import { setupVitePlugins } from './build/plugins' +import { convertEnv, getRootPath, getSrcPath } from './build/utils' export default defineConfig((configEnv: ConfigEnv) => { const srcPath = getSrcPath() @@ -35,6 +35,13 @@ export default defineConfig((configEnv: ConfigEnv) => { commonjsOptions: { ignoreTryCatch: false } + }, + css: { + preprocessorOptions: { + scss: { + api: 'modern-compiler' // or 'modern' + } + } } } })