From d46762c1d68d4b255825ead01eb89a56a64e7cb8 Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Sun, 16 Jan 2022 11:13:39 +0800
Subject: [PATCH] feat: tree-select add tag-render

---
 components/tree-select/demo/checkable.vue     |  2 +-
 .../tree-select/demo/custom-tag-render.vue    | 93 +++++++++++++++++++
 components/tree-select/demo/index.vue         |  9 ++
 .../demo/{treeLine.vue => tree-line.vue}      | 48 +++++-----
 components/tree-select/demo/treeData.vue      | 74 ---------------
 .../tree-select/demo/virtual-scroll.vue       | 73 +++++++++++++++
 .../vc-select/Selector/MultipleSelector.tsx   | 12 ++-
 .../vc-select/Selector/SingleSelector.tsx     |  1 +
 components/vc-tree-select/TreeSelect.tsx      |  1 +
 9 files changed, 212 insertions(+), 101 deletions(-)
 create mode 100644 components/tree-select/demo/custom-tag-render.vue
 rename components/tree-select/demo/{treeLine.vue => tree-line.vue} (62%)
 delete mode 100644 components/tree-select/demo/treeData.vue
 create mode 100644 components/tree-select/demo/virtual-scroll.vue

diff --git a/components/tree-select/demo/checkable.vue b/components/tree-select/demo/checkable.vue
index 868add70b..36f435e77 100644
--- a/components/tree-select/demo/checkable.vue
+++ b/components/tree-select/demo/checkable.vue
@@ -27,9 +27,9 @@ Multiple and checkable.
   />
 </template>
 <script lang="ts">
-import { TreeSelect } from 'ant-design-vue';
 import type { TreeSelectProps } from 'ant-design-vue';
 import { defineComponent, ref, watch } from 'vue';
