From 08dfac52cd82f1d0f1ae02ac6c45e3fc7bca5d4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=BF=85=E8=86=80?= Date: Sat, 17 Oct 2026 02:52:14 +0800 Subject: [PATCH] feat(console): reorder a group's routes by drag or keyboard The per-card up/down arrows saved after every single step, so moving a route five places took five writes. A Reorder mode on the group page now swaps each card's switch for a drag handle: pointer drags (mouse and touch) slide the neighbours out of the way and auto-scroll near the viewport edges, Arrow Up/Down on a focused handle moves a card by one and is announced to screen readers, and nothing is written until Save order. Cancel or Escape (unless a dialog or list owns it) drops the draft. The cards move into a new RouteList component that owns the drag state. --- AGENTS.md | 4 +- README.md | 2 +- README.zh.md | 2 +- app/assets/css/main.css | 48 ++++++ app/components/ConsolePage.vue | 161 +++++++++++++++----- app/components/RouteCard.vue | 69 +++++---- app/components/RouteList.vue | 265 +++++++++++++++++++++++++++++++++ app/composables/useI18n.ts | 16 ++ docs/guide/routes.md | 4 + docs/zh/guide/routes.md | 4 + 10 files changed, 504 insertions(+), 71 deletions(-) create mode 100644 app/components/RouteList.vue diff --git a/AGENTS.md b/AGENTS.md index 24713c9..bd73bde 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -37,8 +37,8 @@ app/ # Vue 3 UI (Nuxt app dir) ├── assets/css/main.css # Tailwind v4 entry: Elysola-compatible RGB aliases + bespoke layout classes + Vue transition glue ├── pages/ # index (landing), terms, privacy, admin/[...slug] (console SPA) ├── components/ # ConsolePage (sidebar shell + topbar), AdminHome (overview dashboard), -│ # RouteCard/Editor (RouteEditor has FilterNodeEditor AST builder + TagInput chips), -│ # GroupEditor, MembersPanel, WebhookPanel, +│ # RouteList (drag/keyboard reorder mode) + RouteCard, RouteEditor (FilterNodeEditor +│ # AST builder + TagInput chips), GroupEditor, MembersPanel, WebhookPanel, │ # ConfirmDialog (app-wide destructive-action confirm), SendLogs, AuditLog, MetricsPanel, │ # AppToasts, LegalLayout ├── composables/ # useI18n, useToasts, useConfirm (promise-based confirm), useGroups, useGroupRoutes, useFilterNode (AST helpers), useFragments, useLogs, diff --git a/README.md b/README.md index 19290be..c793883 100644 --- a/README.md +++ b/README.md @@ -107,7 +107,7 @@ Routes are stored in D1 (`d1_routes`, seeded from legacy KV `config:routes` on f ### Web UI (`/admin`) -The built-in config console lets you manage routes and groups in the browser (add / edit / delete / toggle / reorder), inspect send logs, manage group members and invite links, and read the audit log — no KV access needed: +The built-in config console lets you manage routes and groups in the browser (add / edit / delete / toggle / drag to reorder — the saved order is the evaluation order), inspect send logs, manage group members and invite links, and read the audit log — no KV access needed: 1. Set `ADMIN_USER_IDS` to the GitHub user IDs (or logins) allowed to manage the console, e.g. `ADMIN_USER_IDS=12345,RhenCloud`. 2. Visit `/admin` and sign in with GitHub. Users with no access get `403` — unless `ALLOW_SELF_SIGNUP=1` (they receive a personal group) or they follow a group invite link. diff --git a/README.zh.md b/README.zh.md index 433f5ea..b712a40 100644 --- a/README.zh.md +++ b/README.zh.md @@ -107,7 +107,7 @@ bunx wrangler dev # 启动本地开发服务器 ### Web 控制台(`/admin`) -内置的配置控制台让你在浏览器中管理路由与分组(新增 / 编辑 / 删除 / 开关 / 排序)、查看发送日志、管理组成员与邀请链接、阅读审计日志——无需直接操作 D1 或 KV: +内置的配置控制台让你在浏览器中管理路由与分组(新增 / 编辑 / 删除 / 开关 / 拖动排序——保存的顺序即评估顺序)、查看发送日志、管理组成员与邀请链接、阅读审计日志——无需直接操作 D1 或 KV: 1. 设置 `ADMIN_USER_IDS` 为允许管理控制台的 GitHub 用户 ID(或登录名),例如 `ADMIN_USER_IDS=12345,RhenCloud`。 2. 访问 `/admin` 并用 GitHub 登录。无任何权限的用户收到 `403`——除非开启 `ALLOW_SELF_SIGNUP=1`(自动获得个人分组)或通过分组邀请链接加入。 diff --git a/app/assets/css/main.css b/app/assets/css/main.css index 4529a82..f76b82f 100644 --- a/app/assets/css/main.css +++ b/app/assets/css/main.css @@ -290,6 +290,8 @@ .route-card { @apply block animate-rise rounded-xl border border-border bg-surface px-4 py-3 shadow-xs transition-all duration-150; + /* Only the entry delay keeps the hidden state: inline transforms (drag) must win afterwards. */ + animation-fill-mode: backwards; } .route-card:hover { @@ -414,6 +416,52 @@ @apply min-w-0 truncate font-mono text-[11.5px] text-text; } + /* ---- Route reordering ---- */ + .route-handle { + @apply grid h-9 w-9 cursor-grab place-items-center rounded-lg text-muted transition-colors hover:bg-surface-2 hover:text-text; + touch-action: none; + } + + .route-handle:disabled { + @apply cursor-not-allowed opacity-40 hover:bg-transparent; + } + + .route-handle:focus-visible { + @apply outline-2 outline-offset-2 outline-accent; + } + + .route-list.is-reordering .route-card { + @apply select-none; + } + + .route-list.is-dragging .route-card { + transition: transform 180ms ease; + } + + .route-list.is-dragging .route-handle { + @apply cursor-grabbing; + } + + .route-list .route-card.is-dragged { + @apply relative z-10 border-accent shadow-lg; + transition: none; + } + + .route-list .route-card.is-dragged.is-settling { + transition: transform 150ms ease; + } + + .route-list.is-committing .route-card { + transition: none !important; + } + + @media (prefers-reduced-motion: reduce) { + .route-list.is-dragging .route-card, + .route-list .route-card.is-dragged.is-settling { + transition: none; + } + } + /* ---- Toggle switch ---- */ .switch { @apply relative h-[22px] w-[38px] flex-shrink-0; diff --git a/app/components/ConsolePage.vue b/app/components/ConsolePage.vue index 63d041d..3efd412 100644 --- a/app/components/ConsolePage.vue +++ b/app/components/ConsolePage.vue @@ -49,7 +49,7 @@ >{{ t("app.langToggle") }} {{ t("app.newRoute") }} @@ -101,28 +101,53 @@ >

