Merge e2e1bc886c into 9580c43a8e

package.json

@@ -100,7 +100,8 @@
     "serve-static": "^1.13.2",
     "svg-sprite-loader": "4.1.3",
     "svgo": "1.2.0",
-    "vue-template-compiler": "2.6.10"
+    "vue-template-compiler": "2.6.10",
+    "webpack-theme-color-replacer": "^1.3.8"
   },
   "engines": {
     "node": ">=8.9",

src/components/RightPanel/index.vue

@@ -2,7 +2,7 @@
   <div ref="rightPanel" :class="{show:show}" class="rightPanel-container">
     <div class="rightPanel-background" />
     <div class="rightPanel">
-      <div class="handle-button" :style="{'top':buttonTop+'px','background-color':theme}" @click="show=!show">
+      <div class="handle-button" :style="{'top':buttonTop+'px'}" @click="show=!show">
         <i :class="show?'el-icon-close':'el-icon-setting'" />
       </div>
       <div class="rightPanel-items">
@@ -32,11 +32,6 @@ export default {
       show: false
     }
   },
-  computed: {
-    theme() {
-      return this.$store.state.settings.theme
-    }
-  },
   watch: {
     show(value) {
       if (value && !this.clickNotClose) {
@@ -85,6 +80,7 @@ export default {
 </style>
 
 <style lang="scss" scoped>
+@import "../../styles/element-variables";
 .rightPanel-background {
   position: fixed;
   top: 0;
@@ -125,6 +121,15 @@ export default {
 }
 
 .handle-button {
+  /*
+   You can use any color of theme colors(which refers to `matchColors` option) in your css,
+   such as: $--color-primary and $--color-primary-light-6
+
+   可以在项目的css中使用任意主题色系的颜色，比如：$--color-primary 和 $--color-primary-light-6
+   主题色系的系列颜色是由webpack-theme-color-replacer插件的`matchColors`选项所指定的，可在vue.config.js中修改。
+   */
+  background-color: $--color-primary;
+
   width: 48px;
   height: 48px;
   position: absolute;

src/components/ThemePicker/index.vue

@@ -8,35 +8,19 @@
 </template>
 
 <script>
-const version = require('element-ui/package.json').version // element-ui version from node_modules
+// const version = require('element-ui/package.json').version // element-ui version from node_modules
-const ORIGINAL_THEME = '#409EFF' // default color
+// const ORIGINAL_THEME = '#409EFF' // default color
+import client from 'webpack-theme-color-replacer/client'
+import forElementUI from 'webpack-theme-color-replacer/forElementUI'
 
 export default {
   data() {
     return {
-      chalk: '', // content of theme-chalk css
+      theme: this.$store.state.settings.theme
-      theme: ''
-    }
-  },
-  computed: {
-    defaultTheme() {
-      return this.$store.state.settings.theme
     }
   },
   watch: {
-    defaultTheme: {
+    theme(val) {
-      handler: function(val, oldVal) {
-        this.theme = val
-      },
-      immediate: true
-    },
-    async theme(val) {
-      const oldVal = this.chalk ? this.theme : ORIGINAL_THEME
-      if (typeof val !== 'string') return
-      const themeCluster = this.getThemeCluster(val.replace('#', ''))
-      const originalCluster = this.getThemeCluster(oldVal.replace('#', ''))
-      console.log(themeCluster, originalCluster)
-
       const $message = this.$message({
         message: '  Compiling the theme',
         customClass: 'theme-message',
@@ -44,132 +28,28 @@ export default {
         duration: 0,
         iconClass: 'el-icon-loading'
       })
-
+      const options = {
-      const getHandler = (variable, id) => {
+        newColors: forElementUI.getElementUISeries(val)
-        return () => {
-          const originalCluster = this.getThemeCluster(ORIGINAL_THEME.replace('#', ''))
-          const newStyle = this.updateStyle(this[variable], originalCluster, themeCluster)
-
-          let styleTag = document.getElementById(id)
-          if (!styleTag) {
-            styleTag = document.createElement('style')
-            styleTag.setAttribute('id', id)
-            document.head.appendChild(styleTag)
-          }
-          styleTag.innerText = newStyle
-        }
       }
-
+      client.changer.changeColor(options, Promise).finally(() => $message.close())
-      if (!this.chalk) {
-        const url = `https://unpkg.com/element-ui@${version}/lib/theme-chalk/index.css`
-        await this.getCSSString(url, 'chalk')
-      }
-
-      const chalkHandler = getHandler('chalk', 'chalk-style')
-
-      chalkHandler()
-
-      const styles = [].slice.call(document.querySelectorAll('style'))
-        .filter(style => {
-          const text = style.innerText
-          return new RegExp(oldVal, 'i').test(text) && !/Chalk Variables/.test(text)
-        })
-      styles.forEach(style => {
-        const { innerText } = style
-        if (typeof innerText !== 'string') return
-        style.innerText = this.updateStyle(innerText, originalCluster, themeCluster)
-      })
-
-      this.$emit('change', val)
-
-      $message.close()
-    }
-  },
-
-  methods: {
-    updateStyle(style, oldCluster, newCluster) {
-      let newStyle = style
-      oldCluster.forEach((color, index) => {
-        newStyle = newStyle.replace(new RegExp(color, 'ig'), newCluster[index])
-      })
-      return newStyle
-    },
-
-    getCSSString(url, variable) {
-      return new Promise(resolve => {
-        const xhr = new XMLHttpRequest()
-        xhr.onreadystatechange = () => {
-          if (xhr.readyState === 4 && xhr.status === 200) {
-            this[variable] = xhr.responseText.replace(/@font-face{[^}]+}/, '')
-            resolve()
-          }
-        }
-        xhr.open('GET', url)
-        xhr.send()
-      })
-    },
-
-    getThemeCluster(theme) {
-      const tintColor = (color, tint) => {
-        let red = parseInt(color.slice(0, 2), 16)
-        let green = parseInt(color.slice(2, 4), 16)
-        let blue = parseInt(color.slice(4, 6), 16)
-
-        if (tint === 0) { // when primary color is in its rgb space
-          return [red, green, blue].join(',')
-        } else {
-          red += Math.round(tint * (255 - red))
-          green += Math.round(tint * (255 - green))
-          blue += Math.round(tint * (255 - blue))
-
-          red = red.toString(16)
-          green = green.toString(16)
-          blue = blue.toString(16)
-
-          return `#${red}${green}${blue}`
-        }
-      }
-
-      const shadeColor = (color, shade) => {
-        let red = parseInt(color.slice(0, 2), 16)
-        let green = parseInt(color.slice(2, 4), 16)
-        let blue = parseInt(color.slice(4, 6), 16)
-
-        red = Math.round((1 - shade) * red)
-        green = Math.round((1 - shade) * green)
-        blue = Math.round((1 - shade) * blue)
-
-        red = red.toString(16)
-        green = green.toString(16)
-        blue = blue.toString(16)
-
-        return `#${red}${green}${blue}`
-      }
-
-      const clusters = [theme]
-      for (let i = 0; i <= 9; i++) {
-        clusters.push(tintColor(theme, Number((i / 10).toFixed(2))))
-      }
-      clusters.push(shadeColor(theme, 0.1))
-      return clusters
     }
   }
 }
 </script>
 
 <style>
-.theme-message,
+  .theme-message,
-.theme-picker-dropdown {
+  .theme-picker-dropdown {
-  z-index: 99999 !important;
+    z-index: 99999 !important;
-}
+  }
 
-.theme-picker .el-color-picker__trigger {
+  .theme-picker .el-color-picker__trigger {
-  height: 26px !important;
+    height: 26px !important;
-  width: 26px !important;
+    width: 26px !important;
-  padding: 2px;
+    padding: 2px;
-}
+  }
 
-.theme-picker-dropdown .el-color-dropdown__link-btn {
+  .theme-picker-dropdown .el-color-dropdown__link-btn {
-  display: none;
+    display: none;
-}
+  }
 </style>

src/main.js

@@ -5,7 +5,7 @@ import Cookies from 'js-cookie'
 import 'normalize.css/normalize.css' // a modern alternative to CSS resets
 
 import Element from 'element-ui'
-import './styles/element-variables.scss'
+import './styles/element-index.scss'
 
 import '@/styles/index.scss' // global css
 

src/styles/element-index.scss

@@ -0,0 +1,17 @@
+/**
+* I think element-ui's default theme color is too light for long-term use.
+* So I modified the default color and you can modify it to your liking.
+**/
+
+@import "./element-variables";
+
+/* icon font path, required */
+$--font-path: '~element-ui/lib/theme-chalk/fonts';
+
+@import "~element-ui/packages/theme-chalk/src/index";
+
+// the :export directive is the magic sauce for webpack
+// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
+:export {
+  theme: $--color-primary;
+}

src/styles/element-variables.scss

@@ -22,10 +22,3 @@ $--table-border: 1px solid #dfe6ec;
 /* icon font path, required */
 $--font-path: "~element-ui/lib/theme-chalk/fonts";
 
-@import "~element-ui/packages/theme-chalk/src/index";
-
-// the :export directive is the magic sauce for webpack
-// https://www.bluematador.com/blog/how-to-share-variables-between-js-and-sass
-:export {
-  theme: $--color-primary;
-}

vue.config.js

@@ -1,6 +1,8 @@
 'use strict'
 const path = require('path')
 const defaultSettings = require('./src/settings.js')
+const ThemeColorReplacer = require('webpack-theme-color-replacer')
+const forElementUI = require('webpack-theme-color-replacer/forElementUI')
 
 function resolve(dir) {
   return path.join(__dirname, dir)
@@ -46,7 +48,16 @@ module.exports = {
       alias: {
         '@': resolve('src')
       }
-    }
+    },
+    plugins: [
+      // build css which contains theme colors
+      new ThemeColorReplacer({
+        fileName: 'css/theme-colors.[contenthash:8].css',
+        matchColors: forElementUI.getElementUISeries('#1890ff'),
+        changeSelector: forElementUI.changeSelector
+        // isJsUgly: config.isBuild,
+      })
+    ]
   },
   chainWebpack(config) {
     config.plugins.delete('preload') // TODO: need test