feat: 剪切板内容删除前确认

EcoPasteHub · Jun 14, 2024 · 0a8c043 · 0a8c043
1 parent 1570eda
commit 0a8c043
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 17 deletions.
diff --git a/src/pages/Clipboard/History/components/Popup/components/Text/index.tsx b/src/pages/Clipboard/History/components/Popup/components/Text/index.tsx
@@ -1,5 +1,4 @@
 import type { HistoryItem } from "@/types/database";
-import { open } from "@tauri-apps/api/shell";
 import { Typography } from "antd";
 import type { FC } from "react";
 
@@ -11,12 +10,9 @@ const Text: FC<HistoryItem> = (props) => {
 			const url = isURL(content) ? content : `mailto:${content}`;
 
 			return (
-				<span
-					className="cursor-pointer text-primary"
-					onMouseDown={() => open(url)}
-				>
+				<a href={url} target="_blank" rel="noreferrer">
 					{content}
-				</span>
+				</a>
 			);
 		}
 

diff --git a/src/pages/Clipboard/History/components/Popup/index.tsx b/src/pages/Clipboard/History/components/Popup/index.tsx
@@ -1,6 +1,6 @@
 import Icon from "@/components/Icon";
 import type { HistoryItem } from "@/types/database";
-import { Flex } from "antd";
+import { Flex, Popconfirm } from "antd";
 import clsx from "clsx";
 import { FixedSizeList } from "react-window";
 import {
@@ -143,13 +143,18 @@ const Popup = () => {
 									className={clsx({ "text-gold!": isCollected })}
 									onMouseDown={() => collect(historyData)}
 								/>
-								<Icon
-									hoverable
-									size={15}
-									name="i-iconamoon:trash-simple"
-									className="hover:text-red!"
-									onMouseDown={() => deleteItem(id!)}
-								/>
+								<Popconfirm
+									title="确定要删除吗？"
+									placement="left"
+									onConfirm={() => deleteItem(id!)}
+								>
+									<Icon
+										hoverable
+										size={15}
+										name="i-iconamoon:trash-simple"
+										className="hover:text-red!"
+									/>
+								</Popconfirm>
 							</Flex>
 						</Flex>
 

diff --git a/src/pages/Clipboard/History/index.tsx b/src/pages/Clipboard/History/index.tsx
@@ -73,12 +73,10 @@ const ClipboardHistory = () => {
 
 		if (!clipboardStore.capacity) return;
 
-		const maxMinute = clipboardStore.capacity * 24 * 60;
-
 		for (const item of list) {
 			const { id, createTime } = item;
 
-			if (dayjs().diff(createTime, "minutes") > maxMinute) {
+			if (dayjs().diff(createTime, "days") >= clipboardStore.capacity) {
 				deleteSQL("history", id);
 			}
 		}