diff --git a/electron/main/backend/install-manager.ts b/electron/main/backend/install-manager.ts index 6228207f..6229cb4e 100644 --- a/electron/main/backend/install-manager.ts +++ b/electron/main/backend/install-manager.ts @@ -306,12 +306,6 @@ ipcMain.on('remove-installed', async (_event, pkgname: string) => { webContents.send('remove-progress', chunk); }); - child.stderr.on('data', (data) => { - const chunk = data.toString(); - output += chunk; - webContents.send('remove-progress', chunk); - }); - child.on('close', (code) => { const success = code === 0; // 拼接json消息 diff --git a/src/App.vue b/src/App.vue index 3940fbc7..4f8bf1a1 100644 --- a/src/App.vue +++ b/src/App.vue @@ -301,7 +301,11 @@ const refreshInstalledApps = async () => { }; const requestUninstall = (app) => { - const target = apps.value.find(a => a.Pkgname === app.pkgname); + let target = null; + if (!app?.Pkgname) // TODO: 很丑,之后统一变量名 + target = apps.value.find(a => a.Pkgname === app.pkgname); + else + target = app; uninstallTargetApp.value = target; showUninstallModal.value = true; }; diff --git a/src/components/DownloadDetail.vue b/src/components/DownloadDetail.vue index 42792ab8..700809fb 100644 --- a/src/components/DownloadDetail.vue +++ b/src/components/DownloadDetail.vue @@ -5,7 +5,7 @@
-
diff --git a/src/modeuls/processInstall.ts b/src/modeuls/processInstall.ts index cfa40a45..46481b23 100644 --- a/src/modeuls/processInstall.ts +++ b/src/modeuls/processInstall.ts @@ -54,7 +54,7 @@ export const handleRetry = (download_: DownloadItem) => { }; export const handleUpgrade = (pkg: any) => { - if (!pkg.pkgname) return; + if (!pkg.Pkgname) return; downloadIdCounter += 1; const download: DownloadItem = {