resolver-egretimp-plus 0.0.83 → 0.0.85

package/package.json

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

package/src/analysisComponent.jsx

@@ -191,6 +191,7 @@ export default {
     }
     function executeClickEvents() {
       executeEventOrchestration({
+        components,
         props,
         requestTraceId: requestTraceId?.value,
         axiosInstance: _axiosInstance?.value,

package/src/components/childDialog/src/index.vue

@@ -6,6 +6,11 @@ import en from 'element-plus/es/locale/lang/en'
 const Resolver = defineAsyncComponent(() => import('../../../resolver-web.vue'))
 
 const props = defineProps({
+  // 传入的自定义组件
+  components: {
+    type: Object,
+    default: () => ({})
+  },
   busiIdentityId: {
     type: String,
     default: ''
@@ -119,6 +124,7 @@ defineExpose({
         :polyfillConfigs="props.polyfillConfigs"
         :axiosInstance="props.axiosInstance"
         :axiosConfig="props.axiosConfig"
+        :components="props.components"
       ></Resolver>
     </ElDialog>
   </ElConfigProvider>

package/src/components/helper/eventOrchestration.js

@@ -181,6 +181,7 @@ export function getTableConfig(outParamMappingList = [], { dynamicMapComp, dynam
 }
 
 export function openDailg({
+  components,
   rootValue,
   polyfillConfigs,
   pagePopupMap,
@@ -354,6 +355,7 @@ export function openDailg({
       lang,
       loadEvnetsReq: reqData,
       initData: reqData,
+      components,
       polyfillConfigs: {
         ...initPolyfillConfigs,
         ...(polyfillConfigs || {})
@@ -451,7 +453,7 @@ function closePage(lcpPageClosedMapVO) {
   }
 }
 
-export async function executeEventOrchestration({props, requestTraceId, axiosInstance, polyfillConfigs, buttonActions, rootValue, confirmInstance, dialogReq, dynamicMapComp, messageInstance, openChildDialog, messageCb, lang, appContext } = {}) {
+export async function executeEventOrchestration({components, props, requestTraceId, axiosInstance, polyfillConfigs, buttonActions, rootValue, confirmInstance, dialogReq, dynamicMapComp, messageInstance, openChildDialog, messageCb, lang, appContext } = {}) {
   const lcpPageRuleVOLis = props.config?.lcpPageRuleVOList || []
   const PageServiceMapVOList = props.config.lcpPageServiceMapVOList || []
   const mixinServiceConfig = PageServiceMapVOList.find(service => service.serviceType === '1')
@@ -498,6 +500,7 @@ export async function executeEventOrchestration({props, requestTraceId, axiosIns
 
     const dynamicHireRelat = props.config?.dynamicHireRelat
     openDailg({
+      components,
       rootValue,
       polyfillConfigs,
       pagePopupMap: lcpPagePopupMapVO,

package/src/components/packages-web/CustomComponentTable.jsx

@@ -66,7 +66,11 @@ export default {
     const tableColumnConfigs = computed(() => {
       let pmPageMetaList = props.config.pmPageMetaList || []
       return pmPageMetaList.map((config) => {
-        if (config.displayType === DISPLAY_SHOW && !tableColumnFirstMetaCode.value) {
+        if (
+          config.displayType !== DISPLAY_HIDDEN &&
+          !((props.width == 0 || props.width == '0px' || config.hidden == '1')) &&
+          !tableColumnFirstMetaCode.value
+        ) {
           tableColumnFirstMetaCode.value = config.metaCode
         }
         return normalColumnConfig(config)
@@ -216,9 +220,6 @@ export default {
     watch(() => {
       return tableData?.value?.length
     }, (length) => {
-      // if (props.config.metaCode == 'solutionSupports') {
-      //   debugger
-      // }
       let list = []
       if (length) {
         const newVal = tableData?.value
@@ -251,7 +252,7 @@ export default {
       props.config.multiPmPageMetaList = list
     }, {
       immediate: true,
-      // deep: true,
+      deep: true,
     })
     // 统计行定义 ====start======
     const totalMetaCodes = computed(() => {
@@ -468,8 +469,13 @@ export default {
                         }
                         const config = multiPmPageMetaList.value?.[$index]?.[configIdx]
                         return (
-                          tableColumnNotRender(config) ? null :
-                          <Renderer key={`${config.columnId}-${config.rowIndex}`} class="error-tip-block" modelValue={getValue($index)} rowScope={{row, $index}} onUpdate:modelValue={(val) => { onUpdateModelValue(val, $index) }} config={config}></Renderer>
+                          <div>
+                            requiredFlag: {config.requiredFlag}
+                            {
+                              tableColumnNotRender(config) ? null :
+                              <Renderer key={`${config.columnId}-${config.rowIndex}`} class="error-tip-block" modelValue={getValue($index)} rowScope={{row, $index}} onUpdate:modelValue={(val) => { onUpdateModelValue(val, $index) }} config={config}></Renderer>
+                            }
+                          </div>
                         )
                       }
                     }}

package/src/hooks/pageConfig.js

@@ -11,6 +11,8 @@ export function usePageConfig() {
   const hireRelatMapRulesRef = ref(null)
   const mapCompRef = ref(null)
   function initPageConfig({
+    route,
+    router,
     config,
     lang,
     polyfillConfigs,
@@ -23,6 +25,8 @@ export function usePageConfig() {
     messageCb
   }) {
     const { pageConfig, mapComp, hireRelatMapRules } = parsePageConfig({
+      route,
+      router,
       config, lang, polyfillConfigs, instance, isH5,
       rootValue,
       parentRootValue,

package/src/index.jsx

@@ -7,6 +7,8 @@ import { MODE } from "./utils/const.js"
 import { generateRequester } from "./utils/request.js"
 import { executeLoadServices } from "./components/helper/resolver.js"
 import { deepMerge } from "./utils/index.js"
+import { useRouter } from "vue-router"
+import { useRoute } from "vue-router"
 export default {
   name: 'Resolver',
   props: {
@@ -130,6 +132,8 @@ export default {
   setup(props, { emit, attrs, expose }) {
     const rootStore = reactive({})
     const nativeDataLoad = ref(false)
+    const router = useRouter()
+    const route = useRoute()
     const axiosInstance = ref(props.axiosInstance)
     watch(() => {
       return props.axiosConfig
@@ -153,6 +157,8 @@ export default {
     const { initPageConfig, pageConfigRef, mapCompRef, hireRelatMapRulesRef } = usePageConfig()
 
     initPageConfig({
+      router,
+      route,
       config: props.config,
       lang: props.lang, 
       polyfillConfigs: props.polyfillConfigs,
@@ -183,6 +189,8 @@ export default {
 
     watch(toRef(props, 'config'), () => {
       initPageConfig({
+        router,
+        route,
         config: props.config,
         lang: props.lang, 
         polyfillConfigs: props.polyfillConfigs,

package/src/rules/eventsSupplement.js

@@ -189,7 +189,9 @@ const allInitEvents = {
         // const oldDisplayType = labelInfo && labelInfo.displayType
         // oldDisplayTypes.push(oldDisplayType)
         labelInfo && (labelInfo.displayType = '0')
+        labelInfo && (labelInfo.hidden = '1')
         labelInfo && labelInfo.refConfig && (labelInfo.refConfig.displayType = '0')
+        labelInfo && labelInfo.refConfig && (labelInfo.refConfig.hidden = '1')
       })
     }, 0)
     
@@ -198,7 +200,9 @@ const allInitEvents = {
       configs.forEach((labelInfo, idx) => {
         // const oldDisplayType = oldDisplayTypes[idx]
         labelInfo && (labelInfo.displayType = '1')
+        labelInfo && (labelInfo.hidden = '0')
         labelInfo && labelInfo.refConfig && (labelInfo.refConfig.displayType = '1')
+        labelInfo && labelInfo.refConfig && (labelInfo.refConfig.hidden = '0')
       })
     }
   },

package/src/utils/render.jsx

@@ -105,6 +105,8 @@ function generateFormConfig(lang = 'zh', isH5) {
  * @param {*} config 通过接口获取的配置对象
  */
 export function parsePageConfig({
+  route,
+  router,
   config, lang, polyfillConfigs, instance, isH5,
   rootValue,
   parentRootValue,
@@ -118,6 +120,8 @@ export function parsePageConfig({
   formConfig.pmPageMetaList = config.pmPageMetaList
   const cbs = []
   let { pageConfig, mapComp } = normalConfig({
+    route,
+    router,
     polyfillConfigs,
     instance,
     cbs,
@@ -144,6 +148,8 @@ export function parsePageConfig({
  * @param {*} config 
  */
 export function normalConfig({ 
+  route,
+  router,
   polyfillConfigs,
   instance,
   cbs = [],
@@ -168,6 +174,8 @@ export function normalConfig({
     wrapVm: null, // 当前组件的实例（也就是analysisComponent）
     hireRelat,
     parent: null, // 这个是执行过程中，动态获取的
+    router,
+    route,
     dynamicHireRelat: '', // 这个也是执行过程中，动态获取的层级
   }
   
@@ -187,6 +195,8 @@ export function normalConfig({
   if (config.pmPageMetaList && config.pmPageMetaList.length) {
     config.pmPageMetaList = config.pmPageMetaList.map(metaItem => {
       const { pageConfig } = normalConfig({
+        route,
+        router,
         cbs,
         polyfillConfigs,
         instance,
@@ -813,7 +823,7 @@ export function getComponentPropsKeys(comp, config) {
   let emitsKyes = []
   if (config) {
     Object.keys(config).forEach(key => {
-      if (/^on[A-Z]/.test(key)) {
+      if (/^on[A-Z]/.test(key) && !['onVnodeMounted'].includes(key)) {
         emitsKyes.push(key)
       }
     })