vue2-client 1.14.14 → 1.14.15

package/src/utils/lowcode/registerComponentForEditor.js

@@ -1 +1 @@
-export {}
+export {}

package/src/utils/lowcode/registerComponentForRender.js

@@ -1,11 +1,11 @@
-import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'
-import XTreeOne from '@vue2-client/base-client/components/common/XTreeOne/XTreeOne.vue'
-import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
-import XDescriptions from '@vue2-client/base-client/components/common/XDescriptions/XDescriptions.vue'
-
-export {
-  XFormTable,
-  XTreeOne,
-  XAddNativeForm,
-  XDescriptions
-}
+import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable.vue'
+import XTreeOne from '@vue2-client/base-client/components/common/XTreeOne/XTreeOne.vue'
+import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
+import XDescriptions from '@vue2-client/base-client/components/common/XDescriptions/XDescriptions.vue'
+
+export {
+  XFormTable,
+  XTreeOne,
+  XAddNativeForm,
+  XDescriptions
+}

package/src/utils/map-utils.js

@@ -1,47 +1,47 @@
-import AMapLoader from '@amap/amap-jsapi-loader'
-let Amap
-async function GetGDMap (secretKey, key) {
-  if (!Amap) {
-    window._AMapSecurityConfig = {
-      securityJsCode: secretKey
-    }
-    //  解决高德地图加载报错 ---> 禁止多种API加载方式混用
-    AMapLoader.reset()
-    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.MouseTool',
-        'AMap.Geocoder', 'AMap.MarkerClusterer', 'AMap.AutoComplete', 'AMap.Scale'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
-      AMapUI: {
-        version: '1.1', // AMapUI 缺省 1.1
-        plugins: ['misc/PositionPicker'] // 需要加载的 AMapUI ui插件
-      }
-    })
-  }
-  return Amap
-}
-
-async function getGDMap (address) {
-  new (await GetGDMap()).Geocoder({
-    radius: 500 // 范围，默认：500
-  }).getLocation(address, function (status, result) {
-    if (status === 'complete' && result.geocodes.length) {
-      return ({ lng: result.geocodes[0].location.lng, lat: result.geocodes[0].location.lat })
-    } else {
-      // eslint-disable-next-line prefer-promise-reject-errors
-      throw new Error('根据经纬度查询地址失败')
-    }
-  })
-}
-
-async function GetLocation (address) {
-  return new Promise((resolve, reject) => {
-    try {
-      resolve(getGDMap(address))
-    } catch (e) {
-      reject(e)
-    }
-  })
-}
-export { GetGDMap, GetLocation }
+import AMapLoader from '@amap/amap-jsapi-loader'
+let Amap
+async function GetGDMap (secretKey, key) {
+  if (!Amap) {
+    window._AMapSecurityConfig = {
+      securityJsCode: secretKey
+    }
+    //  解决高德地图加载报错 ---> 禁止多种API加载方式混用
+    AMapLoader.reset()
+    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.MouseTool',
+        'AMap.Geocoder', 'AMap.MarkerClusterer', 'AMap.AutoComplete', 'AMap.Scale'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+      AMapUI: {
+        version: '1.1', // AMapUI 缺省 1.1
+        plugins: ['misc/PositionPicker'] // 需要加载的 AMapUI ui插件
+      }
+    })
+  }
+  return Amap
+}
+
+async function getGDMap (address) {
+  new (await GetGDMap()).Geocoder({
+    radius: 500 // 范围，默认：500
+  }).getLocation(address, function (status, result) {
+    if (status === 'complete' && result.geocodes.length) {
+      return ({ lng: result.geocodes[0].location.lng, lat: result.geocodes[0].location.lat })
+    } else {
+      // eslint-disable-next-line prefer-promise-reject-errors
+      throw new Error('根据经纬度查询地址失败')
+    }
+  })
+}
+
+async function GetLocation (address) {
+  return new Promise((resolve, reject) => {
+    try {
+      resolve(getGDMap(address))
+    } catch (e) {
+      reject(e)
+    }
+  })
+}
+export { GetGDMap, GetLocation }

