vue2-client 1.8.440 → 1.8.442

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.8.440",
+  "version": "1.8.442",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/XAddNativeForm/XAddNativeForm.vue

@@ -592,10 +592,14 @@ export default {
           this.loading = true
           const requestForm = this.prepareForm()
           await this.appendSilenceAddFields(requestForm)
+          const realForm = this.handleFormKeys(requestForm)
+          if (this.businessType === '新增') {
+            delete realForm.id
+          }
           resolve({
+            realForm,
             businessType: this.businessType,
             serviceName: this.serviceName,
-            realForm: this.handleFormKeys(requestForm),
             currUserName: this.currUser.name,
             currUserId: this.currUser.id,
             orgId: this.currUser.orgid

package/src/base-client/components/common/XAddReport/XAddReport.vue

@@ -108,10 +108,16 @@ export default {
       onSubmit () {
         if (this.$refs.main?.config?.confirmFunction) {
           console.info('执行自定义确认逻辑')
-          executeStrFunctionByContext(this, this.$refs.main?.config?.confirmFunction, [])
+          const result = executeStrFunctionByContext(this, this.$refs.main?.config?.confirmFunction, [])
+          if (result instanceof Promise) {
+            result.then(() => {
+              this.close()
+            })
+          } else {
+            this.close()
+          }
         } else {
           console.warn('未配置modal确认按钮逻辑')
-          this.loading = true
           this.close()
         }
       },