vue2-client 1.6.47 → 1.6.49

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

@@ -1,80 +1,80 @@
-import Vue from 'vue'
-import VueI18n from 'vue-i18n'
-import routesI18n from '@vue2-client/router/i18n'
-import './Objects'
-import { getI18nKey } from '@vue2-client/utils/routerUtil'
-
-/**
- * 创建 i18n 配置
- * @param locale 本地化语言
- * @param fallback 回退语言
- * @returns {VueI18n}
- */
-function initI18n (locale, fallback) {
-  Vue.use(VueI18n)
-  const i18nOptions = {
-    locale,
-    fallbackLocale: fallback,
-    silentFallbackWarn: true
-  }
-  return new VueI18n(i18nOptions)
-}
-
-/**
- * 根据 router options 配置生成 国际化语言
- * @param lang
- * @param routes
- * @param valueKey
- * @returns {*}
- */
-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]
-    lang.assignProps(keys, value)
-    if (route.children) {
-      generateI18n(lang, route.children, valueKey)
-    }
-  })
-  return lang
-}
-
-/**
- * 格式化 router.options.routes，生成 fullPath
- * @param routes
- * @param parentPath
- */
-function formatFullPath (routes, parentPath = '') {
-  routes.forEach(route => {
-    const isFullPath = route.path.substring(0, 1) === '/'
-    route.fullPath = isFullPath ? route.path : (parentPath === '/' ? parentPath + route.path : parentPath + '/' + route.path)
-    if (route.children) {
-      formatFullPath(route.children, route.fullPath)
-    }
-  })
-}
-
-/**
- * 从路由提取国际化数据
- * @param i18n
- * @param routes
- */
-function mergeI18nFromRoutes (i18n, routes) {
-  formatFullPath(routes)
-  // eslint-disable-next-line no-new-object
-  const CN = generateI18n({}, routes, 'name')
-  // eslint-disable-next-line no-new-object
-  const US = generateI18n({}, routes, 'path')
-  i18n.mergeLocaleMessage('CN', CN)
-  i18n.mergeLocaleMessage('US', US)
-  const messages = routesI18n.messages
-  Object.keys(messages).forEach(lang => {
-    i18n.mergeLocaleMessage(lang, messages[lang])
-  })
-}
-
-export {
-  initI18n,
-  mergeI18nFromRoutes,
-  formatFullPath
-}
+import Vue from 'vue'
+import VueI18n from 'vue-i18n'
+import routesI18n from '@vue2-client/router/i18n'
+import './Objects'
+import { getI18nKey } from '@vue2-client/utils/routerUtil'
+
+/**
+ * 创建 i18n 配置
+ * @param locale 本地化语言
+ * @param fallback 回退语言
+ * @returns {VueI18n}
+ */
+function initI18n (locale, fallback) {
+  Vue.use(VueI18n)
+  const i18nOptions = {
+    locale,
+    fallbackLocale: fallback,
+    silentFallbackWarn: true
+  }
+  return new VueI18n(i18nOptions)
+}
+
+/**
+ * 根据 router options 配置生成 国际化语言
+ * @param lang
+ * @param routes
+ * @param valueKey
+ * @returns {*}
+ */
+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]
+    lang.assignProps(keys, value)
+    if (route.children) {
+      generateI18n(lang, route.children, valueKey)
+    }
+  })
+  return lang
+}
+
+/**
+ * 格式化 router.options.routes，生成 fullPath
+ * @param routes
+ * @param parentPath
+ */
+function formatFullPath (routes, parentPath = '') {
+  routes.forEach(route => {
+    const isFullPath = route.path.substring(0, 1) === '/'
+    route.fullPath = isFullPath ? route.path : (parentPath === '/' ? parentPath + route.path : parentPath + '/' + route.path)
+    if (route.children) {
+      formatFullPath(route.children, route.fullPath)
+    }
+  })
+}
+
+/**
+ * 从路由提取国际化数据
+ * @param i18n
+ * @param routes
+ */
+function mergeI18nFromRoutes (i18n, routes) {
+  formatFullPath(routes)
+  // eslint-disable-next-line no-new-object
+  const CN = generateI18n({}, routes, 'name')
+  // eslint-disable-next-line no-new-object
+  const US = generateI18n({}, routes, 'path')
+  i18n.mergeLocaleMessage('CN', CN)
+  i18n.mergeLocaleMessage('US', US)
+  const messages = routesI18n.messages
+  Object.keys(messages).forEach(lang => {
+    i18n.mergeLocaleMessage(lang, messages[lang])
+  })
+}
+
+export {
+  initI18n,
+  mergeI18nFromRoutes,
+  formatFullPath
+}

