vue2-client 1.3.6 → 1.3.9

package/src/utils/excel/Export2Excel.js

@@ -16,7 +16,7 @@ function generateArray(table) {
       let colspan = cell.getAttribute('colspan');
       let rowspan = cell.getAttribute('rowspan');
       let cellValue = cell.innerText;
-      if (cellValue !== "" && cellValue == +cellValue) cellValue = +cellValue;
+      if (cellValue !== "" && cellValue === +cellValue) cellValue = +cellValue;
 
       //Skip ranges
       ranges.forEach(function (range) {
@@ -52,8 +52,8 @@ function datenum(v, date1904) {
 function sheet_from_array_of_arrays(data, opts) {
   const ws = {};
   const range = {s: {c: 10000000, r: 10000000}, e: {c: 0, r: 0}};
-  for (let R = 0; R != data.length; ++R) {
-    for (let C = 0; C != data[R].length; ++C) {
+  for (let R = 0; R !== data.length; ++R) {
+    for (let C = 0; C !== data[R].length; ++C) {
       if (range.s.r > R) range.s.r = R;
       if (range.s.c > C) range.s.c = C;
       if (range.e.r < R) range.e.r = R;
@@ -86,7 +86,7 @@ function Workbook() {
 function s2ab(s) {
   const buf = new ArrayBuffer(s.length);
   const view = new Uint8Array(buf);
-  for (let i = 0; i != s.length; ++i) view[i] = s.charCodeAt(i) & 0xFF;
+  for (let i = 0; i !== s.length; ++i) view[i] = s.charCodeAt(i) & 0xFF;
   return buf;
 }
 

package/src/utils/formatter.js

@@ -1,68 +1,68 @@
-/**
- * 把对象按照 js配置文件的格式进行格式化
- * @param obj 格式化的对象
- * @param dep 层级，此项无需传值
- * @returns {string}
- */
-function formatConfig (obj, dep) {
-  dep = dep || 1
-  const LN = '\n'; const TAB = '  '
-  let indent = ''
-  for (let i = 0; i < dep; i++) {
-    indent += TAB
-  }
-  let isArray = false; let arrayLastIsObj = false
-  let str = ''; let prefix = '{'; let subfix = '}'
-  if (Array.isArray(obj)) {
-    isArray = true
-    prefix = '['
-    subfix = ']'
-    str = obj.map((item, index) => {
-      let format = ''
-      if (typeof item == 'function') {
-        //
-      } else if (typeof item == 'object') {
-        arrayLastIsObj = true
-        format = `${LN}${indent}${formatConfig(item, dep + 1)},`
-      } else if ((typeof item == 'number' && !isNaN(item)) || typeof item == 'boolean') {
-        format = `${item},`
-      } else if (typeof item == 'string') {
-        format = `'${item}',`
-      }
-      if (index == obj.length - 1) {
-        format = format.substring(0, format.length - 1)
-      } else {
-        arrayLastIsObj = false
-      }
-      return format
-    }).join('')
-  } else if (typeof obj != 'function' && typeof obj == 'object') {
-    str = Object.keys(obj).map((key, index, keys) => {
-      const val = obj[key]
-      let format = ''
-      if (typeof val == 'function') {
-        //
-      } else if (typeof val == 'object') {
-        format = `${LN}${indent}${key}: ${formatConfig(val, dep + 1)},`
-      } else if ((typeof val == 'number' && !isNaN(val)) || typeof val == 'boolean') {
-        format = `${LN}${indent}${key}: ${val},`
-      } else if (typeof val == 'string') {
-        format = `${LN}${indent}${key}: '${val}',`
-      }
-      if (index == keys.length - 1) {
-        format = format.substring(0, format.length - 1)
-      }
-      return format
-    }).join('')
-  }
-  const len = TAB.length
-  if (indent.length >= len) {
-    indent = indent.substring(0, indent.length - len)
-  }
-  if (!isArray || arrayLastIsObj) {
-    subfix = LN + indent + subfix
-  }
-  return `${prefix}${str}${subfix}`
-}
-
-module.exports = { formatConfig }
+/**
+ * 把对象按照 js配置文件的格式进行格式化
+ * @param obj 格式化的对象
+ * @param dep 层级，此项无需传值
+ * @returns {string}
+ */
+function formatConfig (obj, dep) {
+  dep = dep || 1
+  const LN = '\n'; const TAB = '  '
+  let indent = ''
+  for (let i = 0; i < dep; i++) {
+    indent += TAB
+  }
+  let isArray = false; let arrayLastIsObj = false
+  let str = ''; let prefix = '{'; let subfix = '}'
+  if (Array.isArray(obj)) {
+    isArray = true
+    prefix = '['
+    subfix = ']'
+    str = obj.map((item, index) => {
+      let format = ''
+      if (typeof item == 'function') {
+        //
+      } else if (typeof item == 'object') {
+        arrayLastIsObj = true
+        format = `${LN}${indent}${formatConfig(item, dep + 1)},`
+      } else if ((typeof item == 'number' && !isNaN(item)) || typeof item == 'boolean') {
+        format = `${item},`
+      } else if (typeof item == 'string') {
+        format = `'${item}',`
+      }
+      if (index === obj.length - 1) {
+        format = format.substring(0, format.length - 1)
+      } else {
+        arrayLastIsObj = false
+      }
+      return format
+    }).join('')
+  } else if (typeof obj != 'function' && typeof obj == 'object') {
+    str = Object.keys(obj).map((key, index, keys) => {
+      const val = obj[key]
+      let format = ''
+      if (typeof val == 'function') {
+        //
+      } else if (typeof val == 'object') {
+        format = `${LN}${indent}${key}: ${formatConfig(val, dep + 1)},`
+      } else if ((typeof val == 'number' && !isNaN(val)) || typeof val == 'boolean') {
+        format = `${LN}${indent}${key}: ${val},`
+      } else if (typeof val == 'string') {
+        format = `${LN}${indent}${key}: '${val}',`
+      }
+      if (index === keys.length - 1) {
+        format = format.substring(0, format.length - 1)
+      }
+      return format
+    }).join('')
+  }
+  const len = TAB.length
+  if (indent.length >= len) {
+    indent = indent.substring(0, indent.length - len)
+  }
+  if (!isArray || arrayLastIsObj) {
+    subfix = LN + indent + subfix
+  }
+  return `${prefix}${str}${subfix}`
+}
+
+module.exports = { formatConfig }

package/src/utils/i18n.js

@@ -30,7 +30,7 @@ function initI18n (locale, fallback) {
 function generateI18n (lang, routes, valueKey) {
   routes.forEach(route => {
     const keys = getI18nKey(route.fullPath).split('.')
-    const value = valueKey === 'path' ? route[valueKey].split('/').filter(item => !item.startsWith(':') && item != '').join('.') : route[valueKey]
+    const value = valueKey === 'path' ? route[valueKey].split('/').filter(item => !item.startsWith(':') && item !== '').join('.') : route[valueKey]
     lang.assignProps(keys, value)
     if (route.children) {
       generateI18n(lang, route.children, valueKey)

package/src/utils/routerUtil.js

@@ -60,7 +60,7 @@ function parseRoutes (routesConfig, routerMap) {
       routeCfg = { path: (router && router.path) || item, router: item }
     } else if (typeof item === 'object') {
       // 当没有设置路由对象名或者设置的是blank路由对象时, 给空界面, path为名称
-      if (!item.router || item.router == 'blank') {
+      if (!item.router || item.router === 'blank') {
         router = routerMap['blank']
         item.path = item.name
       } else {
@@ -145,7 +145,7 @@ function loadRoutes (routesConfig) {
   const { router, store, i18n } = appOptions
 
   // 刷新页面时,有些全局状态丢失,在此处从本地缓存拿出来赋值
-  if (JSON.stringify(Vue.$login.f) == '{}') {
+  if (JSON.stringify(Vue.$login.f) === '{}') {
     const login = store.getters['account/login']
     Object.assign(Vue.$login, login)
   }
@@ -287,7 +287,7 @@ function formatAuthority (routes, pAuthorities = []) {
  * @returns {*}
  */
 function getI18nKey (path) {
-  const keys = path.split('/').filter(item => !item.startsWith(':') && item != '')
+  const keys = path.split('/').filter(item => !item.startsWith(':') && item !== '')
   keys.push('name')
   return keys.join('.')
 }

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

@@ -4,7 +4,7 @@ function resolveCss (output, srcArr) {
   const regExps = []
   // 提取 resolve 配置中所有的正则配置
   Object.keys(cssResolve).forEach(key => {
-    let isRegExp = false
+    let isRegExp
     let reg = {}
     try {
       reg = eval(key)
@@ -26,7 +26,7 @@ function resolveCss (output, srcArr) {
     // 转换为 css 对象
     const cssObj = parseCssObj(text)
     // 根据selector匹配配置，匹配成功，则按配置处理 css
-    if (cssResolve[cssObj.selector] != undefined) {
+    if (cssResolve[cssObj.selector] !== undefined) {
       const cfg = cssResolve[cssObj.selector]
       if (cfg) {
         outArr.push(cfg.resolve(text, cssObj))
@@ -43,7 +43,7 @@ function resolveCss (output, srcArr) {
         // 未匹配到正则，则设置 cssText 为默认的 css（即不处理）
         cssText = text
       }
-      if (cssText != '') {
+      if (cssText !== '') {
         outArr.push(cssText)
       }
     }

package/src/utils/themeUtil.js

@@ -1,102 +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)
-  const themeColors = [
-    ...replaceColors.mainColors,
-    ...replaceColors.subColors,
-    ...replaceColors.menuColors,
-    ...replaceColors.contentColors,
-    ...replaceColors.rgbColors,
-    ...replaceColors.functionalColors.success,
-    ...replaceColors.functionalColors.warning,
-    ...replaceColors.functionalColors.error
-  ]
-  return themeColors
-}
-
-function changeThemeColor (newColor, $theme) {
-  const promise = client.changer.changeColor({ newColors: getThemeColors(newColor, $theme) })
-  return promise
-}
-
-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)
-  }
-}
-
-/**
- * 获取本地保存的配置
- * @param load {boolean} 是否加载配置中的主题
- * @returns {Object}
- */
-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)
+  }
+}
+
+/**
+ * 获取本地保存的配置
+ * @param load {boolean} 是否加载配置中的主题
+ * @returns {Object}
+ */
+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
+}

package/src/utils/util.js

@@ -27,8 +27,8 @@ const timeList = [
  * 数组去空值
  */
 export function arrRemoveEmpty (arr) {
-  for (var i = 0; i < arr.length; i++) {
-    if (arr[i] == '' || typeof (arr[i]) == 'undefined') {
+  for (let i = 0; i < arr.length; i++) {
+    if (arr[i] === '' || typeof (arr[i]) == 'undefined') {
       arr.splice(i, 1)
       i--
     }

package/vue.config.js

@@ -23,24 +23,14 @@ module.exports = {
         ws: false,
         changeOrigin: true
       },
-      '/af-system/entity': {
-        pathRewrite: { '^/af-system/entity': '/rs/entity' },
+      '/api': {
+        pathRewrite: { '^/api/af-system/': '/rs/' },
         target: local,
         changeOrigin: true
       },
-      '/af-system/upload': {
-        pathRewrite: { '^/af-system/upload': '/rs/file/upload' },
-        target: local,
-        changeOrigin: true
-      },
-      '/af-system/resource': {
-        pathRewrite: { '^/af-system/resource': '/rs/resource' },
-        target: local,
-        changeOrigin: true
-      },
-      '/af-system': {
-        pathRewrite: { '^/af-system': '/rs/logic' },
-        target: local,
+      '/resource': {
+        pathRewrite: { '^/resource': '/' },
+        target: 'http://127.0.0.1:4789',
         changeOrigin: true
       }
     }

package/vue2-client.iml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>