resolver-egretimp-plus 0.1.13 → 0.1.15

package/package.json

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

package/src/bpm/bpmInstance.js

@@ -37,16 +37,21 @@ export const MESSAGE_TYPE = {
 export let bpmInstance = null
 
 export class Bpm {
+  params = {}
+  bpmConfigs = {}
   eventData = null
   postOptions =  null
   sdkInstance = null
   postMessageData = null
   actions = {}
-  defaultActions = {}
-  constructor(postMessageData, actions) {
+  nativeMethods = {}
+  saveResponse = null
+  constructor(postMessageData, actions, bpmConfigs, params) {
     this.postMessageData = postMessageData
     this.actions = actions
-    
+    this.bpmConfigs = bpmConfigs || {}
+    this.params = params || {}
+    this.setNativeMethods()
     this.init()
   }
   init() {
@@ -55,8 +60,52 @@ export class Bpm {
     }
     window.addEventListener("message", this.messageListener.bind(this))
   }
-  setDefaultactions(actions) {
-    this.defaultActions = actions
+  setNativeMethods() {
+    const { validate, dynamicMapComp, bpmSubmitBtn, toExecuteLoadServices } = this.params
+    const toSave = (cb, eventData) => {
+      const saveButton = dynamicMapComp[bpmSubmitBtn]
+      if (saveButton) {
+        const createAfterRequestService = (fn) => {
+          return async (ret) => {
+            const { saveAfter } = this.bpmConfigs
+            this.saveResponse = ret
+            try {
+              await saveAfter?.(ret, eventData)
+            } catch (error) {
+              console.error('saveAfter error, error:', error)
+            }
+            setTimeout(() => {
+              fn?.(ret)
+            }, 0);
+          }
+        }
+        if (cb && typeof cb === 'function') {
+          saveButton?.vm?.click({
+            afterRequestService: createAfterRequestService((ret) => { cb(ret) })
+          })
+        } else {
+          return new Promise((resolve) => {
+            saveButton?.vm?.click({
+              // 保存成功的回调
+              afterRequestService: createAfterRequestService((ret) => { resolve(ret) })
+            })
+          })
+        }
+      } else {
+        messageInstance?.warning?.('no set bpmSubmitBtn, or bpmSubmitBtn is invalid, at preset, bpmSubmitBtn:', props.bpmSubmitBtn)
+      }
+    }
+    const getDetail = () => {
+      const { getDetailReq } = this.bpmConfigs
+      const params = getDetailReq?.(this.saveResponse)
+      toExecuteLoadServices(true, true, { params })
+    }
+
+    this.nativeMethods = {
+      validate,
+      toSave,
+      getDetail
+    }
   }
   messageListener(event) {
     console.log('message event===:', event)
@@ -86,19 +135,14 @@ export class Bpm {
           eventData: this.eventData,
         })
       }
-      const defaultAction = this.defaultActions?.[submitType]?.getForm
-      let action = this.actions?.[submitType]?.getForm
+      let action = this.actions?.[submitType]?.formAction
       if (!action) {
-        action = () => {
-          return defaultAction?.({
-            eventData: this.eventData
-          })
-        }
+        action = this.getDefaultAction(data)
       }
       if (action) {
-        let valid = action?.({
+        let valid = await action?.({
           eventData: this.eventData,
-          defaultAction,
+          nativeMethods: this.nativeMethods,
         })
         if (valid === false) {
           return
@@ -106,30 +150,21 @@ 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)
       
-      const defaultAction = this.defaultActions?.[submitType]?.getForm
-      const action = this.actions?.[submitType]?.success
+      let action = this.actions?.[submitType]?.successAction
       if (!action) {
-        action = () => {
-          return defaultAction?.({
-            eventData: this.eventData
-          })
-        }
+        action = this.getDefaultAction(data)
       }
       if (action) {
-        let valid = action?.({
+        closeFlag = await action?.({
           eventData: this.eventData,
-          postMessageData,
           originCloseFlag: closeFlag,
-          defaultAction
+          nativeMethods: this.nativeMethods,
         })
-        if (valid === false) {
-          return
-        }
       }
-      this.postMessage(null, { closeFlag })
+      this.postMessage(null, { closeFlag: !!closeFlag })
     }
   }
   setSaveMessage() {
@@ -175,6 +210,57 @@ export class Bpm {
       }
     }
   }
+  getDefaultAction(eventData) {
+    const { messageType, submitType } = eventData
+    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()
+                    resolve(true)
+                  } else {
+                    resolve(false)
+                  }
+                }, eventData)
+              } else {
+                resolve(true)
+              }
+            })
+          }
+      }
+    }
+  }
   // 暂时没用到=======start======
   on(key, fn) {
     let fns = this.actions[key] || (this.actions[key] = [])

package/src/components/helper/eventOrchestration.js

@@ -2,38 +2,9 @@ import { isArray, isHasVal, isNull, isUndefined } from "../../utils/is"
 import { DATA_VALID_RULE_EXECUTE } from "../../api/builtIn"
 import { getRelateConfigKeys } from "../../rules/ruleUtils"
 import { RESULT_CODE, resultToast } from "../../utils/respone"
-import { isPromise, modelValueDeepMerge, parseExtendAttr, unionWith } from "../../utils/index"
+import { assignmentPathVal, getPathVal, isPromise, modelValueDeepMerge, parseExtendAttr, unionWith } from "../../utils/index"
 import { buildInRequest } from "../../utils/request"
-
-function getPathVal(obj = {}, path) {
-  let paths = path
-  if (typeof path === 'string') {
-    paths = path.split('.')
-  }
-  return paths.reduce((ret, key) => {
-    if (ret) {
-      return ret[key]
-    }
-    return null
-  }, obj) ?? ''
-}
-function assignmentPathVal(obj = {}, path, val) {
-  let paths = path
-  if (typeof path === 'string') {
-    paths = path.split('.')
-  }
-  let currentObj = obj
-  paths.forEach((item, idx) => {
-    if (idx + 1 === paths.length) {
-      currentObj[item] = val ?? ''
-    } else {
-      if (!currentObj[item]) {
-        currentObj[item] = {}
-      }
-      currentObj = currentObj[item]
-    }
-  })
-}
+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)
@@ -164,7 +135,16 @@ export async function dispatchClickEvent(service, {
   }
 
   const noSuccessIip = httpMethod.toLocaleLowerCase() === 'get' || service.transactionType == '1' || serviceCustomProps?.noSuccessIip
-  if (!resultToast(ret?.data, messageInstance, {messageCb, service, compConfig, noSuccessIip})) {
+  const toastParmas = {
+    messageCb,
+    service,
+    compConfig,
+    noSuccessIip
+  }
+  if (serviceCustomProps.resultCodeKey) {
+    toastParmas.resultCodeKey = serviceCustomProps.resultCodeKey
+  }
+  if (!resultToast(ret?.data, messageInstance, toastParmas)) {
     await Promise.reject()
     return
   }
@@ -426,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)
@@ -475,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,

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

@@ -291,6 +291,12 @@ function normalTableRowValue(row) {
     ...row
   }
   pmPageMetaList.value.forEach(config => {
+    if (config?.defaultValue) {
+      if (ret[config.metaCode] === "" || ret[config.metaCode] === undefined || ret[config.metaCode] === null) {
+        ret[config.metaCode] = config.defaultValue
+        row[config.metaCode] = config.defaultValue
+      }
+    }
     normalResult(ret, config)
   })
   return ret

package/src/index.jsx

@@ -167,6 +167,10 @@ export default {
     bpmActions: {
       type: [Object],
       default: {}
+    },
+    bpmConfigs: {
+      type: Object,
+      default: {}
     }
   },
   emits: ['update:modelValue', 'rootStoreChange'],
@@ -201,7 +205,11 @@ export default {
       return props.dataLoad || nativeDataLoad.value
     })
     const { initPageConfig, pageConfigRef, mapCompRef, hireRelatMapRulesRef } = usePageConfig()
