From 842b8cc08a0369c7eb572d17001f6104080c205e Mon Sep 17 00:00:00 2001
From: sqzhou <zhousq809@163.com>
Date: Sat, 17 Sep 2022 21:45:29 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20transfer=20=E7=BB=93=E6=9E=9C=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E9=BB=98=E8=AE=A4=E6=8F=90=E7=A4=BA=E8=AF=AD=E5=8F=A5?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/amis-ui/src/components/ResultList.tsx      | 10 ++++++----
 packages/amis-ui/src/components/ResultTableList.tsx |  7 ++++---
 packages/amis-ui/src/components/ResultTreeList.tsx  | 12 +++++++-----
 packages/amis-ui/src/components/Transfer.tsx        |  9 +++++----
 packages/amis-ui/src/components/TransferSearch.tsx  |  4 ----
 5 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/packages/amis-ui/src/components/ResultList.tsx b/packages/amis-ui/src/components/ResultList.tsx
index 2ce5f10b5..04f4a6175 100644
--- a/packages/amis-ui/src/components/ResultList.tsx
+++ b/packages/amis-ui/src/components/ResultList.tsx
@@ -21,6 +21,7 @@ export interface ResultListProps extends ThemeProps, LocaleProps {
   sortable?: boolean;
   disabled?: boolean;
   title?: string;
+  searchPlaceholder?: string;
   placeholder: string;
   itemRender: (option: Option, states: ItemRenderStates) => JSX.Element;
   itemClassName?: string;
@@ -225,7 +226,8 @@ export class ResultList extends React.Component<
       itemClassName,
       sortable,
       labelField,
-      translate: __
+      translate: __,
+      placeholder
     } = this.props;
 
     return (
@@ -272,7 +274,7 @@ export class ResultList extends React.Component<
             ))}
           </div>
         ) : (
-          <div className={cx('Selections-placeholder')}>{__('Transfer.selectFromLeft')}</div>
+          <div className={cx('Selections-placeholder')}>{__(placeholder)}</div>
         )}
       </>
     );
@@ -286,7 +288,7 @@ export class ResultList extends React.Component<
       searchable,
       value,
       translate: __,
-      placeholder = __('Transfer.searchKeyword')
+      searchPlaceholder
     } = this.props;
 
     const {searchResult} = this.state;
@@ -296,7 +298,7 @@ export class ResultList extends React.Component<
         {title ? <div className={cx('Selections-title')}>{title}</div> : null}
         {searchable ? (
           <TransferSearch
-            placeholder={placeholder}
+            placeholder={searchPlaceholder}
             onSearch={this.search}
             onCancelSearch={this.clearSearch}
           />
diff --git a/packages/amis-ui/src/components/ResultTableList.tsx b/packages/amis-ui/src/components/ResultTableList.tsx
index 1f6eece11..e8cc2098a 100644
--- a/packages/amis-ui/src/components/ResultTableList.tsx
+++ b/packages/amis-ui/src/components/ResultTableList.tsx
@@ -17,6 +17,7 @@ import TableSelection from './TableSelection';
 
 export interface ResultTableSelectionProps extends BaseSelectionProps {
   title?: string;
+  searchPlaceholder?: string;
   placeholder?: string;
   searchable?: boolean;
   onSearch?: Function;
@@ -195,7 +196,7 @@ export class BaseResultTableSelection extends BaseSelection<
             }}
           />
         ) : (
-          <div className={cx('Selections-placeholder')}>{__('Transfer.selectFromLeft')}</div>
+          <div className={cx('Selections-placeholder')}>{__(placeholder)}</div>
         )}
       </div>
     );
@@ -208,7 +209,7 @@ export class BaseResultTableSelection extends BaseSelection<
       title,
       searchable,
       translate: __,
