resolver-egretimp-plus 0.1.141 → 0.1.142

package/package.json

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

package/src/rules/parseCondition.js

@@ -69,7 +69,7 @@
     }
  */
 import { getConfigValue, getCurrentComp, parseRules } from './ruleUtils'
-import {formatDate, isArray} from '../utils/index'
+import {formatDate, isArray, normalCompareVal} from '../utils/index'
 
 export const rulesTypes = {
   constrast: '1',
@@ -99,7 +99,13 @@ const calcConditionValue = {
     return getSystemArgVal(value)
   },
   [conditionType.SELF]: ({value}) => {
-    return value
+    let retVal = ''
+    try {
+      retVal = JSON.parse(value)
+    } catch (e) {
+      // console.log('e==:', e)
+    }
+    return retVal
   },
   [conditionType.COMPONENT_ENMU]: ({value}) => {
     return value
@@ -210,7 +216,6 @@ export function parseCondition(rule) {
       // }
       if (!calcConditionValue[refType]) return false
       let refVal = calcConditionValue[refType].call(this, {tabpanelCode, value: refValue})
-
       if (conditionType.COMPONENT == targetType) {
         const labelInfos = getCurrentComp.call(this, `${tabpanelCode ? tabpanelCode + '->' : ''}${targetValue}`)
         if (!labelInfos || labelInfos.length !== 1) {
@@ -239,7 +244,7 @@ export function parseCondition(rule) {
         case 4:
             return formatRefVal <= formatTargetVal
         case 5:
-            return refVal == targetVal || (!targetVal && isArray(refVal) && !refVal.length)
+            return normalCompareVal(refVal) == normalCompareVal(targetVal)
         case 6:
             return refVal != targetVal
         case 7:

package/src/rulesOfDate/parseCondition.js

@@ -69,7 +69,7 @@
     }
  */
 import { getConfigValue, getCurrentComp, parseRules } from './ruleUtils'
-import {formatDate, isArray} from '../utils/index'
+import {formatDate, normalCompareVal} from '../utils/index'
 
 export const rulesTypes = {
   constrast: '1',
@@ -95,7 +95,13 @@ const calcConditionValue = {
     return getSystemArgVal(value)
   },
   [conditionType.SELF]: ({value}) => {
-    return value
+    let retVal = ''
+    try {
+      retVal = JSON.parse(value)
+    } catch (e) {
+      // console.log('e==:', e)
+    }
+    return retVal
   },
   [conditionType.COMPONENT_ENMU]: ({value}) => {
     return value
@@ -144,7 +150,7 @@ export function parseCondition({
       case 4:
           return formatRefVal <= formatTargetVal
       case 5:
-          return refVal == targetVal || (!targetVal && isArray(refVal) && !refVal.length)
+          return normalCompareVal(refVal) == normalCompareVal(targetVal)
       case 6:
           return refVal != targetVal
       case 7:

package/src/utils/common.js

@@ -1,5 +1,5 @@
 
-import { intersectionWith, isEqual, mergeWith, unionWith, isArray, cloneDeep, debounce } from 'lodash-es'
+import { intersectionWith, isEqual, mergeWith, unionWith, isArray, cloneDeep, debounce, isEmpty } from 'lodash-es'
 import { isDate } from './is'
 import { isRef } from 'vue'
 export {
@@ -735,3 +735,12 @@ function getPadding(el) {
 function isGreaterThan(a, b, epsilon = 0.01) {
   return a - b > epsilon
 }
+
+// 规则比较值的时候，兼容数组比较
+export function normalCompareVal(val) {
+  if (isArray(val)) {
+    return isEmpty(val) ? '' : val.join(',')
+  } else {
+    return val
+  }
+}

package/src/utils/render.jsx

@@ -372,7 +372,7 @@ export function normalConfig({
     }
 
     mapComp[hireRelat] = pageConfig
-    parsePolyfillConfigs({ polyfillConfigs, instance, parentRootValue, parentDynamicMapComp }, toRaw(pageConfig))
+    parsePolyfillConfigs({ polyfillConfigs, instance, parentRootValue, parentDynamicMapComp, rootValue, dynamicMapComp }, toRaw(pageConfig))
   }
   
   if (!OPEN_DATA_RULES) {
@@ -671,7 +671,7 @@ export function isCycleConfig(config) {
   return findComponent(CYCLE_COMPONETS, config.renderby) !== -1 || findComponent(CYCLE_COMPONETS, config.metaType) !== -1
 }
 
-function parsePolyfillConfigs({ polyfillConfigs, instance, parentRootValue, parentDynamicMapComp}, config) {
+function parsePolyfillConfigs({ polyfillConfigs, instance, parentRootValue, parentDynamicMapComp, rootValue, dynamicMapComp}, config) {
   const hireRelat = config.hireRelat
   const findKeys = Object.keys(polyfillConfigs || {}).filter(key => hireRelat.endsWith(key))
   if (!findKeys.length) {
@@ -679,7 +679,7 @@ function parsePolyfillConfigs({ polyfillConfigs, instance, parentRootValue, pare
   }
   // 层级写的越明确，就使用更明确的层级配置
   const findKey = findKeys.reduce((ret, key) => (hireRelat.lastIndexOf(ret) < hireRelat.lastIndexOf(key) ? ret : key))
-  const polyObj = polyfillConfigs[findKey] && polyfillConfigs[findKey](config, instance, {parentRootValue, parentDynamicMapComp,})
+  const polyObj = polyfillConfigs[findKey] && polyfillConfigs[findKey](config, instance, {parentRootValue, parentDynamicMapComp, rootValue, dynamicMapComp})
   polyObj && Object.keys(polyObj).forEach(key => {
     config[key] = polyObj[key]
   })