From 097a06c50cf3f86036bc8302a707ef74aa04734d Mon Sep 17 00:00:00 2001
From: Daly Huang <Daly.Huang@walmart.com>
Date: Mon, 4 Dec 2023 17:37:57 +0800
Subject: [PATCH 01/11] =?UTF-8?q?=E6=96=B0=E5=A2=9ETransferPicker=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E6=94=AF=E6=8C=81=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../amis-ui/src/components/TransferPicker.tsx | 25 +++++++++++++++--
 packages/amis/src/renderers/Form/Transfer.tsx |  4 +--
 .../src/renderers/Form/TransferPicker.tsx     | 28 ++++++++++++++++++-
 3 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/packages/amis-ui/src/components/TransferPicker.tsx b/packages/amis-ui/src/components/TransferPicker.tsx
index 784e5ac9b3d..9e17be9fab0 100644
--- a/packages/amis-ui/src/components/TransferPicker.tsx
+++ b/packages/amis-ui/src/components/TransferPicker.tsx
@@ -23,7 +23,17 @@ export interface TransferPickerProps extends Omit<TransferProps, 'itemRender'> {
   popOverContainer?: any;
 }
 
-export class TransferPicker extends React.Component<TransferPickerProps> {
+export interface TransferPickerState {
+  tempValue?: any;
+}
+
+export class TransferPicker extends React.Component<
+  TransferPickerProps,
+  TransferPickerState
+> {
+  state: TransferPickerState = {
+    tempValue: null
+  };
   optionModified = false;
   @autobind
   handleConfirm(value: any) {
@@ -59,6 +69,15 @@ export class TransferPicker extends React.Component<TransferPickerProps> {
       ...rest
     } = this.props;
 
+    const tp = {
+      value: this.state.tempValue || value,
+      onChange: (value: any) => {
+        this.setState({
+          tempValue: value
+        });
+      }
+    };
+
     return (
       <PickerContainer
         title={__('Select.placeholder')}
@@ -84,13 +103,13 @@ export class TransferPicker extends React.Component<TransferPickerProps> {
                   this.optionModified = true;
                   setState({options, value});
                 } else {
-                  onChange(value);
+                  tp.onChange(value);
                 }
               }}
             />
           );
         }}
-        value={value}
+        value={tp.value}
         onConfirm={this.handleConfirm}
         size={size}
       >
diff --git a/packages/amis/src/renderers/Form/Transfer.tsx b/packages/amis/src/renderers/Form/Transfer.tsx
index 70143a6988b..c6b4671c96b 100644
--- a/packages/amis/src/renderers/Form/Transfer.tsx
+++ b/packages/amis/src/renderers/Form/Transfer.tsx
@@ -175,9 +175,9 @@ export interface TransferControlSchema
    */
   pagination?: {
     /** 是否左侧选项分页，默认不开启 */
-    enable: SchemaExpression;
+    enable: boolean;
     /** 分页组件CSS类名 */
-    className?: SchemaClassName;
+    className?: string;
     /** 是否开启前端分页 */
     loadDataOnce?: boolean;
   } & Pick<
diff --git a/packages/amis/src/renderers/Form/TransferPicker.tsx b/packages/amis/src/renderers/Form/TransferPicker.tsx
index 7dd789e51c6..d45cf63002b 100644
--- a/packages/amis/src/renderers/Form/TransferPicker.tsx
+++ b/packages/amis/src/renderers/Form/TransferPicker.tsx
@@ -7,6 +7,7 @@ import {autobind, createObject} from 'amis-core';
 import {ActionObject, toNumber} from 'amis-core';
 import {supportStatic} from './StaticHoc';
 import {isMobile} from 'amis-core';
