vue2-client 1.8.259 → 1.8.261

package/src/utils/lowcode/lowcodeUtils.js

@@ -1,129 +1,276 @@
-// eslint-disable-next-line no-unused-vars
-import * as registeredConfig from './registerComponentForEditor'
-
-// 根据id获取组件定义的配置（在ForEditor中注册的配置）
-export function getEditorConfigById (componentId, config) {
-  if (config.page) {
-    config = config.page
-  }
-  for (let i = 0; i < config.length; i++) {
-    const page = config[i]
-    for (let j = 0; j < page.body.length; j++) {
-      const row = page.body[j]
-      for (let k = 0; k < row.length; k++) {
-        const item = row[k]
-        if (item.id === componentId) {
-          return getEditorConfigByType(item.type)
-        }
-      }
-    }
-  }
-  return undefined
-}
-
-// 根据类型获取组件定义的配置（在ForEditor中注册的配置）
-export function getEditorConfigByType (componentType) {
-  let result
-  const registeredConfigKeys = Object.keys(registeredConfig)
-  registeredConfigKeys.forEach(key => {
-    if (registeredConfig[key].type === componentType) {
-      result = registeredConfig[key]
-    }
-  })
-  return result
-}
-
-// 根据组件的id获取页面容器
-export function getPageByComponentID (id, config) {
-  for (let i = 0; i < config.page.length; i++) {
-    const page = config.page[i]
-    for (let j = 0; j < page.body.length; j++) {
-      const row = page.body[j]
-      for (let k = 0; k < row.length; k++) {
-        const item = row[k]
-        if (item.id === id) {
-          return page
-        }
-      }
-    }
-  }
-}
-
-// 解析页面容器类型为中文
-export function resolvePageType (type) {
-  switch (type) {
-    case 'page':
-      return '页面'
-    case 'modal':
-      return '弹框'
-    case 'draw':
-      return '抽屉'
-  }
-}
-
-// 根据页面容器id获取页面容器配置
-export function getPageByPageID (id, config) {
-  for (let i = 0; i < config.page.length; i++) {
-    const page = config.page[i]
-    if (page.id === id) {
-      return page
-    }
-  }
-}
-
-// 根据id获取配置
-export function getComponentConfig (componentId, config) {
-  if (config.page) {
-    config = config.page
-  }
-
-  for (let i = 0; i < config.length; i++) {
-    for (let j = 0; j < config[i].body.length; j++) {
-      const row = config[i].body[j]
-      for (let k = 0; k < row.length; k++) {
-        const item = row[k]
-        if (item.id === componentId) {
-          return item
-        }
-      }
-    }
-  }
-}
-
-// 根据ID获取页面容器
-export function getPageConfigById (id, config) {
-  for (let i = 0; i < config.page.length; i++) {
-    const page = config.page[i]
-    if (page.id === id) {
-      return page
-    }
-  }
-}
-
-// 根据行Index获取行
-export function getRowConfigById (id, config) {
-  const pageId = id.split('_')[0]
-  const rowIndex = id.split('_')[1] - 1
-  for (let i = 0; i < config.page.length; i++) {
-    const page = config.page[i]
-    if (page.id === pageId) {
-      return page.body[rowIndex]
-    }
-  }
-}
-
-// 根据id获取配置，根据id的长度自动判断类型
-export function getConfig (id, config) {
-  let result
-  if (id.length === 2) {
-    // page
-    result = getPageConfigById(id, config)
-  } else if (id.length > 2 && id.length <= 5) {
-    // row
-    result = getRowConfigById(id, config)
-  } else {
-    // component
-    result = getComponentConfig(id, config)
-  }
-  return result
-}
+// eslint-disable-next-line no-unused-vars
+import * as registeredConfig from './registerComponentForEditor'
+import { nanoid } from 'nanoid'
+
+// 随机id去除特定字符
+export function nanoidWithoutSymbol (size, without = '_') {
+  let result = nanoid(size)
+  while (result.includes(without)) {
+    result = nanoid(size)
+  }
+  return result
+}
+
+// 根据id获取组件定义的配置（在ForEditor中注册的配置）
+export function getEditorConfigById (componentId, config) {
+  if (config.page) {
+    config = config.page
+  }
+  const target = getComponentConfig(componentId, config)
+  return getEditorConfigByType(target.type)
+}
+
+// 根据类型获取组件定义的配置（在ForEditor中注册的配置）
+export function getEditorConfigByType (componentType) {
+  let result
+  const registeredConfigKeys = Object.keys(registeredConfig)
+  registeredConfigKeys.forEach(key => {
+    if (registeredConfig[key].type === componentType) {
+      result = registeredConfig[key]
+    }
+  })
+  return result
+}
+
+// 根据组件的id获取页面容器
+export function getPageByComponentID (id, config) {
+  for (let i = 0; i < config.page.length; i++) {
+    const page = config.page[i]
+    for (let j = 0; j < page.body.length; j++) {
+      const row = page.body[j]
+      for (let k = 0; k < row.length; k++) {
+        const item = row[k]
+        if (item.type === 'container_page') {
+          const result = getPageByComponentID(id, item)
+          if (result) {
+            return result
+          }
+        }
+        if (item.id === id) {
+          return page
+        }
+      }
+    }
+  }
+}
+
+export function getRowByComponentId (id, config) {
+  for (let i = 0; i < config.page.length; i++) {
+    const page = config.page[i]
+    for (let j = 0; j < page.body.length; j++) {
+      const row = page.body[j]
+      for (let k = 0; k < row.length; k++) {
+        const item = row[k]
+        if (item.type === 'container_page') {
+          const result = getRowByComponentId(id, item)
+          if (result) {
+            return result
+          }
+        }
+        if (item.id === id) {
+          return row
+        }
+      }
+    }
+  }
+}
+
+// 解析页面容器类型为中文
+export function resolvePageType (type) {
+  switch (type) {
+    case 'page':
+      return '页面'
+    case 'modal':
+      return '弹框'
+    case 'draw':
+      return '抽屉'
+  }
+}
+
+// 根据id获取配置
+export function getComponentConfig (componentId, config) {
+  if (config.page) {
+    config = config.page
+  }
+
+  for (let i = 0; i < config.length; i++) {
+    for (let j = 0; j < config[i].body.length; j++) {
+      const row = config[i].body[j]
+      for (let k = 0; k < row.length; k++) {
+        const item = row[k]
+        if (item.id === componentId) {
+          return item
+        }
+        if (item.type === 'container_page') {
+          const result = getComponentConfig(componentId, item)
+          if (result) {
+            return result
+          }
+        }
+      }
+    }
+  }
+}
+
+// 根据ID获取页面容器
+export function getPageConfigById (id, config) {
+  for (let i = 0; i < config.page.length; i++) {
+    const page = config.page[i]
+    if (page.id === id) {
+      return page
+    }
+    for (let j = 0; j < page.body.length; j++) {
+      const row = page.body[j]
+      for (let k = 0; k < row.length; k++) {
+        const item = row[k]
+        if (item.type === 'container_page') {
+          const result = getPageConfigById(id, item)
+          if (result) {
+            return result
+          }
+        }
+      }
+    }
+  }
+}
+
+// 获取容器页面外层容器
+export function getContainerPageOuterByContainerPageId (id, config) {
+  for (let i = 0; i < config.page.length; i++) {
+    const page = config.page[i]
+    if (page.id === id) {
+      return config
+    }
+    for (let j = 0; j < page.body.length; j++) {
+      const row = page.body[j]
+      for (let k = 0; k < row.length; k++) {
+        const item = row[k]
+        if (item.type === 'container_page') {
+          const result = getContainerPageOuterByContainerPageId(id, item)
+          if (result) {
+            return result
+          }
+        }
+      }
+    }
+  }
+}
+
+// 根据组件ID获取行
+export function getRowConfigByComponentId (id, config) {
+  for (let i = 0; i < config.page.length; i++) {
+    for (let j = 0; j < config.page[i].body.length; j++) {
+      const row = config.page[i].body[j]
+      for (let k = 0; k < row.length; k++) {
+        const item = row[k]
+        if (item.id === id) {
+          return row
+        }
+        if (item.type === 'container_page') {
+          const result = getRowConfigByComponentId(id, item)
+          if (result) {
+            return result
+          }
+        }
+      }
+    }
+  }
+}
+
+// 根据组件ID获取组件在行中index
+export function getComponentInRowIndex (id, config) {
+  for (let i = 0; i < config.page.length; i++) {
+    for (let j = 0; j < config.page[i].body.length; j++) {
+      const row = config.page[i].body[j]
+      for (let k = 0; k < row.length; k++) {
+        const item = row[k]
+        if (item.id === id) {
+          return k
+        }
+        if (item.type === 'container_page') {
+          const result = getComponentInRowIndex(id, item)
+          if (result) {
+            return result
+          }
+        }
+      }
+    }
+  }
+}
+
+// 根据行ID获取行
+export function getRowConfigById (id, config) {
+  const lastIndex = id.lastIndexOf('_')
+  const rowIndex = id.substring(lastIndex + 1)
+  const pageId = id.substring(0, lastIndex)
+  const page = getPageConfigById(pageId, config)
+  return page.body[rowIndex - 1]
+  // for (let i = 0; i < config.page.length; i++) {
+  //   const page = config.page[i]
+  //   if (page.id === pageId) {
+  //     return page.body[rowIndex]
+  //   }
+  // }
+}
+
+// 根据id获取配置，根据id的长度自动判断类型
+export function getConfig (id, config) {
+  let result
+  if (id.startsWith('page') && id.length <= 11) {
+    // page
+    result = getPageConfigById(id, config)
+  } else if (id.startsWith('page') && id.length > 11) {
+    // row
+    result = getRowConfigById(id, config)
+  } else {
+    // component
+    result = getComponentConfig(id, config)
+  }
+  return result
+}
+
+// 取消选择所有容器
+export function unCheckAll (config) {
+  config.page.forEach(page => {
+    page.body.forEach(row => {
+      row.forEach(item => {
+        if (item.type !== 'container_page') {
+          item.selected = false
+        } else {
+          unCheckAll(item)
+        }
+      })
+    })
+  })
+}
+
+// 根据组件id获取它的name，如果没有name则返回id
+export function getComponentNameById (id, config) {
+  const targetConfig = getComponentConfig(id, config)
+  if (targetConfig.name) {
+    return targetConfig.name
+  } else {
+    return targetConfig.id
+  }
+}
+
+// 重新随机容器下所有子项目的ID
+export function reRandomComponentId (config) {
+  config.page.forEach(page => {
+    const pagePrefix = getIdPrefix(page.id)
+    page.id = pagePrefix + '_' + nanoidWithoutSymbol(2)
+    page.body.forEach(row => {
+      row.forEach(item => {
+        const itemPrefix = getIdPrefix(item.id)
+        item.id = itemPrefix + '_' + nanoidWithoutSymbol(6)
+      })
+    })
+  })
+  return config
+}
+
+// 获取id前传
+export function getIdPrefix (id) {
+  const lastIndex = id.lastIndexOf('_')
+  return id.substring(0, lastIndex)
+}