+import { TreeSelect } from 'ant-design-vue';
 const SHOW_PARENT = TreeSelect.SHOW_PARENT;
 
 const treeData: TreeSelectProps['treeData'] = [
diff --git a/components/tree-select/demo/custom-tag-render.vue b/components/tree-select/demo/custom-tag-render.vue
new file mode 100644
index 000000000..24fbbf74e
--- /dev/null
+++ b/components/tree-select/demo/custom-tag-render.vue
@@ -0,0 +1,93 @@
+<docs>
+---
+order: 24
+title:
+  zh-CN: 自定义选择标签
+  en-US: Custom Tag Render
+---
+
+## zh-CN
+
+允许自定义选择标签的样式。仅支持多选模式，单选可直接使用 `title` 插槽
+
+## en-US
+
+Allows for custom rendering of tags.
+
+</docs>
+
+<template>
+  <a-tree-select
+    v-model:value="value"
+    show-search
+    style="width: 100%"
+    :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+    placeholder="Please select"
+    allow-clear
+    multiple
+    :show-checked-strategy="SHOW_ALL"
+    tree-default-expand-all
+    :tree-data="treeData"
+  >
+    <template #tagRender="{ label, closable, onClose, option }">
+      <a-tag :closable="closable" :color="option.color" style="margin-right: 3px" @close="onClose">
+        {{ label }}&nbsp;&nbsp;
+      </a-tag>
+    </template>
+    <template #title="{ value: val, title }">
+      <b v-if="val === 'parent 1-1'" style="color: #08c">{{ val }}</b>
+      <template v-else>{{ title }}</template>
+    </template>
+  </a-tree-select>
+</template>
+<script lang="ts">
+import type { TreeSelectProps } from 'ant-design-vue';
+import { defineComponent, ref, watch } from 'vue';
+import { TreeSelect } from 'ant-design-vue';
+const SHOW_ALL = TreeSelect.SHOW_ALL;
+export default defineComponent({
+  setup() {
+    const value = ref<string[]>(['parent 1', 'parent 1-0', 'leaf1']);
+    const treeData = ref<TreeSelectProps['treeData']>([
+      {
+        title: 'parent 1',
+        value: 'parent 1',
+        color: 'pink',
+        children: [
+          {
+            title: 'parent 1-0',
+            value: 'parent 1-0',
+            color: 'orange',
+            children: [
+              {
+                title: 'my leaf',
+                value: 'leaf1',
+                color: 'green',
+              },
+              {
+                title: 'your leaf',
+                value: 'leaf2',
+                color: 'cyan',
+              },
+            ],
+          },
+          {
+            title: 'parent 1-1',
+            value: 'parent 1-1',
+            color: 'blue',
+          },
+        ],
+      },
+    ]);
+    watch(value, () => {
+      console.log('select', value.value);
+    });
+
+    return {
+      value,
+      treeData,
+      SHOW_ALL,
+    };
+  },
+});
+</script>
diff --git a/components/tree-select/demo/index.vue b/components/tree-select/demo/index.vue
index 87fa10469..4a3b57646 100644
--- a/components/tree-select/demo/index.vue
+++ b/components/tree-select/demo/index.vue
@@ -7,6 +7,9 @@
     <suffix />
     <async />
     <Highlight />
+    <treeLineVue />
+    <virtualScrollVue />
+    <customTagRenderVue />
   </demo-sort>
 </template>
 <script lang="ts">
@@ -17,6 +20,9 @@ import Checkable from './checkable.vue';
 import Suffix from './suffix.vue';
 import Async from './async.vue';
 import Highlight from './highlight.vue';
+import treeLineVue from './tree-line.vue';
+import virtualScrollVue from './virtual-scroll.vue';
+import customTagRenderVue from './custom-tag-render.vue';
 import CN from '../index.zh-CN.md';
 import US from '../index.en-US.md';
 import { defineComponent } from 'vue';
@@ -32,6 +38,9 @@ export default defineComponent({
     Suffix,
     Async,
     Highlight,
+    treeLineVue,
+    virtualScrollVue,
+    customTagRenderVue,
   },
   setup() {
     return {};
diff --git a/components/tree-select/demo/treeLine.vue b/components/tree-select/demo/tree-line.vue
similarity index 62%
rename from components/tree-select/demo/treeLine.vue
rename to components/tree-select/demo/tree-line.vue
index bdb3ed6a4..b6afa24ab 100644
--- a/components/tree-select/demo/treeLine.vue
+++ b/components/tree-select/demo/tree-line.vue
@@ -17,29 +17,31 @@ Use `treeLine` to show the line style.
 </docs>
 
 <template>
-  <a-switch
-    v-model:checked="treeLine"
-    checked-children="treeLine"
-    un-checked-children="treeLine"
-  ></a-switch>
-  <a-switch
-    v-model:checked="showLeafIcon"
-    :disabled="!treeLine"
-    checked-children="showLeafIcon"
-    un-checked-children="showLeafIcon"
-  ></a-switch>
-  <a-tree-select
-    v-model:value="value"
-    style="width: 300px"
-    placeholder="Please select"
-    :tree-line="treeLine && { showLeafIcon }"
-    :tree-data="treeData"
-  >
-    <template #title="{ value: val, title }">
-      <b v-if="val === 'parent 1-1'" style="color: #08c">sss</b>
-      <template v-else>{{ title }}</template>
-    </template>
-  </a-tree-select>
+  <a-space direction="vertical">
+    <a-switch
+      v-model:checked="treeLine"
+      checked-children="treeLine"
+      un-checked-children="treeLine"
+    ></a-switch>
+    <a-switch
+      v-model:checked="showLeafIcon"
+      :disabled="!treeLine"
+      checked-children="showLeafIcon"
+      un-checked-children="showLeafIcon"
+    ></a-switch>
+    <a-tree-select
+      v-model:value="value"
+      style="width: 300px"
+      placeholder="Please select"
+      :tree-line="treeLine && { showLeafIcon }"
+      :tree-data="treeData"
+    >
+      <template #title="{ value: val, title }">
+        <b v-if="val === 'parent 1-1'" style="color: #08c">sss</b>
+        <template v-else>{{ title }}</template>
+      </template>
+    </a-tree-select>
+  </a-space>
 </template>
 <script lang="ts">
 import type { TreeSelectProps } from 'ant-design-vue';
diff --git a/components/tree-select/demo/treeData.vue b/components/tree-select/demo/treeData.vue
deleted file mode 100644
index f8865710e..000000000
--- a/components/tree-select/demo/treeData.vue
+++ /dev/null
@@ -1,74 +0,0 @@
-<docs>
----
-order: 2
-title:
-  zh-CN: 从数据直接生成
-  en-US: Generate form tree data
----
-
-## zh-CN
-
-使用 `treeData` 把 JSON 数据直接生成树结构。
-
-## en-US
-
-The tree structure can be populated using `treeData` property. This is a quick and easy way to provide the tree content.
-
-</docs>
-<template>
-  <a-tree-select
-    v-model:value="value"
-    style="width: 100%"
-    :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
-    :tree-data="treeData"
-    placeholder="Please select"
-    tree-default-expand-all
-  >
-    <template #title="{ key, value: val, title }">
-      <span v-if="key === '0-0-1'" style="color: #08c">Child Node1 {{ val }}</span>
-      <template v-else>{{ title }}</template>
-    </template>
-  </a-tree-select>
-</template>
-
-<script lang="ts">
-import type { TreeSelectProps } from 'ant-design-vue';
-import { defineComponent, ref, watch } from 'vue';
-
-const treeData: TreeSelectProps['treeData'] = [
-  {
-    title: 'Node1',
-    value: '0-0',
-    key: '0-0',
-    children: [
-      {
-        value: '0-0-1',
-        key: '0-0-1',
-      },
-      {
-        title: 'Child Node2',
-        value: '0-0-2',
-        key: '0-0-2',
-      },
-    ],
-  },
-  {
-    title: 'Node2',
-    value: '0-1',
-    key: '0-1',
-  },
-];
-export default defineComponent({
-  setup() {
-    const value = ref<string>();
-
-    watch(value, () => {
-      console.log(value.value);
-    });
-    return {
-      value,
-      treeData,
-    };
-  },
-});
-</script>
diff --git a/components/tree-select/demo/virtual-scroll.vue b/components/tree-select/demo/virtual-scroll.vue
new file mode 100644
index 000000000..f8c5eb847
--- /dev/null
+++ b/components/tree-select/demo/virtual-scroll.vue
@@ -0,0 +1,73 @@
+<docs>
+---
+order: 9
+title:
+  zh-CN: 虚拟滚动
+  en-US: Virtual scroll
+---
+
+## zh-CN
+
+使用 `height` 属性则切换为虚拟滚动。
+
+## en-US
+
+Use virtual list through `height` prop.
+
+</docs>
+<template>
+  <a-tree-select
+    v-model:value="checkedKeys"
+    style="width: 100%"
+    tree-checkable
+    tree-default-expand-all
+    :show-checked-strategy="SHOW_PARENT"
+    :height="233"
+    :tree-data="treeData"
+    :max-tag-count="10"
+  >
+    <template #title="{ title, value }">
+      <span v-if="value === '0-0-1-0'" style="color: #1890ff">{{ title }}</span>
+      <template v-else>{{ title }}</template>
+    </template>
+  </a-tree-select>
+</template>
+<script lang="ts">
+import type { TreeSelectProps } from 'ant-design-vue';
+import { TreeSelect } from 'ant-design-vue';
+import { defineComponent, ref, watch } from 'vue';
+const SHOW_PARENT = TreeSelect.SHOW_PARENT;
+
+function dig(path = '0', level = 3) {
+  const list: TreeSelectProps['treeData'] = [];
+  for (let i = 0; i < 10; i += 1) {
+    const value = `${path}-${i}`;
+    const treeNode: TreeSelectProps['treeData'][number] = {
+      title: value,
+      value,
+    };
+
+    if (level > 0) {
+      treeNode.children = dig(value, level - 1);
+    }
+
+    list.push(treeNode);
+  }
+  return list;
+}
+
+export default defineComponent({
+  setup() {
+    const checkedKeys = ref<string[]>(['0-0-0', '0-0-1']);
+    watch(checkedKeys, () => {
+      console.log('checkedKeys', checkedKeys);
+    });
+
+    return {
+      treeData: dig(),
+      checkedKeys,
+      SHOW_PARENT,
+    };
+  },
+});
+</script>
diff --git a/components/vc-select/Selector/MultipleSelector.tsx b/components/vc-select/Selector/MultipleSelector.tsx
index 4fddf5dfb..3919d1f39 100644
--- a/components/vc-select/Selector/MultipleSelector.tsx
+++ b/components/vc-select/Selector/MultipleSelector.tsx
@@ -10,6 +10,7 @@ import type { VueNode } from '../../_util/type';
 import Overflow from '../../vc-overflow';
 import type { DisplayValueType, RenderNode, CustomTagProps, RawValueType } from '../BaseSelect';
 import type { BaseOptionType } from '../Select';
+import useInjectLegacySelectContext from '../../vc-tree-select/LegacyContext';
 
 type SelectorProps = InnerSelectorProps & {
   // Icon
@@ -79,7 +80,7 @@ const SelectSelector = defineComponent<SelectorProps>({
     const measureRef = ref();
     const inputWidth = ref(0);
     const focused = ref(false);
-
+    const legacyTreeSelectContext = useInjectLegacySelectContext();
     const selectionPrefixCls = computed(() => `${props.prefixCls}-selection`);
 
     // ===================== Search ======================
@@ -147,15 +148,20 @@ const SelectSelector = defineComponent<SelectorProps>({
         onPreventMouseDown(e);
         props.onToggleOpen(!open);
       };
+      let originData = option;
+      // For TreeSelect
+      if (legacyTreeSelectContext.keyEntities) {
+        originData = legacyTreeSelectContext.keyEntities[value]?.node || {};
+      }
       return (
-        <span onMousedown={onMouseDown}>
+        <span key={value} onMousedown={onMouseDown}>
           {props.tagRender({
             label: content,
             value,
             disabled: itemDisabled,
             closable,
             onClose,
-            option,
+            option: originData,
           })}
         </span>
       );
diff --git a/components/vc-select/Selector/SingleSelector.tsx b/components/vc-select/Selector/SingleSelector.tsx
index a5004cb51..b67159a98 100644
--- a/components/vc-select/Selector/SingleSelector.tsx
+++ b/components/vc-select/Selector/SingleSelector.tsx
@@ -109,6 +109,7 @@ const SingleSelector = defineComponent<SelectorProps>({
       let titleNode = null;
       // custom tree-select title by slot
 
+      // For TreeSelect
       if (item && legacyTreeSelectContext.customSlots) {
         const key = item.key ?? item.value;
         const originData = legacyTreeSelectContext.keyEntities[key]?.node || {};
diff --git a/components/vc-tree-select/TreeSelect.tsx b/components/vc-tree-select/TreeSelect.tsx
index 830043a5d..0d900158f 100644
--- a/components/vc-tree-select/TreeSelect.tsx
+++ b/components/vc-tree-select/TreeSelect.tsx
@@ -727,6 +727,7 @@ export default defineComponent({
           OptionList={OptionList}
           emptyOptions={!mergedTreeData.value.length}
           onDropdownVisibleChange={onInternalDropdownVisibleChange}
+          tagRender={props.tagRender || slots.tagRender}
         />
       );
     };