From f1e25123a3b2f1a91fec3c60925d0611b9336c3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Thu, 13 Feb 2020 16:00:50 +0800
Subject: [PATCH] feat(Form): add label-align prop

---
 src/field/index.js       | 11 ++++++++++-
 src/form/README.md       |  1 +
 src/form/README.zh-CN.md |  1 +
 src/form/index.js        |  1 +
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/field/index.js b/src/field/index.js
index 1ffbbcc0e..86e6a26f2 100644
--- a/src/field/index.js
+++ b/src/field/index.js
@@ -433,10 +433,19 @@ export default createComponent({
         );
       }
     },
+
+    getProp(key) {
+      if (this.vanForm && isDef(this.vanForm[key])) {
+        return this.vanForm[key];
+      }
+
+      return this[key];
+    },
   },
 
   render() {
-    const { slots, labelAlign } = this;
+    const { slots } = this;
+    const labelAlign = this.getProp('labelAlign');
 
     const scopedSlots = {
       icon: this.genLeftIcon,
diff --git a/src/form/README.md b/src/form/README.md
index 765ddc9e1..ead064b26 100644
--- a/src/form/README.md
+++ b/src/form/README.md
@@ -405,6 +405,7 @@ export default {
 
 | Attribute | Description | Type | Default |
 |------|------|------|------|
+| label-align | Label text align, can be set to `center` `right` | *string* | `left` |
 | validate-first | Whether to stop the validation when a rule fails | *boolean* | `false` |
 
 ### Events
diff --git a/src/form/README.zh-CN.md b/src/form/README.zh-CN.md
index 06176bf2f..3725106c9 100644
--- a/src/form/README.zh-CN.md
+++ b/src/form/README.zh-CN.md
@@ -437,6 +437,7 @@ export default {
 
 | 参数 | 说明 | 类型 | 默认值 |
 |------|------|------|------|
+| label-align | 表单项左侧文本对齐方式，可选值为 `center` `right` | *string* | `left` |
 | validate-first | 是否在某一项校验不通过时停止校验 | *boolean* | `false` |
 
 ### Events
diff --git a/src/form/index.js b/src/form/index.js
index 1d960ecfe..55df73302 100644
--- a/src/form/index.js
+++ b/src/form/index.js
@@ -4,6 +4,7 @@ const [createComponent, bem] = createNamespace('form');
 
 export default createComponent({
   props: {
+    labelAlign: String,
     validateFirst: Boolean,
   },