diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index a5554e5..c1c0b4e 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -8,7 +8,7 @@ use std::path::PathBuf; use tokio::sync::mpsc; use tauri::{AppHandle, Manager, State, Emitter}; use serde::{Serialize, Deserialize}; -use winget::{Software, list_all_software, list_updates, ensure_winget_dependencies}; +use winget::{Software, list_installed_software, list_updates, ensure_winget_dependencies}; use regex::Regex; #[derive(Clone, Serialize, Deserialize)] @@ -155,8 +155,8 @@ fn get_essentials(app: AppHandle) -> Option { } #[tauri::command] -async fn get_all_software(app: AppHandle) -> Vec { - tokio::task::spawn_blocking(move || list_all_software(&app)).await.unwrap_or_default() +async fn get_installed_software(app: AppHandle) -> Vec { + tokio::task::spawn_blocking(move || list_installed_software(&app)).await.unwrap_or_default() } #[tauri::command] @@ -308,7 +308,7 @@ pub fn run() { save_settings, sync_essentials, get_essentials, - get_all_software, + get_installed_software, get_updates, install_software, get_logs_history diff --git a/src-tauri/src/winget.rs b/src-tauri/src/winget.rs index dd793fe..db4731b 100644 --- a/src-tauri/src/winget.rs +++ b/src-tauri/src/winget.rs @@ -104,8 +104,8 @@ pub fn ensure_winget_dependencies(handle: &AppHandle) -> Result<(), String> { } } -pub fn list_all_software(handle: &AppHandle) -> Vec { - let log_id = format!("list-all-{}", chrono::Local::now().timestamp_millis()); +pub fn list_installed_software(handle: &AppHandle) -> Vec { + let log_id = format!("list-installed-{}", chrono::Local::now().timestamp_millis()); let script = r#" $OutputEncoding = [Console]::OutputEncoding = [System.Text.Encoding]::UTF8 $ErrorActionPreference = 'SilentlyContinue' @@ -125,7 +125,7 @@ pub fn list_all_software(handle: &AppHandle) -> Vec { } "#; - execute_powershell(handle, &log_id, "Fetch All Software", script) + execute_powershell(handle, &log_id, "Fetch Installed Software", script) } pub fn list_updates(handle: &AppHandle) -> Vec { diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue index 54a4440..f37e857 100644 --- a/src/components/Sidebar.vue +++ b/src/components/Sidebar.vue @@ -14,7 +14,7 @@ - + @@ -23,16 +23,6 @@ 软件更新 - - - - - - - - - 全部软件 -
diff --git a/src/router/index.ts b/src/router/index.ts index 90650cf..ae980c8 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -15,10 +15,6 @@ const router = createRouter({ path: '/updates', component: () => import('../views/Updates.vue') }, - { - path: '/all', - component: () => import('../views/AllSoftware.vue') - }, { path: '/logs', component: () => import('../views/Logs.vue') diff --git a/src/store/software.ts b/src/store/software.ts index 0ad84d8..2d36ccb 100644 --- a/src/store/software.ts +++ b/src/store/software.ts @@ -61,7 +61,6 @@ export const useSoftwareStore = defineStore('software', { }); }, sortedUpdates: (state) => [...state.updates].sort(sortByName), - sortedAllSoftware: (state) => [...state.allSoftware].sort(sortByName), isBusy: (state) => { const allItems = [...state.essentials, ...state.updates, ...state.allSoftware]; return allItems.some(item => item.status === 'pending' || item.status === 'installing'); @@ -159,16 +158,6 @@ export const useSoftwareStore = defineStore('software', { this.loading = false } }, - async fetchAll() { - if (this.isBusy) return; - this.loading = true - try { - const res = await invoke('get_all_software') - this.allSoftware = res as any[] - } finally { - this.loading = false - } - }, async syncDataIfNeeded(force = false) { if (this.isBusy) return; const now = Date.now(); @@ -187,7 +176,7 @@ export const useSoftwareStore = defineStore('software', { // 然后同步本地软件安装/更新状态，不再强制联网下载 JSON const [all, updates] = await Promise.all([ - invoke('get_all_software'), + invoke('get_installed_software'), invoke('get_updates') ]); diff --git a/src/views/AllSoftware.vue b/src/views/AllSoftware.vue deleted file mode 100644 index ebb3501..0000000 --- a/src/views/AllSoftware.vue +++ /dev/null @@ -1,190 +0,0 @@ - - - - -