resolver-egretimp-plus 0.1.14 → 0.1.16

package/package.json

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

package/src/bpm/bpmInstance.js

@@ -61,10 +61,16 @@ export class Bpm {
     window.addEventListener("message", this.messageListener.bind(this))
   }
   setNativeMethods() {
-    const { validate, dynamicMapComp, bpmSubmitBtn, toExecuteLoadServices } = this.params
+    const { validate: nativeValidate, dynamicMapComp, bpmSubmitBtn, toExecuteLoadServices } = this.params
+    const { getDetailReq, customValidate } = this.bpmConfigs
+
     const toSave = (cb, eventData) => {
       const saveButton = dynamicMapComp[bpmSubmitBtn]
       if (saveButton) {
+        if (!eventData && typeof cb !== 'function') {
+          eventData = cb
+          cb = null
+        }
         const createAfterRequestService = (fn) => {
           return async (ret) => {
             const { saveAfter } = this.bpmConfigs
@@ -96,12 +102,25 @@ export class Bpm {
       }
     }
     const getDetail = () => {
-      const { getDetailReq } = this.bpmConfigs
       const params = getDetailReq?.(this.saveResponse)
       toExecuteLoadServices(true, true, { params })
     }
 
+    const validate = async (eventData) => {
+      let valid = await new Promise((resolve) => {
+        nativeValidate((val) => {
+          resolve(val)
+        })
+      })
+      if (!valid) return false
+      if (customValidate && typeof customValidate === 'function') {
+        return customValidate(eventData)
+      }
+      return true
+    }
     this.nativeMethods = {
+      nativeValidate,
+      customValidate,
       validate,
       toSave,
       getDetail
@@ -119,25 +138,16 @@ export class Bpm {
     this.handleMessage && this.handleMessage(event, options)
   }
   async handleMessage(event, options) {
-    let data = this.eventData || {}
-    const { messageType, submitType } = data
-    const actionType = data?.bpmInfo?.actionType
+    let eventData = this.eventData || {}
+    const { messageType, submitType } = eventData
+    const actionType = eventData?.bpmInfo?.actionType
     console.log('messageType==:', messageType)
     console.log('submitType==:', submitType)
     console.log('actionType==:', actionType)
     if (MESSAGE_TYPE.GET_FORM_DATA === messageType) {
-      let postMessageData = this.actions?.[submitType]?.postMessageData
-      if (!postMessageData) {
-        postMessageData = this.postMessageData
-      }
-      if (typeof postMessageData === 'function') {
-        postMessageData = await postMessageData({
-          eventData: this.eventData,
-        })
-      }
       let action = this.actions?.[submitType]?.formAction
       if (!action) {
-        action = this.getDefaultAction(data)
+        action = this.getDefaultAction(eventData)
       }
       if (action) {
         let valid = await action?.({
@@ -148,14 +158,23 @@ export class Bpm {
           return
         }
       }
+      let postMessageData = this.actions?.[submitType]?.postMessageData
+      if (!postMessageData) {
+        postMessageData = this.postMessageData
+      }
+      if (typeof postMessageData === 'function') {
+        postMessageData = await postMessageData({
+          eventData: this.eventData,
+        })
+      }
       this.postMessage(postMessageData)
     } else if (MESSAGE_TYPE.PROCESS_ACTION_SUCCESS === messageType) {
-      let closeFlag = false
-      closeFlag = [SUBMIT_TYPE.PROCESS_SHOW, SUBMIT_TYPE.BACK, SUBMIT_TYPE.DRAFT_HANDLE].includes(submitType)
+      let closeFlag = true
+      closeFlag = ![SUBMIT_TYPE.PROCESS_SHOW, SUBMIT_TYPE.BACK, SUBMIT_TYPE.DRAFT_HANDLE].includes(submitType)
       
       let action = this.actions?.[submitType]?.successAction
       if (!action) {
-        action = this.getDefaultAction(data)
+        action = this.getDefaultAction(eventData)
       }
       if (action) {
         closeFlag = await action?.({
@@ -175,7 +194,7 @@ export class Bpm {
     }
   }
   async postMessage(formData = {}, options) {
-    console.log('postmessage===:', formData, options)
+    console.log('postmessage formData ===:', formData, options)
     this.postOptions = options
     const closeFlag = options?.closeFlag
     if (closeFlag) {
@@ -192,19 +211,22 @@ export class Bpm {
       let preventCloseFlag = ['BACK'].includes(this.eventData?.submitType) ? false : true
       console.log('eventData==:', this.eventData)
       if (window.parent !== window) {
-        window.parent.postMessage(
-          {
-            success: true, //表单数据验证成功或不需要验证时传true，否则传false
-            submitType: this.eventData?.submitType, //将此字段值回传
-            messageType: this.eventData?.messageType, //获取表单数据消息
-            actionInfo: {
-              preventClose: preventCloseFlag, // true 不关闭页面
-            },
-            //表单数据放这里
-            formData: {
-              ...formData
-            },
+        const postData = {
+          success: true, //表单数据验证成功或不需要验证时传true，否则传false
+          submitType: this.eventData?.submitType, //将此字段值回传
+          messageType: this.eventData?.messageType, //获取表单数据消息
+          actionInfo: {
+            preventClose: preventCloseFlag, // true 不关闭页面
+          },
+          //表单数据放这里
+          formData: {
+            ...formData
           },
+        }
+        console.log('url==:', this.eventData.url)
+        console.log('postData==:', postData)
+        window.parent.postMessage(
+          postData,
           this.eventData?.url
         )
       }
@@ -212,50 +234,46 @@ export class Bpm {
   }
   getDefaultAction(eventData) {
     const { messageType, submitType } = eventData
-    switch (submitType) {
-      case SUBMIT_TYPE.SEND:
-      case SUBMIT_TYPE.SUBMIT:
-        return (eventData) => {
-          const { validate, toSave, getDetail } = this.nativeMethods
-          return new Promise((resolve) => {
-            validate((valid) => {
-              if (valid) {
-                toSave((ret) => {
-                  if (ret?.data?.success) {
-                    getDetail()
-                    resolve(true)
-                  } else {
-                    resolve(false)
-                  }
-                }, eventData)
+    if (MESSAGE_TYPE.GET_FORM_DATA === messageType) {
+      switch (submitType) {
+        case SUBMIT_TYPE.SEND:
+        case SUBMIT_TYPE.SUBMIT:
+        case SUBMIT_TYPE.AGREE:
+          return async (eventData) => {
+            const { validate, toSave, getDetail } = this.nativeMethods
+            const valid = await validate(eventData)
+            if (valid) {
+              const ret = await toSave(eventData)
+              if (ret?.data?.success) {
+                getDetail()
+                return true
               } else {
-                resolve(false)
+                return false
               }
-            })
-          })
-        }
-      case SUBMIT_TYPE.NOTICE:
-      case SUBMIT_TYPE.GIVE:
-      case SUBMIT_TYPE.DELETE_DRAFT:
-      case SUBMIT_TYPE.MULTI_COOPERATE:
-        return (eventData) => {
-          const actionType = eventData?.bpmInfo?.actionType
-          const { toSave, getDetail } = this.nativeMethods
-          return new Promise((resolve) => {
+            } else {
+              return false
+            }
+          }
+        case SUBMIT_TYPE.NOTICE:
+        case SUBMIT_TYPE.GIVE:
+        case SUBMIT_TYPE.DRAFT_HANDLE:
+        case SUBMIT_TYPE.MULTI_COOPERATE:
+          return async (eventData) => {
+            const actionType = eventData?.bpmInfo?.actionType
+            const { toSave, getDetail } = this.nativeMethods
             if (!actionType) {
-              toSave((ret) => {
-                if (ret?.data?.success) {
-                  getDetail()
-                  resolve(true)
-                } else {
-                  resolve(false)
-                }
-              }, eventData)
+              const ret = await toSave(eventData)
+              if (ret?.data?.success) {
+                getDetail()
+                return true
+              } else {
+                return false
+              }
             } else {
-              resolve(true)
+              return true
             }
-          })
-        }
+          }
+      }
     }
   }
   // 暂时没用到=======start======

package/src/components/helper/eventOrchestration.js

@@ -4,6 +4,7 @@ import { getRelateConfigKeys } from "../../rules/ruleUtils"
 import { RESULT_CODE, resultToast } from "../../utils/respone"
 import { assignmentPathVal, getPathVal, isPromise, modelValueDeepMerge, parseExtendAttr, unionWith } from "../../utils/index"
 import { buildInRequest } from "../../utils/request"
+import { bpmInstance } from "../../bpm/bpmInstance"
 
 export async function dispatchClickEvents  ({serviceList = [], requestTraceId, axiosInstance, dialogReq, dynamicMapComp, rootValue, dynamicHireRelat, messageCb, compConfig, messageInstance, lang, beforeRequestService, afterRequestService}) {
   const dynamicMapCompKeys = Object.keys(dynamicMapComp)
@@ -405,6 +406,7 @@ export function openDailg({
   const paramsBeforeOpenDialog = beforeOpenDialog
   if (configBeforeOpenDialog || paramsBeforeOpenDialog) {
     beforeOpenDialog = async (...arg) => {
+      bpmInstance?.changeSlide?.(false)
       let beforeOpenDialogRet = true
       if (paramsBeforeOpenDialog) {
         beforeOpenDialogRet = paramsBeforeOpenDialog?.(...arg)
@@ -454,13 +456,14 @@ export function openDailg({
     const paramsAfterOpenDialog = afterOpenDialog
     if (configAfterOpenDialog || paramsAfterOpenDialog) {
       afterOpenDialog = async (...arg) => {
+        bpmInstance?.changeSlide?.(true)
         paramsAfterOpenDialog?.(...arg)
         configAfterOpenDialog?.(...arg)
       }
     }
     afterOpenDialog && afterOpenDialog({
       dynamicMapComp,
-      rootValue, 
+      rootValue,
       dynamicHireRelat, 
       compConfig,
       pagePopupMap,