resolver-egretimp-plus 0.0.78 → 0.0.80

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "resolver-egretimp-plus",
-  "version": "0.0.78",
+  "version": "0.0.80",
   "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 dialogReq = inject('_dialogReq', {})
     const requestTraceId = inject('requestTraceId')
     const polyfillConfigs = inject('_polyfillConfigs', {})
     const buttonActions = inject('buttonActions', {})
@@ -202,6 +203,7 @@ export default {
         messageCb,
         buttonActions,
         lang: lang?.value,
+        dialogReq,
         appContext
       })
     }

package/src/components/childDialog/index.js

@@ -4,13 +4,15 @@ import { createVNode, render } from 'vue'
 let instance = null
 
 export function openChildDialog(options = {}, appContext) {
+  const initData = options.initData || {}
   if (instance) {
     Object.keys(options).forEach(key => {
       instance.props[key] = options[key]
 
-      instance.vm.exposed.dialogVisible.value = true
     })
-    instance?.vm?.exposed?.clearData()
+    instance.vm.exposed.dialogVisible.value = true
+    // instance?.vm?.exposed?.clearData()
+    instance?.vm?.exposed?.initData(initData)
     return instance.close
   }
   const container = document.createElement('div')
@@ -30,5 +32,7 @@ export function openChildDialog(options = {}, appContext) {
     }
   }
   vnode.component.exposed.dialogVisible.value = true
+  vnode.component.exposed?.initData(initData)
+
   return instance.close
 }

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

@@ -81,6 +81,9 @@ defineExpose({
   dialogVisible,
   clearData: () => {
     formData.value = {}
+  },
+  initData: (data) => {
+    formData.value = data
   }
 })
 </script>
