fix: form组件移除无效样式

AntmJS · Oct 26, 2022 · 250ab14 · 250ab14
1 parent 290338c
commit 250ab14
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/packages/vantui/src/form-item/index.less b/packages/vantui/src/form-item/index.less
@@ -1,9 +1,5 @@
 @import '../style/var.less';
 
-.vant-form-formItem:last-child {
-  border-bottom: none;
-}
-
 /* stylelint-disable-next-line no-descending-specificity */
 .vant-form-formItem {
   line-height: @form-line-height;
@@ -13,7 +9,6 @@
   margin: 0 @form-space-horizontal;
   padding: @form-space-vertical 0;
   background-color: @form-background-color;
-  border-bottom: @form-border-bottom;
 
   &-wrapper {
     background-color: @form-background-color;

diff --git a/packages/vantui/src/form/core/formstore.ts b/packages/vantui/src/form/core/formstore.ts
@@ -309,12 +309,19 @@ class FormStore {
       if (value || value === 0) {
         if (isReg(rule)) {
           status = rule.test(value) ? 'resolve' : 'reject'
-          if (status === 'reject') this.model[name].message = message
+          if (status === 'reject') {
+            this.model[name].message = message
+            break
+          }
         } else if (typeof rule === 'function') {
           rule(value, (message: string) => {
             this.model[name].message = message
             status = !message ? 'resolve' : 'reject'
           })
+
+          if (status === 'reject') {
+            break
+          }
         }
       }
     }