update:在商店混合模式下，同包名的软件合并在同一个详情页面并加入切换开关

src/global/storeConfig.ts

@@ -16,8 +16,6 @@ export const currentStoreMode = ref<StoreMode>(initialMode);
 
 declare global {
   interface Window {
-    apm_store: {
-      arch: string;
-    };
+    apm_store: any;
   }
 }

src/global/typedefinition.ts

@@ -107,6 +107,10 @@ export interface App {
   flags?: string; // Tags in apm packages manager, e.g. "automatic" for dependencies
   arch?: string; // Architecture, e.g. "amd64", "arm64"
   currentStatus: "not-installed" | "installed"; // Current installation status
+  isMerged?: boolean; // FLAG for overlapping apps
+  sparkApp?: App; // Optional reference to the spark version
+  apmApp?: App; // Optional reference to the apm version
+  viewingOrigin?: "spark" | "apm"; // Currently viewed origin inside the app modal
 }
 
 export interface UpdateAppItem {