fix inline form label width

7f1d36ee · baiyaaaaa · 杨奕 · f1913d99 · 7f1d36ee
Commit 7f1d36ee authored Feb 23, 2017 by baiyaaaaa Committed by 杨奕 Feb 23, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 6 deletions

packages/form/src/form-item.vue packages/form/src/form-item.vue +5 -6

No files found.
--- a/packages/form/src/form-item.vue
+++ b/packages/form/src/form-item.vue
@@ -84,12 +84,11 @@
        return ret;
      },
      contentStyle() {
-        var ret = {};
-        if (this.form.labelPosition === 'top') return ret;
-        var labelWidth = this.labelWidth || this.form.labelWidth;
-        if (labelWidth) {
-          ret.marginLeft = labelWidth;
-        }
+        let ret = {};
+        const labelWidth = this.labelWidth || this.form.labelWidth;
+        const form = this.form;
+        if (form.labelPosition === 'top' || form.inline) return ret;
+        if (labelWidth) ret.marginLeft = labelWidth;
        return ret;
      },
      form() {