diff --git a/src/app/App.tsx b/src/app/App.tsx index eeda3821d..5d25939e6 100644 --- a/src/app/App.tsx +++ b/src/app/App.tsx @@ -22,6 +22,8 @@ import { initPluginEngine, r, } from "~/utils" +import { applyCustomize } from "~/utils/customize" +import { isTsWorker } from "~/utils/backend" import { MustUser, UserOrGuest } from "./MustUser" import "./index.css" import { globalStyles } from "./theme" @@ -57,7 +59,14 @@ const App: Component = () => { (async () => { handleRespWithoutAuthAndNotify( (await r.get("/public/settings")) as Resp>, - setSettings, + (data) => { + setSettings(data) + // 注入自定义 CSS/JS（customize_head/body）：仅 TS 模式前端运行时注入； + // Go 后端已在服务端完成注入，重复注入会导致自定义内容出现两次。 + if (isTsWorker()) { + applyCustomize() + } + }, (e) => setErr(err().concat(e)), ) })(), diff --git a/src/pages/manage/backup-restore.tsx b/src/pages/manage/backup-restore.tsx index 2e4589542..58682c9f3 100644 --- a/src/pages/manage/backup-restore.tsx +++ b/src/pages/manage/backup-restore.tsx @@ -300,12 +300,19 @@ const BackupRestore = () => { appendLog(t("br.wrong_encrypt_password"), "error") return } - const dataArray = Object.values(data) - for (let i = dataArray.length - 4; i < dataArray.length; i++) { - const obj = dataArray[i] - console.log(obj) - for (let a = 0; a < obj.length; a++) { - const obj1 = obj[a] + // 解密 settings + users/storages/metas/shares（备份时这 5 个数组均被加密）。 + // 原实现用 Object.values(data) 从 length-4 开始解密，会漏掉 settings + // （加密备份恢复后 settings 仍是密文，导致 customize_head/body 等配置失效）。 + for (const name of [ + "settings", + "users", + "storages", + "metas", + "shares", + ] as const) { + const arr = (data as any)[name] + if (!Array.isArray(arr)) continue + for (const obj1 of arr) { for (const key in obj1) { obj1[key] = decrypt(obj1[key], password(), false, encrypted) } diff --git a/src/utils/customize.ts b/src/utils/customize.ts new file mode 100644 index 000000000..2d905258f --- /dev/null +++ b/src/utils/customize.ts @@ -0,0 +1,43 @@ +import { getSetting } from "~/store/settings" + +/** + * 运行时注入自定义内容（对齐 Go 后端服务端注入 index.html 的 + * `` / `` 占位符）。 + * + * Go 后端在返回 HTML 前完成占位符替换；TS/静态部署前端 HTML 不经后端， + * 因此无法走服务端注入，改由前端在 settings 加载完成后动态注入： + * customize_head -> 注入到 末尾 + * customize_body -> 注入到 末尾 + * + * 注意：insertAdjacentHTML / innerHTML 不会执行插入的