resolver-egretimp-plus 0.0.28 → 0.0.30

package/package.json

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

package/src/components/helper/button.js

@@ -1,6 +1,4 @@
-import { ElMessage } from 'element-plus';
-
-export async function dispatchClickEvents  ({serviceList = [], axiosInstance, reqData}) {
+export async function dispatchClickEvents  ({serviceList = [], axiosInstance, reqData, messageInstance}) {
   for (let i = 0; i < serviceList.length; i++) {
     const service = serviceList[i]
     const url = service.serviceCode
@@ -10,7 +8,7 @@ export async function dispatchClickEvents  ({serviceList = [], axiosInstance, re
       data: reqData
     }))
     if (!ret?.data?.success) {
-      ElMessage.error(ret?.data?.resultMessage || '')
+      messageInstance?.value?.error(ret?.data?.resultMessage || '')
       await Promise.reject()
     }
   }

package/src/components/helper/resolver.js

@@ -0,0 +1,39 @@
+export async function executeLoadServices(services = [], { axiosInstance, messageInstance, reqData, respCb }) {
+  const loadServices = services.filter(ser => ser.eventType == '1')
+  for (let i = 0; i < loadServices.length; i++) {
+    const service = loadServices[i]
+    const url = service.serviceCode
+    const ret = await (axiosInstance.value && axiosInstance.value({
+      url,
+      method: "post",
+      data: reqData
+    }))
+    // const ret = await (new Promise((res) => {
+    //   setTimeout(() => {
+    //     res({
+    //       data: {
+    //         success: true,
+    //         result: {
+    //           studentId: 121212
+    //         }
+    //       }
+    //     })
+    //   }, 3000);
+    // }))
+    if (!ret?.data?.success) {
+      messageInstance?.value?.error(ret?.data?.resultMessage || '')
+      await Promise.reject()
+    }
+    respCb && respCb(ret?.data?.result)
+  }
+}
+
+export function normalPageConfigs(pageConfig) {
+  const rootOptionComp = pageConfig?.pmPageMetaList?.find(item => item.metaCode === 'PC-root-panel')
+  if (rootOptionComp) {
+    pageConfig.pmPageMetaList = rootOptionComp.pmPageMetaList
+    delete rootOptionComp.pmPageMetaList
+    pageConfig.rootOptionComp = rootOptionComp
+  }
+  return pageConfig
+}

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

@@ -2,7 +2,7 @@
 import { defineProps, inject, getCurrentInstance, computed, useAttrs } from 'vue'
 import { commonPropsType } from '../../utils/index.js'
 import { useRoute } from 'vue-router'
-import { dispatchClickEvents } from '../helper/button-H5.js';
+import { dispatchClickEvents } from '../helper/button.js';
 
 const appContext = getCurrentInstance()?.appContext
 
@@ -41,6 +41,7 @@ const label = computed(() => {
 const route = useRoute()
 const buttonActions = inject('buttonActions', {})
 
+const messageInstance = inject('_messageInstance')
 const dynamicMapComp = inject('dynamicMapComp')
 const hireRelatMapRules = inject('hireRelatMapRules')
 const components = inject('components')
@@ -71,7 +72,9 @@ const buttonAction = () => {
   if (PageServiceMapVOList?.length) {
     dispatchClickEvents({
       serviceList: PageServiceMapVOList,
-      axiosInstance: _axiosInstance
+      axiosInstance: _axiosInstance,
+      reqData: rootValue?.value,
+      messageInstance
     })
   }
 }

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

@@ -28,8 +28,10 @@ const onChange = (e) => {
 </script>
 
 <template>
-  <cmi-cell
-    :value="modelValue" v-bind="{ ...attrs, ...calcProps}" 
-    @change="onChange"
-  ></cmi-cell>
+  <cmi-cell-group>
+    <cmi-cell
+      :value="modelValue" v-bind="{ ...attrs, ...calcProps}" 
+      @change="onChange"
+    ></cmi-cell>
+  </cmi-cell-group>
 </template>

package/src/components/packages-web/ElButton.vue

@@ -53,6 +53,7 @@ const label = computed(() => {
 const route = useRoute()
 const buttonActions = inject('buttonActions', {})
 
+const messageInstance = inject('_messageInstance')
 const dynamicMapComp = inject('dynamicMapComp')
 const hireRelatMapRules = inject('hireRelatMapRules')
 const components = inject('components')
@@ -83,7 +84,8 @@ const buttonAction = () => {
     dispatchClickEvents({
       serviceList: PageServiceMapVOList,
       axiosInstance: _axiosInstance,
-      reqData: rootValue?.value
+      reqData: rootValue?.value,
+      messageInstance
     })
   }
 }

package/src/hooks/pageConfig.js

@@ -2,6 +2,7 @@ import { parsePageConfig } from "../utils"
 import { ref } from 'vue'
 import { buildInRequest } from "../utils/request"
 import { GET_SYS_PARAM_CACHE, QUERY_PAGE_CONFIG_DATA } from "../api/builtIn"
+import { normalPageConfigs } from "../components/helper/resolver"
 
 export function usePageConfig() {
   const pageConfigRef = ref(null)
@@ -31,7 +32,7 @@ export function useBuildInData(messageTipInstance, loadingInstance) {
     }
     buildInRequest(QUERY_PAGE_CONFIG_DATA, reqData).then(ret => {
       if (ret.data.success) {
-        pageConfig.value = ret.data.result
+        pageConfig.value = normalPageConfigs(ret.data.result)
         getSelects(ret.data.result?.pmBusinessIdentityVO?.tenantId)
         return
       }
@@ -44,7 +45,7 @@ export function useBuildInData(messageTipInstance, loadingInstance) {
       }
     })
   }
-  const selects = ref([])
+  const selects = ref({})
   function getSelects(tenantId) {
     buildInRequest(GET_SYS_PARAM_CACHE, {
       tenantId

package/src/index.jsx

@@ -5,6 +5,7 @@ import { useBuildInData, usePageConfig } from './hooks/pageConfig'
 import { toValidate } from './utils/valid.js'
 import { MODE } from "./utils/const.js"
 import { generateRequester } from "./utils/request.js"
+import { executeLoadServices } from "./components/helper/resolver.js"
 export default {
   name: 'Resolver',
   props: {
@@ -73,8 +74,21 @@ export default {
       type: Function,
       default: () => ({composeComponents: {}})
     },
+    loadingInstance: {
+      type: [Object, Function],
+      default: () => null
+    },
+    messageInstance: {
+      type: [Object, Function],
+      default: () => null
+    },
+    loadEvnetsReq: {
+      type: Object,
+      default: () => ({})
+    }
   },
   setup(props, { emit, attrs, expose }) {
+    let nativeDataLoad = ref(false)
     let axiosInstance = ref(props.axiosInstance)
     watch(() => {
       return props.axiosConfig
@@ -87,14 +101,50 @@ export default {
     }, {
       immediate: true
     })
+
+    
+    const dataLoad = computed(() => {
+      return props.dataLoad || nativeDataLoad.value
+    })
     const instance = getCurrentInstance()
     const { initPageConfig, pageConfigRef, mapCompRef, hireRelatMapRulesRef } = usePageConfig()
+
     initPageConfig(props.config, props.lang, props.polyfillConfigs, instance, props.isH5)
+    // 触发加载事件执行
+    executeLoadServices(
+      props.config?.pmPageServiceMapVOList || [],
+      {
+        messageInstance: toRef(props, 'messageInstance'),
+        axiosInstance,
+        reqData: props.loadEvnetsReq,
+        respCb: (result) => {
+          nativeDataLoad.value = true
+          emit('update:modelValue', result)
+          emit('loadEvnetsCompleted', result)
+        }
+      }
+    )
 
     watch(toRef(props, 'config'), () => {
       initPageConfig(props.config, props.lang, props.polyfillConfigs, instance, props.isH5)
+      executeLoadServices(
+        props.config?.pmPageServiceMapVOList || [],
+        {
+          messageInstance: toRef(props, 'messageInstance'),
+          axiosInstance,
+          reqData: props.loadEvnetsReq,
+          respCb: (result) => {
+            debugger
+            nativeDataLoad.value = true
+            emit('update:modelValue', result)
+            emit('loadEvnetsCompleted', result)
+          }
+        }
+      )
     })
     
+    provide('_messageInstance', toRef(props, 'messageInstance'))
+    provide('_loadingInstance', toRef(props, 'loadingInstance'))
     provide('_getNativeComps', props.getNativeComps)
     provide('pageConfig', pageConfigRef)
     const dynamicMapComp = reactive({})
@@ -108,7 +158,7 @@ export default {
     provide('selects', toRef(props, 'selects'))
     provide('rootValue', toRef(props, 'modelValue')) // 绑定进入的跟数据
     provide('lang', toRef(props, 'lang'))
-    provide('dataLoad', toRef(props, 'dataLoad')) // 是否可以开始执行规则初始化
+    provide('dataLoad', dataLoad) // 是否可以开始执行规则初始化
     provide('dialogComponents', props.dialogComponents) // 是否可以开始执行规则初始化
     provide('_isH5', toRef(props, 'isH5')) // 是否是H5配置
 

package/src/resolver-common.vue

@@ -14,11 +14,11 @@ const props = defineProps({
     default: () => ({composeComponents: {}})
   },
   loadingInstance: {
-    type: Object,
+    type: [Object, Function],
     default: () => null
   },
   messageInstance: {
-    type: Object,
+    type: [Object, Function],
     default: () => null
   },
 })
@@ -36,10 +36,10 @@ getPageConfig({
 const allSelects = computed(() => {
   return {
     ...props.selects,
-    ...selects
+    ...selects.value
   }
 })
 </script>
 <template>
-  <Resolver v-bind="attrs" :getNativeComps="props.getNativeComps" :config="pageConfig || null" :selects="allSelects"></Resolver>
+  <Resolver v-bind="attrs" :loadingInstance="props.loadingInstance" :messageInstance="props.messageInstance" :getNativeComps="props.getNativeComps" :config="pageConfig || null" :selects="allSelects"></Resolver>
 </template>

package/src/components/helper/button-H5.js

@@ -1,17 +0,0 @@
-// import { ElMessage } from 'element-plus';
-
-export async function dispatchClickEvents  ({serviceList = [], axiosInstance, reqData}) {
-  for (let i = 0; i < serviceList.length; i++) {
-    const service = serviceList[i]
-    const url = service.serviceCode
-    const ret = await (axiosInstance.value && axiosInstance.value({
-      url,
-      method: "post",
-      data: reqData
-    }))
-    if (!ret?.data?.success) {
-      // ElMessage.error(ret?.data?.resultMessage || '')
-      await Promise.reject()
-    }
-  }
-}