resolver-egretimp-plus 0.0.179 → 0.0.181

package/package.json

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

package/src/components/helper/eventOrchestration.js

@@ -44,11 +44,46 @@ export async function dispatchClickEvents  ({serviceList = [], requestTraceId, a
   }
 }
 
-export async function dispatchClickEvent(service, { dynamicMapComp, requestTraceId, dialogReq, mixinServiceConfig, rootValue, dynamicMapCompKeys, dynamicHireRelat, axiosInstance, messageCb, compConfig, messageInstance, lang, beforeRequestService, afterRequestService }) {
+export async function dispatchClickEvent(service, { 
+  dynamicMapComp, requestTraceId, dialogReq,
+  mixinServiceConfig, rootValue, dynamicMapCompKeys,
+  dynamicHireRelat, axiosInstance, messageCb, compConfig,
+  messageInstance, lang, beforeRequestService, afterRequestService 
+}) {
   let reqData = rootValue || {}
   let tableConfig = null
   const serviceCustomProps = parseExtendAttr({extendAttr: service.extendAttr})
 
+  let normalBeforeRequestService = null
+  let normalAfterRequestService = null
+  // 定义的请求前钩子
+  const configBeforeRequestService = compConfig?.beforeRequestService
+  if (configBeforeRequestService || beforeRequestService) {
+    normalBeforeRequestService = async (...arg) => {
+      let beforeRequestServiceRet = true
+      if (beforeRequestService) {
+        beforeRequestServiceRet = beforeRequestService?.(...arg)
+      }
+      const beforeRequestServiceRetValid = await beforeRequestServiceRet
+      if (beforeRequestServiceRetValid === false) {
+        return false
+      }
+      if (configBeforeRequestService) {
+        return configBeforeRequestService?.(...arg)
+      } else {
+        return true
+      }
+    }
+  }
+  // 定义的请求后钩子
+  const configAfterRequestService = compConfig?.afterRequestService
+  if (configAfterRequestService || afterRequestService) {
+    normalAfterRequestService = (...arg) => {
+      afterRequestService?.(...arg)
+      configAfterRequestService?.(...arg)
+    }
+  }
+
   if (service.transactionType == '1') {
     reqData = getReqData(service.inParamMappingList || [], {dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat})
     tableConfig = getTableConfig(service.outParamMappingList, { dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat })
@@ -80,8 +115,8 @@ export async function dispatchClickEvent(service, { dynamicMapComp, requestTrace
   }
 
   let beforeRequestServiceRet = true
-  if (beforeRequestService) {
-    beforeRequestServiceRet = beforeRequestService({
+  if (normalBeforeRequestService) {
+    beforeRequestServiceRet = normalBeforeRequestService({
       dynamicMapComp,
       requestTraceId, 
       mixinServiceConfig, 
@@ -107,7 +142,7 @@ export async function dispatchClickEvent(service, { dynamicMapComp, requestTrace
     delete reqConfig.data
   }
   const ret = await (axiosInstance && axiosInstance(reqConfig))
-  afterRequestService && afterRequestService(ret)
+  normalAfterRequestService && normalAfterRequestService(ret)
   const noSuccessIip = httpMethod.toLocaleLowerCase() === 'get' || service.transactionType == '1' || serviceCustomProps?.noSuccessIip
   if (!resultToast(ret?.data, messageInstance, {messageCb, service, compConfig, noSuccessIip})) {
     await Promise.reject()
@@ -461,8 +496,8 @@ export function openDailg({
 
 // 数据校验服务
 export async function executeDataValid(validConfig, {
-  beforeRequestService,
-  afterRequestService,
+  beforeDataValidRequestService,
+  afterDataValidRequestService,
   confirmInstance,
   dynamicMapComp,
   requestTraceId,
@@ -475,6 +510,33 @@ export async function executeDataValid(validConfig, {
 }) {
   let reqData = rootValue || {}
   const url = DATA_VALID_RULE_EXECUTE
+  let beforeRequestService
+  let afterRequestService
+  const configBeforeDataValidRequestService = compConfig?.beforeDataValidRequestService
+  if (configBeforeDataValidRequestService || beforeDataValidRequestService) {
+    beforeRequestService = async (...arg) => {
+      let beforeRequestServiceRet = true
+      if (beforeDataValidRequestService) {
+        beforeRequestServiceRet = beforeDataValidRequestService?.(...arg)
+      }
+      const beforeRequestServiceRetValid = await beforeRequestServiceRet
+      if (beforeRequestServiceRetValid === false) {
+        return false
+      }
+      if (configBeforeDataValidRequestService) {
+        return configBeforeDataValidRequestService?.(...arg)
+      } else {
+        return true
+      }
+    }
+  }
+  const configAfterDataValidRequestService = compConfig?.afterDataValidRequestService
+  if (configAfterDataValidRequestService || afterDataValidRequestService) {
+    afterRequestService = (...arg) => {
+      afterDataValidRequestService?.(...arg)
+      configAfterDataValidRequestService?.(...arg)
+    }
+  }
 
   let beforeRequestServiceRet = true
   if (beforeRequestService) {
@@ -591,69 +653,10 @@ export async function executeEventOrchestration({
   builtPolyfillReq,
   appContext 
 } = {}) {
-  const lcpPageRuleVOLis = props.config?.lcpPageRuleVOList || []
   const PageServiceMapVOList = props.config.lcpPageServiceMapVOList || []
   const mixinServiceConfig = PageServiceMapVOList.find(service => service.serviceType === '1')
-
-  let normalBeforeRequestService = null
-  let normalAfterRequestService = null
-  if ((lcpPageRuleVOLis?.length) || PageServiceMapVOList?.length) {
-    // 定义的请求前钩子
-    const configBeforeRequestService = props.config?.beforeRequestService
-    if (configBeforeRequestService || beforeRequestService) {
-      normalBeforeRequestService = async (...arg) => {
-        let beforeRequestServiceRet = true
-        if (beforeRequestService) {
-          beforeRequestServiceRet = beforeRequestService?.(...arg)
-        }
-        const beforeRequestServiceRetValid = await beforeRequestServiceRet
-        if (beforeRequestServiceRetValid === false) {
-          return false
-        }
-        if (configBeforeRequestService) {
-          return configBeforeRequestService?.(...arg)
-        } else {
-          return true
-        }
-      }
-    }
-    // 定义的请求后钩子
-    const configAfterRequestService = props.config?.afterRequestService
-    if (configAfterRequestService || afterRequestService) {
-      normalAfterRequestService = (...arg) => {
-        afterRequestService?.(...arg)
-        configAfterRequestService?.(...arg)
-      }
-    }
-  }
+  const lcpPageRuleVOLis = props.config?.lcpPageRuleVOList || []
   if (lcpPageRuleVOLis?.length) {
-    let normalBeforeDataValidRequestService
-    let normalAfterDataValidRequestService
-    const configBeforeDataValidRequestService = props.config?.beforeDataValidRequestService
-    if (configBeforeDataValidRequestService || beforeDataValidRequestService) {
-      normalBeforeDataValidRequestService = async (...arg) => {
-        let beforeRequestServiceRet = true
-        if (beforeDataValidRequestService) {
-          beforeRequestServiceRet = beforeDataValidRequestService?.(...arg)
-        }
-        const beforeRequestServiceRetValid = await beforeRequestServiceRet
-        if (beforeRequestServiceRetValid === false) {
-          return false
-        }
-        if (configBeforeDataValidRequestService) {
-          return configBeforeDataValidRequestService?.(...arg)
-        } else {
-          return true
-        }
-      }
-    }
-    const configAfterDataValidRequestService = props.config?.afterDataValidRequestService
-    if (configAfterDataValidRequestService || afterDataValidRequestService) {
-      normalAfterDataValidRequestService = (...arg) => {
-        afterDataValidRequestService?.(...arg)
-        configAfterDataValidRequestService?.(...arg)
-      }
-    }
     // 数据校验服务
     const validConfig = lcpPageRuleVOLis[0]
     const valid = await executeDataValid(validConfig, {
@@ -665,15 +668,15 @@ export async function executeEventOrchestration({
       compConfig: props.config,
       confirmInstance,
       builtPolyfillReq,
-      beforeRequestService: normalBeforeDataValidRequestService,
-      afterRequestService: normalAfterDataValidRequestService,
+      beforeDataValidRequestService,
+      afterDataValidRequestService,
       lang
     })
     if (!valid) {
       return
     }
   }
-  
+
   if (PageServiceMapVOList?.length) {
     const dynamicHireRelat = props.config?.dynamicHireRelat
     dispatchClickEvents({
@@ -688,8 +691,8 @@ export async function executeEventOrchestration({
       compConfig: props.config,
       dialogReq,
       lang,
-      beforeRequestService: normalBeforeRequestService,
-      afterRequestService: normalAfterRequestService
+      beforeRequestService,
+      afterRequestService
     })
   }
   const lcpPagePopupMapVO = props.config.lcpPagePopupMapVO

package/src/hooks/pageConfig.js

@@ -11,6 +11,8 @@ export function usePageConfig() {
   const hireRelatMapRulesRef = ref(null)
   const mapCompRef = ref(null)
   function initPageConfig({
+    requestTraceId,
+    dialogReq,
     mode,
     route,
     router,
@@ -26,6 +28,8 @@ export function usePageConfig() {
     messageCb
   }) {
     const { pageConfig, mapComp, hireRelatMapRules } = parsePageConfig({
+      requestTraceId,
+      dialogReq,
       mode,
       route,
       router,

package/src/index.jsx

@@ -171,6 +171,7 @@ export default {
     const { initPageConfig, pageConfigRef, mapCompRef, hireRelatMapRulesRef } = usePageConfig()
     function toExecuteLoadServices(clearFlag) {
       // 触发加载事件执行
+      nativeDataLoad.value = false
       executeLoadServices(
         props.config?.pmPageServiceMapVOList || props.config?.lcpPageServiceMapVOList || [],
         {
@@ -196,6 +197,8 @@ export default {
       )
     }
     initPageConfig({
+      requestTraceId: props.requestTraceId,
+      dialogReq: props.dialogReq,
       mode: props.mode,
       router,
       route,
@@ -214,6 +217,8 @@ export default {
 
     watch(toRef(props, 'config'), () => {
       initPageConfig({
+        requestTraceId: props.requestTraceId,
+        dialogReq: props.dialogReq,
         mode: props.mode,
         router,
         route,

package/src/resolver-H5.vue

@@ -61,6 +61,12 @@ defineExpose({
       return resolverRef.value?.rootForm
     }
   }),
+  getRequestTraceId(...arg) {
+    return resolverRef.value?.getRequestTraceId(...arg)
+  },
+  toExecuteLoadServices(...arg) {
+    return resolverRef.value?.toExecuteLoadServices(...arg)
+  },
 })
 </script>
 <template>

package/src/resolver-common.vue

@@ -87,6 +87,12 @@ defineExpose({
       return resolverRef.value?.rootForm
     }
   }),
+  getRequestTraceId(...arg) {
+    return resolverRef.value?.getRequestTraceId(...arg)
+  },
+  toExecuteLoadServices(...arg) {
+    return resolverRef.value?.toExecuteLoadServices(...arg)
+  },
 })
 </script>
 <template>

package/src/resolver-web.vue

@@ -60,6 +60,12 @@ defineExpose({
       return resolverRef.value?.rootForm
     }
   }),
+  getRequestTraceId(...arg) {
+    return resolverRef.value?.getRequestTraceId(...arg)
+  },
+  toExecuteLoadServices(...arg) {
+    return resolverRef.value?.toExecuteLoadServices(...arg)
+  },
 })
 </script>
 <template>

package/src/utils/render.jsx

@@ -108,6 +108,8 @@ function generateFormConfig(lang = 'zh', isH5) {
  * @param {*} config 通过接口获取的配置对象
  */
 export function parsePageConfig({
+  requestTraceId,
+  dialogReq,
   mode,
   route,
   router,
@@ -124,6 +126,9 @@ export function parsePageConfig({
   formConfig.pmPageMetaList = config.pmPageMetaList
   const cbs = []
   let { pageConfig, mapComp } = normalConfig({
+    requestTraceId,
+    dialogReq,
+    lang,
     mode,
     route,
     router,
@@ -153,9 +158,10 @@ export function parsePageConfig({
  * @param {*} config 
  */
 export function normalConfig({
+  requestTraceId,
+  dialogReq,
+  lang,
   mode,
-  route,
-  router,
   polyfillConfigs,
   instance,
   cbs = [],
@@ -180,8 +186,6 @@ export function normalConfig({
     wrapVm: null, // 当前组件的实例（也就是analysisComponent）
     hireRelat,
     parent: null, // 这个是执行过程中，动态获取的
-    router: router,
-    route: route,
     dynamicHireRelat: '', // 这个也是执行过程中，动态获取的层级
   }
   
@@ -201,8 +205,9 @@ export function normalConfig({
   if (config.pmPageMetaList && config.pmPageMetaList.length) {
     config.pmPageMetaList = config.pmPageMetaList.map(metaItem => {
       const { pageConfig } = normalConfig({
-        // routeQuery: route?.query,
-        // router,
+        requestTraceId,
+        dialogReq,
+        lang,
         mode,
         cbs,
         polyfillConfigs,
@@ -272,26 +277,48 @@ export function normalConfig({
   if(pageConfig.lcpPageServiceMapVOList?.length) {
     cbs.push(() => {
       const tabsServices = getTableServices(pageConfig.lcpPageServiceMapVOList, {dynamicMapComp: mapComp, dynamicMapCompKeys: Object.keys(mapComp), hireRelat})
-      tabsServices.forEach((({tableConfig, service}) => {
+      tabsServices.forEach((({mixinServiceConfig, tableConfig, service}) => {
         const orginCurrentChange = tableConfig.currentChange
         tableConfig.currentChange = (val, props, page) => {
-          // setTimeout(() => {
-            orginCurrentChange && orginCurrentChange(val, props, page)
-            const dynamicMapComp = props.config.dynamicMapComp
-            const dynamicMapCompKeys = Object.keys(dynamicMapComp)
-            const dynamicHireRelat = props.config.dynamicHireRelat
-            dispatchClickEvent(service, { dynamicMapComp,  dynamicMapCompKeys, dynamicHireRelat, rootValue, messageCb, compConfig: pageConfig, axiosInstance, messageInstance })
-          // }, 0);
+          orginCurrentChange && orginCurrentChange(val, props, page)
+          const dynamicMapComp = props.config.dynamicMapComp
+          const dynamicMapCompKeys = Object.keys(dynamicMapComp)
+          const dynamicHireRelat = props.config.dynamicHireRelat
+          dispatchClickEvent(service, {
+            requestTraceId,
+            dialogReq,
+            mixinServiceConfig, 
+            lang,
+            dynamicMapComp,
+            dynamicMapCompKeys,
+            dynamicHireRelat,
+            rootValue,
+            messageCb,
+            compConfig: pageConfig,
+            axiosInstance,
+            messageInstance
+          })
         }
         const orginSizeChange = tableConfig.sizeChange
         tableConfig.sizeChange = (val, props, page) => {
-          // setTimeout(() => {
-            orginSizeChange && orginSizeChange(val, props, page)
-            const dynamicMapComp = props.config.dynamicMapComp
-            const dynamicMapCompKeys = Object.keys(dynamicMapComp)
-            const dynamicHireRelat = props.config.dynamicHireRelat
-            dispatchClickEvent(service, { dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat, rootValue, messageCb, compConfig: pageConfig, axiosInstance, messageInstance })
-          // }, 0);
+          orginSizeChange && orginSizeChange(val, props, page)
+          const dynamicMapComp = props.config.dynamicMapComp
+          const dynamicMapCompKeys = Object.keys(dynamicMapComp)
+          const dynamicHireRelat = props.config.dynamicHireRelat
+          dispatchClickEvent(service, {
+            requestTraceId,
+            dialogReq,
+            mixinServiceConfig, 
+            lang,
+            dynamicMapComp,
+            dynamicMapCompKeys,
+            dynamicHireRelat,
+            rootValue,
+            messageCb,
+            compConfig: pageConfig,
+            axiosInstance,
+            messageInstance
+          })
         }
       }))
     })
@@ -304,12 +331,14 @@ export function normalConfig({
 
 // 从按钮的服务编排中，获取到按钮中配置的表格中的config，并且绑定表格的分页
 function getTableServices(lcpPageServiceMapVOList = [], { dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat }) {
+  const mixinServiceConfig = lcpPageServiceMapVOList.find(service => service.serviceType === '1')
   const searchServices = lcpPageServiceMapVOList.filter(service => service.transactionType == '1')
   if (searchServices.length) {
     return searchServices.map(service => {
       const tableConfig = getTableConfig(service?.outParamMappingList, { dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat })
       if (tableConfig) {
         return {
+          mixinServiceConfig,
           tableConfig,
           service
         }