From 54056aec3a23132434abd28400abeb137f174647 Mon Sep 17 00:00:00 2001
From: callmeyan <yaclty2@gmail.com>
Date: Sun, 2 Mar 2025 12:24:50 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20feat:=20=E6=96=B0=E5=A2=9E=20disableRem?=
 =?UTF-8?q?oveMessage=20=E5=B1=9E=E6=80=A7=E4=BB=A5=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/article/block.tsx | 6 ++++--
 src/components/article/group.tsx | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/article/block.tsx b/src/components/article/block.tsx
index bb2c795..ce5607f 100644
--- a/src/components/article/block.tsx
+++ b/src/components/article/block.tsx
@@ -16,6 +16,7 @@ type Props = {
 	blocks: BlockContent[];
 	editable?: boolean;
 	onChange?: (blocks: BlockContent[]) => void;
+	disableRemoveMessage?:string;
 	onRemove?: () => void;
 	onAdd?: (index:number,checkIndex:number) => void;
 	errorMessage?: string;
@@ -46,6 +47,7 @@ export default function ArticleBlock(
 		blocks: defaultBlocks,
 		editable,
 		onRemove,
+		disableRemoveMessage,
 		onAdd,
 		onChange,
 		index,
@@ -80,7 +82,7 @@ export default function ArticleBlock(
 			</div>
 			{editable && <div className="ml-2 flex items-center">
 				{
-					index > 0 ? <Popconfirm
+					disableRemoveMessage? <span></span> : <Popconfirm
 						rootClassName={'popconfirm-main'}
 						placement={'left'}
 						arrow={false}
@@ -93,7 +95,7 @@ export default function ArticleBlock(
                     <span className="article-action-icon hidden group-hover:block ml-1" title={t('news.edit_delete_group')}>
 	                    <IconDelete style={{fontSize: 24}}/>
 					</span>
-					</Popconfirm> : <span></span>
+					</Popconfirm>
 				}
             </div>}
 		</div>
diff --git a/src/components/article/group.tsx b/src/components/article/group.tsx
index 987b4f1..05c7c42 100644
--- a/src/components/article/group.tsx
+++ b/src/components/article/group.tsx
@@ -93,8 +93,9 @@ export default function ArticleGroup({groups, editable, onChange, errorMessage}:
 							onAdd={(_index,checkIndex) => {
 								handleAddGroup?.(_index ? _index :index + 1,checkIndex)
 							}}
+							disableRemoveMessage={groups.length <= 2?t('news.edit_notice_keep_1'):''}
 							onRemove={async () => {
-								if (groups.length == 1) {
+								if (groups.length <= 2) {
 									message.warning(t('news.edit_notice_keep_1'))
 									return;
 								}