+import pick from 'lodash/pick';
 
 /**
  * TransferPicker 穿梭器的弹框形态
@@ -93,7 +94,10 @@ export class TransferPickerRenderer extends BaseTransferRenderer<TabsTransferPro
       mobileUI,
       env,
       maxTagCount,
-      overflowTagPopover
+      overflowTagPopover,
+      pagination,
+      formItem,
+      popOverContainer
     } = this.props;
 
     // 目前 LeftOptions 没有接口可以动态加载
@@ -148,6 +152,28 @@ export class TransferPickerRenderer extends BaseTransferRenderer<TabsTransferPro
           popOverContainer={env?.getModalContainer}
           maxTagCount={maxTagCount}
           overflowTagPopover={overflowTagPopover}
+          pagination={{
+            ...pick(pagination, [
+              'className',
+              'layout',
+              'perPageAvailable',
+              'popOverContainerSelector'
+            ]),
+            enable:
+              !!formItem?.enableSourcePagination &&
+              (!selectMode ||
+                selectMode === 'list' ||
+                selectMode === 'table') &&
+              options.length > 0,
+            maxButtons: Number.isInteger(pagination?.maxButtons)
+              ? pagination?.maxButtons
+              : 5,
+            page: formItem?.sourcePageNum,
+            perPage: formItem?.sourcePerPageNum,
+            total: formItem?.sourceTotalNum,
+            popOverContainer: popOverContainer ?? env?.getModalContainer
+          }}
+          onPageChange={this.handlePageChange}
         />
 
         <Spinner

From 441172b1d7bd9413ca5b733498cd1e0a4b3ed0d8 Mon Sep 17 00:00:00 2001
From: Daly Huang <Daly.Huang@walmart.com>
Date: Thu, 7 Dec 2023 20:16:58 +0800
Subject: [PATCH 02/11] =?UTF-8?q?=E8=A7=A3=E5=86=B3transfer=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=BC=80=E5=90=AF=E5=88=86=E9=A1=B5=E6=97=B6=EF=BC=8C?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=8D=E6=94=AF=E6=8C=81=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82transferPicker=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=B4=E6=97=B6=E9=80=89=E4=B8=AD=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E9=A1=B5=E9=9D=A2=E5=90=8E=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=E9=9C=80=E6=B8=85=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/amis-ui/src/components/Transfer.tsx  | 115 +++++++++++++-----
 .../amis-ui/src/components/TransferPicker.tsx |   6 +
 packages/amis/src/renderers/Form/Transfer.tsx |  98 +++++++++------
 3 files changed, 154 insertions(+), 65 deletions(-)

diff --git a/packages/amis-ui/src/components/Transfer.tsx b/packages/amis-ui/src/components/Transfer.tsx
index 214a031e8ea..b070b5f8bce 100644
--- a/packages/amis-ui/src/components/Transfer.tsx
+++ b/packages/amis-ui/src/components/Transfer.tsx
@@ -79,8 +79,14 @@ export interface TransferProps
   onChange?: (value: Array<Option>, optionModified?: boolean) => void;
   onSearch?: (
     term: string,
-    setCancel: (cancel: () => void) => void
-  ) => Promise<Options | void>;
+    setCancel: (cancel: () => void) => void,
+    targePage?: {page: number; perPage?: number}
+  ) => Promise<{
+    items: Options;
+    page?: number;
+    perPage?: number;
+    total?: number;
+  } | void>;
 
   // 自定义选择框相关
   selectRender?: (
@@ -157,6 +163,7 @@ export interface TransferState {
   tempValue?: Array<Option> | Option;
   inputValue: string;
   searchResult: Options | null;
+  searchResultPage: {page?: number; perPage?: number; total?: number} | null;
   isTreeDeferLoad: boolean;
   resultSelectMode: 'list' | 'tree' | 'table';
 }
@@ -188,6 +195,7 @@ export class Transfer<
   state: TransferState = {
     inputValue: '',
     searchResult: null,
+    searchResultPage: null,
     isTreeDeferLoad: false,
     resultSelectMode: 'list'
   };
@@ -376,37 +384,50 @@ export class Transfer<
   handleSeachCancel() {
     this.setState({
       inputValue: '',
-      searchResult: null
+      searchResult: null,
+      searchResultPage: null
     });
   }
 
-  lazySearch = debounce(
-    async () => {
-      const {inputValue} = this.state;
-      if (!inputValue) {
-        return;
-      }
-      const onSearch = this.props.onSearch!;
-      let result = await onSearch(
-        inputValue,
-        (cancelExecutor: () => void) => (this.cancelSearch = cancelExecutor)
-      );
+  lazySearch = debounce(this.searchRequest, 250, {
+    trailing: true,
+    leading: false
+  });
 
-      if (this.unmounted) {
-        return;
-      }
+  @autobind
+  async searchRequest(page?: number, perPage?: number) {
+    const {pagination} = this.props;
+    const {inputValue} = this.state;
+    if (!inputValue) {
+      return;
+    }
 
-      if (!Array.isArray(result)) {
+    const onSearch = this.props.onSearch!;
+    let result = await onSearch(
+      inputValue,
+      (cancelExecutor: () => void) => (this.cancelSearch = cancelExecutor),
+      this.props.pagination?.enable
+        ? {page: page || 1, perPage: perPage || pagination?.perPage || 10}
+        : undefined
+    );
+
+    if (this.unmounted) {
+      return;
+    }
+
+    if (result) {
+      const {items, ...currentPage} = result;
+
+      if (!Array.isArray(items)) {
         throw new Error('onSearch 需要返回数组');
       }
 
       this.setState({
-        searchResult: result
+        searchResult: items,
+        searchResultPage: {...currentPage}
       });
-    },
-    250,
-    {trailing: true, leading: false}
-  );
+    }
+  }
 
   getFlattenArr(options: Array<Option>) {
     const {valueField = 'value'} = this.props;
@@ -478,6 +499,22 @@ export class Transfer<
         });
   }
 
+  @autobind
+  onPageChangeHandle(
+    page: number,
+    perPage?: number,
+    direction?: 'forward' | 'backward'
+  ) {
+    const {onPageChange, onSearch} = this.props;
+    const {searchResult, inputValue} = this.state;
+
+    if (searchResult) {
+      this.searchRequest(page, perPage);
+    } else if (onPageChange) {
+      onPageChange(page, perPage, direction);
+    }
+  }
+
   renderSelect(
     props: TransferProps & {
       onToggleAll?: () => void;
@@ -597,24 +634,42 @@ export class Transfer<
   }
 
   renderFooter() {
-    const {classnames: cx, pagination, onPageChange} = this.props;
+    const {classnames: cx, pagination} = this.props;
+    const {searchResult, searchResultPage} = this.state;
+
+    if (!pagination || !pagination?.enable) {
+      return null;
+    }
 
-    return pagination?.enable ? (
+    const currentPage =
+      searchResult && searchResultPage
+        ? {
+            page: searchResultPage.page,
+            perPage: searchResultPage.perPage,
+            total: searchResultPage.total
+          }
+        : {
+            page: pagination.page,
+            perPage: pagination.perPage,
+            total: pagination.total
+          };
+
+    return (
       <div className={cx('Transfer-footer')}>
         <Pagination
           className={cx('Transfer-footer-pagination', pagination.className)}
-          activePage={pagination.page}
-          perPage={pagination.perPage}
-          total={pagination.total}
+          activePage={currentPage.page}
+          perPage={currentPage.perPage}
+          total={currentPage.total}
           layout={pagination.layout}
           maxButtons={pagination.maxButtons}
           perPageAvailable={pagination.perPageAvailable}
           popOverContainer={pagination.popOverContainer}
           popOverContainerSelector={pagination.popOverContainerSelector}
-          onPageChange={onPageChange}
+          onPageChange={this.onPageChangeHandle}
         />
       </div>
-    ) : null;
+    );
   }
 
   renderSearchResult(props: TransferProps) {
diff --git a/packages/amis-ui/src/components/TransferPicker.tsx b/packages/amis-ui/src/components/TransferPicker.tsx
index 9e17be9fab0..d7e37c6c433 100644
--- a/packages/amis-ui/src/components/TransferPicker.tsx
+++ b/packages/amis-ui/src/components/TransferPicker.tsx
@@ -37,6 +37,9 @@ export class TransferPicker extends React.Component<
   optionModified = false;
   @autobind
   handleConfirm(value: any) {
+    this.setState({
+      tempValue: null
+    });
     this.props.onChange?.(value, this.optionModified);
     this.optionModified = false;
   }
@@ -48,6 +51,9 @@ export class TransferPicker extends React.Component<
 
   @autobind
   onBlur() {
+    this.setState({
+      tempValue: null
+    });
     this.props.onBlur?.();
   }
 
diff --git a/packages/amis/src/renderers/Form/Transfer.tsx b/packages/amis/src/renderers/Form/Transfer.tsx
index c6b4671c96b..520f47a8ce9 100644
--- a/packages/amis/src/renderers/Form/Transfer.tsx
+++ b/packages/amis/src/renderers/Form/Transfer.tsx
@@ -352,7 +352,11 @@ export class BaseTransferRenderer<
   }
 
   @autobind
-  async handleSearch(term: string, cancelExecutor: Function) {
+  async handleSearch(
+    term: string,
+    cancelExecutor: Function,
+    targePage?: {page: number; perPage?: number}
+  ) {
     const {
       searchApi,
       options,
@@ -368,7 +372,7 @@ export class BaseTransferRenderer<
       try {
         const payload = await env.fetcher(
           searchApi,
-          createObject(data, {term}),
+          createObject(data, {term, ...(targePage ? targePage : {})}),
           {
             cancelExecutor
           }
@@ -384,29 +388,46 @@ export class BaseTransferRenderer<
           throw new Error(__('CRUD.invalidArray'));
         }
 
-        return mapTree(result, item => {
-          let resolved: any = null;
-          const value = item[valueField || 'value'];
-
-          // 只有 value 值有意义的时候，再去找；否则直接返回
-          if (Array.isArray(options) && value !== null && value !== undefined) {
-            resolved = find(options, optionValueCompare(value, valueField));
-            if (item?.children) {
-              resolved = {
-                ...resolved,
-                children: item.children
-              };
+        let currentPage = {};
+        if (targePage) {
+          currentPage = {
+            page: payload.data.page,
+            perPage: targePage.perPage,
+            total: payload.data.count
+          };
+        }
+        return {
+          items: mapTree(result, item => {
+            let resolved: any = null;
+            const value = item[valueField || 'value'];
+
+            // 只有 value 值有意义的时候，再去找；否则直接返回
+            if (
+              Array.isArray(options) &&
+              value !== null &&
+              value !== undefined
+            ) {
+              resolved = find(options, optionValueCompare(value, valueField));
+              if (item?.children) {
+                resolved = {
+                  ...resolved,
+                  children: item.children
+                };
+              }
             }
-          }
 
-          return resolved || item;
-        });
+            return resolved || item;
+          }),
+          ...currentPage
+        };
       } catch (e) {
         if (!env.isCancel(e) && !searchApi.silent) {
           env.notify('error', e.message);
         }
 
-        return [];
+        return {
+          items: []
+        };
       }
     } else if (term) {
       const labelKey = (labelField as string) || 'label';
@@ -416,29 +437,36 @@ export class BaseTransferRenderer<
       if (filterOption) {
         const customFilterOption = getCustomFilterOption(filterOption);
         if (customFilterOption) {
-          return customFilterOption(options, term, option);
+          return {items: customFilterOption(options, term, option)};
         } else {
           env.notify('error', '自定义检索函数不符合要求');
-          return [];
+          return {items: []};
         }
       }
 
-      return filterTree(
-        options,
-        (option: Option, key: number, level: number, paths: Array<Option>) => {
-          return !!(
-            (Array.isArray(option.children) && option.children.length) ||
-            !!matchSorter([option].concat(paths), term, {
-              keys: [labelField || 'label', valueField || 'value'],
-              threshold: matchSorter.rankings.CONTAINS
-            }).length
-          );
-        },
-        0,
-        true
-      );
+      return {
+        items: filterTree(
+          options,
+          (
+            option: Option,
+            key: number,
+            level: number,
+            paths: Array<Option>
+          ) => {
+            return !!(
+              (Array.isArray(option.children) && option.children.length) ||
+              !!matchSorter([option].concat(paths), term, {
+                keys: [labelField || 'label', valueField || 'value'],
+                threshold: matchSorter.rankings.CONTAINS
+              }).length
+            );
+          },
+          0,
+          true
+        )
+      };
     } else {
-      return options;
+      return {items: options};
     }
   }
 

From b9b96b739714a29e7f6d88a84af8f07dd12fe7fb Mon Sep 17 00:00:00 2001
From: Daly Huang <Daly.Huang@walmart.com>
Date: Wed, 13 Dec 2023 14:11:51 +0800
Subject: [PATCH 03/11] =?UTF-8?q?TabsTransferPicker=E5=92=8CTransferPlcker?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=94=AF=E6=8C=81placeholder?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/amis-ui/src/components/TabsTransferPicker.tsx  | 3 ++-
 packages/amis-ui/src/components/TransferPicker.tsx      | 3 ++-
 packages/amis/src/renderers/Form/TabsTransferPicker.tsx | 4 +++-
 packages/amis/src/renderers/Form/TransferPicker.tsx     | 4 +++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/amis-ui/src/components/TabsTransferPicker.tsx b/packages/amis-ui/src/components/TabsTransferPicker.tsx
index ce59fc2f406..9bcc05c9119 100644
--- a/packages/amis-ui/src/components/TabsTransferPicker.tsx
+++ b/packages/amis-ui/src/components/TabsTransferPicker.tsx
@@ -51,6 +51,7 @@ export class TransferPicker extends React.Component<TabsTransferPickerProps> {
       popOverContainer,
       maxTagCount,
       overflowTagPopover,
+      placeholder,
       ...rest
     } = this.props;
 
@@ -100,7 +101,7 @@ export class TransferPicker extends React.Component<TabsTransferPickerProps> {
             result={value}
             onResultChange={onChange}
             onResultClick={onClick}
-            placeholder={__('Select.placeholder')}
+            placeholder={placeholder ?? __('Select.placeholder')}
             disabled={disabled}
             itemRender={option => (
               <span>{(option && option[labelField]) || 'undefiend'}</span>
diff --git a/packages/amis-ui/src/components/TransferPicker.tsx b/packages/amis-ui/src/components/TransferPicker.tsx
index d7e37c6c433..b851578ab19 100644
--- a/packages/amis-ui/src/components/TransferPicker.tsx
+++ b/packages/amis-ui/src/components/TransferPicker.tsx
@@ -72,6 +72,7 @@ export class TransferPicker extends React.Component<
       popOverContainer,
       maxTagCount,
       overflowTagPopover,
+      placeholder,
       ...rest
     } = this.props;
 
@@ -130,7 +131,7 @@ export class TransferPicker extends React.Component<
             result={value}
             onResultChange={onChange}
             onResultClick={onClick}
-            placeholder={__('Select.placeholder')}
+            placeholder={placeholder ?? __('Select.placeholder')}
             disabled={disabled}
             borderMode={borderMode}
             itemRender={option => (
diff --git a/packages/amis/src/renderers/Form/TabsTransferPicker.tsx b/packages/amis/src/renderers/Form/TabsTransferPicker.tsx
index 6554568ae7e..f2a188a433d 100644
--- a/packages/amis/src/renderers/Form/TabsTransferPicker.tsx
+++ b/packages/amis/src/renderers/Form/TabsTransferPicker.tsx
@@ -112,7 +112,8 @@ export class TabsTransferPickerRenderer extends BaseTabsTransferRenderer<TabsTra
       mobileUI,
       env,
       maxTagCount,
-      overflowTagPopover
+      overflowTagPopover,
+      placeholder
     } = this.props;
 
     return (
@@ -120,6 +121,7 @@ export class TabsTransferPickerRenderer extends BaseTabsTransferRenderer<TabsTra
         <TabsTransferPicker
           activeKey={this.state.activeKey}
           onTabChange={this.onTabChange}
+          placeholder={placeholder}
           value={selectedOptions}
           disabled={disabled}
           options={options}
diff --git a/packages/amis/src/renderers/Form/TransferPicker.tsx b/packages/amis/src/renderers/Form/TransferPicker.tsx
index d45cf63002b..ec59c0b0732 100644
--- a/packages/amis/src/renderers/Form/TransferPicker.tsx
+++ b/packages/amis/src/renderers/Form/TransferPicker.tsx
@@ -97,7 +97,8 @@ export class TransferPickerRenderer extends BaseTransferRenderer<TabsTransferPro
       overflowTagPopover,
       pagination,
       formItem,
-      popOverContainer
+      popOverContainer,
+      placeholder
     } = this.props;
 
     // 目前 LeftOptions 没有接口可以动态加载
@@ -119,6 +120,7 @@ export class TransferPickerRenderer extends BaseTransferRenderer<TabsTransferPro
     return (
       <div className={cx('TransferControl', className)}>
         <TransferPicker
+          placeholder={placeholder}
           borderMode={borderMode}
           selectMode={selectMode}
           value={selectedOptions}

From 5a3e017ebadc42f95ca25066b8c67e69497b4a50 Mon Sep 17 00:00:00 2001
From: Daly Huang <Daly.Huang@walmart.com>
Date: Thu, 14 Dec 2023 10:25:40 +0800
Subject: [PATCH 04/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8DTabsTransfer=E5=A4=9Ata?=
 =?UTF-8?q?b=E4=B8=8B=E7=9A=84=E6=90=9C=E7=B4=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/amis-ui/src/components/TabsTransfer.tsx  | 5 ++++-
 packages/amis/src/renderers/Form/TabsTransfer.tsx | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/amis-ui/src/components/TabsTransfer.tsx b/packages/amis-ui/src/components/TabsTransfer.tsx
index a6f93b50cb2..ab142e94eb0 100644
--- a/packages/amis-ui/src/components/TabsTransfer.tsx
+++ b/packages/amis-ui/src/components/TabsTransfer.tsx
@@ -127,7 +127,6 @@ export class TabsTransfer extends React.Component<
         if (!Array.isArray(result)) {
           throw new Error('onSearch 需要返回数组');
         }
-
         this.setState({
           searchResult: result
         });
@@ -171,12 +170,15 @@ export class TabsTransfer extends React.Component<
       onlyChildren,
       selectMode,
       loadingConfig,
+      activeKey,
+      options: optionsConfig,
       valueField = 'value',
       labelField = 'label'
     } = this.props;
     const options = searchResult || [];
     const mode = searchResultMode || selectMode; // 没有配置时默认和左侧选项展示形式一致
 
+    const activeTab = optionsConfig[activeKey];
     return mode === 'table' ? (
       <TableCheckboxes
         placeholder={noResultsText}
@@ -204,6 +206,7 @@ export class TabsTransfer extends React.Component<
         showIcon={false}
         multiple={true}
         cascade={true}
+        autoCheckChildren={activeTab.autoCheckChildren}
         itemRender={
           optionItemRender
             ? (item: Option, states: ItemRenderStates) =>
diff --git a/packages/amis/src/renderers/Form/TabsTransfer.tsx b/packages/amis/src/renderers/Form/TabsTransfer.tsx
index efe1c6d8858..cbc2d570273 100644
--- a/packages/amis/src/renderers/Form/TabsTransfer.tsx
+++ b/packages/amis/src/renderers/Form/TabsTransfer.tsx
@@ -121,7 +121,7 @@ export class BaseTabsTransferRenderer<
       }
     } else if (term) {
       return filterTree(
-        options,
+        option.children || options,
         (option: Option, key: number, level: number, paths: Array<Option>) => {
           return !!(
             (Array.isArray(option.children) && option.children.length) ||

From c9db91e6162ab95480c5186fdc4def9980d087b6 Mon Sep 17 00:00:00 2001
From: Daly Huang <Daly.Huang@walmart.com>
Date: Fri, 15 Dec 2023 13:15:47 +0800
Subject: [PATCH 05/11] =?UTF-8?q?Transfer=E7=BB=84=E4=BB=B6=E5=8F=8A?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=9A=84Tabs=E5=92=8CPicker=EF=BC=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0tree=E6=A8=A1=E5=BC=8F=E4=B8=8B=E7=9A=84initi?=
 =?UTF-8?q?allyOpen=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/amis-ui/src/components/TabsTransfer.tsx        | 6 ++++++
 packages/amis-ui/src/components/Transfer.tsx            | 8 +++++++-
 packages/amis/src/renderers/Form/TabsTransfer.tsx       | 4 +++-
 packages/amis/src/renderers/Form/TabsTransferPicker.tsx | 4 +++-
 packages/amis/src/renderers/Form/Transfer.tsx           | 9 ++++++++-
 packages/amis/src/renderers/Form/TransferPicker.tsx     | 4 +++-
 6 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/packages/amis-ui/src/components/TabsTransfer.tsx b/packages/amis-ui/src/components/TabsTransfer.tsx
index ab142e94eb0..854b779eab3 100644
--- a/packages/amis-ui/src/components/TabsTransfer.tsx
+++ b/packages/amis-ui/src/components/TabsTransfer.tsx
@@ -54,6 +54,10 @@ export interface TabsTransferProps
   ctx?: Record<string, any>;
   selectMode?: 'table' | 'list' | 'tree' | 'chained' | 'associated';
   searchable?: boolean;
+  /**
+   * 是否默认都展开
+   */
+  initiallyOpen?: boolean;
 }
 
 export interface TabsTransferState {
@@ -352,6 +356,7 @@ export class TabsTransfer extends React.Component<
       virtualThreshold,
       onlyChildren,
       loadingConfig,
+      initiallyOpen = true,
       valueField = 'value',
       labelField = 'label',
       deferField = 'defer'
@@ -403,6 +408,7 @@ export class TabsTransfer extends React.Component<
         virtualThreshold={virtualThreshold}
         valueField={valueField}
         labelField={labelField}
+        initiallyOpen={initiallyOpen}
       />
     ) : selectMode === 'chained' ? (
       <ChainedCheckboxes
diff --git a/packages/amis-ui/src/components/Transfer.tsx b/packages/amis-ui/src/components/Transfer.tsx
index b070b5f8bce..0368747529a 100644
--- a/packages/amis-ui/src/components/Transfer.tsx
+++ b/packages/amis-ui/src/components/Transfer.tsx
@@ -157,6 +157,10 @@ export interface TransferProps
     perPage?: number,
     direction?: 'forward' | 'backward'
   ) => void;
