vue2-client 1.5.21 → 1.5.22

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

package/vue.config.js

@@ -1,106 +1,106 @@
-const path = require('path')
-const webpack = require('webpack')
-const ThemeColorReplacer = require('webpack-theme-color-replacer')
-const { getThemeColors, modifyVars } = require('./src/utils/themeUtil')
-const { resolveCss } = require('./src/utils/theme-color-replacer-extend')
-const CompressionWebpackPlugin = require('compression-webpack-plugin')
-
-const productionGzipExtensions = ['js', 'css']
-const isProd = process.env.NODE_ENV === 'production'
-
-const server = 'http://61.134.55.234:8405'
-// const local = 'http://localhost:8445/webmeter'
-const local = 'http://localhost:8445/webmeter'
-// const local = 'http://localhost:8080'
-
-module.exports = {
-  devServer: {
-    // development server port 8000
-    port: 8001,
-    // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
-    proxy: {
-      '/rs': {
-        target: server,
-        ws: false,
-        changeOrigin: true
-      },
-      '/auth': {
-        pathRewrite: { '^/auth/': '/rs/auth/' },
-        target: local,
-        changeOrigin: true
-      },
-      '/api': {
-        pathRewrite: { '^/api/af-system/': '/rs/' },
-        // pathRewrite: { '^/api': '/' },
-        target: local,
-        changeOrigin: true
-      },
-      '/resource': {
-        pathRewrite: { '^/resource': '/' },
-        target: 'http://127.0.0.1:4789',
-        changeOrigin: true
-      }
-    }
-  },
-  pluginOptions: {
-    'style-resources-loader': {
-      preProcessor: 'less',
-      patterns: [path.resolve(__dirname, './src/theme/theme.less')]
-    }
-  },
-  configureWebpack: config => {
-    config.entry.app = ['babel-polyfill', 'whatwg-fetch', './src/main.js']
-    config.performance = {
-      hints: false
-    }
-    config.plugins.push(
-      new ThemeColorReplacer({
-        fileName: 'css/theme-colors-[contenthash:8].css',
-        matchColors: getThemeColors(),
-        injectCss: true,
-        resolveCss
-      })
-    )
-    // Ignore all locale files of moment.js
-    config.plugins.push(new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/))
-    // 生产环境下将资源压缩成gzip格式
-    if (isProd) {
-      // add `CompressionWebpack` plugin to webpack plugins
-      config.plugins.push(new CompressionWebpackPlugin({
-        algorithm: 'gzip',
-        test: new RegExp('\\.(' + productionGzipExtensions.join('|') + ')$'),
-        threshold: 10240,
-        minRatio: 0.8
-      }))
-    }
-    // if prod, add externals
-    // if (isProd) {
-    //   config.externals = assetsCDN.externals
-    // }
-  },
-  chainWebpack: config => {
-    // 生产环境下关闭css压缩的 colormin 项，因为此项优化与主题色替换功能冲突
-    if (isProd) {
-      config.plugin('optimize-css')
-        .tap(args => {
-          args[0].cssnanoOptions.preset[1].colormin = false
-          return args
-        })
-    }
-    config.resolve.alias.set('@vue2-client', path.resolve(__dirname, 'src'))
-  },
-  css: {
-    loaderOptions: {
-      less: {
-        lessOptions: {
-          modifyVars: modifyVars(),
-          javascriptEnabled: true
-        }
-      }
-    }
-  },
-  publicPath: process.env.VUE_APP_PUBLIC_PATH,
-  outputDir: 'dist',
-  assetsDir: 'static',
-  productionSourceMap: false
-}
+const path = require('path')
+const webpack = require('webpack')
+const ThemeColorReplacer = require('webpack-theme-color-replacer')
+const { getThemeColors, modifyVars } = require('./src/utils/themeUtil')
+const { resolveCss } = require('./src/utils/theme-color-replacer-extend')
+const CompressionWebpackPlugin = require('compression-webpack-plugin')
+
+const productionGzipExtensions = ['js', 'css']
+const isProd = process.env.NODE_ENV === 'production'
+
+const server = 'http://61.134.55.234:8405'
+// const local = 'http://localhost:8445/webmeter'
+const local = 'http://61.134.55.234:8456/webmeter'
+// const local = 'http://localhost:8080'
+
+module.exports = {
+  devServer: {
+    // development server port 8000
+    port: 8001,
+    // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
+    proxy: {
+      '/rs': {
+        target: server,
+        ws: false,
+        changeOrigin: true
+      },
+      '/auth': {
+        pathRewrite: { '^/auth/': '/rs/auth/' },
+        target: local,
+        changeOrigin: true
+      },
+      '/api': {
+        pathRewrite: { '^/api/af-system/': '/rs/' },
+        // pathRewrite: { '^/api': '/' },
+        target: local,
+        changeOrigin: true
+      },
+      '/resource': {
+        pathRewrite: { '^/resource': '/' },
+        target: 'http://127.0.0.1:4789',
+        changeOrigin: true
+      }
+    }
+  },
+  pluginOptions: {
+    'style-resources-loader': {
+      preProcessor: 'less',
+      patterns: [path.resolve(__dirname, './src/theme/theme.less')]
+    }
+  },
+  configureWebpack: config => {
+    config.entry.app = ['babel-polyfill', 'whatwg-fetch', './src/main.js']
+    config.performance = {
+      hints: false
+    }
+    config.plugins.push(
+      new ThemeColorReplacer({
+        fileName: 'css/theme-colors-[contenthash:8].css',
+        matchColors: getThemeColors(),
+        injectCss: true,
+        resolveCss
+      })
+    )
+    // Ignore all locale files of moment.js
+    config.plugins.push(new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/))
+    // 生产环境下将资源压缩成gzip格式
+    if (isProd) {
+      // add `CompressionWebpack` plugin to webpack plugins
+      config.plugins.push(new CompressionWebpackPlugin({
+        algorithm: 'gzip',
+        test: new RegExp('\\.(' + productionGzipExtensions.join('|') + ')$'),
+        threshold: 10240,
+        minRatio: 0.8
+      }))
+    }
+    // if prod, add externals
+    // if (isProd) {
+    //   config.externals = assetsCDN.externals
+    // }
+  },
+  chainWebpack: config => {
+    // 生产环境下关闭css压缩的 colormin 项，因为此项优化与主题色替换功能冲突
+    if (isProd) {
+      config.plugin('optimize-css')
+        .tap(args => {
+          args[0].cssnanoOptions.preset[1].colormin = false
+          return args
+        })
+    }
+    config.resolve.alias.set('@vue2-client', path.resolve(__dirname, 'src'))
+  },
+  css: {
+    loaderOptions: {
+      less: {
+        lessOptions: {
+          modifyVars: modifyVars(),
+          javascriptEnabled: true
+        }
+      }
+    }
+  },
+  publicPath: process.env.VUE_APP_PUBLIC_PATH,
+  outputDir: 'dist',
+  assetsDir: 'static',
+  productionSourceMap: false
+}