修复：切换主题颜色中间内容颜色未生效

ruoyi-ui/src/assets/styles/ruoyi.scss

@@ -135,11 +135,7 @@
 }
 
 /** 表格更多操作下拉样式 */
-.el-table .el-dropdown-link {
+.el-button+.el-dropdown{margin-left: 10px;}
-	cursor: pointer;
-	color: #409EFF;
-	margin-left: 5px;
-}
 
 .el-table .el-dropdown, .el-icon-arrow-down {
 	font-size: 12px;

ruoyi-ui/src/components/ThemePicker/index.vue

@@ -8,13 +8,9 @@
 </template>
 
 <script>
-const version = require('element-ui/package.json').version // element-ui version from node_modules
-const ORIGINAL_THEME = '#409EFF' // default color
-
 export default {
   data() {
     return {
-      chalk: '', // content of theme-chalk css
       theme: ''
     }
   },
@@ -30,127 +26,14 @@ export default {
       },
       immediate: true
     },
-    async theme(val) {
+    theme(val) {
-      await this.setTheme(val)
+      this.setTheme(val)
     }
   },
-  created() {
-    if(this.defaultTheme !== ORIGINAL_THEME) {
-      this.setTheme(this.defaultTheme)
-    }
-  },
-
   methods: {
-    async setTheme(val) {
+    setTheme(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('#', ''))
-
-      const getHandler = (variable, id) => {
-        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
-        }
-      }
-
-      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)
     },
-
-    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>

ruoyi-ui/src/store/modules/settings.js

@@ -3,6 +3,10 @@ import defaultSettings from '@/settings'
 const { sideTheme, showSettings, topNav, tagsView, fixedHeader, sidebarLogo, dynamicTitle } = defaultSettings
 
 const storageSetting = JSON.parse(localStorage.getItem('layout-setting')) || ''
+
+import Vue from 'vue'
+storageSetting.theme&&setThemeColor(storageSetting.theme)
+
 const state = {
   title: '',
   theme: storageSetting.theme || '#409EFF',
@@ -18,6 +22,9 @@ const mutations = {
   CHANGE_SETTING: (state, { key, value }) => {
     if (state.hasOwnProperty(key)) {
       state[key] = value
+      if(key==='theme'){
+        setThemeColor(value)
+      }
     }
   }
 }
@@ -33,6 +40,121 @@ const actions = {
   }
 }
 
+function setThemeColor(val,oldColor){
+  let chalk=''
+  let theme=''
+  const ORIGINAL_THEME = '#409EFF'
+  const version = require('element-ui/package.json').version
+  setTheme(val)
+  async function setTheme(val) {
+    const oldVal = chalk ? theme : ORIGINAL_THEME
+    if (typeof val !== 'string') return
+    const themeCluster = getThemeCluster(val.replace('#', ''))
+    const originalCluster = getThemeCluster(oldVal.replace('#', ''))
+
+    const getHandler = (variable, id) => {
+      return () => {
+        const originalCluster = getThemeCluster(ORIGINAL_THEME.replace('#', ''))
+        const newStyle = updateStyle(Vue[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
+      }
+    }
+
+    if (!chalk) {
+      const url = `https://unpkg.com/element-ui@${version}/lib/theme-chalk/index.css`
+      await 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 = updateStyle(innerText, originalCluster, themeCluster)
+    })
+  }
+
+  function updateStyle(style, oldCluster, newCluster) {
+    let newStyle = style
+    oldCluster.forEach((color, index) => {
+      newStyle = newStyle.replace(new RegExp(color, 'ig'), newCluster[index])
+    })
+    return newStyle
+  }
+
+  function getCSSString(url, variable) {
+    return new Promise(resolve => {
+      const xhr = new XMLHttpRequest()
+      xhr.onreadystatechange = () => {
+        if (xhr.readyState === 4 && xhr.status === 200) {
+          Vue[variable] = xhr.responseText.replace(/@font-face{[^}]+}/, '')
+          resolve()
+        }
+      }
+      xhr.open('GET', url)
+      xhr.send()
+    })
+  }
+
+  function 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
+  }
+}
+
+
 export default {
   namespaced: true,
   state,

ruoyi-ui/src/views/monitor/job/index.vue

@@ -129,9 +129,7 @@
             v-hasPermi="['monitor:job:remove']"
           >删除</el-button>
           <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['monitor:job:changeStatus', 'monitor:job:query']">
-            <span class="el-dropdown-link">
+            <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
-              <i class="el-icon-d-arrow-right el-icon--right"></i>更多
-            </span>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item command="handleRun" icon="el-icon-caret-right"
                 v-hasPermi="['monitor:job:changeStatus']">执行一次</el-dropdown-item>

ruoyi-ui/src/views/system/role/index.vue

@@ -135,9 +135,7 @@
             v-hasPermi="['system:role:remove']"
           >删除</el-button>
           <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:role:edit']">
-            <span class="el-dropdown-link">
+            <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
-              <i class="el-icon-d-arrow-right el-icon--right"></i>更多
-            </span>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item command="handleDataScope" icon="el-icon-circle-check"
                 v-hasPermi="['system:role:edit']">数据权限</el-dropdown-item>

ruoyi-ui/src/views/system/user/index.vue

@@ -179,9 +179,7 @@
                 v-hasPermi="['system:user:remove']"
               >删除</el-button>
               <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)" v-hasPermi="['system:user:resetPwd', 'system:user:edit']">
-                <span class="el-dropdown-link">
+                <el-button size="mini" type="text" icon="el-icon-d-arrow-right">更多</el-button>
-                  <i class="el-icon-d-arrow-right el-icon--right"></i>更多
-                </span>
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item command="handleResetPwd" icon="el-icon-key"
                     v-hasPermi="['system:user:resetPwd']">重置密码</el-dropdown-item>