feat: 1. 本地化思源黑体的字体包并优先使用。
2. 添加权限映射表和全局查看权限的hook,便于路由控制不同权限按钮显示/隐藏。 3. 删除评查点分组的部分旧api方法。 4. 对接评查点分组接口,文档类型接口, 提示词管理接口, 入口模块管理的接口。 5. 优化角色权限管理的接口,完善不用地区的访问权限认证。 6. 优化主页交叉评查和设置的入口样式和布局。 7. 优化评查点分组,评查规则的功能权限校验。
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
import { postgrestGet, postgrestPost, postgrestPut, postgrestDelete, type PostgrestParams } from '../postgrest-client';
|
||||
import { postgrestGet, postgrestPut, type PostgrestParams } from '../postgrest-client';
|
||||
import { apiRequest } from '../axios-client';
|
||||
import { formatDate } from '../../utils';
|
||||
|
||||
@@ -238,680 +238,9 @@ export async function getChildGroups(parentId: string, token?: string): Promise<
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取所有评查点分组(包括一级和二级)
|
||||
* @deprecated 使用 getAllEvaluationPointGroups 代替(FastAPI v3)
|
||||
* @param token JWT token (可选)
|
||||
* @returns 完整的评查点分组列表
|
||||
*/
|
||||
export async function getAllRuleGroups_legacy(token?: string): Promise<{data: RuleGroup[]; error?: never} | {data?: never; error: string; status?: number}> {
|
||||
try {
|
||||
// 1. 获取所有分组
|
||||
const allGroupsParams: PostgrestParams = {
|
||||
select: `
|
||||
id,
|
||||
pid,
|
||||
name,
|
||||
is_enabled
|
||||
`,
|
||||
token
|
||||
};
|
||||
|
||||
const allGroupsResponse = await postgrestGet<{code: number; msg: string; data: Array<{
|
||||
id: number;
|
||||
pid: number;
|
||||
name: string;
|
||||
is_enabled: boolean;
|
||||
}>}>('evaluation_point_groups', allGroupsParams);
|
||||
|
||||
if (allGroupsResponse.error) {
|
||||
return { error: allGroupsResponse.error, status: allGroupsResponse.status };
|
||||
}
|
||||
|
||||
// 2. 处理响应数据
|
||||
let allGroups: RuleGroup[] = [];
|
||||
if (allGroupsResponse.data && 'code' in allGroupsResponse.data && allGroupsResponse.data.data) {
|
||||
allGroups = allGroupsResponse.data.data.map(group => ({
|
||||
id: group.id.toString(),
|
||||
pid: group.pid.toString(),
|
||||
name: group.name,
|
||||
is_enabled: group.is_enabled,
|
||||
children: []
|
||||
}));
|
||||
} else if (Array.isArray(allGroupsResponse.data)) {
|
||||
allGroups = allGroupsResponse.data.map(group => ({
|
||||
id: group.id.toString(),
|
||||
pid: group.pid.toString(),
|
||||
name: group.name,
|
||||
is_enabled: group.is_enabled,
|
||||
children: []
|
||||
}));
|
||||
}
|
||||
|
||||
// 3. 构建树形结构(pid为NULL表示顶级分组)
|
||||
const parentGroups = allGroups.filter(group => !group.pid || group.pid === '0' || group.pid === null);
|
||||
|
||||
// 4. 为每个父分组添加子分组
|
||||
for (const parent of parentGroups) {
|
||||
parent.children = allGroups.filter(group => group.pid === parent.id);
|
||||
|
||||
// 5. 获取每个子分组的评查点数量
|
||||
for (const child of parent.children) {
|
||||
const ruleCountParams: PostgrestParams = {
|
||||
select: 'id',
|
||||
filter: {
|
||||
'evaluation_point_groups_id': `eq.${child.id}`
|
||||
},
|
||||
token
|
||||
};
|
||||
|
||||
const ruleCountResponse = await postgrestGet<ApiResponse<Array<{id: number}>>>('evaluation_points', ruleCountParams);
|
||||
|
||||
child.ruleCount = ruleCountResponse.data && 'code' in ruleCountResponse.data
|
||||
? (ruleCountResponse.data.data && Array.isArray(ruleCountResponse.data.data) ? ruleCountResponse.data.data.length : 0)
|
||||
: (Array.isArray(ruleCountResponse.data) ? (ruleCountResponse.data as unknown[]).length : 0)
|
||||
}
|
||||
}
|
||||
|
||||
return { data: parentGroups };
|
||||
} catch (error) {
|
||||
console.error('获取所有评查点分组出错:', error);
|
||||
return {
|
||||
error: error instanceof Error ? error.message : '获取所有评查点分组失败',
|
||||
status: 500
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取单个评查点分组详情(包含评查点数量统计)
|
||||
* @deprecated 使用 getEvaluationPointGroup 代替(FastAPI v3)
|
||||
* @param id 分组ID
|
||||
* @param token JWT token (可选)
|
||||
* @returns 分组详情
|
||||
*/
|
||||
export async function getRuleGroup_legacy(id: string, token?: string): Promise<{data: RuleGroup; error?: never} | {data?: never; error: string; status?: number}> {
|
||||
try {
|
||||
if (!id) {
|
||||
return { error: '分组ID不能为空', status: 400 };
|
||||
}
|
||||
|
||||
const params: PostgrestParams = {
|
||||
select: `
|
||||
id,
|
||||
pid,
|
||||
name,
|
||||
code,
|
||||
description,
|
||||
is_enabled,
|
||||
created_at
|
||||
`,
|
||||
filter: {
|
||||
'id': `eq.${id}`
|
||||
},
|
||||
token
|
||||
};
|
||||
|
||||
const response = await postgrestGet<{code: number; msg: string; data: Array<{
|
||||
id: number;
|
||||
pid: number;
|
||||
name: string;
|
||||
code?: string;
|
||||
description?: string;
|
||||
is_enabled: boolean;
|
||||
created_at?: string;
|
||||
}>}>('evaluation_point_groups', params);
|
||||
|
||||
if (response.error) {
|
||||
return { error: response.error, status: response.status };
|
||||
}
|
||||
|
||||
let group: RuleGroup | null = null;
|
||||
|
||||
if (response.data && 'code' in response.data && response.data.data && response.data.data.length > 0) {
|
||||
const apiGroup = response.data.data[0];
|
||||
group = {
|
||||
id: apiGroup.id.toString(),
|
||||
pid: apiGroup.pid.toString(),
|
||||
name: apiGroup.name,
|
||||
code: apiGroup.code,
|
||||
description: apiGroup.description,
|
||||
is_enabled: apiGroup.is_enabled,
|
||||
createdAt: apiGroup.created_at ? formatDate(apiGroup.created_at) : undefined
|
||||
};
|
||||
} else if (Array.isArray(response.data) && response.data.length > 0) {
|
||||
const apiGroup = response.data[0];
|
||||
group = {
|
||||
id: apiGroup.id.toString(),
|
||||
pid: apiGroup.pid.toString(),
|
||||
name: apiGroup.name,
|
||||
code: apiGroup.code,
|
||||
description: apiGroup.description,
|
||||
is_enabled: apiGroup.is_enabled,
|
||||
createdAt: apiGroup.created_at ? formatDate(apiGroup.created_at) : undefined
|
||||
};
|
||||
}
|
||||
|
||||
if (!group) {
|
||||
return { error: '未找到指定分组', status: 404 };
|
||||
}
|
||||
|
||||
// 获取该分组下的评查点数量(一级分组和二级分组都统计)
|
||||
const ruleCountParams: PostgrestParams = {
|
||||
select: 'id',
|
||||
filter: {
|
||||
'evaluation_point_groups_id': `eq.${group.id}`
|
||||
},
|
||||
token
|
||||
};
|
||||
|
||||
const ruleCountResponse = await postgrestGet<ApiResponse<Array<{id: number}>>>(
|
||||
'evaluation_points',
|
||||
ruleCountParams
|
||||
);
|
||||
|
||||
// 计算评查点数量
|
||||
let ruleCount = 0;
|
||||
if (ruleCountResponse.error) {
|
||||
// 查询失败,使用默认值 0
|
||||
ruleCount = 0;
|
||||
} else if (ruleCountResponse.data) {
|
||||
// 处理包装格式的响应
|
||||
if ('code' in ruleCountResponse.data && 'data' in ruleCountResponse.data) {
|
||||
const wrappedData = ruleCountResponse.data as {code: number; data: Array<{id: number}>};
|
||||
ruleCount = Array.isArray(wrappedData.data) ? wrappedData.data.length : 0;
|
||||
}
|
||||
// 处理直接数组格式的响应
|
||||
else if (Array.isArray(ruleCountResponse.data)) {
|
||||
ruleCount = (ruleCountResponse.data as Array<{id: number}>).length;
|
||||
}
|
||||
}
|
||||
|
||||
group.ruleCount = ruleCount;
|
||||
|
||||
return { data: group };
|
||||
} catch (error) {
|
||||
console.error('获取评查点分组详情失败:', error);
|
||||
return {
|
||||
error: error instanceof Error ? error.message : '获取评查点分组详情失败',
|
||||
status: 500
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 创建评查点分组(增强版 - 包含完整验证)
|
||||
* @deprecated 使用 createEvaluationPointGroup 代替(FastAPI v3)
|
||||
* @param groupData 分组数据
|
||||
* @param token JWT token (可选)
|
||||
* @returns 创建的分组
|
||||
*/
|
||||
export async function createRuleGroup_legacy(groupData: RuleGroupCreateUpdateDto, token?: string): Promise<{data: RuleGroup; error?: never} | {data?: never; error: string; status?: number}> {
|
||||
try {
|
||||
// ========== 1. 基本字段验证 ==========
|
||||
|
||||
// 验证必填字段
|
||||
if (!groupData.name || !groupData.code) {
|
||||
return { error: '分组名称和编码不能为空', status: 400 };
|
||||
}
|
||||
|
||||
// 验证名称长度
|
||||
const trimmedName = groupData.name.trim();
|
||||
if (trimmedName.length === 0) {
|
||||
return { error: '分组名称不能为空', status: 400 };
|
||||
}
|
||||
if (trimmedName.length > 100) {
|
||||
return { error: '分组名称不能超过100个字符', status: 400 };
|
||||
}
|
||||
|
||||
// 验证编码格式(只允许字母、数字、连字符、下划线)
|
||||
const trimmedCode = groupData.code.trim();
|
||||
if (trimmedCode.length === 0) {
|
||||
return { error: '分组编码不能为空', status: 400 };
|
||||
}
|
||||
if (!/^[a-zA-Z0-9-_]+$/.test(trimmedCode)) {
|
||||
return { error: '分组编码只能包含字母、数字、连字符和下划线', status: 400 };
|
||||
}
|
||||
if (trimmedCode.length > 50) {
|
||||
return { error: '分组编码不能超过50个字符', status: 400 };
|
||||
}
|
||||
|
||||
// ========== 2. 编码唯一性验证 ==========
|
||||
|
||||
const existingGroupsResponse = await getRuleGroups({
|
||||
code: trimmedCode,
|
||||
pageSize: 1,
|
||||
token
|
||||
});
|
||||
|
||||
if (existingGroupsResponse.error) {
|
||||
return {
|
||||
error: `编码唯一性检查失败: ${existingGroupsResponse.error}`,
|
||||
status: existingGroupsResponse.status || 500
|
||||
};
|
||||
}
|
||||
|
||||
if (existingGroupsResponse.data && existingGroupsResponse.data.length > 0) {
|
||||
return { error: '分组编码已存在,请使用其他编码', status: 409 };
|
||||
}
|
||||
|
||||
// ========== 3. 父级ID验证 ==========
|
||||
|
||||
let pidValue: number | null;
|
||||
if (!groupData.pid || groupData.pid === '0') {
|
||||
// 一级分组(顶级分组)
|
||||
pidValue = null;
|
||||
} else {
|
||||
// 二级分组 - 验证父级ID
|
||||
pidValue = Number(groupData.pid);
|
||||
if (isNaN(pidValue)) {
|
||||
return { error: '父分组ID必须是有效的数字', status: 400 };
|
||||
}
|
||||
|
||||
// 验证父级分组是否存在
|
||||
const parentGroupResponse = await getRuleGroup(groupData.pid, token);
|
||||
if (parentGroupResponse.error || !parentGroupResponse.data) {
|
||||
return { error: '父分组不存在或无法访问', status: 404 };
|
||||
}
|
||||
|
||||
// 验证父级分组本身不是二级分组(不允许三级分组)
|
||||
const parentGroup = parentGroupResponse.data;
|
||||
if (parentGroup.pid && parentGroup.pid !== '0') {
|
||||
return { error: '不允许创建三级分组,父级分组必须是一级分组', status: 400 };
|
||||
}
|
||||
}
|
||||
|
||||
// ========== 4. 构建并发送请求 ==========
|
||||
|
||||
const apiGroup: ApiRuleGroup = {
|
||||
pid: pidValue,
|
||||
name: trimmedName,
|
||||
code: trimmedCode,
|
||||
description: groupData.description?.trim() || '',
|
||||
is_enabled: groupData.is_enabled !== undefined ? groupData.is_enabled : true
|
||||
};
|
||||
|
||||
const response = await postgrestPost<ApiResponse<ApiRuleGroup> | ApiRuleGroup, ApiRuleGroup>(
|
||||
'evaluation_point_groups',
|
||||
apiGroup,
|
||||
token
|
||||
);
|
||||
|
||||
if (response.error) {
|
||||
// 处理数据库约束错误
|
||||
if (response.error.includes('evaluation_point_groups_code_key')) {
|
||||
return { error: '分组编码已存在(数据库约束)', status: 409 };
|
||||
}
|
||||
return { error: response.error, status: response.status };
|
||||
}
|
||||
|
||||
// ========== 5. 处理响应数据 ==========
|
||||
|
||||
const apiResponse = extractApiData<ApiRuleGroup>(response.data);
|
||||
|
||||
if (!apiResponse || !apiResponse.id) {
|
||||
return { error: '创建成功但未返回分组ID', status: 500 };
|
||||
}
|
||||
|
||||
// 构建返回对象
|
||||
const createdGroup: RuleGroup = {
|
||||
id: apiResponse.id.toString(),
|
||||
pid: apiResponse.pid !== null ? apiResponse.pid.toString() : '0',
|
||||
name: apiResponse.name,
|
||||
code: apiResponse.code || trimmedCode,
|
||||
description: apiResponse.description,
|
||||
is_enabled: apiResponse.is_enabled,
|
||||
createdAt: apiResponse.created_at ? formatDate(apiResponse.created_at) : undefined
|
||||
};
|
||||
|
||||
return { data: createdGroup };
|
||||
} catch (error) {
|
||||
console.error('创建评查点分组失败:', error);
|
||||
return {
|
||||
error: error instanceof Error ? error.message : '创建评查点分组失败',
|
||||
status: 500
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 更新评查点分组(增强版 - 包含完整验证,不允许修改 pid)
|
||||
* @deprecated 使用 updateEvaluationPointGroup 代替(FastAPI v3)
|
||||
* @param id 分组ID
|
||||
* @param data 更新的分组数据
|
||||
* @param token JWT token (可选)
|
||||
* @returns 更新后的分组
|
||||
*/
|
||||
export async function updateRuleGroup_legacy(id: string, data: RuleGroupCreateUpdateDto, token?: string): Promise<{data: RuleGroup; error?: never} | {data?: never; error: string; status?: number}> {
|
||||
try {
|
||||
// ========== 1. ID有效性验证 ==========
|
||||
|
||||
if (!id) {
|
||||
return { error: '分组ID不能为空', status: 400 };
|
||||
}
|
||||
|
||||
// 验证分组是否存在
|
||||
const existingGroupResponse = await getRuleGroup(id, token);
|
||||
if (existingGroupResponse.error || !existingGroupResponse.data) {
|
||||
return { error: '分组不存在或无法访问', status: 404 };
|
||||
}
|
||||
|
||||
const existingGroup = existingGroupResponse.data;
|
||||
|
||||
// ========== 2. 基本字段验证 ==========
|
||||
|
||||
// 验证必填字段
|
||||
if (!data.name || !data.code) {
|
||||
return { error: '分组名称和编码不能为空', status: 400 };
|
||||
}
|
||||
|
||||
// 验证名称长度
|
||||
const trimmedName = data.name.trim();
|
||||
if (trimmedName.length === 0) {
|
||||
return { error: '分组名称不能为空', status: 400 };
|
||||
}
|
||||
if (trimmedName.length > 100) {
|
||||
return { error: '分组名称不能超过100个字符', status: 400 };
|
||||
}
|
||||
|
||||
// 验证编码格式(只允许字母、数字、连字符、下划线)
|
||||
const trimmedCode = data.code.trim();
|
||||
if (trimmedCode.length === 0) {
|
||||
return { error: '分组编码不能为空', status: 400 };
|
||||
}
|
||||
if (!/^[a-zA-Z0-9-_]+$/.test(trimmedCode)) {
|
||||
return { error: '分组编码只能包含字母、数字、连字符和下划线', status: 400 };
|
||||
}
|
||||
if (trimmedCode.length > 50) {
|
||||
return { error: '分组编码不能超过50个字符', status: 400 };
|
||||
}
|
||||
|
||||
// ========== 3. 编码唯一性验证(排除自身) ==========
|
||||
|
||||
const duplicateCheckResponse = await getRuleGroups({
|
||||
code: trimmedCode,
|
||||
pageSize: 10,
|
||||
token
|
||||
});
|
||||
|
||||
if (duplicateCheckResponse.error) {
|
||||
return {
|
||||
error: `编码唯一性检查失败: ${duplicateCheckResponse.error}`,
|
||||
status: duplicateCheckResponse.status || 500
|
||||
};
|
||||
}
|
||||
|
||||
// 检查是否有其他分组使用了相同的编码
|
||||
if (duplicateCheckResponse.data && duplicateCheckResponse.data.length > 0) {
|
||||
const isDuplicate = duplicateCheckResponse.data.some(group => group.id !== id);
|
||||
if (isDuplicate) {
|
||||
return { error: '分组编码已被其他分组使用,请使用其他编码', status: 409 };
|
||||
}
|
||||
}
|
||||
|
||||
// ========== 4. 不允许修改 pid(防止分组层级混乱) ==========
|
||||
|
||||
if (data.pid !== undefined) {
|
||||
const existingPid = existingGroup.pid === '0' || !existingGroup.pid ? null : existingGroup.pid;
|
||||
const newPid = !data.pid || data.pid === '0' ? null : data.pid;
|
||||
|
||||
if (existingPid !== newPid) {
|
||||
return {
|
||||
error: '不允许修改分组的父级ID,这会导致分组层级混乱。如需调整层级,请删除后重新创建。',
|
||||
status: 400
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
// ========== 5. 构建并发送请求 ==========
|
||||
|
||||
const apiGroup: Partial<ApiRuleGroup> = {
|
||||
name: trimmedName,
|
||||
code: trimmedCode,
|
||||
description: data.description?.trim() || '',
|
||||
is_enabled: data.is_enabled !== undefined ? data.is_enabled : true
|
||||
};
|
||||
|
||||
// 注意:不包含 pid 字段,防止误修改
|
||||
|
||||
const response = await postgrestPut<ApiResponse<RuleGroup> | RuleGroup, Partial<ApiRuleGroup>>(
|
||||
'evaluation_point_groups',
|
||||
apiGroup,
|
||||
{ id },
|
||||
token
|
||||
);
|
||||
|
||||
if (response.error) {
|
||||
// 处理数据库约束错误
|
||||
if (response.error.includes('evaluation_point_groups_code_key')) {
|
||||
return { error: '分组编码已存在(数据库约束)', status: 409 };
|
||||
}
|
||||
return { error: response.error, status: response.status };
|
||||
}
|
||||
|
||||
// ========== 6. 处理响应数据 ==========
|
||||
|
||||
const extractedData = extractApiData<RuleGroup>(response.data);
|
||||
|
||||
if (!extractedData) {
|
||||
return { error: '更新成功但未返回数据', status: 500 };
|
||||
}
|
||||
|
||||
return { data: extractedData };
|
||||
} catch (error) {
|
||||
console.error('更新评查点分组失败:', error);
|
||||
return {
|
||||
error: error instanceof Error ? error.message : '更新评查点分组失败',
|
||||
status: 500
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除评查点分组(增强版 - 安全的阻止删除策略)
|
||||
* @deprecated 使用 deleteEvaluationPointGroup 代替(FastAPI v3)
|
||||
*
|
||||
* 删除策略:
|
||||
* - 如果分组下有子分组,拒绝删除,提示用户先删除子分组
|
||||
* - 如果分组下有评查点,拒绝删除,提示用户先删除或移动评查点
|
||||
* - 只有空分组才能被删除
|
||||
*
|
||||
* @param id 分组ID
|
||||
* @param token JWT token (可选)
|
||||
* @returns 删除结果
|
||||
*/
|
||||
export async function deleteRuleGroup_legacy(id: string, token?: string): Promise<{success: boolean; error?: string; details?: { hasChildren: boolean; hasPoints: boolean; childCount?: number; pointCount?: number }}> {
|
||||
try {
|
||||
// ========== 1. ID验证 ==========
|
||||
|
||||
if (!id) {
|
||||
return { success: false, error: '分组ID不能为空' };
|
||||
}
|
||||
|
||||
// 验证分组是否存在
|
||||
const groupResponse = await getRuleGroup(id, token);
|
||||
if (groupResponse.error || !groupResponse.data) {
|
||||
return { success: false, error: '分组不存在或无法访问' };
|
||||
}
|
||||
|
||||
const group = groupResponse.data;
|
||||
|
||||
// ========== 2. 检查是否有子分组(一级分组专用) ==========
|
||||
|
||||
let hasChildren = false;
|
||||
let childCount = 0;
|
||||
|
||||
// 如果是一级分组,检查是否有子分组
|
||||
if (!group.pid || group.pid === '0') {
|
||||
const childGroupsResponse = await getChildGroups(id, token);
|
||||
|
||||
if (childGroupsResponse.error) {
|
||||
return {
|
||||
success: false,
|
||||
error: `检查子分组时出错: ${childGroupsResponse.error}`
|
||||
};
|
||||
}
|
||||
|
||||
const childGroups = childGroupsResponse.data || [];
|
||||
childCount = childGroups.length;
|
||||
hasChildren = childCount > 0;
|
||||
|
||||
if (hasChildren) {
|
||||
return {
|
||||
success: false,
|
||||
error: `该分组下存在 ${childCount} 个子分组,请先删除所有子分组后再删除此分组。`,
|
||||
details: {
|
||||
hasChildren: true,
|
||||
hasPoints: false,
|
||||
childCount
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
// ========== 3. 检查是否有关联的评查点 ==========
|
||||
|
||||
const pointsParams: PostgrestParams = {
|
||||
select: 'id',
|
||||
filter: {
|
||||
'evaluation_point_groups_id': `eq.${id}`
|
||||
},
|
||||
limit: 1, // 只需要知道是否存在,不需要获取所有数据
|
||||
token
|
||||
};
|
||||
|
||||
const pointsResponse = await postgrestGet<ApiResponse<Array<{id: number}>>>(
|
||||
'evaluation_points',
|
||||
pointsParams
|
||||
);
|
||||
|
||||
let hasPoints = false;
|
||||
let pointCount = group.ruleCount || 0;
|
||||
|
||||
if (pointsResponse.error) {
|
||||
return {
|
||||
success: false,
|
||||
error: `检查关联评查点时出错: ${pointsResponse.error}`
|
||||
};
|
||||
}
|
||||
|
||||
if (pointsResponse.data) {
|
||||
if ('code' in pointsResponse.data && pointsResponse.data.data) {
|
||||
hasPoints = Array.isArray(pointsResponse.data.data) && pointsResponse.data.data.length > 0;
|
||||
} else if (Array.isArray(pointsResponse.data)) {
|
||||
hasPoints = pointsResponse.data.length > 0;
|
||||
}
|
||||
}
|
||||
|
||||
if (hasPoints) {
|
||||
return {
|
||||
success: false,
|
||||
error: `该分组下存在 ${pointCount} 个评查点,请先删除或移动所有评查点后再删除此分组。`,
|
||||
details: {
|
||||
hasChildren: false,
|
||||
hasPoints: true,
|
||||
pointCount
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
// ========== 4. 执行删除操作 ==========
|
||||
|
||||
const response = await postgrestDelete<ApiResponse<{id: number}>>('evaluation_point_groups', {
|
||||
filter: {
|
||||
'id': `eq.${id}`
|
||||
},
|
||||
token
|
||||
});
|
||||
|
||||
if (response.error) {
|
||||
return { success: false, error: `删除失败: ${response.error}` };
|
||||
}
|
||||
|
||||
return {
|
||||
success: true,
|
||||
details: {
|
||||
hasChildren: false,
|
||||
hasPoints: false
|
||||
}
|
||||
};
|
||||
} catch (error) {
|
||||
console.error('删除评查点分组失败:', error);
|
||||
return {
|
||||
success: false,
|
||||
error: error instanceof Error ? error.message : '删除评查点分组失败'
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除子分组及其相关数据(级联删除)
|
||||
*
|
||||
* @deprecated 当前采用阻止删除策略,此函数暂不使用
|
||||
* @param id 子分组ID
|
||||
* @param token JWT token (可选)
|
||||
* @returns 删除结果
|
||||
*/
|
||||
async function deleteChildGroup(id: string, token?: string): Promise<{success: boolean; error?: string}> {
|
||||
try {
|
||||
// 1. 删除子分组下的所有评查点
|
||||
const deletePointsResult = await deleteEvaluationPointsByGroupId(id, token);
|
||||
if (!deletePointsResult.success) {
|
||||
return deletePointsResult;
|
||||
}
|
||||
|
||||
// 2. 删除子分组本身
|
||||
const response = await postgrestDelete<ApiResponse<{id: number}>>('evaluation_point_groups', {
|
||||
filter: {
|
||||
'id': `eq.${id}`
|
||||
},
|
||||
token
|
||||
});
|
||||
|
||||
if (response.error) {
|
||||
return { success: false, error: response.error };
|
||||
}
|
||||
|
||||
return { success: true };
|
||||
} catch (error) {
|
||||
console.error('删除子分组失败:', error);
|
||||
return {
|
||||
success: false,
|
||||
error: error instanceof Error ? error.message : '删除子分组失败'
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除指定分组下的所有评查点(级联删除)
|
||||
*
|
||||
* @deprecated 当前采用阻止删除策略,此函数暂不使用
|
||||
* @param groupId 分组ID
|
||||
* @param token JWT token (可选)
|
||||
* @returns 删除结果
|
||||
*/
|
||||
async function deleteEvaluationPointsByGroupId(groupId: string, token?: string): Promise<{success: boolean; error?: string}> {
|
||||
try {
|
||||
const response = await postgrestDelete<ApiResponse<{id: number}>>('evaluation_points', {
|
||||
filter: {
|
||||
'evaluation_point_groups_id': `eq.${groupId}`
|
||||
},
|
||||
token
|
||||
});
|
||||
|
||||
if (response.error) {
|
||||
return { success: false, error: response.error };
|
||||
}
|
||||
|
||||
return { success: true };
|
||||
} catch (error) {
|
||||
console.error('删除评查点失败:', error);
|
||||
return {
|
||||
success: false,
|
||||
error: error instanceof Error ? error.message : '删除评查点失败'
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
// ==================== 批量操作接口 ====================
|
||||
|
||||
@@ -1184,14 +513,12 @@ export async function getEvaluationPointGroups(
|
||||
if (code) queryParams.append('code', code);
|
||||
if (is_enabled !== undefined) queryParams.append('is_enabled', String(is_enabled));
|
||||
// 🔑 添加 pid 参数过滤
|
||||
// pid=null 或 pid='0' 表示只查询一级分组,后端需要识别字符串 "null"
|
||||
// pid=null 或 pid='0' 表示只查询一级分组(pid=0)
|
||||
// 如果 pid 未定义,则不传该参数(默认查询所有分组)
|
||||
if (pid !== undefined) {
|
||||
if (pid === null || pid === '0') {
|
||||
// 方案1:传递字符串 "null",后端需要识别并转换为 None/NULL
|
||||
queryParams.append('pid', 'null');
|
||||
// 方案2:不传参数,后端默认查询一级分组(需要后端支持)
|
||||
// 不添加 pid 参数
|
||||
// FastAPI v3 后端期望 pid=0(数字),不接受字符串 "null"
|
||||
queryParams.append('pid', '0');
|
||||
} else {
|
||||
queryParams.append('pid', String(pid));
|
||||
}
|
||||
@@ -1262,11 +589,25 @@ export async function getAllEvaluationPointGroups(
|
||||
return { error: response.error, status: response.status };
|
||||
}
|
||||
|
||||
if (response.data) {
|
||||
// ✅ 后端直接返回数组(不包裹在 { data: [...] } 中)
|
||||
if (response.data && Array.isArray(response.data)) {
|
||||
const ruleGroups = response.data.map(convertApiGroupToRuleGroup);
|
||||
return { data: ruleGroups };
|
||||
}
|
||||
|
||||
// ✅ 后端返回 { data: [...] } 格式(向后兼容)
|
||||
if (response.data && response.data.data && Array.isArray(response.data.data)) {
|
||||
const ruleGroups = response.data.data.map(convertApiGroupToRuleGroup);
|
||||
return { data: ruleGroups };
|
||||
}
|
||||
|
||||
// 返回错误(数据格式不正确)
|
||||
// console.error('❌ 获取分组数据格式错误:', {
|
||||
// responseData: response.data,
|
||||
// isArray: Array.isArray(response.data),
|
||||
// hasDataField: !!(response.data && 'data' in response.data)
|
||||
// });
|
||||
|
||||
return { error: '获取分组树形结构失败:返回数据格式不正确', status: 500 };
|
||||
} catch (error) {
|
||||
console.error('❌ 获取分组树形结构出错:', error);
|
||||
|
||||
Reference in New Issue
Block a user