From 9cbec9034766f151dc9b75886f8f5c810a666bf3 Mon Sep 17 00:00:00 2001 From: jinghui Date: Sun, 15 Nov 2026 12:24:14 +0800 Subject: [PATCH] =?UTF-8?q?feat(autosave):=20=E6=89=BE=E5=9B=9E=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E7=89=88=E6=9C=AC=E2=80=94=E2=80=94=E3=80=8C=E6=89=BE?= =?UTF-8?q?=E5=9B=9E=E3=80=8D=E9=9D=A2=E6=9D=BF=E4=B8=80=E9=94=AE=E6=81=A2?= =?UTF-8?q?=E5=A4=8D=E4=BB=BB=E6=84=8F=E4=BF=9D=E5=AD=98=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - AutosaveBar 新增「找回」按钮与历史面板:列出该工具近20份保存留档(时间精确到秒),点任意一条立即恢复成该版继续编辑 - autosave.ts 导出 loadHistory/restoreVersion - relay 新增 /draft/history 与 /draft/load?ts= 端点;save 落盘留档20份,同秒连续保存只覆盖不重复占档 - README 自动保存章节补「找回历史版本」;Home NEW_FEATURES 置顶条目 - 同步 in-repo relay 副本 server.py --- README.md | 3 +- docker/it-tools-relay/server.py | 156 ++++++++++++++++++++++++++++++++ src/components/AutosaveBar.vue | 154 ++++++++++++++++++++++++++++++- src/composable/autosave.ts | 51 +++++++++-- src/pages/Home.page.vue | 1 + 5 files changed, 352 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index f3ccd0e..cc749c9 100644 --- a/README.md +++ b/README.md @@ -121,8 +121,9 @@ - **「立即保存」按钮全程可点**(保存中除外):idle 态点一下即保存当前内容 - **离开拦截**:未保存就刷新、关闭、站内前进后退时提示「当前内容还没保存,离开会丢失」——点「确定」= 先保存再离开,点「取消」= 留在本页 - **刷新自动恢复**:重新进入工具页自动还原上次未保存的内容 +- **找回历史版本**(2026-11-15 新增):状态条上的「找回」按钮列出该工具的保存历史(服务端留档 20 份,时间精确到秒),点任意一条立即把页面内容恢复成那一版,随后可继续编辑;内容没有变化的重复保存只更新时间,不会重复占档 -> 实现:通用 DOM 快照一次性覆盖全部工具(无需逐个改造),字段定位用 `name > tag:type:组内序号`(框架动态 id 每次刷新都会变,实测不能用);服务端三端点 `/draft/save|load|delete`,按机器码隔离。 +> 实现:通用 DOM 快照一次性覆盖全部工具(无需逐个改造),字段定位用 `name > tag:type:组内序号`(框架动态 id 每次刷新都会变,实测不能用);服务端四端点 `/draft/save|load|history|delete`,按机器码隔离。 ### 历史记录 100 条上限(2026.11 新增) diff --git a/docker/it-tools-relay/server.py b/docker/it-tools-relay/server.py index 2d3e1fe..d34f23b 100644 --- a/docker/it-tools-relay/server.py +++ b/docker/it-tools-relay/server.py @@ -2417,6 +2417,12 @@ class Handler(BaseHTTPRequestHandler): if parsed.path == "/ai/img-history": self._handle_img_history() return + if parsed.path == "/draft/load": + self._handle_draft_load(parsed) + return + if parsed.path == "/draft/history": + self._handle_draft_history(parsed) + return if parsed.path.startswith("/ai/img/"): self._handle_img_file(parsed) return @@ -3435,6 +3441,12 @@ class Handler(BaseHTTPRequestHandler): if parsed.path == "/ai/img-save": self._handle_img_save() return + if parsed.path == "/draft/save": + self._handle_draft_save() + return + if parsed.path == "/draft/delete": + self._handle_draft_delete() + return if parsed.path == "/ai/edit-image": self._handle_edit_image() return @@ -3850,6 +3862,150 @@ class Handler(BaseHTTPRequestHandler): log_usage(machine, tool) self._reply(200, json.dumps({"code": 200, "message": "ok", "data": {"img_url": img_url}}, ensure_ascii=False).encode("utf-8"), "application/json") + # ---------- 全站草稿自动保存(每 1 分钟 / 立即保存按钮 / 离开拦截)---------- + @staticmethod + def _draft_path(machine: str, tool: str) -> str: + """校验并映射到 DATA_DIR/drafts//.json;非法返回空串。""" + m = MACHINE_RE.match(machine or "") + t = re.sub(r"[^A-Za-z0-9_-]", "", tool or "")[:64] + if not m or not t: + return "" + return os.path.join(DATA_DIR, "drafts", m.group(0), t + ".json") + + def _handle_draft_save(self): + payload = self._read_payload() + machine = str(payload.get("machine") or "") + tool = str(payload.get("tool") or "") + path = self._draft_path(machine, tool) + if not path: + self._reply(400, json.dumps({"code": 400, "message": "bad machine/tool"}, ensure_ascii=False).encode("utf-8"), "application/json") + return + state = payload.get("state") + try: + raw = json.dumps(state, ensure_ascii=False) + except (TypeError, ValueError): + self._reply(400, json.dumps({"code": 400, "message": "bad state"}, ensure_ascii=False).encode("utf-8"), "application/json") + return + if len(raw.encode("utf-8")) > 300 * 1024: + self._reply(413, json.dumps({"code": 413, "message": "草稿超过 300KB 限制"}, ensure_ascii=False).encode("utf-8"), "application/json") + return + try: + os.makedirs(os.path.dirname(path), exist_ok=True) + rec = {"tool": tool[:64], "machine": machine, "ts": int(time.time()), "state": state} + tmp = path + ".tmp" + with open(tmp, "w", encoding="utf-8") as f: + json.dump(rec, f, ensure_ascii=False) + os.replace(tmp, path) + except OSError: + self._reply(500, json.dumps({"code": 500, "message": "保存失败"}, ensure_ascii=False).encode("utf-8"), "application/json") + return + # 追加历史版本(保留最近 20 版,供前端「找回」面板选择回填) + try: + hpath = path[:-5] + ".hist.json" + hist = [] + if os.path.isfile(hpath): + with open(hpath, "r", encoding="utf-8") as f: + loaded = json.load(f) + if isinstance(loaded, list): + hist = [h for h in loaded if isinstance(h, dict)] + # 连续保存相同内容不重复入档(只更新最新一条时间戳) + if hist and hist[0].get("state") == state: + hist[0]["ts"] = rec["ts"] + elif hist and hist[0].get("ts") == rec["ts"]: + # 同一秒内的连续保存:按最新内容覆盖,避免出现两条同时间条目 + hist[0] = {"ts": rec["ts"], "state": state} + else: + hist.insert(0, {"ts": rec["ts"], "state": state}) + hist = hist[:20] + tmp2 = hpath + ".tmp" + with open(tmp2, "w", encoding="utf-8") as f: + json.dump(hist, f, ensure_ascii=False) + os.replace(tmp2, hpath) + except (OSError, ValueError, TypeError): + pass # 历史写入失败不影响主保存 + self._reply(200, json.dumps({"code": 200, "message": "ok", "data": {"ts": rec["ts"]}}, ensure_ascii=False).encode("utf-8"), "application/json") + + def _handle_draft_load(self, parsed): + qs = parse.parse_qs(parsed.query) + machine = str((qs.get("machine") or [""])[0] or "") + tool = str((qs.get("tool") or [""])[0] or "") + try: + want_ts = int((qs.get("ts") or ["0"])[0] or 0) + except ValueError: + want_ts = 0 + path = self._draft_path(machine, tool) + if not path: + self._reply(400, json.dumps({"code": 400, "message": "bad machine/tool"}, ensure_ascii=False).encode("utf-8"), "application/json") + return + data = None + # 指定 ts:从历史版本里找回该条 + if want_ts > 0: + hpath = path[:-5] + ".hist.json" + if os.path.isfile(hpath): + try: + with open(hpath, "r", encoding="utf-8") as f: + hist = json.load(f) + if isinstance(hist, list): + for h in hist: + if isinstance(h, dict) and int(h.get("ts") or 0) == want_ts: + data = {"state": h.get("state"), "ts": want_ts} + break + except (OSError, ValueError, TypeError): + data = None + else: + if os.path.isfile(path): + try: + with open(path, "r", encoding="utf-8") as f: + rec = json.load(f) + data = {"state": rec.get("state"), "ts": int(rec.get("ts") or 0)} + except (OSError, ValueError): + data = None + self._reply(200, json.dumps({"code": 200, "message": "ok", "data": data}, ensure_ascii=False).encode("utf-8"), "application/json") + + def _handle_draft_history(self, parsed): + """历史版本清单(只回 ts/bytes,不回 state,面板按需逐条取)。""" + qs = parse.parse_qs(parsed.query) + machine = str((qs.get("machine") or [""])[0] or "") + tool = str((qs.get("tool") or [""])[0] or "") + path = self._draft_path(machine, tool) + if not path: + self._reply(400, json.dumps({"code": 400, "message": "bad machine/tool"}, ensure_ascii=False).encode("utf-8"), "application/json") + return + items = [] + hpath = path[:-5] + ".hist.json" + if os.path.isfile(hpath): + try: + with open(hpath, "r", encoding="utf-8") as f: + hist = json.load(f) + if isinstance(hist, list): + for h in hist: + if not isinstance(h, dict): + continue + st = h.get("state") + try: + b = len(json.dumps(st, ensure_ascii=False).encode("utf-8")) if st is not None else 0 + except (TypeError, ValueError): + b = 0 + items.append({"ts": int(h.get("ts") or 0), "bytes": b}) + except (OSError, ValueError): + items = [] + self._reply(200, json.dumps({"code": 200, "message": "ok", "data": {"items": items}}, ensure_ascii=False).encode("utf-8"), "application/json") + + def _handle_draft_delete(self): + payload = self._read_payload() + machine = str(payload.get("machine") or "") + tool = str(payload.get("tool") or "") + path = self._draft_path(machine, tool) + if not path: + self._reply(400, json.dumps({"code": 400, "message": "bad machine/tool"}, ensure_ascii=False).encode("utf-8"), "application/json") + return + try: + if os.path.isfile(path): + os.remove(path) + except OSError: + pass + self._reply(200, json.dumps({"code": 200, "message": "ok"}, ensure_ascii=False).encode("utf-8"), "application/json") + def _handle_img_history(self): parsed = parse.urlparse(self.path) qs = parse.parse_qs(parsed.query) diff --git a/src/components/AutosaveBar.vue b/src/components/AutosaveBar.vue index 8ca008b..b4a04cc 100644 --- a/src/components/AutosaveBar.vue +++ b/src/components/AutosaveBar.vue @@ -1,7 +1,7 @@