package/src/utils/lowcode/registerComponentForEditor.js

@@ -1,11 +1,11 @@
-import { XFormTableConfig } from '@vue2-client/base-client/components/common/XFormTable/lowcodeEditorRegister'
-import { XTreeOneConfig } from '@vue2-client/base-client/components/common/XTreeOne/lowcodeEditorRegister'
-import { XAddNativeFormConfig } from '@vue2-client/base-client/components/common/XAddNativeForm/lowcodeEditorRegister'
-import { XDescriptionsConfig } from '@vue2-client/base-client/components/common/XDescriptions/lowcodeEditorRegister'
-
-export {
-  XFormTableConfig,
-  XTreeOneConfig,
-  XAddNativeFormConfig,
-  XDescriptionsConfig
-}
+import { XFormTableConfig } from '@vue2-client/base-client/components/common/XFormTable/lowcodeEditorRegister'
+import { XTreeOneConfig } from '@vue2-client/base-client/components/common/XTreeOne/lowcodeEditorRegister'
+import { XAddNativeFormConfig } from '@vue2-client/base-client/components/common/XAddNativeForm/lowcodeEditorRegister'
+import { XDescriptionsConfig } from '@vue2-client/base-client/components/common/XDescriptions/lowcodeEditorRegister'
+
+export {
+  XFormTableConfig,
+  XTreeOneConfig,
+  XAddNativeFormConfig,
+  XDescriptionsConfig
+}

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'等
-      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'等
+      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,19 +1,19 @@
-/** 手机号 */
-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 const _IDRe18 = /^\d{6}(18|19|20\d{2})(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}[\dXx]$/
-export const _IDre15 = /^([1-6][1-9]|50)\d{4}\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}$/
-/** 座机号 */
-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 const _IDRe18 = /^\d{6}(18|19|20\d{2})(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01])\d{3}[\dXx]$/
+export const _IDre15 = /^([1-6][1-9]|50)\d{4}\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}$/
+/** 座机号 */
+export const REG_LANDLINE = /\d{3}-\d{8}|\d{4}-\d{7}/
+
+/** 营业执照 */
+export const REG_BUSINESS_LICENSE = /^[0-9a-zA-Z]{15}$/