+  /**
+   * 是否默认都展开
+   */
+  initiallyOpen?: boolean;
 }
 
 export interface TransferState {
@@ -816,7 +820,8 @@ export class Transfer<
       loadingConfig,
       checkAll,
       checkAllLabel,
-      onlyChildren
+      onlyChildren,
+      initiallyOpen = true
     } = props;
 
     return selectMode === 'table' ? (
@@ -859,6 +864,7 @@ export class Transfer<
         loadingConfig={loadingConfig}
         checkAllLabel={checkAllLabel}
         checkAll={checkAll}
+        initiallyOpen={initiallyOpen}
       />
     ) : selectMode === 'chained' ? (
       <ChainedSelection
diff --git a/packages/amis/src/renderers/Form/TabsTransfer.tsx b/packages/amis/src/renderers/Form/TabsTransfer.tsx
index cbc2d570273..6345d8ad718 100644
--- a/packages/amis/src/renderers/Form/TabsTransfer.tsx
+++ b/packages/amis/src/renderers/Form/TabsTransfer.tsx
@@ -307,7 +307,8 @@ export class TabsTransferRenderer extends BaseTabsTransferRenderer<TabsTransferP
       valueTpl,
       menuTpl,
       data,
-      mobileUI
+      mobileUI,
+      initiallyOpen = true
     } = this.props;
 
     return (
@@ -341,6 +342,7 @@ export class TabsTransferRenderer extends BaseTabsTransferRenderer<TabsTransferP
           valueField={valueField}
           ctx={data}
           mobileUI={mobileUI}
+          initiallyOpen={initiallyOpen}
         />
 
         <Spinner
diff --git a/packages/amis/src/renderers/Form/TabsTransferPicker.tsx b/packages/amis/src/renderers/Form/TabsTransferPicker.tsx
index f2a188a433d..9bbb8e37e80 100644
--- a/packages/amis/src/renderers/Form/TabsTransferPicker.tsx
+++ b/packages/amis/src/renderers/Form/TabsTransferPicker.tsx
@@ -113,7 +113,8 @@ export class TabsTransferPickerRenderer extends BaseTabsTransferRenderer<TabsTra
       env,
       maxTagCount,
       overflowTagPopover,
-      placeholder
+      placeholder,
+      initiallyOpen = true
     } = this.props;
 
     return (
@@ -152,6 +153,7 @@ export class TabsTransferPickerRenderer extends BaseTabsTransferRenderer<TabsTra
           popOverContainer={env?.getModalContainer}
           maxTagCount={maxTagCount}
           overflowTagPopover={overflowTagPopover}
+          initiallyOpen={initiallyOpen}
         />
 
         <Spinner
diff --git a/packages/amis/src/renderers/Form/Transfer.tsx b/packages/amis/src/renderers/Form/Transfer.tsx
index 520f47a8ce9..e843031c4d1 100644
--- a/packages/amis/src/renderers/Form/Transfer.tsx
+++ b/packages/amis/src/renderers/Form/Transfer.tsx
@@ -169,6 +169,11 @@ export interface TransferControlSchema
    */
   onlyChildren?: boolean;
 
+  /**
+   * 是否默认都展开
+   */
+  initiallyOpen?: boolean;
+
   /**
    * 分页配置，selectMode为默认和table才会生效
    * @since 3.6.0
@@ -624,7 +629,8 @@ export class BaseTransferRenderer<
       pagination,
       formItem,
       env,
-      popOverContainer
+      popOverContainer,
+      initiallyOpen = true
     } = this.props;
 
     // 目前 LeftOptions 没有接口可以动态加载
@@ -710,6 +716,7 @@ export class BaseTransferRenderer<
             popOverContainer: popOverContainer ?? env?.getModalContainer
           }}
           onPageChange={this.handlePageChange}
+          initiallyOpen={initiallyOpen}
         />
 
         <Spinner
diff --git a/packages/amis/src/renderers/Form/TransferPicker.tsx b/packages/amis/src/renderers/Form/TransferPicker.tsx
index ec59c0b0732..a66b42270b5 100644
--- a/packages/amis/src/renderers/Form/TransferPicker.tsx
+++ b/packages/amis/src/renderers/Form/TransferPicker.tsx
@@ -98,7 +98,8 @@ export class TransferPickerRenderer extends BaseTransferRenderer<TabsTransferPro
       pagination,
       formItem,
       popOverContainer,
-      placeholder
+      placeholder,
+      initiallyOpen = true
     } = this.props;
 
     // 目前 LeftOptions 没有接口可以动态加载
@@ -176,6 +177,7 @@ export class TransferPickerRenderer extends BaseTransferRenderer<TabsTransferPro
             popOverContainer: popOverContainer ?? env?.getModalContainer
           }}
           onPageChange={this.handlePageChange}
+          initiallyOpen={initiallyOpen}
         />
 
         <Spinner

From 968616d88493c427cab5938926a84b02d32979e1 Mon Sep 17 00:00:00 2001
From: Daly Huang <Daly.Huang@walmart.com>
Date: Fri, 15 Dec 2023 13:20:11 +0800
Subject: [PATCH 06/11] =?UTF-8?q?CRUD=E7=BB=84=E4=BB=B6=E5=9C=A8loading?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=8B=EF=BC=8C=E6=89=80=E6=9C=89actions?=
 =?UTF-8?q?=E4=B8=8D=E8=A2=AB=E6=89=A7=E8=A1=8C=EF=BC=88=E5=9B=A0=E4=B8=BA?=
 =?UTF-8?q?loading=E9=81=AE=E7=BD=A9=E6=B2=A1=E6=9C=89=E6=8A=8A=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E9=81=AE=E4=BD=8F=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/amis/src/renderers/CRUD.tsx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/amis/src/renderers/CRUD.tsx b/packages/amis/src/renderers/CRUD.tsx
index 22043da11c6..2f7fc90a60e 100644
--- a/packages/amis/src/renderers/CRUD.tsx
+++ b/packages/amis/src/renderers/CRUD.tsx
@@ -760,6 +760,11 @@ export default class CRUD extends React.Component<CRUDProps, any> {
       stopAutoRefreshWhenModalIsOpen
     } = this.props;
 
+    if (store.loading) {
+      //由于curd的loading样式未遮罩按钮部分，如果处于加载中时不处理操作
+      return;
+    }
+
     if (action.actionType === 'dialog') {
       store.setCurrentAction(action);
       const idx: number = (ctx as any).index;

From 0102129734d001010da619a95c279d436535590d Mon Sep 17 00:00:00 2001
From: daly huang <weien601@gmail.com>
Date: Thu, 4 Jan 2024 18:23:59 +0800
Subject: [PATCH 07/11] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DTransfer?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6autoCheckChildren=E7=9A=84=E4=BC=A0=E5=8F=82?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/amis-ui/src/components/Transfer.tsx        | 6 ++++++
 packages/amis/src/renderers/Form/Transfer.tsx       | 7 ++++++-
 packages/amis/src/renderers/Form/TransferPicker.tsx | 2 ++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/packages/amis-ui/src/components/Transfer.tsx b/packages/amis-ui/src/components/Transfer.tsx
index 0368747529a..916792c7ae8 100644
--- a/packages/amis-ui/src/components/Transfer.tsx
+++ b/packages/amis-ui/src/components/Transfer.tsx
@@ -161,6 +161,10 @@ export interface TransferProps
    * 是否默认都展开
    */
   initiallyOpen?: boolean;
+  /**
+   * ui级联关系，true代表级联选中，false代表不级联，默认为true
+   */
+  autoCheckChildren?: boolean;
 }
 
 export interface TransferState {
@@ -821,6 +825,7 @@ export class Transfer<
       checkAll,
       checkAllLabel,
       onlyChildren,
+      autoCheckChildren = true,
       initiallyOpen = true
     } = props;
 
