feat(tray): Implement system tray functionality and optimize related logic

- Add system tray icon and menu functions, support left-click to show/hide the main window
- Implement the function of exiting the application from the tray
- Optimize the tray construction logic, distinguish the icon processing between macOS and other platforms
- Remove duplicate window close event listening logic
- Adjust the Tauri configuration file, add compilation optimization options for development and release versions
- Update component declaration files, remove unused Naive UI component references
- Add internationalization support for the new connection button
- Implement the new form function for ZSet data type
- Improve the existence check logic for keys of various data types to avoid duplicate creation
- Optimize the data display interface for Hash and Set types, add search, reset and other functions
- Fix the issue where list-type data was not refreshed in time after deletion
- Supplement and improve Chinese and English internationalization copy content

Author: fuyoo

components.d.ts

@@ -12,11 +12,8 @@ declare module 'vue' {
     NAlert: typeof import('naive-ui')['NAlert']
     NBadge: typeof import('naive-ui')['NBadge']
     NButton: typeof import('naive-ui')['NButton']
-    NCard: typeof import('naive-ui')['NCard']
     NConfigProvider: typeof import('naive-ui')['NConfigProvider']
     NDataTable: typeof import('naive-ui')['NDataTable']
-    NDescription: typeof import('naive-ui')['NDescription']
-    NDescriptionItem: typeof import('naive-ui')['NDescriptionItem']
     NDescriptions: typeof import('naive-ui')['NDescriptions']
     NDescriptionsItem: typeof import('naive-ui')['NDescriptionsItem']
     NDialogProvider: typeof import('naive-ui')['NDialogProvider']
@@ -26,26 +23,20 @@ declare module 'vue' {
     NEmpty: typeof import('naive-ui')['NEmpty']
     NForm: typeof import('naive-ui')['NForm']
     NFormItem: typeof import('naive-ui')['NFormItem']
-    NH1: typeof import('naive-ui')['NH1']
-    NH3: typeof import('naive-ui')['NH3']
     NH4: typeof import('naive-ui')['NH4']
     NInput: typeof import('naive-ui')['NInput']
     NInputNumber: typeof import('naive-ui')['NInputNumber']
     NPopconfirm: typeof import('naive-ui')['NPopconfirm']
     NPopselect: typeof import('naive-ui')['NPopselect']
-    NRadio: typeof import('naive-ui')['NRadio']
     NRadioButton: typeof import('naive-ui')['NRadioButton']
     NRadioGroup: typeof import('naive-ui')['NRadioGroup']
     NScrollbar: typeof import('naive-ui')['NScrollbar']
     NSelect: typeof import('naive-ui')['NSelect']
     NSpace: typeof import('naive-ui')['NSpace']
     NSplit: typeof import('naive-ui')['NSplit']
-    NSwitch: typeof import('naive-ui')['NSwitch']
     NTab: typeof import('naive-ui')['NTab']
-    NTabPane: typeof import('naive-ui')['NTabPane']
     NTabs: typeof import('naive-ui')['NTabs']
     NTag: typeof import('naive-ui')['NTag']
-    NTest: typeof import('naive-ui')['NTest']
     NText: typeof import('naive-ui')['NText']
     NTree: typeof import('naive-ui')['NTree']
     RouterLink: typeof import('vue-router')['RouterLink']

src-tauri/Cargo.toml

@@ -32,3 +32,13 @@ tauri-plugin-window-state = "2"
 [features]
 # This feature is used for production builds or when a dev server is not specified, DO NOT REMOVE!!
 custom-protocol = ["tauri/custom-protocol"]
+
+[profile.dev]
+incremental = true # Compile your binary in smaller steps.
+
+[profile.release]
+codegen-units = 1 # Allows LLVM to perform better optimization.
+lto = true # Enables link-time-optimizations.
+opt-level = "s" # Prioritizes small binary size. Use `3` if you prefer speed.
+panic = "abort" # Higher performance by disabling panic handlers.
+strip = true # Ensures debug symbols are removed.

src-tauri/icons/logo.png

@@ -5,10 +5,12 @@ use crate::api::rdb::{ConnectionImpl, RedisClientImpl};
 use crate::api::resp::Response;
 use redis::{cmd, Value};
 use serde::{Deserialize, Serialize};
-use tauri::{Emitter, Manager, Result, command};
+use tauri::{command, Emitter, Manager, Result};
 pub mod rdb;
 pub mod resp;
 use crate::{r_404, r_error, r_ok};
+use tauri::menu::{Menu, MenuItem};
+use tauri::tray::{MouseButton, TrayIconBuilder, TrayIconEvent};
 
 async fn route<T: serde::Serialize>(f: impl Future<Output = Result<Response<T>>>) -> String {
     match f.await {
@@ -83,14 +85,77 @@ async fn do_query(connection_info: ConnectionImpl, data: &str) -> Result<Respons
     Ok(r_ok!(rdb::convert_to_string(resp)?, None))
 }
 
-#[derive(Serialize,Clone, Debug)]
+#[derive(Serialize, Clone, Debug)]
 pub struct Evt {
-  pub evt: String,
-  pub data: String,
+    pub evt: String,
+    pub data: String,
 }
 
 #[command]
-pub async fn emit_event(app: tauri::AppHandle,evt: String, data: String) -> Result<Response<()>> {
-  app.app_handle().emit("emit-event",Evt{evt,data})?;
-  Ok(r_ok!((), None))
-}
+pub async fn emit_event(app: tauri::AppHandle, evt: String, data: String) -> Result<Response<()>> {
+    app.app_handle().emit("emit-event", Evt { evt, data })?;
+    Ok(r_ok!((), None))
+}
+
+#[command]
+pub async fn quit(app: tauri::AppHandle) -> Result<Response<()>> {
+    app.app_handle().exit(0);
+    Ok(r_ok!((), None))
+}
+#[command]
+pub async fn init_tray(app: tauri::AppHandle, text: String) -> Result<Response<()>> {
+    let app = app.app_handle();
+    let quit_i = MenuItem::with_id(app, "quit", text, true, None::<&str>)?;
+    let menu = Menu::with_items(app, &[&quit_i])?;
+    if let Some(tray) = app.tray_by_id("1") {
+        tray.set_menu(Some(menu))?;
+        return Ok(r_ok!((), None));
+    }
+    let _tray = TrayIconBuilder::new()
+        .menu(&menu)
+        .on_menu_event(|app, event| match event.id.as_ref() {
+            "quit" => {
+                app.exit(0);
+            }
+            _ => {}
+        })
+        .show_menu_on_left_click(false)
+        .on_tray_icon_event(|tray, event| match event {
+            TrayIconEvent::Click { button, .. } => match button {
+                MouseButton::Left => {
+                    #[cfg(target_os = "macos")]
+                    let _ = tauri::AppHandle::show(tray.app_handle());
+                    #[cfg(not(target_os = "macos"))]
+                    {
+                        let win = tray
+                            .app_handle()
+                            .get_webview_window("main")
+                            .expect("no main window");
+                        win.show().expect("failed to show window");
+                        let _ = win.set_focus();
+                        let _ = win.unminimize();
+                    }
+                }
+                _ => {}
+            },
+            _ => {}
+        });
+    println!("{:?}", _tray.id());
+    // 设置图标
+    #[cfg(target_os = "macos")]
+    let icon = include_bytes!("../../icons/template.png");
+    #[cfg(target_os = "macos")]
+    let img = tauri::image::Image::from_bytes(icon)?;
+    #[cfg(target_os = "macos")]
+    let _tray = _tray.icon(img);
+    #[cfg(target_os = "macos")]
+    let _tray = _tray.icon_as_template(true);
+    #[cfg(not(target_os = "macos"))]
+    let icon = include_bytes!("../../icons/logo.png");
+    #[cfg(not(target_os = "macos"))]
+    let img = tauri::image::Image::from_bytes(icon)?;
+    #[cfg(not(target_os = "macos"))]
+    let _tray = _tray.icon(img);
+    _tray.build(app)?;
+    Ok(r_ok!((), None))
+}

src-tauri/src/api/mod.rs

@@ -5,63 +5,6 @@ use std::sync::Mutex;
 use tauri::webview::PageLoadEvent;
 use tauri::Manager;
 use tauri::RunEvent;
-use tauri::menu::{Menu, MenuItem};
-use tauri::tray::{TrayIconBuilder, TrayIconEvent, MouseButton};
-fn build_try(app: &mut tauri::App) -> Result<(), Box<dyn std::error::Error>> {
-    let quit_i = MenuItem::with_id(app, "quit", "关闭", true, None::<&str>)?;
-            let menu = Menu::with_items(app, &[&quit_i])?;
-
-            let _tray = TrayIconBuilder::new()
-                .menu(&menu)
-                .on_menu_event(|app, event| match event.id.as_ref() {
-                    "quit" => {
-                        println!("quit menu item was clicked");
-                        app.exit(0);
-                    }
-                    _ => {
-                        println!("menu item {:?} not handled", event.id);
-                    }
-                })
-                .show_menu_on_left_click(false)
-                .on_tray_icon_event(|tray, event| match event {
-                    TrayIconEvent::Click { button, .. } => match button {
-                        MouseButton::Left => {
-                            #[cfg(target_os = "macos")]
-                            let _ = tauri::AppHandle::show(tray.app_handle());
-                            #[cfg(not(target_os = "macos"))]
-                            {
-                             let win = tray.app_handle()
-                                .get_webview_window("main")
-                                .expect("no main window");
-                                win.show()
-                                .expect("failed to show window");
-                               let _ = win.set_focus();
-                               let _ = win.unminimize();
-                            }
-                           
-                        }
-                        _ => {}
-                    },
-                    _ => {}
-                });
-            // 设置图标
-            #[cfg(target_os = "macos")]
-            let icon = include_bytes!("../icons/template.png");
-            #[cfg(target_os = "macos")]
-            let img = tauri::image::Image::from_bytes(icon)?;
-            #[cfg(target_os = "macos")]
-            let _tray = _tray.icon(img);
-            #[cfg(target_os = "macos")]
-            let _tray = _tray.icon_as_template(true);
-             #[cfg(not(target_os = "macos"))]
-            let icon = include_bytes!("../icons/icon.png");
-             #[cfg(not(target_os = "macos"))]
-            let img = tauri::image::Image::from_bytes(icon)?;
-            #[cfg(not(target_os = "macos"))]
-            let _tray = _tray.icon(img);
-            _tray.build(app)?;
-            Ok(())
-}
 pub fn run() -> Result<(), Box<dyn std::error::Error>> {
     let mut app = tauri::Builder::default();
     // Access the system shell. Allows you to spawn child processes
@@ -80,20 +23,6 @@ pub fn run() -> Result<(), Box<dyn std::error::Error>> {
             )
             .build(),
     );
-    // listen window event
-    app = app.on_window_event(|win, evt| match evt {
-        tauri::WindowEvent::CloseRequested { api, .. } => match win.label() {
-            "main" => {
-                api.prevent_close();
-                #[cfg(target_os = "macos")]
-                let _ = tauri::AppHandle::hide(win.app_handle());
-                #[cfg(not(target_os = "macos"))]
-                let _ = win.hide();
-            }
-            _ => {}
-        },
-        _ => {}
-    });
     app = app.plugin(tauri_plugin_single_instance::init(|app, _args, _cwd| {
         let win = app.get_webview_window("main").expect("no main window");
         let _ = win.show();
@@ -109,21 +38,35 @@ pub fn run() -> Result<(), Box<dyn std::error::Error>> {
             Some(win) => {
                 let _ = win.set_decorations(false);
             }
-        }
-        build_try(_app)?;
+        };
 
         Ok(())
     });
 
-    app = app
-        .manage(Mutex::new(Vec::<tabs::Tab>::new()))
-        .invoke_handler(tauri::generate_handler![
-            api::request,
-            tabs::tab_list,
-            tabs::tab_change,
-            tabs::tab_close,
-            api::emit_event
-        ]);
+    // listen window event
+    app = app.on_window_event(|win, evt| match evt {
+        tauri::WindowEvent::CloseRequested { api, .. } => match win.label() {
+            "main" => {
+                api.prevent_close();
+                #[cfg(target_os = "macos")]
+                let _ = tauri::AppHandle::hide(win.app_handle());
+                #[cfg(not(target_os = "macos"))]
+                let _ = win.hide();
+            }
+            _ => {}
+        },
+        _ => {}
+    });
+    app = app.manage(Mutex::new(Vec::<tabs::Tab>::new()));
+    app = app.invoke_handler(tauri::generate_handler![
+        api::request,
+        tabs::tab_list,
+        tabs::tab_change,
+        tabs::tab_close,
+        api::emit_event,
+        api::quit,
+        api::init_tray,
+    ]);
     let app = app.on_page_load(|wb, evt| match evt.event() {
         PageLoadEvent::Finished => {
             let win = wb.window();

src-tauri/src/lib.rs

@@ -2,12 +2,14 @@
 import { RouterView } from 'vue-router'
 import { useLocate } from '@/i18n'
 import { useTheme } from './hooks/life';
+import { buildTray } from './tools/tray';
 const { theme, initThemeMode, listenChange } = useTheme()
 provide('theme', theme)
 const { locate, listenLocateChange } = useLocate()
 initThemeMode()
 listenChange()
 listenLocateChange()
+buildTray()
 </script>
 
 <template>

src/App.vue

@@ -1,10 +1,39 @@
 import NewStringForm from '@/pages/host/components/CoKeys/compoents/NewStringForm.vue'
 import NewSetForm from '@/pages/host/components/CoKeys/compoents/NewSetForm.vue'
+import NewZSetForm from '@/pages/host/components/CoKeys/compoents/NewZSetForm.vue'
 import NewListForm from '@/pages/host/components/CoKeys/compoents/NewListForm.vue'
 import NewHashForm from '@/pages/host/components/CoKeys/compoents/NewHashForm.vue'
 import type { DialogApiInjection } from 'naive-ui/es/dialog/src/DialogProvider'
+import { useReqStore } from '@/stores/req'
+import { useI18n } from 'vue-i18n'
+import { message } from '@/tools'
+import { useRoute, useRouter } from 'vue-router'
 
 export const useActions = (dialog: DialogApiInjection) => {
+  const req = useReqStore()
+  const { t } = useI18n()
+  const router = useRouter()
+  const route = useRoute()
+  const checkKeyIsExist = async (key: string, hideMsg?: boolean, jump?: boolean) => {
+    const resp = await req.reqWithHost({
+      path: `/cmd`,
+      data: ['exists', key],
+    })
+    if (resp.data === '0') {
+      // if key is not exist and jump is true, jump to new key page
+      if (jump) {
+        await router.replace(`/tab/${route.params.id}/main/database/none/${btoa(key)}`)
+        return
+      }
+      return Promise.resolve(false)
+    }
+    if (!hideMsg) {
+      message.destroyAll()
+      message.warning(t('tips.7', { key }))
+    }
+
+    return Promise.reject(t('tips.7', { key }))
+  }
   const options = [
     {
       label: 'string',
@@ -75,7 +104,7 @@ export const useActions = (dialog: DialogApiInjection) => {
     dialog.create({
       title: title ?? 'New Key',
       content: () => {
-        return <div>good job</div>
+        return <NewZSetForm></NewZSetForm>
       },
       draggable: true,
     })
@@ -88,5 +117,6 @@ export const useActions = (dialog: DialogApiInjection) => {
     addHashKey,
     addSetKey,
     addZSetKey,
+    checkKeyIsExist,
   }
 }