feat: 添加对话应用选择和知识库切换功能
- 新增对话应用管理模块(dify-chat-apps),支持获取和切换对话应用 - 优化对话应用切换后自动刷新会话列表功能 - 知识库管理页面新增下拉选择器,支持切换不同知识库 - API 层支持 app_id 参数传递,实现多应用会话隔离 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
* 提供地区-知识库绑定管理功能
|
||||
*/
|
||||
|
||||
import { useState, useEffect, useCallback } from 'react';
|
||||
import { useState, useEffect, useCallback, useMemo } from 'react';
|
||||
import {
|
||||
getMyDatasets,
|
||||
getAllDatasets,
|
||||
@@ -31,9 +31,9 @@ export interface UseAreaDatasetConfigReturn {
|
||||
areas: string[];
|
||||
areasLoading: boolean;
|
||||
|
||||
// 筛选
|
||||
filterArea: string;
|
||||
setFilterArea: (area: string) => void;
|
||||
// 筛选 - 支持多选
|
||||
filterAreas: string[];
|
||||
setFilterAreas: (areas: string[]) => void;
|
||||
page: number;
|
||||
setPage: (page: number) => void;
|
||||
pageSize: number;
|
||||
@@ -56,23 +56,36 @@ export interface UseAreaDatasetConfigReturn {
|
||||
canManageDataset: boolean;
|
||||
}
|
||||
|
||||
// 角色名称映射
|
||||
const ROLE_LABELS: Record<string, string> = {
|
||||
common: '普通用户',
|
||||
admin: '市级管理员',
|
||||
provincial_admin: '省级管理员',
|
||||
};
|
||||
|
||||
// ==================== Hook Implementation ====================
|
||||
|
||||
export function useAreaDatasetConfig(): UseAreaDatasetConfigReturn {
|
||||
// 权限控制
|
||||
const { canManageDataset, canViewDataset, userRole } = usePermission();
|
||||
const { userRole: permissionUserRole } = usePermission();
|
||||
|
||||
// 根据 userRole 判断权限
|
||||
// provincial_admin 可以管理所有知识库配置
|
||||
// 其他角色只能查看自己地区的配置
|
||||
const canManageDataset = permissionUserRole === 'provincial_admin' || permissionUserRole.toLowerCase().includes('provin');
|
||||
const canViewDataset = true; // 所有登录用户都可以查看
|
||||
|
||||
// 数据状态
|
||||
const [datasets, setDatasets] = useState<AreaDataset[]>([]);
|
||||
const [allDatasets, setAllDatasets] = useState<AreaDataset[]>([]); // 保存所有数据用于提取地区
|
||||
const [loading, setLoading] = useState<boolean>(false);
|
||||
const [total, setTotal] = useState<number>(0);
|
||||
const [userArea, setUserArea] = useState<string>('');
|
||||
const [userRoleState, setUserRoleState] = useState<string>('');
|
||||
const [areas, setAreas] = useState<string[]>([]);
|
||||
const [apiAreas, setApiAreas] = useState<string[]>([]); // API 返回的地区列表
|
||||
const [areasLoading, setAreasLoading] = useState<boolean>(false);
|
||||
|
||||
// 筛选状态
|
||||
const [filterArea, setFilterArea] = useState<string>('');
|
||||
// 筛选状态 - 支持多选
|
||||
const [filterAreas, setFilterAreas] = useState<string[]>([]);
|
||||
const [page, setPage] = useState<number>(1);
|
||||
const pageSize = 20;
|
||||
|
||||
@@ -81,6 +94,26 @@ export function useAreaDatasetConfig(): UseAreaDatasetConfigReturn {
|
||||
const [editingId, setEditingId] = useState<number | null>(null);
|
||||
const [submitLoading, setSubmitLoading] = useState<boolean>(false);
|
||||
|
||||
// 从数据集中提取地区列表
|
||||
const extractedAreas = useMemo(() => {
|
||||
const areaSet = new Set<string>();
|
||||
allDatasets.forEach(ds => {
|
||||
if (ds.area) {
|
||||
areaSet.add(ds.area);
|
||||
}
|
||||
});
|
||||
return Array.from(areaSet).sort();
|
||||
}, [allDatasets]);
|
||||
|
||||
// 合并 API 返回的地区和从数据中提取的地区
|
||||
const areas = useMemo(() => {
|
||||
const areaSet = new Set<string>([...apiAreas, ...extractedAreas]);
|
||||
return Array.from(areaSet).sort();
|
||||
}, [apiAreas, extractedAreas]);
|
||||
|
||||
// 获取角色显示名称
|
||||
const userRoleLabel = ROLE_LABELS[permissionUserRole] || permissionUserRole || '未知角色';
|
||||
|
||||
// ==================== Data Loading ====================
|
||||
|
||||
/**
|
||||
@@ -98,9 +131,11 @@ export function useAreaDatasetConfig(): UseAreaDatasetConfigReturn {
|
||||
|
||||
if (canManageDataset) {
|
||||
// 省级管理员:获取所有知识库
|
||||
// 如果有多个地区筛选,用逗号分隔传递
|
||||
const areaFilter = filterAreas.length > 0 ? filterAreas.join(',') : undefined;
|
||||
response = await getAllDatasets({
|
||||
area: filterArea || undefined,
|
||||
only_enabled: true,
|
||||
area: areaFilter,
|
||||
only_enabled: false, // 管理员可以看到所有状态
|
||||
page,
|
||||
page_size: pageSize,
|
||||
});
|
||||
@@ -109,17 +144,25 @@ export function useAreaDatasetConfig(): UseAreaDatasetConfigReturn {
|
||||
response = await getMyDatasets();
|
||||
}
|
||||
|
||||
if (response.code === 0) {
|
||||
setDatasets(response.data.data);
|
||||
setTotal(response.data.total);
|
||||
console.log('[AreaDatasetConfig] API响应:', response);
|
||||
|
||||
if (response && response.code === 0 && response.data) {
|
||||
const dataList = Array.isArray(response.data.data) ? response.data.data : [];
|
||||
setDatasets(dataList);
|
||||
setTotal(response.data.total || dataList.length);
|
||||
|
||||
// 如果没有筛选,保存所有数据用于提取地区
|
||||
if (filterAreas.length === 0) {
|
||||
setAllDatasets(dataList);
|
||||
}
|
||||
|
||||
// 如果是 my 接口,保存用户信息
|
||||
if ('user_area' in response.data) {
|
||||
setUserArea((response.data as any).user_area);
|
||||
setUserRoleState((response.data as any).user_role);
|
||||
setUserArea((response.data as any).user_area || '');
|
||||
}
|
||||
} else {
|
||||
message.error(`加载失败: ${response.message}`);
|
||||
console.error('[AreaDatasetConfig] API响应格式错误:', response);
|
||||
message.error(`加载失败: ${response?.message || '未知错误'}`);
|
||||
}
|
||||
} catch (error: any) {
|
||||
console.error('加载知识库失败:', error);
|
||||
@@ -127,7 +170,7 @@ export function useAreaDatasetConfig(): UseAreaDatasetConfigReturn {
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
}, [canManageDataset, canViewDataset, filterArea, page, pageSize]);
|
||||
}, [canManageDataset, canViewDataset, filterAreas, page, pageSize]);
|
||||
|
||||
/**
|
||||
* 加载地区列表(仅省级管理员)
|
||||
@@ -138,10 +181,16 @@ export function useAreaDatasetConfig(): UseAreaDatasetConfigReturn {
|
||||
setAreasLoading(true);
|
||||
try {
|
||||
const areasList = await getAvailableAreas();
|
||||
setAreas(areasList);
|
||||
console.log('[AreaDatasetConfig] 地区列表响应:', areasList);
|
||||
if (Array.isArray(areasList)) {
|
||||
setApiAreas(areasList);
|
||||
} else {
|
||||
console.warn('[AreaDatasetConfig] 地区列表不是数组:', areasList);
|
||||
setApiAreas([]);
|
||||
}
|
||||
} catch (error: any) {
|
||||
console.error('加载地区列表失败:', error);
|
||||
message.error('加载地区列表失败');
|
||||
// 不显示错误提示,因为可以从数据中提取地区
|
||||
} finally {
|
||||
setAreasLoading(false);
|
||||
}
|
||||
@@ -247,29 +296,20 @@ export function useAreaDatasetConfig(): UseAreaDatasetConfigReturn {
|
||||
|
||||
// ==================== Effects ====================
|
||||
|
||||
// 加载数据
|
||||
// 初始加载数据
|
||||
useEffect(() => {
|
||||
loadDatasets();
|
||||
}, [loadDatasets]);
|
||||
}, []); // 只在挂载时加载一次
|
||||
|
||||
// 加载地区列表
|
||||
useEffect(() => {
|
||||
loadAreas();
|
||||
}, [loadAreas]);
|
||||
|
||||
// 监听筛选条件变化
|
||||
// 监听筛选条件和页码变化
|
||||
useEffect(() => {
|
||||
if (canManageDataset) {
|
||||
setPage(1); // 筛选条件变化时重置到第一页
|
||||
loadDatasets();
|
||||
}
|
||||
}, [filterArea, canManageDataset, loadDatasets]);
|
||||
|
||||
// 监听页码变化
|
||||
useEffect(() => {
|
||||
if (canManageDataset) {
|
||||
loadDatasets();
|
||||
}
|
||||
}, [page, canManageDataset, loadDatasets]);
|
||||
loadDatasets();
|
||||
}, [filterAreas, page]);
|
||||
|
||||
return {
|
||||
// 数据
|
||||
@@ -277,13 +317,13 @@ export function useAreaDatasetConfig(): UseAreaDatasetConfigReturn {
|
||||
loading,
|
||||
total,
|
||||
userArea,
|
||||
userRole: userRoleState,
|
||||
userRole: userRoleLabel,
|
||||
areas,
|
||||
areasLoading,
|
||||
|
||||
// 筛选
|
||||
filterArea,
|
||||
setFilterArea,
|
||||
filterAreas,
|
||||
setFilterAreas,
|
||||
page,
|
||||
setPage,
|
||||
pageSize,
|
||||
|
||||
Reference in New Issue
Block a user