Revert "动态改变颜色"

This reverts commit 5f4abe1418 [formerly 487a27193d189c11d12a79d339a5c1800d157597] [formerly 0804b0bb33ea9e286fbde79c834e97952e86d63d] [formerly 5161b39309ce5c69a4ba3ea37ad85b6bbbab258b] [formerly ea29897c0709a4348a85161429003ba4405f59aa] [formerly aec7f7119c7ac86d848dcb3226c4f018284a7470] [formerly c208536ddbb4a1ee18d0b4c6985e02ec857bdf52 [formerly 1651b96ca9070d2cd743063fafb83dd06b31403e]] [formerly 8a034bad24ce45a2180974bec4bb98aa22136872] [formerly 00c4123c1d7eb8c098d62f9d82c9fbe5286722bb] [formerly 1915e090833022dc051aa9cdc18547dbe38fa926 [formerly 1915e090833022dc051aa9cdc18547dbe38fa926 [formerly 1915e090833022dc051aa9cdc18547dbe38fa926 [formerly 1915e090833022dc051aa9cdc18547dbe38fa926 [formerly 27b9dffa48083e7d9838f32b8981c30abfc951f0 [formerly 06cbe3b2364c0a802527426b9fb2945c79521492]]]]]].


Former-commit-id: e53ade4e4745c6b8fb5276931a04705e43f755a8 [formerly e53ade4e4745c6b8fb5276931a04705e43f755a8 [formerly e53ade4e4745c6b8fb5276931a04705e43f755a8 [formerly e53ade4e4745c6b8fb5276931a04705e43f755a8 [formerly 209704775ed95f07abf99c39612489810f22cbf7 [formerly 01ea64980978fe4d79a4c062fa9159cf83d85377]]]]]
Former-commit-id: eecca6128a837f1309d3eb36a67877a53e466db5
Former-commit-id: 4af058cdabfd22f01726a1123d6101182d6dfa7e
Former-commit-id: b657360b57349dfe57cefe5bcd608e42e8c04e13 [formerly def83a8523ca7745ad46f5c3ebeb42de33f0cb54]
Former-commit-id: 8f846055e49cd5ef9dcb0557f0acd478bdc057a0
Former-commit-id: 019183e81e20591abe30a9a139b90e07e2e36b52
Former-commit-id: 1386cba2cfc49b31cf43efe182b5b644e1507da8
Former-commit-id: 6af6c766c6c9b5bf0510226eaea61c47df0d3d63
Former-commit-id: eebaabc70ea787c0ce0dee49ac7fd398b65fd27a

.env

@@ -3,4 +3,3 @@ VUE_APP_API=/api/
 VUE_APP_REPO=https://github.com/d2-projects/d2-admin
 VUE_APP_I18N_LOCALE=zh-chs
 VUE_APP_I18N_FALLBACK_LOCALE=en
-VUE_APP_ELEMENT_COLOR=#409EFF

package.json

@@ -25,7 +25,7 @@
     "countup.js": "^2.0.4",
     "dayjs": "^1.8.12",
     "echarts": "^4.2.1",
-    "element-ui": "^2.9.1",
+    "element-ui": "^2.7.2",
     "flex.css": "^1.1.7",
     "fuse.js": "^3.4.4",
     "github-markdown-css": "^3.0.1",
@@ -72,7 +72,6 @@
     "text-loader": "0.0.1",
     "uglifyjs-webpack-plugin": "^2.1.2",
     "vue-cli-plugin-i18n": "^0.6.0",
-    "vue-template-compiler": "^2.5.21",
+    "vue-template-compiler": "^2.5.21"
-    "webpack-theme-color-replacer": "^1.2.1"
   }
 }

src/layout/header-aside/components/header-color/index.vue

@@ -1,41 +0,0 @@
-<template>
-  <el-color-picker :value="value" size="small" @change="changeColor"></el-color-picker>
-</template>
-
-<script>
-import { mapState, mapActions } from 'vuex'
-import client from 'webpack-theme-color-replacer/client'
-import forElementUI from 'webpack-theme-color-replacer/forElementUI'
-
-export default {
-  name: 'd2-header-color',
-  computed: {
-    ...mapState('d2admin/color', [
-      'value'
-    ])
-  },
-  watch: {
-    value (val, old) {
-      this.changeThemeColor(old, val)
-    }
-  },
-  created () {
-    this.changeThemeColor(process.env.VUE_APP_ELEMENT_COLOR, this.value)
-  },
-  methods: {
-    ...mapActions({
-      colorSet: 'd2admin/color/set'
-    }),
-    changeColor (newColor) {
-      this.colorSet(newColor)
-    },
-    changeThemeColor (curColor, newColor) {
-      var options = {
-        oldColors: [...forElementUI.getElementUISeries(curColor)],
-        newColors: [...forElementUI.getElementUISeries(newColor)]
-      }
-      client.changer.changeColor(options, Promise)
-    }
-  }
-}
-</script>

