feat: 工单列表重设计+权限组实例过滤+通知修复

后端:
- Ticket model 新增 ticket_no 字段(格式: YYYYMMDDHHmmss+ms+seq, 如20260522160543841)
- create_ticket 自动生成工单编号(flush后生成)
- _enrich_ticket 新增 instance_name, current_approver_name 字段
- current_approver: 从 ticket_approvals 查询第一个 pending 状态的审批步骤获取审核人
- TicketResponse schema 新增 ticket_no, instance_name, current_approver_name
- 新增 /instances/accessible endpoint(按用户权限组过滤实例, 无admin bypass)
- instance_group response_model 改为 InstanceGroupDetailResponse(含readonly/write实例)
- instance_group_members 脏数据清理, 重建 group_id=2 正确数据
- notification 模板修复: \n→\n 换行, 钉钉 \n→\n\n 双换行
- test_notification endpoint 改为真正调用 NotificationSender.send()
- auditor 角色添加到 audit_rule/ticket 只读端点
- seed_data() 创建4个默认用户(admin/zhangsan/laoliu/lurenjia)
- SQLite ALTER TABLE 添加 ticket_no 列, 迁移现有6条工单数据

前端:
- TicketsPage 完全重设计: 工单编号/实例名称/提交人/当前审核人/状态/操作
- 状态映射简化: pending/reviewing/approved→审核中, success→完成, failed→失败
- 执行详情弹框: 解析 execute_result JSON 展示状态/影响行数/耗时/验证/原始输出/错误信息
- 状态流程可视化(提交→审批→通过→执行→完成)
- 快速筛选: 全部/待审批/执行中/完成/失败 (合并 pending+reviewing+approved 统计)
- TicketCreatePage: 去掉数据库类型选择器, 用 accessible(write) 过滤变更实例
- QueriesPage: 用 accessible(readonly) 过滤查询实例
- instance.ts 新增 accessible 方法
- 分页优化: 动态计算页码范围(总页>5时中间滚动)
This commit is contained in:
logan committed 2026-05-24 22:55:51 +08:00
1 parent 88d064ea95
commit 08f0f88cf1
20 files changed
+1672 -944

No files matched your search