@@ -865,6 +870,7 @@ export class Transfer<
         checkAllLabel={checkAllLabel}
         checkAll={checkAll}
         initiallyOpen={initiallyOpen}
+        autoCheckChildren={autoCheckChildren}
       />
     ) : selectMode === 'chained' ? (
       <ChainedSelection
diff --git a/packages/amis/src/renderers/Form/Transfer.tsx b/packages/amis/src/renderers/Form/Transfer.tsx
index e843031c4d1..a994a0d7860 100644
--- a/packages/amis/src/renderers/Form/Transfer.tsx
+++ b/packages/amis/src/renderers/Form/Transfer.tsx
@@ -173,6 +173,10 @@ export interface TransferControlSchema
    * 是否默认都展开
    */
   initiallyOpen?: boolean;
+  /**
+   * ui级联关系，true代表级联选中，false代表不级联，默认为true
+   */
+  autoCheckChildren?: boolean;
 
   /**
    * 分页配置，selectMode为默认和table才会生效
@@ -630,6 +634,7 @@ export class BaseTransferRenderer<
       formItem,
       env,
       popOverContainer,
+      autoCheckChildren = true,
       initiallyOpen = true
     } = this.props;
 
@@ -717,8 +722,8 @@ export class BaseTransferRenderer<
           }}
           onPageChange={this.handlePageChange}
           initiallyOpen={initiallyOpen}
+          autoCheckChildren={autoCheckChildren}
         />
-
         <Spinner
           overlay
           key="info"
diff --git a/packages/amis/src/renderers/Form/TransferPicker.tsx b/packages/amis/src/renderers/Form/TransferPicker.tsx
index a66b42270b5..acde861aaec 100644
--- a/packages/amis/src/renderers/Form/TransferPicker.tsx
+++ b/packages/amis/src/renderers/Form/TransferPicker.tsx
@@ -99,6 +99,7 @@ export class TransferPickerRenderer extends BaseTransferRenderer<TabsTransferPro
       formItem,
       popOverContainer,
       placeholder,
+      autoCheckChildren = true,
       initiallyOpen = true
     } = this.props;
 
@@ -177,6 +178,7 @@ export class TransferPickerRenderer extends BaseTransferRenderer<TabsTransferPro
             popOverContainer: popOverContainer ?? env?.getModalContainer
           }}
           onPageChange={this.handlePageChange}
+          autoCheckChildren={autoCheckChildren}
           initiallyOpen={initiallyOpen}
         />
 

From 311da12bdf2fc23a3ad6c28b32a0667e4d25dfac Mon Sep 17 00:00:00 2001
From: daly huang <weien601@gmail.com>
Date: Mon, 22 Jan 2024 17:00:49 +0800
Subject: [PATCH 08/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9TransferState=E7=9A=84s?=
 =?UTF-8?q?earchResultPage=E5=8F=82=E6=95=B0=E4=B8=BA=E5=8F=AF=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/amis-ui/src/components/Transfer.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/amis-ui/src/components/Transfer.tsx b/packages/amis-ui/src/components/Transfer.tsx
index 916792c7ae8..209c53ecf28 100644
--- a/packages/amis-ui/src/components/Transfer.tsx
+++ b/packages/amis-ui/src/components/Transfer.tsx
@@ -171,7 +171,7 @@ export interface TransferState {
   tempValue?: Array<Option> | Option;
   inputValue: string;
   searchResult: Options | null;
-  searchResultPage: {page?: number; perPage?: number; total?: number} | null;
+  searchResultPage?: {page?: number; perPage?: number; total?: number} | null;
   isTreeDeferLoad: boolean;
   resultSelectMode: 'list' | 'tree' | 'table';
 }

From 467ecc93ba55991bcea9dfe78da8f8c191ccfc54 Mon Sep 17 00:00:00 2001
From: weien huang <weien601@gmail.com>
Date: Wed, 31 Jan 2024 13:23:34 +0800
Subject: [PATCH 09/11] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9Transfer?=
 =?UTF-8?q?=E7=9A=84search=E5=8F=82=E6=95=B0=E6=8B=BC=E9=94=99=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/amis-ui/src/components/Transfer.tsx  | 2 +-
 packages/amis/src/renderers/Form/Transfer.tsx | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/amis-ui/src/components/Transfer.tsx b/packages/amis-ui/src/components/Transfer.tsx
index 209c53ecf28..731ba1bc5ac 100644
--- a/packages/amis-ui/src/components/Transfer.tsx
+++ b/packages/amis-ui/src/components/Transfer.tsx
@@ -80,7 +80,7 @@ export interface TransferProps
   onSearch?: (
     term: string,
     setCancel: (cancel: () => void) => void,
-    targePage?: {page: number; perPage?: number}
+    targetPage?: {page: number; perPage?: number}
   ) => Promise<{
     items: Options;
     page?: number;
diff --git a/packages/amis/src/renderers/Form/Transfer.tsx b/packages/amis/src/renderers/Form/Transfer.tsx
index a994a0d7860..4f6b9acaa33 100644
--- a/packages/amis/src/renderers/Form/Transfer.tsx
+++ b/packages/amis/src/renderers/Form/Transfer.tsx
@@ -364,7 +364,7 @@ export class BaseTransferRenderer<
   async handleSearch(
     term: string,
     cancelExecutor: Function,
-    targePage?: {page: number; perPage?: number}
+    targetPage?: {page: number; perPage?: number}
   ) {
     const {
       searchApi,
@@ -381,7 +381,7 @@ export class BaseTransferRenderer<
       try {
         const payload = await env.fetcher(
           searchApi,
-          createObject(data, {term, ...(targePage ? targePage : {})}),
+          createObject(data, {term, ...(targetPage ? targetPage : {})}),
           {
             cancelExecutor
           }
@@ -398,10 +398,10 @@ export class BaseTransferRenderer<
         }
 
         let currentPage = {};
-        if (targePage) {
+        if (targetPage) {
           currentPage = {
             page: payload.data.page,
-            perPage: targePage.perPage,
+            perPage: targetPage.perPage,
             total: payload.data.count
           };
         }

From a829bf879bc9fd765b6841e5b6dced618c8af2b6 Mon Sep 17 00:00:00 2001
From: weien huang <weien601@gmail.com>
Date: Thu, 1 Feb 2024 11:32:47 +0800
Subject: [PATCH 10/11] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DTransfer?=
 =?UTF-8?q?=E5=92=8CTransferPicker=E7=9A=84pagination.enable=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E8=A1=A8=E8=BE=BE=E5=BC=8F=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/amis/src/renderers/Form/Transfer.tsx      | 12 +++++++++---
 .../amis/src/renderers/Form/TransferPicker.tsx     | 14 ++++++++++++--
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/packages/amis/src/renderers/Form/Transfer.tsx b/packages/amis/src/renderers/Form/Transfer.tsx
index 4f6b9acaa33..b8bc6bffc74 100644
--- a/packages/amis/src/renderers/Form/Transfer.tsx
+++ b/packages/amis/src/renderers/Form/Transfer.tsx
@@ -24,7 +24,8 @@ import {
   optionValueCompare,
   resolveVariable,
   ActionObject,
-  toNumber
+  toNumber,
+  evalExpression
 } from 'amis-core';
 import {SpinnerExtraProps, Transfer, Spinner, ResultList} from 'amis-ui';
 import {
@@ -184,7 +185,7 @@ export interface TransferControlSchema
    */
   pagination?: {
     /** 是否左侧选项分页，默认不开启 */
-    enable: boolean;
+    enable: SchemaExpression;
     /** 分页组件CSS类名 */
     className?: string;
     /** 是否开启前端分页 */
@@ -634,6 +635,7 @@ export class BaseTransferRenderer<
       formItem,
       env,
       popOverContainer,
+      data,
       autoCheckChildren = true,
       initiallyOpen = true
     } = this.props;
@@ -707,7 +709,11 @@ export class BaseTransferRenderer<
               'popOverContainerSelector'
             ]),
             enable:
