From af01d80db27d30dd5176573a933c72ebca700fa3 Mon Sep 17 00:00:00 2001 From: xiaoxian521 <1923740402@qq.com> Date: Wed, 10 Nov 2021 11:50:29 +0800 Subject: [PATCH] fix: update --- package.json | 2 +- pnpm-lock.yaml | 8 ++++---- src/layout/components/setting/index.vue | 6 +++--- vite.config.ts | 5 +---- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 74500753d..eda91b150 100644 --- a/package.json +++ b/package.json @@ -82,7 +82,7 @@ "@vue/compiler-sfc": "^3.2.21", "@vue/eslint-config-prettier": "6.0.0", "@vue/eslint-config-typescript": "7.0.0", - "@zougt/vite-plugin-theme-preprocessor": "^1.3.8", + "@zougt/vite-plugin-theme-preprocessor": "^1.3.10", "autoprefixer": "10.2.4", "babel-plugin-transform-remove-console": "6.9.4", "chalk": "2.4.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index eb4884cab..a526a8620 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -20,7 +20,7 @@ specifiers: "@vue/eslint-config-typescript": 7.0.0 "@vueuse/core": ^6.7.1 "@vueuse/motion": ^2.0.0-beta.4 - "@zougt/vite-plugin-theme-preprocessor": ^1.3.8 + "@zougt/vite-plugin-theme-preprocessor": ^1.3.10 animate.css: ^4.1.1 autoprefixer: 10.2.4 await-to-js: ^3.0.0 @@ -137,7 +137,7 @@ devDependencies: "@vue/compiler-sfc": 3.2.21 "@vue/eslint-config-prettier": 6.0.0_82e4252401b0cc5be86f7c2133946f49 "@vue/eslint-config-typescript": 7.0.0_e03d82996bd4a66fb128f33523d782ea - "@zougt/vite-plugin-theme-preprocessor": 1.3.8_sass@1.43.4 + "@zougt/vite-plugin-theme-preprocessor": 1.3.10_sass@1.43.4 autoprefixer: 10.2.4_postcss@8.2.6 babel-plugin-transform-remove-console: 6.9.4 chalk: 2.4.2 @@ -1540,10 +1540,10 @@ packages: sass: 1.43.4 dev: true - /@zougt/vite-plugin-theme-preprocessor/1.3.8_sass@1.43.4: + /@zougt/vite-plugin-theme-preprocessor/1.3.10_sass@1.43.4: resolution: { - integrity: sha512-2fOaxWgg5Sxs3yiwzGH8DROSMtyCYCbf3B4F63aazayyoyPbVEnJG/f4whkYCFtzaJLiUEmlg3ABpcw9dwz/BA== + integrity: sha512-HHSTUYBv3quM8yRv57RJoDWqSm9cn9njCFk3ziSY+MALr7WT2uD5AmSnH9QBMVIU5jRcyPiuF3zDKbh8bifI+A== } engines: { node: ">= 12.0.0" } dependencies: diff --git a/src/layout/components/setting/index.vue b/src/layout/components/setting/index.vue index 17ba48e84..ebf91c1fe 100644 --- a/src/layout/components/setting/index.vue +++ b/src/layout/components/setting/index.vue @@ -17,7 +17,7 @@ import { debounce } from "/@/utils/debounce"; import { themeColorsType } from "../../types"; import { useAppStoreHook } from "/@/store/modules/app"; import { storageLocal, storageSession } from "/@/utils/storage"; -import { addClassNameToHtmlTag } from "@zougt/vite-plugin-theme-preprocessor/dist/browser-utils"; +import { toggleTheme } from "@zougt/vite-plugin-theme-preprocessor/dist/browser-utils"; const router = useRouter(); const { isSelect } = useCssModule(); @@ -62,7 +62,7 @@ let layoutTheme = if (unref(layoutTheme)) { let layout = unref(layoutTheme).layout; let theme = unref(layoutTheme).theme; - addClassNameToHtmlTag({ + toggleTheme({ scopeName: `layout-theme-${theme}` }); window.document.body.setAttribute("layout", layout); @@ -200,7 +200,7 @@ function setLayoutModel(layout: string) { // 设置导航主题色 function setLayoutThemeColor(theme: string) { layoutTheme.value.theme = theme; - addClassNameToHtmlTag({ + toggleTheme({ scopeName: `layout-theme-${theme}` }); instance.layout = { layout: useAppStoreHook().layout, theme }; diff --git a/vite.config.ts b/vite.config.ts index 0f01c16eb..5a46c87ec 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -110,10 +110,7 @@ export default ({ command, mode }: ConfigEnv): UserConfigExport => { // 在生产模式是否抽取独立的主题css文件,extract为true以下属性有效 extract: true, // 独立主题css文件的输出路径,默认取 viteConfig.build.assetsDir 相对于 (viteConfig.build.outDir) - outputDir: - process.env.NODE_ENV === "production" - ? "/manages/assets/" - : VITE_PUBLIC_PATH, + outputDir: "", // 会选取defaultScopeName对应的主题css文件在html添加link themeLinkTagId: "head", // "head"||"head-prepend" || "body" ||"body-prepend"