package/src/utils/reg.js

@@ -1,95 +1,95 @@
-/** 手机号 */
-export const REG_PHONE =
-  /^[1](([3][0-9])|([4][01456789])|([5][012356789])|([6][2567])|([7][0-8])|([8][0-9])|([9][012356789]))[0-9]{8}$/
-
-/** 邮箱 */
-export const REG_EMAIL = /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/
-
-/** url */
-export const REG_URL =
-  /(((^https?:(?:\/\/)?)(?:[-;:&=+$,\w]+@)?[A-Za-z0-9.-]+(?::\d+)?|(?:www.|[-;:&=+$,\w]+@)[A-Za-z0-9.-]+)((?:\/[+~%/.\w-_]*)?\??(?:[-+=&;%@.\w_]*)#?(?:[\w]*))?)$/
-
-/** 身份证号校验 */
-export function checkIdNumber (value) {
-  const psidno = String(value)
-  // 1.校验身份证号格式和长度
-  const regPsidno = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
-  if (!regPsidno.test(psidno)) {
-    return false
-  }
-  // 2.校验前两位的省份编码是否正确
-  const province = { 11: '北京', 12: '天津', 13: '河北', 14: '山西', 15: '内蒙古', 21: '辽宁', 22: '吉林', 23: '黑龙江 ', 31: '上海', 32: '江苏', 33: '浙江', 34: '安徽', 35: '福建', 36: '江西', 37: '山东', 41: '河南', 42: '湖北 ', 43: '湖南', 44: '广东', 45: '广西', 46: '海南', 50: '重庆', 51: '四川', 52: '贵州', 53: '云南', 54: '西藏 ', 61: '陕西', 62: '甘肃', 63: '青海', 64: '宁夏', 65: '新疆', 71: '台湾', 81: '香港', 82: '澳门', 91: '国外' }
-  if (!province[Number(psidno.slice(0, 2))]) {
-    return false
-  }
-  // 3.校验出生日期
-  if (psidno.length === 15) {
-    // 15位号码 省（2位）市（2位）县（2位）年（2位）月（2位）日（2位）校验码（3位）
-    const reg = /^(\d{6})(\d{2})(\d{2})(\d{2})(\d{3})$/
-    const arrSplit = psidno.match(reg)
-    // 15位号码在年份前补 19 或 20
-    const year = Number(arrSplit[2].charAt(0)) > 0 ? '19' + arrSplit[2] : '20' + arrSplit[2]
-    const month = arrSplit[3]
-    const day = arrSplit[4]
-    if (!validateBirthday(year, month, day)) {
-      return false
-    }
-  } else if (psidno.length === 18) {
-    // 18位号码 省（2位）市（2位）县（2位）年（4位）月（2位）日（2位）校验码（4位）
-    const reg = /^(\d{6})(\d{4})(\d{2})(\d{2})(\d{3})([0-9]|X)$/
-    const arrSplit = psidno.match(reg)
-    const year = arrSplit[2]
-    const month = arrSplit[3]
-    const day = arrSplit[4]
-    if (!validateBirthday(year, month, day)) {
-      return false
-    }
-  } else {
-    return false
-  }
-  // 校验出生日期是否合理
-  function validateBirthday (year, month, day) {
-    year = Number(year) // 年
-    month = Number(month) // 月
-    day = Number(day) // 日
-    const nowTime = new Date().getTime() // 当前时间戳
-    const birthTime = new Date(`${year}-${month}-${day}`).getTime() // 获取出生日期的时间戳
-    // 不能是明天出生的吧
-    if (birthTime > nowTime) {
-      return false
-    }
-    // 一般人活不到150岁吧
-    const nowYear = new Date().getFullYear()
-    if ((nowYear - year) > 150) {
-      return false
-    }
-    // 不能是13月出生的吧
-    if (month < 1 || month > 12) {
-      return false
-    }
-    // 不能是2月30号、4月31号、5月32号出生的吧
-    const date = new Date(year, month, 0) // 获取当月的最后一天
-    if (day < 1 || day > date.getDate()) {
-      return false
-    }
-    return true
-  }
-  // 4.18位号码校验生成的校验码
-  if (psidno.length === 18) {
-    const Wi = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2] // 加权因子
-    const parity = ['1', '0', 'X', '9', '8', '7', '6', '5', '4', '3', '2'] // 校验码
-    let sum = 0
-    for (let i = 0; i < 17; i++) {
-      sum += Number(psidno.charAt(i)) * Wi[i]
-    }
-    if (parity[sum % 11] !== psidno[17]) {
-      return false
-    }
-  }
-  return true
-}
-/** 座机号 */
-export const REG_LANDLINE = /\d{3}-\d{8}|\d{4}-\d{7}/
-
-/** 营业执照 */
-export const REG_BUSINESS_LICENSE = /^[0-9a-zA-Z]{15}$/
+/** 手机号 */
+export const REG_PHONE =
+  /^[1](([3][0-9])|([4][01456789])|([5][012356789])|([6][2567])|([7][0-8])|([8][0-9])|([9][012356789]))[0-9]{8}$/
+
+/** 邮箱 */
+export const REG_EMAIL = /^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/
+
+/** url */
+export const REG_URL =
+  /(((^https?:(?:\/\/)?)(?:[-;:&=+$,\w]+@)?[A-Za-z0-9.-]+(?::\d+)?|(?:www.|[-;:&=+$,\w]+@)[A-Za-z0-9.-]+)((?:\/[+~%/.\w-_]*)?\??(?:[-+=&;%@.\w_]*)#?(?:[\w]*))?)$/
+
+/** 身份证号校验 */
+export function checkIdNumber (value) {
+  const psidno = String(value)
+  // 1.校验身份证号格式和长度
+  const regPsidno = /^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[X])$)$/
+  if (!regPsidno.test(psidno)) {
+    return false
+  }
+  // 2.校验前两位的省份编码是否正确
+  const province = { 11: '北京', 12: '天津', 13: '河北', 14: '山西', 15: '内蒙古', 21: '辽宁', 22: '吉林', 23: '黑龙江 ', 31: '上海', 32: '江苏', 33: '浙江', 34: '安徽', 35: '福建', 36: '江西', 37: '山东', 41: '河南', 42: '湖北 ', 43: '湖南', 44: '广东', 45: '广西', 46: '海南', 50: '重庆', 51: '四川', 52: '贵州', 53: '云南', 54: '西藏 ', 61: '陕西', 62: '甘肃', 63: '青海', 64: '宁夏', 65: '新疆', 71: '台湾', 81: '香港', 82: '澳门', 91: '国外' }
+  if (!province[Number(psidno.slice(0, 2))]) {
+    return false
+  }
+  // 3.校验出生日期
+  if (psidno.length === 15) {
+    // 15位号码 省（2位）市（2位）县（2位）年（2位）月（2位）日（2位）校验码（3位）
+    const reg = /^(\d{6})(\d{2})(\d{2})(\d{2})(\d{3})$/
+    const arrSplit = psidno.match(reg)
+    // 15位号码在年份前补 19 或 20
+    const year = Number(arrSplit[2].charAt(0)) > 0 ? '19' + arrSplit[2] : '20' + arrSplit[2]
+    const month = arrSplit[3]
+    const day = arrSplit[4]
+    if (!validateBirthday(year, month, day)) {
+      return false
+    }
+  } else if (psidno.length === 18) {
+    // 18位号码 省（2位）市（2位）县（2位）年（4位）月（2位）日（2位）校验码（4位）
+    const reg = /^(\d{6})(\d{4})(\d{2})(\d{2})(\d{3})([0-9]|X)$/
+    const arrSplit = psidno.match(reg)
+    const year = arrSplit[2]
+    const month = arrSplit[3]
+    const day = arrSplit[4]
+    if (!validateBirthday(year, month, day)) {
+      return false
+    }
+  } else {
+    return false
+  }
+  // 校验出生日期是否合理
+  function validateBirthday (year, month, day) {
+    year = Number(year) // 年
+    month = Number(month) // 月
+    day = Number(day) // 日
+    const nowTime = new Date().getTime() // 当前时间戳
+    const birthTime = new Date(`${year}-${month}-${day}`).getTime() // 获取出生日期的时间戳
+    // 不能是明天出生的吧
+    if (birthTime > nowTime) {
+      return false
+    }
+    // 一般人活不到150岁吧
+    const nowYear = new Date().getFullYear()
+    if ((nowYear - year) > 150) {
+      return false
+    }
+    // 不能是13月出生的吧
+    if (month < 1 || month > 12) {
+      return false
+    }
+    // 不能是2月30号、4月31号、5月32号出生的吧
+    const date = new Date(year, month, 0) // 获取当月的最后一天
+    if (day < 1 || day > date.getDate()) {
+      return false
+    }
+    return true
+  }
+  // 4.18位号码校验生成的校验码
+  if (psidno.length === 18) {
+    const Wi = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2] // 加权因子
+    const parity = ['1', '0', 'X', '9', '8', '7', '6', '5', '4', '3', '2'] // 校验码
+    let sum = 0
+    for (let i = 0; i < 17; i++) {
+      sum += Number(psidno.charAt(i)) * Wi[i]
+    }
+    if (parity[sum % 11] !== psidno[17]) {
+      return false
+    }
+  }
+  return true
+}
+/** 座机号 */
+export const REG_LANDLINE = /\d{3}-\d{8}|\d{4}-\d{7}/
+
+/** 营业执照 */
+export const REG_BUSINESS_LICENSE = /^[0-9a-zA-Z]{15}$/