-              !!formItem?.enableSourcePagination &&
+              (pagination && pagination.enable !== undefined
+                ? !!(typeof pagination.enable === 'string'
+                    ? evalExpression(pagination.enable, data)
+                    : pagination.enable)
+                : !!formItem?.enableSourcePagination) &&
               (!selectMode ||
                 selectMode === 'list' ||
                 selectMode === 'table') &&
diff --git a/packages/amis/src/renderers/Form/TransferPicker.tsx b/packages/amis/src/renderers/Form/TransferPicker.tsx
index acde861aaec..47e28b49af9 100644
--- a/packages/amis/src/renderers/Form/TransferPicker.tsx
+++ b/packages/amis/src/renderers/Form/TransferPicker.tsx
@@ -1,4 +1,9 @@
-import {OptionsControlProps, OptionsControl, resolveEventData} from 'amis-core';
+import {
+  OptionsControlProps,
+  OptionsControl,
+  resolveEventData,
+  evalExpression
+} from 'amis-core';
 import React from 'react';
 import {Spinner, SpinnerExtraProps} from 'amis-ui';
 import {BaseTransferRenderer, TransferControlSchema} from './Transfer';
@@ -97,6 +102,7 @@ export class TransferPickerRenderer extends BaseTransferRenderer<TabsTransferPro
       overflowTagPopover,
       pagination,
       formItem,
