resolver-egretimp-plus 0.1.96 → 0.1.98

package/package.json

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

package/src/bpm/bpmInstance.js

@@ -78,60 +78,65 @@ export class Bpm {
         }
       }
       const saveButton = dynamicMapComp[bpmSubmitBtn]
-      if (saveButton) {
-        const createAfterRequestService = (fn) => {
-          return async (ret) => {
-            const { saveAfter } = this.bpmConfigs
-            this.saveResponse = ret
-            // ======= 刚开始保存的弹框复制单号逻辑 ===== start======
-            const { copyModal, lang, calcShowCopyModal } = this.params
-            try {
-              const tipMsgPath = calcShowCopyModal(ret, eventData)
-              if (tipMsgPath) {
-                const { submitType } = eventData
-                this.showCopyModalCb = () => {
-                  const msgSubmit = lang?.value?.indexOf('zh') > -1 ? '提交成功' : 'Submit Success'
-                  const msgSave = lang?.value?.indexOf('zh') > -1 ? '保存成功' : 'Save Success'
-                  const isSubmit = [SUBMIT_TYPE.SEND, SUBMIT_TYPE.SUBMIT, SUBMIT_TYPE.AGREE].includes(submitType)
-                  const successMsg = isSubmit ? msgSubmit : msgSave
-                  this.showCopyModalCb = null
 
-                  return new Promise(resolve => {
-                    copyModal?.({
-                      lang: lang?.value,
-                      type: 'check',
-                      showcopy: true,
-                      copytype: lang?.value?.indexOf('zh') > -1 ? '申请单号' : 'Application No.',
-                      copymsg: tipMsgPath,
-                      showCancle: false,
-                      msg: successMsg,
-                      handleOk: async () => {
-                        resolve(true)
-                      }
-                    })
+      const createAfterRequestService = (fn) => {
+        return async (ret) => {
+          const { saveAfter } = this.bpmConfigs
+          this.saveResponse = ret
+          // ======= 刚开始保存的弹框复制单号逻辑 ===== start======
+          const { copyModal, lang, calcShowCopyModal } = this.params
+          try {
+            const tipMsgPath = calcShowCopyModal(ret, eventData)
+            if (tipMsgPath) {
+              const { submitType } = eventData
+              this.showCopyModalCb = () => {
+                const msgSubmit = lang?.value?.indexOf('zh') > -1 ? '提交成功' : 'Submit Success'
+                const msgSave = lang?.value?.indexOf('zh') > -1 ? '保存成功' : 'Save Success'
+                const isSubmit = [SUBMIT_TYPE.SEND, SUBMIT_TYPE.SUBMIT, SUBMIT_TYPE.AGREE].includes(submitType)
+                const successMsg = isSubmit ? msgSubmit : msgSave
+                this.showCopyModalCb = null
+
+                return new Promise(resolve => {
+                  copyModal?.({
+                    lang: lang?.value,
+                    type: 'check',
+                    showcopy: true,
+                    copytype: lang?.value?.indexOf('zh') > -1 ? '申请单号' : 'Application No.',
+                    copymsg: tipMsgPath,
+                    showCancle: false,
+                    msg: successMsg,
+                    handleOk: async () => {
+                      resolve(true)
+                    }
                   })
-                }
+                })
               }
-            // ======= 刚开始保存的弹框复制单号逻辑 ===== end======
-
-              await saveAfter?.(ret, eventData)
-            } catch (error) {
-              console.error('saveAfter error, error:', error)
             }
-            setTimeout(() => {
-              fn?.(ret)
-            }, 0);
+          // ======= 刚开始保存的弹框复制单号逻辑 ===== end======
+
+            await saveAfter?.(ret, eventData)
+          } catch (error) {
+            console.error('saveAfter error, error:', error)
           }
+          setTimeout(() => {
+            fn?.(ret)
+          }, 0);
         }
-        return new Promise((resolve) => {
+      }
+      return new Promise((resolve) => {
+        const afterRequestService = createAfterRequestService((ret) => { resolve(ret) })
+        
+        if (saveButton) {
           saveButton?.vm?.click({
             // 保存成功的回调
-            afterRequestService: createAfterRequestService((ret) => { resolve(ret) })
+            afterRequestService,
           })
-        })
-      } else {
-        messageInstance?.warning?.('no set bpmSubmitBtn, or bpmSubmitBtn is invalid.')
-      }
+        } else {
+          // messageInstance?.warning?.('no set bpmSubmitBtn, or bpmSubmitBtn is invalid.')
+          console.log('no set bpmSubmitBtn, or bpmSubmitBtn is invalid.')
+          afterRequestService({})
+        }
+      })
     }
     const getDetail = () => {
       const params = getDetailReq?.(this.saveResponse)

package/src/utils/render.jsx

@@ -821,7 +821,7 @@ function getFormItemRule(config, lang, params, compProps) {
         return
       }
       const val = config?.refValue
-      const message = lang.indexOf('zh') > -1 ? `${config.metaNameZh}不能为空` : `${config.metaNameEn} can not be empty`
+      const message = lang.indexOf('zh') > -1 ? `${config.metaNameZh || ''}不能为空` : `${config.metaNameEn || ''} can not be empty`
       if (!onlyRequiredFlag && required) {
         if (val === '' || val === null || val === undefined || (Array.isArray(val) && !val.length)) {
           callback(new Error(message))