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
@@ -165,7 +165,6 @@ export default function TicketCreatePage() {
|
||||
// -- Form fields --
|
||||
const [title, setTitle] = useState('');
|
||||
const [priority, setPriority] = useState('medium');
|
||||
const [dbType, setDbType] = useState('');
|
||||
const [instanceId, setInstanceId] = useState('');
|
||||
const [database, setDatabase] = useState('');
|
||||
const [sqlContent, setSqlContent] = useState('');
|
||||
@@ -208,7 +207,7 @@ export default function TicketCreatePage() {
|
||||
|
||||
useEffect(() => {
|
||||
setLoadingInstances(true);
|
||||
instanceApi.list()
|
||||
instanceApi.accessible('write')
|
||||
.then((res: unknown) => {
|
||||
const data = (res as { items?: unknown[] })?.items ?? res;
|
||||
setInstances(Array.isArray(data) ? data as InstanceItem[] : []);
|
||||
@@ -217,33 +216,9 @@ export default function TicketCreatePage() {
|
||||
.finally(() => setLoadingInstances(false));
|
||||
}, []);
|
||||
|
||||
const filteredInstances = useMemo(() => {
|
||||
if (!dbType) return instances;
|
||||
return instances.filter(i => {
|
||||
if (dbType === 'postgres') return i.db_type === 'postgres' || i.db_type === 'postgresql';
|
||||
return i.db_type === dbType;
|
||||
});
|
||||
}, [instances, dbType]);
|
||||
|
||||
useEffect(() => {
|
||||
if (instanceId) {
|
||||
const current = instances.find(i => i.id === Number(instanceId));
|
||||
if (current && dbType) {
|
||||
const match = dbType === 'postgres'
|
||||
? (current.db_type === 'postgres' || current.db_type === 'postgresql')
|
||||
: current.db_type === dbType;
|
||||
if (!match) {
|
||||
setInstanceId('');
|
||||
setDatabase('');
|
||||
setDatabases([]);
|
||||
}
|
||||
}
|
||||
}
|
||||
}, [dbType, instances, instanceId]);
|
||||
|
||||
/* ---------------------------------------------------------------- */
|
||||
/* Fetch databases */
|
||||
/* ---------------------------------------------------------------- */
|
||||
// 从选中实例自动获取 dbType
|
||||
const selectedInstance = useMemo(() => instances.find((i) => i.id === Number(instanceId)), [instances, instanceId]);
|
||||
const dbType = selectedInstance?.db_type || '';
|
||||
|
||||
useEffect(() => {
|
||||
if (!instanceId) { setDatabases([]); setDatabase(''); return; }
|
||||
@@ -391,7 +366,7 @@ export default function TicketCreatePage() {
|
||||
try {
|
||||
const inst = instances.find((i) => i.id === Number(instanceId));
|
||||
await ticketApi.create({
|
||||
title: title.trim(), db_type: inst?.db_type || dbType || 'mysql',
|
||||
title: title.trim(), db_type: inst?.db_type || 'mysql',
|
||||
instance_id: Number(instanceId), target_database: database,
|
||||
sql_content: sqlContent, rollback_sql: rollbackSql || undefined,
|
||||
reason: reason.trim(), priority: priority,
|
||||
@@ -403,13 +378,12 @@ export default function TicketCreatePage() {
|
||||
const msg = Array.isArray(raw) ? raw.map((v) => v.msg).join('; ') : (raw || '提交失败，请稍后重试');
|
||||
setError(msg);
|
||||
} finally { setSubmitting(false); }
|
||||
}, [title, sqlContent, instanceId, database, reason, priority, rollbackSql, instances, dbType, navigate]);
|
||||
}, [title, sqlContent, instanceId, database, reason, priority, rollbackSql, instances, navigate]);
|
||||
|
||||
/* ---------------------------------------------------------------- */
|
||||
/* Derived values */
|
||||
/* ---------------------------------------------------------------- */
|
||||
|
||||
const selectedInstance = useMemo(() => instances.find((i) => i.id === Number(instanceId)), [instances, instanceId]);
|
||||
const isRedis = selectedInstance?.db_type === 'redis';
|
||||
const isMySQL = selectedInstance?.db_type === 'mysql' || selectedInstance?.db_type === 'postgresql' || selectedInstance?.db_type === 'postgres';
|
||||
|
||||
@@ -770,33 +744,22 @@ export default function TicketCreatePage() {
|
||||
{PRIORITY_OPTIONS.map((opt) => <option key={opt.value} value={opt.value}>{opt.label}</option>)}
|
||||
</select>
|
||||
</div>
|
||||
<div>
|
||||
<label className="block text-sm font-medium mb-2">
|
||||
数据库类型 <span className="text-red-400">*</span>
|
||||
</label>
|
||||
<select value={dbType} onChange={(e) => setDbType(e.target.value)}
|
||||
className="w-full px-3 py-2 bg-[var(--dg-bg-primary)] border border-[var(--dg-border)] rounded-lg text-sm focus:outline-none focus:border-blue-500 transition-colors">
|
||||
{DB_TYPE_OPTIONS.map((opt) => <option key={opt.value} value={opt.value}>{opt.label}</option>)}
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Instance */}
|
||||
{/* Instance — 直接展示用户变更授权的实例 */}
|
||||
<div>
|
||||
<label className="block text-sm font-medium mb-2">
|
||||
选择实例 <span className="text-red-400">*</span>
|
||||
目标实例 <span className="text-red-400">*</span>
|
||||
</label>
|
||||
<select value={instanceId} onChange={(e) => setInstanceId(e.target.value)}
|
||||
disabled={loadingInstances || filteredInstances.length === 0}
|
||||
disabled={loadingInstances}
|
||||
className="w-full px-3 py-2 bg-[var(--dg-bg-primary)] border border-[var(--dg-border)] rounded-lg text-sm focus:outline-none focus:border-blue-500 transition-colors disabled:opacity-50">
|
||||
<option value="">
|
||||
{loadingInstances ? '加载中...' : dbType && filteredInstances.length === 0
|
||||
? `无 ${(DB_TYPE_LABELS[dbType]) || dbType} 实例` : dbType
|
||||
? `请选择 ${(DB_TYPE_LABELS[dbType]) || dbType} 实例` : '请先选择数据库类型'}
|
||||
{loadingInstances ? '加载中...' : instances.length === 0 ? '暂无变更授权实例' : '请选择实例'}
|
||||
</option>
|
||||
{filteredInstances.map((inst) => (
|
||||
{instances.map((inst) => (
|
||||
<option key={inst.id} value={String(inst.id)}>
|
||||
{inst.name} ({inst.host}:{inst.port})
|
||||
{inst.name} ({inst.host}:{inst.port}) — {DB_TYPE_LABELS[inst.db_type] || inst.db_type}
|
||||
</option>
|
||||
))}
|
||||
</select>
|
||||
|
||||
Reference in new issue
Block a user