From e9f393698937f88a434de35b276c9bc409348f5b Mon Sep 17 00:00:00 2001
From: Lindy <33708359+Lindysen@users.noreply.github.com>
Date: Fri, 10 Apr 2020 15:44:09 +0800
Subject: [PATCH] feat(AddressEdit): add area-placeholder prop (#6023)

---
 src/address-edit/README.md       |  1 +
 src/address-edit/README.zh-CN.md |  1 +
 src/address-edit/index.js        | 17 +++++++++--------
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/address-edit/README.md b/src/address-edit/README.md
index 59eb9755f..fe9810e5d 100644
--- a/src/address-edit/README.md
+++ b/src/address-edit/README.md
@@ -67,6 +67,7 @@ export default {
 |------|------|------|------|
 | area-list | Area List | *object* | - |
 | area-columns-placeholder `v2.2.5` | placeholder of area columns | *string[]* | `[]` |
+| area-placeholder | placeholder of area input field | *string* | `Area` |
 | address-info | Address Info | *AddressInfo* | `{}` |
 | search-result | Address search result | *SearchResult[]* | `[]` |
 | show-postal | Whether to show postal field | *boolean* | `false` |
diff --git a/src/address-edit/README.zh-CN.md b/src/address-edit/README.zh-CN.md
index 0299a2c70..a6aecdcba 100644
--- a/src/address-edit/README.zh-CN.md
+++ b/src/address-edit/README.zh-CN.md
@@ -67,6 +67,7 @@ export default {
 |------|------|------|------|
 | area-list | 地区列表 | *object* | - |
 | area-columns-placeholder `v2.2.5` | 地区选择列占位提示文字 | *string[]* | `[]` |
+| area-placeholder | 地区输入框占位提示文字 | *string* | `选择省 / 市 / 区` |
 | address-info | 收货人信息初始值 | *AddressInfo* | `{}` |
 | search-result | 详细地址搜索结果 | *SearchResult[]* | `[]` |
 | show-postal | 是否显示邮政编码 | *boolean* | `false` |
diff --git a/src/address-edit/index.js b/src/address-edit/index.js
index 4e77030ce..2358aee50 100644
--- a/src/address-edit/index.js
+++ b/src/address-edit/index.js
@@ -44,6 +44,7 @@ export default createComponent({
     showSearchResult: Boolean,
     saveButtonText: String,
     deleteButtonText: String,
+    areaPlaceholder: String,
     showArea: {
       type: Boolean,
       default: true,
@@ -106,7 +107,7 @@ export default createComponent({
         if (province && province === city) {
           arr.splice(1, 1);
         }
-        return arr.filter((text) => text).join('/');
+        return arr.filter(text => text).join('/');
       }
       return '';
     },
@@ -144,9 +145,9 @@ export default createComponent({
     },
 
     onAreaConfirm(values) {
-      values = values.filter((value) => !!value);
+      values = values.filter(value => !!value);
 
-      if (values.some((value) => !value.code)) {
+      if (values.some(value => !value.code)) {
         Toast(t('areaEmpty'));
         return;
       }
@@ -182,7 +183,7 @@ export default createComponent({
         items.push('postalCode');
       }
 
-      const isValid = items.every((item) => {
+      const isValid = items.every(item => {
         const msg = this.getErrorMessage(item);
         if (msg) {
           this.errorInfo[item] = msg;
@@ -260,7 +261,7 @@ export default createComponent({
 
   render() {
     const { data, errorInfo, searchResult, disableArea } = this;
-    const onFocus = (name) => () => this.onFocus(name);
+    const onFocus = name => () => this.onFocus(name);
 
     // hide bottom field when use search && detail get focused
     const hideBottomFields =
@@ -291,7 +292,7 @@ export default createComponent({
             readonly
             clickable={!disableArea}
             label={t('area')}
-            placeholder={t('areaPlaceholder')}
+            placeholder={this.areaPlaceholder || t('areaPlaceholder')}
             errorMessage={errorInfo.areaCode}
             rightIcon={!disableArea ? 'arrow' : null}
             value={this.areaText}
@@ -313,7 +314,7 @@ export default createComponent({
             onFocus={onFocus('addressDetail')}
             onBlur={this.onDetailBlur}
             onInput={this.onChangeDetail}
-            onSelect-search={(event) => {
+            onSelect-search={event => {
               this.$emit('select-search', event);
             }}
           />
@@ -337,7 +338,7 @@ export default createComponent({
             vModel={data.isDefault}
             vShow={!hideBottomFields}
             title={t('defaultAddress')}
-            onChange={(event) => {
+            onChange={event => {
               this.$emit('change-default', event);
             }}
           />