From f8ae27f11ba484e04cb7216cae61e5df508a47af Mon Sep 17 00:00:00 2001
From: "Xc@centOs" <chinawraith@163.com>
Date: Fri, 1 Mar 2024 21:24:44 +0800
Subject: [PATCH] =?UTF-8?q?ListPro=E5=9C=A8=E6=B2=A1=E6=9C=89=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AEonReload=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=88=B7=E6=96=B0=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 es/components/list/toolBar/index.d.ts |  2 +-
 es/components/list/toolBar/index.js   | 15 ++++++++-------
 es/components/listPro/index.js        |  4 +---
 src/components/list/toolBar/index.tsx | 27 ++++++++++++++-------------
 src/components/listPro/index.tsx      |  4 +---
 5 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/es/components/list/toolBar/index.d.ts b/es/components/list/toolBar/index.d.ts
index 3903313c..5ec1d0a5 100644
--- a/es/components/list/toolBar/index.d.ts
+++ b/es/components/list/toolBar/index.d.ts
@@ -9,7 +9,7 @@ type ToolBarProps = {
     title?: React.ReactNode;
     buttonGroup?: buttonProps[];
     extraContent?: React.ReactNode;
-    reload: () => void;
+    reload?: () => void;
 };
 declare function ToolBar(props: ToolBarProps): React.JSX.Element;
 export default ToolBar;
diff --git a/es/components/list/toolBar/index.js b/es/components/list/toolBar/index.js
index 3e918fb7..13dcd927 100644
--- a/es/components/list/toolBar/index.js
+++ b/es/components/list/toolBar/index.js
@@ -14,13 +14,14 @@ function ToolBar(props) {
                 <Space align='center'>
                     {extraContent}
                     {buttonGroup && buttonGroup.length > 0 && (<ButtonGroup items={buttonGroup}/>)}
-                    <Tooltip title={features.locales.t('reload')}>
-                        <div className={Style.reloadIconBox} onClick={() => {
-            reload();
-        }}>
-                            <ReloadOutlined />
-                        </div>
-                    </Tooltip>
+                    {reload &&
+            <Tooltip title={features.locales.t('reload')}>
+                            <div className={Style.reloadIconBox} onClick={() => {
+                    reload();
+                }}>
+                                <ReloadOutlined />
+                            </div>
+                        </Tooltip>}
                     <ColumnSetting />
                 </Space>
             </div>
diff --git a/es/components/listPro/index.js b/es/components/listPro/index.js
index 6f7c916e..e37b4f0c 100644
--- a/es/components/listPro/index.js
+++ b/es/components/listPro/index.js
@@ -68,9 +68,7 @@ const ProList = (props) => {
             },
         }}>
             <div className={Style.container}>
-                {!isMobile && !hideDefaultButtons && (<ToolBar title={title} extraContent={extraContent} buttonGroup={buttonGroup} reload={() => {
-                onReload && onReload();
-            }}/>)}
+                {!isMobile && !hideDefaultButtons && (<ToolBar title={title} extraContent={extraContent} buttonGroup={buttonGroup} reload={onReload}/>)}
                 {isMobile && <ButtonGroup items={buttonGroup}/>}
                 <List entity={entity} extraActions={extraActions} onAction={onAction} disabledOp={disabledOp} attributes={attributes} data={!disableSerialNumber
             ? data?.map((ele, index) => {
diff --git a/src/components/list/toolBar/index.tsx b/src/components/list/toolBar/index.tsx
index 769752fb..e316685c 100644
--- a/src/components/list/toolBar/index.tsx
+++ b/src/components/list/toolBar/index.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Space, Tooltip, ButtonProps } from 'antd';
 import {
- ReloadOutlined
+    ReloadOutlined
 } from '@ant-design/icons';
 import ButtonGroup from '../buttonGroup';
 import ColumnSetting from '../columnSetting';
@@ -13,13 +13,13 @@ type buttonProps = {
     label: string;
     type?: ButtonProps['type'];
     onClick: () => void;
-} 
+}
 
 type ToolBarProps = {
     title?: React.ReactNode;
     buttonGroup?: buttonProps[];
     extraContent?: React.ReactNode;
-    reload: () => void;
+    reload?: () => void;
 }
 
 function ToolBar(props: ToolBarProps) {
@@ -35,16 +35,17 @@ function ToolBar(props: ToolBarProps) {
                     {buttonGroup && buttonGroup.length > 0 && (
                         <ButtonGroup items={buttonGroup} />
                     )}
-                    <Tooltip title={features.locales.t('reload')}>
-                        <div
-                            className={Style.reloadIconBox}
-                            onClick={() => {
-                                reload();
-                            }}
-                        >
-                            <ReloadOutlined />
-                        </div>
-                    </Tooltip>
+                    {reload &&
+                        <Tooltip title={features.locales.t('reload')}>
+                            <div
+                                className={Style.reloadIconBox}
+                                onClick={() => {
+                                    reload!();
+                                }}
+                            >
+                                <ReloadOutlined />
+                            </div>
+                        </Tooltip>}
                     <ColumnSetting />
                 </Space>
             </div>
diff --git a/src/components/listPro/index.tsx b/src/components/listPro/index.tsx
index 1d6748dc..50e2514b 100644
--- a/src/components/listPro/index.tsx
+++ b/src/components/listPro/index.tsx
@@ -162,9 +162,7 @@ const ProList = <ED2 extends ED, T extends keyof ED2>(props: Props<ED2, T>) => {
                         title={title}
                         extraContent={extraContent}
                         buttonGroup={buttonGroup}
-                        reload={() => {
-                            onReload && onReload();
-                        }}
+                        reload={onReload}
                     />
                 )}
                 {isMobile && <ButtonGroup items={buttonGroup} />}