resolver-egretimp-plus 0.0.120 → 0.0.122

package/package.json

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

package/src/analysisComponent.jsx

@@ -238,7 +238,6 @@ export default {
       }) // 生成formItem（）的辅助函数
       return formItemPolyfill(
         <currentComponent.value
-          key={props.config}
           ref={refFn}
           onVnodeMounted={onVnodeMounted}
           onVnodeUnmounted={onVnodeUnmounted}

package/src/components/helper/eventOrchestration.js

@@ -1,4 +1,4 @@
-import { isArray, isHasVal } from "../../utils/is"
+import { isArray, isHasVal, isNull, isUndefined } from "../../utils/is"
 import { DATA_VALID_RULE_EXECUTE } from "../../api/builtIn"
 import { getRelateConfigKeys } from "../../rules/ruleUtils"
 import { RESULT_CODE, resultToast } from "../../utils/respone"
@@ -51,8 +51,12 @@ export async function dispatchClickEvent(service, { dynamicMapComp, requestTrace
     reqData = getReqData(service.inParamMappingList || [], {dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat})
     tableConfig = getTableConfig(service.outParamMappingList, { dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat })
     if (tableConfig?.vm) {
-      assignmentPathVal(reqData, service.pageNum || 'pageNum', tableConfig.vm.page?.pageNum)
-      assignmentPathVal(reqData, service.pageSize || 'pageSize', tableConfig.vm.page?.pageSize)
+      if (!isUndefined(tableConfig.vm.page?.pageNum) && !isNull(tableConfig.vm.page?.pageNum) ) {
+        assignmentPathVal(reqData, service.pageNum || 'pageNum', tableConfig.vm.page?.pageNum)
+      }
+      if (!isUndefined(tableConfig.vm.page?.pageSize) && !isNull(tableConfig.vm.page?.pageSize) ) {
+        assignmentPathVal(reqData, service.pageSize || 'pageSize', tableConfig.vm.page?.pageSize)
+      }
     }
     reqData = {
       ...reqData,
@@ -123,21 +127,13 @@ function getReqData(inParamMappingList = [], {dynamicMapComp, dynamicMapCompKeys
       console.error('search arg muti', params, configCodes)
     }
     const configCode = configCodes[0]
-    if (configCode) {
+    if (
+      configCode &&
+      !isUndefined(dynamicMapComp[configCode]?.refValue) &&
+      !isNull(dynamicMapComp[configCode]?.refValue)
+    ) {
       const destParamArr = destParam?.split('.') || []
       assignmentPathVal(ret, destParamArr, dynamicMapComp[configCode]?.refValue)
-
-      // let currentObj = ret
-      // destParamArr.forEach((item, idx) => {
-      //   if (idx + 1 === destParamArr.length) {
-      //     currentObj[item] = dynamicMapComp[configCode]?.refValue
-      //   } else {
-      //     if (!currentObj[item]) {
-      //       currentObj[item] = {}
-      //     }
-      //     currentObj = currentObj[item]
-      //   }
-      // })
     }
     return ret
   }, {})

package/src/enums/index.js

@@ -1,4 +1,4 @@
-import { GET_SYS_PARAM_CACHE, LCP_LOGIN, QUERY_PAGE_CONFIG_DATA } from "../api/builtIn"
+import { DATA_VALID_RULE_EXECUTE, GET_SYS_PARAM_CACHE, LCP_LOGIN, QUERY_PAGE_CONFIG_DATA } from "../api/builtIn"
 
 export const USER_NAME = 'lcpsupport'
 export const PASSWORD = '8ik,*IK<'
@@ -8,5 +8,6 @@ export const AUTH_CODE = '9887'
 export const NOT_AUTH_APIS = [
   LCP_LOGIN,
   GET_SYS_PARAM_CACHE,
-  QUERY_PAGE_CONFIG_DATA
+  QUERY_PAGE_CONFIG_DATA,
+  DATA_VALID_RULE_EXECUTE
 ]

package/src/index.jsx

@@ -7,8 +7,8 @@ import { MODE } from "./utils/const.js"
 import { generateRequester } from "./utils/request.js"
 import { executeLoadServices } from "./components/helper/resolver.js"
 import { deepMerge } from "./utils/index.js"
-import { useRouter } from "vue-router"
-import { useRoute } from "vue-router"
+// import { useRouter } from "vue-router"
+// import { useRoute } from "vue-router"
 export default {
   name: 'Resolver',
   props: {
@@ -172,6 +172,7 @@ export default {
             let val = result
             if (!clearFlag) {
               val = deepMerge(props.modelValue, result, 'replace')
+              val = {...val}
             }
             emit('update:modelValue', val)
             emit('loadEvnetsCompleted', result)

package/src/theme/element/components/common.scss

@@ -1,6 +1,7 @@
 @mixin nestMargin {
   & > div {
-    & > .CustomComponentCollapse {
+    & > .CustomComponentCollapse,
+    & > .CustomComponentTabs {
       & > div {
         margin-right: 16px;
       }