From 04a2e436d6939d229ced46ebdf2ed12e84758064 Mon Sep 17 00:00:00 2001 From: kicer Date: Wed, 23 Sep 2026 23:57:26 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=8C=E8=BF=94=E5=9B=9E=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E3=80=8D=E5=8D=87=E7=BA=A7=E4=B8=BA=E5=9B=9E=E5=88=B0=E6=BA=90?= =?UTF-8?q?=E4=BC=9A=E8=AF=9D:FAB=E9=93=BE=E7=AE=80=E5=8C=96=E4=B8=BA?= =?UTF-8?q?=E6=B7=B1=E9=93=BE=E2=80=94=E2=80=94=E6=95=B0=E6=8D=AE=E9=A1=B5?= =?UTF-8?q?task=5Fid=E5=8D=B3=E4=BC=9A=E8=AF=9Did(engine=E9=87=8C1:1),back?= =?UTF-8?q?ToApp()=E7=9B=B4=E6=8E=A5=E8=B7=B3/=3Fs=3D;=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E5=90=AF=E5=8A=A8(settings.js=E6=96=87=E6=9C=ABinit)?= =?UTF-8?q?=E6=B6=88=E8=B4=B9=E4=B8=80=E6=AC=A1:=E5=91=BD=E4=B8=AD?= =?UTF-8?q?=E5=8D=B3openSession+replaceState=E6=8A=B9=E5=8F=82=E6=95=B0(?= =?UTF-8?q?=E9=98=B2=E5=88=B7=E6=96=B0=E9=92=89=E5=9B=9E),=E4=BC=9A?= =?UTF-8?q?=E8=AF=9D=E5=B7=B2=E5=88=A0=E8=B5=B0openSession=E8=87=AA?= =?UTF-8?q?=E5=B8=A6=E6=8A=A5=E9=94=99=E8=90=BD=E5=9C=A8welcome=E3=80=82JS?= =?UTF-8?q?=E6=A1=A5/=3Ffrom=3D/history.back=E6=95=B4=E6=9D=A1=E9=93=BE?= =?UTF-8?q?=E7=A7=BB=E9=99=A4=E2=80=94=E2=80=94back=E5=9C=A8=E5=A4=9A?= =?UTF-8?q?=E9=A1=B5=E6=95=B0=E6=8D=AE=E5=BA=94=E7=94=A8=E9=87=8C=E9=80=80?= =?UTF-8?q?=E7=9A=84=E6=98=AF=E4=B8=8A=E4=B8=80=E5=BC=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=A1=B5(=E9=82=A3=E6=98=AF=E3=80=8C=E4=B8=8A=E4=B8=80?= =?UTF-8?q?=E9=A1=B5=E3=80=8D=E8=AF=AD=E4=B9=89,=E5=BD=92=E9=A1=B6?= =?UTF-8?q?=E9=83=A8=E8=BF=94=E5=9B=9E=E5=AF=BC=E8=88=AA=E7=AE=A1),?= =?UTF-8?q?=E6=A1=A5=E4=B8=8Efrom=E5=9D=87=E6=97=A0=E7=9C=9F=E5=AE=9E?= =?UTF-8?q?=E6=B6=88=E8=B4=B9=E6=96=B9,=E7=A1=AE=E5=AE=9A=E6=80=A7?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E8=83=9C=E8=BF=87=E7=8C=9C=E7=8E=AF=E5=A2=83?= =?UTF-8?q?;=E6=8C=89=E9=92=AE=E6=96=87=E6=A1=88=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E2=86=92=E8=BF=94=E5=9B=9E=E5=AF=B9=E8=AF=9D?= =?UTF-8?q?(=E6=88=BF=E5=AD=90=E5=9B=BE=E6=A0=87=E4=B8=8D=E5=8F=98,?= =?UTF-8?q?=E8=AF=AD=E4=B9=89=E7=BB=88=E4=BA=8E=E9=85=8D=E5=BE=97=E4=B8=8A?= =?UTF-8?q?=E5=9B=BE=E6=A0=87);SKILL.md=E5=A5=91=E7=BA=A6=E5=90=8C?= =?UTF-8?q?=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/server/public/js/settings.js | 10 +++++++++- skills/data-page/SKILL.md | 4 ++-- skills/data-page/templates/dashboard.html | 19 +++++++------------ skills/data-page/templates/kanban.html | 19 +++++++------------ skills/data-page/templates/table.html | 19 +++++++------------ 5 files changed, 32 insertions(+), 39 deletions(-) diff --git a/app/server/public/js/settings.js b/app/server/public/js/settings.js index 4abcf1f..a7e55ff 100644 --- a/app/server/public/js/settings.js +++ b/app/server/public/js/settings.js @@ -1465,5 +1465,13 @@ } } catch (_) { /* 网络错误放过,让后续请求正常走 */ } loadSessionList(); - loadDrawerUser(verifiedUser); // 侧边栏底部展示真实登录用户(未启用认证/拉取失败时静默回退默认占位) + loadDrawerUser(verifiedUser); // 侧边栏底部展示真实登录用户(未启用鉴权/拉取失败时静默回退默认占位) + // 会话深链 /?s=:数据页面(/app/{task_id}/...)的「返回会话」FAB 用—— + // task_id 即会话 id(engine 里 1:1),启动时消费一次即 replaceState 抹掉参数, + // 避免刷新/分享时被钉回该会话;会话已删则 openSession 自行报错,落在 welcome。 + const deep = new URLSearchParams(location.search).get('s'); + if (deep) { + history.replaceState(null, '', '/'); + openSession(deep); + } })(); diff --git a/skills/data-page/SKILL.md b/skills/data-page/SKILL.md index c813dcc..1105a37 100644 --- a/skills/data-page/SKILL.md +++ b/skills/data-page/SKILL.md @@ -83,7 +83,7 @@ const taskId = location.pathname.split('/').filter(Boolean)[1]; - 桌面优先、移动兼容的样式:容器宽度按页面类型给足(表格类 1200px、看板类 1400px 或不设、统计类 1080px),不要照搬 800px 级别的移动端尺寸 - 通过 `fetch` 调用数据 API - 错误处理和加载状态 -- **返回应用入口**:右下角 FAB(.fab,内联 SVG 图标),onclick 走 `returnToApp()`,优先级链:APK 注册的 JS 桥(`window.Android.backToApp` / webkit handler,有则最干净)→ `?from=` 参数(须站内绝对路径,防开放重定向)→ `history.back()` → 根路径。**每一个 `app/*.html` 页面(含 index.html)都要带**——用户可能从任意子页直入,缺入口即被困住 +- **返回应用入口**:右下角 FAB(房子图标),`backToApp()` 跳主界面深链 `/?s=`——数据页面的 task_id 就是会话 id,一点直达发起本页的对话;若未来 APK 提供 JS 桥,只需替换 `backToApp()` 一处。**每一个 `app/*.html` 页面(含 index.html)都要带**——用户可能从任意子页直入,缺出口即被困住 ## 模板 @@ -216,5 +216,5 @@ const taskId = location.pathname.split('/').filter(Boolean)[1]; - [ ] 页面动态解析 task_id - [ ] 包含错误处理和加载状态 - [ ] 用户输入渲染时已转义 -- [ ] 每个 `app/*.html` 页面右下角都有「返回应用」FAB(returnToApp 链完整) +- [ ] 每个 `app/*.html` 页面右下角都有「返回会话」FAB(backToApp → `/?s=` 深链) - [ ] 已告知用户完整访问 URL(run 输出「访问地址」那行,含域名,非相对路径) diff --git a/skills/data-page/templates/dashboard.html b/skills/data-page/templates/dashboard.html index ae677ef..fb84b68 100644 --- a/skills/data-page/templates/dashboard.html +++ b/skills/data-page/templates/dashboard.html @@ -71,7 +71,7 @@ body { padding-bottom: calc(72px + env(safe-area-inset-bottom)); } - @@ -140,17 +140,12 @@ async function init() { document.getElementById('table').innerHTML = ''; } } -// 返回应用主界面(APK WebView 场景):① APK 注册的 JS 桥(Android.backToApp / iOS handler,有则最干净) -// ② ?from=(限站内绝对路径,防开放重定向)③ history.back ④ 根路径(agent 主界面)。 -// 纯浏览器里 ③④ 恰好落在「回上一页/首页」,无需环境判断也行为合理。 -function returnToApp() { - if (window.Android && typeof window.Android.backToApp === 'function') { window.Android.backToApp(); return; } - if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.backToApp) { - window.webkit.messageHandlers.backToApp.postMessage({}); return; - } - const from = new URLSearchParams(location.search).get('from'); - if (from && /^\/(?!\/)/.test(from)) { location.href = from; return; } - if (history.length > 1) history.back(); else location.href = '/'; +// 返回应用=回到发起本页的对话:主界面深链 /?s=<会话id>(数据页的 task_id 就是会话 id, +// engine 里 1:1),前端启动时消费一次打开该会话。刻意不用 history.back():多页数据应用里 +// back 退的是上一张数据页——那是「上一页」语义,归顶部「返回导航」管。 +function backToApp() { + const id = location.pathname.split('/').filter(Boolean)[1]; + location.href = id ? '/?s=' + encodeURIComponent(id) : '/'; } init(); diff --git a/skills/data-page/templates/kanban.html b/skills/data-page/templates/kanban.html index d422fb0..04fc0df 100644 --- a/skills/data-page/templates/kanban.html +++ b/skills/data-page/templates/kanban.html @@ -63,7 +63,7 @@ body { padding-bottom: calc(72px + env(safe-area-inset-bottom)); }
加载中…
- @@ -160,17 +160,12 @@ function bind() { }); } -// 返回应用主界面(APK WebView 场景):① APK 注册的 JS 桥(Android.backToApp / iOS handler,有则最干净) -// ② ?from=(限站内绝对路径,防开放重定向)③ history.back ④ 根路径(agent 主界面)。 -// 纯浏览器里 ③④ 恰好落在「回上一页/首页」,无需环境判断也行为合理。 -function returnToApp() { - if (window.Android && typeof window.Android.backToApp === 'function') { window.Android.backToApp(); return; } - if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.backToApp) { - window.webkit.messageHandlers.backToApp.postMessage({}); return; - } - const from = new URLSearchParams(location.search).get('from'); - if (from && /^\/(?!\/)/.test(from)) { location.href = from; return; } - if (history.length > 1) history.back(); else location.href = '/'; +// 返回应用=回到发起本页的对话:主界面深链 /?s=<会话id>(数据页的 task_id 就是会话 id, +// engine 里 1:1),前端启动时消费一次打开该会话。刻意不用 history.back():多页数据应用里 +// back 退的是上一张数据页——那是「上一页」语义,归顶部「返回导航」管。 +function backToApp() { + const id = location.pathname.split('/').filter(Boolean)[1]; + location.href = id ? '/?s=' + encodeURIComponent(id) : '/'; } load(); diff --git a/skills/data-page/templates/table.html b/skills/data-page/templates/table.html index b67d186..ef6408e 100644 --- a/skills/data-page/templates/table.html +++ b/skills/data-page/templates/table.html @@ -106,7 +106,7 @@ body { padding-bottom: calc(72px + env(safe-area-inset-bottom)); } - @@ -279,17 +279,12 @@ document.getElementById('dlgForm').onsubmit = async e => { } catch (e) { alert('新增失败:' + e.message); } }; -// 返回应用主界面(APK WebView 场景):① APK 注册的 JS 桥(Android.backToApp / iOS handler,有则最干净) -// ② ?from=(限站内绝对路径,防开放重定向)③ history.back ④ 根路径(agent 主界面)。 -// 纯浏览器里 ③④ 恰好落在「回上一页/首页」,无需环境判断也行为合理。 -function returnToApp() { - if (window.Android && typeof window.Android.backToApp === 'function') { window.Android.backToApp(); return; } - if (window.webkit && window.webkit.messageHandlers && window.webkit.messageHandlers.backToApp) { - window.webkit.messageHandlers.backToApp.postMessage({}); return; - } - const from = new URLSearchParams(location.search).get('from'); - if (from && /^\/(?!\/)/.test(from)) { location.href = from; return; } - if (history.length > 1) history.back(); else location.href = '/'; +// 返回应用=回到发起本页的对话:主界面深链 /?s=<会话id>(数据页的 task_id 就是会话 id, +// engine 里 1:1),前端启动时消费一次打开该会话。刻意不用 history.back():多页数据应用里 +// back 退的是上一张数据页——那是「上一页」语义,归顶部「返回导航」管。 +function backToApp() { + const id = location.pathname.split('/').filter(Boolean)[1]; + location.href = id ? '/?s=' + encodeURIComponent(id) : '/'; } load();