resolver-egretimp-plus 0.0.96 → 0.0.97

package/package.json

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

package/src/components/helper/eventOrchestration.js

@@ -368,37 +368,53 @@ export function openDailg({
 }
 
 // 数据校验服务
-export async function executeDataValid(validConfig, { dynamicMapComp, requestTraceId, mixinServiceConfig, rootValue, axiosInstance, lang}) {
+export async function executeDataValid(validConfig, {
+  beforeRequestService,
+  afterRequestService,
+  confirmInstance,
+  dynamicMapComp,
+  requestTraceId,
+  compConfig,
+  mixinServiceConfig,
+  rootValue,
+  axiosInstance,
+  lang
+}) {
   let reqData = rootValue || {}
   const url = DATA_VALID_RULE_EXECUTE
 
+  let beforeRequestServiceRet = true
+  if (beforeRequestService) {
+    beforeRequestServiceRet = beforeRequestService({
+      dynamicMapComp,
+      requestTraceId, 
+      mixinServiceConfig, 
+      rootValue, 
+      compConfig,
+      service: validConfig,
+      reqData: reqData
+    })
+  }
+  const beforeRequestServiceRetValid = await beforeRequestServiceRet
+  if (!beforeRequestServiceRetValid) {
+    return
+  }
   const ret = await buildInRequest(url, {
     requestTraceId,
+    ...reqData,
     pmHandleBusinessIdentity: {
       busiIdentityId: validConfig.busiIdentityId,
       pageMetaId: validConfig.pageMetaId,
       tenantId: validConfig.tenantId,
       mainServiceCode: mixinServiceConfig?.mainServiceCode, // 提交按钮绑定上绑定的融合服务编码
     },
-    ...reqData
   }, {
     method: "post",
   })
-  // 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 || {}
+  let result = ret.data || {}
+  if (ret.data?.baseResponse) {
+    result = ret.data?.baseResponse
+  }
   const resultCode = result.resultCode
   const resultMessage = result?.resultMessage || ''
   let type = ''
@@ -424,24 +440,26 @@ export async function executeDataValid(validConfig, { dynamicMapComp, requestTra
         type = 'error'
         break;
     }
-  }
-  // if (validConfig?.validationType === '2') {
-  //   weakFlag = true
-  // }
-  return new Promise((resolver, inject) => {
-    confirmInstance(resultMessage, lang?.indexOf('zh') > -1 ? '提示' : 'Hint', {
-      type,
-      showCancelButton: weakFlag
-    }).then(() => {
-      if (!weakFlag) {
-        resolver(false)
-      } else {
-        resolver(true)
-      }
-    }).catch(() => {
-      inject(false)
+    return new Promise((resolver, inject) => {
+      confirmInstance(resultMessage, lang?.indexOf('zh') > -1 ? '提示' : 'Hint', {
+        type,
+        showCancelButton: weakFlag
+      }).then(() => {
+        if (!weakFlag) {
+          afterRequestService && afterRequestService(ret, {valid: false})
+          resolver(false)
+        } else {
+          afterRequestService && afterRequestService(ret, {valid: true})
+          resolver(true)
+        }
+      }).catch(() => {
+        afterRequestService && afterRequestService(ret, {valid: false})
+        inject(false)
+      })
     })
-  })
+  }
+  afterRequestService && afterRequestService(ret, {valid: true})
+  return true
 }
 
 function closePage(lcpPageClosedMapVO) {
@@ -475,26 +493,12 @@ export async function executeEventOrchestration({
   const lcpPageRuleVOLis = props.config?.lcpPageRuleVOList || []
   const PageServiceMapVOList = props.config.lcpPageServiceMapVOList || []
   const mixinServiceConfig = PageServiceMapVOList.find(service => service.serviceType === '1')
-  if (lcpPageRuleVOLis?.length && mixinServiceConfig) {
-      // 数据校验服务
-      const validConfig = lcpPageRuleVOLis[0]
-      const valid = await executeDataValid(validConfig, {
-        dynamicMapComp,
-        requestTraceId,
-        rootValue,
-        axiosInstance,
-        mixinServiceConfig,
-        lang
-      })
-      if (!valid) {
-        return
-      }
-  }
-  
-  if (PageServiceMapVOList?.length) {
+
+  let normalBeforeRequestService = null
+  let normalAfterRequestService = null
+  if ((lcpPageRuleVOLis?.length) || PageServiceMapVOList?.length) {
     // 定义的请求前钩子
     const configBeforeRequestService = props.config?.beforeRequestService
-    let normalBeforeRequestService = null
     if (configBeforeRequestService || beforeRequestService) {
       normalBeforeRequestService = async (...arg) => {
         let ret = true
@@ -510,14 +514,34 @@ export async function executeEventOrchestration({
     }
     // 定义的请求后钩子
     const configAfterRequestService = props.config?.afterRequestService
-    let normalAfterRequestService = null
     if (configAfterRequestService || afterRequestService) {
       normalAfterRequestService = (...arg) => {
         afterRequestService?.(...arg)
         configAfterRequestService?.(...arg)
       }
     }
-
+  }
+  if (lcpPageRuleVOLis?.length) {
+      // 数据校验服务
+      const validConfig = lcpPageRuleVOLis[0]
+      const valid = await executeDataValid(validConfig, {
+        dynamicMapComp,
+        requestTraceId,
+        rootValue,
+        axiosInstance,
+        mixinServiceConfig,
+        compConfig: props.config,
+        confirmInstance,
+        beforeRequestService: normalBeforeRequestService,
+        afterRequestService: normalAfterRequestService,
+        lang
+      })
+      if (!valid) {
+        return
+      }
+  }
+  
+  if (PageServiceMapVOList?.length) {
     const dynamicHireRelat = props.config?.dynamicHireRelat
     dispatchClickEvents({
       serviceList: PageServiceMapVOList,

package/src/components/packages-H5/CustomComponentTableH5.vue

@@ -31,7 +31,7 @@ const tableProps = computed(() => {
 })
 const page = reactive({
   pageNum: 1,
-  pageSize: props.config?.pageSize || 10,
+  pageSize: props.config?.pageSize || 3,
   total: 0,
 })
 

package/src/utils/defaultVal.js

@@ -5,9 +5,6 @@ export default function defaultVal(config) {
   if ((config.defaultVal || config.defaultValue) && !config.bindValue && config.bindValue !== 0) {
     const configDefaultVal = config.defaultVal || config.defaultValue
     let defaultVal = null
-    if (config.metaCode === 'custId') {
-      debugger
-    }
     try {
       if (/^{\w*}$/.test(configDefaultVal) || /^\[\w*\]$/.test(configDefaultVal)) {
         defaultVal = JSON.parse(configDefaultVal)