resolver-egretimp-plus 0.0.163 → 0.0.164

package/package.json

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

package/src/components/helper/eventOrchestration.js

@@ -543,6 +543,8 @@ function closePage(lcpPageClosedMapVO) {
 }
 
 export async function executeEventOrchestration({
+  beforeDataValidRequestService,
+  afterDataValidRequestService,
   beforeRequestService,
   afterRequestService,
   beforeOpenDialog,
@@ -601,24 +603,51 @@ export async function executeEventOrchestration({
     }
   }
   if (lcpPageRuleVOLis?.length) {
-      // 数据校验服务
-      const validConfig = lcpPageRuleVOLis[0]
-      const valid = await executeDataValid(validConfig, {
-        dynamicMapComp,
-        requestTraceId,
-        rootValue,
-        axiosInstance,
-        mixinServiceConfig,
-        compConfig: props.config,
-        confirmInstance,
-        builtPolyfillReq,
-        beforeRequestService: normalBeforeRequestService,
-        afterRequestService: normalAfterRequestService,
-        lang
-      })
-      if (!valid) {
-        return
+    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, {
+      dynamicMapComp,
+      requestTraceId,
+      rootValue,
+      axiosInstance,
+      mixinServiceConfig,
+      compConfig: props.config,
+      confirmInstance,
+      builtPolyfillReq,
+      beforeRequestService: normalBeforeDataValidRequestService,
+      afterRequestService: normalAfterDataValidRequestService,
+      lang
+    })
+    if (!valid) {
+      return
+    }
   }
   
   if (PageServiceMapVOList?.length) {

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

@@ -79,6 +79,11 @@ const tableEvents = computed(() => {
       if (attrs.onRowclick) {
         attrs.onRowclick?.(e)
       }
+    },
+    onTogglelandscape: (e) => {
+      if (attrs.onTogglelandscape) {
+        attrs.onTogglelandscape?.(e)
+      }
     }
   }
   return ret
@@ -213,7 +218,7 @@ function normalTableRowValue(row) {
 }
 </script>
 <template>
-  <cmi-table ref="tableRef" :key="tableKey" v-bind="tableProps" @rowclick="tableEvents.onRowclick">
+  <cmi-table ref="tableRef" :key="tableKey" v-bind="tableProps" @rowclick="tableEvents.onRowclick" @togglelandscape="tableEvents.onTogglelandscape">
     <cmi-table-column
       v-for="column in pmPageMetaList" :key="column.metaCode"
       v-bind="{