From 6989bd595916962a4a5c3906ecde5a02544b63f4 Mon Sep 17 00:00:00 2001
From: waldon <852727515@qq.com>
Date: Sun, 28 May 2023 02:22:21 +0800
Subject: [PATCH 1/4] =?UTF-8?q?docs:=20=F0=9F=93=83change=20the=20default?=
 =?UTF-8?q?=20=20setting=20of=20=20"treeNodeFilterProp"=20from=20=20"value?=
 =?UTF-8?q?"=20to=20"label"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/tree-select/demo/basic.vue             | 15 ++++++++-------
 components/tree-select/demo/checkable.vue         | 13 +++++++------
 components/tree-select/demo/custom-tag-render.vue | 15 ++++++++-------
 components/tree-select/demo/highlight.vue         | 15 ++++++++-------
 components/tree-select/demo/multiple.vue          | 15 ++++++++-------
 components/tree-select/demo/replaceFields.vue     |  1 +
 components/tree-select/demo/suffix.vue            | 12 ++++++++++++
 site/src/i18n.js                                  |  2 +-
 8 files changed, 53 insertions(+), 35 deletions(-)

diff --git a/components/tree-select/demo/basic.vue b/components/tree-select/demo/basic.vue
index e1cea999fd..9cd8b3eede 100644
--- a/components/tree-select/demo/basic.vue
+++ b/components/tree-select/demo/basic.vue
@@ -26,10 +26,11 @@ The most basic usage.
     allow-clear
     tree-default-expand-all
     :tree-data="treeData"
+    tree-node-filter-prop="label"
   >
-    <template #title="{ value: val, title }">
+    <template #title="{ value: val, label }">
       <b v-if="val === 'parent 1-1'" style="color: #08c">sss</b>
-      <template v-else>{{ title }}</template>
+      <template v-else>{{ label }}</template>
     </template>
   </a-tree-select>
 </template>
