From fc4bfc35d7cc04f45228ced117c87fca55face67 Mon Sep 17 00:00:00 2001 From: xiaoxian521 <1923740402@qq.com> Date: Wed, 27 Oct 2021 09:03:12 +0800 Subject: [PATCH] refactor: theme --- package.json | 4 +- public/serverConfig.json | 3 +- src/layout/components/setting/index.vue | 146 +++----------- src/layout/index.vue | 8 +- src/layout/theme/default-vars.scss | 17 ++ src/layout/theme/index.ts | 19 ++ src/layout/theme/light-vars.scss | 7 + src/plugins/element-plus/index.ts | 6 +- src/store/modules/app.ts | 4 +- src/style/sidebar.scss | 135 +++---------- vite.config.ts | 29 +++ yarn.lock | 258 ++++++++++++++---------- 12 files changed, 288 insertions(+), 348 deletions(-) create mode 100644 src/layout/theme/default-vars.scss create mode 100644 src/layout/theme/index.ts create mode 100644 src/layout/theme/light-vars.scss diff --git a/package.json b/package.json index 8153a2c4d..3cb1fa8f0 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ }, "dependencies": { "@amap/amap-jsapi-loader": "^1.0.1", + "@element-plus/icons": "^0.0.11", "@logicflow/core": "^0.7.1", "@logicflow/extension": "^0.7.1", "@vueuse/core": "^6.7.1", @@ -70,6 +71,7 @@ "@vue/compiler-sfc": "^3.2.20", "@vue/eslint-config-prettier": "^6.0.0", "@vue/eslint-config-typescript": "^7.0.0", + "@zougt/vite-plugin-theme-preprocessor": "^1.2.0", "autoprefixer": "^10.2.4", "babel-plugin-transform-remove-console": "^6.9.4", "chalk": "^2.4.2", @@ -92,7 +94,7 @@ "stylelint-order": "^4.1.0", "typescript": "^4.4.2", "unplugin-element-plus": "^0.1.0", - "vite": "^2.6.10", + "vite": "^2.6.11", "vite-plugin-mock": "^2.9.6", "vite-plugin-style-import": "^1.2.1", "vite-svg-loader": "^2.2.0", diff --git a/public/serverConfig.json b/public/serverConfig.json index 23097b9ee..538068f27 100644 --- a/public/serverConfig.json +++ b/public/serverConfig.json @@ -5,7 +5,8 @@ "HiddenSideBar": false, "KeepAlive": true, "Locale": "zh", - "Layout": "vertical-dark", + "Layout": "vertical", + "Theme": "default", "MapConfigure": { "amapKey": "97b3248d1553172e81f168cf94ea667e", "baiduKey": "wTHbkkEweiFqZLKunMIjcrb2RcqNXkhc", diff --git a/src/layout/components/setting/index.vue b/src/layout/components/setting/index.vue index 157487407..fb9e97eec 100644 --- a/src/layout/components/setting/index.vue +++ b/src/layout/components/setting/index.vue @@ -1,5 +1,4 @@ @@ -190,23 +152,12 @@ function setTheme(layout: string, theme: string) {