resolver-egretimp-plus 0.1.126 → 0.1.127

package/src/rules/rulesDriver.js

@@ -1,12 +1,11 @@
 /* eslint-disable */
 import { parseCondition } from './parseCondition'
 import { runEvent } from './eventsSupplement'
-import { OPEN_DATA_RULES } from '../config'
 
-const recoverCb = {}
+export const recoverCb = {}
 const recoverCbTimer = {}
 
-export default function(rules, isInit) {
+export default function(rules, isInit, OPEN_DATA_RULES) {
   if (OPEN_DATA_RULES) {
     return
   }
@@ -118,5 +117,19 @@ export function runClickRules(rules, isInit) {
   }
 }
 
+export function normalRecoverCb(config, index) {
+  const currentHire = config.dynamicHireRelat?.replace(new RegExp(`\\[\\d*\\]->${config.metaCode}$`), `[${index}]->${config.metaCode}`)
+  if (currentHire == config.dynamicHireRelat) {
+    return
+  }
+  Object.keys(recoverCb).forEach(key => {
+    const currentKey = key.replace(config.dynamicHireRelat, currentHire)
+    if (currentKey !== key) {
+      recoverCb[currentKey] = recoverCb[key]
+      delete recoverCb[key]
+    }
+  })
+}
+
 export { generateConfigsHireRelat } from './ruleUtils' 
 export { getCodeMapRules } from './parseCondition.js'

package/src/rulesOfDate/eventsSupplement.js

@@ -83,6 +83,7 @@ function replaceDefValue(str, {currentPath, rootValue, lang, route}) {
     return val
   })
 }
