From 85356ac3027406b3e770bc9d70ee7dfcca7a7ece Mon Sep 17 00:00:00 2001 From: neverland Date: Fri, 16 Aug 2019 17:43:32 +0800 Subject: [PATCH] [new feature] TreeSelect: main-active-index support sync modifier (#4132) --- src/tree-select/README.md | 2 +- src/tree-select/README.zh-CN.md | 16 ++++------------ src/tree-select/demo/index.vue | 14 ++------------ src/tree-select/index.tsx | 1 + 4 files changed, 8 insertions(+), 25 deletions(-) diff --git a/src/tree-select/README.md b/src/tree-select/README.md index 2d4f46bcc..fcca0c24a 100644 --- a/src/tree-select/README.md +++ b/src/tree-select/README.md @@ -91,7 +91,7 @@ export default { | items | Required datasets for the component | `Item[]` | `[]` | | height | Height | `string | number` | `300` | | main-Active-index | The index of selected parent node | `number` | `0` | -| active-id | Id of selected item | `string | number` | `0` | +| active-id | Id of selected item | `string | number | (string | number)[]` | `0` | ### Events diff --git a/src/tree-select/README.zh-CN.md b/src/tree-select/README.zh-CN.md index 253066275..faa55bac8 100644 --- a/src/tree-select/README.zh-CN.md +++ b/src/tree-select/README.zh-CN.md @@ -17,8 +17,7 @@ Vue.use(TreeSelect); ``` @@ -33,9 +32,6 @@ export default { }; }, methods: { - onClickNav(index) { - this.mainActiveIndex = index; - }, onClickItem(data) { this.activeId = data.id; } @@ -49,8 +45,7 @@ export default { ``` @@ -65,9 +60,6 @@ export default { }; }, methods: { - onClickNav(index) { - this.mainActiveIndex = index; - }, onClickItem(data) { const { id } = data; const { activeIds } = this; @@ -90,8 +82,8 @@ export default { |------|------|------|------|------| | items | 分类显示所需的数据 | `Item[]` | `[]` | - | | height | 高度,默认单位为 px | `string | number` | `300` | - | -| main-active-index | 左侧导航高亮的索引 | `number` | `0` | - | -| active-id | 右侧选择项,高亮的数据id | `string | number` | `0` | - | +| main-active-index | 左侧高亮选项的索引 | `number` | `0` | - | +| active-id | 右侧高亮选项的 id,支持传入数组 | `string | number | (string | number)[]` | `0` | - | ### Events diff --git a/src/tree-select/demo/index.vue b/src/tree-select/demo/index.vue index 50af58a06..b5d3d0133 100644 --- a/src/tree-select/demo/index.vue +++ b/src/tree-select/demo/index.vue @@ -3,9 +3,8 @@ @@ -13,9 +12,8 @@ @@ -140,18 +138,10 @@ export default { }, methods: { - onNavClick(index) { - this.mainActiveIndex = index; - }, - onItemClick(data) { this.activeId = data.id; }, - onNavClick2(index) { - this.mainActiveIndex2 = index; - }, - onItemClick2(data) { const { id } = data; const { activeIds } = this; diff --git a/src/tree-select/index.tsx b/src/tree-select/index.tsx index cb5060198..e8c4a6508 100644 --- a/src/tree-select/index.tsx +++ b/src/tree-select/index.tsx @@ -63,6 +63,7 @@ function TreeSelect( onClick={() => { if (!item.disabled) { emit(ctx, 'click-nav', index); + emit(ctx, 'update:main-active-index', index); // compatible for old usage, should be removed in next major version emit(ctx, 'navclick', index);