resolver-egretimp-plus 0.0.60 → 0.0.62

package/package.json

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

package/src/analysisComponent.jsx

@@ -48,6 +48,7 @@ export default {
       delete ret.onClick
       return ret
     })
+    const polyfillConfigs = inject('_polyfillConfigs', {})
     const buttonActions = inject('buttonActions', {})
     const route = useRoute()
     const routeQuery= route?.query
@@ -183,6 +184,7 @@ export default {
       executeEventOrchestration({
         props,
         axiosInstance: _axiosInstance?.value,
+        polyfillConfigs,
         rootValue: rootValue?.value,
         confirmInstance: confirmInstance?.value,
         dynamicMapComp,

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

@@ -37,6 +37,16 @@ const props = defineProps({
     type: Object,
     default: () => ({})
   },
+  parentRootValue: {
+    type: Object,
+    default: () => ({})
+  },
+  selectionsObj: {
+    type: Object,
+    // selections
+    // primaryKeys
+    default: () => ({})
+  },
   rootStoreChange: Function
 })
 const formData = ref({})
@@ -82,6 +92,8 @@ defineExpose({
         @loadedConfigCompeted="loadedConfigCompeted"
         @rootStoreChange="rootStoreChange"
         v-model="formData"
+        :parentRootValue="props.parentRootValue"
+        :selectionsObj="props.selectionsObj"
         :busiIdentityId="busiIdentityId"
         :lang="props.lang"
         :buttonActions="props.buttonActions"

package/src/components/helper/eventOrchestration.js

@@ -127,6 +127,8 @@ export function getTableConfig(outParamMappingList = [], { dynamicMapComp, dynam
 }
 
 export function openDailg({
+  rootValue,
+  polyfillConfigs,
   pagePopupMap,
   axiosInstance,
   dynamicMapComp,
@@ -148,6 +150,7 @@ export function openDailg({
     }
   }) || []
   let mapList = {}
+  let selectionsObj = {}
   // 是表格还是list
   const isList = pagePopupMap?.objOrList == '1'
   if (isList ) {
@@ -171,14 +174,17 @@ export function openDailg({
         isList: true
       }
     ]
+    const orginTableConfig = getTableConfig(outParamMappingList, { dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat })
+    selectionsObj.selections = (orginTableConfig.refValue || [])
+    selectionsObj.primaryKeys = primaryKeys
   }
 
 
   let rootStore = {}
   let dialogClose = null
-  const polyfillConfigs = {}
+  const initPolyfillConfigs = {}
   if (pagePopupMap.outDisplayTrigger) {
-    polyfillConfigs[pagePopupMap.outDisplayTrigger] = (config) => {
+    initPolyfillConfigs[pagePopupMap.outDisplayTrigger] = (config) => {
       return {
         onClick() {
           const outResult = rootStore.tableSelectedInfo?.map(item => {
@@ -199,7 +205,7 @@ export function openDailg({
     }
   }
   if (pagePopupMap.closedTrigger) {
-    polyfillConfigs[pagePopupMap.closedTrigger] = (config) => {
+    initPolyfillConfigs[pagePopupMap.closedTrigger] = (config) => {
       return {
         onClick() {
           dialogClose?.()
@@ -209,11 +215,16 @@ export function openDailg({
   }
   dialogClose = openChildDialog({
     buttonActions,
+    parentRootValue: rootValue,
+    selectionsObj,
     busiIdentityId,
     axiosInstance: axiosInstance,
     lang,
     loadEvnetsReq: reqData,
-    polyfillConfigs,
+    polyfillConfigs: {
+      ...initPolyfillConfigs,
+      ...(polyfillConfigs || {})
+    },
     rootStoreChange: (val) => {
       rootStore = val
     }
@@ -292,7 +303,7 @@ function closePage(lcpPageClosedMapVO) {
   }
 }
 
-export async function executeEventOrchestration({props, axiosInstance, buttonActions, rootValue, confirmInstance, dynamicMapComp, messageInstance, openChildDialog, messageCb, lang, appContext } = {}) {
+export async function executeEventOrchestration({props, axiosInstance, polyfillConfigs, buttonActions, rootValue, confirmInstance, dynamicMapComp, messageInstance, openChildDialog, messageCb, lang, appContext } = {}) {
   const lcpPageRuleVOLis = props.config?.lcpPageRuleVOList || []
   const PageServiceMapVOList = props.config.lcpPageServiceMapVOList || []
   const mixinServiceConfig = PageServiceMapVOList.find(service => service.serviceType === '1')
@@ -328,6 +339,8 @@ export async function executeEventOrchestration({props, axiosInstance, buttonAct
   if (lcpPagePopupMapVO) {
     const dynamicHireRelat = props.config?.dynamicHireRelat
     openDailg({
+      rootValue,
+      polyfillConfigs,
       pagePopupMap: lcpPagePopupMapVO,
       axiosInstance,
       dynamicMapComp,

package/src/components/helper/resolver.js

@@ -1,9 +1,15 @@
 import { resultToast } from "../../utils/respone"
 
 export async function executeLoadServices(services = [], { axiosInstance, messageInstance, reqData, respCb }) {
+  if (reqData?.notLoad) {
+    return
+  }
+  const noramlReqData = {
+    ...(reqData || {})
+  }
+  delete noramlReqData.notLoad
   const loadServices = services.filter(ser => ser.eventType == '1')
   const mixinServiceConfig = services.find(service => service.serviceType === '1')
-
   for (let i = 0; i < loadServices.length; i++) {
     const service = loadServices[i]
     const url = service.serviceCode

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

@@ -58,6 +58,8 @@ const rootValue = inject('rootValue')
 const dataLoad = inject('dataLoad')
 const rootForm = inject('rootForm')
 const validate = inject('_validate', () => {})
+const parentRootValue = inject('_parentRootValue', {})
+
 const routeQuery= route?.query
 
 const buttonAction = (...arg) => {
@@ -79,7 +81,8 @@ const buttonAction = (...arg) => {
       rootForm,
       routeQuery,
       validate,
-      lastClick
+      lastClick,
+      parentRootValue
     }, appContext)
   }
   if (actionFnRet !== null && actionFnRet !== undefined) {

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

@@ -57,6 +57,7 @@ export default {
     const pagenationEvents = computed(() => {
       return getCompEvents(ElPagination)
     })
+    const selectionsObj = inject('_selectionsObj', {})
     const rootStore = inject('_rootStore', {})
     const lang = inject('lang')
     const rootValue = inject('rootValue')
@@ -126,6 +127,23 @@ export default {
       if (isPlainColumn({...config, isColumn: true}, calcDisable(config, props.mode))) {
         props['show-overflow-tooltip'] = true
       }
+      if (config.type === 'selection') {
+        const orginSelectable = props.selectable
+        props.selectable = (row, index) => {
+          let orginRet = true
+          if (orginSelectable && typeof orginSelectable === 'function') {
+            orginRet = orginSelectable(row, index)
+          }
+          let parentSelectionsRet = true
+          if (selectionsObj.selections && selectionsObj.selections.length && selectionsObj.primaryKeys && selectionsObj.primaryKeys.length) {
+            const hasRow = selectionsObj.selections?.some(selectRow => {
+              return selectionsObj.primaryKeys.map(key => key && selectRow[key] == row[key]).every(item => item)
+            })
+            parentSelectionsRet = !hasRow
+          }
+          return orginRet && parentSelectionsRet
+        }
+      }
       return props
     }
 

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

@@ -70,6 +70,7 @@ const rootValue = inject('rootValue')
 const dataLoad = inject('dataLoad')
 const rootForm = inject('rootForm')
 const validate = inject('_validate', () => {})
+const parentRootValue = inject('_parentRootValue', {})
 
 const routeQuery= route?.query
 
@@ -92,7 +93,8 @@ const buttonAction = async (...arg) => {
       rootForm,
       routeQuery,
       validate,
-      lastClick
+      lastClick,
+      parentRootValue
     }, appContext)
   }
   if (actionFnRet !== null && actionFnRet !== undefined) {

package/src/hooks/pageConfig.js

@@ -17,6 +17,7 @@ export function usePageConfig() {
     instance,
     isH5,
     rootValue,
+    parentRootValue,
     axiosInstance,
     messageInstance,
     messageCb
@@ -24,6 +25,7 @@ export function usePageConfig() {
     const { pageConfig, mapComp, hireRelatMapRules } = parsePageConfig({
       config, lang, polyfillConfigs, instance, isH5,
       rootValue,
+      parentRootValue,
       axiosInstance,
       messageInstance,
       messageCb

package/src/index.jsx

@@ -98,6 +98,18 @@ export default {
       type: Object,
       default: () => ({})
     },
+    // 如果当前页面是弹框，这个是父页面传入的根数据
+    parentRootValue: {
+      type: Object,
+      default: () => ({})
+    },
+    // 如果当前页面是弹框，这个是父页面已经选中的数据，控制表格选中的禁用
+    selectionsObj: {
+      type: Object,
+      // selections
+      // primaryKeys
+      default: () => ({})
+    },
     // 提示语的回调
     messageCb: Function,
   },
@@ -133,6 +145,7 @@ export default {
       instance,
       isH5: props.isH5,
       rootValue: props.modelValue,
+      parentRootValue: props.parentRootValue,
       axiosInstance: axiosInstance.value,
       messageInstance: props.messageInstance,
       messageCb: props.messageCb
@@ -160,6 +173,7 @@ export default {
         instance,
         isH5: props.isH5,
         rootValue: props.modelValue,
+        parentRootValue: props.parentRootValue,
         axiosInstance: axiosInstance.value,
         messageInstance: props.messageInstance,
         messageCb: props.messageCb
@@ -201,6 +215,10 @@ export default {
     provide('dialogComponents', props.dialogComponents) // 是否可以开始执行规则初始化
     provide('_isH5', toRef(props, 'isH5')) // 是否是H5配置
 
+    provide('_parentRootValue', props.parentRootValue) 
+    provide('_selectionsObj', props.selectionsObj) 
+    provide('_polyfillConfigs', props.polyfillConfigs)
+
     const rootForm = ref(null)
     provide('rootForm', rootForm)
 

package/src/utils/render.jsx

@@ -106,6 +106,7 @@ function generateFormConfig(lang = 'zh', isH5) {
 export function parsePageConfig({
   config, lang, polyfillConfigs, instance, isH5,
   rootValue,
+  parentRootValue,
   axiosInstance,
   messageInstance,
   messageCb
@@ -122,7 +123,8 @@ export function parsePageConfig({
     rootValue,
     axiosInstance,
     messageInstance,
-    messageCb
+    messageCb,
+    parentRootValue
   }, formConfig)
   cbs.forEach((cb) => {
     cb()
@@ -147,7 +149,8 @@ export function normalConfig({
   rootValue,
   axiosInstance,
   messageInstance,
-  messageCb
+  messageCb,
+  parentRootValue
 }, config, hireRelat = '', mapComp = {}, needformItem = false) {
   const metaCode = config.metaCode || ''
   hireRelat += hireRelat ? `->${metaCode}` : metaCode
@@ -189,7 +192,8 @@ export function normalConfig({
         rootValue,
         axiosInstance,
         messageInstance ,
-        messageCb
+        messageCb,
+        parentRootValue
       }, metaItem, hireRelat, mapComp, needformItem || [FORM_META_TYPE, FORM_META_TYPE_H5].includes(metaType))
       return pageConfig
     })?.sort((a, b) => a.seqNo - b.seqNo)
@@ -213,7 +217,7 @@ export function normalConfig({
     pageConfig.needWrap = '1'
   }
   mapComp[hireRelat] = pageConfig
-  parsePolyfillConfigs({ polyfillConfigs, instance }, pageConfig)
+  parsePolyfillConfigs({ polyfillConfigs, instance, parentRootValue }, pageConfig)
   if(pageConfig.lcpPageServiceMapVOList?.length) {
     cbs.push(() => {
       const tabsServices = getTableServices(pageConfig.lcpPageServiceMapVOList, {dynamicMapComp: mapComp, dynamicMapCompKeys: Object.keys(mapComp), hireRelat})
@@ -260,14 +264,15 @@ function getTableServices(lcpPageServiceMapVOList = [], { dynamicMapComp, dynami
   return []
 }
 
-function parsePolyfillConfigs({ polyfillConfigs, instance }, config) {
+function parsePolyfillConfigs({ polyfillConfigs, instance, parentRootValue }, config) {
   const hireRelat = config.hireRelat
   const findKeys = Object.keys(polyfillConfigs).filter(key => hireRelat.endsWith(key))
   if (!findKeys.length) {
     return
   }
+  // 层级写的越明确，就使用更明确的层级配置
   const findKey = findKeys.reduce((ret, key) => (hireRelat.lastIndexOf(ret) < hireRelat.lastIndexOf(key) ? ret : key))
-  const polyObj = polyfillConfigs[findKey] && polyfillConfigs[findKey](config, instance)
+  const polyObj = polyfillConfigs[findKey] && polyfillConfigs[findKey](config, instance, {parentRootValue})
   polyObj && Object.keys(polyObj).forEach(key => {
     config[key] = polyObj[key]
   })
@@ -461,10 +466,13 @@ export function generateLayoutPolyfill(config, disabled, isH5) {
     props = {
       ...props,
       ...getDefaultColProps(config),
-      ...elColSpecialProsp(config),
     }
     
   }
+  props = {
+    ...props,
+    ...elColSpecialProsp(config),
+  }
   return node => {
     // 表格中中的列，是否需要转换为普通形式
     if (isPlainColumn(config, disabled)) {