From c7d964965d3abc12f19298ad2a059188fb5ef83c Mon Sep 17 00:00:00 2001
From: callmeyan <yaclty2@gmail.com>
Date: Tue, 31 Dec 2024 11:19:56 +0800
Subject: [PATCH] =?UTF-8?q?fixed=20=E7=A9=BA=E6=95=B0=E6=8D=AE=E6=97=B6?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E7=9A=84=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/button-batch.tsx | 2 +-
 src/pages/news/edit.tsx         | 3 ++-
 src/pages/news/index.tsx        | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/button-batch.tsx b/src/components/button-batch.tsx
index 04c4d2c..2b4f9cc 100644
--- a/src/components/button-batch.tsx
+++ b/src/components/button-batch.tsx
@@ -67,7 +67,7 @@ export default function ButtonBatch(
 
 	return (
 		<button disabled={loading} className={className} onClick={handleBtnClick}>
-			<span className={'text'}>{children}</span>
+			{icon ? <span className="text">{children}</span>:children}
 			{loading ? <LoadingOutlined/> : icon}
 		</button>
 	)
diff --git a/src/pages/news/edit.tsx b/src/pages/news/edit.tsx
index f056458..dba34fd 100644
--- a/src/pages/news/edit.tsx
+++ b/src/pages/news/edit.tsx
@@ -57,6 +57,7 @@ export default function NewEdit() {
 	}
 	const handleCheckAll = (checked: boolean) => {
 		setState({checkAll: checked})
+		if(!data?.list) return;
 		if (checked) {
 			setSelectedRowKeys(data?.list?.map(item => item.id) || [])
 		} else {
@@ -88,7 +89,7 @@ export default function NewEdit() {
 					<span className={'inline-block cursor-pointer mr-2'} onClick={() => {
 						handleCheckAll(!state.checkAll)
 					}}>全选</span>
-						<Checkbox checked={state.checkAll && selectedRowKeys.length == data?.list.length}
+						<Checkbox checked={state.checkAll && (!data?.list || selectedRowKeys.length == data?.list?.length)}
 						          onChange={e => {
 							          handleCheckAll(e.target.checked)
 						          }}/>
diff --git a/src/pages/news/index.tsx b/src/pages/news/index.tsx
index 1232164..b947528 100644
--- a/src/pages/news/index.tsx
+++ b/src/pages/news/index.tsx
@@ -175,7 +175,7 @@ export default function NewsIndex() {
 									<div><span>图片数: {item.img_num}</span></div>
 									<div><span>字数: {item.content_word_count}</span></div>
 									<div
-										className={`checkbox mt-1`}>
+										className={` mt-1`}>
 										{item.internal_article_id > 0 ?
 											<span className={"inline-block text-gray-600"}>已推送</span> :
 											<Checkbox checked={checkedId.includes(item.id)} onChange={() => {