vue2-client 1.7.0 → 1.7.1

package/src/utils/theme-color-replacer-extend.js

@@ -1,91 +1,91 @@
-const { cssResolve } = require('../config/replacer')
-// 修正 webpack-theme-color-replacer 插件提取的 css 结果
-function resolveCss (output, srcArr) {
-  const regExps = []
-  // 提取 resolve 配置中所有的正则配置
-  Object.keys(cssResolve).forEach(key => {
-    let isRegExp
-    let reg = {}
-    try {
-      reg = eval(key)
-      isRegExp = reg instanceof RegExp
-    } catch (e) {
-      isRegExp = false
-    }
-    if (isRegExp) {
-      regExps.push([reg, cssResolve[key]])
-    }
-  })
-
-  // 去重
-  srcArr = dropDuplicate(srcArr)
-
-  // 处理 css
-  const outArr = []
-  srcArr.forEach(text => {
-    // 转换为 css 对象
-    const cssObj = parseCssObj(text)
-    // 根据selector匹配配置，匹配成功，则按配置处理 css
-    if (cssResolve[cssObj.selector] !== undefined) {
-      const cfg = cssResolve[cssObj.selector]
-      if (cfg) {
-        outArr.push(cfg.resolve(text, cssObj))
-      }
-    } else {
-      let cssText = ''
-      // 匹配不成功，则测试是否有匹配的正则配置，有则按正则对应的配置处理
-      for (const regExp of regExps) {
-        if (regExp[0].test(cssObj.selector)) {
-          const cssCfg = regExp[1]
-          cssText = cssCfg ? cssCfg.resolve(text, cssObj) : ''
-          break
-        }
-        // 未匹配到正则，则设置 cssText 为默认的 css（即不处理）
-        cssText = text
-      }
-      if (cssText !== '') {
-        outArr.push(cssText)
-      }
-    }
-  })
-  output = outArr.join('\n')
-  return output
-}
-
-// 数组去重
-function dropDuplicate (arr) {
-  const map = {}
-  const r = []
-  for (const s of arr) {
-    if (!map[s]) {
-      r.push(s)
-      map[s] = 1
-    }
-  }
-  return r
-}
-
-/**
- * 从字符串解析 css 对象
- * @param cssText
- * @returns {{
- *   name: String,
- *   rules: Array[String],
- *   toText: function
- * }}
- */
-function parseCssObj (cssText) {
-  const css = {}
-  const ruleIndex = cssText.indexOf('{')
-  css.selector = cssText.substring(0, ruleIndex)
-  const ruleBody = cssText.substring(ruleIndex + 1, cssText.length - 1)
-  css.rules = ruleBody.split(';')
-  css.toText = function () {
-    let body = ''
-    this.rules.forEach(item => { body += item + ';' })
-    return `${this.selector}{${body}}`
-  }
-  return css
-}
-
-module.exports = { resolveCss }
+const { cssResolve } = require('../config/replacer')
+// 修正 webpack-theme-color-replacer 插件提取的 css 结果
+function resolveCss (output, srcArr) {
+  const regExps = []
+  // 提取 resolve 配置中所有的正则配置
+  Object.keys(cssResolve).forEach(key => {
+    let isRegExp
+    let reg = {}
+    try {
+      reg = eval(key)
+      isRegExp = reg instanceof RegExp
+    } catch (e) {
+      isRegExp = false
+    }
+    if (isRegExp) {
+      regExps.push([reg, cssResolve[key]])
+    }
+  })
+
+  // 去重
+  srcArr = dropDuplicate(srcArr)
+
+  // 处理 css
+  const outArr = []
+  srcArr.forEach(text => {
+    // 转换为 css 对象
+    const cssObj = parseCssObj(text)
+    // 根据selector匹配配置，匹配成功，则按配置处理 css
+    if (cssResolve[cssObj.selector] !== undefined) {
+      const cfg = cssResolve[cssObj.selector]
+      if (cfg) {
+        outArr.push(cfg.resolve(text, cssObj))
+      }
+    } else {
+      let cssText = ''
+      // 匹配不成功，则测试是否有匹配的正则配置，有则按正则对应的配置处理
+      for (const regExp of regExps) {
+        if (regExp[0].test(cssObj.selector)) {
+          const cssCfg = regExp[1]
+          cssText = cssCfg ? cssCfg.resolve(text, cssObj) : ''
+          break
+        }
+        // 未匹配到正则，则设置 cssText 为默认的 css（即不处理）
+        cssText = text
+      }
+      if (cssText !== '') {
+        outArr.push(cssText)
+      }
+    }
+  })
+  output = outArr.join('\n')
+  return output
+}
+
+// 数组去重
+function dropDuplicate (arr) {
+  const map = {}
+  const r = []
+  for (const s of arr) {
+    if (!map[s]) {
+      r.push(s)
+      map[s] = 1
+    }
+  }
+  return r
+}
+
+/**
+ * 从字符串解析 css 对象
+ * @param cssText
+ * @returns {{
+ *   name: String,
+ *   rules: Array[String],
+ *   toText: function
+ * }}
+ */
+function parseCssObj (cssText) {
+  const css = {}
+  const ruleIndex = cssText.indexOf('{')
+  css.selector = cssText.substring(0, ruleIndex)
+  const ruleBody = cssText.substring(ruleIndex + 1, cssText.length - 1)
+  css.rules = ruleBody.split(';')
+  css.toText = function () {
+    let body = ''
+    this.rules.forEach(item => { body += item + ';' })
+    return `${this.selector}{${body}}`
+  }
+  return css
+}
+
+module.exports = { resolveCss }

