spark-store-project/spark-store
15
0
Fork 0
mirror of https://gitee.com/spark-store-project/spark-store synced 2026-04-26 09:20:18 +08:00
Code Issues 1 Packages Projects Releases Wiki Activity

update:修复github工作流问题

Browse Source
This commit is contained in:
momen
2026-03-11 09:38:28 +08:00
parent a2671e2968
commit 5bc68f5a9a
11 changed files with 183 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

155
src/App.vue
View File

@@ -163,7 +163,6 @@ import {
handleInstall,
handleRetry,
handleUpgrade,
handleRemove,
} from "./modules/processInstall";
import type {
App,
@@ -171,6 +170,9 @@ import type {
DownloadItem,
UpdateAppItem,
ChannelPayload,
CategoryInfo,
HomeLink,
HomeList,
} from "./global/typedefinition";
import type { Ref } from "vue";
import type { IpcRendererEvent } from "electron";
@@ -211,7 +213,7 @@ const isDarkTheme = computed(() => {
return themeMode.value === "dark";
});
const categories: Ref<Record<string, any>> = ref({});
const categories: Ref<Record<string, CategoryInfo>> = ref({});
const apps: Ref<App[]> = ref([]);
const activeCategory = ref("home");
const searchQuery = ref("");
@@ -237,12 +239,17 @@ const showUninstallModal = ref(false);
const uninstallTargetApp: Ref<App | null> = ref(null);
// 缓存不同模式的数据
const storeCache = ref<Record<string, {
apps: App[];
categories: Record<string, any>;
homeLinks: any[];
homeLists: any[];
}>>({});
const storeCache = ref<
Record<
string,
{
apps: App[];
categories: Record<string, CategoryInfo>;
homeLinks: HomeLink[];
homeLists: HomeList[];
}
>
>({});
const saveToCache = (mode: string) => {
storeCache.value[mode] = {
@@ -270,14 +277,14 @@ watch(currentStoreMode, async (newMode, oldMode) => {
if (oldMode) {
saveToCache(oldMode);
}
if (!restoreFromCache(newMode)) {
// 如果没有缓存，清空当前状态并重新加载
apps.value = [];
categories.value = {};
homeLinks.value = [];
homeLists.value = [];
loading.value = true;
await loadCategories();
await Promise.all([
@@ -392,45 +399,51 @@ const selectCategory = (category: string) => {
activeCategory.value = category;
searchQuery.value = "";
isSidebarOpen.value = false;
if (category === "home" && homeLinks.value.length === 0 && homeLists.value.length === 0) {
if (
category === "home" &&
homeLinks.value.length === 0 &&
homeLists.value.length === 0
) {
loadHome();
}
};
const openDetail = (app: App | Record<string, unknown>) => {
// 提取 pkgname（必须存在）
const pkgname = (app as any).pkgname;
const pkgname = (app as Record<string, unknown>).pkgname as string;
if (!pkgname) {
console.warn('openDetail: 缺少 pkgname', app);
console.warn("openDetail: 缺少 pkgname", app);
return;
}
// 首先尝试从当前已经处理好（合并/筛选）的 filteredApps 中查找，以便获取 isMerged 状态等
let fullApp = filteredApps.value.find(a => a.pkgname === pkgname);
let fullApp = filteredApps.value.find((a) => a.pkgname === pkgname);
// 如果没找到（可能是从已安装列表之类的其他入口打开的），回退到全局 apps 中查找完整 App
if (!fullApp) {
fullApp = apps.value.find(a => a.pkgname === pkgname);
fullApp = apps.value.find((a) => a.pkgname === pkgname);
}
if (!fullApp) {
// 构造一个最小可用的 App 对象
fullApp = {
name: (app as any).name || '',
name: ((app as Record<string, unknown>).name as string) || "",
pkgname: pkgname,
version: (app as any).version || '',
filename: (app as any).filename || '',
category: (app as any).category || 'unknown',
torrent_address: '',
author: '',
contributor: '',
website: '',
update: '',
size: '',
more: (app as any).more || '',
tags: '',
version: ((app as Record<string, unknown>).version as string) || "",
filename: ((app as Record<string, unknown>).filename as string) || "",
category:
((app as Record<string, unknown>).category as string) || "unknown",
torrent_address: "",
author: "",
contributor: "",
website: "",
update: "",
size: "",
more: ((app as Record<string, unknown>).more as string) || "",
tags: "",
img_urls: [],
icons: '',
origin: (app as any).origin || 'apm',
currentStatus: 'not-installed',
icons: "",
origin:
((app as Record<string, unknown>).origin as "spark" | "apm") || "apm",
currentStatus: "not-installed",
} as App;
}
@@ -487,10 +500,8 @@ const closeScreenPreview = () => {
};
// Home data
const homeLinks = ref<Record<string, unknown>[]>([]);
const homeLists = ref<
Array<{ title: string; apps: Record<string, unknown>[] }>
>([]);
const homeLinks = ref<HomeLink[]>([]);
const homeLists = ref<HomeList[]>([]);
const homeLoading = ref(false);
const homeError = ref("");
@@ -517,7 +528,10 @@ const loadHome = async () => {
const res = await fetch(cacheBuster(`${base}/homelinks.json`));
if (res.ok) {
const links = await res.json();
const taggedLinks = links.map((l: any) => ({ ...l, origin: mode }));
const taggedLinks = links.map((l: HomeLink) => ({
...l,
origin: mode,
}));
homeLinks.value.push(...taggedLinks);
}
} catch (e) {
@@ -538,7 +552,7 @@ const loadHome = async () => {
const appsJson = await r.json();
const rawApps = appsJson || [];
const apps = await Promise.all(
rawApps.map(async (a: any) => {
rawApps.map(async (a: Record<string, string>) => {
const baseApp = {
name: a.Name || a.name || a.Pkgname || a.PkgName || "",
pkgname: a.Pkgname || a.pkgname || "",
@@ -648,18 +662,20 @@ const refreshUpgradableApps = async () => {
return;
}
// eslint-disable-next-line @typescript-eslint/no-explicit-any
upgradableApps.value = (result.apps || []).map((app: any) => ({
...app,
// Map properties if needed or assume main matches App interface except field names might differ
// For now assuming result.apps returns objects compatible with App for core fields,
// but let's normalize just in case if main returns different structure.
name: app.name || app.Name || "",
pkgname: app.pkgname || app.Pkgname || "",
version: app.newVersion || app.version || "",
category: app.category || "unknown",
selected: false,
upgrading: false,
}));
upgradableApps.value = (result.apps || []).map(
(app: Record<string, string>) => ({
...app,
// Map properties if needed or assume main matches App interface except field names might differ
// For now assuming result.apps returns objects compatible with App for core fields,
// but let's normalize just in case if main returns different structure.
name: app.name || app.Name || "",
pkgname: app.pkgname || app.Pkgname || "",
version: app.newVersion || app.version || "",
category: app.category || "unknown",
selected: false,
upgrading: false,
}),
);
} catch (error: unknown) {
upgradableApps.value = [];
updateError.value = (error as Error)?.message || "检查更新失败";
@@ -778,21 +794,9 @@ const refreshInstalledApps = async () => {
};
const requestUninstall = (app: App) => {
let target = null;
target = apps.value.find((a) => a.pkgname === app.pkgname) || app;
if (target) {
uninstallTargetApp.value = target as App;
showUninstallModal.value = true;
// TODO: 挪到卸载完成ipc回调里面
removeDownloadItem(app.pkgname);
}
};
const requestUninstallFromDetail = () => {
if (currentApp.value) {
requestUninstall(currentApp.value);
}
uninstallTargetApp.value = app;
showUninstallModal.value = true;
removeDownloadItem(app.pkgname);
};
const onDetailRemove = (app: App) => {
@@ -820,7 +824,11 @@ const onUninstallSuccess = () => {
};
const installCompleteCallback = (pkgname?: string, status?: string) => {
if (currentApp.value && (!pkgname || currentApp.value.pkgname === pkgname) && status === "completed") {
if (
currentApp.value &&
(!pkgname || currentApp.value.pkgname === pkgname) &&
status === "completed"
) {
checkAppInstalled(currentApp.value);
}
};
@@ -926,8 +934,11 @@ const loadCategories = async () => {
mode === "spark"
? arch.replace("-apm", "-store")
: arch.replace("-store", "-apm");
const path = mode === "spark" ? "/store/categories.json" : `/${finalArch}/categories.json`;
const path =
mode === "spark"
? "/store/categories.json"
: `/${finalArch}/categories.json`;
try {
const response = await axiosInstance.get(cacheBuster(path));
const data = response.data;
@@ -965,7 +976,9 @@ const loadApps = async (onFirstBatch?: () => void) => {
await Promise.all(
categoriesList.map(async (category) => {
const catInfo = categories.value[category];
const origins: string[] = catInfo.origins || (catInfo.origin ? [catInfo.origin] : []);
if (!catInfo) return;
const origins = (catInfo.origins ||
(catInfo.origin ? [catInfo.origin] : [])) as string[];
await Promise.all(
origins.map(async (mode) => {
@@ -1000,7 +1013,7 @@ const loadApps = async (onFirstBatch?: () => void) => {
tags: appJson.Tags,
img_urls:
typeof appJson.img_urls === "string"
? JSON.parse(appJson.img_urls)
? (JSON.parse(appJson.img_urls) as string[])
: appJson.img_urls,
icons: appJson.icons,
category: category,
@@ -1017,9 +1030,11 @@ const loadApps = async (onFirstBatch?: () => void) => {
onFirstBatch();
}
} catch (error) {
logger.warn(`加载分类 ${category} 来源 ${mode} 最终失败: ${error}`);
logger.warn(
`加载分类 ${category} 来源 ${mode} 最终失败: ${error}`,
);
}
})
}),
);
}),
);

8
src/components/AppCard.vue
View File

@@ -33,7 +33,13 @@
: 'bg-blue-100 text-blue-600 dark:bg-blue-900/30 dark:text-blue-400',
]"
>
{{ app.isMerged ? "Spark/APM" : app.origin === "spark" ? "Spark" : "APM" }}
{{
app.isMerged
? "Spark/APM"
: app.origin === "spark"
? "Spark"
: "APM"
}}
</span>
</div>
<div class="text-sm text-slate-500 dark:text-slate-400">

25
src/components/AppDetailModal.vue
View File

@@ -36,12 +36,19 @@
<p class="text-2xl font-bold text-slate-900 dark:text-white">
{{ displayApp?.name || "" }}
</p>
<div v-if="app?.isMerged" class="flex gap-1 overflow-hidden rounded-md shadow-sm border border-slate-200 dark:border-slate-700 font-medium ml-1">
<div
v-if="app?.isMerged"
class="flex gap-1 overflow-hidden rounded-md shadow-sm border border-slate-200 dark:border-slate-700 font-medium ml-1"
>
<button
v-if="app.sparkApp"
type="button"
class="px-2 py-0.5 text-[10px] uppercase tracking-wider transition-colors"
:class="viewingOrigin === 'spark' ? 'bg-orange-500 text-white' : 'bg-slate-100/50 text-slate-500 dark:bg-slate-800 dark:text-slate-400 hover:bg-slate-200 dark:hover:bg-slate-700'"
:class="
viewingOrigin === 'spark'
? 'bg-orange-500 text-white'
: 'bg-slate-100/50 text-slate-500 dark:bg-slate-800 dark:text-slate-400 hover:bg-slate-200 dark:hover:bg-slate-700'
"
@click="viewingOrigin = 'spark'"
>
Spark
@@ -50,7 +57,11 @@
v-if="app.apmApp"
type="button"
class="px-2 py-0.5 text-[10px] uppercase tracking-wider transition-colors"
:class="viewingOrigin === 'apm' ? 'bg-blue-500 text-white' : 'bg-slate-100/50 text-slate-500 dark:bg-slate-800 dark:text-slate-400 hover:bg-slate-200 dark:hover:bg-slate-700'"
:class="
viewingOrigin === 'apm'
? 'bg-blue-500 text-white'
: 'bg-slate-100/50 text-slate-500 dark:bg-slate-800 dark:text-slate-400 hover:bg-slate-200 dark:hover:bg-slate-700'
"
@click="viewingOrigin = 'apm'"
>
APM
@@ -69,7 +80,8 @@
</span>
</div>
<p class="text-sm text-slate-500 dark:text-slate-400">
{{ displayApp?.pkgname || "" }} · {{ displayApp?.version || "" }}
{{ displayApp?.pkgname || "" }} ·
{{ displayApp?.version || "" }}
<span v-if="downloadCount"> · 下载量：{{ downloadCount }}</span>
</p>
</div>
@@ -219,7 +231,10 @@
</div>
</div>
<div v-if="displayApp?.more && displayApp.more.trim() !== ''" class="mt-6 space-y-3">
<div
v-if="displayApp?.more && displayApp.more.trim() !== ''"
class="mt-6 space-y-3"
>
<h3 class="text-lg font-semibold text-slate-900 dark:text-white">
应用详情
</h3>

13
src/components/HomeView.vue
View File

@@ -12,7 +12,7 @@
:href="link.type === '_blank' ? undefined : link.url"
@click.prevent="onLinkClick(link)"
class="flex flex-col items-start gap-2 rounded-2xl border border-slate-200/70 bg-white/90 p-4 shadow-sm hover:shadow-lg transition"
:title="link.more"
:title="link.more as string"
>
<img
:src="computedImgUrl(link)"
@@ -50,19 +50,20 @@
<script setup lang="ts">
import AppCard from "./AppCard.vue";
import { APM_STORE_BASE_URL } from "../global/storeConfig";
import type { HomeLink, HomeList, App } from "../global/typedefinition";
defineProps<{
links: Array<any>;
lists: Array<{ title: string; apps: any[] }>;
links: HomeLink[];
lists: HomeList[];
loading: boolean;
error: string;
}>();
defineEmits<{
(e: "open-detail", app: any): void;
(e: "open-detail", app: App | Record<string, unknown>): void;
}>();
const computedImgUrl = (link: Record<string, any>) => {
const computedImgUrl = (link: HomeLink) => {
if (!link.imgUrl) return "";
const arch = window.apm_store.arch || "amd64-apm";
const finalArch =
@@ -72,7 +73,7 @@ const computedImgUrl = (link: Record<string, any>) => {
return `${APM_STORE_BASE_URL}/${finalArch}${link.imgUrl}`;
};
const onLinkClick = (link: any) => {
const onLinkClick = (link: HomeLink) => {
if (link.type === "_blank") {
window.open(link.url, "_blank");
} else {

21
src/components/StoreModeSwitcher.vue
View File

@@ -1,15 +1,24 @@
<template>
<div class="flex flex-col gap-2 p-4 rounded-2xl bg-slate-50 dark:bg-slate-800/50 border border-slate-200/70 dark:border-slate-700/70">
<span class="text-xs font-semibold uppercase tracking-wider text-slate-500 dark:text-slate-400 px-1">商店模式</span>
<div class="grid grid-cols-3 gap-1 p-1 bg-slate-200/50 dark:bg-slate-900/50 rounded-xl">
<div
class="flex flex-col gap-2 p-4 rounded-2xl bg-slate-50 dark:bg-slate-800/50 border border-slate-200/70 dark:border-slate-700/70"
>
<span
class="text-xs font-semibold uppercase tracking-wider text-slate-500 dark:text-slate-400 px-1"
>商店模式</span
>
<div
class="grid grid-cols-3 gap-1 p-1 bg-slate-200/50 dark:bg-slate-900/50 rounded-xl"
>
<button
v-for="mode in modes"
:key="mode.id"
type="button"
class="flex flex-col items-center justify-center py-2 px-1 rounded-lg text-[10px] font-medium transition-all duration-200"
:class="currentStoreMode === mode.id
? 'bg-white dark:bg-slate-700 text-brand shadow-sm scale-105 z-10'
: 'text-slate-500 dark:text-slate-400 hover:text-slate-700 dark:hover:text-slate-200'"
:class="
currentStoreMode === mode.id
? 'bg-white dark:bg-slate-700 text-brand shadow-sm scale-105 z-10'
: 'text-slate-500 dark:text-slate-400 hover:text-slate-700 dark:hover:text-slate-200'
"
@click="setMode(mode.id as StoreMode)"
>
<i :class="mode.icon" class="mb-1 text-xs"></i>

9
src/global/storeConfig.ts
View File

@@ -11,11 +11,6 @@ export const APM_STORE_STATS_BASE_URL: string =
export const currentApp = ref<App | null>(null);
export const currentAppIsInstalled = ref(false);
const initialMode = (localStorage.getItem("store_mode") as StoreMode) || "hybrid";
const initialMode =
(localStorage.getItem("store_mode") as StoreMode) || "hybrid";
export const currentStoreMode = ref<StoreMode>(initialMode);
declare global {
interface Window {
apm_store: any;
}
}

23
src/global/typedefinition.ts
View File

@@ -138,3 +138,26 @@ export type ChannelPayload = {
message: string;
[k: string]: unknown;
};
export interface CategoryInfo {
zh: string;
origins?: string[];
origin?: "spark" | "apm";
[k: string]: unknown;
}
export interface HomeLink {
name: string;
url: string;
icon: string;
more?: string;
imgUrl?: string;
type?: string;
origin?: "spark" | "apm";
[k: string]: unknown;
}
export interface HomeList {
title: string;
apps: App[];
}

5
src/vite-env.d.ts vendored
View File

@@ -10,7 +10,10 @@ declare module "*.vue" {
interface Window {
// expose in the `electron/preload/index.ts`
ipcRenderer: import("electron").IpcRenderer;
apm_store: any;
apm_store: {
arch: string;
[k: string]: any;
};
}
declare const __APP_VERSION__: string;