haiwei-ui 1.3.7 → 1.3.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "haiwei-ui",
-  "version": "1.3.7",
+  "version": "1.3.8",
   "description": "HaiWei前端组件库",
   "author": "Eric",
   "license": "ISC",

package/packages/components/form/index.vue

@@ -68,11 +68,8 @@ export default {
     /** 提交 */
     submit() {
       this.validate(() => {
-        this.openLoading()
-        console.log('this.model======>', this.model);
-        // 使用深拷贝确保获取最新数据
-        const formData = JSON.parse(JSON.stringify(this.model))
-        console.log('this.model======>formData', formData);
+        this.openLoading()        
+       
         this.action(this.model)
           .then(data => {
             if (this.successMsg === true) {

package/packages/components/form-dialog/index.vue

@@ -150,35 +150,39 @@ export default {
     }
   },
   methods: {
-    /** 提交 */
     async submit() {
       // 设置loading状态
       this.loading_ = true
-
       // 触发 before-submit 钩子
       if (this.$listeners['before-submit']) {
         try {
-          // 执行 before-submit 钩子并等待结果
-          // 注意：这里不传递model参数，父组件应该直接修改this.model
-          const result = await this.$emit('before-submit')
-          
-          // 如果返回false，停止提交
-          if (result === false) {
-            this.loading_ = false
-            return
+          // 执行 before-submit 钩子
+          // $emit返回事件处理函数的返回值数组
+          const results = this.$emit('before-submit')
+          // 如果有返回值且是Promise，等待它
+          if (results && results.length > 0) {
+            const firstResult = results[0]
+            if (firstResult && typeof firstResult.then === 'function') {
+              const result = await firstResult
+              if (result === false) {
+                this.loading_ = false
+                return
+              }
+            } else if (firstResult === false) {
+              this.loading_ = false
+              return
+            }
           }
-          // 返回true或undefined则继续提交
         } catch (error) {
           this.loading_ = false
           this.$emit('error', error)
           return
         }
       }
-
-      console.log('test',this.model)
-      // 继续原有提交逻辑
+      console.log('test', this.model)
       this.$refs.form.submit()
     },
+
     /** 重置 */
     reset() {
       this.$nextTick(() => {