-    function toExecuteLoadServices(clearFlag, alongLoad) {
+    function toExecuteLoadServices(
+      clearFlag,
+      alongLoad,
+      configs
+    ) {
       // 触发加载事件执行
       const oldNativeDataload = nativeDataLoad.value
       nativeDataLoad.value = false
@@ -213,7 +221,7 @@ export default {
           messageInstance: toRef(props, 'messageInstance'),
           businessIdentityReqData: props.businessIdentityReqData,
           axiosInstance,
-          reqData: {...props.loadEvnetsReq, ...props.dialogReq},
+          reqData: {...props.loadEvnetsReq, ...props.dialogReq, ...(configs?.params || {})},
           notLoadCb: () => {
             nativeDataLoad.value = true
           },
@@ -363,56 +371,11 @@ export default {
     })
     onMounted(() => {
       if (props.openBpm) {
-        function toSave() {
-          return new Promise((resolve) => {
-            const saveButton = dynamicMapComp[props.bpmSubmitBtn]
-            if (saveButton) {
-              // 保存服务绑定在配置的按钮上面，这边直接调用按钮的服务
-              saveButton?.vm?.click({
-                // 保存成功的回调
-                afterRequestService(ret) {
-                  if (ret?.data?.success) {
-                    toExecuteLoadServices(true, true)
-                    resolve(true)
-                  } else {
-                    resolve(false)
-                  }
-                }
-              })
-            }
-          })
-        }
-        function toSubmit() {
-          return new Promise((resolve) => {
-            validate((valid) => {
-              if (valid) {
-                resolve(toSave())
-              } else {
-                resolve(false)
-              }
-            })
-          })
-        }
-        const commonSaveObj = {
-          getForm({ eventData }) {
-            return toSave()
-          }
-        }
-        const commonSubmitObj = {
-          getForm({ eventData }) {
-            const actionType = eventData?.bpmInfo?.actionType
-            if (!actionType) {
-              return toSubmit()
-            }
-          }
-        }
-        const bpmInstance = initBpm(bpmMessage, props.bpmActions)
-        bpmInstance.setDefaultactions({
-          [SUBMIT_TYPE.SEND]: commonSubmitObj,
-          [SUBMIT_TYPE.SUBMIT]: commonSubmitObj,
-          [SUBMIT_TYPE.GIVE]: commonSaveObj,
-          [SUBMIT_TYPE.AGREE]: commonSaveObj,
-          [SUBMIT_TYPE.DRAFT_HANDLE]: commonSaveObj,
+        initBpm(props.bpmMessage, props.bpmActions, props.bpmConfigs, {
+          validate,
+          dynamicMapComp,
+          toExecuteLoadServices,
+          bpmSubmitBtn: props.bpmSubmitBtn
         })
       }
     })

package/src/theme/element/index.scss

@@ -1,6 +1,7 @@
 @import './components/index.scss';
 * {
   font-family: PingFang SC,sans-serif;
+  font-weight: normal;
 }
 .custom-form-item.hidden-label {
   & > .el-form-item__label {

package/src/utils/common.js

@@ -565,4 +565,35 @@ function normalizeNumberString(numStr) {
   if (result.startsWith("-.")) result = "-0" + result.slice(1);
   
   return result;
+}
+
+
+export function getPathVal(obj = {}, path) {
+  let paths = path
+  if (typeof path === 'string') {
+    paths = path.split('.')
+  }
+  return paths.reduce((ret, key) => {
+    if (ret) {
+      return ret[key]
+    }
+    return null
+  }, obj) ?? ''
+}
+export function assignmentPathVal(obj = {}, path, val) {
+  let paths = path
+  if (typeof path === 'string') {
+    paths = path.split('.')
+  }
+  let currentObj = obj
+  paths.forEach((item, idx) => {
+    if (idx + 1 === paths.length) {
+      currentObj[item] = val ?? ''
+    } else {
+      if (!currentObj[item]) {
+        currentObj[item] = {}
+      }
+      currentObj = currentObj[item]
+    }
+  })
 }

package/src/utils/respone.js

@@ -1,4 +1,4 @@
-import { isPromise } from "./common"
+import { getPathVal, isPromise } from "./common"
 
 export const RESULT_CODE = {
   SUCCESS: '000000',
@@ -7,11 +7,12 @@ export const RESULT_CODE = {
   ERROR: '000000',
   OTHER: '020002'
 }
-export function resultToast(result = {}, messageInstance, {messageCb, service, compConfig, noSuccessIip = false} = {}) {
+export function resultToast(result = {}, messageInstance, {messageCb, service, compConfig, noSuccessIip = false, resultCodeKey = 'resultCode'} = {}) {
   let ret = false
   let cbKey = ''
   const resultMessage = result?.resultMessage || ''
-  const resultCode = result.resultCode
+
+  const resultCode = getPathVal(result, resultCodeKey)
   switch (resultCode) {
     case RESULT_CODE.SUCCESS:
       if (!noSuccessIip) {