resolver-egretimp-plus 0.0.29 → 0.0.30

package/package.json

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

package/src/components/helper/resolver.js

@@ -26,4 +26,14 @@ export async function executeLoadServices(services = [], { axiosInstance, messag
     }
     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/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
       }

package/src/index.jsx

@@ -75,11 +75,11 @@ export default {
       default: () => ({composeComponents: {}})
     },
     loadingInstance: {
-      type: Object,
+      type: [Object, Function],
       default: () => null
     },
     messageInstance: {
-      type: Object,
+      type: [Object, Function],
       default: () => null
     },
     loadEvnetsReq: {

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
   },
 })