resolver-egretimp-plus 0.1.109 → 0.1.110

package/package.json

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

package/src/components/helper/resolver.js

@@ -87,16 +87,37 @@ export async function executeLoadServices(services = [], {
   }
 }
 
-export function normalPageConfigs(pageConfig) {
+export function normalPageConfigs(pageConfig, target) {
   const rootOptionComp = pageConfig?.pmPageMetaList?.find(item => item.metaType === 'PC-root-panel' || item.metaType === 'H5-root-panel')
   if (rootOptionComp) {
     pageConfig.pmPageMetaList = rootOptionComp.pmPageMetaList
     delete rootOptionComp.pmPageMetaList
     pageConfig.rootOptionComp = rootOptionComp
   }
+  if (target) {
+    const targetComp = getTargetComp(pageConfig, target)
+    if (targetComp) {
+      pageConfig.pmPageMetaList = [targetComp]
+    }
+  }
   return pageConfig
 }
 
+// 获取配置的时候，设置了只需要展示指定的部分
+function getTargetComp(config, target = '') {
+  let ret = config
+  if (target) {
+    metaCodes = target.split('->')
+    ret = metaCodes.reduce((ret, metaCode) => {
+      if (ret && ret.pmPageMetaList && Array.isArray(ret.pmPageMetaList)) {
+        return ret.pmPageMetaList.find(item => item.metaCode === metaCode)
+      }
+      return ret
+    }, config)
+  }
+  return ret
+}
+
 export function resetConfigEventInit(dynamicMapComp) {
   Object.keys(dynamicMapComp).forEach(key => {
     if (hasOwn(dynamicMapComp[key], 'eventInit')) {

package/src/components/helper/table.jsx

@@ -50,11 +50,11 @@ export async function tableValidate({
       }
       const rules = getFormItemRule(columnConfig, lang, params, compProps)
       const validator = new AsyncValidator({
-        // [props.config.metaCode]: rules
-        validator: (rule, value, callback) => {
-          callback(new Error('test error'))
-          return
-        }
+        [props.config.metaCode]: rules
+        // validator: (rule, value, callback) => {
+        //   callback(new Error('test error'))
+        //   return
+        // }
       })
       const a = await validator.validate({[columnConfig.metaCode]: row[columnConfig.metaCode]})
       debugger

package/src/resolver-common.vue

@@ -8,7 +8,7 @@ const props = defineProps({
   busiIdentityId: String,
   selects: {
     type: Object,
-    default: () => ({})
+    default: () => ({_default: true})
   },
   getNativeComps: {
     type: Function,
@@ -38,43 +38,51 @@ const props = defineProps({
     type: Object,
     default: () => ({})
   },
+  // 外部传入的config
+  nativeConfig: [Object, Array]
 })
+const selectsLoad = ref(true)
 defineOptions({
   inheritAttrs: false
 })
-const loadSelects = ref({})
 const attrs = useAttrs()
-const allSelects = computed(() => {
-  return {
-    ...loadSelects.value,
-    ...(props.selects || {})
-  }
-})
+
 initInterceptors(props.messageInstance)
 const { getPageConfig, pageConfig, selects } = useBuildInData({messageInstance: props.messageInstance, loadingInstance: props.loadingInstance, requestTraceId: props.requestTraceId})
-getPageConfig({
-  busiIdentityId: props.busiIdentityId,
-  queryPageMeta: '1',
-  queryPageService: '1',
-  ...(props.builtPolyfillReq || {}),
-  ...(props.loadConfigReq || {})
-}, {
-  configCb: (pageConfig) => {
-    // 配置数据加载完成事件 'loadedConfigCompeted'
-    attrs?.onLoadedConfigCompeted?.(pageConfig)
-  },
-  selectsCb: (selects) => {
-    // 配置数据加载完成事件 'loadedConfigCompeted'
-    // Object.keys(selects || {}).forEach(key => {
-    //   props.selects[key] = selects[key]
-    // })
-    loadSelects.value = selects
-    attrs?.onLoadedSelectsCompeted?.(allSelects.value)
-  },
-  selectPolyReq: {
-    ...(props.builtPolyfillReq || {}),
+if (!props.nativeConfig) {
+  if (props.selects?._default) {
+    // 没有传selects对象的时候，在selectsCb中设置props.selects属性，是不会响应式的，所以这边需要进行逻辑控制
+    selectsLoad.value = false
   }
-})
+  getPageConfig({
+    busiIdentityId: props.busiIdentityId,
+    queryPageMeta: '1',
+    queryPageService: '1',
+    ...(props.builtPolyfillReq || {}),
+    ...(props.loadConfigReq || {})
+  }, {
+    configCb: (pageConfig) => {
+      // 配置数据加载完成事件 'loadedConfigCompeted'
+      attrs?.onLoadedConfigCompeted?.(pageConfig)
+    },
+    selectsCb: (selects) => {
+      // 配置数据加载完成事件 'loadedConfigCompeted'
+      Object.keys(selects || {}).forEach(key => {
+        props.selects[key] = selects[key]
+      })
+      attrs?.onLoadedSelectsCompeted?.(props.selects)
+      if (props.selects?._default) {
+        // 没有传selects对象的时候，在selectsCb中设置props.selects属性，是不会响应式的，所以这边需要进行逻辑控制
+        selectsLoad.value = true
+      }
+    },
+    selectPolyReq: {
+      ...(props.builtPolyfillReq || {}),
+    }
+  })
+} else {
+  pageConfig.value = props.nativeConfig
+}
 
 const resolverRef = ref(null)
 defineExpose({
@@ -106,7 +114,7 @@ defineExpose({
 </script>
 <template>
   <Resolver
-    v-if="pageConfig"
+    v-if="pageConfig && selectsLoad"
     ref="resolverRef"
     v-bind="attrs"
     :loadingInstance="props.loadingInstance"
@@ -114,7 +122,7 @@ defineExpose({
     :getNativeComps="props.getNativeComps"
     :copyModal="props.copyModal"
     :config="pageConfig || null"
-    :selects="allSelects"
+    :selects="props.selects"
     :builtPolyfillReq="props.builtPolyfillReq"
     :requestTraceId="props.requestTraceId"
   ></Resolver>

package/src/utils/render.jsx

@@ -199,7 +199,6 @@ export function normalConfig({
     parent: null, // 这个是执行过程中，动态获取的
     dynamicHireRelat: '', // 这个也是执行过程中，动态获取的层级
   }
-  
   let extendAttrObj = parseExtendAttr(config)
   let extendObj = {
     removeCol: findComponent(NOT_NEED_COL_ITEM_META_TYPE, extendAttrObj.renderby) !== -1 || findComponent(NOT_NEED_COL_ITEM_META_TYPE, metaType) !== -1,
@@ -449,6 +448,7 @@ export function getComponentForConfig({messageInstance, config, disabled, getNat
         renderbyComp = <div>not component</div>
       }
     }
+
     component = renderbyComp || component
   }
   return component