haiwei-ui 1.3.6 → 1.3.8

package/package.json

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

package/packages/components/form/index.vue

@@ -1,138 +1,142 @@
 <template>
-  <el-form class="nm-form" ref="form" :model="model" :rules="rules" :label-width="labelWidth" :label-position="labelPosition" :size="fontSize" :inline="inline" :disabled="disabled" v-loading="showLoading" :element-loading-text="loadingText" :element-loading-background="loadingBackground" :element-loading-spinner="loadingSpinner" @validate="onValidate">
+  <el-form class="nm-form" ref="form" :model="model" :rules="rules" :label-width="labelWidth"
+    :label-position="labelPosition" :size="fontSize" :inline="inline" :disabled="disabled" v-loading="showLoading"
+    :element-loading-text="loadingText" :element-loading-background="loadingBackground"
+    :element-loading-spinner="loadingSpinner" @validate="onValidate">
     <slot />
   </el-form>
 </template>
 <script>
-  import loading from '../../mixins/components/loading'
-  export default {
-    name: 'Form',
-    mixins: [loading],
-    data() {
-      return {
-        loading_: false
-      }
+import loading from '../../mixins/components/loading'
+export default {
+  name: 'Form',
+  mixins: [loading],
+  data() {
+    return {
+      loading_: false
+    }
+  },
+  props: {
+    /** 表单对象 */
+    model: {
+      type: Object,
+      required: true
     },
-    props: {
-      /** 表单对象 */
-      model: {
-        type: Object,
-        required: true
-      },
-      /** 验证规则 */
-      rules: Object,
-      /** 提交请求 */
-      action: Function,
-      /** 行内表单模式 */
-      inline: Boolean,
-      /** 是否显示成功提示消息 */
-      successMsg: {
-        type: Boolean,
-        default: true
-      },
-      /** 成功提示消息文本 */
-      successMsgText: {
-        type: String,
-        default: '保存成功'
-      },
-      /** 标签的宽度 */
-      labelWidth: {
-        type: String,
-        default: '100px'
-      },
-      /** 表单域标签的位置，如果值为 left 或者 right 时，则需要设置 label-width */
-      labelPosition: {
-        type: String,
-        default: 'right'
-      },
-      // 自定义验证
-      customValidate: Function,
-      /** 禁用表单 */
-      disabled: Boolean,
-      /** 显示加载动画 */
-      loading: Boolean,
-      /** 不显示加载动画 */
-      noLoading: Boolean,
-      /** 自定义重置操作 */
-      customResetFunction: Function
+    /** 验证规则 */
+    rules: Object,
+    /** 提交请求 */
+    action: Function,
+    /** 行内表单模式 */
+    inline: Boolean,
+    /** 是否显示成功提示消息 */
+    successMsg: {
+      type: Boolean,
+      default: true
     },
-    computed: {
-      showLoading() {
-        return !this.noLoading && (this.loading_ || this.loading)
-      }
+    /** 成功提示消息文本 */
+    successMsgText: {
+      type: String,
+      default: '保存成功'
     },
-    methods: {
-      /** 提交 */
-      submit() {
-        this.validate(() => {
-          this.openLoading()
-          this.action(this.model)
-            .then(data => {
-              if (this.successMsg === true) {
-                this._success(this.successMsgText)
-              }
-              this.$emit('success', data)
-            })
-            .catch(() => {
-              this.$emit('error')
-            })
-            .finally(() => {
-              this.closeLoading()
-            })
-        })
-      },
-      /** 表单验证 */
-      validate(callback) {
-        this.$refs.form.validate(async valid => {
-          // 自定义验证
-          if (valid && (!this.customValidate || this.customValidate() === true)) {
-            callback()
-          } else {
-            // 验证失败
-            this.$emit('validate-error')
-          }
-        })
-      },
-      /** 重置 */
-      reset() {
-        if (this.customResetFunction) {
-          this.customResetFunction()
-        } else {
-          this.$refs.form.resetFields()
-          this.resetChildren(this.$refs.form)
-        }
-        this.$emit('reset')
-      },
-      /** 重置子组件 */
-      resetChildren(vnode) {
-        if (vnode.$children && vnode.$children.length > 0) {
-          vnode.$children.forEach(item => {
-            if (item && item.reset && typeof item.reset === 'function') {
-              item.reset()
+    /** 标签的宽度 */
+    labelWidth: {
+      type: String,
+      default: '100px'
+    },
+    /** 表单域标签的位置，如果值为 left 或者 right 时，则需要设置 label-width */
+    labelPosition: {
+      type: String,
+      default: 'right'
+    },
+    // 自定义验证
+    customValidate: Function,
+    /** 禁用表单 */
+    disabled: Boolean,
+    /** 显示加载动画 */
+    loading: Boolean,
+    /** 不显示加载动画 */
+    noLoading: Boolean,
+    /** 自定义重置操作 */
+    customResetFunction: Function
+  },
+  computed: {
+    showLoading() {
+      return !this.noLoading && (this.loading_ || this.loading)
+    }
+  },
+  methods: {
+    /** 提交 */
+    submit() {
+      this.validate(() => {
+        this.openLoading()        
+       
+        this.action(this.model)
+          .then(data => {
+            if (this.successMsg === true) {
+              this._success(this.successMsgText)
             }
-            this.resetChildren(item)
+            this.$emit('success', data)
           })
+          .catch(() => {
+            this.$emit('error')
+          })
+          .finally(() => {
+            this.closeLoading()
+          })
+      })
+    },
+    /** 表单验证 */
+    validate(callback) {
+      this.$refs.form.validate(async valid => {
+        // 自定义验证
+        if (valid && (!this.customValidate || this.customValidate() === true)) {
+          callback()
+        } else {
+          // 验证失败
+          this.$emit('validate-error')
         }
-      },
-      /** 清除验证结果 */
-      clearValidate(props) {
-        this.$refs.form.clearValidate(props)
-      },
-      /** 打开加载中 */
-      openLoading() {
-        if (!this.noLoading) {
-          this.loading_ = true
-        }
-      },
-      /** 关闭加载中 */
-      closeLoading() {
-        if (!this.noLoading) {
-          this.loading_ = false
-        }
-      },
-      onValidate(prop, valid, msg) {
-        this.$emit('validate', prop, valid, msg)
+      })
+    },
+    /** 重置 */
+    reset() {
+      if (this.customResetFunction) {
+        this.customResetFunction()
+      } else {
+        this.$refs.form.resetFields()
+        this.resetChildren(this.$refs.form)
+      }
+      this.$emit('reset')
+    },
+    /** 重置子组件 */
+    resetChildren(vnode) {
+      if (vnode.$children && vnode.$children.length > 0) {
+        vnode.$children.forEach(item => {
+          if (item && item.reset && typeof item.reset === 'function') {
+            item.reset()
+          }
+          this.resetChildren(item)
+        })
+      }
+    },
+    /** 清除验证结果 */
+    clearValidate(props) {
+      this.$refs.form.clearValidate(props)
+    },
+    /** 打开加载中 */
+    openLoading() {
+      if (!this.noLoading) {
+        this.loading_ = true
       }
+    },
+    /** 关闭加载中 */
+    closeLoading() {
+      if (!this.noLoading) {
+        this.loading_ = false
+      }
+    },
+    onValidate(prop, valid, msg) {
+      this.$emit('validate', prop, valid, msg)
     }
   }
+}
 </script>

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(() => {