From 309a5bc07196ba8abc964d27384569952f13ab97 Mon Sep 17 00:00:00 2001
From: Jake <Jake.Laoyu@gmail.com>
Date: Mon, 14 Oct 2019 16:47:49 +0800
Subject: [PATCH] feat(Area): getArea method filter placeholder (#4717)

---
 docs/src/docs-entry.js               | 1 -
 packages/address-edit/demo/index.vue | 1 +
 packages/area/index.js               | 8 ++++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/docs/src/docs-entry.js b/docs/src/docs-entry.js
index 18901821b..80bb7857a 100644
--- a/docs/src/docs-entry.js
+++ b/docs/src/docs-entry.js
@@ -2,7 +2,6 @@
 // This file is auto gererated by build/build-entry.js
 export default {
   'changelog.en-US': () => import('../markdown/changelog.en-US.md'),
-  'changelog.generated': () => import('../markdown/changelog.generated.md'),
   'changelog.zh-CN': () => import('../markdown/changelog.zh-CN.md'),
   'contribution.zh-CN': () => import('../markdown/contribution.zh-CN.md'),
   'design.zh-CN': () => import('../markdown/design.zh-CN.md'),
diff --git a/packages/address-edit/demo/index.vue b/packages/address-edit/demo/index.vue
index c08225a0b..76f692a99 100644
--- a/packages/address-edit/demo/index.vue
+++ b/packages/address-edit/demo/index.vue
@@ -8,6 +8,7 @@
         show-set-default
         show-search-result
         :search-result="searchResult"
+        :area-columns-placeholder="['请选择','请选择','请选择']"
         @save="onSave"
         @delete="onDelete"
         @change-detail="onChangeDetail"
diff --git a/packages/area/index.js b/packages/area/index.js
index 5ee581845..f7c3a2dac 100644
--- a/packages/area/index.js
+++ b/packages/area/index.js
@@ -198,7 +198,10 @@ export default sfc({
     },
 
     getValues() {
-      return this.$refs.picker ? this.$refs.picker.getValues().filter(value => !!value) : [];
+      const { picker } = this.$refs;
+      let getValues = picker ? picker.getValues() : [];
+      getValues = this.parseOutputValues(getValues);
+      return getValues.filter(value => !!value);
     },
 
     getArea() {
@@ -216,8 +219,9 @@ export default sfc({
       }
 
       const names = values.map(item => item.name);
+      const filterCodeValues = values.filter(value => !!value.code);
+      area.code = filterCodeValues.length ? filterCodeValues[filterCodeValues.length - 1].code : '';
 
-      area.code = values[values.length - 1].code;
       if (area.code[0] === '9') {
         area.country = names[1] || '';
         area.province = names[2] || '';