From 74aebe57c68b78a77fd2b196e1eea3adecce5461 Mon Sep 17 00:00:00 2001
From: ybc <2483488988@qq.com>
Date: Fri, 8 Aug 2025 14:27:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=BA=86=E6=B0=94?=
 =?UTF-8?q?=E6=B3=A1=E7=A1=AE=E8=AE=A4=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ImageUploader.jsx | 63 ++++++++++++++++++--------------
 1 file changed, 36 insertions(+), 27 deletions(-)

diff --git a/src/components/ImageUploader.jsx b/src/components/ImageUploader.jsx
index c13eb92..46d82a7 100644
--- a/src/components/ImageUploader.jsx
+++ b/src/components/ImageUploader.jsx
@@ -1,5 +1,6 @@
 import { useEffect, useState } from "react";
-import { Upload, List, Modal } from "antd";
+import { Upload, List, Popconfirm } from "antd";
+
 import { UploadOutlined } from "@ant-design/icons";
 import { Image } from "antd";
 import { fetchJSON } from "@/utils/request";
@@ -108,30 +109,18 @@ export const ImageUploader = props => {
 	}, [key]);
 
 	// 处理删除操作
-	const handleDelete = file => {
-		Modal.confirm({
-			title: '确认删除',
-			content: '确定要删除这张图片吗？',
-			okText: '确认',
-			cancelText: '取消',
-			onOk: async () => {
-				const success = await deleteImage(file.encrypt_key);
-				if (success) {
-					const newImages = fileList.filter(item => item.encrypt_key !== file.encrypt_key);
-					if (props.onChange) {
-						props.onChange(newImages);
-					}
-					setFileList(newImages);
-					console.log("删除成功");
-				} else {
-					console.error("删除失败");
-				}
-			},
-			onCancel: () => {
-				// 用户点击取消，重新设置fileList以刷新Upload组件
-				setFileList([...fileList]);
-			},
-		});
+	const handleDelete = async file => {
+		const success = await deleteImage(file.encrypt_key);
+		if (success) {
+			const newImages = fileList.filter(item => item.encrypt_key !== file.encrypt_key);
+			if (props.onChange) {
+				props.onChange(newImages);
+			}
+			setFileList(newImages);
+			//console.log("删除成功");
+		} else {
+			//console.error("删除失败");
+		}
 	};
 
 	// 处理上传操作
@@ -176,9 +165,29 @@ export const ImageUploader = props => {
 		setPreviewOpen(true);
 	};
 
+	const handleRemove = file => {
+		// 返回 false 阻止默认的删除行为，让 Popconfirm 来处理
+		return false;
+	};
+
+	const itemRender = (originNode, file, fileList, actions) => {
+		return (
+			<Popconfirm
+				title="Confirm deletion"
+				description="Confirm deletion of this file?"
+				onConfirm={() => handleDelete(file)}
+				onCancel={() => setFileList([...fileList])}
+				okText="Yes"
+				cancelText="No"
+			>
+				{originNode}
+			</Popconfirm>
+		);
+	};
+
 	return (
 		<>
-			<Upload customRequest={handleUploadFile} multiple={true} onRemove={handleDelete} listType="picture-card" fileList={fileList} onPreview={handlePreview} onChange={handleChange}>
+			<Upload customRequest={handleUploadFile} multiple={true} onRemove={handleRemove} listType="picture-card" fileList={fileList} onPreview={handlePreview} onChange={handleChange} itemRender={itemRender}>
 				<div>
 					<UploadOutlined />
 					<div style={{ marginTop: 8 }}>上传图片</div>
@@ -245,4 +254,4 @@ export const ImageViewer = props => {
 	);
 };
 
-export default ImageUploader;
+export default ImageUploader;
\ No newline at end of file

From cd8c3b98ec7462b5a961a0e2da88396c3122ca85 Mon Sep 17 00:00:00 2001
From: ybc <2483488988@qq.com>
Date: Fri, 8 Aug 2025 14:45:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9C=89=E9=97=AE=E9=A2=98=E7=9A=84?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ImageUploader.jsx | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/components/ImageUploader.jsx b/src/components/ImageUploader.jsx
index 46d82a7..4a70aba 100644
--- a/src/components/ImageUploader.jsx
+++ b/src/components/ImageUploader.jsx
@@ -165,12 +165,8 @@ export const ImageUploader = props => {
 		setPreviewOpen(true);
 	};
 
-	const handleRemove = file => {
-		// 返回 false 阻止默认的删除行为，让 Popconfirm 来处理
-		return false;
-	};
-
-	const itemRender = (originNode, file, fileList, actions) => {
+	const handleRemove = file => {	
+		
 		return (
 			<Popconfirm
 				title="Confirm deletion"
@@ -180,14 +176,20 @@ export const ImageUploader = props => {
 				okText="Yes"
 				cancelText="No"
 			>
-				{originNode}
+			
 			</Popconfirm>
 		);
+		// 返回 false 阻止默认的删除行为，让 Popconfirm 来处理
+		return false;
+	};
+
+	const itemRender = (originNode, file, fileList, actions) => {
+
 	};
 
 	return (
 		<>
-			<Upload customRequest={handleUploadFile} multiple={true} onRemove={handleRemove} listType="picture-card" fileList={fileList} onPreview={handlePreview} onChange={handleChange} itemRender={itemRender}>
+			<Upload customRequest={handleUploadFile} multiple={true} onRemove={handleRemove} listType="picture-card" fileList={fileList} onPreview={handlePreview} onChange={handleChange} >
 				<div>
 					<UploadOutlined />
 					<div style={{ marginTop: 8 }}>上传图片</div>