resolver-egretimp-plus 0.1.124 → 0.1.126

package/src/utils/render.jsx

@@ -26,14 +26,15 @@ import {
   MODE,
 
   isHidden,
-  CYCLE_COMPONETS
+  CYCLE_COMPONETS,
+  EXECTE_CLICK_EVENT_COMPONENTS
 } from './const.js'
 import { preserveCheck } from './preserveFunc.js'
 import { isArray, isFunction, isString } from './is.js'
 import CustomComponentPlain from '../components/packages-web/CustomComponentPlain.vue'
 // import QuestionFilled from '../components/icons/question-filled.vue'
 import infoIcon from '../components/icons/info.vue'
-import { dispatchClickEvent, dispatchClickEvents, getTableConfig } from '../components/helper/eventOrchestration.js'
+import { dispatchClickEvent, dispatchClickEvents, executeEventOrchestration, getTableConfig } from '../components/helper/eventOrchestration.js'
 import CmiFormItem from '../components/cmiFormItem'
 import loadModule from './loadModule.js'
 import dayjs from 'dayjs'
@@ -119,6 +120,11 @@ export function generateFormConfig(lang = 'zh', isH5) {
  * @param {*} config 通过接口获取的配置对象
  */
 export function parsePageConfig({
+  components,
+  confirmInstance,
+  openChildDialogInstance,
+  buttonActions,
+  builtPolyfillReq,
   requestTraceId,
   dialogReq,
   mode,
@@ -140,6 +146,11 @@ export function parsePageConfig({
   const cbs = []
   window?.performance?.mark('noraml_config_start')
   let { pageConfig, mapComp } = normalConfig({
+    components,
+    confirmInstance,
+    openChildDialogInstance,
+    buttonActions,
+    builtPolyfillReq,
     requestTraceId,
     dialogReq,
     lang,
@@ -204,6 +215,20 @@ function correctConfigDynamicMapHandler({config, dynamicMapComp, changedDynamicH
     }
   }
 }
+
+function canReuse(
+  dynamicMapComp,
+  dynamicHireRelat,
+  currentIdx
+) {
+  // 如果组件上的rowIndex等于当前的idx，说明这个config已经没有被用到了，我们可以直接拿过来复用
+  const currentCg = dynamicMapComp[dynamicHireRelat]
+  if (currentCg?.rowIndex === currentIdx) {
+    return true
+  }
+  return false
+}
+
 /**
  * {
  *  children: [], // 子元素
@@ -212,6 +237,11 @@ function correctConfigDynamicMapHandler({config, dynamicMapComp, changedDynamicH
  * @param {*} config 
  */
 export function normalConfig({
+  components,
+  confirmInstance,
+  openChildDialogInstance,
+  buttonActions,
+  builtPolyfillReq,
   requestTraceId,
   dialogReq,
   lang,
@@ -229,6 +259,7 @@ export function normalConfig({
   noParsePageMetaList,
   changeConfig,
   notParseConfig,
+  parentConfig,
 }, config, hireRelat = '', mapComp = {}, needformItem = false, dynamicHireRelat = '', unWatchsList = []) {
 
   const metaCode = config.metaCode || ''
@@ -250,10 +281,10 @@ export function normalConfig({
     vm: null, // 具体渲染的组件
     wrapVm: null, // 当前组件的实例（也就是analysisComponent）
     hireRelat,
-    parent: null, // 这个是执行过程中，动态获取的
   }
   if (!OPEN_DATA_RULES) {
     extendNativeObj.dynamicHireRelat = ''
+    extendNativeObj.parent = null
   } else {
     if (changeConfig) {
       // 设置multiPmPageMetaList的时候，如果数组变了，如果数组中的值变换了位置，需要对dynamicMapComp设置正确的映射
@@ -263,6 +294,7 @@ export function normalConfig({
     dynamicMapComp[dynamicHireRelat] = config
     definePrivatelyProp(config, '_rootValue', rootValue)
     definePrivatelyProp(config, 'refValue', useVmodels(config).modelValue)
+    definePrivatelyProp(config, 'parent', parentConfig) // 这边手动设置一下，防止组件复用的时候不会刷新，造成parent的丢失
   }
 
   if (!notParseConfig) {
@@ -351,6 +383,23 @@ export function normalConfig({
       })?.sort((a, b) => a.seqNo - b.seqNo)
     }
   } else {
+    compatibilityConfig({
+      config,
+      builtPolyfillReq,
+      components,
+      requestTraceId,
+      rootValue,
+      axiosInstance,
+      polyfillConfigs,
+      confirmInstance,
+      dynamicMapComp,
+      openChildDialogInstance,
+      messageInstance,
+      messageCb,
+      buttonActions,
+      lang,
+      dialogReq,
+    })
     // 如果有子项，需要进行递归遍历
     if (pageConfig.pmPageMetaList && pageConfig.pmPageMetaList.length && !noParsePageMetaList) {
       normalPmPageMetaList(pageConfig)
@@ -379,59 +428,72 @@ export function normalConfig({
 
         
         config._unPageMetaListWatch = watch(() => getPathVal(unref(rootValue), config.dynamicHireRelat, '->'), (val) => {
+          let noParseConfigs = []
           const list = getPathVal(unref(rootValue), config.dynamicHireRelat, '->')
           if (list && list.length) {
             const cbFns = []
-            const pageMetaList = list.map((row, idx) => {
+            const pageMetaList = new Array(list.length)
+            for (let idx = 0; idx < list.length; idx++) {
+              const row = list[idx];
               const columnsCgs = config._rowColumnConfgsMap.get(row)
               if (columnsCgs) {
                 columnsCgs.forEach(config => {
                   config.rowIndex = idx
                   config.rowScope.$index =idx
                 })
-                return columnsCgs
+                pageMetaList.splice(idx, 1, columnsCgs)
               } else {
-                let retColumnConfigs = config.pmPageMetaList.map((itemConfig, relIdx) => {
-                  const ret = cloneDeep(itemConfig)
-                  if (findComponent(['CustomComponentTable'], config.renderby) !== -1 || findComponent(['CustomComponentTable'], config.metaType) !== -1) {
-                    ret.labelHidden = '1'
-                    if (ret.width && !ret.columnWidth) {
-                      ret.columnWidth = ret.width
-                      delete ret.width
-                    }
-                    ret.isColumn = true
-                  }
-                  ret.rowScope = {$index: idx, row}
-                  ret.columnId = generateUniqueId()
-                  ret.rowIndex = idx
-                  definePrivatelyProp(ret, 'refConfig', config.pmPageMetaList?.[relIdx])
-                  definePrivatelyProp(ret, 'parent', config) // 这边手动设置一下，防止组件复用的时候不会刷新，造成parent的丢失
-                  return ret
-                })
-                retColumnConfigs = reactive(retColumnConfigs)
                 cbFns.push(() => {
+                  let retColumnConfigs = config.pmPageMetaList.map((itemConfig, relIdx) => {
+                    const compareDynamicHireRelat = `${config.dynamicHireRelat}[${idx}]->${itemConfig.metaCode}`
+                    let ret = null
+                    if (canReuse(dynamicMapComp, compareDynamicHireRelat, idx)) {
+                      ret = dynamicMapComp[compareDynamicHireRelat]
+                      noParseConfigs.push(ret)
+                    } else {
+                      ret = cloneDeep(itemConfig)
+                      if (findComponent(['CustomComponentTable'], config.renderby) !== -1 || findComponent(['CustomComponentTable'], config.metaType) !== -1) {
+                        ret.labelHidden = '1'
+                        if (ret.width && !ret.columnWidth) {
+                          ret.columnWidth = ret.width
+                          delete ret.width
+                        }
+                        ret.isColumn = true
+                      }
+                      ret.rowScope = {$index: idx, row}
+                      ret.rowIndex = idx
+                      ret.columnId = generateUniqueId()
+                    }
+                    definePrivatelyProp(ret, 'parent', parentConfig) // 这边手动设置一下，防止组件复用的时候不会刷新，造成parent的丢失
+                    definePrivatelyProp(ret, 'refConfig', config.pmPageMetaList?.[relIdx])
+                    return ret
+                  })
+                  retColumnConfigs = reactive(retColumnConfigs)
                   simpleNormalPmPageMetaList({
-                    pmPageMetaList: retColumnConfigs,
+                    pmPageMetaList: retColumnConfigs.filter(cg => !noParseConfigs.some(cg1 => cg === cg1)),
                     dynamicHireRelat: `${config.dynamicHireRelat}[${idx}]`,
                     unWatchsList: currentUnWatchsList,
                     noParsePageMetaList: false,
                     changeConfig: true,
                     notParseConfig: true,
                   })
+                  config._rowColumnConfgsMap.set(row, retColumnConfigs)
+
+                  pageMetaList.splice(idx, 1, retColumnConfigs)
                 })
-                config._rowColumnConfgsMap.set(row, retColumnConfigs)
-                return retColumnConfigs
               }
-            })
-            config.multiPmPageMetaList = pageMetaList
+            }
             cbFns.forEach(cb => cb())
+            config.multiPmPageMetaList = pageMetaList
             
             const mapKeys = config._rowColumnConfgsMap.keys()
             Array.from(mapKeys).forEach(row => {
               // 如果已经没有对应的数据循环config了，删除子级的PmPageMetaList监听
               if (!list.some(row2 => row2 === row)) {
                 config._rowColumnConfgsMap.get(row)?.forEach(unWatchConfig => {
-                  unWatchConfig?._unWatchs?.forEach(un => un?.())
+                  if (!noParseConfigs.some(cg1 => cg1 === unWatchConfig)) {
+                    unWatchConfig?._unWatchs?.forEach(un => un?.())
+                  }
                 })
                 config._rowColumnConfgsMap.delete(row)
               }
@@ -440,10 +502,9 @@ export function normalConfig({
         }, {
           immediate: true,
           deep: true,
-          // flush: 'sync'
         })
 
-        oldUnWatchsList?.forEach(list => {
+        currentUnWatchsList?.forEach(list => {
           list?.push(config._unPageMetaListWatch)
         })
       }
@@ -451,6 +512,11 @@ export function normalConfig({
       function simpleNormalPmPageMetaList({pmPageMetaList, dynamicHireRelat, unWatchsList, noParsePageMetaList, changeConfig, notParseConfig}) {
         return pmPageMetaList.map(metaItem => {
           const { pageConfig } = normalConfig({
+            components,
+            confirmInstance,
+            openChildDialogInstance,
+            buttonActions,
+            builtPolyfillReq,
             requestTraceId,
             dialogReq,
             lang,
@@ -468,6 +534,7 @@ export function normalConfig({
             noParsePageMetaList,
             changeConfig,
             notParseConfig,
+            parentConfig: config
           }, metaItem, hireRelat, mapComp, needformItem || [FORM_META_TYPE, FORM_META_TYPE_H5].includes(metaType), dynamicHireRelat, unWatchsList)
           return pageConfig
         })?.sort((a, b) => a.seqNo - b.seqNo)
@@ -475,13 +542,83 @@ export function normalConfig({
     }
   }
 
-
   return {
     mapComp,
     pageConfig
   }
 }
 
+// 目前做数据进行驱动规则、循环组件的config渲染，需要兼容一些现有业务逻辑
+function compatibilityConfig({
+  config,
+  builtPolyfillReq,
+  components,
+  requestTraceId,
+  rootValue,
+  axiosInstance,
+  polyfillConfigs,
+  confirmInstance,
+  dynamicMapComp,
+  openChildDialogInstance,
+  messageInstance,
+  messageCb,
+  buttonActions,
+  lang,
+  dialogReq,
+}) {
+  // 给button组件的vm中添加click事件，因为这边业务都用到了，需要进行兼容
+  const needClick = findComponent(EXECTE_CLICK_EVENT_COMPONENTS, config.renderby) !== -1 || findComponent(EXECTE_CLICK_EVENT_COMPONENTS, config.metaType) !== -1
+  if (needClick) {
+    config.vm = markRaw({
+      click(params) {
+        executeEventOrchestration({
+          ...params,
+          builtPolyfillReq,
+          components,
+          props: {config},
+          requestTraceId,
+          axiosInstance: axiosInstance,
+          polyfillConfigs,
+          rootValue: rootValue?.value,
+          confirmInstance,
+          dynamicMapComp,
+          openChildDialog: openChildDialogInstance,
+          messageInstance,
+          messageCb,
+          buttonActions,
+          lang,
+          dialogReq,
+          appContext: null
+        })
+      }
+    })
+  }
+  // tab需要兼容setActiveTab方法，业务侧有没加载就使用
+  const needSetActive = findComponent(['CustomComponentTabs'], config.renderby) !== -1 || findComponent(['CustomComponentTabs'], config.metaType) !== -1
+  if (needSetActive) {
+    config.vm = markRaw({
+      setActiveTab(val) {
+        const tabpanes = config.pmPageMetaList || []
+        tabpanes.forEach(tab => {
+          if (assertMetaType(tab, 'CustomComponentCycleTabPane') || tab?.isCycle == '1') {
+            if (/^cycleTabpane-(\d+)$/.test(val)) {
+              tab.currentCode = val
+            } else {
+              tab.currentCode = ''
+            }
+          } else if (tab.metaType === 'CustomComponentTabPane') {
+            if (tab.metaCode === val) {
+              tab.defaultShowFlag = '1'
+            } else {
+              tab.defaultShowFlag = '0'
+            }
+          }
+        })
+      }
+    })
+  }
+}
+
 // 从按钮的服务编排中，获取到按钮中配置的表格中的config，并且绑定表格的分页
 function getTableServices(lcpPageServiceMapVOList = [], { dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat }) {
   const mixinServiceConfig = lcpPageServiceMapVOList.find(service => service.serviceType == '1')
@@ -1311,3 +1448,7 @@ function labelMouseEnenter(e, config, lang) {
     config._triggerRef = e.target
   }
 }
+
+export function assertMetaType(config, metaType) {
+  return config.renderby === metaType || config.metaType === metaType
+}

package/src/utils/validateByData.js

@@ -0,0 +1,177 @@
+import { toRaw } from "vue"
+import { calcDisable } from "./const"
+import { getFormItemRule, isCycleConfig } from "./render"
+import AsyncValidator from 'async-validator'
+
+export async function toValidate({
+  rootConfig, rootValue, mode, lang, messageInstance,
+  formRef, cb, dynamicMapComp
+}) {
+  const flag = await validateConfig({
+    validConfig: rootConfig,
+    mode,
+    lang,
+    rootValue,
+    dynamicMapComp,
+    messageInstance
+  })
+  if (!flag) {
+    if (!cb) {
+      return formRef.value && formRef.value.validate().catch(err => {
+        validFailAction(err, dynamicMapComp)
+        return Promise.reject(err)
+      })
+    }
+    return formRef.value && formRef.value.validate((valid, errInfo) => {
+      errInfo && validFailAction(errInfo, dynamicMapComp)
+      cb && cb(valid, errInfo)
+    })
+  } else {
+    if (!cb) {
+      return Promise.resolve(true)
+    }
+    return cb?.(true)
+  }
+}
+
+// 校验的一些附加动作， 例如校验失败，tab需要聚焦到失败tab页面，组件失败，需要展开
+function validFailAction(errInfo, dynamicMapComp) {
+  const errKyes = Object.keys(errInfo)
+  if (errKyes.length) {
+    let oneKey = errKyes[0]
+    const referComps = []
+    while (oneKey.indexOf('->') > -1) {
+      let idx = -1
+      let code = ''
+      const matchs = oneKey?.match(/^(.+)\[(\d+)\]$/)
+      if (matchs) {
+        idx = parseInt(matchs[2])
+        code = matchs[1]
+      } else {
+        code = oneKey
+      }
+
+      const compInfo = dynamicMapComp[code]
+      compInfo && referComps.unshift({
+        compInfo,
+        cycleIdx: idx
+      })
+      oneKey = oneKey?.split('->')?.slice(0, -1)?.join('->') || ''
+    }
+    const compInfo = dynamicMapComp[oneKey]
+    compInfo && referComps.unshift({
+      compInfo,
+      cycleIdx: -1
+    })
+    referComps.forEach(({compInfo, cycleIdx}) => {
+      validFail(compInfo, cycleIdx)
+    })
+    // 组件对应的页面展示更新后才能获取到校验住的元素
+    setTimeout(() => {
+      const {compInfo: config} = referComps.pop()
+      const veiwEl = config?.wrapVm?.vnode?.el
+      veiwEl && veiwEl.scrollIntoView({ behavior: 'smooth' })
+
+      // const fouceErrEle = document.querySelector('.el-form-item__error')
+      // const fouceEle = fouceErrEle.parentElement
+      // fouceEle && fouceEle.scrollIntoView({ behavior: 'smooth' })
+    }, 200)
+  }
+}
+// 校验不通过的时候，需要进行一下组件配置的调整，
+// 标签组件，需要进行聚焦当前页面
+// component组件，需要打开折叠
+function validFail(config, cycleIdx) {
+  const type = config.renderby || config.metaType
+  switch (type) {
+    case 'CustomComponentTabPane':
+    case 'CustomComponentCycleTabPane':
+      config.parent && config.parent.pmPageMetaList && config.parent.pmPageMetaList.forEach(tab => {
+        if (tab.metaType === 'CustomComponentTabPane') {
+          tab.defaultShowFlag = '0'
+        }
+        if (tab.metaType === 'CustomComponentCycleTabPane' || tab?.isCycle == '1') {
+          tab.currentCode = ''
+        }
+      })
+      if (type === 'CustomComponentTabPane' && config?.isCycle != '1') {
+        config.defaultShowFlag = '1'
+      }
+      if (type === 'CustomComponentCycleTabPane' || config?.isCycle == '1') {
+        config.currentCode = `${config.metaCode}-${cycleIdx}`
+      }
+      break
+    case 'CustomComponentCollapse':
+      config.defaultOpenFlag = '1'
+      break
+    case 'CustomComponentDialog':
+      config.dialogVisible = true
+      break
+    default:
+  }
+}
+
+function validateConfig({
+  validConfig,
+  mode,
+  lang,
+  rootValue,
+  dynamicMapComp,
+  messageInstance
+}) {
+  return travelConfig(validConfig, (config) => {
+    const compProps = {
+      disabled: calcDisable(config, mode)
+    }
+    const params = {
+      lang,
+      rootValue,
+      dynamicMapComp,
+      props: {
+        config: config,
+        modelValue: toRaw(config?.refValue),
+        rowScope: config.rowScope,
+        mode: mode
+      },
+      messageInstance
+    }
+    const rules = getFormItemRule(config, lang, params, compProps, true)
+    if (rules && rules.length) {
+      const validator = new AsyncValidator({
+        [config.dynamicHireRelat]: rules
+      })
+      
+      async function toValidate() {
+        try {
+          await validator.validate({[config.dynamicHireRelat]: toRaw(config?.refValue)})
+        } catch (error) {
+          validFailAction({[config.dynamicHireRelat]: true}, dynamicMapComp)
+          return Promise.reject()
+        }
+        return true
+      }
+      return toValidate()
+    }
+  })
+}
+
+async function travelConfig(configs, cb) {
+  let travseConfigs = Array.isArray(configs) ? configs : [configs]
+  let currentConfig = null
+  while(travseConfigs.length) {
+    currentConfig = travseConfigs.shift()
+    try {
+      await cb?.(currentConfig)
+    } catch (error) {
+      return false   
+    }
+    if (isCycleConfig(currentConfig)) {
+      (currentConfig.multiPmPageMetaList || []).forEach(pmPageMetaList => {
+        [].push.apply(travseConfigs, pmPageMetaList)
+      })
+    } else if (currentConfig?.pmPageMetaList?.length) {
+      [].push.apply(travseConfigs, currentConfig.pmPageMetaList)
+    }
+  }
+  return true
+}