From 305a5d05b84280e96be4fb59c72947daa1a0e9f1 Mon Sep 17 00:00:00 2001
From: yang <29636098325@qq.com>
Date: Wed, 7 Sep 2022 19:25:59 +0800
Subject: [PATCH 1/4] =?UTF-8?q?Cascader=20=EF=BC=9A=E4=BF=AE=E5=A4=8D=20ta?=
 =?UTF-8?q?gRender=20=E9=80=89=E9=A1=B9=EF=BC=8C=E5=B9=B6=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0demo=20=20:bug:=20:memo:=20Cascader:=20Fix=20the=20tag?=
 =?UTF-8?q?Render=20option=20and=20add=20Demo=20:bug:=20:memo:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/cascader/demo/index.vue     |  3 +
 components/cascader/demo/tagRender.vue | 91 ++++++++++++++++++++++++++
 components/cascader/index.tsx          |  3 +-
 3 files changed, 96 insertions(+), 1 deletion(-)
 create mode 100644 components/cascader/demo/tagRender.vue

diff --git a/components/cascader/demo/index.vue b/components/cascader/demo/index.vue
index 0f5871a9e0..deb0e0db53 100644
--- a/components/cascader/demo/index.vue
+++ b/components/cascader/demo/index.vue
@@ -12,6 +12,7 @@
     <fields-name />
     <suffix />
     <multipleVue />
+    <tagRender />
   </demo-sort>
 </template>
 <script>
@@ -27,6 +28,7 @@ import Size from './size.vue';
 import FieldsName from './fields-name.vue';
 import Suffix from './suffix.vue';
 import multipleVue from './multiple.vue';
+import tagRender from './tagRender.vue';
 
 import CN from '../index.zh-CN.md';
 import US from '../index.en-US.md';
@@ -47,6 +49,7 @@ export default defineComponent({
     FieldsName,
     Suffix,
     multipleVue,
+    tagRender,
   },
 });
 </script>
