Merge pull request #7 from TanNhatCMS/fix

feat: 支持issue中的部分功能 EcoPasteHub#1074

Author: TanNhatCMS

package.json

@@ -90,7 +90,7 @@
 		"typescript-plugin-css-modules": "^5.1.0",
 		"unocss": "^0.63.6",
 		"unplugin-auto-import": "^0.18.6",
-		"vite": "^5.4.18"
+		"vite": "^5.4.19"
 	},
 	"simple-git-hooks": {
 		"commit-msg": "npx --no-install commitlint -e",

pnpm-lock.yaml

@@ -73,6 +73,8 @@ pub fn run() {
         .plugin(tauri_plugin_eco_window::init())
         // 自定义剪贴板插件
         .plugin(tauri_plugin_eco_clipboard::init())
+        // Shell 插件
+        .plugin(tauri_plugin_shell::init())
         // 自定义图片识别插件
         .plugin(tauri_plugin_eco_ocr::init())
         // 自定义粘贴的插件

src-tauri/src/lib.rs

@@ -34,6 +34,7 @@ export const LISTEN_KEY = {
 	CLOSE_DATABASE: "close-database",
 	TOGGLE_LISTEN_CLIPBOARD: "toggle-listen-clipboard",
 	CLIPBOARD_ITEM_FAVORITE: "clipboard-item-favorite",
+	CLIPBOARD_ITEM_COPY: "clipboard-item-copy",
 	ACTIVATE_BACK_TOP: "activate-back-top",
 };
 
@@ -43,4 +44,5 @@ export const PRESET_SHORTCUT = {
 	OPEN_PREFERENCES: isMac ? "meta.comma" : "ctrl.comma",
 	HIDE_WINDOW: isMac ? "meta.w" : "ctrl.w",
 	FIXED_WINDOW: isMac ? "meta.p" : "ctrl.p",
+	COPY: isMac ? "meta.c" : "ctrl.c",
 };

src/constants/index.ts

@@ -71,6 +71,7 @@
 					"delete_confirm": "Delete Confirmation",
 					"auto_sort": "Auto Sort",
 					"show_original_content": "Show Original Content",
+					"auto_deduplicate": "Auto Deduplicate",
 					"excluded_file_types": "Exclude specified file types",
 					"file_size_limit": "File size limit"
 				},
@@ -84,6 +85,7 @@
 					"delete_confirm": "Pop-up confirmation dialog when deleting clipboard contents",
 					"auto_sort": "Alignment to the top when copying existing content",
 					"show_original_content": "Whether to display the original content on mouse hover after adding a note",
+					"auto_deduplicate": "Automatically deduplicate when copying existing content",
 					"excluded_file_types": "When copying, do not save files of the specified type",
 					"excluded_file_types_placeholder": "For example .pdf .mp3",
 					"file_size_limit": "File size limit, default 0 means no limit, if the file exceeds the specified size, the file will not be saved when copying"
@@ -200,7 +202,8 @@
 				"back_to_top": "Back to Top",
 				"fixed_window": "Fixed Window",
 				"open_preferences": "Open Preferences",
-				"hide_window": "Hide Window"
+				"hide_window": "Hide Window",
+				"copy": "Copy"
 			}
 		},
 		"data_backup": {

src/locales/en-US.json

@@ -71,6 +71,7 @@
 					"delete_confirm": "削除確認",
 					"auto_sort": "自動整列",
 					"show_original_content": "元の内容を表示します",
+					"auto_deduplicate": "複製已存在的內容時自動去重"
 					"excluded_file_types": "指定された種類のファイルを除外する",
 					"file_size_limit": "ファイルサイズの制限"
 				},
@@ -84,6 +85,7 @@
 					"delete_confirm": "クリップボードの内容を削除する際に確認ダイアログを表示する",
 					"auto_sort": "既存の内容をコピーして最前面に配置する",
 					"show_original_content": "メモを追加した後、マウスをホバーしたときに元のコンテンツを表示するかどうか",
+					"auto_deduplicate": "複製已存在的內容時自動去重",
 					"excluded_file_types": "コピー時に、指定したタイプのファイルを保存しない",
 					"excluded_file_types_placeholder": "例えば .pdf .mp3",
 					"file_size_limit": "ファイルサイズの制限。デフォルトは 0 で制限なし。ファイルが指定されたサイズを超えると、コピー時にファイルは保存されません"
