From cf88dda233041f84450fa6b33e2d364194309584 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Mon, 21 May 2018 20:27:53 +0800
Subject: [PATCH] [Improvement] TreeSelect: support string type id (#1126)

---
 packages/tree-select/en-US.md  | 2 +-
 packages/tree-select/index.vue | 2 +-
 packages/tree-select/zh-CN.md  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/tree-select/en-US.md b/packages/tree-select/en-US.md
index a9839f0e2..acf55b393 100644
--- a/packages/tree-select/en-US.md
+++ b/packages/tree-select/en-US.md
@@ -51,7 +51,7 @@ export default {
 |-----------|-----------|-----------|-------------|
 | items | Required datasets for the component, see Data Structure for detail. | `Array` | `[]` |
 | main-Active-index | The index of selected parent node | `Number` | `0` |
-| active-id | Id of selected item | `Number` | `0` |
+| active-id | Id of selected item | `String | Number` | `0` |
 
 #### Event
 | Event | Description | Arguments |
diff --git a/packages/tree-select/index.vue b/packages/tree-select/index.vue
index 249c93953..9e63cc508 100644
--- a/packages/tree-select/index.vue
+++ b/packages/tree-select/index.vue
@@ -43,7 +43,7 @@ export default create({
       default: 0
     },
     activeId: {
-      type: Number,
+      type: [Number, String],
       default: 0
     },
     maxHeight: {
diff --git a/packages/tree-select/zh-CN.md b/packages/tree-select/zh-CN.md
index 35d6162fd..9af6ff732 100644
--- a/packages/tree-select/zh-CN.md
+++ b/packages/tree-select/zh-CN.md
@@ -52,7 +52,7 @@ export default {
 |-----------|-----------|-----------|-------------|
 | items | 分类显示所需的数据，具体数据结构可看 数据结构 | `Array` | `[]` |
 | main-active-index | 左侧导航高亮的索引 | `Number` | `0` |
-| active-id | 右侧选择项，高亮的数据id | `Number` | `0` |
+| active-id | 右侧选择项，高亮的数据id | `String | Number` | `0` |
 
 #### 事件