package/src/utils/routerUtil.js

@@ -82,7 +82,8 @@ function parseRoutes (routesConfig, routerMap) {
       }
       // 查看是否是栅格配置页面
       if (item.meta && item.meta.type) {
-        if (item.meta.type === 'GridView') {
+        // 新的资源管理有单独字段存储 component
+        if (item.meta.type === 'GridView' || item.component === 'GridView') {
           router = routerMap.gridView
           item.path = encodeURI(item.router) || encodeURI(item.name)
         }
@@ -434,6 +435,7 @@ function parsefunc (func) {
       name: row.name
     }
     if (row.link) {
+      // 旧的资源管理 link 格式为 {name_space}${link} 所以这么判断
       if (row.link.includes('$')) {
         route.router = row.link.split('$')[1]
         route.params = row.link.split('$')[0]
@@ -453,6 +455,9 @@ function parsefunc (func) {
           }
         } catch (e) {}
       }
+      if (row.config_name) {
+        route.meta.configName = row.config_name
+      }
     }
     if (row.children && row.children.length > 0) {
       route.children = parsefunc(row.children)

package/src/utils/runEvalFunction.js

@@ -1,14 +1,14 @@
-export function executeStrFunction (funcString, args) {
-  // 使用 eval 执行传入的函数字符串
-  // eslint-disable-next-line no-eval
-  return eval(`(${funcString})`)(...args)
-}
-
-export function executeStrFunctionByContext (context, fnStr, args) {
-  // 使用 new Function 创建函数，并绑定 context 作为 this
-  // eslint-disable-next-line no-eval,no-new-func
-  const fn = new Function(`return (${fnStr});`)()
-
-  // 使用 bind 绑定 context，并立即调用
-  return fn.bind(context)(...args)
-}
+export function executeStrFunction (funcString, args) {
+  // 使用 eval 执行传入的函数字符串
+  // eslint-disable-next-line no-eval
+  return eval(`(${funcString})`)(...args)
+}
+
+export function executeStrFunctionByContext (context, fnStr, args) {
+  // 使用 new Function 创建函数，并绑定 context 作为 this
+  // eslint-disable-next-line no-eval,no-new-func
+  const fn = new Function(`return (${fnStr});`)()
+
+  // 使用 bind 绑定 context，并立即调用
+  return fn.bind(context)(...args)
+}

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

@@ -1,92 +1,92 @@
-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 {
-      // eslint-disable-next-line no-eval
-      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 {
+      // eslint-disable-next-line no-eval
+      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 }