mirror of
https://github.com/Elysola/WebHooker.git
synced 2026-11-20 17:13:49 +00:00
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.
This commit is contained in:
1 parent
2eac368602
commit
08dfac52cd
10 files changed
+504
-71
No files matched your search
@@ -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,
|
||||
|
||||
@@ -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.
|
||||
|
||||
+1
-1
@@ -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`(自动获得个人分组)或通过分组邀请链接加入。
|
||||
|
||||
@@ -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;
|
||||
|
||||
+125
-36
@@ -49,7 +49,7 @@
|
||||
><Languages :size="15" />{{ t("app.langToggle") }}</RcButton
|
||||
>
|
||||
<RcButton
|
||||
v-if="!needLogin && selectedGroup && canEditRoutes(selectedGroup.id)"
|
||||
v-if="!needLogin && selectedGroup && canEditRoutes(selectedGroup.id) && !reordering"
|
||||
@click="openNew"
|
||||
><Plus :size="16" />{{ t("app.newRoute") }}</RcButton
|
||||
>
|
||||
@@ -101,28 +101,53 @@
|
||||
>
|
||||
<p>{{ t("group.routesIn", { name: selectedGroup.name }) }}</p>
|
||||
</div>
|
||||
<RcBadge :variant="groupRoutesLoading ? 'soft' : 'success'" size="sm" dot>{{
|
||||
groupRoutes.length
|
||||
}}</RcBadge>
|
||||
<div class="console-context-actions">
|
||||
<RcBadge :variant="groupRoutesLoading ? 'soft' : 'success'" size="sm" dot>{{
|
||||
groupRoutes.length
|
||||
}}</RcBadge>
|
||||
<template v-if="reordering">
|
||||
<RcButton
|
||||
variant="outline"
|
||||
color="neutral"
|
||||
size="sm"
|
||||
:disabled="savingOrder"
|
||||
@click="cancelReorder"
|
||||
>{{ t("routes.reorderCancel") }}</RcButton
|
||||
>
|
||||
<RcButton
|
||||
size="sm"
|
||||
:loading="savingOrder"
|
||||
:disabled="!orderChanged || reorderBusy"
|
||||
@click="saveOrder"
|
||||
><Check :size="15" />{{ t("routes.reorderSave") }}</RcButton
|
||||
>
|
||||
</template>
|
||||
<RcButton
|
||||
v-else-if="canReorder"
|
||||
variant="outline"
|
||||
color="neutral"
|
||||
size="sm"
|
||||
:disabled="groupRoutesLoading || saving"
|
||||
@click="startReorder"
|
||||
><ArrowUpDown :size="15" />{{ t("routes.reorder") }}</RcButton
|
||||
>
|
||||
</div>
|
||||
<p v-if="reordering" class="console-reorder-hint">{{ t("routes.reorderHint") }}</p>
|
||||
</section>
|
||||
|
||||
<p v-if="groupRoutesError" class="err">{{ groupRoutesError }}</p>
|
||||
|
||||
<section class="route-list">
|
||||
<RouteCard
|
||||
v-for="(r, i) in groupRoutes"
|
||||
:key="r.id"
|
||||
:route="r"
|
||||
:at-first="i === 0"
|
||||
:at-last="i === groupRoutes.length - 1"
|
||||
:readonly="!canEditRoutes(selectedGroup.id)"
|
||||
:style="{ animationDelay: i * 45 + 'ms' }"
|
||||
@toggle="onToggle"
|
||||
@edit="openEdit"
|
||||
@delete="onDelete"
|
||||
@move="onMove"
|
||||
/>
|
||||
</section>
|
||||
<RouteList
|
||||
:routes="reordering ? orderDraft : groupRoutes"
|
||||
:reordering="reordering"
|
||||
:locked="savingOrder"
|
||||
:readonly="!canEditRoutes(selectedGroup.id)"
|
||||
@update:routes="orderDraft = $event"
|
||||
@update:busy="reorderBusy = $event"
|
||||
@toggle="onToggle"
|
||||
@edit="openEdit"
|
||||
@delete="onDelete"
|
||||
/>
|
||||
|
||||
<section v-if="!groupRoutesLoading && !groupRoutes.length" class="console-empty">
|
||||
<RcEmptyState :title="t('routes.emptyGroup')">
|
||||
@@ -325,6 +350,8 @@ import {
|
||||
Activity,
|
||||
ArrowLeft,
|
||||
ArrowRight,
|
||||
ArrowUpDown,
|
||||
Check,
|
||||
ClipboardList,
|
||||
Gauge,
|
||||
Languages,
|
||||
@@ -465,6 +492,22 @@ const groupEditorOpen = ref(false);
|
||||
const editingGroup = ref<Group | null>(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<Route[]>([]);
|
||||
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<void> {
|
||||
}
|
||||
|
||||
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<void> {
|
||||
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<void> {
|
||||
}
|
||||
}
|
||||
|
||||
async function onMove(route: Route, dir: -1 | 1): Promise<void> {
|
||||
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<void> {
|
||||
const group = selectedGroup.value;
|
||||
if (!group) return;
|
||||
@@ -849,9 +926,10 @@ async function onDeleteGroup(group: Group): Promise<void> {
|
||||
}
|
||||
.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<void> {
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -2,8 +2,21 @@
|
||||
<RcCard variant="outline" padding="none" :class="cardClass">
|
||||
<div class="route-row">
|
||||
<div class="route-lead">
|
||||
<button
|
||||
v-if="reordering"
|
||||
type="button"
|
||||
class="route-handle"
|
||||
:data-route-handle="route.id"
|
||||
:aria-label="t('routes.dragHandle', { name: displayName })"
|
||||
:aria-describedby="hintId"
|
||||
:disabled="locked"
|
||||
@pointerdown="emit('dragStart', $event)"
|
||||
@keydown="onHandleKey"
|
||||
>
|
||||
<GripVertical :size="16" />
|
||||
</button>
|
||||
<RcSwitch
|
||||
v-if="!readonly"
|
||||
v-else-if="!readonly"
|
||||
:model-value="route.enabled"
|
||||
size="sm"
|
||||
@update:model-value="onToggle"
|
||||
@@ -12,6 +25,7 @@
|
||||
</div>
|
||||
|
||||
<div class="route-title">
|
||||
<span v-if="reordering" class="route-position">{{ position }}</span>
|
||||
<span class="route-name">{{ displayName }}</span>
|
||||
<span class="route-id">{{ route.id }}</span>
|
||||
</div>
|
||||
@@ -42,31 +56,7 @@
|
||||
}}</RcBadge>
|
||||
</div>
|
||||
|
||||
<div v-if="!readonly" class="route-actions">
|
||||
<RcButton
|
||||
type="button"
|
||||
variant="ghost"
|
||||
size="icon"
|
||||
class="h-8 w-8 text-muted hover:text-text"
|
||||
:disabled="atFirst"
|
||||
:title="t('route.moveUp')"
|
||||
:aria-label="t('route.moveUp')"
|
||||
@click="emit('move', route, -1)"
|
||||
>
|
||||
<ChevronUp :size="15" />
|
||||
</RcButton>
|
||||
<RcButton
|
||||
type="button"
|
||||
variant="ghost"
|
||||
size="icon"
|
||||
class="h-8 w-8 text-muted hover:text-text"
|
||||
:disabled="atLast"
|
||||
:title="t('route.moveDown')"
|
||||
:aria-label="t('route.moveDown')"
|
||||
@click="emit('move', route, 1)"
|
||||
>
|
||||
<ChevronDown :size="15" />
|
||||
</RcButton>
|
||||
<div v-if="!readonly && !reordering" class="route-actions">
|
||||
<RcButton
|
||||
type="button"
|
||||
variant="ghost"
|
||||
@@ -120,7 +110,7 @@
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { ChevronDown, ChevronUp, Pencil, Trash2 } from "lucide-vue-next";
|
||||
import { GripVertical, Pencil, Trash2 } from "lucide-vue-next";
|
||||
import type { FilterNode, Route, RouteTarget } from "~/types";
|
||||
import { describeNode } from "~/composables/useFilterNode";
|
||||
|
||||
@@ -130,16 +120,23 @@ const { t } = useI18n();
|
||||
|
||||
const props = defineProps<{
|
||||
route: Route;
|
||||
atFirst?: boolean;
|
||||
atLast?: boolean;
|
||||
readonly?: boolean;
|
||||
/** Reorder mode: a drag handle replaces the switch and the actions hide. */
|
||||
reordering?: boolean;
|
||||
/** The new order is being saved: the handle waits until it is written. */
|
||||
locked?: boolean;
|
||||
/** 1-based position shown while reordering. */
|
||||
position?: number;
|
||||
/** Id of the element describing how to reorder (for the handle). */
|
||||
hintId?: string;
|
||||
}>();
|
||||
|
||||
const emit = defineEmits<{
|
||||
(e: "toggle", route: Route): void;
|
||||
(e: "edit", route: Route): void;
|
||||
(e: "delete", route: Route): void;
|
||||
(e: "move", route: Route, dir: -1 | 1): void;
|
||||
(e: "dragStart", event: PointerEvent): void;
|
||||
(e: "nudge", dir: -1 | 1): void;
|
||||
}>();
|
||||
|
||||
const displayName = computed(() => props.route.name || t("route.untitled"));
|
||||
@@ -147,7 +144,10 @@ const summary = computed(() => {
|
||||
const node: FilterNode = props.route.ast ?? { all: props.route.filters };
|
||||
return describeNode(node, t);
|
||||
});
|
||||
const cardClass = computed(() => `route-card${props.route.enabled ? "" : " disabled"}`);
|
||||
const cardClass = computed(
|
||||
() =>
|
||||
`route-card${props.route.enabled ? "" : " disabled"}${props.reordering ? " is-reordering" : ""}`,
|
||||
);
|
||||
|
||||
/** One tag per platform (in target order) with how many targets use it. */
|
||||
const platforms = computed(() => {
|
||||
@@ -175,4 +175,11 @@ function platformLabel(platform: Platform): string {
|
||||
function onToggle(enabled: boolean): void {
|
||||
emit("toggle", { ...props.route, enabled });
|
||||
}
|
||||
|
||||
function onHandleKey(event: KeyboardEvent): void {
|
||||
if (event.key === "ArrowUp" || event.key === "ArrowDown") {
|
||||
event.preventDefault();
|
||||
emit("nudge", event.key === "ArrowUp" ? -1 : 1);
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@@ -0,0 +1,265 @@
|
||||
<template>
|
||||
<div
|
||||
ref="listEl"
|
||||
class="route-list"
|
||||
:class="{
|
||||
'is-reordering': reordering,
|
||||
'is-dragging': dragIndex >= 0,
|
||||
'is-committing': committing,
|
||||
}"
|
||||
>
|
||||
<p v-if="reordering" :id="hintId" class="sr-only">{{ t("routes.reorderKeyboardHint") }}</p>
|
||||
<RouteCard
|
||||
v-for="(r, i) in routes"
|
||||
:key="r.id"
|
||||
:data-route-id="r.id"
|
||||
:route="r"
|
||||
:readonly="readonly"
|
||||
:reordering="reordering"
|
||||
:locked="locked"
|
||||
:position="i + 1"
|
||||
:hint-id="hintId"
|
||||
:class="{ 'is-dragged': i === dragIndex, 'is-settling': i === dragIndex && settling }"
|
||||
:style="itemStyle(i)"
|
||||
@toggle="emit('toggle', $event)"
|
||||
@edit="emit('edit', $event)"
|
||||
@delete="emit('delete', $event)"
|
||||
@drag-start="onDragStart(i, $event)"
|
||||
@nudge="nudge(i, $event)"
|
||||
/>
|
||||
<p class="sr-only" aria-live="assertive">{{ announcement }}</p>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import type { Route } from "~/types";
|
||||
|
||||
/**
|
||||
* The routes of one group. In reorder mode each card gets a drag handle:
|
||||
* pointer drags (mouse and touch) move a card while its neighbours slide out
|
||||
* of the way, and the new order is emitted on drop; Arrow Up / Down on a
|
||||
* focused handle moves it by one. `locked` freezes the order (e.g. while it
|
||||
* is being saved); `busy` reports a drag that has not been committed yet.
|
||||
*/
|
||||
const props = defineProps<{
|
||||
routes: Route[];
|
||||
reordering?: boolean;
|
||||
readonly?: boolean;
|
||||
locked?: boolean;
|
||||
}>();
|
||||
|
||||
const emit = defineEmits<{
|
||||
(e: "update:routes", routes: Route[]): void;
|
||||
(e: "update:busy", busy: boolean): void;
|
||||
(e: "toggle", route: Route): void;
|
||||
(e: "edit", route: Route): void;
|
||||
(e: "delete", route: Route): void;
|
||||
}>();
|
||||
|
||||
const { t } = useI18n();
|
||||
|
||||
const hintId = `route-reorder-hint-${useId()}`;
|
||||
const listEl = ref<HTMLElement | null>(null);
|
||||
const dragIndex = ref(-1);
|
||||
const overIndex = ref(-1);
|
||||
const dragDelta = ref(0);
|
||||
const settling = ref(false);
|
||||
const committing = ref(false);
|
||||
const announcement = ref("");
|
||||
|
||||
interface DragSession {
|
||||
pointerId: number;
|
||||
startY: number;
|
||||
startScroll: number;
|
||||
lastY: number;
|
||||
/** Document-relative tops and heights of every card when the drag began. */
|
||||
tops: number[];
|
||||
heights: number[];
|
||||
gap: number;
|
||||
}
|
||||
|
||||
let session: DragSession | null = null;
|
||||
let scrollSpeed = 0;
|
||||
let scrollFrame = 0;
|
||||
let settleTimer: ReturnType<typeof setTimeout> | undefined;
|
||||
|
||||
/** Distance the cards between the drag origin and the drop slot move by. */
|
||||
function shiftPx(): number {
|
||||
return session && dragIndex.value >= 0 ? session.heights[dragIndex.value]! + session.gap : 0;
|
||||
}
|
||||
|
||||
function itemStyle(i: number): Record<string, string> | undefined {
|
||||
const from = dragIndex.value;
|
||||
if (from < 0) return undefined;
|
||||
if (i === from) return { transform: `translateY(${dragDelta.value}px)` };
|
||||
const to = overIndex.value;
|
||||
if (to > from && i > from && i <= to) return { transform: `translateY(${-shiftPx()}px)` };
|
||||
if (to < from && i >= to && i < from) return { transform: `translateY(${shiftPx()}px)` };
|
||||
return undefined;
|
||||
}
|
||||
|
||||
function measure(): Pick<DragSession, "tops" | "heights" | "gap"> | null {
|
||||
const list = listEl.value;
|
||||
if (!list) return null;
|
||||
const cards = [...list.querySelectorAll<HTMLElement>("[data-route-id]")];
|
||||
if (cards.length !== props.routes.length) return null;
|
||||
const rects = cards.map((el) => el.getBoundingClientRect());
|
||||
return {
|
||||
tops: rects.map((r) => r.top + window.scrollY),
|
||||
heights: rects.map((r) => r.height),
|
||||
gap: parseFloat(getComputedStyle(list).rowGap) || 0,
|
||||
};
|
||||
}
|
||||
|
||||
function onDragStart(index: number, event: PointerEvent): void {
|
||||
if (!props.reordering || props.locked || session || settling.value) return;
|
||||
if (event.pointerType === "mouse" && event.button !== 0) return;
|
||||
const geometry = measure();
|
||||
if (!geometry) return;
|
||||
event.preventDefault();
|
||||
session = {
|
||||
pointerId: event.pointerId,
|
||||
startY: event.clientY,
|
||||
startScroll: window.scrollY,
|
||||
lastY: event.clientY,
|
||||
...geometry,
|
||||
};
|
||||
dragIndex.value = index;
|
||||
overIndex.value = index;
|
||||
dragDelta.value = 0;
|
||||
window.addEventListener("pointermove", onPointerMove);
|
||||
window.addEventListener("pointerup", onPointerUp);
|
||||
window.addEventListener("pointercancel", onPointerUp);
|
||||
}
|
||||
|
||||
function update(): void {
|
||||
const s = session;
|
||||
const from = dragIndex.value;
|
||||
if (!s || from < 0) return;
|
||||
const delta = s.lastY - s.startY + (window.scrollY - s.startScroll);
|
||||
const center = s.tops[from]! + delta + s.heights[from]! / 2;
|
||||
// Slot = how many other cards' original centers lie above the dragged center.
|
||||
let slot = 0;
|
||||
for (let i = 0; i < s.tops.length; i++) {
|
||||
if (i !== from && s.tops[i]! + s.heights[i]! / 2 < center) slot++;
|
||||
}
|
||||
dragDelta.value = delta;
|
||||
overIndex.value = slot;
|
||||
}
|
||||
|
||||
function onPointerMove(event: PointerEvent): void {
|
||||
if (!session || event.pointerId !== session.pointerId) return;
|
||||
session.lastY = event.clientY;
|
||||
update();
|
||||
autoScroll(event.clientY);
|
||||
}
|
||||
|
||||
/** Scroll the page while the pointer rests near the viewport's top or bottom edge. */
|
||||
function autoScroll(clientY: number): void {
|
||||
const top = 140;
|
||||
const bottom = window.innerHeight - 80;
|
||||
const raw = clientY < top ? (clientY - top) / 6 : clientY > bottom ? (clientY - bottom) / 6 : 0;
|
||||
scrollSpeed = Math.max(-18, Math.min(18, Math.round(raw)));
|
||||
if (!scrollSpeed || scrollFrame) return;
|
||||
const step = (): void => {
|
||||
if (!session || !scrollSpeed) {
|
||||
scrollFrame = 0;
|
||||
return;
|
||||
}
|
||||
window.scrollBy(0, scrollSpeed);
|
||||
update();
|
||||
scrollFrame = requestAnimationFrame(step);
|
||||
};
|
||||
scrollFrame = requestAnimationFrame(step);
|
||||
}
|
||||
|
||||
function stopListening(): void {
|
||||
window.removeEventListener("pointermove", onPointerMove);
|
||||
window.removeEventListener("pointerup", onPointerUp);
|
||||
window.removeEventListener("pointercancel", onPointerUp);
|
||||
cancelAnimationFrame(scrollFrame);
|
||||
scrollFrame = 0;
|
||||
scrollSpeed = 0;
|
||||
}
|
||||
|
||||
function onPointerUp(event: PointerEvent): void {
|
||||
const s = session;
|
||||
if (!s || event.pointerId !== s.pointerId) return;
|
||||
stopListening();
|
||||
const from = dragIndex.value;
|
||||
const to = overIndex.value;
|
||||
// Glide the card into its slot, then commit the order in one frame.
|
||||
let slotTop = s.tops[0]!;
|
||||
for (let i = 0, placed = 0; placed < to; i++) {
|
||||
if (i === from) continue;
|
||||
slotTop += s.heights[i]! + s.gap;
|
||||
placed++;
|
||||
}
|
||||
settling.value = true;
|
||||
dragDelta.value = slotTop - s.tops[from]!;
|
||||
settleTimer = setTimeout(() => commit(from, to), 160);
|
||||
}
|
||||
|
||||
function commit(from: number, to: number): void {
|
||||
committing.value = true;
|
||||
if (to !== from) {
|
||||
const next = [...props.routes];
|
||||
const [moved] = next.splice(from, 1);
|
||||
next.splice(to, 0, moved!);
|
||||
emit("update:routes", next);
|
||||
announce(moved!, to);
|
||||
}
|
||||
resetDrag();
|
||||
requestAnimationFrame(() => requestAnimationFrame(() => (committing.value = false)));
|
||||
}
|
||||
|
||||
function resetDrag(): void {
|
||||
clearTimeout(settleTimer);
|
||||
session = null;
|
||||
dragIndex.value = -1;
|
||||
overIndex.value = -1;
|
||||
dragDelta.value = 0;
|
||||
settling.value = false;
|
||||
}
|
||||
|
||||
function cancelDrag(): void {
|
||||
stopListening();
|
||||
resetDrag();
|
||||
}
|
||||
|
||||
function nudge(index: number, dir: -1 | 1): void {
|
||||
const to = index + dir;
|
||||
if (props.locked || session || to < 0 || to >= props.routes.length) return;
|
||||
const next = [...props.routes];
|
||||
const [moved] = next.splice(index, 1);
|
||||
next.splice(to, 0, moved!);
|
||||
emit("update:routes", next);
|
||||
announce(moved!, to);
|
||||
nextTick(() => {
|
||||
listEl.value
|
||||
?.querySelector<HTMLElement>(`[data-route-handle="${CSS.escape(moved!.id)}"]`)
|
||||
?.focus();
|
||||
});
|
||||
}
|
||||
|
||||
function announce(route: Route, index: number): void {
|
||||
announcement.value = t("routes.moved", {
|
||||
name: route.name || route.id,
|
||||
n: index + 1,
|
||||
});
|
||||
}
|
||||
|
||||
watch(
|
||||
() => dragIndex.value >= 0,
|
||||
(busy) => emit("update:busy", busy),
|
||||
);
|
||||
|
||||
watch(
|
||||
() => props.reordering,
|
||||
(on) => {
|
||||
if (!on) cancelDrag();
|
||||
},
|
||||
);
|
||||
|
||||
onBeforeUnmount(cancelDrag);
|
||||
</script>
|
||||
@@ -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} 条路由引用它,将失去所属分组。",
|
||||
|
||||
@@ -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 <kbd>↑</kbd> / <kbd>↓</kbd>), 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.
|
||||
|
||||
@@ -39,6 +39,10 @@
|
||||
| `discordRoleIds` | string[] | 否 | 路由触发时要提醒的 Discord 身份组 id;仅对 Discord 目标生效 |
|
||||
| `ast` | object | 否 | 布尔过滤器树(`{all:[...]}` / `{any:[...]}` / `{not:{...}}`);存在时优先于 `filters` |
|
||||
|
||||
## 路由顺序
|
||||
|
||||
路由按控制台中显示的顺序逐个分组评估。在分组页点击**调整顺序**,拖动路由左侧的手柄(或聚焦手柄后按 <kbd>↑</kbd> / <kbd>↓</kbd>),再点击**保存顺序**。顺序按分组保存在 D1(`d1_routes.position`,迁移 `0012`);未执行该迁移的数据库会继续按 id 顺序加载路由。
|
||||
|
||||
## Discord 身份组提醒
|
||||
|
||||
在路由上设置 `discordRoleIds` 可在其触发时提醒一个或多个 Discord 身份组(角色)。提醒(`<@&roleId>`)会加在路由所有 **Discord** 目标的消息内容前;Telegram 目标忽略该字段。只有当机器人拥有 `Mention Everyone` 权限(或身份组标记为可提及)且能看到该身份组时,提醒才会触发通知。
|
||||
|
||||
Reference in new issue
Block a user