package/src/utils/themeUtil.js

@@ -1,100 +1,100 @@
-const client = require('webpack-theme-color-replacer/client')
-const { theme } = require('../config')
-const { getMenuColors, getAntdColors, getThemeToggleColors, getFunctionalColors } = require('../utils/colors')
-const { ANTD } = require('../config/default')
-
-function getThemeColors (color, $theme) {
-  const _color = color || theme.color
-  const mode = $theme || theme.mode
-  const replaceColors = getThemeToggleColors(_color, mode)
-  return [
-    ...replaceColors.mainColors,
-    ...replaceColors.subColors,
-    ...replaceColors.menuColors,
-    ...replaceColors.contentColors,
-    ...replaceColors.rgbColors,
-    ...replaceColors.functionalColors.success,
-    ...replaceColors.functionalColors.warning,
-    ...replaceColors.functionalColors.error
-  ]
-}
-
-function changeThemeColor (newColor, $theme) {
-  return client.changer.changeColor({ newColors: getThemeColors(newColor, $theme) })
-}
-
-function modifyVars (color) {
-  const _color = color || theme.color
-  const palettes = getAntdColors(_color, theme.mode)
-  const menuColors = getMenuColors(_color, theme.mode)
-  const { success, warning, error } = getFunctionalColors(theme.mode)
-  const primary = palettes[5]
-  return {
-    'primary-color': primary,
-    'primary-1': palettes[0],
-    'primary-2': palettes[1],
-    'primary-3': palettes[2],
-    'primary-4': palettes[3],
-    'primary-5': palettes[4],
-    'primary-6': palettes[5],
-    'primary-7': palettes[6],
-    'primary-8': palettes[7],
-    'primary-9': palettes[8],
-    'primary-10': palettes[9],
-    'info-color': primary,
-    'success-color': success[5],
-    'warning-color': warning[5],
-    'error-color': error[5],
-    'alert-info-bg-color': palettes[0],
-    'alert-info-border-color': palettes[2],
-    'alert-success-bg-color': success[0],
-    'alert-success-border-color': success[2],
-    'alert-warning-bg-color': warning[0],
-    'alert-warning-border-color': warning[2],
-    'alert-error-bg-color': error[0],
-    'alert-error-border-color': error[2],
-    'processing-color': primary,
-    'menu-dark-submenu-bg': menuColors[0],
-    'layout-header-background': menuColors[1],
-    'layout-trigger-background': menuColors[2],
-    'btn-danger-bg': error[4],
-    'btn-danger-border': error[4],
-    ...ANTD.theme[theme.mode]
-  }
-}
-
-function loadLocalTheme (localSetting) {
-  if (localSetting && localSetting.theme) {
-    let { color, mode } = localSetting.theme
-    color = color || theme.color
-    mode = mode || theme.mode
-    changeThemeColor(color, mode)
-  }
-}
-
-/**
- * 获取本地保存的配置
- * @returns {Object}
- * @param loadTheme
- */
-function getLocalSetting (loadTheme) {
-  let localSetting = {}
-  try {
-    const localSettingStr = localStorage.getItem(process.env.VUE_APP_SETTING_KEY)
-    localSetting = JSON.parse(localSettingStr)
-  } catch (e) {
-    console.error(e)
-  }
-  if (loadTheme) {
-    loadLocalTheme(localSetting)
-  }
-  return localSetting
-}
-
-module.exports = {
-  getThemeColors,
-  changeThemeColor,
-  modifyVars,
-  loadLocalTheme,
-  getLocalSetting
-}
+const client = require('webpack-theme-color-replacer/client')
+const { theme } = require('../config')
+const { getMenuColors, getAntdColors, getThemeToggleColors, getFunctionalColors } = require('../utils/colors')
+const { ANTD } = require('../config/default')
+
+function getThemeColors (color, $theme) {
+  const _color = color || theme.color
+  const mode = $theme || theme.mode
+  const replaceColors = getThemeToggleColors(_color, mode)
+  return [
+    ...replaceColors.mainColors,
+    ...replaceColors.subColors,
+    ...replaceColors.menuColors,
+    ...replaceColors.contentColors,
+    ...replaceColors.rgbColors,
+    ...replaceColors.functionalColors.success,
+    ...replaceColors.functionalColors.warning,
+    ...replaceColors.functionalColors.error
+  ]
+}
+
+function changeThemeColor (newColor, $theme) {
+  return client.changer.changeColor({ newColors: getThemeColors(newColor, $theme) })
+}
+
+function modifyVars (color) {
+  const _color = color || theme.color
+  const palettes = getAntdColors(_color, theme.mode)
+  const menuColors = getMenuColors(_color, theme.mode)
+  const { success, warning, error } = getFunctionalColors(theme.mode)
+  const primary = palettes[5]
+  return {
+    'primary-color': primary,
+    'primary-1': palettes[0],
+    'primary-2': palettes[1],
+    'primary-3': palettes[2],
+    'primary-4': palettes[3],
+    'primary-5': palettes[4],
+    'primary-6': palettes[5],
+    'primary-7': palettes[6],
+    'primary-8': palettes[7],
+    'primary-9': palettes[8],
+    'primary-10': palettes[9],
+    'info-color': primary,
+    'success-color': success[5],
+    'warning-color': warning[5],
+    'error-color': error[5],
+    'alert-info-bg-color': palettes[0],
+    'alert-info-border-color': palettes[2],
+    'alert-success-bg-color': success[0],
+    'alert-success-border-color': success[2],
+    'alert-warning-bg-color': warning[0],
+    'alert-warning-border-color': warning[2],
+    'alert-error-bg-color': error[0],
+    'alert-error-border-color': error[2],
+    'processing-color': primary,
+    'menu-dark-submenu-bg': menuColors[0],
+    'layout-header-background': menuColors[1],
+    'layout-trigger-background': menuColors[2],
+    'btn-danger-bg': error[4],
+    'btn-danger-border': error[4],
+    ...ANTD.theme[theme.mode]
+  }
+}
+
+function loadLocalTheme (localSetting) {
+  if (localSetting && localSetting.theme) {
+    let { color, mode } = localSetting.theme
+    color = color || theme.color
+    mode = mode || theme.mode
+    changeThemeColor(color, mode)
+  }
+}
+
+/**
+ * 获取本地保存的配置
+ * @returns {Object}
+ * @param loadTheme
+ */
+function getLocalSetting (loadTheme) {
+  let localSetting = {}
+  try {
+    const localSettingStr = localStorage.getItem(process.env.VUE_APP_SETTING_KEY)
+    localSetting = JSON.parse(localSettingStr)
+  } catch (e) {
+    console.error(e)
+  }
+  if (loadTheme) {
+    loadLocalTheme(localSetting)
+  }
+  return localSetting
+}
+
+module.exports = {
+  getThemeColors,
+  changeThemeColor,
+  modifyVars,
+  loadLocalTheme,
+  getLocalSetting
+}