+export const actionPeddingMaps = {}
 const allInitEvents = {
   setDefaultValue({event, rootValue, mapComp, route, lang, currentPath, isInit}) {
     let { targetObj: target, targetObjVal } = event
@@ -145,7 +146,9 @@ const allInitEvents = {
     const { targetObj: target } = event
     if (!target) return
     const targetObj = `${target}`
-
+    if (targetObj === 'PreInitiationTab1->tabPane3->tabPlane4->projectTab->purchaseSolution->purchaseContent->forBidPackage->bidPackage->purchaseMethodRow->supplierId') {
+      debugger
+    }
     setFormVal(targetObj, '', mapComp, rootValue, currentPath)
 
   },
@@ -153,10 +156,16 @@ const allInitEvents = {
     const { targetObj: target } = event
     if (!target) return
     const targetObj = `${target}`
-    const configs = getCurrentComp({codesStr: targetObj, dynamicMapComp, currentPath})
-    configs.forEach(labelInfo => {
-      labelInfo && (labelInfo.editFlag = '0')
-    })
+    let configs = []
+
+    function toAction() {
+      configs = getCurrentComp({codesStr: targetObj, dynamicMapComp, currentPath})
+      configs.forEach(labelInfo => {
+        labelInfo && (labelInfo.editFlag = '0')
+      })
+    }
+    toAction()
+
     // 有的事件在不满足条件的情况下，需要进行恢复
     return () => {
       configs.forEach(labelInfo => {
@@ -204,6 +213,8 @@ const allInitEvents = {
           if (multiPmPageMetaList?.every(columns => columns[idx]?.requiredFlag == '0')) {
             labelInfo && labelInfo.refConfig && (labelInfo.refConfig.requiredFlag = '0')
           }
+        } else {
+          labelInfo && labelInfo.refConfig && (labelInfo.refConfig.requiredFlag = '0')
         }
       })
     }
@@ -225,39 +236,66 @@ const allInitEvents = {
     return () => {
       configs.forEach((labelInfo, idx) => {
         labelInfo && (labelInfo.requiredFlag = labelInfo._originRequiredFlag)
-        if (labelInfo.isColumn && labelInfo._originRequiredFlag == '0') {
-          // 表格列的必填设置，需要判断所有列是否都不是必填的
-          const pmPageMetaList = labelInfo?.parent?.pmPageMetaList || []
-          const multiPmPageMetaList = labelInfo?.parent?.multiPmPageMetaList || []
-          const idx = pmPageMetaList?.findIndex(cg => cg.metaCode === labelInfo.metaCode)
-          if (multiPmPageMetaList?.every(columns => columns[idx]?.requiredFlag == '0')) {
+        if (labelInfo.isColumn) {
+          if (labelInfo._originRequiredFlag == '0') {
+            // 表格列的必填设置，需要判断所有列是否都不是必填的
+            const pmPageMetaList = labelInfo?.parent?.pmPageMetaList || []
+            const multiPmPageMetaList = labelInfo?.parent?.multiPmPageMetaList || []
+            const idx = pmPageMetaList?.findIndex(cg => cg.metaCode === labelInfo.metaCode)
+            if (multiPmPageMetaList?.every(columns => columns[idx]?.requiredFlag == '0')) {
+              labelInfo && labelInfo.refConfig && (labelInfo.refConfig.requiredFlag = labelInfo._originRequiredFlag)
+            }
+          }
+        } else {
+          if (labelInfo._originRequiredFlag == '0') {
             labelInfo && labelInfo.refConfig && (labelInfo.refConfig.requiredFlag = labelInfo._originRequiredFlag)
           }
         }
       })
     }
   },
-  setHidden({event, rootValue, mapComp, dynamicMapComp, currentPath, isInit}) {
+  setHidden({event, rootValue, mapComp, dynamicMapComp, currentPath, isInit, relIdKey}) {
     const { targetObj: target } = event
     if (!target) return
     const targetObj = `${target}`
-    const configs = getCurrentComp({codesStr: targetObj, dynamicMapComp, currentPath})
+    let configs = []
+    function toAction() {
+      configs = getCurrentComp({codesStr: targetObj, dynamicMapComp, currentPath})
+      configs.forEach(labelInfo => {
+        labelInfo && (labelInfo.hidden = '1')
+        // if (labelInfo.isColumn) {
+          labelInfo && labelInfo.refConfig && (labelInfo.refConfig.hidden = '1')
+        // }
+      })
+    }
+    toAction()
+
+    // 为了支持循环组件中还没加载出来的组件进行了动作的设置 ====start====
+    // !actionPeddingMaps[targetObj] && (actionPeddingMaps[targetObj] = [])
+    // const penddingId = `${relIdKey}_setHidden`
+    // const existIdx = actionPeddingMaps[targetObj].findIndex(item => item.id === penddingId)
+    // if (existIdx > -1) {
+    //   actionPeddingMaps[targetObj].splice(existIdx, 1)
+    // }
+    // actionPeddingMaps[targetObj].push({
+    //   id: penddingId,
+    //   currentPath,
+    //   action: toAction
+    // })
+    // 为了支持循环组件中还没加载出来的组件进行了动作的设置 ====end====
 
-    configs.forEach(labelInfo => {
-      labelInfo && (labelInfo.hidden = '1')
-      if (labelInfo.isColumn) {
-        labelInfo && labelInfo.refConfig && (labelInfo.refConfig.hidden = '1')
-      }
-    })
-    
     // 有的事件在不满足条件的情况下，需要进行恢复
     return () => {
       configs.forEach((labelInfo, idx) => {
         labelInfo && (labelInfo.hidden = '0')
-        if (labelInfo.isColumn) {
+        // if (labelInfo.isColumn) {
           labelInfo && labelInfo.refConfig && (labelInfo.refConfig.hidden = '0')
-        }
+        // }
       })
+      // const actionIdx = actionPeddingMaps[targetObj].findIndex(item => item.id === penddingId)
+      // if (actionIdx > -1) {
+      //   actionPeddingMaps[targetObj].splice(actionIdx, 1)
+      // }
     }
   },
   setShow({event, rootValue, mapComp, dynamicMapComp, currentPath, isInit}) {
@@ -267,17 +305,17 @@ const allInitEvents = {
     const configs = getCurrentComp({codesStr: targetObj, dynamicMapComp, currentPath})
     configs.forEach((labelInfo) => {
       labelInfo && (labelInfo.hidden = '0')
-      if (labelInfo.isColumn) {
+      // if (labelInfo.isColumn) {
         labelInfo && labelInfo.refConfig && (labelInfo.refConfig.hidden = '0')
-      }
+      // }
     })
     // 有的事件在不满足条件的情况下，需要进行恢复
     return () => {
       configs.forEach((labelInfo, idx) => {
         labelInfo && (labelInfo.hidden = '1')
-        if (labelInfo.isColumn) {
+        // if (labelInfo.isColumn) {
           labelInfo && labelInfo.refConfig && (labelInfo.refConfig.hidden = '1')
-        }
+        // }
       })
     }
   },
@@ -299,6 +337,8 @@ const allInitEvents = {
           if (multiPmPageMetaList?.every(columns => columns[idx]?.requiredFlag == '0')) {
             labelInfo && labelInfo.refConfig && (labelInfo.refConfig.requiredFlag = '0')
           }
+        } else {
+          labelInfo && labelInfo.refConfig && (labelInfo.refConfig.requiredFlag = '0')
         }
         // 有的事件在不满足条件的情况下，需要进行恢复
         callFns.push(() => {
@@ -333,6 +373,8 @@ const allInitEvents = {
           if (multiPmPageMetaList?.every(columns => columns[idx]?.requiredFlag == '0')) {
             labelInfo && labelInfo.refConfig && (labelInfo.refConfig.requiredFlag = '0')
           }
+        } else {
+          labelInfo && labelInfo.refConfig && (labelInfo.refConfig.requiredFlag = '0')
         }
 
         // 有的事件在不满足条件的情况下，需要进行恢复
@@ -347,6 +389,8 @@ const allInitEvents = {
               if (multiPmPageMetaList?.every(columns => columns[idx]?.requiredFlag == '0')) {
                 labelInfo && labelInfo.refConfig && (labelInfo.refConfig.requiredFlag = labelInfo._originRequiredFlag)
               }
+            } else {
+              labelInfo && labelInfo.refConfig && (labelInfo.refConfig.requiredFlag = labelInfo._originRequiredFlag)
             }
           } else {
             labelInfo && labelInfo.refConfig && (labelInfo.refConfig.requiredFlag = labelInfo._originRequiredFlag)
@@ -518,8 +562,9 @@ const allInitEvents = {
   setProps({event, rootValue, mapComp, dynamicMapComp, currentPath, messageInstance, isInit}) {
     const { targetObj: target, targetObjVal } = event
     if (!target) return
-
     const targetObj = `${target}`
+    const configs = getCurrentComp({codesStr: targetObj, dynamicMapComp, currentPath})
+    
     let val = ''
     try {
       val = parseExtendAttr(
@@ -534,8 +579,6 @@ const allInitEvents = {
     }
     delete val.metaCode
     if (!isPlainObject(val)) return
-
-    const configs = getCurrentComp({codesStr: targetObj, dynamicMapComp, currentPath})
     const porpsKeys = Object.keys(val)
     configs.forEach((labelInfo) => {
       let updateFlag = false
@@ -583,12 +626,45 @@ const allInitEvents = {
 
 export default allInitEvents
 
-export function runEvent({events, rootValue, mapComp, dynamicMapComp, route, lang, currentPath, isInit, rule, messageInstance}) {
+export function runEvent({events, rootValue, mapComp, dynamicMapComp, route, lang, currentPath, isInit, rule, messageInstance, relIdKey}) {
   events = events || []
   return events.map(event => {
     const { eventId } = event
     const eventCode = eventsMap[eventId]
-    return allInitEvents[eventCode] && allInitEvents[eventCode]({event, rootValue, mapComp, dynamicMapComp, route, lang, currentPath, isInit, rule, messageInstance})
+    let actionRecoverCb = allInitEvents[eventCode] && allInitEvents[eventCode]({event, rootValue, mapComp, dynamicMapComp, route, lang, currentPath, isInit, rule, messageInstance, relIdKey})
+    const retObj = {
+      recoverCb: null
+    }
+    if (actionRecoverCb) {
+      const { targetObj } = event
+      // 为了支持循环组件中还没加载出来的组件进行了动作的设置 ====start====
+      !actionPeddingMaps[targetObj] && (actionPeddingMaps[targetObj] = [])
+      const penddingId = `${relIdKey}_${eventCode}`
+      const existIdx = actionPeddingMaps[targetObj].findIndex(item => item.id === penddingId)
+      if (existIdx > -1) {
+        actionPeddingMaps[targetObj].splice(existIdx, 1)
+      }
+      actionPeddingMaps[targetObj].push({
+        id: penddingId,
+        currentPath,
+        action: () => {
+          actionRecoverCb = allInitEvents[eventCode] && allInitEvents[eventCode]({event, rootValue, mapComp, dynamicMapComp, route, lang, currentPath, isInit, rule, messageInstance, relIdKey})
+        }
+      })
+      // 为了支持循环组件中还没加载出来的组件进行了动作的设置 ====end====
+  
+      retObj.recoverCb = () => {
+        actionRecoverCb?.()
+        const actionIdx = actionPeddingMaps[targetObj].findIndex(item => item.id === penddingId)
+        if (actionIdx > -1) {
+          actionPeddingMaps[targetObj].splice(actionIdx, 1)
+        }
+      }
+    } else {
+      retObj.recoverCb = actionRecoverCb
+    }
+
+    return retObj
   })
 }
 

package/src/rulesOfDate/ruleUtils.js

@@ -87,7 +87,7 @@ export function setFormVal(pathStr, val, mapComp, rootValue, currentPath) {
   let assignPath = null
   if (diffIdx !== -1) {
     difComps = comps.slice(diffIdx)
-    const prefix = comps.slice(0, diffIdx).join('->')
+    const prefix = pathArr.slice(0, diffIdx).join('->')
     assignPath = calcAssignPath(difComps, 0, prefix)
   } else {
     assignPath = pathArr.join('->')

package/src/rulesOfDate/rulesDriver.js

@@ -21,22 +21,26 @@ export default function({
   // this.rules = rules
 
   if (rules && rules.length) {
+    const executeFns = []
     rules.forEach(rule => {
       if (!rule) return
       const { pmRuleTargetEventVoList, pmRuleTargetEventVOList, relId } = rule
       const relIdKey = `${relId}__${currentPath}`
       if (parseCondition({rule, rootValue: unref(rootValue), currentPath})) {
-        const recovers = runEvent({events: pmRuleTargetEventVoList || pmRuleTargetEventVOList, rootValue, route, lang, currentPath, mapComp, dynamicMapComp, isInit, rule, messageInstance})
-        recoverCb[relIdKey] = recovers
+        executeFns.push(() => {
+          const recovers = runEvent({events: pmRuleTargetEventVoList || pmRuleTargetEventVOList, rootValue, route, lang, currentPath, mapComp, dynamicMapComp, isInit, rule, messageInstance, relIdKey})
+          recoverCb[relIdKey] = recovers
+        })
       } else {
         recoverCb[relIdKey] && recoverCb[relIdKey].forEach(recover => {
-          if (recover) {
-            recover()
+          if (recover?.recoverCb) {
+            recover?.recoverCb()
           }
         })
         delete recoverCb[relIdKey]
       }
     })
+    executeFns.forEach(cb => cb?.())
   }
 }
 

package/src/utils/render.jsx

@@ -38,8 +38,9 @@ import { dispatchClickEvent, dispatchClickEvents, executeEventOrchestration, get
 import CmiFormItem from '../components/cmiFormItem'
 import loadModule from './loadModule.js'
 import dayjs from 'dayjs'
-import { OPEN_DATA_RULES } from '../config.js'
 import { useVmodels } from '../hooks/reactive.js'
+import LazyLoadComponent, { LazyLoadSkeleton } from '../components/lazyLoadComponent/index.js'
+import { actionPeddingMaps } from '../rulesOfDate/eventsSupplement.js'
 
 export const COFNGI_KEY_EVENT_FLAG = /^on[A-Z]/
 
@@ -120,6 +121,7 @@ export function generateFormConfig(lang = 'zh', isH5) {
  * @param {*} config 通过接口获取的配置对象
  */
 export function parsePageConfig({
+  OPEN_DATA_RULES,
   components,
   confirmInstance,
   openChildDialogInstance,
@@ -146,6 +148,7 @@ export function parsePageConfig({
   const cbs = []
   window?.performance?.mark('noraml_config_start')
   let { pageConfig, mapComp } = normalConfig({
+    OPEN_DATA_RULES,
     components,
     confirmInstance,
     openChildDialogInstance,
@@ -237,6 +240,7 @@ function canReuse(
  * @param {*} config 
  */
 export function normalConfig({
+  OPEN_DATA_RULES,
   components,
   confirmInstance,
   openChildDialogInstance,
@@ -295,6 +299,18 @@ export function normalConfig({
     definePrivatelyProp(config, '_rootValue', rootValue)
     definePrivatelyProp(config, 'refValue', useVmodels(config).modelValue)
     definePrivatelyProp(config, 'parent', parentConfig) // 这边手动设置一下，防止组件复用的时候不会刷新，造成parent的丢失
+    if (!config.refConfig && parentConfig?.refConfig) {
+      definePrivatelyProp(config, 'refConfig', parentConfig.refConfig?.pmPageMetaList?.find(item => item.metaCode === config.metaCode))
+    }
+    if (actionPeddingMaps[hireRelat]) {
+      actionPeddingMaps[hireRelat].forEach(peddingAction => {
+        peddingAction?.action()
+      })
+    }
+    // 如何子组件中有自定义组件，不开启懒加载
+    if (config.renderby) {
+      travelParentConfigLazy(config)
+    }
   }
 
   if (!notParseConfig) {
@@ -512,6 +528,7 @@ export function normalConfig({
       function simpleNormalPmPageMetaList({pmPageMetaList, dynamicHireRelat, unWatchsList, noParsePageMetaList, changeConfig, notParseConfig}) {
         return pmPageMetaList.map(metaItem => {
           const { pageConfig } = normalConfig({
+            OPEN_DATA_RULES,
             components,
             confirmInstance,
             openChildDialogInstance,
@@ -548,6 +565,16 @@ export function normalConfig({
   }
 }
 
+// _notOpenLazyopenLazy 属性
+// 如果是自定义组件，父层级组件都不能进行懒加载
+export function travelParentConfigLazy(config) {
+  definePrivatelyProp(config, '_notOpenLazy', true)
+  while (config.parent) {
+    config = config.parent
+    definePrivatelyProp(config, '_notOpenLazy', true)
+  }
+}
+
 // 目前做数据进行驱动规则、循环组件的config渲染，需要兼容一些现有业务逻辑
 function compatibilityConfig({
   config,
@@ -702,7 +729,7 @@ export function isPlainColumn(config, disabled) {
 }
 
 // 判断是否可以显示组件（需要开启数据驱动规则事件的时候）
-export function canHiddenConfig(config) {
+export function canHiddenConfig(config, OPEN_DATA_RULES) {
   let retFlag = OPEN_DATA_RULES && config.hidden == '1'
   if (!retFlag) return false
   
@@ -896,10 +923,6 @@ export function generateLayoutPolyfill(config, disabled, isH5) {
     ...elColSpecialProsp(config),
   }
   return node => {
-    // 表格中中的列，是否需要转换为普通形式
-    // if (isPlainColumn(config, disabled)) {
-    //   return node
-    // }
     
     if (config.removeCol) {
       return node
@@ -972,6 +995,34 @@ function parseIntColProps(obj) {
   return obj
 }
 
+// 生成懒加载vnode
+function generateLazyNode(node, config) {
+  if (config._notOpenLazy) {
+    return node
+  }
+  let height = 32
+  if (config.isColumn) {
+    height = 23
+  }
+  if (findComponent([FORM_META_TYPE, FORM_META_TYPE_H5], config.renderby || config.metaType) !== -1) {
+    height = '100vh'
+  } else if (findComponent(['CustomComponentCollapse', 'CustomComponentCard'], config.renderby || config.metaType) !== -1) {
+    height = 200
+  } else if (findComponent(['CustomComponentTabs'], config.renderby || config.metaType) !== -1) {
+    height = 400
+  } else if (findComponent(['CustomComponentTable'], config.renderby || config.metaType) !== -1) {
+    height = 300
+  }
+  return (
+    <LazyLoadComponent config={config}>
+      {{
+        default: () => node,
+        skeleton: () => <LazyLoadSkeleton  key={Math.random()} height={height}></LazyLoadSkeleton>
+      }}
+    </LazyLoadComponent>
+  )
+}
+
 function generateFormItemPc (config, lang, compProps, params,) {
   let isFormItem = false
   let props = {}
@@ -1003,6 +1054,9 @@ function generateFormItemPc (config, lang, compProps, params,) {
     }
   }
   return node => {
+    if (params.OPEN_DATA_RULES) {
+      node = generateLazyNode(node, config)
+    }
     if (config.polyfillNode && typeof config.polyfillNode === 'function') {
       node = (
         <div style="width: 100%; line-height: 16px;">
@@ -1011,10 +1065,6 @@ function generateFormItemPc (config, lang, compProps, params,) {
         </div>
       )
     }
-    // 表格中中的列，是否需要转换为普通形式
-    // if (isPlainColumn(config, compProps.disabled)) {
-    //   return node
-    // }
     
     let showFormItem = null
     if (hasOwn(config, 'showFormItem')) {

package/src/utils/validateByData.js

@@ -1,6 +1,6 @@
-import { toRaw } from "vue"
+import { nextTick, toRaw } from "vue"
 import { calcDisable } from "./const"
-import { getFormItemRule, isCycleConfig } from "./render"
+import { getFormItemRule, isCycleConfig, travelParentConfigLazy } from "./render"
 import AsyncValidator from 'async-validator'
 
 export async function toValidate({
@@ -145,6 +145,8 @@ function validateConfig({
         try {
           await validator.validate({[config.dynamicHireRelat]: toRaw(config?.refValue)})
         } catch (error) {
+          travelParentConfigLazy(config)
+          await nextTick()
           validFailAction({[config.dynamicHireRelat]: true}, dynamicMapComp)
           return Promise.reject()
         }