vue2-client 1.6.49 → 1.7.0

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
+}

package/src/utils/util.js

@@ -1,230 +1,230 @@
-import enquireJs from 'enquire.js'
-
-const timeList = [
-  {
-    CN: '早上好',
-    HK: '早晨啊',
-    US: 'Good morning'
-  }, {
-    CN: '上午好',
-    HK: '上午好',
-    US: 'Good morning'
-  }, {
-    CN: '中午好',
-    HK: '中午好',
-    US: 'Good afternoon'
-  }, {
-    CN: '下午好',
-    HK: '下午好',
-    US: 'Good afternoon'
-  }, {
-    CN: '晚上好',
-    HK: '晚上好',
-    US: 'Good evening'
-  }
-]
-/**
- * 数组去空值
- */
-export function arrRemoveEmpty (arr) {
-  for (let i = 0; i < arr.length; i++) {
-    if (arr[i] === '' || typeof (arr[i]) == 'undefined') {
-      arr.splice(i, 1)
-      i--
-    }
-  }
-  return arr
-}
-
-export function isDef (v) {
-  return v !== undefined && v !== null
-}
-
-export function formatDate (dateStr, fmt) {
-  if (dateStr == null) {
-    return '--'
-  }
-  let date
-  if (dateStr === 'now') {
-    date = new Date()
-  } else {
-    date = new Date(dateStr)
-  }
-  const o = {
-    'M+': date.getMonth() + 1,
-    'd+': date.getDate(),
-    'h+': date.getHours(),
-    'm+': date.getMinutes(),
-    's+': date.getSeconds(),
-    'q+': Math.floor((date.getMonth() + 3) / 3),
-    'S': date.getMilliseconds()
-  }
-  if (!fmt) {
-    fmt = 'yyyy-MM-dd hh:mm:ss'
-  }
-  if (/(y+)/.test(fmt)) {
-    fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length))
-  }
-  for (const k in o) {
-    if (new RegExp('(' + k + ')').test(fmt)) {
-      fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)))
-    }
-  }
-  return fmt
-}
-
-export function uuid () {
-    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-      const r = Math.random() * 16 | 0
-      const v = c === 'x' ? r : (r & 0x3 | 0x8)
-      return v.toString(16)
-    })
-}
-
-export function timeCompare (date1, date2) {
-  const date11 = new Date(date1)
-  const date22 = new Date(date2)
-  return date11.time > date22.time ? 1 : -1
-}
-
-export function timeFix () {
-  const time = new Date()
-  const hour = time.getHours()
-  return hour < 9
-    ? timeList[0] : (hour <= 11 ? timeList[1] : (hour <= 13 ? timeList[2] : (hour <= 20 ? timeList[3] : timeList[4])))
-}
-
-/**
- * Remove an item from an array.
- */
-export function remove (arr, item) {
-  if (arr.length) {
-    const index = arr.indexOf(item)
-    if (index > -1) {
-      return arr.splice(index, 1)
-    }
-  }
-}
-
-export function isRegExp (v) {
-  return _toString.call(v) === '[object RegExp]'
-}
-
-export function enquireScreen (call) {
-  const handler = {
-    match: function () {
-      call && call(true)
-    },
-    unmatch: function () {
-      call && call(false)
-    }
-  }
-  enquireJs.register('only screen and (max-width: 767.99px)', handler)
-}
-
-export function showXml (str) {
-  let text = str
-
-  // 去掉多余的空格
-  text = '\n' + text.replace(/(<\w+)(\s.*?>)/g, function ($0, name, props) {
-    return name + props.replace(/\s+(\w+=)/g, ' $1')
-  }).replace(/>\s*?</g, '>\n<')
-
-  // 把注释编码
-  text = text.replace(/\n/g, '\r').replace(/<!--(.+?)-->/g, function ($0, text) {
-    return '<!--' + escape(text) + '-->'
-  }).replace(/\r/g, '\n')
-
-  // 调整格式
-  const rgx = /\n(<(([^?]).+?)(?:\s|\s*?>|\s*?(\/)>)(?:.*?(?:(\/)>|<(\/)\2>))?)/mg
-  const nodeStack = []
-  const output = text.replace(rgx, function ($0, all, name, isBegin, isCloseFull1, isCloseFull2, isFull1, isFull2) {
-    const isClosed = (isCloseFull1 === '/') || (isCloseFull2 === '/') || (isFull1 === '/') || (isFull2 === '/')
-    let prefix
-    if (isBegin === '!') {
-      prefix = getPrefix(nodeStack.length)
-    } else {
-      if (isBegin !== '/') {
-        prefix = getPrefix(nodeStack.length)
-        if (!isClosed) {
-          nodeStack.push(name)
-        }
-      } else {
-        nodeStack.pop()
-        prefix = getPrefix(nodeStack.length)
-      }
-    }
-    return '\n' + prefix + all
-  })
-  let outputText = output.substring(1)
-
-  // 把注释还原并解码，调格式
-  outputText = outputText.replace(/\n/g, '\r').replace(/(\s*)<!--(.+?)-->/g, function ($0, prefix, text) {
-    if (prefix.charAt(0) === '\r') { prefix = prefix.substring(1) }
-    text = unescape(text).replace(/\r/g, '\n')
-    return '\n' + prefix + '<!--' + text.replace(/^\s*/mg, prefix) + '-->'
-  })
-  // alert(outputText);
-
-  outputText =	outputText.replace(/\s+$/g, '').replace(/\r/g, '\r\n')
-
-  return outputText
-}
-
-function getPrefix (prefixIndex) {
-  const span = '    '
-  const output = []
-  for (let i = 0; i < prefixIndex; ++i) {
-    output.push(span)
-  }
-
-  return output.join('')
-}
-
-/**
- * 构造树型结构数据
- * [label,value,children]
- */
-export function handleTree (data, id, parentId, children) {
-  const config = {
-    id: id || 'id',
-    parentId: parentId || 'parent_id',
-    childrenList: children || 'children'
-  }
-  const childrenListMap = {}
-  const nodeIds = {}
-  const tree = []
-  for (const d of data) {
-    const parentId = d[config.parentId]
-    if (childrenListMap[parentId] == null) {
-      childrenListMap[parentId] = []
-    }
-    nodeIds[d[config.id]] = d
-    childrenListMap[parentId].push(d)
-  }
-  for (const d of data) {
-    const parentId = d[config.parentId]
-    if (nodeIds[parentId] == null) {
-      tree.push(d)
-    }
-  }
-  for (const t of tree) {
-    adaptToChildrenList(t)
-  }
-
-  function adaptToChildrenList (o) {
-    o.label = o.name
-    o.value = o.name
-    if (childrenListMap[o[config.id]] !== null) {
-      o[config.childrenList] = childrenListMap[o[config.id]]
-    }
-    if (o[config.childrenList]) {
-      for (const c of o[config.childrenList]) {
-        adaptToChildrenList(c)
-      }
-    }
-  }
-  return tree
-}
-
-const _toString = Object.prototype.toString
+import enquireJs from 'enquire.js'
+
+const timeList = [
+  {
+    CN: '早上好',
+    HK: '早晨啊',
+    US: 'Good morning'
+  }, {
+    CN: '上午好',
+    HK: '上午好',
+    US: 'Good morning'
+  }, {
+    CN: '中午好',
+    HK: '中午好',
+    US: 'Good afternoon'
+  }, {
+    CN: '下午好',
+    HK: '下午好',
+    US: 'Good afternoon'
+  }, {
+    CN: '晚上好',
+    HK: '晚上好',
+    US: 'Good evening'
+  }
+]
+/**
+ * 数组去空值
+ */
+export function arrRemoveEmpty (arr) {
+  for (let i = 0; i < arr.length; i++) {
+    if (arr[i] === '' || typeof (arr[i]) == 'undefined') {
+      arr.splice(i, 1)
+      i--
+    }
+  }
+  return arr
+}
+
+export function isDef (v) {
+  return v !== undefined && v !== null
+}
+
+export function formatDate (dateStr, fmt) {
+  if (dateStr == null) {
+    return '--'
+  }
+  let date
+  if (dateStr === 'now') {
+    date = new Date()
+  } else {
+    date = new Date(dateStr)
+  }
+  const o = {
+    'M+': date.getMonth() + 1,
+    'd+': date.getDate(),
+    'h+': date.getHours(),
+    'm+': date.getMinutes(),
+    's+': date.getSeconds(),
+    'q+': Math.floor((date.getMonth() + 3) / 3),
+    'S': date.getMilliseconds()
+  }
+  if (!fmt) {
+    fmt = 'yyyy-MM-dd hh:mm:ss'
+  }
+  if (/(y+)/.test(fmt)) {
+    fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length))
+  }
+  for (const k in o) {
+    if (new RegExp('(' + k + ')').test(fmt)) {
+      fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (('00' + o[k]).substr(('' + o[k]).length)))
+    }
+  }
+  return fmt
+}
+
+export function uuid () {
+    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+      const r = Math.random() * 16 | 0
+      const v = c === 'x' ? r : (r & 0x3 | 0x8)
+      return v.toString(16)
+    })
+}
+
+export function timeCompare (date1, date2) {
+  const date11 = new Date(date1)
+  const date22 = new Date(date2)
+  return date11.time > date22.time ? 1 : -1
+}
+
+export function timeFix () {
+  const time = new Date()
+  const hour = time.getHours()
+  return hour < 9
+    ? timeList[0] : (hour <= 11 ? timeList[1] : (hour <= 13 ? timeList[2] : (hour <= 20 ? timeList[3] : timeList[4])))
+}
+
+/**
+ * Remove an item from an array.
+ */
+export function remove (arr, item) {
+  if (arr.length) {
+    const index = arr.indexOf(item)
+    if (index > -1) {
+      return arr.splice(index, 1)
+    }
+  }
+}
+
+export function isRegExp (v) {
+  return _toString.call(v) === '[object RegExp]'
+}
+
+export function enquireScreen (call) {
+  const handler = {
+    match: function () {
+      call && call(true)
+    },
+    unmatch: function () {
+      call && call(false)
+    }
+  }
+  enquireJs.register('only screen and (max-width: 767.99px)', handler)
+}
+
+export function showXml (str) {
+  let text = str
+
+  // 去掉多余的空格
+  text = '\n' + text.replace(/(<\w+)(\s.*?>)/g, function ($0, name, props) {
+    return name + props.replace(/\s+(\w+=)/g, ' $1')
+  }).replace(/>\s*?</g, '>\n<')
+
+  // 把注释编码
+  text = text.replace(/\n/g, '\r').replace(/<!--(.+?)-->/g, function ($0, text) {
+    return '<!--' + escape(text) + '-->'
+  }).replace(/\r/g, '\n')
+
+  // 调整格式
+  const rgx = /\n(<(([^?]).+?)(?:\s|\s*?>|\s*?(\/)>)(?:.*?(?:(\/)>|<(\/)\2>))?)/mg
+  const nodeStack = []
+  const output = text.replace(rgx, function ($0, all, name, isBegin, isCloseFull1, isCloseFull2, isFull1, isFull2) {
+    const isClosed = (isCloseFull1 === '/') || (isCloseFull2 === '/') || (isFull1 === '/') || (isFull2 === '/')
+    let prefix
+    if (isBegin === '!') {
+      prefix = getPrefix(nodeStack.length)
+    } else {
+      if (isBegin !== '/') {
+        prefix = getPrefix(nodeStack.length)
+        if (!isClosed) {
+          nodeStack.push(name)
+        }
+      } else {
+        nodeStack.pop()
+        prefix = getPrefix(nodeStack.length)
+      }
+    }
+    return '\n' + prefix + all
+  })
+  let outputText = output.substring(1)
+
+  // 把注释还原并解码，调格式
+  outputText = outputText.replace(/\n/g, '\r').replace(/(\s*)<!--(.+?)-->/g, function ($0, prefix, text) {
+    if (prefix.charAt(0) === '\r') { prefix = prefix.substring(1) }
+    text = unescape(text).replace(/\r/g, '\n')
+    return '\n' + prefix + '<!--' + text.replace(/^\s*/mg, prefix) + '-->'
+  })
+  // alert(outputText);
+
+  outputText =	outputText.replace(/\s+$/g, '').replace(/\r/g, '\r\n')
+
+  return outputText
+}
+
+function getPrefix (prefixIndex) {
+  const span = '    '
+  const output = []
+  for (let i = 0; i < prefixIndex; ++i) {
+    output.push(span)
+  }
+
+  return output.join('')
+}
+
+/**
+ * 构造树型结构数据
+ * [label,value,children]
+ */
+export function handleTree (data, id, parentId, children) {
+  const config = {
+    id: id || 'id',
+    parentId: parentId || 'parent_id',
+    childrenList: children || 'children'
+  }
+  const childrenListMap = {}
+  const nodeIds = {}
+  const tree = []
+  for (const d of data) {
+    const parentId = d[config.parentId]
+    if (childrenListMap[parentId] == null) {
+      childrenListMap[parentId] = []
+    }
+    nodeIds[d[config.id]] = d
+    childrenListMap[parentId].push(d)
+  }
+  for (const d of data) {
+    const parentId = d[config.parentId]
+    if (nodeIds[parentId] == null) {
+      tree.push(d)
+    }
+  }
+  for (const t of tree) {
+    adaptToChildrenList(t)
+  }
+
+  function adaptToChildrenList (o) {
+    o.label = o.name
+    o.value = o.name
+    if (childrenListMap[o[config.id]] !== null) {
+      o[config.childrenList] = childrenListMap[o[config.id]]
+    }
+    if (o[config.childrenList]) {
+      for (const c of o[config.childrenList]) {
+        adaptToChildrenList(c)
+      }
+    }
+  }
+  return tree
+}
+
+const _toString = Object.prototype.toString