resolver-egretimp-plus 0.0.162 → 0.0.164

package/package.json

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

package/src/analysisComponent.jsx

@@ -68,6 +68,7 @@ export default {
     const openChildDialogInstance = inject('_openChildDialogInstance')
     const messageCb = inject('_messageCb')
     const messageInstance = inject('_messageInstance')
+    const builtPolyfillReq = inject('_builtPolyfillReq')
 
     const selects = inject('selects')
     // 当前组件的实例
@@ -243,6 +244,7 @@ export default {
       }
       executeEventOrchestration({
         ...params,
+        builtPolyfillReq,
         components,
         props,
         requestTraceId: requestTraceId?.value,

package/src/components/helper/eventOrchestration.js

@@ -445,6 +445,7 @@ export async function executeDataValid(validConfig, {
   compConfig,
   mixinServiceConfig,
   rootValue,
+  builtPolyfillReq,
   axiosInstance,
   lang
 }) {
@@ -471,6 +472,7 @@ export async function executeDataValid(validConfig, {
     aid_language: lang,
     requestTraceId,
     ...reqData,
+    ...(builtPolyfillReq || {}),
     pmHandleBusinessIdentity: {
       busiIdentityId: validConfig.busiIdentityId,
       pageMetaId: validConfig.pageMetaId,
@@ -541,6 +543,8 @@ function closePage(lcpPageClosedMapVO) {
 }
 
 export async function executeEventOrchestration({
+  beforeDataValidRequestService,
+  afterDataValidRequestService,
   beforeRequestService,
   afterRequestService,
   beforeOpenDialog,
@@ -560,6 +564,7 @@ export async function executeEventOrchestration({
   openChildDialog,
   messageCb,
   lang,
+  builtPolyfillReq,
   appContext 
 } = {}) {
   const lcpPageRuleVOLis = props.config?.lcpPageRuleVOList || []
@@ -598,23 +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,
-        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="{

package/src/hooks/pageConfig.js

@@ -48,7 +48,7 @@ export function usePageConfig() {
 
 export function useBuildInData({ messageInstance, loadingInstance, requestTraceId }) {
   const pageConfig = ref(null)
-  function getPageConfig(reqData, { configCb, selectsCb}) {
+  function getPageConfig(reqData, { configCb, selectsCb, selectPolyReq}) {
     if (loadingInstance.start && typeof loadingInstance.start === 'function') {
       loadingInstance.start()
     } else if (loadingInstance.show && typeof loadingInstance.show === 'function') {
@@ -63,7 +63,10 @@ export function useBuildInData({ messageInstance, loadingInstance, requestTraceI
         } catch (error) {
           console.error(error)
         }
-        getSelects(ret.data.result?.pmBusinessIdentityVO?.tenantId, selectsCb)
+        getSelects({
+          tenantId: ret.data.result?.pmBusinessIdentityVO?.tenantId,
+          ...(selectPolyReq || {})
+        }, selectsCb)
         return
       } else {
         if (loadingInstance.finish && typeof loadingInstance.finish === 'function') {
@@ -81,9 +84,9 @@ export function useBuildInData({ messageInstance, loadingInstance, requestTraceI
     })
   }
   const selects = ref({})
-  function getSelects(tenantId, selectsCb) {
+  function getSelects(req, selectsCb) {
     buildInRequest(GET_SYS_PARAM_CACHE, {
-      tenantId
+      ...(req || {})
     }).then(ret => {
       if (resultToast(ret.data, messageInstance, { noSuccessIip: true })) {
         selects.value = JSON.parse(ret.data.result || '{}')

package/src/index.jsx

@@ -132,6 +132,11 @@ export default {
       type: Object,
       default: () => ({})
     },
+    // 外部传入，给所有的内置接口的额外参数
+    builtPolyfillReq: {
+      type: Object,
+      default: () => ({})
+    },
   },
   emits: ['update:modelValue', 'rootStoreChange'],
   setup(props, { emit, attrs, expose }) {
@@ -220,6 +225,8 @@ export default {
       })
       toExecuteLoadServices()
     })
+    
+    provide('_builtPolyfillReq', props.builtPolyfillReq)
     provide('_loadModuleCache', props.loadModuleCache)
     provide('_ruleExecuter', ruleExecuter)
     provide('_toExecuteLoadServices', toExecuteLoadServices)

package/src/resolver-common.vue

@@ -28,7 +28,12 @@ const props = defineProps({
   loadConfigReq: {
     type: Object,
     default: () => ({})
-  }
+  },
+  // 外部传入，给所有的内置接口的额外参数
+  builtPolyfillReq: {
+    type: Object,
+    default: () => ({})
+  },
 })
 defineOptions({
   inheritAttrs: false
@@ -40,6 +45,7 @@ getPageConfig({
   busiIdentityId: props.busiIdentityId,
   queryPageMeta: '1',
   queryPageService: '1',
+  ...(props.builtPolyfillReq || {}),
   ...(props.loadConfigReq || {})
 }, {
   configCb: (pageConfig) => {
@@ -50,6 +56,9 @@ getPageConfig({
     // 配置数据加载完成事件 'loadedConfigCompeted'
     attrs?.onLoadedSelectsCompeted?.(selects)
   },
+  selectPolyReq: {
+    ...(props.builtPolyfillReq || {}),
+  }
 })
 const allSelects = computed(() => {
   return {
@@ -89,6 +98,7 @@ defineExpose({
     :getNativeComps="props.getNativeComps"
     :config="pageConfig || null"
     :selects="allSelects"
+    :builtPolyfillReq="props.builtPolyfillReq"
     :requestTraceId="props.requestTraceId"
   ></Resolver>
 </template>