package/src/utils/map-utils.js

@@ -1,37 +1,37 @@
-import AMapLoader from '@amap/amap-jsapi-loader'
-let Amap
-async function GetGDMap (secretKey, key) {
-  if (!Amap) {
-    window._AMapSecurityConfig = {
-      securityJsCode: secretKey
-    }
-    Amap = await AMapLoader.load({
-      key: key, // 申请好的Web端开发者Key，首次调用 load 时必填
-      version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
-      plugins: ['AMap.IndexCluster', 'AMP.MarkerCluster', 'AMap.InfoWindow', 'AMap.HeatMap', 'AMap.HawkEye', 'AMap.DistrictSearch',
-        'AMap.ToolBar', 'AMap.Geolocation',
-        'AMap.Geocoder', 'AMap.MarkerClusterer', 'AMap.AutoComplete'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
-      AMapUI: {
-        version: '1.1', // AMapUI 缺省 1.1
-        plugins: ['misc/PositionPicker'] // 需要加载的 AMapUI ui插件
-      }
-    })
-  }
-  return Amap
-}
-async function GetLocation (address) {
-  return new Promise(async (resolve, reject) => {
-    new (await GetGDMap()).Geocoder({
-      radius: 500 // 范围，默认：500
-    }).getLocation(address, function (status, result) {
-      console.log(result)
-      if (status === 'complete' && result.geocodes.length) {
-        resolve({ lng: result.geocodes[0].location.lng, lat: result.geocodes[0].location.lat })
-      } else {
-        // eslint-disable-next-line prefer-promise-reject-errors
-        reject('根据经纬度查询地址失败')
-      }
-    })
-  })
-}
-export { GetGDMap, GetLocation }
+import AMapLoader from '@amap/amap-jsapi-loader'
+let Amap
+async function GetGDMap (secretKey, key) {
+  if (!Amap) {
+    window._AMapSecurityConfig = {
+      securityJsCode: secretKey
+    }
+    Amap = await AMapLoader.load({
+      key: key, // 申请好的Web端开发者Key，首次调用 load 时必填
+      version: '2.0', // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+      plugins: ['AMap.IndexCluster', 'AMP.MarkerCluster', 'AMap.InfoWindow', 'AMap.HeatMap', 'AMap.HawkEye', 'AMap.DistrictSearch',
+        'AMap.ToolBar', 'AMap.Geolocation',
+        'AMap.Geocoder', 'AMap.MarkerClusterer', 'AMap.AutoComplete'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+      AMapUI: {
+        version: '1.1', // AMapUI 缺省 1.1
+        plugins: ['misc/PositionPicker'] // 需要加载的 AMapUI ui插件
+      }
+    })
+  }
+  return Amap
+}
+async function GetLocation (address) {
+  return new Promise(async (resolve, reject) => {
+    new (await GetGDMap()).Geocoder({
+      radius: 500 // 范围，默认：500
+    }).getLocation(address, function (status, result) {
+      console.log(result)
+      if (status === 'complete' && result.geocodes.length) {
+        resolve({ lng: result.geocodes[0].location.lng, lat: result.geocodes[0].location.lat })
+      } else {
+        // eslint-disable-next-line prefer-promise-reject-errors
+        reject('根据经纬度查询地址失败')
+      }
+    })
+  })
+}
+export { GetGDMap, GetLocation }

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 }