refactor(admin): 折叠箭头与卡片列表改用库里的 Caret / SortableList

- 分组表格的折叠箭头换成 Caret,.group-caret 只保留按钮盒
- 首页卡片列表换成 SortableList,拖拽与排序计算交给组件;reorder 改为接收 key 顺序
- 删掉 .cards-side-item / .cards-side-title / .cards-side-count / .cards-drag-handle 等
  9 条样式,App.css 再减 42 行
This commit is contained in:
2026-11-01 22:07:32 +08:00
parent 4ae69b29fe
commit 6e773374bb
2 changed files with 24 additions and 148 deletions
+1 -78
View File
@@ -1008,7 +1008,7 @@
width: 260px; width: 260px;
} }
/* 折叠箭头:与前台侧栏 Menu 的 caret 同一套画法(CSS 画的 6px 角标) */ /* 折叠箭头:外观交给 @stash/ui 的 Caret,这里只管按钮盒与占位 */
.group-caret { .group-caret {
display: inline-flex; display: inline-flex;
flex: none; flex: none;
@@ -1023,36 +1023,10 @@
cursor: pointer; cursor: pointer;
} }
.group-caret::before {
content: '';
width: 6px;
height: 6px;
border-left: 1px solid currentColor;
border-bottom: 1px solid currentColor;
opacity: 0.4;
transform: rotate(315deg);
transition:
transform var(--su-duration-base) var(--su-ease-in-out),
opacity var(--su-duration-base) var(--su-ease-in-out);
}
.group-caret:hover::before {
opacity: 0.7;
}
.group-caret-open::before {
opacity: 0.7;
transform: rotate(135deg);
}
.group-caret-empty { .group-caret-empty {
cursor: default; cursor: default;
} }
.group-caret-empty::before {
display: none;
}
/* 分组图标选择:搜索 + 图标网格 */ /* 分组图标选择:搜索 + 图标网格 */
.icon-picker { .icon-picker {
display: flex; display: flex;
@@ -1312,65 +1286,14 @@ a.entry-href:hover {
width: 100%; width: 100%;
} }
.cards-side-list {
display: flex;
flex-direction: column;
gap: var(--su-space-1);
}
.cards-side-item {
display: flex;
align-items: center;
gap: var(--su-space-2);
padding: var(--su-space-2) var(--su-space-3);
border: none;
border-radius: var(--su-radius-sm);
background: transparent;
color: var(--su-text-main);
font-size: var(--su-font-size-md);
text-align: left;
cursor: pointer;
}
.cards-drag-handle {
flex: none;
color: var(--su-text-placeholder);
font-size: var(--su-font-size-sm);
line-height: 1;
cursor: grab;
}
.cards-side-item.is-dragging {
opacity: 0.45;
}
.cards-side-item.is-over {
outline: 1px dashed var(--su-color-primary);
outline-offset: -1px;
}
.cards-side-item:hover {
background-color: var(--su-bg-card);
}
.cards-side-item.is-active {
background-color: var(--su-bg-card);
color: var(--su-color-primary);
font-weight: 600;
}
.cards-side-title {
flex: 1;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.cards-side-count {
color: var(--su-text-muted);
font-size: var(--su-font-size-sm);
font-weight: 400;
}
/* 拖动说明夹在「新建卡片」和卡片列表之间:上方靠按钮的外边距,下方留一点呼吸 */ /* 拖动说明夹在「新建卡片」和卡片列表之间:上方靠按钮的外边距,下方留一点呼吸 */
.cards-drag-hint { .cards-drag-hint {
+23 -70
View File
@@ -2,6 +2,7 @@ import {
Brand, Brand,
Button, Button,
Card, Card,
Caret,
Empty, Empty,
FormField, FormField,
Icon, Icon,
@@ -14,6 +15,7 @@ import {
PasswordInput, PasswordInput,
Select, Select,
Space, Space,
SortableList,
Switch, Switch,
Table, Table,
Tabs, Tabs,
@@ -602,11 +604,13 @@ function GroupsPanel({
{hasChildren ? ( {hasChildren ? (
<button <button
type="button" type="button"
className={`group-caret${open ? ' group-caret-open' : ''}`} className="group-caret"
aria-label={open ? `折叠 ${node.title}` : `展开 ${node.title}`} aria-label={open ? `折叠 ${node.title}` : `展开 ${node.title}`}
aria-expanded={open} aria-expanded={open}
onClick={() => toggle(node.key)} onClick={() => toggle(node.key)}
/> >
<Caret open={open} />
</button>
) : ( ) : (
<span className="group-caret group-caret-empty" aria-hidden="true" /> <span className="group-caret group-caret-empty" aria-hidden="true" />
)} )}
@@ -1383,8 +1387,6 @@ function CardsPanel({
const [newOpen, setNewOpen] = useState(false) const [newOpen, setNewOpen] = useState(false)
const [newTitle, setNewTitle] = useState('') const [newTitle, setNewTitle] = useState('')
const [newBusy, setNewBusy] = useState(false) const [newBusy, setNewBusy] = useState(false)
const [dragId, setDragId] = useState<number | null>(null)
const [overId, setOverId] = useState<number | null>(null)
const [reordering, setReordering] = useState(false) const [reordering, setReordering] = useState(false)
useEffect(() => { useEffect(() => {
@@ -1420,25 +1422,12 @@ function CardsPanel({
onReload() onReload()
} }
const reorder = async (targetId: number) => { /** 排序:组件给回完整的 key 顺序,逐个写 sort 字段 */
const from = dragId const reorder = async (keys: string[]) => {
setDragId(null)
setOverId(null)
if (from === null || from === targetId) return
const original = cards.map((card) => card.id)
const fromIndex = original.indexOf(from)
const targetIndex = original.indexOf(targetId)
if (fromIndex < 0 || targetIndex < 0) return
const ids = original.filter((id) => id !== from)
const targetAfter = ids.indexOf(targetId)
// 向下拖时插到目标之后,保证能拖到列表最后一项;向上拖时插到目标之前
const insertAt = fromIndex < targetIndex ? targetAfter + 1 : targetAfter
ids.splice(insertAt, 0, from)
setReordering(true) setReordering(true)
const results = await Promise.all(ids.map((id, index) => updateCard(id, { sort: index }))) const results = await Promise.all(
keys.map((key, index) => updateCard(Number(key), { sort: index })),
)
setReordering(false) setReordering(false)
if (results.some((result) => !result.ok)) { if (results.some((result) => !result.ok)) {
toast.error('排序保存失败') toast.error('排序保存失败')
@@ -1474,54 +1463,18 @@ function CardsPanel({
</Text> </Text>
)} )}
<div className="cards-side-list"> <SortableList
{cards.map((card) => ( items={cards.map((card) => ({
<button key: String(card.id),
key={card.id} label: card.title,
type="button" meta: card.key === 'local-service' ? projects.length : card.groups.length,
draggable={!reordering} }))}
className={[ activeKey={active === undefined ? undefined : String(active.id)}
'cards-side-item', onSelect={(key) => setActiveId(Number(key))}
active?.id === card.id ? 'is-active' : '', onReorder={(keys) => void reorder(keys)}
dragId === card.id ? 'is-dragging' : '', disabled={reordering}
overId === card.id && dragId !== null && dragId !== card.id ? 'is-over' : '', emptyText="还没有卡片,先新建一张。"
] />
.filter(Boolean)
.join(' ')}
onClick={() => setActiveId(card.id)}
onDragStart={(event) => {
setDragId(card.id)
event.dataTransfer.effectAllowed = 'move'
event.dataTransfer.setData('text/plain', String(card.id))
}}
onDragOver={(event) => {
event.preventDefault()
if (overId !== card.id) setOverId(card.id)
}}
onDrop={(event) => {
event.preventDefault()
void reorder(card.id)
}}
onDragEnd={() => {
setDragId(null)
setOverId(null)
}}
>
<span className="cards-drag-handle" aria-hidden="true">
⋮⋮
</span>
<span className="cards-side-title">{card.title}</span>
<span className="cards-side-count">
{card.key === 'local-service' ? projects.length : card.groups.length}
</span>
</button>
))}
{cards.length === 0 && (
<Text size="sm" tone="muted">
还没有卡片,先新建一张。
</Text>
)}
</div>
</aside> </aside>
<div className="cards-main"> <div className="cards-main">