From d3169e7e6b32f6865a061137c0fe4cf1d7b92222 Mon Sep 17 00:00:00 2001
From: Jake <Jake.Laoyu@gmail.com>
Date: Thu, 26 Sep 2019 16:38:18 +0800
Subject: [PATCH] feat(address-edit): add area-columns-placeholder props
 (#4584)

---
 packages/address-edit/en-US.md | 1 +
 packages/address-edit/index.js | 5 +++++
 packages/address-edit/zh-CN.md | 1 +
 3 files changed, 7 insertions(+)

diff --git a/packages/address-edit/en-US.md b/packages/address-edit/en-US.md
index e9508ab66..73f597959 100644
--- a/packages/address-edit/en-US.md
+++ b/packages/address-edit/en-US.md
@@ -62,6 +62,7 @@ export default {
 | Attribute | Description | Type | Default |
 |------|------|------|------|
 | area-list | Area List | `Object` | - |
+| area-columns-placeholder | placeholder of area columns | `string[]` | `[]` | - |
 | address-info | Address Info | `Object` | `{}` |
 | search-result | Address search result | `Array` | `[]` |
 | show-postal | Whether to show postal field | `Boolean` | `false` |
diff --git a/packages/address-edit/index.js b/packages/address-edit/index.js
index 460caf29c..5993775d8 100644
--- a/packages/address-edit/index.js
+++ b/packages/address-edit/index.js
@@ -56,6 +56,10 @@ export default sfc({
     telValidator: {
       type: Function,
       default: isMobile
+    },
+    areaColumnsPlaceholder: {
+      type: Array,
+      default: () => []
     }
   },
 
@@ -323,6 +327,7 @@ export default sfc({
             loading={!this.areaListLoaded}
             value={data.areaCode}
             areaList={this.areaList}
+            columnsPlaceholder={this.areaColumnsPlaceholder}
             onConfirm={this.onAreaConfirm}
             onCancel={() => {
               this.showAreaPopup = false;
diff --git a/packages/address-edit/zh-CN.md b/packages/address-edit/zh-CN.md
index b7bd537c3..7f88355a1 100644
--- a/packages/address-edit/zh-CN.md
+++ b/packages/address-edit/zh-CN.md
@@ -60,6 +60,7 @@ export default {
 | 参数 | 说明 | 类型 | 默认值 | 版本 |
 |------|------|------|------|------|
 | area-list | 地区列表 | `Object` | - | - |
+| area-columns-placeholder | 地区选择列占位提示文字 | `string[]` | `[]` | - |
 | address-info | 收货人信息初始值 | `Object` | `{}` | - |
 | search-result | 详细地址搜索结果 | `Array` | `[]` | - |
 | show-postal | 是否显示邮政编码 | `Boolean` | `false` | - |