resolver-egretimp-plus 0.0.32 → 0.0.34

package/src/hooks/pageConfig.js

@@ -39,7 +39,7 @@ export function usePageConfig() {
 
 export function useBuildInData(messageTipInstance, loadingInstance) {
   const pageConfig = ref(null)
-  function getPageConfig(reqData) {
+  function getPageConfig(reqData, cb) {
     if (loadingInstance.start && typeof loadingInstance.start === 'function') {
       loadingInstance.start()
     } else if (loadingInstance.show && typeof loadingInstance.show === 'function') {
@@ -49,6 +49,7 @@ export function useBuildInData(messageTipInstance, loadingInstance) {
       if (ret.data.success) {
         // pageConfig.value = normalPageConfigs(mock)
         pageConfig.value = normalPageConfigs(ret.data.result)
+        cb(pageConfig.value)
         getSelects(ret.data.result?.pmBusinessIdentityVO?.tenantId)
         return
       }

package/src/index.jsx

@@ -88,8 +88,9 @@ export default {
     }
   },
   setup(props, { emit, attrs, expose }) {
-    let nativeDataLoad = ref(false)
-    let axiosInstance = ref(props.axiosInstance)
+    const rootStore = reactive({})
+    const nativeDataLoad = ref(false)
+    const axiosInstance = ref(props.axiosInstance)
     watch(() => {
       return props.axiosConfig
     }, (val) => {
@@ -101,8 +102,10 @@ export default {
     }, {
       immediate: true
     })
+    watch(rootStore, () => {
+      emit('rootStoreChange', rootStore)
+    }, { immediate: true })
 
-    
     const dataLoad = computed(() => {
       return props.dataLoad || nativeDataLoad.value
     })
@@ -152,7 +155,6 @@ export default {
           axiosInstance,
           reqData: props.loadEvnetsReq,
           respCb: (result) => {
-            debugger
             nativeDataLoad.value = true
             emit('update:modelValue', result)
             emit('loadEvnetsCompleted', result)
@@ -161,6 +163,7 @@ export default {
       )
     })
     
+    provide('_rootStore', rootStore)
     provide('_messageInstance', toRef(props, 'messageInstance'))
     provide('_loadingInstance', toRef(props, 'loadingInstance'))
     provide('_getNativeComps', props.getNativeComps)

package/src/resolver-common.vue

@@ -32,6 +32,9 @@ getPageConfig({
   busiIdentityId: props.busiIdentityId,
   queryPageMeta: '1',
   queryPageService: '1',
+}, (pageConfig) => {
+  // 数据加载完成事件 'loadedConfigCompeted'
+  attrs.onLoadedConfigCompeted(pageConfig)
 })
 const allSelects = computed(() => {
   return {

package/src/theme/element/components/tabs.scss

@@ -1,6 +1,6 @@
 
 .el-tabs {
-  display: block;
+  // display: block;
   border-radius: 4px;
   overflow: hidden;
   &.el-tabs--border-card>.el-tabs__content {

package/src/utils/render.jsx

@@ -204,7 +204,7 @@ export function normalConfig({
     pageConfig.type = 'daterange'
   }
   if (config.metaType == 'card') {
-    pageConfig.needWrap = '2'
+    pageConfig.needWrap = '1'
   }
   mapComp[hireRelat] = pageConfig
   parsePolyfillConfigs({ polyfillConfigs, instance }, pageConfig)
@@ -213,20 +213,20 @@ export function normalConfig({
       const tabsServices = getTableServices(pageConfig.lcpPageServiceMapVOList, {dynamicMapComp: mapComp, dynamicMapCompKeys: Object.keys(mapComp), hireRelat})
       tabsServices.forEach((({tableConfig, service}) => {
         tableConfig.currentChange = (val, props, page) => {
-          setTimeout(() => {
+          // setTimeout(() => {
             const dynamicMapComp = props.config.dynamicMapComp
             const dynamicMapCompKeys = Object.keys(dynamicMapComp)
             const dynamicHireRelat = props.config.dynamicHireRelat
             dispatchClickEvent(service, { dynamicMapComp,  dynamicMapCompKeys, dynamicHireRelat, rootValue, axiosInstance, messageInstance })
-          }, 0);
+          // }, 0);
         }
         tableConfig.sizeChange = (val, props, page) => {
-          setTimeout(() => {
+          // setTimeout(() => {
             const dynamicMapComp = props.config.dynamicMapComp
             const dynamicMapCompKeys = Object.keys(dynamicMapComp)
             const dynamicHireRelat = props.config.dynamicHireRelat
             dispatchClickEvent(service, { dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat, rootValue, axiosInstance, messageInstance })
-          }, 0);
+          // }, 0);
         }
       }))
     })