+94 -19
View File
@@ -4,7 +4,7 @@ import {
Activity, HardDrive, ChevronRight, Trash2, Edit2,
XCircle, Eye, EyeOff, ChevronLeft, Gauge, Wifi,
WifiOff, AlertTriangle, CheckCircle, Signal,
LayoutGrid, ListFilter, X, Loader2, BarChart3, Users,
LayoutGrid, ListFilter, X, Loader2, BarChart3, Users, Copy,
} from 'lucide-react';
import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card';
import { useActionPermission } from '@/hooks/useAuth';
@@ -140,6 +140,8 @@ export default function InstancePage() {
const [editingInstance, setEditingInstance] = useState<InstanceItem | null>(null);
const [selectedIds, setSelectedIds] = useState<Set<number>>(new Set());
const [batchDeleting, setBatchDeleting] = useState(false);
const [showClone, setShowClone] = useState(false);
const [cloneSource, setCloneSource] = useState<InstanceItem | null>(null);
const typeTabs = [
{ key: 'all', label: '全部', icon: LayoutGrid },
@@ -249,6 +251,7 @@ export default function InstancePage() {
canDelete={canDelete}
onDelete={() => { handleDelete(editingInstance.id); setView('grid'); setShowEdit(false); setEditingInstance(null); }}
onEdit={() => {}}
onClone={canAdd ? () => { setCloneSource(editingInstance); setShowClone(true); } : undefined}
/>
<EditInstanceDialog
instance={editingInstance}
@@ -256,6 +259,15 @@ export default function InstancePage() {
onClose={() => { setShowEdit(false); setEditingInstance(null); }}
onSaved={() => { setShowEdit(false); setEditingInstance(null); fetchInstances(); }}
/>
{cloneSource && showClone && (
<EditInstanceDialog
instance={{ ...cloneSource, name: `${cloneSource.name}-副本`, id: 0 }}
open={showClone}
onClose={() => { setShowClone(false); setCloneSource(null); }}
onSaved={() => { setShowClone(false); setCloneSource(null); fetchInstances(); }}
mode="clone"
/>
)}
</>
);
}
@@ -266,15 +278,27 @@ export default function InstancePage() {
if (view === 'detail' && selectedInstance) {
return (
<InstanceDetail
instance={selectedInstance}
onBack={() => setView('grid')}
config={selectedConfig}
canEdit={canEdit}
canDelete={canDelete}
onDelete={() => { handleDelete(selectedInstance.id); setView('grid'); }}
onEdit={() => { setEditingInstance(selectedInstance); setShowEdit(true); }}
/>
<>
<InstanceDetail
instance={selectedInstance}
onBack={() => setView('grid')}
config={selectedConfig}
canEdit={canEdit}
canDelete={canDelete}
onDelete={() => { handleDelete(selectedInstance.id); setView('grid'); }}
onEdit={() => { setEditingInstance(selectedInstance); setShowEdit(true); }}
onClone={canAdd ? () => { setCloneSource(selectedInstance); setShowClone(true); } : undefined}
/>
{cloneSource && showClone && (
<EditInstanceDialog
instance={{ ...cloneSource, name: `${cloneSource.name}-副本`, id: 0 }}
open={showClone}
onClose={() => { setShowClone(false); setCloneSource(null); }}
onSaved={() => { setShowClone(false); setCloneSource(null); fetchInstances(); }}
mode="clone"
/>
)}
</>
);
}
@@ -540,11 +564,34 @@ export default function InstancePage() {
<div className="mt-2 opacity-0 group-hover:opacity-100 transition-opacity">
<div className="mt-2 opacity-0 group-hover:opacity-100 transition-opacity flex items-center justify-between">
<span className="text-[11px] text-blue-400 flex items-center gap-1">
查看详情
<ChevronRight className="w-3 h-3" />
</span>
<div className="flex items-center gap-1" onClick={e => e.stopPropagation()}>
{canAdd && (
<button
onClick={() => {
setCloneSource(instance);
setShowClone(true);
}}
className="p-1 rounded hover:bg-[var(--dg-bg-hover)] text-[var(--dg-text-muted)] hover:text-blue-400 transition-colors"
title="克隆实例"
>
<Copy className="w-3.5 h-3.5" />
</button>
)}
{canEdit && (
<button
onClick={() => { setEditingInstance(instance); setShowEdit(true); }}
className="p-1 rounded hover:bg-[var(--dg-bg-hover)] text-[var(--dg-text-muted)] hover:text-blue-400 transition-colors"
title="编辑实例"
>
<Edit2 className="w-3.5 h-3.5" />
</button>
)}
</div>
</div>
</div>
);
@@ -627,12 +674,23 @@ export default function InstancePage() {
</div>
</td>
<td className="px-4 py-3">
<button
onClick={e => { e.stopPropagation(); setSelectedInstance(instance); setView('detail'); }}
className="text-blue-400 hover:text-blue-300 text-xs font-medium transition-colors"
>
查看
</button>
<div className="flex items-center gap-2">
<button
onClick={e => { e.stopPropagation(); setSelectedInstance(instance); setView('detail'); }}
className="text-blue-400 hover:text-blue-300 text-xs font-medium transition-colors"
>
查看
</button>
{canAdd && (
<button
onClick={e => { e.stopPropagation(); setCloneSource(instance); setShowClone(true); }}
className="text-[var(--dg-text-muted)] hover:text-blue-400 transition-colors"
title="克隆实例"
>
<Copy className="w-3.5 h-3.5" />
</button>
)}
</div>
</td>
</tr>
);
@@ -643,6 +701,17 @@ export default function InstancePage() {
</CardContent>
</Card>
)}
{/* Clone Dialog */}
{cloneSource && showClone && (
<EditInstanceDialog
instance={{ ...cloneSource, name: `${cloneSource.name}-副本`, id: 0 }}
open={showClone}
onClose={() => { setShowClone(false); setCloneSource(null); }}
onSaved={() => { setShowClone(false); setCloneSource(null); fetchInstances(); }}
mode="clone"
/>
)}
</div>
);
}
@@ -650,10 +719,10 @@ export default function InstancePage() {
/* ------------------------------------------------------------------ */
/* InstanceDetail */
/* ------------------------------------------------------------------ */
function InstanceDetail({ instance, onBack, config, canEdit, canDelete, onDelete, onEdit }: {
function InstanceDetail({ instance, onBack, config, canEdit, canDelete, onDelete, onEdit, onClone }: {
instance: InstanceItem; onBack: () => void;
config: { icon: React.ElementType; color: string; bg: string };
canEdit: boolean; canDelete: boolean; onDelete: () => void; onEdit: () => void;
canEdit: boolean; canDelete: boolean; onDelete: () => void; onEdit: () => void; onClone?: () => void;
}) {
const [testing, setTesting] = useState(false);
const [testResult, setTestResult] = useState<{ success: boolean; message: string; version?: string } | null>(null);
@@ -710,6 +779,12 @@ function InstanceDetail({ instance, onBack, config, canEdit, canDelete, onDelete
<Zap className="w-4 h-4" />
{testing ? '测试中...' : '测试连接'}
</button>
{onClone && (
<button onClick={onClone} className="flex items-center gap-2 px-4 py-2.5 bg-[var(--dg-bg-tertiary)] border border-[var(--dg-border)] rounded-lg text-sm text-[var(--dg-text-primary)] hover:bg-[var(--dg-bg-hover)] transition-all">
<Copy className="w-4 h-4" />
克隆
</button>
)}
{canEdit && (
<button onClick={onEdit} className="flex items-center gap-2 px-4 py-2.5 bg-[var(--dg-bg-tertiary)] border border-[var(--dg-border)] rounded-lg text-sm text-[var(--dg-text-primary)] hover:bg-[var(--dg-bg-hover)] transition-all">
<Edit2 className="w-4 h-4" />