resolver-egretimp-plus 0.1.55 → 0.1.57

package/package.json

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

package/src/analysisComponent.jsx

@@ -227,8 +227,16 @@ export default {
     configLinks.reduce((parent, config) => {
       definePrivatelyProp(config, 'parent', parent)
       definePrivatelyProp(config, 'dynamicMapComp', dynamicMapComp)
-      const dynamicHireRelat = parent?.dynamicHireRelat ?  `${parent?.dynamicHireRelat}${hasOwn(config, 'rowIndex') ? `[${config.rowIndex}]` : ''}->${(config.metaCode || '')}` : config.metaCode
-      definePrivatelyProp(config, 'dynamicHireRelat', dynamicHireRelat)
+      
+      // 如果已经有dynamicHireRelat值的时候，就不需要再进行以下赋值了
+      if (config?.dynamicHireRelat_bak) {
+        definePrivatelyProp(config, 'dynamicHireRelat', `__@__${props.mode}__${config.dynamicHireRelat_bak}`)
+      } else {
+        const dynamicHireRelat = parent?.dynamicHireRelat ?  `${parent?.dynamicHireRelat}${hasOwn(config, 'rowIndex') ? `[${config.rowIndex}]` : ''}->${(config.metaCode || '')}` : config.metaCode
+        definePrivatelyProp(config, 'dynamicHireRelat', dynamicHireRelat)
+        config.dynamicHireRelat_bak = dynamicHireRelat
+      }
+      
       config.dynamicHireRelat && (dynamicMapComp[config.dynamicHireRelat] = config)
       return config
     })

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

@@ -346,9 +346,17 @@ export default {
     })
     const defaultTotalFn = (total, val, row) => {
       if (val === undefined || val === null) {
-        val = !isNaN(Number(val)) ? 0 : ''
+        val = 0
+        if (val === undefined) {
+          val = ''
+        }
       } else {
-        val = val.toString().replace(/[^\d\.]/g, '')
+        const strVal = val.toString()
+        const negativeFlag = /^-/.test(strVal)
+        val = strVal.replace(/[^\d\.]/g, '')
+        if (negativeFlag) {
+          val = `-${val}`
+        }
       }
       const numFlag = !isNaN(Number(val))
       if (total === null || total === undefined) {

package/src/rules/ruleUtils.js

@@ -66,8 +66,20 @@ export function setFormVal(pathStr, val) {
 
 function getRelateConfigs(codesStr, config, type) {
   const { dynamicHireRelat = '' } = config
+  // 这边逻辑目前主要是为了兼容日志的时候，也可以正常使用规则========start=====
+  let normalDynamicHireRelat = dynamicHireRelat
+  let preFlagStr = ''
+  // 这个规则是因为在日志直接拷贝配置的时候，在analysisComponent组件中会在前面额外加上 这个 标识 所以需要转换一下
+  const preFlagStrReg = /^(__@__[^(->)]*__)/
+  const preFlagStrMatchs = dynamicHireRelat?.match(preFlagStrReg)
+  if (preFlagStrMatchs) {
+    preFlagStr = preFlagStrMatchs[1]
+    normalDynamicHireRelat = normalDynamicHireRelat?.replace(preFlagStrReg, '')
+  }
+  // 这边逻辑目前主要是为了兼容日志的时候，也可以正常使用规则========end=====
+
   // 组装成此数据结果，用于后续的获取对应字段=====start====
-  const dynamicCodeInfos = dynamicHireRelat.split('->').map(code => {
+  const dynamicCodeInfos = normalDynamicHireRelat.split('->').map(code => {
     const matchs = code?.match(/^(\w+)\[(\d+)\]$/)
     if (matchs) {
       return {
@@ -102,6 +114,7 @@ function getRelateConfigs(codesStr, config, type) {
   let sameStr = sameCodesStr
   let sameIdx = null
   const sameMatchs = sameCodesStr.match(/^([\w\W]*)\[(\d*)\]$/)
+  // 这边是在出现a->c->c[0]这种情况的时候，可以正常获取的组件config
   if (sameMatchs) {
     sameStr = sameMatchs[1]
     sameIdx = sameMatchs[2]
@@ -109,10 +122,10 @@ function getRelateConfigs(codesStr, config, type) {
   const { dynamicMapComp, _mapComp } = this
   let retConfigs = []
   if (sameStr) {
-    retConfigs = [dynamicMapComp[sameStr]]
+    retConfigs = [dynamicMapComp[`${preFlagStr}${sameStr}`]]
   } else {
     const code = diffCodes.shift()
-    retConfigs = [dynamicMapComp[code]]
+    retConfigs = [dynamicMapComp[`${preFlagStr}${code}`]]
   }
   while (diffCodes.length) {
     const code = diffCodes.shift()