vue2-client 1.8.450 → 1.8.452

package/package.json

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

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

@@ -105,7 +105,7 @@ export default {
       getComponentByName (name) {
         return this.$refs.main.getComponentByName(name)
       },
-      onSubmit () {
+      async onSubmit () {
         if (this.$refs.main?.config?.confirmFunction) {
           console.info('执行自定义确认逻辑')
           let func = this.$refs.main?.config?.confirmFunction
@@ -115,7 +115,7 @@ export default {
           const result = executeStrFunctionByContext(this, func, [])
           if (result instanceof Promise) {
             result.then((res) => {
-              let message = '操作成功'
+              if (!res) return
               let messageType = 'success'
               // 如果传递了组件名字 自动调用刷新
               if (res?.name) {
@@ -126,15 +126,14 @@ export default {
                   console.warn(`未找到组件${res.name}无法刷新`)
                 }
               }
-              // 如果传递了提示信息自动调用提示
-              if (res?.message) {
-                message = res.message
-              }
               // 如果传递消息类型 自动调用消息
               if (res?.messageType) {
                 messageType = res.messageType
               }
-              this.$message[messageType](message)
+              // 如果传递了提示信息自动调用提示
+              if (res?.message) {
+                this.$message[messageType](res?.message)
+              }
               this.close()
             })
           } else {

package/src/base-client/components/common/XReportGrid/XReportTrGroup.vue

@@ -530,16 +530,16 @@ export default {
         return handlers
       }
       cell.events.forEach(event => {
-        handlers[event.type] = (...args) => {
+        handlers[event.type] = async (...args) => {
           console.info('Event handled:', event.type, args)
           let func = event.customFunction
           if (func && func.startsWith('function')) {
             func = func.replace('function', 'async function')
           }
-          const result = executeStrFunctionByContext(this, func, args)
+          const result = await executeStrFunctionByContext(this, func, args)
           if (result instanceof Promise) {
             result.then((res) => {
-              let message = '操作成功'
+              if (!res) return
               let messageType = 'success'
               // 如果传递了组件名字 自动调用刷新
               if (res?.name) {
@@ -550,16 +550,14 @@ export default {
                   console.warn(`未找到组件${res.name}无法刷新`)
                 }
               }
-              // 如果传递了提示信息自动调用提示
-              if (res?.message) {
-                message = res.message
-              }
               // 如果传递消息类型 自动调用消息
               if (res?.messageType) {
                 messageType = res.messageType
               }
-              this.$message[messageType](message)
-              this.close()
+              // 如果传递了提示信息自动调用提示
+              if (res?.message) {
+                this.$message[messageType](res?.message)
+              }
             })
           }
         }