diff --git a/components/cascader/demo/tagRender.vue b/components/cascader/demo/tagRender.vue
new file mode 100644
index 0000000000..3052c34459
--- /dev/null
+++ b/components/cascader/demo/tagRender.vue
@@ -0,0 +1,91 @@
+<docs>
+---
+order: 10
+title:
+  zh-CN: 自定义 tag 内容
+  en-US: The custom tag
+---
+
+</docs>
+
+<template>
+  <a-cascader
+    v-model:value="value"
+    multiple
+    :options="options"
+    placeholder="Please select"
+    suffix-icon="Shopping Around"
+  >
+    <template #tagRender="data">
+      <a-tag :key="data.value" color="blue">{{ data.label }}</a-tag>
+    </template>
+  </a-cascader>
+</template>
+<script lang="ts">
+import { defineComponent, ref } from 'vue';
+import type { CascaderProps } from 'ant-design-vue';
+const options: CascaderProps['options'] = [
+  {
+    value: 'zhejiang',
+    label: 'Zhejiang',
+    children: [
+      {
+        value: 'freezeKey',
+        label: 'freeze',
+        children: [
+          {
+            value: 'key1',
+            label: 'salmon',
+          },
+          {
+            value: 'key2',
+            label: 'beef',
+          },
+        ],
+      },
+      {
+        value: 'fruitsKey',
+        label: 'fruits',
+        children: [
+          {
+            value: 'key11',
+            label: 'apple',
+          },
+          {
+            value: 'key22',
+            label: 'banana',
+          },
+        ],
+      },
+    ],
+  },
+  {
+    value: 'Chinese delicious food',
+    label: '中国美食',
+    children: [
+      {
+        value: 'key3',
+        label: '月饼',
+        children: [
+          {
+            value: 'key4',
+            label: '蛋黄馅',
+          },
+          {
+            value: 'key5',
+            label: '五仁馅',
+          },
+        ],
+      },
+    ],
+  },
+];
+export default defineComponent({
+  setup() {
+    return {
+      value: ref<string[]>([]),
+      options,
+    };
+  },
+});
+</script>
diff --git a/components/cascader/index.tsx b/components/cascader/index.tsx
index 775a0c3cbb..a760fc14b9 100644
--- a/components/cascader/index.tsx
+++ b/components/cascader/index.tsx
@@ -136,7 +136,7 @@ const Cascader = defineComponent({
     if (process.env.NODE_ENV !== 'production') {
       watchEffect(() => {
         devWarning(
-          !props.multiple || !props.displayRender || !slots.displayRender,
+          !props.multiple ? !props.displayRender || !slots.displayRender : !slots.tagRender,
           'Cascader',
           '`displayRender` not work on `multiple`. Please use `tagRender` instead.',
         );
@@ -280,6 +280,7 @@ const Cascader = defineComponent({
             ...slots,
             checkable: () => <span class={`${cascaderPrefixCls.value}-checkbox-inner`} />,
           }}
+          tagRender={slots.tagRender}
           displayRender={props.displayRender || slots.displayRender}
           maxTagPlaceholder={props.maxTagPlaceholder || slots.maxTagPlaceholder}
           showArrow={props.showArrow}

From f51e930168e1be053e8ae57de13ace9f30d876ca Mon Sep 17 00:00:00 2001
From: yang <2636098325@qq.com>
Date: Wed, 14 Sep 2022 11:23:27 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20test=20=E4=B8=AD?=
 =?UTF-8?q?=E7=AD=89=E5=BE=85=E6=97=B6=E6=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/typography/__tests__/index.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/typography/__tests__/index.test.js b/components/typography/__tests__/index.test.js
index 7c7846f8b5..7c4c3ad514 100644
--- a/components/typography/__tests__/index.test.js
+++ b/components/typography/__tests__/index.test.js
@@ -128,7 +128,7 @@ describe('Typography', () => {
         expect(wrapper.find('p').text()).toEqual('...--The information is very important');
 
         wrapper.setProps({ ellipsis: { rows: 2, suffix } });
-        await sleep(20);
+        await wrapper.vm.nextTick();
         expect(wrapper.find('p').text()).toEqual('Ba...--The information is very important');
 
         wrapper.setProps({ ellipsis: { rows: 99, suffix } });

From baa18ef5b3f5da333d860a5cbd6eed23aba60195 Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Mon, 26 Sep 2022 22:04:25 +0800
Subject: [PATCH 3/4] Update index.tsx

---
 components/cascader/index.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/cascader/index.tsx b/components/cascader/index.tsx
index a760fc14b9..01e4fb7d35 100644
--- a/components/cascader/index.tsx
+++ b/components/cascader/index.tsx
@@ -136,7 +136,7 @@ const Cascader = defineComponent({
     if (process.env.NODE_ENV !== 'production') {
       watchEffect(() => {
         devWarning(
-          !props.multiple ? !props.displayRender || !slots.displayRender : !slots.tagRender,
+          !props.multiple || !props.displayRender || !slots.displayRender,
           'Cascader',
           '`displayRender` not work on `multiple`. Please use `tagRender` instead.',
         );
@@ -280,7 +280,7 @@ const Cascader = defineComponent({
             ...slots,
             checkable: () => <span class={`${cascaderPrefixCls.value}-checkbox-inner`} />,
           }}
-          tagRender={slots.tagRender}
+          tagRender={props.tagRender || slots.tagRender}
           displayRender={props.displayRender || slots.displayRender}
           maxTagPlaceholder={props.maxTagPlaceholder || slots.maxTagPlaceholder}
           showArrow={props.showArrow}

From 1ac6ab8cfc5b2ac56f0af09d694ea7bf42ac9636 Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Mon, 26 Sep 2022 22:06:03 +0800
Subject: [PATCH 4/4] Update index.test.js

---
 components/typography/__tests__/index.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/typography/__tests__/index.test.js b/components/typography/__tests__/index.test.js
index 7c4c3ad514..7c7846f8b5 100644
--- a/components/typography/__tests__/index.test.js
+++ b/components/typography/__tests__/index.test.js
@@ -128,7 +128,7 @@ describe('Typography', () => {
         expect(wrapper.find('p').text()).toEqual('...--The information is very important');
 
         wrapper.setProps({ ellipsis: { rows: 2, suffix } });
-        await wrapper.vm.nextTick();
+        await sleep(20);
         expect(wrapper.find('p').text()).toEqual('Ba...--The information is very important');
 
         wrapper.setProps({ ellipsis: { rows: 99, suffix } });