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
1 parent
88d064ea95
commit
08f0f88cf1
20 files changed
+1672
-944
No files matched your search
@@ -21,7 +21,7 @@ const DB_TYPE_COLORS: Record<string, string> = {
|
||||
|
||||
/* ───────── Transfer Component ───────── */
|
||||
|
||||
interface TransferItem { label: string; value: string; tag?: string; tagColor?: string }
|
||||
interface TransferItem { label: string; value: string; tag?: string; tagColor?: string; accessMode?: string }
|
||||
|
||||
interface TransferProps {
|
||||
title: string;
|
||||
@@ -151,10 +151,23 @@ export default function InstanceGroupPage() {
|
||||
value: String(i.id),
|
||||
tag: i.db_type,
|
||||
tagColor: DB_TYPE_COLORS[i.db_type] || '',
|
||||
accessMode: i.access_mode || 'readwrite',
|
||||
})),
|
||||
[allInstances]
|
||||
);
|
||||
|
||||
// 查询授权：只匹配 read + readwrite 实例
|
||||
const readonlyTransferItems = useMemo(() =>
|
||||
transferItems.filter(i => i.accessMode === 'read' || i.accessMode === 'readwrite'),
|
||||
[transferItems]
|
||||
);
|
||||
|
||||
// 变更授权：只匹配 write + readwrite 实例
|
||||
const writeTransferItems = useMemo(() =>
|
||||
transferItems.filter(i => i.accessMode === 'write' || i.accessMode === 'readwrite'),
|
||||
[transferItems]
|
||||
);
|
||||
|
||||
const filteredGroups = useMemo(() => groups.filter(g => !search || g.name.includes(search)), [groups, search]);
|
||||
const filteredUsers = useMemo(() => allUsers.filter(u => !userSearch || (u.display_name || u.username).toLowerCase().includes(userSearch.toLowerCase())), [allUsers, userSearch]);
|
||||
|
||||
@@ -263,20 +276,20 @@ export default function InstanceGroupPage() {
|
||||
<div className="rounded-xl p-4 bg-emerald-500/5 border border-emerald-500/20">
|
||||
<div className="flex items-center gap-2 mb-3">
|
||||
<Eye className="w-4 h-4 text-emerald-400" />
|
||||
<span className="text-sm font-medium text-emerald-400">只读查看</span>
|
||||
<span className="text-sm font-medium text-emerald-400">查询授权</span>
|
||||
<span className="text-xs text-[var(--dg-text-muted)]">— 查询数据的实例</span>
|
||||
</div>
|
||||
<Transfer title="只读实例" items={transferItems} selected={readonlyIds} onChange={setReadonlyIds} emptyText="选择用于查询的实例" />
|
||||
<Transfer title="只读实例" items={readonlyTransferItems} selected={readonlyIds} onChange={setReadonlyIds} emptyText="选择用于查询的实例" />
|
||||
</div>
|
||||
|
||||
{/* Write Transfer */}
|
||||
<div className="rounded-xl p-4 bg-amber-500/5 border border-amber-500/20">
|
||||
<div className="flex items-center gap-2 mb-3">
|
||||
<PenLine className="w-4 h-4 text-amber-400" />
|
||||
<span className="text-sm font-medium text-amber-400">写入变更</span>
|
||||
<span className="text-sm font-medium text-amber-400">变更授权</span>
|
||||
<span className="text-xs text-[var(--dg-text-muted)]">— 数据变更工单的实例</span>
|
||||
</div>
|
||||
<Transfer title="写入实例" items={transferItems} selected={writeIds} onChange={setWriteIds} emptyText="选择用于变更的实例" />
|
||||
<Transfer title="写入实例" items={writeTransferItems} selected={writeIds} onChange={setWriteIds} emptyText="选择用于变更的实例" />
|
||||
</div>
|
||||
|
||||
<div className="flex justify-end gap-3 pt-2">
|
||||
@@ -297,7 +310,7 @@ export default function InstanceGroupPage() {
|
||||
<div className="flex items-center justify-between">
|
||||
<div>
|
||||
<h1 className="text-2xl font-semibold">数据库权限组</h1>
|
||||
<p className="text-sm text-[var(--dg-text-secondary)] mt-1">每个策略包含「只读查看」和「写入变更」两类实例</p>
|
||||
<p className="text-sm text-[var(--dg-text-secondary)] mt-1">每个策略包含「查询授权」和「变更授权」两类实例</p>
|
||||
</div>
|
||||
{canManage && (
|
||||
<button onClick={() => { resetForm(); setShowCreateModal(true); }} className="flex items-center gap-2 px-4 py-2.5 bg-blue-500 rounded-lg text-sm font-medium text-white hover:bg-blue-600 transition-colors">
|
||||
@@ -372,7 +385,7 @@ export default function InstanceGroupPage() {
|
||||
<Card className="dg-card">
|
||||
<CardContent className="p-5">
|
||||
<h3 className="text-sm font-semibold flex items-center gap-2 mb-3">
|
||||
<Eye className="w-4 h-4 text-emerald-400" />只读查看 ({roInst.length})
|
||||
<Eye className="w-4 h-4 text-emerald-400" />查询授权 ({roInst.length})
|
||||
</h3>
|
||||
<InstanceList instances={roInst} />
|
||||
</CardContent>
|
||||
@@ -382,7 +395,7 @@ export default function InstanceGroupPage() {
|
||||
<Card className="dg-card">
|
||||
<CardContent className="p-5">
|
||||
<h3 className="text-sm font-semibold flex items-center gap-2 mb-3">
|
||||
<PenLine className="w-4 h-4 text-amber-400" />写入变更 ({wrInst.length})
|
||||
<PenLine className="w-4 h-4 text-amber-400" />变更授权 ({wrInst.length})
|
||||
</h3>
|
||||
<InstanceList instances={wrInst} />
|
||||
</CardContent>
|
||||
|
||||
Reference in new issue
Block a user