+      data,
       popOverContainer,
       placeholder,
       autoCheckChildren = true,
@@ -164,7 +170,11 @@ export class TransferPickerRenderer extends BaseTransferRenderer<TabsTransferPro
               'popOverContainerSelector'
             ]),
             enable:
-              !!formItem?.enableSourcePagination &&
+              (pagination && pagination.enable !== undefined
+                ? !!(typeof pagination.enable === 'string'
+                    ? evalExpression(pagination.enable, data)
+                    : pagination.enable)
+                : !!formItem?.enableSourcePagination) &&
               (!selectMode ||
                 selectMode === 'list' ||
                 selectMode === 'table') &&

From ef998d2086a0c003a1cfa114abb7c63641d3a406 Mon Sep 17 00:00:00 2001
From: weien huang <weien601@gmail.com>
Date: Thu, 1 Feb 2024 11:52:00 +0800
Subject: [PATCH 11/11] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DclassName?=
 =?UTF-8?q?=E7=9A=84=E7=B1=BB=E5=9E=8B=E4=B8=BASchemaClassName?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/amis/src/renderers/Form/Transfer.tsx       | 2 +-
 packages/amis/src/renderers/Form/TransferPicker.tsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/amis/src/renderers/Form/Transfer.tsx b/packages/amis/src/renderers/Form/Transfer.tsx
