resolver-egretimp-plus 0.0.80 → 0.0.81

package/package.json

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

package/src/components/helper/eventOrchestration.js

@@ -3,6 +3,25 @@ import { DATA_VALID_RULE_EXECUTE } from "../../api/builtIn"
 import { getRelateConfigKeys } from "../../rules/ruleUtils"
 import { RESULT_CODE, resultToast } from "../../utils/respone"
 import { isPromise, parseExtendAttr, unionWith } from "../../utils/index"
+import { buildInRequest } from "../../utils/request"
+
+function assignmentPatchVal(obj = {}, path, val) {
+  let paths = path
+  if (typeof path === 'string') {
+    paths = path.split('.')
+  }
+  let currentObj = obj
+  paths.forEach((item, idx) => {
+    if (idx + 1 === paths.length) {
+      currentObj[item] = val
+    } else {
+      if (!currentObj[item]) {
+        currentObj[item] = {}
+      }
+      currentObj = currentObj[item]
+    }
+  })
+}
 
 export async function dispatchClickEvents  ({serviceList = [], requestTraceId, axiosInstance, dialogReq, dynamicMapComp, rootValue, dynamicHireRelat, messageCb, compConfig, messageInstance, beforeRequestService, afterRequestService}) {
   const dynamicMapCompKeys = Object.keys(dynamicMapComp)
@@ -20,8 +39,8 @@ export async function dispatchClickEvent(service, { dynamicMapComp, requestTrace
     reqData = getReqData(service.inParamMappingList || [], {dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat})
     tableConfig = getTableConfig(service.outParamMappingList, { dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat })
     if (tableConfig?.vm) {
-      reqData[service.pageNum || 'pageNum'] = tableConfig.vm.page?.pageNum
-      reqData[service.pageSize || 'pageSize'] = tableConfig.vm.page?.pageSize
+      assignmentPatchVal(reqData, service.pageNum || 'pageNum', tableConfig.vm.page?.pageNum)
+      assignmentPatchVal(reqData, service.pageSize || 'pageSize', tableConfig.vm.page?.pageSize)
     }
     reqData = {
       ...reqData,
@@ -94,17 +113,19 @@ function getReqData(inParamMappingList = [], {dynamicMapComp, dynamicMapCompKeys
     const configCode = configCodes[0]
     if (configCode) {
       const destParamArr = destParam?.split('.') || []
-      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]
-        }
-      })
+      assignmentPatchVal(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
   }, {})
@@ -348,20 +369,33 @@ export function openDailg({
 export async function executeDataValid(validConfig, { dynamicMapComp, requestTraceId, mixinServiceConfig, rootValue, axiosInstance, lang}) {
   let reqData = rootValue || {}
   const url = DATA_VALID_RULE_EXECUTE
-  const ret = await (axiosInstance && axiosInstance({
-    url,
+
+  const ret = await buildInRequest(url, {
+    requestTraceId,
+    pmHandleBusinessIdentity: {
+      busiIdentityId: validConfig.busiIdentityId,
+      pageMetaId: validConfig.pageMetaId,
+      tenantId: validConfig.tenantId,
+      mainServiceCode: mixinServiceConfig?.mainServiceCode, // 提交按钮绑定上绑定的融合服务编码
+    },
+    ...reqData
+  }, {
     method: "post",
-    data: {
-      requestTraceId,
-      pmHandleBusinessIdentity: {
-        busiIdentityId: validConfig.busiIdentityId,
-        pageMetaId: validConfig.pageMetaId,
-        tenantId: validConfig.tenantId,
-        mainServiceCode: mixinServiceConfig?.mainServiceCode, // 提交按钮绑定上绑定的融合服务编码
-      },
-      ...reqData
-    }
-  }))
+  })
+  // const ret = await (axiosInstance && axiosInstance({
+  //   url,
+  //   method: "post",
+  //   data: {
+  //     requestTraceId,
+  //     pmHandleBusinessIdentity: {
+  //       busiIdentityId: validConfig.busiIdentityId,
+  //       pageMetaId: validConfig.pageMetaId,
+  //       tenantId: validConfig.tenantId,
+  //       mainServiceCode: mixinServiceConfig?.mainServiceCode, // 提交按钮绑定上绑定的融合服务编码
+  //     },
+  //     ...reqData
+  //   }
+  // }))
   const result = ret.data || {}
   const resultCode = result.resultCode
   const resultMessage = result?.resultMessage || ''

package/src/utils/common.js

@@ -225,7 +225,7 @@ export function extractFunctionBody(funcStr) {
 }
 
 export function isPromise(fn) {
-  return typeof fn.then === 'function';
+  return fn && typeof fn.then === 'function';
 }
 
 export function getDate(...arg) {

package/src/utils/render.jsx

@@ -394,6 +394,9 @@ export function getRenderComponentProps({ props, component, modelValue, selects,
     ...getRenderCompMargins(config),
     width: commonProps.width || getBuildCompDefaultWidth(config)
   }
+  if (config.hidden === '1') {
+    defprops.style.display = 'none'
+  }
   
   const retObj = {
     ...defprops,
@@ -643,6 +646,12 @@ function getFormItemExtendProps(config, lang, params) {
   const prop = config.dynamicHireRelat || ''
   // const propAttr = config.dynamicHireRelat ? config.dynamicHireRelat?.split('->') : []
   // const prop = propAttr.join('->')
+  const style = {
+    ...getFormItemMargins(config)
+  }
+  if (config.hidden === '1') {
+    style.display = 'none'
+  }
   return {
     prop,
     rules: getFormItemRule(config, lang, params),
@@ -651,9 +660,7 @@ function getFormItemExtendProps(config, lang, params) {
       'hidden-label': config.labelWidth == 0 || config.labelWidth === '0px' || config.labelHidden == '1',
       [`label-position-${config['label-position'] || 'right'}`]: true // label-position 支持三个值，right、left、top
     },
-    style: {
-      ...getFormItemMargins(config)
-    }
+    style,
   }
 }