@@ -41,25 +42,25 @@ export default defineComponent({
     const value = ref<string>();
     const treeData = ref<TreeSelectProps['treeData']>([
       {
-        title: 'parent 1',
+        label: 'parent 1',
         value: 'parent 1',
         children: [
           {
-            title: 'parent 1-0',
+            label: 'parent 1-0',
             value: 'parent 1-0',
             children: [
               {
-                title: 'my leaf',
+                label: 'my leaf',
                 value: 'leaf1',
               },
               {
-                title: 'your leaf',
+                label: 'your leaf',
                 value: 'leaf2',
               },
             ],
           },
           {
-            title: 'parent 1-1',
+            label: 'parent 1-1',
             value: 'parent 1-1',
           },
         ],
diff --git a/components/tree-select/demo/checkable.vue b/components/tree-select/demo/checkable.vue
index 36f435e77f..d39a825c80 100644
--- a/components/tree-select/demo/checkable.vue
+++ b/components/tree-select/demo/checkable.vue
@@ -24,6 +24,7 @@ Multiple and checkable.
     allow-clear
     :show-checked-strategy="SHOW_PARENT"
     placeholder="Please select"
+    tree-node-filter-prop="label"
   />
 </template>
 <script lang="ts">
@@ -34,31 +35,31 @@ const SHOW_PARENT = TreeSelect.SHOW_PARENT;
 
 const treeData: TreeSelectProps['treeData'] = [
   {
-    title: 'Node1',
+    label: 'Node1',
     value: '0-0',
     children: [
       {
-        title: 'Child Node1',
+        label: 'Child Node1',
         value: '0-0-0',
       },
     ],
   },
   {
-    title: 'Node2',
+    label: 'Node2',
     value: '0-1',
 
     children: [
       {
-        title: 'Child Node3',
+        label: 'Child Node3',
         value: '0-1-0',
         disabled: true,
       },
       {
-        title: 'Child Node4',
+        label: 'Child Node4',
         value: '0-1-1',
       },
       {
-        title: 'Child Node5',
+        label: 'Child Node5',
         value: '0-1-2',
       },
     ],
diff --git a/components/tree-select/demo/custom-tag-render.vue b/components/tree-select/demo/custom-tag-render.vue
index 24fbbf74ed..539f5da866 100644
--- a/components/tree-select/demo/custom-tag-render.vue
+++ b/components/tree-select/demo/custom-tag-render.vue
@@ -28,15 +28,16 @@ Allows for custom rendering of tags.
     :show-checked-strategy="SHOW_ALL"
     tree-default-expand-all
     :tree-data="treeData"
+    tree-node-filter-prop="label"
   >
     <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 }">
+    <template #title="{ value: val, label }">
       <b v-if="val === 'parent 1-1'" style="color: #08c">{{ val }}</b>
-      <template v-else>{{ title }}</template>
+      <template v-else>{{ label }}</template>
     </template>
   </a-tree-select>
 </template>
@@ -50,29 +51,29 @@ export default defineComponent({
     const value = ref<string[]>(['parent 1', 'parent 1-0', 'leaf1']);
     const treeData = ref<TreeSelectProps['treeData']>([
       {
-        title: 'parent 1',
+        label: 'parent 1',
         value: 'parent 1',
         color: 'pink',
         children: [
           {
-            title: 'parent 1-0',
+            label: 'parent 1-0',
             value: 'parent 1-0',
             color: 'orange',
             children: [
               {
-                title: 'my leaf',
+                label: 'my leaf',
                 value: 'leaf1',
                 color: 'green',
               },
               {
-                title: 'your leaf',
+                label: 'your leaf',
                 value: 'leaf2',
                 color: 'cyan',
               },
             ],
           },
           {
-            title: 'parent 1-1',
+            label: 'parent 1-1',
             value: 'parent 1-1',
             color: 'blue',
           },
diff --git a/components/tree-select/demo/highlight.vue b/components/tree-select/demo/highlight.vue
index 4b2033ce42..e08ba96bbd 100644
--- a/components/tree-select/demo/highlight.vue
+++ b/components/tree-select/demo/highlight.vue
@@ -27,12 +27,13 @@ Search Value Hightlight
     allow-clear
     tree-default-expand-all
     :tree-data="treeData"
+    tree-node-filter-prop="label"
   >
-    <template #title="{ value: val, title }">
+    <template #title="{ value: val, label }">
       <b v-if="val === 'parent 1-1'" style="color: #08c">sss</b>
       <template v-else>
         <template
-          v-for="(fragment, i) in title
+          v-for="(fragment, i) in label
             .toString()
             .split(new RegExp(`(?<=${searchValue})|(?=${searchValue})`, 'i'))"
         >
@@ -57,25 +58,25 @@ export default defineComponent({
     const value = ref<string>();
     const treeData = ref<TreeSelectProps['treeData']>([
       {
-        title: 'parent 1',
+        label: 'parent 1',
         value: 'parent 1',
         children: [
           {
-            title: 'parent 1-0',
+            label: 'parent 1-0',
             value: 'parent 1-0',
             children: [
               {
-                title: 'my leaf',
+                label: 'my leaf',
                 value: 'leaf1',
               },
               {
-                title: 'your leaf',
+                label: 'your leaf',
                 value: 'leaf2',
               },
             ],
           },
           {
-            title: 'parent 1-1',
+            label: 'parent 1-1',
             value: 'parent 1-1',
           },
         ],
diff --git a/components/tree-select/demo/multiple.vue b/components/tree-select/demo/multiple.vue
index e8fe8206fd..ef8d51d7f8 100644
--- a/components/tree-select/demo/multiple.vue
+++ b/components/tree-select/demo/multiple.vue
@@ -27,10 +27,11 @@ Multiple selection usage.
     multiple
     tree-default-expand-all
     :tree-data="treeData"
+    tree-node-filter-prop="label"
   >
-    <template #title="{ value: val, title }">
+    <template #title="{ value: val, label }">
       <b v-if="val === 'parent 1-1'" style="color: #08c">{{ val }}</b>
-      <template v-else>{{ title }}</template>
+      <template v-else>{{ label }}</template>
     </template>
   </a-tree-select>
 </template>
@@ -43,25 +44,25 @@ export default defineComponent({
     const value = ref<string[]>([]);
     const treeData = ref<TreeSelectProps['treeData']>([
       {
-        title: 'parent 1',
+        label: 'parent 1',
         value: 'parent 1',
         children: [
           {
-            title: 'parent 1-0',
+            label: 'parent 1-0',
             value: 'parent 1-0',
             children: [
               {
-                title: 'my leaf',
+                label: 'my leaf',
                 value: 'leaf1',
               },
               {
-                title: 'your leaf',
+                label: 'your leaf',
                 value: 'leaf2',
               },
             ],
           },
           {
-            title: 'parent 1-1',
+            label: 'parent 1-1',
             value: 'parent 1-1',
           },
         ],
diff --git a/components/tree-select/demo/replaceFields.vue b/components/tree-select/demo/replaceFields.vue
index 14a61ddf0d..829e525a8c 100644
--- a/components/tree-select/demo/replaceFields.vue
+++ b/components/tree-select/demo/replaceFields.vue
@@ -31,6 +31,7 @@ Replace the title,key and children fields in treeNode with the corresponding fie
       label: 'name',
       value: 'value',
     }"
+    tree-node-filter-prop="name"
   ></a-tree-select>
 </template>
 <script lang="ts">
diff --git a/components/tree-select/demo/suffix.vue b/components/tree-select/demo/suffix.vue
index 8ca90e074e..0871c42778 100644
--- a/components/tree-select/demo/suffix.vue
+++ b/components/tree-select/demo/suffix.vue
@@ -27,6 +27,12 @@ The most basic usage.
       allow-clear
       tree-default-expand-all
       :tree-data="treeData"
+      :field-names="{
+        children: 'children',
+        value: 'value',
+        label: 'title',
+      }"
+      tree-node-filter-prop="title"
     >
       <template #suffixIcon><SmileOutlined /></template>
     </a-tree-select>
@@ -42,6 +48,12 @@ The most basic usage.
       show-arrow
       tree-default-expand-all
       :tree-data="treeData"
+      :field-names="{
+        children: 'children',
+        value: 'value',
+        label: 'title',
+      }"
+      tree-node-filter-prop="title"
     >
       <template #suffixIcon><SmileOutlined /></template>
     </a-tree-select>
diff --git a/site/src/i18n.js b/site/src/i18n.js
index be4afa414a..39bf8971f3 100644
--- a/site/src/i18n.js
+++ b/site/src/i18n.js
@@ -4,7 +4,7 @@ import zhCN from './locale/zh-CN';
 import { isZhCN } from './utils/util';
 
 const i18n = createI18n({
-  legacy: true,
+  legacy: false,
   locale: isZhCN(location.pathname) ? 'zh-CN' : 'en-US',
   fallbackLocale: 'en-US',
   messages: {

From d69050f08100df6b7e3a25b791c9e142fb6bc2af Mon Sep 17 00:00:00 2001
From: waldon <852727515@qq.com>
Date: Sun, 28 May 2023 10:50:08 +0800
Subject: [PATCH 2/4] =?UTF-8?q?revert:=20=E2=86=A9revert=20this=20config?=
 =?UTF-8?q?=20and=20create=20another=20pr=20to=20commit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 site/src/i18n.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/site/src/i18n.js b/site/src/i18n.js
index 39bf8971f3..be4afa414a 100644
--- a/site/src/i18n.js
+++ b/site/src/i18n.js
@@ -4,7 +4,7 @@ import zhCN from './locale/zh-CN';
 import { isZhCN } from './utils/util';
 
 const i18n = createI18n({
-  legacy: false,
+  legacy: true,
   locale: isZhCN(location.pathname) ? 'zh-CN' : 'en-US',
   fallbackLocale: 'en-US',
   messages: {

From 8fe7b279d4581a4f56749020857a45e8048bff08 Mon Sep 17 00:00:00 2001
From: waldon <852727515@qq.com>
Date: Thu, 8 Jun 2023 12:19:18 +0800
Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=E2=9C=A8checkbox=20label=20slot=20?=
 =?UTF-8?q?support=20use=20option=20label?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/checkbox/Group.tsx      | 2 +-
 components/checkbox/demo/group.vue | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/checkbox/Group.tsx b/components/checkbox/Group.tsx
index d096fd8ce5..03d463ba4f 100644
--- a/components/checkbox/Group.tsx
+++ b/components/checkbox/Group.tsx
@@ -100,7 +100,7 @@ export default defineComponent({
             onChange={option.onChange}
             class={`${groupPrefixCls}-item`}
           >
-            {option.label === undefined ? slots.label?.(option) : option.label}
+            {slots.label !== undefined ? slots.label?.(option) : option.label}
           </Checkbox>
         ));
       }
diff --git a/components/checkbox/demo/group.vue b/components/checkbox/demo/group.vue
index e2169312aa..32330689bb 100644
--- a/components/checkbox/demo/group.vue
+++ b/components/checkbox/demo/group.vue
@@ -27,8 +27,8 @@ Generate a group of checkboxes from an array
   <br />
   <br />
   <a-checkbox-group v-model:value="value4" :options="optionsWithDisabled" disabled>
-    <template #label="{ value }">
-      <span style="color: red">{{ value }}</span>
+    <template #label="{ label }">
+      <span style="color: red">{{ label }}</span>
     </template>
   </a-checkbox-group>
 </template>
@@ -42,7 +42,7 @@ const options = [
   { label: 'Orange', value: 'Orange' },
 ];
 const optionsWithDisabled = [
-  { value: 'Apple' },
+  { label: 'Apple', value: 'Apple' },
   { label: 'Pear', value: 'Pear' },
   { label: 'Orange', value: 'Orange', disabled: false },
 ];

From b6e5f90b11e4430ebec75ae26f7e5310e86dbdfe Mon Sep 17 00:00:00 2001
From: waldon <852727515@qq.com>
Date: Thu, 8 Jun 2023 15:47:35 +0800
Subject: [PATCH 4/4] =?UTF-8?q?test:=20=F0=9F=A7=AAupdate=20checkbox=20*.s?=
 =?UTF-8?q?nap=20file?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/checkbox/__tests__/__snapshots__/demo.test.js.snap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/checkbox/__tests__/__snapshots__/demo.test.js.snap b/components/checkbox/__tests__/__snapshots__/demo.test.js.snap
index 01ce052f82..f31cfb5a84 100644
--- a/components/checkbox/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/checkbox/__tests__/__snapshots__/demo.test.js.snap
@@ -39,7 +39,7 @@ exports[`renders ./components/checkbox/demo/group.vue correctly 1`] = `
 <div class="ant-checkbox-group"><label class="ant-checkbox-wrapper ant-checkbox-group-item"><span class="ant-checkbox"><input type="checkbox" class="ant-checkbox-input" value="Apple"><span class="ant-checkbox-inner"></span></span><span>Apple</span></label><label class="ant-checkbox-wrapper ant-checkbox-wrapper-checked ant-checkbox-group-item"><span class="ant-checkbox ant-checkbox-checked"><input type="checkbox" class="ant-checkbox-input" value="Pear"><span class="ant-checkbox-inner"></span></span><span>Pear</span></label><label class="ant-checkbox-wrapper ant-checkbox-group-item"><span class="ant-checkbox"><input type="checkbox" class="ant-checkbox-input" value="Orange"><span class="ant-checkbox-inner"></span></span><span>Orange</span></label></div>
 <br>
 <br>
-<div class="ant-checkbox-group"><label class="ant-checkbox-wrapper ant-checkbox-wrapper-checked ant-checkbox-wrapper-disabled ant-checkbox-group-item"><span class="ant-checkbox ant-checkbox-checked ant-checkbox-disabled"><input type="checkbox" disabled="" class="ant-checkbox-input" value="Apple"><span class="ant-checkbox-inner"></span></span><span><span style="color: red;">Apple</span></span></label><label class="ant-checkbox-wrapper ant-checkbox-wrapper-disabled ant-checkbox-group-item"><span class="ant-checkbox ant-checkbox-disabled"><input type="checkbox" disabled="" class="ant-checkbox-input" value="Pear"><span class="ant-checkbox-inner"></span></span><span>Pear</span></label><label class="ant-checkbox-wrapper ant-checkbox-wrapper-disabled ant-checkbox-group-item"><span class="ant-checkbox ant-checkbox-disabled"><input type="checkbox" disabled="" class="ant-checkbox-input" value="Orange"><span class="ant-checkbox-inner"></span></span><span>Orange</span></label></div>
+<div class="ant-checkbox-group"><label class="ant-checkbox-wrapper ant-checkbox-wrapper-checked ant-checkbox-wrapper-disabled ant-checkbox-group-item"><span class="ant-checkbox ant-checkbox-checked ant-checkbox-disabled"><input type="checkbox" disabled="" class="ant-checkbox-input" value="Apple"><span class="ant-checkbox-inner"></span></span><span><span style="color: red;">Apple</span></span></label><label class="ant-checkbox-wrapper ant-checkbox-wrapper-disabled ant-checkbox-group-item"><span class="ant-checkbox ant-checkbox-disabled"><input type="checkbox" disabled="" class="ant-checkbox-input" value="Pear"><span class="ant-checkbox-inner"></span></span><span><span style="color: red;">Pear</span></span></label><label class="ant-checkbox-wrapper ant-checkbox-wrapper-disabled ant-checkbox-group-item"><span class="ant-checkbox ant-checkbox-disabled"><input type="checkbox" disabled="" class="ant-checkbox-input" value="Orange"><span class="ant-checkbox-inner"></span></span><span><span style="color: red;">Orange</span></span></label></div>
 `;
 
 exports[`renders ./components/checkbox/demo/layout.vue correctly 1`] = `