resolver-egretimp-plus 0.0.58 → 0.0.59

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "resolver-egretimp-plus",
-  "version": "0.0.58",
+  "version": "0.0.59",
   "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 buttonActions = inject('buttonActions', {})
     const route = useRoute()
     const routeQuery= route?.query
     const hireRelatMapRules = inject('hireRelatMapRules')
@@ -188,6 +189,7 @@ export default {
         openChildDialog: openChildDialogInstance?.value,
         messageInstance: messageInstance?.value,
         messageCb,
+        buttonActions,
         lang: lang?.value,
         appContext
       })

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

@@ -12,9 +12,14 @@ const props = defineProps({
   },
   // 请求方法的实列
   axiosInstance: {
-      type: [Object, Function],
-      default: () => null
-    },
+    type: [Object, Function],
+    default: () => null
+  },
+  // 按钮的工作集合
+  buttonActions: {
+    type: Object,
+    default: () => ({})
+  },
   // config的额外属性配置
   polyfillConfigs: {
     type: Object,
@@ -76,6 +81,7 @@ defineExpose({
         v-model="formData"
         :busiIdentityId="busiIdentityId"
         :lang="props.lang"
+        :buttonActions="props.buttonActions"
         :loadEvnetsReq="props.loadEvnetsReq"
         :polyfillConfigs="props.polyfillConfigs"
         :axiosInstance="props.axiosInstance"

package/src/components/helper/eventOrchestration.js

@@ -1,6 +1,8 @@
+import { isArray } from "../../utils/is"
 import { DATA_VALID_RULE_EXECUTE } from "../../api/builtIn"
 import { getRelateConfigKeys } from "../../rules/ruleUtils"
 import { RESULT_CODE, resultToast } from "../../utils/respone"
+import { unionWith } from "../../utils/index"
 
 export async function dispatchClickEvents  ({serviceList = [], axiosInstance, dynamicMapComp, rootValue, dynamicHireRelat, messageCb, compConfig, messageInstance}) {
   const dynamicMapCompKeys = Object.keys(dynamicMapComp)
@@ -77,7 +79,7 @@ function getReqData(inParamMappingList = [], {dynamicMapComp, dynamicMapCompKeys
 
 function initOutParamData(outParamMappingList = [], { dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat, outResult = {} }) {
   outParamMappingList.forEach(params => {
-    const { orignParam = '', destParam = '' } = params
+    const { orignParam = '', destParam = '', isList = false, primaryKeys = [] } = params
     const configCodes = getRelateConfigKeys(dynamicMapCompKeys, destParam, dynamicHireRelat)
     if (configCodes.length > 1) {
       console.error('search arg muti', params, configCodes)
@@ -87,10 +89,19 @@ function initOutParamData(outParamMappingList = [], { dynamicMapComp, dynamicMap
    
     if (compConfig) {
       const orignParamArr = orignParam ? orignParam?.split('.') : []
-      const val = orignParamArr.reduce((ret, item) => {
+      let val = orignParamArr.reduce((ret, item) => {
         if (!ret) return
         return ret[item]
       }, outResult)
+      if (isList) {
+        if (!isArray(val)) {
+          val = isArray(compConfig.refValue) ? compConfig.refValue : []
+        } else if (isArray(compConfig.refValue) && isArray(val)) {
+          val = unionWith(compConfig.refValue, val, (arrVal, othVal) => {
+            return (primaryKeys && primaryKeys.length) ? primaryKeys.map(key => arrVal[key] == othVal[key])?.every(item => item) : false
+          })
+        }
+      }
       compConfig.refValue = val
     }
   })
@@ -120,20 +131,47 @@ export function openDailg({
   dynamicMapComp,
   dynamicHireRelat,
   lang,
+  buttonActions,
   openChildDialog,
   appContext,
 }) {
   const busiIdentityId = pagePopupMap.popupBusiIdentityId
   const dynamicMapCompKeys = Object.keys(dynamicMapComp)
   const reqData = getReqData(pagePopupMap.inParamMappingList || [], {dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat})
+  
+  let mapList = {}
+  let outParamMappingList = []
+  // 是表格还是list
+  const isList = pagePopupMap?.objOrList == '1'
+  if (isList ) {
+    const primaryKeys = []
+    mapList = pagePopupMap?.outParamMappingList?.reduce((ret, item) => {
+      const { orignParam, destParam, primaryKeyFlag = '' } = item
+      ret[destParam] = orignParam
+      if (primaryKeyFlag == '1') {
+        primaryKeys.push(destParam)
+      }
+      return ret
+    }, {})
+
+    outParamMappingList = [
+      {
+        orignParam: '',
+        destParam: pagePopupMap.parentTable || '',
+        primaryKeys,
+        isList: true
+      }
+    ]
+  } else {
+    outParamMappingList = pagePopupMap?.outParamMappingList?.map(item => {
+      const orignParamArr = item.orignParam ? item.orignParam.split('->') : []
+      return {
+        ...item,
+        orignParam: item.orignParam ? orignParamArr[orignParamArr.length - 1] : ''
+      }
+    }) || []
+  }
 
-  const outParamMappingList = pagePopupMap?.outParamMappingList?.map(item => {
-    const orignParamArr = item.orignParam ? item.orignParam.split('->') : []
-    return {
-      ...item,
-      orignParam: item.orignParam ? orignParamArr[orignParamArr.length - 1] : ''
-    }
-  }) || []
 
   let rootStore = {}
   let dialogClose = null
@@ -142,7 +180,16 @@ export function openDailg({
     polyfillConfigs[pagePopupMap.outDisplayTrigger] = (config) => {
       return {
         onClick() {
-          initOutParamData(outParamMappingList, {dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat, outResult: rootStore.tableSelectedInfo})
+          const outResult = rootStore.tableSelectedInfo?.map(item => {
+            const retItem = {
+              ...item
+            }
+            Object.keys(mapList).forEach(key => {
+              retItem[key] = item[mapList[key]]
+            })
+            return retItem
+          })
+          initOutParamData(outParamMappingList, {dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat, outResult})
           dialogClose?.()
         }
       }
@@ -158,6 +205,7 @@ export function openDailg({
     }
   }
   dialogClose = openChildDialog({
+    buttonActions,
     busiIdentityId,
     axiosInstance: axiosInstance,
     lang,
@@ -232,17 +280,20 @@ export async function executeDataValid(validConfig, { dynamicMapComp, mixinServi
   })
 }
 
-function closePage() {
-  // window?.close()
-  // window?.history?.back()
+function closePage(lcpPageClosedMapVO) {
+  if (lcpPageClosedMapVO?.closedType == '1') {
+    const top = window.top
+    top?.close()
+  } else {
+    window?.history?.back()
+  }
 }
 
-export async function executeEventOrchestration({props, axiosInstance, rootValue, confirmInstance, dynamicMapComp, messageInstance, openChildDialog, messageCb, lang, appContext } = {}) {
+export async function executeEventOrchestration({props, axiosInstance, 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')
   if (lcpPageRuleVOLis?.length && mixinServiceConfig) {
-    // for(let i = 0; i < lcpPageRuleVOLis.length; i++) {
       // 数据校验服务
       const validConfig = lcpPageRuleVOLis[0]
       const valid = await executeDataValid(validConfig, {
@@ -255,8 +306,8 @@ export async function executeEventOrchestration({props, axiosInstance, rootValue
       if (!valid) {
         return
       }
-    // }
   }
+  
   if (PageServiceMapVOList?.length) {
     const dynamicHireRelat = props.config?.dynamicHireRelat
     dispatchClickEvents({
@@ -281,7 +332,12 @@ export async function executeEventOrchestration({props, axiosInstance, rootValue
       appContext,
       lang,
       messageCb,
+      buttonActions,
       openChildDialog
     })
   }
+  const lcpPageClosedMapVO = props.config.lcpPageClosedMapVO
+  if (lcpPageClosedMapVO) {
+    closePage(lcpPageClosedMapVO)
+  }
 }

package/src/utils/common.js

@@ -2,7 +2,8 @@
 import { intersectionWith, isEqual, mergeWith, unionWith, isArray, cloneDeep } from 'lodash-es'
 
 export {
-  cloneDeep
+  cloneDeep,
+  unionWith
 }
 
 function cached(fn) {