resolver-egretimp-plus 0.1.45 → 0.1.47

package/package.json

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

package/src/components/packages-web/CustomComponentTable.jsx

@@ -67,6 +67,7 @@ export default {
       return getCompEvents(ElPagination)
     })
 
+    const indectModeRef = inject('indectModeRef', ref(''))
     const ruleExecuter = inject('_ruleExecuter')
     const dynamicMapComp = inject('dynamicMapComp')
     const parentRootValue = inject('_parentRootValue', {})
@@ -192,13 +193,13 @@ export default {
         retObj.className = `${retObj.className || ''} clear-index`
       }
       if (
-        isPlainColumn({...config, isColumn: true}, calcDisable(config, retObj.mode)) &&
+        isPlainColumn({...config, isColumn: true}, true) &&
         config.showOverflowTooltip != '0' &&
         config['show-overflow-tooltip'] != '0'
       ) {
         const showOverflowTooltipFn = (data) => {
           const currentConfig = multiPmPageMetaList.value?.[data.$index]?.[idx]
-          return isPlainColumn({...currentConfig, isColumn: true}, calcDisable(currentConfig, retObj.mode))
+          return isPlainColumn({...currentConfig, isColumn: true}, calcDisable(currentConfig, indectModeRef.value))
         }
         retObj['show-overflow-tooltip'] = showOverflowTooltipFn
         retObj.showOverflowTooltip = showOverflowTooltipFn

package/src/rules/rulesDriver.js

@@ -13,7 +13,7 @@ export default function(rules, isInit) {
     rules.forEach(rule => {
       if (!rule) return
       const { pmRuleTargetEventVoList, pmRuleTargetEventVOList, relId, tabpanelCode } = rule
-      const relIdKey = `${relId}_${columnId || ''}_${id || ''}__${dynamicHireRelat}`
+      const relIdKey = `${relId}__${columnId || ''}${id || ''}__${dynamicHireRelat}`
       if (parseCondition.call(this, rule)) {
         setTimeout(() => {
           recoverCb[relIdKey] && recoverCb[relIdKey].forEach(recover => {
@@ -35,7 +35,7 @@ export default function(rules, isInit) {
       } else {
         const recoverCbKeys = Object.keys(recoverCb)
         const filterKeys = recoverCbKeys.filter(recoverKey => {
-          const [recRelId, recDynamicHireRelat] = recoverKey.split('__')
+          const [recRelId, _, recDynamicHireRelat] = recoverKey.split('__')
           if (recRelId == relId) {
             if (recDynamicHireRelat === dynamicHireRelat) {
               return true
@@ -46,7 +46,7 @@ export default function(rules, isInit) {
                 const relat = relats[index]
                 const recRelat = recRelats[index]
                 if (!recRelat || relat.code !== recRelat.code) {
-                  return true
+                  return false
                 } else {
                   if (relat.idx !== recRelat.idx) {
                     return false