-      placeholder = __('Transfer.searchKeyword')
+      searchPlaceholder
     } = this.props;
 
     return (
@@ -216,7 +217,7 @@ export class BaseResultTableSelection extends BaseSelection<
         {title ? <div className={cx('Selections-title')}>{title}</div> : null}
         {searchable ? (
           <TransferSearch
-            placeholder={placeholder}
+            placeholder={searchPlaceholder}
             onSearch={this.search}
             onCancelSearch={this.clearSearch}
           />
diff --git a/packages/amis-ui/src/components/ResultTreeList.tsx b/packages/amis-ui/src/components/ResultTreeList.tsx
index e58237369..65d6a5ac5 100644
--- a/packages/amis-ui/src/components/ResultTreeList.tsx
+++ b/packages/amis-ui/src/components/ResultTreeList.tsx
@@ -2,7 +2,7 @@
  * 结果树(暂时不支持结果排序)
  */
 import React from 'react';
-import {cloneDeep, isEqual, omit} from 'lodash';
+import _, {cloneDeep, isEqual, omit} from 'lodash';
 
 import {Option, Options} from './Select';
 import {ThemeProps, themeable} from 'amis-core';
@@ -24,6 +24,7 @@ export interface ResultTreeListProps
   onSearch?: Function;
   onChange: (value: Array<Option>, optionModified?: boolean) => void;
   placeholder: string;
+  searchPlaceholder?: string;
   itemRender: (option: Option, states: ItemRenderStates) => JSX.Element;
   itemClassName?: string;
   cellRender?: (
@@ -256,7 +257,8 @@ export class BaseResultTreeList extends React.Component<
       value,
       valueField,
       itemRender,
-      translate: __
+      translate: __,
+      placeholder
     } = this.props;
 
     const {treeOptions, searching, searchTreeOptions} = this.state;
@@ -276,7 +278,7 @@ export class BaseResultTreeList extends React.Component<
             onDelete={(option: Option) => this.deleteTreeChecked(option)}
           />
         ) : (
-          <div className={cx('Selections-placeholder')}>{__('Transfer.selectFromLeft')}</div>
+          <div className={cx('Selections-placeholder')}>{__(placeholder)}</div>
         )}
       </div>
     );
@@ -289,7 +291,7 @@ export class BaseResultTreeList extends React.Component<
       title,
       searchable,
       translate: __,
-      placeholder = __('Transfer.searchKeyword')
+      searchPlaceholder
     } = this.props;
 
     return (
@@ -297,7 +299,7 @@ export class BaseResultTreeList extends React.Component<
         {title ? <div className={cx('Selections-title')}>{title}</div> : null}
         {searchable ? (
           <TransferSearch
-            placeholder={placeholder}
+            placeholder={searchPlaceholder}
             onSearch={this.search}
             onCancelSearch={this.clearSearch}
           />
diff --git a/packages/amis-ui/src/components/Transfer.tsx b/packages/amis-ui/src/components/Transfer.tsx
index d1f76253c..8d6bb1e91 100644
--- a/packages/amis-ui/src/components/Transfer.tsx
+++ b/packages/amis-ui/src/components/Transfer.tsx
@@ -630,15 +630,13 @@ export class Transfer<
       onResultSearch,
       sortable,
       labelField,
-      translate: __
+      translate: __,
+      placeholder = __('Transfer.selectFromLeft')
     } = this.props;
 
     const {resultSelectMode, isTreeDeferLoad} = this.state;
     const searchable = !isTreeDeferLoad && resultSearchable;
 
-    const placeholder =
-      resultSearchPlaceholder || __('Transfer.searchKeyword');
-
     switch (resultSelectMode) {
       case 'table':
         return (
@@ -654,6 +652,7 @@ export class Transfer<
             multiple={false}
             searchable={searchable}
             placeholder={placeholder}
+            searchPlaceholder={resultSearchPlaceholder}
             onSearch={onResultSearch}
           />
         );
@@ -669,6 +668,7 @@ export class Transfer<
             itemRender={resultItemRender}
             searchable={searchable}
             placeholder={placeholder}
+            searchPlaceholder={resultSearchPlaceholder}
             onSearch={onResultSearch}
             labelField={labelField}
           />
@@ -682,6 +682,7 @@ export class Transfer<
             value={value}
             onChange={onChange}
             placeholder={placeholder}
+            searchPlaceholder={resultSearchPlaceholder}
             itemRender={resultItemRender}
             searchable={searchable}
             onSearch={onResultSearch}
diff --git a/packages/amis-ui/src/components/TransferSearch.tsx b/packages/amis-ui/src/components/TransferSearch.tsx
index 2013abeb7..d3b710773 100644
--- a/packages/amis-ui/src/components/TransferSearch.tsx
+++ b/packages/amis-ui/src/components/TransferSearch.tsx
@@ -35,10 +35,6 @@ export class TransferSearch extends React.Component<
     return <span>{`${option.scopeLabel || ''}${option.label}`}</span>;
   }
 
-  static defaultProps: Pick<TransferSearchProps, 'placeholder'> = {
-    placeholder: 'placeholder.selectData'
-  };
-
   state: TransferSearchState = {
     inputValue: ''
   };