src/layout/header-aside/layout.vue

@@ -32,7 +32,6 @@
           <d2-header-theme/>
           <d2-header-size/>
           <d2-header-locales/>
-          <d2-header-color></d2-header-color>
           <d2-header-user/>
         </div>
       </div>
@@ -93,7 +92,6 @@ import d2HeaderSize from './components/header-size'
 import d2HeaderTheme from './components/header-theme'
 import d2HeaderUser from './components/header-user'
 import d2HeaderLog from './components/header-log'
-import d2HeaderColor from './components/header-color'
 import { mapState, mapGetters, mapActions } from 'vuex'
 import mixinSearch from './mixins/search'
 export default {
@@ -111,8 +109,7 @@ export default {
     d2HeaderSize,
     d2HeaderTheme,
     d2HeaderUser,
-    d2HeaderLog,
+    d2HeaderLog
-    d2HeaderColor
   },
   data () {
     return {

src/store/modules/d2admin/modules/account.js

@@ -107,7 +107,6 @@ export default {
         await dispatch('d2admin/menu/asideCollapseLoad', null, { root: true })
         // DB -> store 持久化数据加载全局尺寸
         await dispatch('d2admin/size/load', null, { root: true })
-        await dispatch('d2admin/color/load', null, { root: true })
         // end
         resolve()
       })

src/store/modules/d2admin/modules/color.js

@@ -1,46 +0,0 @@
-export default {
-  namespaced: true,
-  state: {
-    // 颜色
-    value: process.env.VUE_APP_ELEMENT_COLOR
-  },
-  actions: {
-    /**
-     * @description 设置颜色
-     * @param {Object} state vuex state
-     * @param {String} color 尺寸
-     */
-    set ({ state, dispatch }, color) {
-      return new Promise(async resolve => {
-        // store 赋值
-        state.value = color
-        // 持久化
-        await dispatch('d2admin/db/set', {
-          dbName: 'sys',
-          path: 'color.value',
-          value: state.value,
-          user: true
-        }, { root: true })
-        // end
-        resolve()
-      })
-    },
-    /**
-     * @description 从持久化数据读取颜色设置
-     * @param {Object} state vuex state
-     */
-    load ({ state, dispatch }) {
-      return new Promise(async resolve => {
-        // store 赋值
-        state.value = await dispatch('d2admin/db/get', {
-          dbName: 'sys',
-          path: 'color.value',
-          defaultValue: process.env.VUE_APP_ELEMENT_COLOR,
-          user: true
-        }, { root: true })
-        // end
-        resolve()
-      })
-    }
-  }
-}

src/views/system/login/page.vue.REMOVED.git-id

@@ -1 +1 @@
-9c9dbaa47996b7dceac7c165fed90e73e4da0237
+fa1ae9f9a7f3f62b11777f83150787d16a763359

vue.config.js

@@ -1,9 +1,6 @@
 const UglifyJsPlugin = require('uglifyjs-webpack-plugin')
 const VueFilenameInjector = require('./tools/vue-filename-injector')
 
-const ThemeColorReplacer = require('webpack-theme-color-replacer')
-const forElementUI = require('webpack-theme-color-replacer/forElementUI')
-
 // 拼接路径
 const resolve = dir => require('path').join(__dirname, dir)
 
@@ -29,17 +26,6 @@ module.exports = {
       }
     }
   },
-  configureWebpack: {
-    plugins: [
-      new ThemeColorReplacer({
-        fileName: 'css/theme-colors.[contenthash:8].css',
-        matchColors: [
-          ...forElementUI.getElementUISeries(process.env.VUE_APP_ELEMENT_COLOR) // Element-ui主色系列
-        ],
-        changeSelector: forElementUI.changeSelector
-      })
-    ]
-  },
   // 默认设置: https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-service/lib/config/base.js
   chainWebpack: config => {
     /**

yarn.lock.REMOVED.git-id

@@ -1 +1 @@
-12deef00e0a1116ba0392a3851989164ee601528
+8a273c9068198d1dcc8d6b9738808332f76dabcb