index b8bc6bffc74..234d7b015a3 100644
--- a/packages/amis/src/renderers/Form/Transfer.tsx
+++ b/packages/amis/src/renderers/Form/Transfer.tsx
@@ -187,7 +187,7 @@ export interface TransferControlSchema
     /** 是否左侧选项分页，默认不开启 */
     enable: SchemaExpression;
     /** 分页组件CSS类名 */
-    className?: string;
+    className?: SchemaClassName;
     /** 是否开启前端分页 */
     loadDataOnce?: boolean;
   } & Pick<
diff --git a/packages/amis/src/renderers/Form/TransferPicker.tsx b/packages/amis/src/renderers/Form/TransferPicker.tsx
index 47e28b49af9..c4647411cd8 100644
--- a/packages/amis/src/renderers/Form/TransferPicker.tsx
+++ b/packages/amis/src/renderers/Form/TransferPicker.tsx
@@ -164,11 +164,11 @@ export class TransferPickerRenderer extends BaseTransferRenderer<TabsTransferPro
           overflowTagPopover={overflowTagPopover}
           pagination={{
             ...pick(pagination, [
-              'className',
               'layout',
               'perPageAvailable',
               'popOverContainerSelector'
             ]),
+            className: pagination?.className as any,
             enable:
               (pagination && pagination.enable !== undefined
                 ? !!(typeof pagination.enable === 'string'