@@ -200,7 +202,8 @@
 				"back_to_top": "トップへ戻る",
 				"fixed_window": "固定ウィンドウ",
 				"open_preferences": "環境設定を開く",
-				"hide_window": "ウィンドウを隠す"
+				"hide_window": "ウィンドウを隠す",
+				"copy": "コピー"
 			}
 		},
 		"data_backup": {

src/locales/ja-JP.json

@@ -71,6 +71,7 @@
 					"delete_confirm": "删除确认",
 					"auto_sort": "自动排序",
 					"show_original_content": "显示原内容",
+					"auto_deduplicate": "自动去重",
 					"excluded_file_types": "排除指定类型文件",
 					"file_size_limit": "文件大小限制"
 				},
@@ -84,6 +85,7 @@
 					"delete_confirm": "删除剪贴板内容时弹出确认对话框",
 					"auto_sort": "复制已存在的内容时排列到最前面",
 					"show_original_content": "添加备注后，鼠标悬停时是否显示原内容",
+					"auto_deduplicate": "复制已存在的内容时，自动去重",
 					"excluded_file_types": "复制时，不保存指定类型的文件",
 					"excluded_file_types_placeholder": "例如 .pdf .mp3",
 					"file_size_limit": "文件大小限制，默认 0 不限制，超过指定大小则在复制时不保存该文件"
@@ -182,11 +184,13 @@
 					"open_clipboard": "打开剪贴板窗口",
 					"open_settings": "打开偏好设置窗口",
 					"quick_paste": "快速粘贴",
-					"paste_as_plain": "粘贴为纯文本"
+					"paste_as_plain": "粘贴为纯文本",
+					"open_notes": "打开备注界面"
 				},
 				"hints": {
 					"quick_paste": "隐藏窗口时，使用数字组合键快速粘贴前九项",
-					"paste_as_plain": "激活窗口时，将选中的内容粘贴为纯文本、OCR文本和路径"
+					"paste_as_plain": "激活窗口时，将选中的内容粘贴为纯文本、OCR文本和路径",
+					"open_notes": "激活窗口时，打开备注界面"
 				}
 			},
 			"preset": {
@@ -200,7 +204,8 @@
 				"back_to_top": "回到顶部",
 				"fixed_window": "固定窗口",
 				"open_preferences": "打开偏好设置",
-				"hide_window": "隐藏窗口"
+				"hide_window": "隐藏窗口",
+				"copy": "复制"
 			}
 		},
 		"data_backup": {

src/locales/zh-CN.json

@@ -71,6 +71,7 @@
 					"delete_confirm": "删除確認",
 					"auto_sort": "自動排序",
 					"show_original_content": "顯示原內容",
+					"auto_deduplicate": "自動去重",
 					"excluded_file_types": "排除指定類型文件",
 					"file_size_limit": "檔案大小限制"
 				},
@@ -84,6 +85,7 @@
 					"delete_confirm": "删除剪貼板內容時彈出確認對話方塊",
 					"auto_sort": "複製已存在的內容時排列到最前面",
 					"show_original_content": "添加備註後，滑鼠懸停時是否顯示原內容",
+					"auto_deduplicate": "複製已存在的內容時自動去重",
 					"excluded_file_types": "複製時，不保存指定類型的檔案",
 					"excluded_file_types_placeholder": "例如 .pdf .mp3",
 					"file_size_limit": "文件大小限制，預設 0 不限制，超過指定大小則在複製時不儲存該文件"
@@ -200,7 +202,8 @@
 				"back_to_top": "回到頂部",
 				"fixed_window": "固定視窗",
 				"open_preferences": "打開偏好設定",
-				"hide_window": "隱藏視窗"
+				"hide_window": "隱藏視窗",
+				"copy": "複製"
 			}
 		},
 		"data_backup": {

src/locales/zh-TW.json

@@ -69,6 +69,8 @@ const Group = () => {
 
 		setChecked(key);
 
+		// 切换时清空多选
+		state.selectedIds = [];
 		Object.assign(state, { group, favorite });
 	};
 

src/pages/Main/components/Group/index.tsx

@@ -119,7 +119,8 @@ const Header: FC<HeaderProps> = (props) => {
 				align="center"
 				gap={6}
 				className={clsx("opacity-0 transition group-hover:opacity-100", {
-					"opacity-100": state.activeId === id,
+					"opacity-100":
+						state.activeId === id || state.selectedIds.includes(id),
 				})}
 				onDoubleClick={(event) => event.stopPropagation()}
 			>