mirror of
https://gitee.com/spark-store-project/spark-store
synced 2026-09-20 21:50:11 +08:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2db91252ad | ||
|
|
86895269c3 | ||
|
|
018dac3d21 | ||
|
|
f94a6584a4 | ||
|
|
25bc414ce1 | ||
|
|
0c18d53db6 | ||
|
|
55247a72da | ||
|
|
791b196256 | ||
|
|
eb4f01da94 | ||
|
|
0ea075c599 | ||
|
|
fdc8455640 | ||
|
|
f2aa1573fa | ||
|
|
08038e6be0 | ||
|
|
bc49a41018 | ||
|
|
b87112fa38 | ||
|
|
d0e6dc1b79 | ||
|
|
81567f8351 | ||
|
|
ede1a1269f | ||
|
|
e25a3c9d8f | ||
|
|
7b658e9dd1 | ||
|
|
4dc1a1d7fe | ||
|
|
2f85f1da71 | ||
|
|
700197bdc1 | ||
|
|
582435b857 | ||
|
|
e4540252b3 | ||
|
|
5efed0dca2 | ||
|
|
ada3a6dab4 | ||
|
|
ae9142ad06 |
+1
-1
@@ -1,3 +1,3 @@
|
|||||||
VITE_APM_STORE_BASE_URL=https://erotica.spark-app.store
|
VITE_APM_STORE_BASE_URL=https://d.spark-app.store
|
||||||
VITE_APM_STORE_STATS_BASE_URL=https://feedback.spark-app.store
|
VITE_APM_STORE_STATS_BASE_URL=https://feedback.spark-app.store
|
||||||
VITE_SPARK_BACKEND_BASE_URL=https://account.spark-app.store
|
VITE_SPARK_BACKEND_BASE_URL=https://account.spark-app.store
|
||||||
|
|||||||
Vendored
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
spark-store (5.3.0-0) UNRELEASED; urgency=medium
|
spark-store (5.3.1) UNRELEASED; urgency=medium
|
||||||
|
|
||||||
* Initial release.
|
* Initial release.
|
||||||
|
|
||||||
|
|||||||
Vendored
+3
@@ -58,6 +58,9 @@ case "$1" in
|
|||||||
systemctl enable spark-update-notifier
|
systemctl enable spark-update-notifier
|
||||||
systemctl start spark-update-notifier
|
systemctl start spark-update-notifier
|
||||||
|
|
||||||
|
# like apt-daily.timer
|
||||||
|
systemctl enable spark-update-notifier.timer
|
||||||
|
systemctl start spark-update-notifier.timer
|
||||||
|
|
||||||
# Update certain caches
|
# Update certain caches
|
||||||
cp -fv /opt/spark-store/extras/store.spark-app.spark-store.policy /usr/share/polkit-1/actions/store.spark-app.spark-store.policy
|
cp -fv /opt/spark-store/extras/store.spark-app.spark-store.policy /usr/share/polkit-1/actions/store.spark-app.spark-store.policy
|
||||||
|
|||||||
@@ -15,6 +15,12 @@ const logger = pino({ name: "install-manager" });
|
|||||||
// 包名白名单:仅允许合法包名字符,杜绝命令注入(spawn 用 shell:false 仍须校验)。
|
// 包名白名单:仅允许合法包名字符,杜绝命令注入(spawn 用 shell:false 仍须校验)。
|
||||||
const PKGNAME_PATTERN = /^[a-zA-Z0-9._+-]+$/;
|
const PKGNAME_PATTERN = /^[a-zA-Z0-9._+-]+$/;
|
||||||
|
|
||||||
|
// 文件名(.deb)白名单:按 dpkg 规则允许包名/版本号合法字符。
|
||||||
|
// 含 epoch 冒号(steam-launcher_1:1.0.0.87_amd64.deb)与排序标记 ~(1.0~beta),
|
||||||
|
// 以及字母数字、. _ + -。路径遍历由下方 basename/".." 检查兜底。
|
||||||
|
// 注意字符组内 : 与 ~ 须用 \- 等转义字符隔离,避免形成正则区间(如 [:~] 会误匹配大量符号)。
|
||||||
|
const FILENAME_PATTERN = /^[A-Za-z0-9._+:\-~]+$/;
|
||||||
|
|
||||||
// 解析并校验应用类 IPC 的 payload(可能是旧版字符串或对象)。
|
// 解析并校验应用类 IPC 的 payload(可能是旧版字符串或对象)。
|
||||||
// 返回规范化后的 { pkgname, origin },pkgname 非法时返回 null。
|
// 返回规范化后的 { pkgname, origin },pkgname 非法时返回 null。
|
||||||
const parseAppPayload = (
|
const parseAppPayload = (
|
||||||
@@ -326,7 +332,7 @@ export const addInstallTask = async (
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 包名/文件名白名单校验:防止路径遍历(如 ../../)或非法字符进入下载目录与安装命令构建
|
// 包名白名单校验:杜绝命令注入(spawn shell:false 仍须校验,且包名不含路径字符)。
|
||||||
if (!PKGNAME_PATTERN.test(pkgname)) {
|
if (!PKGNAME_PATTERN.test(pkgname)) {
|
||||||
logger.warn(`addInstallTask invalid pkgname: ${pkgname}`);
|
logger.warn(`addInstallTask invalid pkgname: ${pkgname}`);
|
||||||
webContents?.send("install-complete", {
|
webContents?.send("install-complete", {
|
||||||
@@ -342,7 +348,10 @@ export const addInstallTask = async (
|
|||||||
});
|
});
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
if (filename && !PKGNAME_PATTERN.test(filename)) {
|
// 文件名(.deb)白名单校验:允许 Debian 包合法字符(含 epoch 冒号),并拒绝路径遍历
|
||||||
|
//("/" 与 ".." 段),防止写入下载目录之外的位置。
|
||||||
|
if (filename) {
|
||||||
|
if (!FILENAME_PATTERN.test(filename) || filename.includes("..") || path.basename(filename) !== filename) {
|
||||||
logger.warn(`addInstallTask invalid filename: ${filename}`);
|
logger.warn(`addInstallTask invalid filename: ${filename}`);
|
||||||
webContents?.send("install-complete", {
|
webContents?.send("install-complete", {
|
||||||
id,
|
id,
|
||||||
@@ -357,6 +366,7 @@ export const addInstallTask = async (
|
|||||||
});
|
});
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// metalinkUrl 来自渲染端(由目录 filename / 主进程解析的 downloadUrl 拼成)。
|
// metalinkUrl 来自渲染端(由目录 filename / 主进程解析的 downloadUrl 拼成)。
|
||||||
// 纵深防御:仅允许 https 协议、官方域名(含任意子域 *.spark-app.store)的绝对 URL,
|
// 纵深防御:仅允许 https 协议、官方域名(含任意子域 *.spark-app.store)的绝对 URL,
|
||||||
|
|||||||
+46
-13
@@ -170,6 +170,18 @@ ipcMain.handle("save-window-bounds", (): boolean => {
|
|||||||
return true;
|
return true;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// 渲染端(设置页)切换界面整体缩放系数,经此实时应用到主窗口。
|
||||||
|
// factor 限定在 0.5~3 之间,避免极端值导致界面不可用。
|
||||||
|
ipcMain.handle("set-zoom-factor", (_event, factor: unknown): boolean => {
|
||||||
|
if (typeof factor !== "number" || !Number.isFinite(factor)) return false;
|
||||||
|
const clamped = Math.min(3, Math.max(0.5, factor));
|
||||||
|
if (win && !win.isDestroyed()) {
|
||||||
|
win.webContents.setZoomFactor(clamped);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
});
|
||||||
|
|
||||||
ipcMain.handle("get-app-version", (): string => getAppVersion());
|
ipcMain.handle("get-app-version", (): string => getAppVersion());
|
||||||
ipcMain.handle("get-system-info", (): { distro: string } => getSystemInfo());
|
ipcMain.handle("get-system-info", (): { distro: string } => getSystemInfo());
|
||||||
|
|
||||||
@@ -307,6 +319,8 @@ interface WindowState {
|
|||||||
x?: number;
|
x?: number;
|
||||||
y?: number;
|
y?: number;
|
||||||
maximized?: boolean;
|
maximized?: boolean;
|
||||||
|
/** 界面整体缩放系数(Electron webContents.setZoomFactor),默认 1 */
|
||||||
|
zoomFactor?: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
function getWindowStatePath(): string {
|
function getWindowStatePath(): string {
|
||||||
@@ -375,7 +389,14 @@ function flushSaveBounds(): void {
|
|||||||
}
|
}
|
||||||
if (win && !win.isDestroyed()) {
|
if (win && !win.isDestroyed()) {
|
||||||
const { width, height, x, y } = win.getBounds();
|
const { width, height, x, y } = win.getBounds();
|
||||||
saveWindowState({ width, height, x, y, maximized: win.isMaximized() });
|
saveWindowState({
|
||||||
|
width,
|
||||||
|
height,
|
||||||
|
x,
|
||||||
|
y,
|
||||||
|
maximized: win.isMaximized(),
|
||||||
|
zoomFactor: win.webContents.getZoomFactor(),
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
function scheduleSaveBounds(winInstance: BrowserWindow): void {
|
function scheduleSaveBounds(winInstance: BrowserWindow): void {
|
||||||
@@ -389,6 +410,7 @@ function scheduleSaveBounds(winInstance: BrowserWindow): void {
|
|||||||
x,
|
x,
|
||||||
y,
|
y,
|
||||||
maximized: winInstance.isMaximized(),
|
maximized: winInstance.isMaximized(),
|
||||||
|
zoomFactor: winInstance.webContents.getZoomFactor(),
|
||||||
});
|
});
|
||||||
}, 400);
|
}, 400);
|
||||||
}
|
}
|
||||||
@@ -438,6 +460,17 @@ async function createWindow() {
|
|||||||
});
|
});
|
||||||
win = mainWindow;
|
win = mainWindow;
|
||||||
|
|
||||||
|
// 启动即应用持久化的界面缩放系数(默认 1 = 100%)。
|
||||||
|
// 必须在 loadURL/loadFile 前设置,使首帧即按目标缩放渲染,避免闪烁。
|
||||||
|
const savedZoom =
|
||||||
|
typeof saved.zoomFactor === "number" &&
|
||||||
|
saved.zoomFactor >= 0.5 &&
|
||||||
|
saved.zoomFactor <= 3
|
||||||
|
? saved.zoomFactor
|
||||||
|
: 1;
|
||||||
|
mainWindow.webContents.setZoomFactor(savedZoom);
|
||||||
|
logger.info({ zoomFactor: savedZoom }, "已应用界面缩放系数");
|
||||||
|
|
||||||
// 设计意图(非缺陷,勿改为自动恢复 maximized):
|
// 设计意图(非缺陷,勿改为自动恢复 maximized):
|
||||||
// 启动时不自动恢复最大化状态。原因——最大化窗口在多数屏幕上 bounds 会超过
|
// 启动时不自动恢复最大化状态。原因——最大化窗口在多数屏幕上 bounds 会超过
|
||||||
// OVERSIZED_WINDOW_THRESHOLD(1600x900),若强行恢复最大化会导致「启动即全屏、
|
// OVERSIZED_WINDOW_THRESHOLD(1600x900),若强行恢复最大化会导致「启动即全屏、
|
||||||
@@ -473,21 +506,13 @@ async function createWindow() {
|
|||||||
logger.info("Renderer process is ready.");
|
logger.info("Renderer process is ready.");
|
||||||
});
|
});
|
||||||
|
|
||||||
// 仅允许可信域名的 https 链接通过浏览器打开,避免钓鱼/恶意站。
|
// 外部链接统一交给系统默认浏览器打开。
|
||||||
// 协议前缀 + 域名后缀白名单双重校验;非法/无效 URL 一律拒绝。
|
// 仅限制协议为 http/https,避免 file:/javascript: 等危险协议被打开;
|
||||||
const ALLOWED_EXTERNAL_HOSTS = [
|
// 不再限制域名,保证应用官网与首页推荐的任意链接均可正常访问。
|
||||||
"spark-app.store",
|
|
||||||
"gitee.com",
|
|
||||||
"bbs.spark-app.store",
|
|
||||||
"spark-app.cn",
|
|
||||||
];
|
|
||||||
mainWindow.webContents.setWindowOpenHandler(({ url }) => {
|
mainWindow.webContents.setWindowOpenHandler(({ url }) => {
|
||||||
try {
|
try {
|
||||||
const parsed = new URL(url);
|
const parsed = new URL(url);
|
||||||
if (
|
if (parsed.protocol === "http:" || parsed.protocol === "https:") {
|
||||||
parsed.protocol === "https:" &&
|
|
||||||
ALLOWED_EXTERNAL_HOSTS.some((h) => parsed.hostname === h || parsed.hostname.endsWith(`.${h}`))
|
|
||||||
) {
|
|
||||||
shell.openExternal(url);
|
shell.openExternal(url);
|
||||||
}
|
}
|
||||||
} catch {
|
} catch {
|
||||||
@@ -843,6 +868,14 @@ app.whenReady().then(() => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
ipcMain.handle('window:state', () => {
|
||||||
|
const win = BrowserWindow.getFocusedWindow()
|
||||||
|
if (!win) return 'normal'
|
||||||
|
if (win.isMaximized()) return 'maximized'
|
||||||
|
if (win.isMinimized()) return 'minimized'
|
||||||
|
return 'normal'
|
||||||
|
})
|
||||||
|
|
||||||
// New window example arg: new windows url
|
// New window example arg: new windows url
|
||||||
// ipcMain.handle('open-win', (_, arg) => {
|
// ipcMain.handle('open-win', (_, arg) => {
|
||||||
// const childWindow = new BrowserWindow({
|
// const childWindow = new BrowserWindow({
|
||||||
|
|||||||
@@ -51,6 +51,7 @@ type WindowControlBridge = {
|
|||||||
minimize: () => void;
|
minimize: () => void;
|
||||||
toggleMaximize: () => void;
|
toggleMaximize: () => void;
|
||||||
close: () => void;
|
close: () => void;
|
||||||
|
state: () => Promise<| 'normal' | 'maximized' | 'minimized'>;
|
||||||
};
|
};
|
||||||
|
|
||||||
type UpdateCenterStateListener = (snapshot: UpdateCenterSnapshot) => void;
|
type UpdateCenterStateListener = (snapshot: UpdateCenterSnapshot) => void;
|
||||||
@@ -110,6 +111,7 @@ contextBridge.exposeInMainWorld("windowControls", {
|
|||||||
minimize: () => ipcRenderer.send("window-control-minimize"),
|
minimize: () => ipcRenderer.send("window-control-minimize"),
|
||||||
toggleMaximize: () => ipcRenderer.send("window-control-toggle-maximize"),
|
toggleMaximize: () => ipcRenderer.send("window-control-toggle-maximize"),
|
||||||
close: () => ipcRenderer.send("window-control-close"),
|
close: () => ipcRenderer.send("window-control-close"),
|
||||||
|
state: () => ipcRenderer.invoke("window:state"),
|
||||||
} satisfies WindowControlBridge);
|
} satisfies WindowControlBridge);
|
||||||
|
|
||||||
contextBridge.exposeInMainWorld("updateCenter", {
|
contextBridge.exposeInMainWorld("updateCenter", {
|
||||||
|
|||||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "spark-store",
|
"name": "spark-store",
|
||||||
"version": "5.3.0",
|
"version": "5.3.1",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "spark-store",
|
"name": "spark-store",
|
||||||
"version": "5.3.0",
|
"version": "5.3.1",
|
||||||
"license": "GPL-3.0",
|
"license": "GPL-3.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@tailwindcss/vite": "^4.1.18",
|
"@tailwindcss/vite": "^4.1.18",
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "spark-store",
|
"name": "spark-store",
|
||||||
"version": "5.3.0",
|
"version": "5.3.1",
|
||||||
"main": "dist-electron/main/index.js",
|
"main": "dist-electron/main/index.js",
|
||||||
"description": "Client for Spark App Store",
|
"description": "Client for Spark App Store",
|
||||||
"author": "elysia-best <elysia-best@simplelinux.cn.eu.org>",
|
"author": "elysia-best <elysia-best@simplelinux.cn.eu.org>",
|
||||||
|
|||||||
@@ -1,15 +1,17 @@
|
|||||||
[Unit]
|
[Unit]
|
||||||
Description=Spark Store update notifier
|
Description=Spark Store update notifier
|
||||||
After=apt-daily.service network.target network-online.target systemd-networkd.service NetworkManager.service connman.service
|
After=apt-daily.service network.target network-online.target systemd-networkd.service NetworkManager.service connman.service
|
||||||
|
# 设置为 1 小时的时间窗口
|
||||||
|
StartLimitIntervalSec=1h
|
||||||
|
# 最大允许失败次数为 3 次
|
||||||
|
StartLimitBurst=3
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=simple
|
Type=simple
|
||||||
RemainAfterExit=yes
|
|
||||||
ExecStart=/opt/durapps/spark-store/bin/update-upgrade/ss-update-notifier.sh
|
ExecStart=/opt/durapps/spark-store/bin/update-upgrade/ss-update-notifier.sh
|
||||||
Restart=on-failure
|
Restart=on-failure
|
||||||
RestartSec=15 # 可以设置为更长的重试间隔,比如 15 秒或 30 秒
|
# 可以设置为更长的重试间隔,比如 15 秒或 30 秒
|
||||||
StartLimitIntervalSec=1h # 设置为 1 小时的时间窗口
|
RestartSec=15
|
||||||
StartLimitBurst=3 # 最大允许失败次数为 3 次
|
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
WantedBy=multi-user.target
|
WantedBy=multi-user.target
|
||||||
|
|||||||
@@ -2,8 +2,8 @@
|
|||||||
Description=Spark Store update notifier
|
Description=Spark Store update notifier
|
||||||
|
|
||||||
[Timer]
|
[Timer]
|
||||||
OnCalendar=*-*-* 6,18:00
|
OnCalendar=*-*-* 6,12,18:00
|
||||||
RandomizedDelaySec=12h
|
RandomizedDelaySec=30m
|
||||||
Persistent=true
|
Persistent=true
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
|
|||||||
+32
-1
@@ -11,7 +11,12 @@
|
|||||||
# 再运行一次 -> 5.2.1.2-test
|
# 再运行一次 -> 5.2.1.2-test
|
||||||
#
|
#
|
||||||
# 注意:
|
# 注意:
|
||||||
# - 此脚本仅用于本地测试,不会修改 package.json(electron-builder 的 dir 产物版本)。
|
# - 此脚本仅用于本地测试,不会修改 package.json(其 version 为 semver 格式,
|
||||||
|
# 而 deb 测试版本如 5.3.0.8-test 会被 electron-builder 拒绝)。
|
||||||
|
# - 为保证打包后「关于」页面显示版本与 deb 版本一致,脚本会临时向
|
||||||
|
# electron-builder.yml 追加 extraMetadata.version(electron-builder 会将其写入
|
||||||
|
# app.asar 内的 package.json,Electron 的 app.getVersion() 即从中读取),
|
||||||
|
# 打包完成后自动恢复,异常退出时由 trap 兜底恢复。
|
||||||
# - 每次运行都会改写 debian/changelog,属于未跟踪的工作区改动,按需自行还原。
|
# - 每次运行都会改写 debian/changelog,属于未跟踪的工作区改动,按需自行还原。
|
||||||
# - 如需恢复正式版本,将 debian/changelog 顶部版本改回即可。
|
# - 如需恢复正式版本,将 debian/changelog 顶部版本改回即可。
|
||||||
|
|
||||||
@@ -71,7 +76,33 @@ sed -i -E "1s/\\(${old_ver_esc}\\)/(${new_ver})/" "$CHANGELOG"
|
|||||||
# Electron 二进制下载镜像(本机到 GitHub 不通,使用 npmmirror 镜像)
|
# Electron 二进制下载镜像(本机到 GitHub 不通,使用 npmmirror 镜像)
|
||||||
export ELECTRON_MIRROR="${ELECTRON_MIRROR:-https://registry.npmmirror.com/-/binary/electron/}"
|
export ELECTRON_MIRROR="${ELECTRON_MIRROR:-https://registry.npmmirror.com/-/binary/electron/}"
|
||||||
|
|
||||||
|
# 同步应用内版本号:临时向 electron-builder.yml 追加 extraMetadata.version。
|
||||||
|
# electron-builder 会把它合并进 app.asar 内的 package.json,
|
||||||
|
# 「关于」页面经 IPC 调用的 app.getVersion() 即读取该值。
|
||||||
|
EB_YML="electron-builder.yml"
|
||||||
|
EB_YML_BAK="${EB_YML}.bak-test-build"
|
||||||
|
|
||||||
|
# 清理上次异常中断可能残留的 extraMetadata 块(追加内容始终位于文件末尾)
|
||||||
|
if grep -q "^extraMetadata:" "$EB_YML"; then
|
||||||
|
echo "清理 $EB_YML 中残留的 extraMetadata 块"
|
||||||
|
sed -i '/^extraMetadata:/,$d' "$EB_YML"
|
||||||
|
fi
|
||||||
|
cp "$EB_YML" "$EB_YML_BAK"
|
||||||
|
restore_eb_yml() {
|
||||||
|
mv -f "$EB_YML_BAK" "$EB_YML" 2>/dev/null || true
|
||||||
|
}
|
||||||
|
trap restore_eb_yml EXIT
|
||||||
|
printf 'extraMetadata:\n version: "%s"\n' "$new_ver" >> "$EB_YML"
|
||||||
|
|
||||||
|
# 清理旧的 electron-builder 产物,避免 release/ 下多个版本目录被 make install
|
||||||
|
# 的 release/*/linux*-unpacked/* 通配一并拷入 deb,造成内容污染
|
||||||
|
rm -rf release/
|
||||||
|
|
||||||
echo "开始测试打包(版本 ${new_ver})..."
|
echo "开始测试打包(版本 ${new_ver})..."
|
||||||
dpkg-buildpackage -us -uc -b
|
dpkg-buildpackage -us -uc -b
|
||||||
|
|
||||||
|
# 打包成功,立即恢复 electron-builder.yml 并解除 trap
|
||||||
|
restore_eb_yml
|
||||||
|
trap - EXIT
|
||||||
|
|
||||||
echo "完成。产物: ../spark-store_${new_ver}_amd64.deb"
|
echo "完成。产物: ../spark-store_${new_ver}_amd64.deb"
|
||||||
|
|||||||
+11
@@ -14,6 +14,7 @@
|
|||||||
@toggle-theme="toggleTheme"
|
@toggle-theme="toggleTheme"
|
||||||
@toggle-sidebar="isSidebarOpen = !isSidebarOpen"
|
@toggle-sidebar="isSidebarOpen = !isSidebarOpen"
|
||||||
@spk-link="handleSpkLink"
|
@spk-link="handleSpkLink"
|
||||||
|
:is-maximized="isMaximized"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<div class="flex min-h-0 flex-1 flex-col lg:flex-row">
|
<div class="flex min-h-0 flex-1 flex-col lg:flex-row">
|
||||||
@@ -344,6 +345,7 @@ import ReviewUserProfileModal from "./components/ReviewUserProfileModal.vue";
|
|||||||
import WindowTitleBar from "./components/WindowTitleBar.vue";
|
import WindowTitleBar from "./components/WindowTitleBar.vue";
|
||||||
import SubmitterWindow from "./components/SubmitterWindow.vue";
|
import SubmitterWindow from "./components/SubmitterWindow.vue";
|
||||||
import { initTagPriorityStrategy } from "./global/tagPriority";
|
import { initTagPriorityStrategy } from "./global/tagPriority";
|
||||||
|
import { initUiScale } from "./global/displaySettings";
|
||||||
import {
|
import {
|
||||||
FLARUM_BASE_URL,
|
FLARUM_BASE_URL,
|
||||||
FLARUM_REGISTER_URL,
|
FLARUM_REGISTER_URL,
|
||||||
@@ -545,6 +547,11 @@ const isDarkTheme = computed(() => {
|
|||||||
return themeMode.value === "dark";
|
return themeMode.value === "dark";
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const isMaximized = ref(false)
|
||||||
|
const updateIsMaximizedState = async () => {
|
||||||
|
const state = await window.windowControls.state()
|
||||||
|
isMaximized.value = state === 'maximized'
|
||||||
|
}
|
||||||
const isSubmitterView = ref(false);
|
const isSubmitterView = ref(false);
|
||||||
|
|
||||||
// 启动参数 --no-apm => 仅 Spark;--no-spark => 仅 APM;由主进程 IPC 提供
|
// 启动参数 --no-apm => 仅 Spark;--no-spark => 仅 APM;由主进程 IPC 提供
|
||||||
@@ -922,6 +929,8 @@ const handleWindowResize = () => {
|
|||||||
saveBoundsTimer = window.setTimeout(() => {
|
saveBoundsTimer = window.setTimeout(() => {
|
||||||
void window.ipcRenderer.invoke("save-window-bounds");
|
void window.ipcRenderer.invoke("save-window-bounds");
|
||||||
}, 400);
|
}, 400);
|
||||||
|
|
||||||
|
updateIsMaximizedState()
|
||||||
};
|
};
|
||||||
|
|
||||||
// —— 以下为可复用的事件/IPC 监听处理器(命名函数,便于 onUnmounted 统一移除)——
|
// —— 以下为可复用的事件/IPC 监听处理器(命名函数,便于 onUnmounted 统一移除)——
|
||||||
@@ -1052,6 +1061,8 @@ onMounted(async () => {
|
|||||||
// 应用启动即锁定标签优先显示策略的真实持久化值,避免依赖详情页挂载顺序
|
// 应用启动即锁定标签优先显示策略的真实持久化值,避免依赖详情页挂载顺序
|
||||||
// 导致先读到内存默认值 "auto" 再懒加载的竞态窗口。
|
// 导致先读到内存默认值 "auto" 再懒加载的竞态窗口。
|
||||||
initTagPriorityStrategy();
|
initTagPriorityStrategy();
|
||||||
|
// 恢复并应用持久化的界面整体缩放(Electron setZoomFactor)。
|
||||||
|
void initUiScale();
|
||||||
initTheme();
|
initTheme();
|
||||||
updateCenterStore.bind();
|
updateCenterStore.bind();
|
||||||
|
|
||||||
|
|||||||
@@ -52,10 +52,10 @@ const emit = defineEmits<{
|
|||||||
display: flex;
|
display: flex;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
gap: 0.75rem;
|
gap: 12px;
|
||||||
min-width: 0;
|
min-width: 0;
|
||||||
border-radius: 0.75rem;
|
border-radius: 12px;
|
||||||
padding: 0.625rem 0.75rem;
|
padding: 10px 12px;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
font-size: 0.875rem;
|
font-size: 0.875rem;
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
|
|||||||
@@ -153,12 +153,10 @@ const formatDownloads = (n?: number): string => {
|
|||||||
|
|
||||||
// 排名徽标配色(前 3 名金/银/铜,其余灰色)
|
// 排名徽标配色(前 3 名金/银/铜,其余灰色)
|
||||||
const rankClass = computed(() => {
|
const rankClass = computed(() => {
|
||||||
if (props.rank === 1)
|
if (props.rank === 1) return "bg-amber-400 text-white shadow-amber-400/40";
|
||||||
return "bg-amber-400 text-white shadow-amber-400/40";
|
|
||||||
if (props.rank === 2)
|
if (props.rank === 2)
|
||||||
return "bg-slate-300 text-slate-700 shadow-slate-400/40";
|
return "bg-slate-300 text-slate-700 shadow-slate-400/40";
|
||||||
if (props.rank === 3)
|
if (props.rank === 3) return "bg-amber-600 text-white shadow-amber-600/40";
|
||||||
return "bg-amber-600 text-white shadow-amber-600/40";
|
|
||||||
return "bg-slate-500/90 text-white shadow-slate-500/30";
|
return "bg-slate-500/90 text-white shadow-slate-500/30";
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -161,10 +161,10 @@ const emitSidebarAction = (action: "list" | "update" | "submit") => {
|
|||||||
display: flex;
|
display: flex;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
gap: 0.75rem;
|
gap: 12px;
|
||||||
border: 1px solid transparent;
|
border: 1px solid transparent;
|
||||||
border-radius: 0.75rem;
|
border-radius: 12px;
|
||||||
padding: 0.625rem 0.875rem;
|
padding: 10px 0.875rem;
|
||||||
text-align: left;
|
text-align: left;
|
||||||
font-size: 0.875rem;
|
font-size: 0.875rem;
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
|
|||||||
@@ -71,7 +71,7 @@ const selectCategory = (category: string) => {
|
|||||||
display: flex;
|
display: flex;
|
||||||
flex-wrap: wrap;
|
flex-wrap: wrap;
|
||||||
gap: 0.5rem;
|
gap: 0.5rem;
|
||||||
padding: 0.75rem 0;
|
padding: 12px 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.category-pill {
|
.category-pill {
|
||||||
@@ -81,7 +81,7 @@ const selectCategory = (category: string) => {
|
|||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
padding: 0.375rem 0.875rem;
|
padding: 0.375rem 0.875rem;
|
||||||
border-radius: 9999px;
|
border-radius: 9999px;
|
||||||
font-size: 0.8125rem;
|
font-size: 13px;
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
color: #64748b;
|
color: #64748b;
|
||||||
background: #f1f5f9;
|
background: #f1f5f9;
|
||||||
@@ -126,7 +126,7 @@ const selectCategory = (category: string) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.category-pill-count {
|
.category-pill-count {
|
||||||
font-size: 0.6875rem;
|
font-size: 11px;
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
opacity: 0.75;
|
opacity: 0.75;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
class="flex flex-1 flex-col items-center justify-center text-slate-500 dark:text-slate-400"
|
class="flex flex-1 flex-col items-center justify-center text-slate-500 dark:text-slate-400"
|
||||||
>
|
>
|
||||||
<i class="fas fa-spinner fa-spin text-2xl mb-3"></i>
|
<i class="fas fa-spinner fa-spin text-2xl mb-3"></i>
|
||||||
<span class="text-sm">正在加载首页内容…</span>
|
<span class="text-base">正在加载首页内容…</span>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
v-else-if="error"
|
v-else-if="error"
|
||||||
@@ -44,7 +44,7 @@
|
|||||||
: "欢迎来到星火应用商店"
|
: "欢迎来到星火应用商店"
|
||||||
}}
|
}}
|
||||||
</h1>
|
</h1>
|
||||||
<p class="text-sm text-slate-500 dark:text-slate-400">
|
<p class="text-base text-slate-500 dark:text-slate-400">
|
||||||
{{
|
{{
|
||||||
storeFilter === "apm"
|
storeFilter === "apm"
|
||||||
? "探索丰富的应用,发现更多精彩内容"
|
? "探索丰富的应用,发现更多精彩内容"
|
||||||
@@ -57,12 +57,12 @@
|
|||||||
<!-- ============ 区域1 · 精选(两行网格 4×2,静态不滚动) ============ -->
|
<!-- ============ 区域1 · 精选(两行网格 4×2,静态不滚动) ============ -->
|
||||||
<section class="shrink-0">
|
<section class="shrink-0">
|
||||||
<div class="mb-4">
|
<div class="mb-4">
|
||||||
<h1 class="text-sm font-bold text-slate-800 dark:text-slate-200">
|
<h1 class="text-2xl font-bold text-slate-800 dark:text-slate-200">
|
||||||
{{
|
{{
|
||||||
storeFilter === "apm" ? "星火应用商店 (Amber PM)" : "星火应用商店"
|
storeFilter === "apm" ? "星火应用商店 (Amber PM)" : "星火应用商店"
|
||||||
}}
|
}}
|
||||||
</h1>
|
</h1>
|
||||||
<p class="text-[10px] text-slate-500 dark:text-slate-400 mt-0.5">
|
<p class="text-base text-slate-500 dark:text-slate-400 mt-0.5">
|
||||||
探索丰富的应用,发现更多精彩内容
|
探索丰富的应用,发现更多精彩内容
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
@@ -108,12 +108,12 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="mt-1.5 px-1">
|
<div class="mt-1.5 px-1">
|
||||||
<div
|
<div
|
||||||
class="text-[13px] font-semibold text-slate-900 dark:text-white group-hover:text-brand dark:group-hover:text-brand transition-colors"
|
class="text-sm font-semibold text-slate-900 dark:text-white group-hover:text-brand dark:group-hover:text-brand transition-colors"
|
||||||
>
|
>
|
||||||
{{ link.name }}
|
{{ link.name }}
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div
|
||||||
class="text-[11px] text-slate-500 dark:text-slate-400 mt-0.5 line-clamp-1"
|
class="text-sm text-slate-500 dark:text-slate-400 mt-0.5 line-clamp-1"
|
||||||
>
|
>
|
||||||
{{ link.more }}
|
{{ link.more }}
|
||||||
</div>
|
</div>
|
||||||
@@ -192,7 +192,7 @@ const onLinkClick = (link: HomeLink) => {
|
|||||||
@media (max-width: 640px) {
|
@media (max-width: 640px) {
|
||||||
.auto-fit-grid {
|
.auto-fit-grid {
|
||||||
grid-template-columns: repeat(auto-fill, minmax(140px, 1fr));
|
grid-template-columns: repeat(auto-fill, minmax(140px, 1fr));
|
||||||
gap: 0.75rem;
|
gap: 12px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -77,7 +77,8 @@ const iconFailed = ref(false);
|
|||||||
|
|
||||||
const iconPath = computed(() => {
|
const iconPath = computed(() => {
|
||||||
const arch = window.apm_store.arch || "amd64";
|
const arch = window.apm_store.arch || "amd64";
|
||||||
const finalArch = props.app.origin === "spark" ? `${arch}-store` : `${arch}-apm`;
|
const finalArch =
|
||||||
|
props.app.origin === "spark" ? `${arch}-store` : `${arch}-apm`;
|
||||||
return `${APM_STORE_BASE_URL}/${finalArch}/${props.app.category}/${props.app.pkgname}/icon.png`;
|
return `${APM_STORE_BASE_URL}/${finalArch}/${props.app.category}/${props.app.pkgname}/icon.png`;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
@click.self="closeModal"
|
@click.self="closeModal"
|
||||||
>
|
>
|
||||||
<div
|
<div
|
||||||
class="relative w-full max-w-md overflow-hidden rounded-3xl border border-white/10 bg-white/95 shadow-2xl dark:border-slate-800 dark:bg-slate-900"
|
class="relative flex max-h-[calc(100vh-2rem)] w-full max-w-md flex-col overflow-hidden rounded-3xl border border-white/10 bg-white/95 shadow-2xl dark:border-slate-800 dark:bg-slate-900"
|
||||||
>
|
>
|
||||||
<!-- 标题栏 -->
|
<!-- 标题栏 -->
|
||||||
<div
|
<div
|
||||||
@@ -35,8 +35,8 @@
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- 设置内容 -->
|
<!-- 设置内容(可滚动,标题/底部固定) -->
|
||||||
<div class="p-6 space-y-4">
|
<div class="flex-1 overflow-y-auto p-6 space-y-4">
|
||||||
<!-- 更新检测开关 -->
|
<!-- 更新检测开关 -->
|
||||||
<div
|
<div
|
||||||
class="flex items-center justify-between rounded-2xl border border-slate-200/60 bg-slate-50/50 px-4 py-4 dark:border-slate-800/60 dark:bg-slate-800/50"
|
class="flex items-center justify-between rounded-2xl border border-slate-200/60 bg-slate-50/50 px-4 py-4 dark:border-slate-800/60 dark:bg-slate-800/50"
|
||||||
@@ -163,6 +163,51 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- 界面缩放(整体缩放:图标 / 间距 / 布局等比变化) -->
|
||||||
|
<div
|
||||||
|
class="rounded-2xl border border-slate-200/60 bg-slate-50/50 px-4 py-4 dark:border-slate-800/60 dark:bg-slate-800/50"
|
||||||
|
>
|
||||||
|
<div class="flex items-start gap-3">
|
||||||
|
<div
|
||||||
|
class="flex h-10 w-10 flex-shrink-0 items-center justify-center rounded-xl bg-teal-100 text-teal-600 dark:bg-teal-900/30 dark:text-teal-400"
|
||||||
|
>
|
||||||
|
<i class="fas fa-search-plus"></i>
|
||||||
|
</div>
|
||||||
|
<div class="min-w-0 flex-1">
|
||||||
|
<p
|
||||||
|
class="text-sm font-medium text-slate-800 dark:text-slate-200"
|
||||||
|
>
|
||||||
|
界面缩放
|
||||||
|
</p>
|
||||||
|
<p class="text-xs text-slate-500 dark:text-slate-400">
|
||||||
|
整体放大或缩小界面(图标、间距、布局等比变化)
|
||||||
|
</p>
|
||||||
|
<div
|
||||||
|
class="mt-3 inline-flex w-full overflow-hidden rounded-lg border border-slate-200 dark:border-slate-700"
|
||||||
|
role="radiogroup"
|
||||||
|
aria-label="界面缩放"
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
v-for="opt in uiScaleOptions"
|
||||||
|
:key="opt.value"
|
||||||
|
type="button"
|
||||||
|
role="radio"
|
||||||
|
:aria-checked="uiScale === opt.value"
|
||||||
|
class="flex-1 px-2 py-1.5 text-xs font-medium transition-colors"
|
||||||
|
:class="
|
||||||
|
uiScale === opt.value
|
||||||
|
? 'bg-brand text-white'
|
||||||
|
: 'bg-white text-slate-500 hover:bg-slate-100 dark:bg-slate-700 dark:text-slate-400 dark:hover:bg-slate-600'
|
||||||
|
"
|
||||||
|
@click="selectUiScale(opt.value)"
|
||||||
|
>
|
||||||
|
{{ opt.label }}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- 底部提示 -->
|
<!-- 底部提示 -->
|
||||||
@@ -185,6 +230,13 @@ import {
|
|||||||
setTagPriorityStrategy,
|
setTagPriorityStrategy,
|
||||||
type TagPriorityStrategy,
|
type TagPriorityStrategy,
|
||||||
} from "../global/tagPriority";
|
} from "../global/tagPriority";
|
||||||
|
import {
|
||||||
|
getUiScale,
|
||||||
|
setUiScale,
|
||||||
|
uiScaleToFactor,
|
||||||
|
UI_SCALE_OPTIONS,
|
||||||
|
type UiScaleOption,
|
||||||
|
} from "../global/displaySettings";
|
||||||
|
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
show: boolean;
|
show: boolean;
|
||||||
@@ -206,6 +258,9 @@ const strategyOptions: Array<{ value: TagPriorityStrategy; label: string }> = [
|
|||||||
{ value: "apm", label: "APM 优先" },
|
{ value: "apm", label: "APM 优先" },
|
||||||
];
|
];
|
||||||
|
|
||||||
|
// 界面缩放档位选项(90% / 100% / 110% / 125% / 150%)
|
||||||
|
const uiScaleOptions = UI_SCALE_OPTIONS;
|
||||||
|
|
||||||
const tagPriorityStrategy = ref<TagPriorityStrategy>("auto");
|
const tagPriorityStrategy = ref<TagPriorityStrategy>("auto");
|
||||||
|
|
||||||
// 加载标签优先显示策略(从持久化读取)
|
// 加载标签优先显示策略(从持久化读取)
|
||||||
@@ -219,6 +274,24 @@ const selectStrategy = (value: TagPriorityStrategy) => {
|
|||||||
setTagPriorityStrategy(value);
|
setTagPriorityStrategy(value);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// 界面整体缩放档位(Electron setZoomFactor,连图标/间距/布局等比变化)
|
||||||
|
const uiScale = ref<UiScaleOption>("100");
|
||||||
|
|
||||||
|
const loadUiScale = () => {
|
||||||
|
uiScale.value = getUiScale();
|
||||||
|
};
|
||||||
|
|
||||||
|
// 选择并保存界面缩放档位(立即经 IPC 应用到主窗口)
|
||||||
|
const selectUiScale = async (value: UiScaleOption) => {
|
||||||
|
uiScale.value = value;
|
||||||
|
setUiScale(value);
|
||||||
|
try {
|
||||||
|
await window.ipcRenderer.invoke("set-zoom-factor", uiScaleToFactor(value));
|
||||||
|
} catch (error) {
|
||||||
|
console.error("应用界面缩放失败:", error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
const settings = ref<Settings>({
|
const settings = ref<Settings>({
|
||||||
enableUpdateCheck: true,
|
enableUpdateCheck: true,
|
||||||
enableCreateDesktop: true,
|
enableCreateDesktop: true,
|
||||||
@@ -279,6 +352,7 @@ watch(
|
|||||||
if (newVal) {
|
if (newVal) {
|
||||||
loadSettings();
|
loadSettings();
|
||||||
loadTagPriority();
|
loadTagPriority();
|
||||||
|
loadUiScale();
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -42,7 +42,7 @@
|
|||||||
<button
|
<button
|
||||||
v-if="searchQuery"
|
v-if="searchQuery"
|
||||||
type="button"
|
type="button"
|
||||||
class="absolute right-2.5 top-1/2 -translate-y-1/2 text-slate-400 hover:text-slate-600 dark:text-slate-500 dark:hover:text-slate-300"
|
class="absolute flex right-2.5 top-1/2 -translate-y-1/2 text-slate-400 hover:text-slate-600 dark:text-slate-500 dark:hover:text-slate-300"
|
||||||
title="清除搜索"
|
title="清除搜索"
|
||||||
@click="clearSearch"
|
@click="clearSearch"
|
||||||
>
|
>
|
||||||
@@ -75,30 +75,28 @@
|
|||||||
<div class="mx-1 h-6 w-px bg-slate-300/70 dark:bg-slate-700/70"></div>
|
<div class="mx-1 h-6 w-px bg-slate-300/70 dark:bg-slate-700/70"></div>
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
class="rounded-md px-3 py-1.5 text-base transition hover:bg-slate-200/80 dark:hover:bg-slate-800"
|
class="fas fa-window-minimize rounded-md px-3 py-1.5 text-base transition hover:bg-slate-200/80 dark:hover:bg-slate-800"
|
||||||
aria-label="最小化"
|
aria-label="最小化"
|
||||||
title="最小化"
|
title="最小化"
|
||||||
@click="minimize"
|
@click="minimize"
|
||||||
>
|
>
|
||||||
−
|
|
||||||
</button>
|
</button>
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
class="rounded-md px-3 py-1.5 text-base transition hover:bg-slate-200/80 dark:hover:bg-slate-800"
|
class="fas rounded-md px-3 py-1.5 text-base transition hover:bg-slate-200/80 dark:hover:bg-slate-800"
|
||||||
|
:class="isMaximized ? 'fa-window-restore' : 'fa-window-maximize'"
|
||||||
aria-label="最大化或还原"
|
aria-label="最大化或还原"
|
||||||
title="最大化或还原"
|
title="最大化或还原"
|
||||||
@click="toggleMaximize"
|
@click="toggleMaximize"
|
||||||
>
|
>
|
||||||
□
|
|
||||||
</button>
|
</button>
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
class="rounded-md px-3 py-1 text-sm transition hover:bg-red-500 hover:text-white"
|
class="fas fa-times rounded-md px-3 py-1.5 text-base transition hover:bg-red-500 hover:text-white"
|
||||||
aria-label="关闭"
|
aria-label="关闭"
|
||||||
title="关闭"
|
title="关闭"
|
||||||
@click="close"
|
@click="close"
|
||||||
>
|
>
|
||||||
×
|
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</header>
|
</header>
|
||||||
@@ -110,6 +108,7 @@ import ThemeToggle from "./ThemeToggle.vue";
|
|||||||
defineProps<{
|
defineProps<{
|
||||||
searchQuery: string;
|
searchQuery: string;
|
||||||
themeMode: "light" | "dark" | "auto";
|
themeMode: "light" | "dark" | "auto";
|
||||||
|
isMaximized: boolean
|
||||||
}>();
|
}>();
|
||||||
|
|
||||||
const emit = defineEmits<{
|
const emit = defineEmits<{
|
||||||
|
|||||||
@@ -83,15 +83,13 @@
|
|||||||
v-if="item.ignored !== true && !task"
|
v-if="item.ignored !== true && !task"
|
||||||
class="flex shrink-0 flex-col items-end gap-0.5"
|
class="flex shrink-0 flex-col items-end gap-0.5"
|
||||||
>
|
>
|
||||||
<span class="text-[11px] font-semibold text-brand dark:text-amber-300">{{
|
<span
|
||||||
timeLabel
|
class="text-[11px] font-semibold text-brand dark:text-amber-300"
|
||||||
}}</span>
|
>{{ timeLabel }}</span
|
||||||
|
>
|
||||||
<span class="text-[10px] text-slate-400">{{ sizeLabel }}</span>
|
<span class="text-[10px] text-slate-400">{{ sizeLabel }}</span>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div v-else-if="!task" class="flex shrink-0 flex-col items-end gap-0.5">
|
||||||
v-else-if="!task"
|
|
||||||
class="flex shrink-0 flex-col items-end gap-0.5"
|
|
||||||
>
|
|
||||||
<span class="text-[11px] font-semibold text-slate-400">{{
|
<span class="text-[11px] font-semibold text-slate-400">{{
|
||||||
timeLabel
|
timeLabel
|
||||||
}}</span>
|
}}</span>
|
||||||
@@ -181,7 +179,8 @@ defineEmits<{
|
|||||||
|
|
||||||
// 被锁定且未强制时,复选框禁用(与「已忽略」一样不可被选中)
|
// 被锁定且未强制时,复选框禁用(与「已忽略」一样不可被选中)
|
||||||
const isSelectionLocked = computed(
|
const isSelectionLocked = computed(
|
||||||
() => props.item.ignored === true || (props.item.held === true && !props.forced),
|
() =>
|
||||||
|
props.item.ignored === true || (props.item.held === true && !props.forced),
|
||||||
);
|
);
|
||||||
|
|
||||||
const normalizeIconSrc = (icon: string): string => {
|
const normalizeIconSrc = (icon: string): string => {
|
||||||
|
|||||||
@@ -342,7 +342,9 @@ const openDetail = async (app: App | OpenDetailInput) => {
|
|||||||
|
|
||||||
currentApp.value = finalApp;
|
currentApp.value = finalApp;
|
||||||
currentScreenIndex.value = 0;
|
currentScreenIndex.value = 0;
|
||||||
// 截图以后端 img_urls 为候选并探测真实存在性;异步进行,详情页先打开不阻塞。
|
// 先清空截图,避免详情页渲染时残留上一个应用的图片(新图需异步探测后才填充)。
|
||||||
|
screenshots.value = [];
|
||||||
|
// 截图按固定路径拼接 screen_1~5.png 并探测真实存在性;异步进行,详情页先打开不阻塞。
|
||||||
// 每次打开取消上一轮探测,避免陈旧结果覆盖当前应用。
|
// 每次打开取消上一轮探测,避免陈旧结果覆盖当前应用。
|
||||||
if (screenshotAbortController) screenshotAbortController.abort();
|
if (screenshotAbortController) screenshotAbortController.abort();
|
||||||
screenshotAbortController = new AbortController();
|
screenshotAbortController = new AbortController();
|
||||||
@@ -439,26 +441,25 @@ const checkScreenshotExists = async (
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
// 截图来源以后端 img_urls 为候选(权威意图列表),但后端元数据可能"声明 N 张实存 M 张"
|
// 截图候选 URL 一律按固定规则前端拼接,最多 5 张(screen_1~5.png),并对每张探测真实存在性,
|
||||||
// (如飞书声明 5 张仅上传 3 张)。因此对候选逐一探测存在性,仅保留真实可用的 URL,
|
// 仅保留真实可用的 URL,保证"实际有几张就预览几张"。
|
||||||
// 既保证"实际有几张就预览几张",又兜底过滤后端脏数据导致的空白页。
|
// 注意:以下拼接路径(APM_STORE_BASE_URL / finalArch / category / pkgname / screen_N.png)
|
||||||
// 探测结果经内存缓存复用,同一应用多次打开不再重复请求。
|
// 直接对应服务器静态资源布局,属于权威路径,禁止修改或替换为 app.img_urls 等其它来源,
|
||||||
|
// 否则会导致截图全部 404(历史已踩坑:后端 img_urls 不准确)。
|
||||||
const loadScreenshots = async (app: App, signal?: AbortSignal) => {
|
const loadScreenshots = async (app: App, signal?: AbortSignal) => {
|
||||||
const raw = app.img_urls as unknown;
|
if (!app.category || app.category === "unknown") {
|
||||||
let candidates: string[] = [];
|
screenshots.value = [];
|
||||||
if (Array.isArray(raw)) {
|
return;
|
||||||
candidates = raw as string[];
|
|
||||||
} else if (typeof raw === "string" && raw.length > 0) {
|
|
||||||
try {
|
|
||||||
const parsed = JSON.parse(raw);
|
|
||||||
if (Array.isArray(parsed)) candidates = parsed as string[];
|
|
||||||
} catch {
|
|
||||||
candidates = [];
|
|
||||||
}
|
}
|
||||||
}
|
const arch = window.apm_store.arch || "amd64";
|
||||||
candidates = candidates.filter(
|
const finalArch = app.origin === "spark" ? `${arch}-store` : `${arch}-apm`;
|
||||||
(u): u is string => typeof u === "string" && u.length > 0,
|
|
||||||
|
const candidates: string[] = [];
|
||||||
|
for (let i = 1; i <= 5; i++) {
|
||||||
|
candidates.push(
|
||||||
|
`${APM_STORE_BASE_URL}/${finalArch}/${app.category}/${app.pkgname}/screen_${i}.png`,
|
||||||
);
|
);
|
||||||
|
}
|
||||||
|
|
||||||
// 先按缓存/同步填充已知结果,未知项异步探测;避免详情页打开后长时间空白
|
// 先按缓存/同步填充已知结果,未知项异步探测;避免详情页打开后长时间空白
|
||||||
const results = await Promise.all(
|
const results = await Promise.all(
|
||||||
|
|||||||
@@ -0,0 +1,76 @@
|
|||||||
|
/**
|
||||||
|
* 显示设置:界面整体缩放(Electron webContents.setZoomFactor)
|
||||||
|
*
|
||||||
|
* 通过 Electron 的 setZoomFactor 整体缩放渲染内容,连图标、间距、布局
|
||||||
|
* 一起等比放大/缩小(逻辑分辨率变化),不会破坏布局;与单纯改字号相比
|
||||||
|
* 更稳定,故本应用只提供此一种显示放大入口。
|
||||||
|
*
|
||||||
|
* 实际缩放由主进程 setZoomFactor 执行;渲染端仅负责持久化档位偏好,
|
||||||
|
* 并在启动时把档位换算的系数通过 IPC 告知主进程。
|
||||||
|
*/
|
||||||
|
|
||||||
|
export type UiScaleOption = "90" | "100" | "110" | "125" | "150";
|
||||||
|
|
||||||
|
// 档位 → 缩放系数(与 Electron setZoomFactor 一致,1 = 100%)
|
||||||
|
const UI_SCALE_MAP: Record<UiScaleOption, number> = {
|
||||||
|
"90": 0.9,
|
||||||
|
"100": 1,
|
||||||
|
"110": 1.1,
|
||||||
|
"125": 1.25,
|
||||||
|
"150": 1.5,
|
||||||
|
};
|
||||||
|
|
||||||
|
export const UI_SCALE_OPTIONS: Array<{
|
||||||
|
value: UiScaleOption;
|
||||||
|
label: string;
|
||||||
|
}> = [
|
||||||
|
{ value: "90", label: "90%" },
|
||||||
|
{ value: "100", label: "100%" },
|
||||||
|
{ value: "110", label: "110%" },
|
||||||
|
{ value: "125", label: "125%" },
|
||||||
|
{ value: "150", label: "150%" },
|
||||||
|
];
|
||||||
|
|
||||||
|
const UI_SCALE_STORAGE_KEY = "spark-store-ui-scale";
|
||||||
|
const DEFAULT_UI_SCALE: UiScaleOption = "100";
|
||||||
|
|
||||||
|
const isValidUiScale = (v: unknown): v is UiScaleOption =>
|
||||||
|
typeof v === "string" && v in UI_SCALE_MAP;
|
||||||
|
|
||||||
|
/** 读取持久化的界面缩放档位(无/非法时回退默认「100%」) */
|
||||||
|
export const getUiScale = (): UiScaleOption => {
|
||||||
|
try {
|
||||||
|
const raw = localStorage.getItem(UI_SCALE_STORAGE_KEY);
|
||||||
|
if (isValidUiScale(raw)) return raw;
|
||||||
|
} catch {
|
||||||
|
// localStorage 不可用时忽略,使用默认
|
||||||
|
}
|
||||||
|
return DEFAULT_UI_SCALE;
|
||||||
|
};
|
||||||
|
|
||||||
|
/** 将档位换算为 Electron 缩放系数 */
|
||||||
|
export const uiScaleToFactor = (option: UiScaleOption): number =>
|
||||||
|
UI_SCALE_MAP[option] ?? UI_SCALE_MAP[DEFAULT_UI_SCALE];
|
||||||
|
|
||||||
|
/** 选择并持久化界面缩放档位(不在此直接调用主进程,由调用方经 IPC 应用) */
|
||||||
|
export const setUiScale = (option: UiScaleOption): void => {
|
||||||
|
try {
|
||||||
|
localStorage.setItem(UI_SCALE_STORAGE_KEY, option);
|
||||||
|
} catch {
|
||||||
|
// 持久化失败时仍已在会话内选定,忽略写入错误
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 应用启动时初始化:从持久化恢复档位,并经 IPC 告知主进程应用缩放。
|
||||||
|
* 需在 App.vue onMounted 调用,主进程 createWindow 阶段已自有兜底(默认 1),
|
||||||
|
* 此处确保渲染端偏好生效。
|
||||||
|
*/
|
||||||
|
export const initUiScale = async (): Promise<void> => {
|
||||||
|
const factor = uiScaleToFactor(getUiScale());
|
||||||
|
try {
|
||||||
|
await window.ipcRenderer.invoke("set-zoom-factor", factor);
|
||||||
|
} catch {
|
||||||
|
// 主进程 IPC 不可用时忽略(主进程启动兜底已设为 1)
|
||||||
|
}
|
||||||
|
};
|
||||||
Vendored
+1
@@ -39,6 +39,7 @@ interface WindowControlBridge {
|
|||||||
minimize: () => void;
|
minimize: () => void;
|
||||||
toggleMaximize: () => void;
|
toggleMaximize: () => void;
|
||||||
close: () => void;
|
close: () => void;
|
||||||
|
state: () => Promise<| 'normal' | 'maximized' | 'minimized'>
|
||||||
}
|
}
|
||||||
|
|
||||||
// IPC channel type definitions
|
// IPC channel type definitions
|
||||||
|
|||||||
Reference in New Issue
Block a user