From a343f8eed6b8019ecc580b15ac28d484b87990b5 Mon Sep 17 00:00:00 2001
From: zjt <zhenjintao1@jd.com>
Date: Thu, 14 Apr 2022 21:55:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E6=A1=86=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../formFields/treeSelect/index.tsx           | 24 +++++--------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/components/formFields/treeSelect/index.tsx b/src/components/formFields/treeSelect/index.tsx
index 00874d0..4ebb1bb 100644
--- a/src/components/formFields/treeSelect/index.tsx
+++ b/src/components/formFields/treeSelect/index.tsx
@@ -33,15 +33,14 @@ export interface DataOptionsConfig {
 export interface ManualOptionsConfig {
   from: 'manual'
   defaultIndex?: string | number
-  data?: treeTableDataConfig[]
+  data?: TreeSelectFieldOption[]
 }
-
-export interface treeTableDataConfig {
+export interface TreeSelectFieldOption {
+  key: string | number
   value: string | number
   title: string
-  children: treeTableDataConfig[]
+  children?: Array<TreeSelectFieldOption>
 }
-
 export interface InterfaceOptionsConfig {
   from: 'interface'
   interface?: InterfaceConfig
@@ -59,13 +58,6 @@ export interface InterfaceOptionsListConfig {
   childrenField?: string
 }
 
-export interface TreeSelectFieldOption {
-  key?: string | number
-  value: string | number,
-  title: ReactNode
-  children?: Array<TreeSelectFieldOption>
-}
-
 interface TreeSelectFieldState {
   interfaceOptionsData: TreeSelectFieldOption[]
 }
@@ -102,7 +94,7 @@ export default class TreeSelectField extends Field<TreeSelectFieldConfig, ITreeS
     return undefined
   }
 
-  formatTree = (treeList: Array<TreeSelectFieldOption>, value: string, title: string, children: string) => {
+  formatTree = (treeList: TreeSelectFieldOption[], value: string, title: string, children: string) => {
     const rsMenu: TreeSelectFieldOption[] = []
 
     treeList.forEach((val: TreeSelectFieldOption) => {
@@ -294,11 +286,7 @@ export default class TreeSelectField extends Field<TreeSelectFieldConfig, ITreeS
     } else {
       return (
         <React.Fragment>
-          {this.renderComponent({
-            value,
-            treeData: this.state.interfaceOptionsData,
-            onChange: async (value: TreeSelectValueType) => await this.props.onValueSet('', value, await this.validate(value))
-          })}
+          {this.renderComponent(props)}
         </React.Fragment>
       )
     }
-- 
Gitee


From 0634c3d9e409d213f803292bdf6d5afd598b3110 Mon Sep 17 00:00:00 2001
From: zjt <zhenjintao1@jd.com>
Date: Fri, 15 Apr 2022 15:52:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?perf:=20=E5=85=BC=E5=AE=B9treeSelect?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/formFields/treeSelect/index.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/formFields/treeSelect/index.tsx b/src/components/formFields/treeSelect/index.tsx
index 4ebb1bb..4f01e85 100644
--- a/src/components/formFields/treeSelect/index.tsx
+++ b/src/components/formFields/treeSelect/index.tsx
@@ -65,6 +65,7 @@ interface TreeSelectFieldState {
 type TreeSelectValueType = string | Array<string | number> | undefined
 
 export interface ITreeSelectField {
+  multiple?: boolean
   value: TreeSelectValueType,
   treeData: Array<TreeSelectFieldOption>
   titleColumn?: string
@@ -275,7 +276,7 @@ export default class TreeSelectField extends Field<TreeSelectFieldConfig, ITreeS
         console.warn('字符串分隔类型的树形选框的值需要是字符串。')
       }
     } else {
-      props.value = Array.isArray(value) ? value : undefined
+      props.value = Array.isArray(value) ? value : (mode === 'treeSelect' ? value : undefined)
     }
 
     if (mode === 'table') {
@@ -284,6 +285,7 @@ export default class TreeSelectField extends Field<TreeSelectFieldConfig, ITreeS
     } else if (mode === 'tree') {
       return this.renderTreeComponent(props)
     } else {
+      props.multiple = multiple === true || multiple?.type === 'array'
       return (
         <React.Fragment>
           {this.renderComponent(props)}
-- 
Gitee