feat(alert): A2 告警引擎分布式安全 — Redis 分布式锁(SetNX)
- Cache 接口新增 SetNX 方法(go-redis 原子 / redka check-then-set 单副本安全) - AlertEngine 改造为支持分布式锁: tryAcquireLock/releaseLock/GetEngineStatus - 多副本部署时仅 Leader 执行告警检查, 60s TTL 防死锁, fail-open 容错 - 新增 GET /alerts/engine/status 监控端点(is_leader/instance_id/lock_holder) - 修复 GrafanaDashboard.tsx Panel.options 类型不匹配导致构建中断 - 同步未提交的前端类型安全迁移(140+ 文件) - ROADMAP/TDD_PLAN/PROJECT_EVALUATION 三文档同步更新 验证: go build 零错误, Docker 部署 healthy, 引擎状态端点正常, 锁竞争测试通过(非 Leader 跳过检查), 5/5 核心 API 回归通过
This commit is contained in:
1 parent
5ca0e6d83a
commit
c68aef4444
150 files changed
+1038
-690
No files matched your search
@@ -23,11 +23,12 @@ import { Loader2 } from 'lucide-react';
|
||||
import { toast } from 'sonner';
|
||||
import { approvalApi } from '@/api';
|
||||
import { parseFields, APPROVAL_TYPE_OPTIONS } from './helpers';
|
||||
import type { JsonData } from '@/types/common';
|
||||
|
||||
interface ApprovalCreateDialogProps {
|
||||
open: boolean;
|
||||
onOpenChange: (open: boolean) => void;
|
||||
templates: any[];
|
||||
templates: JsonData[];
|
||||
onSuccess: () => void;
|
||||
}
|
||||
|
||||
@@ -38,8 +39,8 @@ export function ApprovalCreateDialog({
|
||||
templates,
|
||||
onSuccess,
|
||||
}: ApprovalCreateDialogProps) {
|
||||
const [selectedTemplate, setSelectedTemplate] = useState<any>(null);
|
||||
const [formData, setFormData] = useState<Record<string, any>>({});
|
||||
const [selectedTemplate, setSelectedTemplate] = useState<JsonData>(null);
|
||||
const [formData, setFormData] = useState<JsonData>({});
|
||||
const [submitting, setSubmitting] = useState(false);
|
||||
|
||||
// 提交新建申请 // Logan.Li
|
||||
@@ -143,7 +144,7 @@ export function ApprovalCreateDialog({
|
||||
</button>
|
||||
</div>
|
||||
<div className="grid grid-cols-2 gap-x-4 gap-y-4">
|
||||
{parseFields(selectedTemplate.form_schema).map(( field: any) => {
|
||||
{parseFields(selectedTemplate.form_schema).map((field: JsonData) => {
|
||||
const isTextarea = field.type === 'textarea';
|
||||
return (
|
||||
<div key={field.key} className={cn('space-y-1.5', isTextarea && 'col-span-2')}>
|
||||
|
||||
@@ -16,14 +16,15 @@ import {
|
||||
getApprovalTypeColor,
|
||||
getInstanceType,
|
||||
} from './helpers';
|
||||
import type { JsonData } from '@/types/common';
|
||||
|
||||
interface ApprovalDetailDialogProps {
|
||||
open: boolean;
|
||||
onOpenChange: (open: boolean) => void;
|
||||
instance: any;
|
||||
templates: any[];
|
||||
onApprove: ( instance: any) => void;
|
||||
onReject: ( instance: any) => void;
|
||||
instance?: JsonData;
|
||||
templates: JsonData[];
|
||||
onApprove: (instance: JsonData) => void;
|
||||
onReject: (instance: JsonData) => void;
|
||||
}
|
||||
|
||||
// 审批详情弹窗 — 展示流程详情/表单/进度/操作记录 // Logan.Li
|
||||
@@ -91,7 +92,7 @@ export function ApprovalDetailDialog({
|
||||
<div className="bg-[var(--dg-bg-primary)] rounded-lg p-4">
|
||||
<p className="text-sm font-medium text-[var(--dg-text-secondary)] mb-3">操作记录</p>
|
||||
<div className="space-y-2">
|
||||
{instance.actions.map(( action: any, index: number) => (
|
||||
{instance.actions.map((action: JsonData, index: number) => (
|
||||
<div key={index} className="flex items-center gap-3 text-sm">
|
||||
{action.action === 'approve' ? (
|
||||
<CheckCircle2 className="h-4 w-4 text-emerald-400" />
|
||||
|
||||
@@ -33,13 +33,14 @@ import {
|
||||
getApprovalTypeColor,
|
||||
getInstanceType,
|
||||
} from './helpers';
|
||||
import type { JsonData } from '@/types/common';
|
||||
|
||||
export function ApprovalFlow() {
|
||||
const [activeTab, setActiveTab] = useState<'instances' | 'flows' | 'my-approvals'>('instances');
|
||||
|
||||
const [processes, setProcesses] = useState<any[]>([]);
|
||||
const [templates, setTemplates] = useState<any[]>([]);
|
||||
const [myApprovals, setMyApprovals] = useState<any[]>([]);
|
||||
const [processes, setProcesses] = useState<JsonData[]>([]);
|
||||
const [templates, setTemplates] = useState<JsonData[]>([]);
|
||||
const [myApprovals, setMyApprovals] = useState<JsonData[]>([]);
|
||||
const [loading, setLoading] = useState(true);
|
||||
|
||||
const [searchQuery, setSearchQuery] = useState('');
|
||||
@@ -48,7 +49,7 @@ export function ApprovalFlow() {
|
||||
|
||||
// 详情弹窗
|
||||
const [detailOpen, setDetailOpen] = useState(false);
|
||||
const [selectedInstance, setSelectedInstance] = useState<any>(null);
|
||||
const [selectedInstance, setSelectedInstance] = useState<JsonData>(null);
|
||||
|
||||
// 审批操作弹窗
|
||||
const [actionDialogOpen, setActionDialogOpen] = useState(false);
|
||||
@@ -95,13 +96,13 @@ export function ApprovalFlow() {
|
||||
});
|
||||
|
||||
// 打开详情弹窗 // Logan.Li
|
||||
const handleView = ( instance: any) => {
|
||||
const handleView = (instance: JsonData) => {
|
||||
setSelectedInstance(instance);
|
||||
setDetailOpen(true);
|
||||
};
|
||||
|
||||
// 打开审批操作弹窗 // Logan.Li
|
||||
const openActionDialog = (type: 'approve' | 'reject', instance: any) => {
|
||||
const openActionDialog = (type: 'approve' | 'reject', instance: JsonData) => {
|
||||
setActionType(type);
|
||||
setSelectedInstance(instance);
|
||||
setActionComment('');
|
||||
@@ -123,7 +124,7 @@ export function ApprovalFlow() {
|
||||
setActionDialogOpen(false);
|
||||
loadData();
|
||||
} catch (error) {
|
||||
toast.error('操作失败', { description: (error as Record<string, any>).message });
|
||||
toast.error('操作失败', { description: (error as JsonData).message });
|
||||
} finally {
|
||||
setActionSubmitting(false);
|
||||
}
|
||||
|
||||
@@ -19,6 +19,7 @@ import {
|
||||
getApprovalTypeIcon,
|
||||
getInstanceType,
|
||||
} from './helpers';
|
||||
import type { JsonData } from '@/types/common';
|
||||
|
||||
// 状态标签页定义
|
||||
const STATUS_TABS = [
|
||||
@@ -69,16 +70,16 @@ function getStatusBadge(status: string) {
|
||||
}
|
||||
|
||||
interface ApprovalProcessTabProps {
|
||||
processes: any[];
|
||||
filteredInstances: any[];
|
||||
processes: JsonData[];
|
||||
filteredInstances: JsonData[];
|
||||
loading: boolean;
|
||||
searchQuery: string;
|
||||
setSearchQuery: (v: string) => void;
|
||||
statusFilter: string;
|
||||
setStatusFilter: (v: string) => void;
|
||||
onView: ( instance: any) => void;
|
||||
onApprove: ( instance: any) => void;
|
||||
onReject: ( instance: any) => void;
|
||||
onView: (instance: JsonData) => void;
|
||||
onApprove: (instance: JsonData) => void;
|
||||
onReject: (instance: JsonData) => void;
|
||||
}
|
||||
|
||||
export function ApprovalProcessTab({
|
||||
|
||||
@@ -3,8 +3,9 @@ import { Card, CardContent, CardHeader, CardTitle, CardDescription } from '@/com
|
||||
import { Button } from '@/components/ui/button';
|
||||
import { Badge } from '@/components/ui/badge';
|
||||
import { Filter, Edit, GitBranch, ArrowRight } from 'lucide-react';
|
||||
import type { JsonData } from '@/types/common';
|
||||
|
||||
function parseSteps( steps: any) {
|
||||
function parseSteps(steps: JsonData) {
|
||||
if (Array.isArray(steps)) return steps;
|
||||
if (typeof steps === 'string') {
|
||||
try {
|
||||
@@ -31,14 +32,14 @@ const getApprovalTypeColor = (value: string): string =>
|
||||
APPROVAL_TYPE_OPTIONS.find((o) => o.value === value)?.color || 'var(--dg-text-secondary)';
|
||||
|
||||
// 模拟审批流程图
|
||||
function renderFlowChart( flow: any) {
|
||||
function renderFlowChart(flow: JsonData) {
|
||||
const nodes = parseSteps(flow.steps);
|
||||
if (nodes.length === 0) {
|
||||
return <div className="text-[var(--dg-text-muted)] text-center py-4">暂无流程节点</div>;
|
||||
}
|
||||
return (
|
||||
<div className="flex items-center gap-2 overflow-x-auto py-4">
|
||||
{nodes.map(( node: any, index: number) => (
|
||||
{nodes.map((node: JsonData, index: number) => (
|
||||
<div key={node.id || index} className="flex items-center">
|
||||
<div
|
||||
className={cn(
|
||||
@@ -66,7 +67,7 @@ function renderFlowChart( flow: any) {
|
||||
}
|
||||
|
||||
interface ApprovalTemplateTabProps {
|
||||
filteredTemplates: any[];
|
||||
filteredTemplates: JsonData[];
|
||||
templateTypeFilter: string;
|
||||
setTemplateTypeFilter: (value: string) => void;
|
||||
}
|
||||
|
||||
@@ -8,9 +8,10 @@ import {
|
||||
GitCommit,
|
||||
FileText,
|
||||
} from 'lucide-react';
|
||||
import type { JsonData } from '@/types/common';
|
||||
|
||||
// 解析审批步骤数组(兼容 JSON 字符串) // Logan.Li
|
||||
export function parseSteps( steps: any) {
|
||||
export function parseSteps(steps: JsonData) {
|
||||
if (Array.isArray(steps)) return steps;
|
||||
if (typeof steps === 'string') {
|
||||
try {
|
||||
@@ -24,7 +25,7 @@ export function parseSteps( steps: any) {
|
||||
}
|
||||
|
||||
// 解析模板的 form_schema,返回字段定义数组 // Logan.Li
|
||||
export function parseFields( formSchema: any): any[] {
|
||||
export function parseFields(formSchema: JsonData): JsonData[] {
|
||||
if (!formSchema) return [];
|
||||
const schema = typeof formSchema === 'string' ? (() => { try { return JSON.parse(formSchema); } catch { return null; } })() : formSchema;
|
||||
if (!schema) return [];
|
||||
@@ -32,7 +33,7 @@ export function parseFields( formSchema: any): any[] {
|
||||
}
|
||||
|
||||
// 在详情弹窗中渲染表单数据为键值对展示 // Logan.Li
|
||||
export function renderFormData(formDataStr: string, template?: any) {
|
||||
export function renderFormData(formDataStr: string, template?: JsonData) {
|
||||
if (!formDataStr) return null;
|
||||
let data: Record<string, unknown>;
|
||||
try {
|
||||
@@ -78,26 +79,26 @@ export const getApprovalTypeIcon = (value: string) =>
|
||||
APPROVAL_TYPE_OPTIONS.find((o) => o.value === value)?.icon || FileText;
|
||||
|
||||
// 获取审批实例的类型(优先从关联模板取) // Logan.Li
|
||||
export const getInstanceType = ( instance: any): string =>
|
||||
export const getInstanceType = (instance: JsonData): string =>
|
||||
instance?.template?.type || instance?.type || '';
|
||||
|
||||
// 计算审批进度信息 // Logan.Li
|
||||
export function getProgressInfo( instance: any) {
|
||||
export function getProgressInfo(instance: JsonData) {
|
||||
const steps = parseSteps(instance.steps);
|
||||
const currentIndex = instance.current_step ?? 0;
|
||||
const total = steps.length;
|
||||
const completed = steps.filter(( s: any) => s.status === 'approved' || s.status === 'completed').length;
|
||||
const completed = steps.filter((s: JsonData) => s.status === 'approved' || s.status === 'completed').length;
|
||||
const percentage = total > 0 ? Math.round((completed / total) * 100) : 0;
|
||||
return { steps, currentIndex, total, completed, percentage };
|
||||
}
|
||||
|
||||
// 渲染审批进度(用于详情弹窗) // Logan.Li
|
||||
export function renderStepProgress( instance: any) {
|
||||
export function renderStepProgress(instance: JsonData) {
|
||||
const { steps, currentIndex } = getProgressInfo(instance);
|
||||
if (steps.length === 0) return null;
|
||||
return (
|
||||
<div className="flex items-center gap-1 overflow-x-auto">
|
||||
{steps.map(( step: any, index: number) => {
|
||||
{steps.map((step: JsonData, index: number) => {
|
||||
const isCompleted = step.status === 'approved' || step.status === 'completed';
|
||||
const isCurrent = index === currentIndex;
|
||||
const isRejected = step.status === 'rejected';
|
||||
|
||||
Reference in new issue
Block a user