{{ t("group.routesIn", { name: selectedGroup.name }) }}

- {{ - groupRoutes.length - }} +
+ {{ + groupRoutes.length + }} + + {{ t("routes.reorder") }} +
+

{{ t("routes.reorderHint") }}

{{ groupRoutesError }}

-
- -
+
@@ -325,6 +350,8 @@ import { Activity, ArrowLeft, ArrowRight, + ArrowUpDown, + Check, ClipboardList, Gauge, Languages, @@ -465,6 +492,22 @@ const groupEditorOpen = ref(false); const editingGroup = ref(null); const savingGroup = ref(false); +/** Reorder mode: the draft order the user drags until it is saved or cancelled. */ +const reordering = ref(false); +const orderDraft = ref([]); +const savingOrder = ref(false); +/** A dropped card is still settling; its new position is not in the draft yet. */ +const reorderBusy = ref(false); +const orderChanged = computed( + () => + orderDraft.value.length !== groupRoutes.value.length || + orderDraft.value.some((r, i) => r.id !== groupRoutes.value[i]?.id), +); +const canReorder = computed( + () => + !!selectedGroup.value && canEditRoutes(selectedGroup.value.id) && groupRoutes.value.length > 1, +); + const logFilterGroup = ref(""); const auditFilterGroup = ref(""); const metricsFilterGroup = ref(""); @@ -507,16 +550,66 @@ async function refreshOverview(): Promise { } function enterGroup(group: Group): void { + cancelReorder(); selectedGroup.value = group; groupRoutes.value = []; loadGroupRoutes(group.id); } function exitGroup(): void { + cancelReorder(); selectedGroup.value = null; loadGroups(); } +function startReorder(): void { + if (groupRoutesLoading.value || saving.value) return; + orderDraft.value = [...groupRoutes.value]; + reorderBusy.value = false; + reordering.value = true; +} + +function cancelReorder(): void { + reordering.value = false; + reorderBusy.value = false; + orderDraft.value = []; +} + +async function saveOrder(): Promise { + const group = selectedGroup.value; + if (!group || !orderChanged.value || reorderBusy.value || savingOrder.value) return; + savingOrder.value = true; + try { + await saveGroupRoutes(group.id, orderDraft.value); + cancelReorder(); + push(t("toast.orderSaved")); + } catch (err) { + push(t("toast.saveFailed", { msg: err instanceof Error ? err.message : String(err) }), "bad"); + } finally { + savingOrder.value = false; + } +} + +function onReorderKey(event: KeyboardEvent): void { + if (event.key !== "Escape" || savingOrder.value || event.defaultPrevented) return; + // Escape closes an open dialog or list first (e.g. a member-removal + // confirmation); it must not also throw away the unsaved order. + const target = event.target instanceof Element ? event.target : null; + if ( + target?.closest('[role="dialog"], [role="alertdialog"], [role="listbox"], [role="menu"]') || + document.querySelector('[role="dialog"], [role="alertdialog"]') + ) + return; + cancelReorder(); +} + +watch(reordering, (on) => { + if (on) window.addEventListener("keydown", onReorderKey); + else window.removeEventListener("keydown", onReorderKey); +}); + +onBeforeUnmount(() => window.removeEventListener("keydown", onReorderKey)); + function openNew(): void { editing.value = null; editorOpen.value = true; @@ -552,22 +645,6 @@ async function onSave(route: Route): Promise { } } -async function onMove(route: Route, dir: -1 | 1): Promise { - const group = selectedGroup.value; - if (!group) return; - const i = groupRoutes.value.findIndex((r) => r.id === route.id); - const j = i + dir; - if (i < 0 || j < 0 || j >= groupRoutes.value.length) return; - const next = [...groupRoutes.value]; - [next[i], next[j]] = [next[j]!, next[i]!]; - try { - await saveGroupRoutes(group.id, next); - } catch (err) { - push(t("toast.saveFailed", { msg: err instanceof Error ? err.message : String(err) }), "bad"); - loadGroupRoutes(group.id); - } -} - async function onToggle(route: Route): Promise { const group = selectedGroup.value; if (!group) return; @@ -849,9 +926,10 @@ async function onDeleteGroup(group: Group): Promise { } .console-context-bar { display: flex; + flex-wrap: wrap; align-items: center; justify-content: space-between; - gap: 1rem; + gap: 0.75rem 1rem; margin-bottom: 1rem; padding: 0.8rem 1rem; border: 1px solid rgb(var(--wh-border)); @@ -873,6 +951,17 @@ async function onDeleteGroup(group: Group): Promise { font-size: 1.25rem; letter-spacing: -0.04em; } +.console-context-actions { + display: flex; + align-items: center; + gap: 0.5rem; + margin-left: auto; +} +.console-context-bar .console-reorder-hint { + flex-basis: 100%; + font-size: 0.78rem; + font-weight: 500; +} .console-empty { padding: 4rem 1rem; } diff --git a/app/components/RouteCard.vue b/app/components/RouteCard.vue index 07cd89c..4c2cf2c 100644 --- a/app/components/RouteCard.vue +++ b/app/components/RouteCard.vue @@ -2,8 +2,21 @@
+
+ {{ position }} {{ displayName }} {{ route.id }}
@@ -42,31 +56,7 @@ }}
-
- - - - - - +
diff --git a/app/components/RouteList.vue b/app/components/RouteList.vue new file mode 100644 index 0000000..d50cbb2 --- /dev/null +++ b/app/components/RouteList.vue @@ -0,0 +1,265 @@ + + + diff --git a/app/composables/useI18n.ts b/app/composables/useI18n.ts index 3db0266..2152eb7 100644 --- a/app/composables/useI18n.ts +++ b/app/composables/useI18n.ts @@ -142,6 +142,13 @@ const en: Dict = { "group.routesIn": "Routes in {name}", "routes.emptyGroup": "No routes in this group yet.", "routes.createFirst": "Create your first route", + "routes.reorder": "Reorder", + "routes.reorderHint": "Drag routes by their handle to change the evaluation order, then save.", + "routes.reorderKeyboardHint": "Press Arrow Up or Arrow Down to move this route.", + "routes.reorderSave": "Save order", + "routes.reorderCancel": "Cancel", + "routes.dragHandle": "Reorder {name}", + "routes.moved": "{name} moved to position {n}", "routes.delete": "Delete route", "route.untitled": "(untitled)", "route.noFilters": "no filters", @@ -392,6 +399,7 @@ const en: Dict = { "toast.groupIdExists": "Group ID already exists", "toast.saveFailed": "Save failed: {msg}", "toast.deleteFailed": "Delete failed: {msg}", + "toast.orderSaved": "Route order saved", "confirm.deleteRoute": 'Delete route "{name}"?', "confirm.deleteGroup": 'Delete group "{name}"?', "confirm.deleteGroupWarn": " {n} route(s) reference it and will lose their group.", @@ -544,6 +552,13 @@ const zh: Dict = { "group.routesIn": "{name} 的路由", "routes.emptyGroup": "该分组还没有路由。", "routes.createFirst": "创建第一个路由", + "routes.reorder": "调整顺序", + "routes.reorderHint": "拖动手柄调整路由的评估顺序,完成后保存。", + "routes.reorderKeyboardHint": "按上下方向键移动该路由。", + "routes.reorderSave": "保存顺序", + "routes.reorderCancel": "取消", + "routes.dragHandle": "调整“{name}”的顺序", + "routes.moved": "“{name}”已移到第 {n} 位", "routes.delete": "删除路由", "route.untitled": "(未命名)", "route.noFilters": "无过滤器", @@ -792,6 +807,7 @@ const zh: Dict = { "toast.groupIdExists": "分组 ID 已存在", "toast.saveFailed": "保存失败:{msg}", "toast.deleteFailed": "删除失败:{msg}", + "toast.orderSaved": "路由顺序已保存", "confirm.deleteRoute": "确定删除路由“{name}”吗?", "confirm.deleteGroup": "确定删除分组“{name}”吗?", "confirm.deleteGroupWarn": " 有 {n} 条路由引用它,将失去所属分组。", diff --git a/docs/guide/routes.md b/docs/guide/routes.md index b737cc2..02ae794 100644 --- a/docs/guide/routes.md +++ b/docs/guide/routes.md @@ -39,6 +39,10 @@ Each entry of `targets` is a push destination, so one route can forward to sever | `discordRoleIds` | string[] | No | Discord role ids to ping when this route fires; applied to Discord targets only | | `ast` | object | No | Boolean filter tree (`{all:[...]}` / `{any:[...]}` / `{not:{...}}`); takes precedence over `filters` when present | +## Route Order + +Routes are evaluated in the order the console shows them, group by group. To change it, click **Reorder** on the group page, drag routes by their handle (or focus a handle and press ↑ / ↓), then **Save order**. The order is stored per group in D1 (`d1_routes.position`, migration `0012`); a database without that migration keeps loading routes in id order. + ## Discord Role Mentions Set `discordRoleIds` on a route to ping one or more Discord roles (身份组) whenever that route fires. The mention (`<@&roleId>`) is prepended to the message content of every **Discord** target of the route; Telegram targets ignore this field. Mentions only trigger notifications when the bot has the `Mention Everyone` permission (or the role is marked mentionable), and the bot must be able to see the role. diff --git a/docs/zh/guide/routes.md b/docs/zh/guide/routes.md index d4161ac..f576cfa 100644 --- a/docs/zh/guide/routes.md +++ b/docs/zh/guide/routes.md @@ -39,6 +39,10 @@ | `discordRoleIds` | string[] | 否 | 路由触发时要提醒的 Discord 身份组 id;仅对 Discord 目标生效 | | `ast` | object | 否 | 布尔过滤器树(`{all:[...]}` / `{any:[...]}` / `{not:{...}}`);存在时优先于 `filters` | +## 路由顺序 + +路由按控制台中显示的顺序逐个分组评估。在分组页点击**调整顺序**,拖动路由左侧的手柄(或聚焦手柄后按 ↑ / ↓),再点击**保存顺序**。顺序按分组保存在 D1(`d1_routes.position`,迁移 `0012`);未执行该迁移的数据库会继续按 id 顺序加载路由。 + ## Discord 身份组提醒 在路由上设置 `discordRoleIds` 可在其触发时提醒一个或多个 Discord 身份组(角色)。提醒(`<@&roleId>`)会加在路由所有 **Discord** 目标的消息内容前;Telegram 目标忽略该字段。只有当机器人拥有 `Mention Everyone` 权限(或身份组标记为可提及)且能看到该身份组时,提醒才会触发通知。