From 38b5b76051da0a675692b5da9af21d8ce23e7a43 Mon Sep 17 00:00:00 2001
From: 梁灏 <admin@aresn.com>
Date: Mon, 15 Apr 2019 10:05:42 +0800
Subject: [PATCH] update Select max-tag-placeholder type to Function, #5568

---
 examples/routers/select.vue           | 7 ++++++-
 package.json                          | 2 +-
 src/components/select/select-head.vue | 4 ++--
 src/components/select/select.vue      | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/examples/routers/select.vue b/examples/routers/select.vue
index 3c3e8f4..f08ec42 100644
--- a/examples/routers/select.vue
+++ b/examples/routers/select.vue
@@ -24,7 +24,7 @@
             <Option v-for="item in cityList" :value="item.value" :key="item.value">{{ item.label }}</Option>
         </Select>
 
-        <Select v-model="model10" :max-tag-count="3" max-tag-placeholder="more" multiple style="width:400px" prefix="ios-albums">
+        <Select v-model="model10" :max-tag-count="3" :max-tag-placeholder="more" multiple style="width:400px" prefix="ios-albums">
             <Option v-for="item in cityList" :value="item.value" :key="item.value">{{ item.label }}</Option>
         </Select>
 
@@ -82,6 +82,11 @@
                 model1: '',
                 model10: []
             }
+        },
+        methods: {
+            more (num) {
+                return 'more' + num;
+            }
         }
     }
 </script>
diff --git a/package.json b/package.json
index ac64e12..4d22baa 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "iview",
-    "version": "3.3.3",
+    "version": "3.4.0-rc.2",
     "title": "iView",
     "description": "A high quality UI components Library with Vue.js",
     "homepage": "http://www.iviewui.com",
diff --git a/src/components/select/select-head.vue b/src/components/select/select-head.vue
index ef38a96..5efc60d 100644
--- a/src/components/select/select-head.vue
+++ b/src/components/select/select-head.vue
@@ -13,7 +13,7 @@
             <Icon type="ios-close" @click.native.stop="removeTag(item)"></Icon>
         </div><div class="ivu-tag ivu-tag-checked" v-if="maxTagCount !== undefined && selectedMultiple.length > maxTagCount">
             <span class="ivu-tag-text ivu-select-max-tag">
-                <template v-if="maxTagPlaceholder">{{ maxTagPlaceholder }}</template>
+                <template v-if="maxTagPlaceholder">{{ maxTagPlaceholder(selectedMultiple.length - maxTagCount) }}</template>
                 <template v-else>+ {{ selectedMultiple.length - maxTagCount }}...</template>
             </span>
         </div>
@@ -100,7 +100,7 @@
             },
             // 3.4.0
             maxTagPlaceholder: {
-                type: String
+                type: Function
             }
         },
         data () {
diff --git a/src/components/select/select.vue b/src/components/select/select.vue
index fe17c09..75349e2 100644
--- a/src/components/select/select.vue
+++ b/src/components/select/select.vue
@@ -251,7 +251,7 @@
             },
             // 3.4.0
             maxTagPlaceholder: {
-                type: String
+                type: Function
             }
         },
         mounted(){
--
libgit2 0.21.4