@@ -101,7 +104,7 @@ defineExpose({
         :busiIdentityId="busiIdentityId"
         :lang="props.lang"
         :buttonActions="props.buttonActions"
-        :loadEvnetsReq="props.loadEvnetsReq"
+        :dialogReq="props.loadEvnetsReq"
         :polyfillConfigs="props.polyfillConfigs"
         :axiosInstance="props.axiosInstance"
         :axiosConfig="props.axiosConfig"

package/src/components/helper/eventOrchestration.js

@@ -2,18 +2,18 @@ import { isArray, isHasVal } from "../../utils/is"
 import { DATA_VALID_RULE_EXECUTE } from "../../api/builtIn"
 import { getRelateConfigKeys } from "../../rules/ruleUtils"
 import { RESULT_CODE, resultToast } from "../../utils/respone"
-import { parseExtendAttr, unionWith } from "../../utils/index"
+import { isPromise, parseExtendAttr, unionWith } from "../../utils/index"
 
-export async function dispatchClickEvents  ({serviceList = [], requestTraceId, axiosInstance, dynamicMapComp, rootValue, dynamicHireRelat, messageCb, compConfig, messageInstance}) {
+export async function dispatchClickEvents  ({serviceList = [], requestTraceId, axiosInstance, dialogReq, dynamicMapComp, rootValue, dynamicHireRelat, messageCb, compConfig, messageInstance, beforeRequestService, afterRequestService}) {
   const dynamicMapCompKeys = Object.keys(dynamicMapComp)
   const mixinServiceConfig = serviceList.find(service => service.serviceType === '1')
   for (let i = 0; i < serviceList.length; i++) {
     const service = serviceList[i]
-    dispatchClickEvent(service, {dynamicMapComp, requestTraceId, mixinServiceConfig, rootValue, dynamicMapCompKeys, dynamicHireRelat, axiosInstance, messageCb, compConfig, messageInstance})
+    dispatchClickEvent(service, {dynamicMapComp, requestTraceId, dialogReq, mixinServiceConfig, rootValue, dynamicMapCompKeys, dynamicHireRelat, axiosInstance, messageCb, compConfig, messageInstance, beforeRequestService, afterRequestService})
   }
 }
 
-export async function dispatchClickEvent(service, { dynamicMapComp, requestTraceId, mixinServiceConfig, rootValue, dynamicMapCompKeys, dynamicHireRelat, axiosInstance, messageCb, compConfig, messageInstance }) {
+export async function dispatchClickEvent(service, { dynamicMapComp, requestTraceId, dialogReq, mixinServiceConfig, rootValue, dynamicMapCompKeys, dynamicHireRelat, axiosInstance, messageCb, compConfig, messageInstance, beforeRequestService, afterRequestService }) {
   let reqData = rootValue || {}
   let tableConfig = null
   if (service.transactionType == '1') {
@@ -23,6 +23,10 @@ export async function dispatchClickEvent(service, { dynamicMapComp, requestTrace
       reqData[service.pageNum || 'pageNum'] = tableConfig.vm.page?.pageNum
       reqData[service.pageSize || 'pageSize'] = tableConfig.vm.page?.pageSize
     }
+    reqData = {
+      ...reqData,
+      // ...dialogReq
+    }
   }
   const url = service.serviceCode
   const httpMethod = service.httpMethod || "post"
@@ -36,6 +40,25 @@ export async function dispatchClickEvent(service, { dynamicMapComp, requestTrace
     },
     ...reqData
   }
+
+  let beforeRequestServiceRet = true
+  if (beforeRequestService) {
+    beforeRequestServiceRet = beforeRequestService({
+      dynamicMapComp,
+      requestTraceId, 
+      mixinServiceConfig, 
+      rootValue, 
+      dynamicHireRelat, 
+      compConfig,
+      service,
+      reqData: reqResult
+    })
+  }
+  const beforeRequestServiceRetValid = await beforeRequestServiceRet
+  if (!beforeRequestServiceRetValid) {
+    return
+  }
+
   const reqConfig = {
     url,
     method: httpMethod,
@@ -46,6 +69,8 @@ export async function dispatchClickEvent(service, { dynamicMapComp, requestTrace
     delete reqConfig.data
   }
   const ret = await (axiosInstance && axiosInstance(reqConfig))
+  afterRequestService && afterRequestService(ret)
+
   if (!resultToast(ret?.data, messageInstance, {messageCb, service, compConfig, noSuccessIip: httpMethod.toLocaleLowerCase() === 'get'})) {
     await Promise.reject()
     return
@@ -145,6 +170,7 @@ export function openDailg({
   buttonActions,
   openChildDialog,
   appContext,
+  compConfig
 }) {
   const busiIdentityId = pagePopupMap.popupBusiIdentityId
   const dynamicMapCompKeys = Object.keys(dynamicMapComp)
@@ -209,8 +235,45 @@ export function openDailg({
               return retItem
             })
           }
-          initOutParamData(outParamMappingList, {dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat, outResult})
-          dialogClose?.()
+          // 定义的请求中间钩子
+          const middleOpenDialog = compConfig?.middleOpenDialog
+
+          let middleOpenDialogRet = outResult
+          if (middleOpenDialog) {
+            middleOpenDialogRet = middleOpenDialog({
+              dynamicMapComp,
+              rootValue, 
+              dynamicHireRelat, 
+              compConfig,
+              pagePopupMap,
+              inputParams: reqData,
+              outputParams: outResult
+            })
+          }
+          if (isPromise(middleOpenDialogRet)) {
+            middleOpenDialogRet.then(res => {
+              toInitOutParams(res)
+            })
+          } else {
+            toInitOutParams(middleOpenDialogRet)
+          }
+
+          function toInitOutParams(outData) {
+            initOutParamData(outParamMappingList, {dynamicMapComp, dynamicMapCompKeys, dynamicHireRelat, outResult: outData})
+            dialogClose?.()
+
+            // 定义的请求后钩子
+            const afterOpenDialog = compConfig?.afterOpenDialog
+            afterOpenDialog && afterOpenDialog({
+              dynamicMapComp,
+              rootValue, 
+              dynamicHireRelat, 
+              compConfig,
+              pagePopupMap,
+              inputParams: reqData,
+              outputParams: outData
+            })
+          }
         }
       }
     }
@@ -225,23 +288,60 @@ export function openDailg({
     }
   }
   const dialogProps = parseExtendAttr({extendAttr: pagePopupMap.extendAttr})
-  dialogClose = openChildDialog({
-    buttonActions,
-    dialogProps,
-    parentRootValue: rootValue,
-    selectionsObj,
-    busiIdentityId,
-    axiosInstance: axiosInstance,
-    lang,
-    loadEvnetsReq: reqData,
-    polyfillConfigs: {
-      ...initPolyfillConfigs,
-      ...(polyfillConfigs || {})
-    },
-    rootStoreChange: (val) => {
-      rootStore = val
+
+  // 定义的请求前钩子
+  const beforeOpenDialog = compConfig?.beforeOpenDialog
+  // // 定义的请求后钩子
+  // const afterOpenDialog = compConfig?.afterOpenDialog
+
+  let beforeOpenDialogRet = true
+  if (beforeOpenDialog) {
+    beforeOpenDialogRet = beforeOpenDialog({
+      dynamicMapComp,
+      rootValue, 
+      dynamicHireRelat, 
+      compConfig,
+      pagePopupMap,
+      inputParams: reqData
+    })
+  }
+
+  if (beforeOpenDialogRet !== null && beforeOpenDialogRet !== undefined) {
+    if (isPromise(beforeOpenDialogRet)) {
+      beforeOpenDialogRet.then(res => {
+        if (res) {
+          toOpenDialog()
+        }
+      })
+    } else {
+      if (beforeOpenDialogRet) {
+        toOpenDialog()
+      }
     }
-  }, appContext)
+  } else {
+    toOpenDialog()
+  }
+
+  function toOpenDialog() {
+    dialogClose = openChildDialog({
+      buttonActions,
+      dialogProps,
+      parentRootValue: rootValue,
+      selectionsObj,
+      busiIdentityId,
+      axiosInstance: axiosInstance,
+      lang,
+      loadEvnetsReq: reqData,
+      initData: reqData,
+      polyfillConfigs: {
+        ...initPolyfillConfigs,
+        ...(polyfillConfigs || {})
+      },
+      rootStoreChange: (val) => {
+        rootStore = val
+      }
+    }, appContext)
+  }
 }
 
 // 数据校验服务
@@ -317,7 +417,7 @@ function closePage(lcpPageClosedMapVO) {
   }
 }
 
-export async function executeEventOrchestration({props, requestTraceId, axiosInstance, polyfillConfigs, buttonActions, rootValue, confirmInstance, dynamicMapComp, messageInstance, openChildDialog, messageCb, lang, appContext } = {}) {
+export async function executeEventOrchestration({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')
@@ -338,6 +438,11 @@ export async function executeEventOrchestration({props, requestTraceId, axiosIns
   }
   
   if (PageServiceMapVOList?.length) {
+    // 定义的请求前钩子
+    const beforeRequestService = props.config?.beforeRequestService
+    // 定义的请求后钩子
+    const afterRequestService = props.config?.afterRequestService
+
     const dynamicHireRelat = props.config?.dynamicHireRelat
     dispatchClickEvents({
       serviceList: PageServiceMapVOList,
@@ -348,11 +453,15 @@ export async function executeEventOrchestration({props, requestTraceId, axiosIns
       dynamicHireRelat,
       messageInstance,
       messageCb,
-      compConfig: props.config
+      compConfig: props.config,
+      dialogReq,
+      beforeRequestService,
+      afterRequestService
     })
   }
   const lcpPagePopupMapVO = props.config.lcpPagePopupMapVO
   if (lcpPagePopupMapVO) {
+
     const dynamicHireRelat = props.config?.dynamicHireRelat
     openDailg({
       rootValue,
@@ -365,7 +474,8 @@ export async function executeEventOrchestration({props, requestTraceId, axiosIns
       lang,
       messageCb,
       buttonActions,
-      openChildDialog
+      openChildDialog,
+      compConfig: props.config,
     })
   }
   const lcpPageClosedMapVO = props.config.lcpPageClosedMapVO

package/src/index.jsx

@@ -1,4 +1,4 @@
-import { provide, toRef, watch, computed, ref, defineExpose, reactive, getCurrentInstance } from "vue"
+import { provide, toRef, watch, computed, ref, defineExpose, reactive, getCurrentInstance, toRaw } from "vue"
 import Renderer from './renderer.jsx'
 // import './style/index.scss'
 import { usePageConfig } from './hooks/pageConfig'
@@ -99,6 +99,11 @@ export default {
       type: Object,
       default: () => ({})
     },
+    // 在弹框里面的页面，通过弹窗传染的请求数据
+    dialogReq: {
+      type: Object,
+      default: () => ({})
+    },
     // 加载服务中businessIdentity的额外参数
     businessIdentityReqData: {
       type: Object,
@@ -166,10 +171,11 @@ export default {
         requestTraceId: props.requestTraceId,
         messageInstance: toRef(props, 'messageInstance'),
         axiosInstance,
-        reqData: props.loadEvnetsReq,
+        reqData: {...props.loadEvnetsReq, ...props.dialogReq},
         respCb: (result) => {
           nativeDataLoad.value = true
-          emit('update:modelValue', result)
+          const val = deepMerge(props.modelValue, result, 'replace')
+          emit('update:modelValue', val)
           emit('loadEvnetsCompleted', result)
         }
       }
@@ -195,15 +201,17 @@ export default {
           messageInstance: toRef(props, 'messageInstance'),
           businessIdentityReqData: props.businessIdentityReqData,
           axiosInstance,
-          reqData: props.loadEvnetsReq,
+          reqData: {...props.loadEvnetsReq, ...props.dialogReq},
           respCb: (result) => {
             nativeDataLoad.value = true
-            emit('update:modelValue', deepMerge(props.modelValue, result, 'replace') )
+            const val = deepMerge(props.modelValue, result, 'replace')
+            emit('update:modelValue', val)
             emit('loadEvnetsCompleted', result)
           }
         }
       )
     })
+    provide('_dialogReq', props.dialogReq)
     provide('_messageCb', props.messageCb)
     provide('_rootStore', rootStore)
     provide('_openChildDialogInstance', toRef(props, 'openChildDialogInstance'))

package/src/utils/common.js

@@ -168,7 +168,13 @@ export function deepMerge(
   if (!source) {
     return target;
   }
-  let ret = mergeWith({}, source, target, (sourceValue, targetValue) => {
+  let ret = mergeWith(source, target, (sourceValue, targetValue) => {
+    if (!targetValue) {
+      return sourceValue
+    }
+    if (!sourceValue) {
+      return targetValue
+    }
     if (isArray(targetValue) && isArray(sourceValue)) {
       switch (mergeArrays) {
         case 'union':
@@ -186,7 +192,7 @@ export function deepMerge(
     if (isPlainObject(targetValue) && isPlainObject(sourceValue)) {
       return deepMerge(sourceValue, targetValue, mergeArrays);
     }
-    return undefined;
+    return targetValue;
   });
   if (Array.isArray(source)) {
     if (ret && !Array.isArray(ret)) {

package/src/utils/valid.js

@@ -1,13 +1,11 @@
 export function toValidate(formRef, cb, dynamicMapComp) {
   if (!cb) {
     return formRef.value && formRef.value.validate().catch(err => {
-      debugger
       validFailAction(err, dynamicMapComp)
       return Promise.reject(err)
     })
   }
   return formRef.value && formRef.value.validate((valid, errInfo) => {
-    debugger
     errInfo && validFailAction(errInfo, dynamicMapComp)
     cb && cb(valid, errInfo)
   })