From 32da15c647d984ce167f1fe1e5149859360c1d7c Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Wed, 24 Oct 2018 20:56:05 +0800
Subject: [PATCH] [improvement] AddressEdit: add validator prop (#1971)

---
 packages/address-edit/index.vue                       | 11 +++++++++--
 .../address-edit/test/__snapshots__/demo.spec.js.snap |  4 ++--
 .../test/__snapshots__/index.spec.js.snap             |  8 ++++----
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/packages/address-edit/index.vue b/packages/address-edit/index.vue
index e40486506..97191f582 100644
--- a/packages/address-edit/index.vue
+++ b/packages/address-edit/index.vue
@@ -4,7 +4,6 @@
       <field
         v-model="data.name"
         clearable
-        maxlength="15"
         :label="$t('name')"
         :placeholder="$t('namePlaceholder')"
         :error="errorInfo.name"
@@ -125,6 +124,7 @@ export default create({
     areaList: Object,
     isSaving: Boolean,
     isDeleting: Boolean,
+    validator: Function,
     showDelete: Boolean,
     showPostal: Boolean,
     showSetDefault: Boolean,
@@ -263,9 +263,16 @@ export default create({
     },
 
     getErrorMessage(key) {
-      const value = String(this.data[key]).trim();
+      const value = String(this.data[key] || '').trim();
       const { $t } = this;
 
+      if (this.validator) {
+        const message = this.validator(key, value);
+        if (message) {
+          return message;
+        }
+      }
+
       switch (key) {
         case 'name':
           return value ? '' : $t('nameEmpty');
diff --git a/packages/address-edit/test/__snapshots__/demo.spec.js.snap b/packages/address-edit/test/__snapshots__/demo.spec.js.snap
index 34e5699e2..97c7eef3c 100644
--- a/packages/address-edit/test/__snapshots__/demo.spec.js.snap
+++ b/packages/address-edit/test/__snapshots__/demo.spec.js.snap
@@ -5,14 +5,14 @@ exports[`renders demo correctly 1`] = `
   <div>
     <div class="van-address-edit">
       <div class="van-cell-group van-hairline--top-bottom">
-        <div maxlength="15" placeholder="收货人姓名" class="van-cell van-field">
+        <div placeholder="收货人姓名" class="van-cell van-field">
           <!---->
           <div class="van-cell__title"><span>姓名</span>
             <!---->
           </div>
           <div class="van-cell__value">
             <div class="van-field__body">
-              <input type="text" maxlength="15" placeholder="收货人姓名" value="" class="van-field__control">
+              <input type="text" placeholder="收货人姓名" value="" class="van-field__control">
               <!---->
               <!---->
               <!---->
diff --git a/packages/address-edit/test/__snapshots__/index.spec.js.snap b/packages/address-edit/test/__snapshots__/index.spec.js.snap
index c6a9d58a6..e0a971e78 100644
--- a/packages/address-edit/test/__snapshots__/index.spec.js.snap
+++ b/packages/address-edit/test/__snapshots__/index.spec.js.snap
@@ -3,14 +3,14 @@
 exports[`create a AddressEdit 1`] = `
 <div class="van-address-edit">
   <div class="van-cell-group van-hairline--top-bottom">
-    <div maxlength="15" placeholder="收货人姓名" class="van-cell van-field">
+    <div placeholder="收货人姓名" class="van-cell van-field">
       <!---->
       <div class="van-cell__title"><span>姓名</span>
         <!---->
       </div>
       <div class="van-cell__value">
         <div class="van-field__body">
-          <input type="text" maxlength="15" placeholder="收货人姓名" value="" class="van-field__control">
+          <input type="text" placeholder="收货人姓名" value="" class="van-field__control">
           <!---->
           <!---->
           <!---->
@@ -113,14 +113,14 @@ exports[`create a AddressEdit 1`] = `
 exports[`create a AddressEdit with props 1`] = `
 <div class="van-address-edit">
   <div class="van-cell-group van-hairline--top-bottom">
-    <div maxlength="15" placeholder="收货人姓名" class="van-cell van-field">
+    <div placeholder="收货人姓名" class="van-cell van-field">
       <!---->
       <div class="van-cell__title"><span>姓名</span>
         <!---->
       </div>
       <div class="van-cell__value">
         <div class="van-field__body">
-          <input type="text" maxlength="15" placeholder="收货人姓名" value="测试" class="van-field__control">
+          <input type="text" placeholder="收货人姓名" value="测试" class="van-field__control">
           <!---->
           <!---->
           <!---->