resolver-egretimp-plus 0.1.118 → 0.1.119

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "resolver-egretimp-plus",
-  "version": "0.1.118",
+  "version": "0.1.119",
   "description": "交付体验渲染",
   "main": "./dist/web/index.js",
   "module": "./dist/web/index.js",

package/src/hooks/watchRuels.js

@@ -6,7 +6,9 @@ export function toWatchRules({
   rules,
   rootValue,
   mapComp,
+  dynamicMapComp,
   route,
+  messageInstance,
   lang,
 }) {
   const ruleKeys = Object.keys(rules)
@@ -33,6 +35,7 @@ export function toWatchRules({
         rulesDriver({
           rules: rules[originKey],
           mapComp,
+          dynamicMapComp,
           rootValue,
           route,
           lang,
@@ -47,7 +50,11 @@ export function toWatchRules({
 function watchRuleTrace({comps, rootValue, watchCb}, prefix = '', idx = 0, unWatchsList = []) {
   if (comps && comps.length) {
     const comp = comps[idx]
-    prefix += prefix ? `->${comp.metaCode}` : comp.metaCode
+    try {
+      prefix += prefix ? `->${comp.metaCode}` : comp.metaCode
+    } catch (error) {
+      debugger
+    }
     if (comps.length === (idx + 1)) {
       const unWatch = watch(() => getPathVal(unref(rootValue), prefix, '->'), (val) => {
         // 开始执行规则
@@ -72,17 +79,21 @@ function watchRuleTrace({comps, rootValue, watchCb}, prefix = '', idx = 0, unWat
             const childUnWatchs = []
             unWatchsList.push(childUnWatchs)
             const currentPrefix = `${prefix}[${index}]`
-            idx++
-            watchRuleTrace({comps, rootValue, watchCb}, currentPrefix, idx, [...unWatchsList])
+            const currentIdx = idx + 1
+            watchRuleTrace({comps, rootValue, watchCb}, currentPrefix, currentIdx, [...unWatchsList])
             _rowMapWatchs.set(row, {key: currentPrefix, childUnWatchs})
           }
         })
-        const mapKeys = _rowMapWatchs.keys()
-        mapKeys.forEach(row => {
-          if (!list.some(row2 => row2 === row)) {
-            _rowMapWatchs.get(row)?.childUnWatchs?.forEach(un => un?.())
-          }
-        })
+        try {
+          const mapKeys = _rowMapWatchs.keys()
+          Array.from(mapKeys).forEach(row => {
+            if (!list.some(row2 => row2 === row)) {
+              _rowMapWatchs.get(row)?.childUnWatchs?.forEach(un => un?.())
+            }
+          })
+        } catch (error) {
+          debugger
+        }
       }, {
         immediate: true
       })

package/src/index.jsx

@@ -413,7 +413,9 @@ export default {
     //   rules: hireRelatMapRulesRef.value,
     //   rootValue: toRef(props, 'modelValue'),
     //   mapComp: mapCompRef.value,
+    //   dynamicMapComp,
     //   route,
+    //   messageInstance: props.messageInstance,
     //   lang: props.lang,
     // })
     onMounted(() => {

package/src/rulesOfDate/eventsSupplement.js

@@ -30,6 +30,7 @@ import { ARG_FLAGS, MULTI_PAGE_META_LIST_TYPES } from '../utils/const'
 // import { commModal } from '../../../common/components/cmi/components/comm-modal-tip/index'
 import { findComponent, formatDate, getPathVal, hasOwn, isPlainObject, parseExtendAttr } from '../utils/index';
 import { unref } from 'vue';
+import { assignmentPathVal } from '../utils';
 const valArrTypes = [...MULTI_PAGE_META_LIST_TYPES]
 const valBooleanTypes = []
 
@@ -127,7 +128,7 @@ const allInitEvents = {
         if (matchs) {
           val = matchs?.[1]
         } else  {
-          const curVal = getConfigValue.call(this, targetObj, true)
+          const curVal = getConfigValue(unref(rootValue), targetObj, currentPath)
           if (curVal || curVal == '0') {
             val = curVal
           }
@@ -148,11 +149,11 @@ const allInitEvents = {
     setFormVal(targetObj, '', mapComp, rootValue, currentPath)
 
   },
-  setDisable({event, rootValue, mapComp, currentPath, isInit}) {
+  setDisable({event, rootValue, mapComp, dynamicMapComp, currentPath, isInit}) {
     const { targetObj: target } = event
     if (!target) return
     const targetObj = `${target}`
-    const configs = getCurrentComp.call(this, targetObj)
+    const configs = getCurrentComp({codesStr: targetObj, dynamicMapComp, currentPath})
     configs.forEach(labelInfo => {
       labelInfo && (labelInfo.editFlag = '0')
     })
@@ -163,30 +164,29 @@ const allInitEvents = {
       })
     }
   },
-  setDisableNotEffect(event, isInit, tabpanelCode) {
+  setDisableNotEffect({event, rootValue, mapComp, dynamicMapComp, currentPath, isInit}) {
     const { targetObj: target } = event
     if (!target) return
-    const targetObj = `${tabpanelCode ? tabpanelCode + '->' : ''}${target}`
-    const configs = getCurrentComp.call(this, targetObj)
-    const oldEditFlags = []
+    const targetObj = `${target}`
+    const configs = getCurrentComp({codesStr: targetObj, dynamicMapComp, currentPath})
     configs.forEach(labelInfo => {
-      const oldEditFlag = labelInfo && labelInfo.editFlag
-      oldEditFlags.push(oldEditFlag)
+      if (!hasOwn(labelInfo, '_originEditFlag')) {
+        labelInfo._originEditFlag = labelInfo.editFlag
+      }
       labelInfo && (labelInfo.editFlag = '0')
     })
     // 有的事件在不满足条件的情况下，需要进行恢复
     return () => {
       configs.forEach((labelInfo, idx) => {
-        const oldEditFlag = oldEditFlags[idx]
-        labelInfo && (labelInfo.editFlag = oldEditFlag)
+        labelInfo && (labelInfo.editFlag = labelInfo._originEditFlag)
       })
     }
   },
-  setRequired(event, isInit, tabpanelCode) {
+  setRequired({event, rootValue, mapComp, dynamicMapComp, currentPath, isInit}) {
     const { targetObj: target } = event
     if (!target) return
-    const targetObj = `${tabpanelCode ? tabpanelCode + '->' : ''}${target}`
-    const configs = getCurrentComp.call(this, targetObj)
+    const targetObj = `${target}`
+    const configs = getCurrentComp({codesStr: targetObj, dynamicMapComp, currentPath})
     configs.forEach(labelInfo => {
       labelInfo && (labelInfo.requiredFlag = '1')
       labelInfo && labelInfo.refConfig && (labelInfo.refConfig.requiredFlag = '1')
@@ -196,103 +196,114 @@ const allInitEvents = {
     return () => {
       configs.forEach(labelInfo => {
         labelInfo && (labelInfo.requiredFlag = '0')
-        labelInfo && labelInfo.refConfig && (labelInfo.refConfig.requiredFlag = '0')
+        if (labelInfo.isColumn) {
+          // 表格列的必填设置，需要判断所有列是否都不是必填的
+          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 = '0')
+          }
+        }
       })
     }
   },
-  setRequiredNotEffect(event, isInit, tabpanelCode) {
+  setRequiredNotEffect({event, rootValue, mapComp, dynamicMapComp, currentPath, isInit}) {
     const { targetObj: target } = event
     if (!target) return
-    const targetObj = `${tabpanelCode ? tabpanelCode + '->' : ''}${target}`
-    const configs = getCurrentComp.call(this, targetObj)
+    const targetObj = `${target}`
+    const configs = getCurrentComp({codesStr: targetObj, dynamicMapComp, currentPath})
 
-    const oldRequiredFlags = []
     configs.forEach(labelInfo => {
-      const oldRequiredFlag = labelInfo && labelInfo.requiredFlag
-      oldRequiredFlags.push(oldRequiredFlag)
+      if (!hasOwn(labelInfo, '_originRequiredFlag')) {
+        labelInfo._originRequiredFlag = labelInfo.requiredFlag
+      }
       labelInfo && (labelInfo.requiredFlag = '1')
       labelInfo && labelInfo.refConfig && (labelInfo.refConfig.requiredFlag = '1')
     })
     // 有的事件在不满足条件的情况下，需要进行恢复
     return () => {
       configs.forEach((labelInfo, idx) => {
-        const oldRequiredFlag = oldRequiredFlags[idx]
-        labelInfo && (labelInfo.requiredFlag = oldRequiredFlag)
-        labelInfo && labelInfo.refConfig && (labelInfo.refConfig.requiredFlag = oldRequiredFlag)
+        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')) {
+            labelInfo && labelInfo.refConfig && (labelInfo.refConfig.requiredFlag = labelInfo._originRequiredFlag)
+          }
+        }
       })
     }
   },
-  setHidden(event, isInit, tabpanelCode) {
+  setHidden({event, rootValue, mapComp, dynamicMapComp, currentPath, isInit}) {
     const { targetObj: target } = event
     if (!target) return
-    const targetObj = `${tabpanelCode ? tabpanelCode + '->' : ''}${target}`
-    const configs = getCurrentComp.call(this, targetObj, 'setHidden')
-    // const oldDisplayTypes = []
-    // 隐藏的效果需要晚点触发，才能正常执行清空等一些列需要组件操作
-    setTimeout(() => {
-      configs.forEach(labelInfo => {
-        // const oldDisplayType = labelInfo && labelInfo.displayType
-        // oldDisplayTypes.push(oldDisplayType)
-        // 兼容开始使用displayType用于显示隐藏的配置
-        labelInfo && /^\d+$/.test(labelInfo.displayType) && (labelInfo.displayType = '0')
-        labelInfo && (labelInfo.hidden = '1')
-        labelInfo && labelInfo.refConfig && (labelInfo.refConfig.displayType = '0')
+    const targetObj = `${target}`
+    const configs = getCurrentComp({codesStr: targetObj, dynamicMapComp, currentPath})
+
+    configs.forEach(labelInfo => {
+      labelInfo && (labelInfo.hidden = '1')
+      if (labelInfo.isColumn) {
         labelInfo && labelInfo.refConfig && (labelInfo.refConfig.hidden = '1')
-      })
-    }, 0)
+      }
+    })
     
     // 有的事件在不满足条件的情况下，需要进行恢复
     return () => {
       configs.forEach((labelInfo, idx) => {
-        // const oldDisplayType = oldDisplayTypes[idx]
-        labelInfo && /^\d+$/.test(labelInfo.displayType) && (labelInfo.displayType = '1')
         labelInfo && (labelInfo.hidden = '0')
-        labelInfo && labelInfo.refConfig && (labelInfo.refConfig.displayType = '1')
-        labelInfo && labelInfo.refConfig && (labelInfo.refConfig.hidden = '0')
+        if (labelInfo.isColumn) {
+          labelInfo && labelInfo.refConfig && (labelInfo.refConfig.hidden = '0')
+        }
       })
     }
   },
-  setShow(event, isInit, tabpanelCode, rule) {
+  setShow({event, rootValue, mapComp, dynamicMapComp, currentPath, isInit}) {
     const { targetObj: target } = event
     if (!target) return
-    const targetObj = `${tabpanelCode ? tabpanelCode + '->' : ''}${target}`
-    const configs = getCurrentComp.call(this, targetObj, 'setShow')
-    // const oldDisplayTypes = []
+    const targetObj = `${target}`
+    const configs = getCurrentComp({codesStr: targetObj, dynamicMapComp, currentPath})
     configs.forEach((labelInfo) => {
-      // const oldDisplayType = labelInfo && labelInfo.displayType
-      // oldDisplayTypes.push(oldDisplayType)
-      labelInfo && /^\d+$/.test(labelInfo.displayType) && (labelInfo.displayType = '1')
       labelInfo && (labelInfo.hidden = '0')
-      labelInfo && labelInfo.refConfig && (labelInfo.refConfig.displayType = '1')
-      labelInfo && labelInfo.refConfig && (labelInfo.refConfig.hidden = '0')
+      if (labelInfo.isColumn) {
+        labelInfo && labelInfo.refConfig && (labelInfo.refConfig.hidden = '0')
+      }
     })
     // 有的事件在不满足条件的情况下，需要进行恢复
     return () => {
-      // 隐藏的效果需要晚点触发，才能正常执行清空等一些列需要组件操作
-      return setTimeout(() => {
-        configs.forEach((labelInfo, idx) => {
-          // const oldDisplayType = oldDisplayTypes[idx]
-          labelInfo && /^\d+$/.test(labelInfo.displayType) && (labelInfo.displayType = '0')
-          labelInfo && (labelInfo.hidden = '1')
-          labelInfo && labelInfo.refConfig && (labelInfo.refConfig.displayType = '0')
+      configs.forEach((labelInfo, idx) => {
+        labelInfo && (labelInfo.hidden = '1')
+        if (labelInfo.isColumn) {
           labelInfo && labelInfo.refConfig && (labelInfo.refConfig.hidden = '1')
-        })
-      }, 0)
+        }
+      })
     }
   },
-  setNoRequired(event, isInit, tabpanelCode) {
+  setNoRequired({event, rootValue, mapComp, dynamicMapComp, currentPath, isInit}) {
     const { targetObj: target } = event
     if (!target) return
-    const targetObj = `${tabpanelCode ? tabpanelCode + '->' : ''}${target}`
-    const configs = getCurrentComp.call(this, targetObj)
-
+    const targetObj = `${target}`
+    const configs = getCurrentComp({codesStr: targetObj, dynamicMapComp, currentPath})
+ 
     const callFns = []
     configs.forEach(labelInfo => {
       if (labelInfo && labelInfo.requiredFlag != '0') {
         labelInfo && (labelInfo.requiredFlag = '0')
+        if (labelInfo.isColumn) {
+          // 表格列的必填设置，需要判断所有列是否都不是必填的
+          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 = '0')
+          }
+        }
         // 有的事件在不满足条件的情况下，需要进行恢复
         callFns.push(() => {
           labelInfo && (labelInfo.requiredFlag = '1')
+          labelInfo && labelInfo.refConfig && (labelInfo.refConfig.requiredFlag = '1')
         })
       }
     })
@@ -300,66 +311,102 @@ const allInitEvents = {
       callFns.forEach(fn => fn())
     }
   },
-  setNoRequiredNotEffect(event, isInit, tabpanelCode) {
+  setNoRequiredNotEffect({event, rootValue, mapComp, dynamicMapComp, currentPath, isInit}) {
     const { targetObj: target } = event
     if (!target) return
-    const targetObj = `${tabpanelCode ? tabpanelCode + '->' : ''}${target}`
-    const configs = getCurrentComp.call(this, targetObj)
+    const targetObj = `${target}`
+    const configs = getCurrentComp({codesStr: targetObj, dynamicMapComp, currentPath})
 
-    const oldRequiredFlags = []
+    const callFns = []
     configs.forEach(labelInfo => {
-      const oldRequiredFlag = labelInfo && labelInfo.requiredFlag
-      oldRequiredFlags.push(oldRequiredFlag)
-      labelInfo && (labelInfo.requiredFlag = '0')
+      if (labelInfo && labelInfo.requiredFlag != '0') {
+        if (!hasOwn(labelInfo, '_originRequiredFlag')) {
+          labelInfo._originRequiredFlag = labelInfo.requiredFlag
+        }
+        labelInfo && (labelInfo.requiredFlag = '0')
+
+        if (labelInfo.isColumn) {
+          // 表格列的必填设置，需要判断所有列是否都不是必填的
+          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 = '0')
+          }
+        }
+
+        // 有的事件在不满足条件的情况下，需要进行恢复
+        callFns.push(() => {
+          labelInfo && (labelInfo.requiredFlag = labelInfo._originRequiredFlag)
+          if (labelInfo._originRequiredFlag == '0') {
+            if (labelInfo.isColumn) {
+              // 表格列的必填设置，需要判断所有列是否都不是必填的
+              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 {
+            labelInfo && labelInfo.refConfig && (labelInfo.refConfig.requiredFlag = labelInfo._originRequiredFlag)
+          }
+        })
+      }
     })
     
     // 有的事件在不满足条件的情况下，需要进行恢复
     return () => {
-      configs.forEach((labelInfo, idx) => {
-        const oldRequiredFlag = oldRequiredFlags[idx]
-        labelInfo && (labelInfo.requiredFlag = oldRequiredFlag)
-      })
+      callFns.forEach(fn => fn())
     }
   },
-  setNoDisable(event, isInit, tabpanelCode) {
+  setNoDisable({event, rootValue, mapComp, dynamicMapComp, currentPath, isInit}) {
     const { targetObj: target } = event
     if (!target) return
-    const targetObj = `${tabpanelCode ? tabpanelCode + '->' : ''}${target}`
-    const configs = getCurrentComp.call(this, targetObj)
+    const targetObj = `${target}`
+    const configs = getCurrentComp({codesStr: targetObj, dynamicMapComp, currentPath})
+
+    const callFns = []
     configs.forEach((labelInfo) => {
-      labelInfo && (labelInfo.editFlag = '1')
+      if (labelInfo?.editFlag != '1') {
+        labelInfo && (labelInfo.editFlag = '1')
+        callFns.push(() => {
+          labelInfo && (labelInfo.editFlag = '0')
+        })
+      }
     })
     // 有的事件在不满足条件的情况下，需要进行恢复
     return () => {
-      configs.forEach((labelInfo) => {
-        labelInfo && (labelInfo.editFlag = '0')
-      })
+      callFns.forEach(fn => fn())
     }
   },
-  setNoDisableNotEffect(event, isInit, tabpanelCode) {
+  setNoDisableNotEffect({event, rootValue, mapComp, dynamicMapComp, currentPath, isInit}) {
     const { targetObj: target } = event
     if (!target) return
-    const targetObj = `${tabpanelCode ? tabpanelCode + '->' : ''}${target}`
-    const configs = getCurrentComp.call(this, targetObj)
-    const oldEditFlags = []
+    const targetObj = `${target}`
+    const configs = getCurrentComp({codesStr: targetObj, dynamicMapComp, currentPath})
+
+    const callFns = []
     configs.forEach((labelInfo) => {
-      const oldEditFlag = labelInfo && labelInfo.editFlag
-      oldEditFlags.push(oldEditFlag)
+      if (!hasOwn(labelInfo, '_originEditFlag')) {
+        labelInfo._originEditFlag = labelInfo.editFlag
+      }
       labelInfo && (labelInfo.editFlag = '1')
+
+      callFns.push(() => {
+        labelInfo && (labelInfo.editFlag = labelInfo._originEditFlag)
+      })
     })
     
     // 有的事件在不满足条件的情况下，需要进行恢复
     return () => {
-      configs.forEach((labelInfo, idx) => {
-        const oldEditFlag = oldEditFlags[idx]
-        labelInfo && (labelInfo.editFlag = oldEditFlag)
-      })
+      callFns.forEach(fn => fn())
     }
   },
-  limitDataRange(event, isInit, tabpanelCode) {
+  limitDataRange({event, rootValue, mapComp, dynamicMapComp, currentPath, messageInstance, isInit}) {
     const { targetObj: target, targetObjVal = '' } = event
     if (!target) return
-    const targetObj = `${tabpanelCode ? tabpanelCode + '->' : ''}${target}`
+    const targetObj = `${target}`
     let range = []
     if (targetObjVal?.indexOf('~') > -1) {
       range = targetObjVal.split('~')
@@ -367,14 +414,12 @@ const allInitEvents = {
       range = targetObjVal.split(',')
     }
     if (range && range.length) {
-      const oldPorpsList = []
-      const configs = getCurrentComp.call(this, targetObj)
+      const configs = getCurrentComp({codesStr: targetObj, dynamicMapComp, currentPath})
       configs.forEach(config => {
         let updateFlag = false
         const oldProps = {}
-        oldPorpsList.push(oldProps)
+        config._eventLimitDataRageCbProps = oldProps
         if (!config) return
-        const { config: currentConfig } = this
         let val = ''
         if (findComponent(['ElDatePicker'], config?.renderby || config?.metaType) !== -1) {
           const min = range[0]
@@ -383,9 +428,9 @@ const allInitEvents = {
             val = parseExtendAttr(
               {
                 extendAttr: JSON.stringify({min, max}),
-                metaCode: `event limitDataRange code:${config.metaCode}`
+                metaCode: `event setPorps code, target path: ${currentPath}`
               },
-              currentConfig?.bindValue
+              getPathVal(unref(rootValue), currentPath, '->')
             )
           } catch (err) {
             val = ''
@@ -396,20 +441,21 @@ const allInitEvents = {
             val = parseExtendAttr(
               {
                 extendAttr: JSON.stringify({rangeOptions: range}),
-                metaCode: `event limitDataRange code:${config.metaCode}`
+                metaCode: `event setPorps code, target path: ${currentPath}`
               },
-              currentConfig?.bindValue
+              getPathVal(unref(rootValue), currentPath, '->')
             )
           } catch (err) {
             val = ''
           }
         } else {
-          const currentVal = getConfigValue.call(this, targetObj, true)
+          const currentVal = getPathVal(unref(rootValue), config.dynamicHireRelat, '->')
           if (min && lessThan(currentVal, min)) {
-            setFormVal.call(this, config, min)
+
+            assignmentPathVal(rootValue, config.dynamicHireRelat, min, '->')
           }
           if (max && greaterThan(currentVal, max)) {
-            setFormVal.call(this, config, max)
+            assignmentPathVal(rootValue, config.dynamicHireRelat, max, '->')
           }
           return
         }
@@ -423,8 +469,7 @@ const allInitEvents = {
             updateFlag = true
           }
           if ((typeof val[key]) === 'string') {
-            const { config: currentConfig } = this
-            const bindValue = currentConfig?.bindValue
+            const bindValue = getPathVal(unref(rootValue), currentPath, '->')
             config[key] = val[key].replace(/\{([^}]+)\}/g, (originVal, matchVal) => {
               if (matchVal.trimEnd().trimStart() === ARG_FLAGS.REF_VAL) {
                 return bindValue
@@ -443,51 +488,43 @@ const allInitEvents = {
         }
       })
       return () => {
-        // 需要晚点触发，才能正常执行清空等一些列需要组件操作
-        // return setTimeout(() => {
         configs.forEach((labelInfo, idx) => {
-          const oldProps = oldPorpsList[idx]
+          const oldProps = labelInfo._eventLimitDataRageCbProps
           if (!labelInfo) return
           const porpsKeys = Object.keys(oldProps)
           porpsKeys.forEach(key => {
             labelInfo[key] = oldProps[key]
           })
         })
-        // }, 0)
       }
     }
   },
-  setPopup(event, isInit, tabpanelCode) {
+  setPopup({event, rootValue, lang, mapComp, dynamicMapComp, currentPath, isInit}) {
     const { targetMsg, targetMsgEn } = event
-    const msg = this.lang.value.indexOf('zh') > -1 ? targetMsg : targetMsgEn
-    this.messageInstance.warning(msg, '', {
+    const msg = lang?.indexOf('zh') > -1 ? targetMsg : targetMsgEn
+    messageInstance.warning(msg, '', {
       showCancelButton: false,
     });
-    // commModal({
-      // msg: storage.get('aid-language').indexOf('zh') !== -1 ? targetMsg : targetMsgEn
-    // })
-    // document && document.body && document.body.click()
   },
-  openThePage(event, isInit, tabpanelCode) {
+  openThePage({event, rootValue, mapComp, dynamicMapComp, currentPath, messageInstance, isInit}) {
     const { targetObjVal } = event
     if (targetObjVal) {
       window.open(targetObjVal, '_blank')
     }
   },
-  setProps(event, isInit, tabpanelCode, rule) {
+  setProps({event, rootValue, mapComp, dynamicMapComp, currentPath, messageInstance, isInit}) {
     const { targetObj: target, targetObjVal } = event
     if (!target) return
 
-    const targetObj = `${tabpanelCode ? tabpanelCode + '->' : ''}${target}`
-    const { config } = this
+    const targetObj = `${target}`
     let val = ''
     try {
       val = parseExtendAttr(
         {
           extendAttr: targetObjVal,
-          metaCode: `event setPorps code:${config.metaCode}`
+          metaCode: `event setPorps code, target path: ${currentPath}`
         },
-        config?.bindValue
+        getPathVal(unref(rootValue), currentPath, '->')
       )
     } catch (err) {
       val = ''
@@ -495,12 +532,12 @@ const allInitEvents = {
     delete val.metaCode
     if (!isPlainObject(val)) return
 
-    const configs = getCurrentComp.call(this, targetObj)
-    const oldPorpsList = []
+    const configs = getCurrentComp({codesStr: targetObj, dynamicMapComp, currentPath})
     const porpsKeys = Object.keys(val)
     configs.forEach((labelInfo) => {
       let updateFlag = false
       const oldProps = {}
+      labelInfo._eventSetPropsCbProps = oldProps
       if (!labelInfo) return
       porpsKeys.forEach(key => {
         oldProps[key] = labelInfo[key]
@@ -509,8 +546,7 @@ const allInitEvents = {
           updateFlag = true
         }
         if ((typeof val[key]) === 'string') {
-          const { config } = this
-          const bindValue = config?.bindValue
+          const bindValue = getPathVal(unref(rootValue), currentPath, '->')
           labelInfo[key] = val[key].replace(/\{([^}]+)\}/g, (originVal, matchVal) => {
             if (matchVal.trimEnd().trimStart() === ARG_FLAGS.REF_VAL) {
               return bindValue
@@ -524,23 +560,19 @@ const allInitEvents = {
           labelInfo[key] = val[key]
         }
       })
-      oldPorpsList.push(oldProps)
       if (updateFlag) {
         labelInfo?.wrapVm?.proxy?.$forceUpdate?.()
       }
     })
     // 有的事件在不满足条件的情况下，需要进行恢复
     return () => {
-      // 需要晚点触发，才能正常执行清空等一些列需要组件操作
-      // return setTimeout(() => {
       configs.forEach((labelInfo, idx) => {
-        const oldProps = oldPorpsList[idx]
+        const oldProps = labelInfo._eventSetPropsCbProps
         if (!labelInfo) return
         porpsKeys.forEach(key => {
           labelInfo[key] = oldProps[key]
         })
       })
-      // }, 0)
     }
   },
 }
@@ -548,12 +580,12 @@ const allInitEvents = {
 
 export default allInitEvents
 
-export function runEvent({events, rootValue, mapComp, currentPath, isInit, rule,}) {
+export function runEvent({events, rootValue, mapComp, dynamicMapComp, route, lang, currentPath, isInit, rule, messageInstance}) {
   events = events || []
   return events.map(event => {
     const { eventId } = event
     const eventCode = eventsMap[eventId]
-    return allInitEvents[eventCode] && allInitEvents[eventCode]({event, rootValue, mapComp, route, lang, currentPath, isInit, rule,})
+    return allInitEvents[eventCode] && allInitEvents[eventCode]({event, rootValue, mapComp, dynamicMapComp, route, lang, currentPath, isInit, rule, messageInstance})
   })
 }
 

package/src/rulesOfDate/parseCondition.js

@@ -110,7 +110,6 @@ export function parseCondition({
   rootValue,
   currentPath
 }) {
-  debugger
   const { eventExpress } = rule || {}
   if (!eventExpress) return false