resolver-egretimp-plus 0.1.14 → 0.1.15

package/package.json

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

package/src/bpm/bpmInstance.js

@@ -150,8 +150,8 @@ export class Bpm {
       }
       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) {
@@ -212,14 +212,39 @@ 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) {
+    if (MESSAGE_TYPE.GET_FORM_DATA === messageType) {
+      switch (submitType) {
+        case SUBMIT_TYPE.SEND:
+        case SUBMIT_TYPE.SUBMIT:
+        case SUBMIT_TYPE.AGREE:
+          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)
+                } else {
+                  resolve(false)
+                }
+              })
+            })
+          }
+        case SUBMIT_TYPE.NOTICE:
+        case SUBMIT_TYPE.GIVE:
+        case SUBMIT_TYPE.DRAFT_HANDLE:
+        case SUBMIT_TYPE.MULTI_COOPERATE:
+          return (eventData) => {
+            const actionType = eventData?.bpmInfo?.actionType
+            const { toSave, getDetail } = this.nativeMethods
+            return new Promise((resolve) => {
+              if (!actionType) {
                 toSave((ret) => {
                   if (ret?.data?.success) {
                     getDetail()
@@ -229,33 +254,11 @@ export class Bpm {
                   }
                 }, eventData)
               } else {
-                resolve(false)
+                resolve(true)
               }
             })
-          })
-        }
-      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) => {
-            if (!actionType) {
-              toSave((ret) => {
-                if (ret?.data?.success) {
-                  getDetail()
-                  resolve(true)
-                } else {
-                  resolve(false)
-                }
-              }, eventData)
-            } else {
-              resolve(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,