resolver-egretimp-plus 0.0.238 → 0.0.240

package/package.json

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

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

@@ -48,6 +48,11 @@ const props = defineProps({
     type: Object,
     default: () => ({})
   },
+  parentDynamicMapComp: {
+    type: Object,
+    default: () => ({})
+  },
+  
   selectionsObj: {
     type: Object,
     // selections
@@ -89,6 +94,9 @@ const dialogProps = computed(() => {
   if (props.dialogProps?.titleEn && props.lang?.indexOf('zh') == -1) {
     ret.title = props.dialogProps?.titleEn
   }
+  if (!ret.title) {
+    ret['headerClass'] = ret['headerClass'] ? `${ret['headerClass']} hidden-head` : 'hidden-head'
+  }
   return ret
 })
 
@@ -130,6 +138,7 @@ defineExpose({
         @rootStoreChange="rootStoreChange"
         v-model="formData"
         :parentRootValue="props.parentRootValue"
+        :parentDynamicMapComp="props.parentDynamicMapComp"
         :selectionsObj="props.selectionsObj"
         :busiIdentityId="busiIdentityId"
         :lang="props.lang"
@@ -159,5 +168,10 @@ defineExpose({
   .el-dialog__header {
     min-height: 40px;
   }
+  .hidden-head {
+    & > .el-dialog__header {
+      display: none;
+    }
+  }
 }
 </style>

package/src/components/helper/eventOrchestration.js

@@ -485,6 +485,7 @@ export function openDailg({
         },
       },
       parentRootValue: rootValue,
+      parentDynamicMapComp: dynamicMapComp,
       selectionsObj,
       busiIdentityId,
       axiosInstance: axiosInstance,

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

@@ -59,6 +59,7 @@ const dataLoad = inject('dataLoad')
 const rootForm = inject('rootForm')
 const validate = inject('_validate', () => {})
 const parentRootValue = inject('_parentRootValue', {})
+const parentDynamicMapComp = inject('_parentDynamicMapComp', {})
 const rootInstance = inject('_rootInstance', {})
 
 const routeQuery= route?.query
@@ -84,6 +85,7 @@ const buttonAction = (e, params) => {
       validate,
       lastClick,
       parentRootValue,
+      parentDynamicMapComp,
       rootInstance
     }, appContext)
   }

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

@@ -70,6 +70,7 @@ export default {
     const ruleExecuter = inject('_ruleExecuter')
     const dynamicMapComp = inject('dynamicMapComp')
     const parentRootValue = inject('_parentRootValue', {})
+    const parentDynamicMapComp = inject('_parentDynamicMapComp', {})
     const selectionsObj = inject('_selectionsObj', {})
     const rootStore = inject('_rootStore', {})
     const lang = inject('lang')
@@ -203,7 +204,8 @@ export default {
             orginRet = orginSelectable(row, index, {
               tableConfig: props.config,
               rootValue: rootValue,
-              parentRootValue
+              parentRootValue,
+              parentDynamicMapComp
             })
           }
           let parentSelectionsRet = true

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

@@ -78,6 +78,7 @@ const dataLoad = inject('dataLoad')
 const rootForm = inject('rootForm')
 const validate = inject('_validate', () => {})
 const parentRootValue = inject('_parentRootValue', {})
+const parentDynamicMapComp = inject('_parentDynamicMapComp', {})
 const rootInstance = inject('_rootInstance', {})
 
 const routeQuery= route?.query
@@ -104,6 +105,7 @@ const buttonAction = async (e, params) => {
       validate,
       lastClick,
       parentRootValue,
+      parentDynamicMapComp,
       rootInstance
     }, appContext)
   }

package/src/hooks/pageConfig.js

@@ -23,6 +23,7 @@ export function usePageConfig() {
     isH5,
     rootValue,
     parentRootValue,
+    parentDynamicMapComp,
     axiosInstance,
     messageInstance,
     messageCb
@@ -36,6 +37,7 @@ export function usePageConfig() {
       config, lang, polyfillConfigs, instance, isH5,
       rootValue,
       parentRootValue,
+      parentDynamicMapComp,
       axiosInstance,
       messageInstance,
       messageCb

package/src/index.jsx

@@ -124,6 +124,11 @@ export default {
       type: Object,
       default: () => ({})
     },
+    // 如果当前页面是弹框，这个是父页面传入的配置
+    parentDynamicMapComp: {
+      type: Object,
+      default: () => ({})
+    },
     // 如果当前页面是弹框，这个是父页面已经选中的数据，控制表格选中的禁用
     selectionsObj: {
       type: Object,
@@ -243,6 +248,7 @@ export default {
       isH5: props.isH5,
       rootValue: props.modelValue,
       parentRootValue: props.parentRootValue,
+      parentDynamicMapComp: props.parentDynamicMapComp,
       axiosInstance: axiosInstance.value,
       messageInstance: props.messageInstance,
       messageCb: props.messageCb
@@ -263,6 +269,7 @@ export default {
         isH5: props.isH5,
         rootValue: props.modelValue,
         parentRootValue: props.parentRootValue,
+        parentDynamicMapComp: props.parentDynamicMapComp,
         axiosInstance: axiosInstance.value,
         messageInstance: props.messageInstance,
         messageCb: props.messageCb
@@ -305,7 +312,8 @@ export default {
     provide('dialogComponents', props.dialogComponents) // 是否可以开始执行规则初始化
     provide('_isH5', toRef(props, 'isH5')) // 是否是H5配置
 
-    provide('_parentRootValue', props.parentRootValue) 
+    provide('_parentRootValue', props.parentRootValue)
+    provide('_parentDynamicMapComp', props.parentDynamicMapComp)
     provide('_selectionsObj', props.selectionsObj) 
     provide('_polyfillConfigs', props.polyfillConfigs)
     provide('requestTraceId', toRef(props, 'requestTraceId')) // 所有渲染器调用的接口，都需要加次参数（生哥提）

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

@@ -3,6 +3,9 @@
   .custom-form-item {
     display: flex;
     align-items: center;
+    & > .el-form-item__content {
+      min-height: 32px;
+    }
     & > .el-form-item__label {
       // 表单label中使用弹性居中
       display: flex;

package/src/utils/render.jsx

@@ -116,6 +116,7 @@ export function parsePageConfig({
   config, lang, polyfillConfigs, instance, isH5,
   rootValue,
   parentRootValue,
+  parentDynamicMapComp,
   axiosInstance,
   messageInstance,
   messageCb
@@ -139,7 +140,8 @@ export function parsePageConfig({
     axiosInstance,
     messageInstance,
     messageCb,
-    parentRootValue
+    parentRootValue,
+    parentDynamicMapComp,
   }, formConfig)
   cbs.forEach((cb) => {
     cb()
@@ -169,7 +171,8 @@ export function normalConfig({
   axiosInstance,
   messageInstance,
   messageCb,
-  parentRootValue
+  parentRootValue,
+  parentDynamicMapComp,
 }, config, hireRelat = '', mapComp = {}, needformItem = false) {
   const metaCode = config.metaCode || ''
   hireRelat += hireRelat ? `->${metaCode}` : metaCode
@@ -216,7 +219,8 @@ export function normalConfig({
         axiosInstance,
         messageInstance ,
         messageCb,
-        parentRootValue
+        parentRootValue,
+        parentDynamicMapComp,
       }, metaItem, hireRelat, mapComp, needformItem || [FORM_META_TYPE, FORM_META_TYPE_H5].includes(metaType))
       return pageConfig
     })?.sort((a, b) => a.seqNo - b.seqNo)
@@ -269,7 +273,7 @@ export function normalConfig({
   }
 
   mapComp[hireRelat] = pageConfig
-  parsePolyfillConfigs({ polyfillConfigs, instance, parentRootValue }, pageConfig)
+  parsePolyfillConfigs({ polyfillConfigs, instance, parentRootValue, parentDynamicMapComp }, pageConfig)
   if(pageConfig.lcpPageServiceMapVOList?.length) {
     cbs.push(() => {
       const tabsServices = getTableServices(pageConfig.lcpPageServiceMapVOList, {dynamicMapComp: mapComp, dynamicMapCompKeys: Object.keys(mapComp), hireRelat})
@@ -343,7 +347,7 @@ function getTableServices(lcpPageServiceMapVOList = [], { dynamicMapComp, dynami
   }
   return []
 }
-function parsePolyfillConfigs({ polyfillConfigs, instance, parentRootValue }, config) {
+function parsePolyfillConfigs({ polyfillConfigs, instance, parentRootValue, parentDynamicMapComp}, config) {
   const hireRelat = config.hireRelat
   const findKeys = Object.keys(polyfillConfigs || {}).filter(key => hireRelat.endsWith(key))
   if (!findKeys.length) {
@@ -351,7 +355,7 @@ function parsePolyfillConfigs({ polyfillConfigs, instance, parentRootValue }, co
   }
   // 层级写的越明确，就使用更明确的层级配置
   const findKey = findKeys.reduce((ret, key) => (hireRelat.lastIndexOf(ret) < hireRelat.lastIndexOf(key) ? ret : key))
-  const polyObj = polyfillConfigs[findKey] && polyfillConfigs[findKey](config, instance, {parentRootValue})
+  const polyObj = polyfillConfigs[findKey] && polyfillConfigs[findKey](config, instance, {parentRootValue, parentDynamicMapComp,})
   polyObj && Object.keys(polyObj).forEach(key => {
     config[key] = polyObj[key]
   })