diff --git a/frontend/src/api/chat/streame.ts b/frontend/src/api/chat/streame.ts index f7dd5628..8b7d93ee 100644 --- a/frontend/src/api/chat/streame.ts +++ b/frontend/src/api/chat/streame.ts @@ -89,7 +89,7 @@ export function useStream() { if (params.knowledge_ids !== undefined && params.knowledge_ids.length > 0) { postBody.knowledge_ids = params.knowledge_ids; } - // Include agent_id if provided (for custom agent configuration) + // Include agent_id if provided (backend resolves shared agent and tenant from share relation) if (params.agent_id) { postBody.agent_id = params.agent_id; } diff --git a/frontend/src/api/knowledge-base/index.ts b/frontend/src/api/knowledge-base/index.ts index 4b6ba6d4..f382abbb 100644 --- a/frontend/src/api/knowledge-base/index.ts +++ b/frontend/src/api/knowledge-base/index.ts @@ -1,8 +1,11 @@ import { get, post, put, del, postUpload, getDown } from "../../utils/request"; // 知识库管理 API(列表、创建、获取、更新、删除、复制) -export function listKnowledgeBases() { - return get(`/api/v1/knowledge-bases`); +export function listKnowledgeBases(params?: { agent_id?: string }) { + const query = new URLSearchParams(); + if (params?.agent_id) query.set('agent_id', params.agent_id); + const qs = query.toString(); + return get(qs ? `/api/v1/knowledge-bases?${qs}` : '/api/v1/knowledge-bases'); } export function createKnowledgeBase(data: { @@ -23,8 +26,11 @@ export function createKnowledgeBase(data: { return post(`/api/v1/knowledge-bases`, data); } -export function getKnowledgeBaseById(id: string) { - return get(`/api/v1/knowledge-bases/${id}`); +export function getKnowledgeBaseById(id: string, options?: { agent_id?: string }) { + const query = new URLSearchParams(); + if (options?.agent_id) query.set('agent_id', options.agent_id); + const qs = query.toString(); + return get(qs ? `/api/v1/knowledge-bases/${id}?${qs}` : `/api/v1/knowledge-bases/${id}`); } export function updateKnowledgeBase(id: string, data: { name: string; description?: string; config: any }) { @@ -81,8 +87,11 @@ export function listKnowledgeFiles( return get(`/api/v1/knowledge-bases/${kbId}/knowledge?${qs}`); } -export function getKnowledgeDetails(id: string) { - return get(`/api/v1/knowledge/${id}`); +export function getKnowledgeDetails(id: string, options?: { agent_id?: string }) { + const query = new URLSearchParams(); + if (options?.agent_id) query.set('agent_id', options.agent_id); + const qs = query.toString(); + return get(qs ? `/api/v1/knowledge/${id}?${qs}` : `/api/v1/knowledge/${id}`); } export function updateManualKnowledge(id: string, data: { title: string; content: string; status: string }) { @@ -98,8 +107,10 @@ export function downKnowledgeDetails(id: string) { } /** @param idsQueryString - query string with ids (e.g. ids=xxx&ids=yyy) */ -export function batchQueryKnowledge(idsQueryString: string, kbId?: string) { - const qs = kbId ? `${idsQueryString}&kb_id=${encodeURIComponent(kbId)}` : idsQueryString; +export function batchQueryKnowledge(idsQueryString: string, kbId?: string, agentId?: string) { + let qs = idsQueryString; + if (kbId) qs += `&kb_id=${encodeURIComponent(kbId)}`; + if (agentId) qs += `&agent_id=${encodeURIComponent(agentId)}`; return get(`/api/v1/knowledge/batch?${qs}`); } @@ -267,10 +278,20 @@ export function updateFAQImportResultDisplayStatus(knowledgeBaseId: string, disp }); } -export function searchKnowledge(keyword: string, offset = 0, limit = 20, fileTypes?: string[]) { - let url = `/api/v1/knowledge/search?keyword=${encodeURIComponent(keyword)}&offset=${offset}&limit=${limit}`; +export function searchKnowledge( + keyword: string, + offset = 0, + limit = 20, + fileTypes?: string[], + options?: { agent_id?: string } +) { + const query = new URLSearchParams(); + query.set('keyword', keyword); + query.set('offset', String(offset)); + query.set('limit', String(limit)); if (fileTypes && fileTypes.length > 0) { - url += `&file_types=${encodeURIComponent(fileTypes.join(','))}`; + query.set('file_types', fileTypes.join(',')); } - return get(url); + if (options?.agent_id) query.set('agent_id', options.agent_id); + return get(`/api/v1/knowledge/search?${query.toString()}`); } diff --git a/frontend/src/api/organization/index.ts b/frontend/src/api/organization/index.ts index 1af2f165..e8523a36 100644 --- a/frontend/src/api/organization/index.ts +++ b/frontend/src/api/organization/index.ts @@ -16,6 +16,7 @@ export interface Organization { member_limit?: number member_count?: number share_count?: number + agent_share_count?: number pending_join_request_count?: number is_owner?: boolean my_role?: string @@ -80,6 +81,7 @@ export interface OrganizationPreview { avatar?: string member_count: number share_count: number + agent_share_count?: number is_already_member: boolean require_approval: boolean created_at: string @@ -94,6 +96,7 @@ export interface SearchableOrganizationItem { member_count: number member_limit: number // 0 = unlimited share_count: number + agent_share_count?: number is_already_member: boolean require_approval: boolean } @@ -204,6 +207,47 @@ export interface ListSharesResponse { total: number } +// Agent share types +export interface AgentShareResponse { + id: string + agent_id: string + agent_name?: string + organization_id: string + organization_name?: string + shared_by_user_id: string + shared_by_username?: string + source_tenant_id: number + permission: string + my_role_in_org?: string + my_permission?: string + created_at: string + /** Agent scope summary for list display */ + scope_kb?: string + scope_kb_count?: number + scope_web_search?: boolean + scope_mcp?: string + scope_mcp_count?: number + /** Agent avatar (emoji) for list display */ + agent_avatar?: string +} + +export interface SharedAgentInfo { + agent: { id: string; name: string; description?: string; [key: string]: any } + share_id: string + organization_id: string + org_name: string + permission: string + source_tenant_id: number + shared_at: string + shared_by_user_id?: string + shared_by_username?: string +} + +export interface ListAgentSharesResponse { + shares: AgentShareResponse[] + total: number +} + // Organization API functions /** @@ -520,6 +564,61 @@ export async function listOrgShares(orgId: string): Promise> { + try { + const response = await post(`/api/v1/agents/${agentId}/shares`, req) + return response as unknown as ApiResponse + } catch (error: any) { + return { success: false, message: error.message || 'Failed to share agent' } + } +} + +export async function listAgentShares(agentId: string): Promise> { + try { + const response = await get(`/api/v1/agents/${agentId}/shares`) + return response as unknown as ApiResponse + } catch (error: any) { + return { success: false, message: error.message || 'Failed to list agent shares' } + } +} + +export async function updateAgentSharePermission(agentId: string, shareId: string, req: UpdateSharePermissionRequest): Promise> { + try { + const response = await put(`/api/v1/agents/${agentId}/shares/${shareId}`, req) + return response as unknown as ApiResponse + } catch (error: any) { + return { success: false, message: error.message || 'Failed to update share permission' } + } +} + +export async function removeAgentShare(agentId: string, shareId: string): Promise> { + try { + const response = await del(`/api/v1/agents/${agentId}/shares/${shareId}`) + return response as unknown as ApiResponse + } catch (error: any) { + return { success: false, message: error.message || 'Failed to remove share' } + } +} + +export async function listSharedAgents(): Promise> { + try { + const response = await get('/api/v1/shared-agents') + return response as unknown as ApiResponse + } catch (error: any) { + return { success: false, message: error.message || 'Failed to list shared agents' } + } +} + +export async function listOrgAgentShares(orgId: string): Promise> { + try { + const response = await get(`/api/v1/organizations/${orgId}/agent-shares`) + return response as unknown as ApiResponse + } catch (error: any) { + return { success: false, message: error.message || 'Failed to list organization agent shares' } + } +} + /** * Search users for inviting to organization (excludes existing members) */ diff --git a/frontend/src/components/AgentSelector.vue b/frontend/src/components/AgentSelector.vue index 74ec72c0..397e0007 100644 --- a/frontend/src/components/AgentSelector.vue +++ b/frontend/src/components/AgentSelector.vue @@ -30,7 +30,7 @@ >
@@ -51,7 +51,7 @@
{{ agent.name }} - {{ $t('agent.selector.current') }} + {{ $t('agent.selector.current') }}

{{ agent.description || $t('agent.noDescription') }}

@@ -86,6 +86,22 @@ {{ agent.config?.agent_mode === 'smart-reasoning' ? $t('agent.type.agent') : $t('agent.type.normal') }} +
+ + {{ getKbCapability(agent) }} +
+
+ + {{ $t('agent.capabilities.webSearchOn') }} +
+
+ + {{ getMcpCapability(agent) }} +
+
+ + {{ $t('agent.capabilities.multiTurn') }} +
@@ -105,7 +121,7 @@ >
@@ -117,7 +133,7 @@
{{ agent.name }} - {{ $t('agent.selector.current') }} + {{ $t('agent.selector.current') }}

{{ agent.description || $t('agent.noDescription') }}

@@ -151,9 +167,9 @@ {{ $t('agent.capabilities.webSearchOn') }} -
+
- {{ $t('agent.capabilities.mcpEnabled') }} + {{ getMcpCapability(agent) }}
@@ -165,8 +181,87 @@
+ +
+
{{ $t('agent.tabs.sharedToMe') }}
+ +
+ + {{ shared.agent.name }} + {{ $t('agent.selector.sharedLabel') }} +
+ + + +
+
+ +
+
+ -
+
{{ $t('agent.noAgents') }}
@@ -176,34 +271,43 @@ + + diff --git a/frontend/src/components/Input-field.vue b/frontend/src/components/Input-field.vue index 2231bc08..1817aca0 100644 --- a/frontend/src/components/Input-field.vue +++ b/frontend/src/components/Input-field.vue @@ -39,7 +39,16 @@ const selectedAgentId = computed({ set: (val: string) => settingsStore.selectAgent(val) }); const selectedAgent = computed(() => { - return agents.value.find(a => a.id === selectedAgentId.value) || { + const mine = agents.value.find(a => a.id === selectedAgentId.value); + if (mine) return mine; + const sourceTenantId = settingsStore.selectedAgentSourceTenantId; + if (sourceTenantId && orgStore.sharedAgents?.length) { + const shared = orgStore.sharedAgents.find( + s => s.agent.id === selectedAgentId.value && String(s.source_tenant_id) === sourceTenantId + ); + if (shared?.agent) return shared.agent as CustomAgent; + } + return { id: BUILTIN_QUICK_ANSWER_ID, name: t('input.normalMode'), is_builtin: true, @@ -80,25 +89,49 @@ const agentKnowledgeBases = computed(() => { return currentAgentConfig.value?.knowledge_bases || []; }); -// 当智能体改变时,将智能体配置的知识库同步到 store -// 这样用户可以移除这些知识库 -watch([selectedAgentId, agentKnowledgeBases], ([newAgentId, newAgentKbs], [oldAgentId]) => { - if (newAgentId !== oldAgentId && newAgentKbs && newAgentKbs.length > 0) { - // 智能体切换了,将新智能体配置的知识库添加到 store - const currentSelected = settingsStore.settings.selectedKnowledgeBases || []; - const toAdd = newAgentKbs.filter((id: string) => !currentSelected.includes(id)); - if (toAdd.length > 0) { - settingsStore.selectKnowledgeBases([...currentSelected, ...toAdd]); - } - } -}, { immediate: true }); - // 智能体的知识库选择模式 const agentKBSelectionMode = computed(() => { if (!hasAgentConfig.value) return null; // null 表示不受智能体控制 return currentAgentConfig.value?.kb_selection_mode || 'all'; }); +// 当智能体改变时,模型、网络搜索、可@知识库列表均跟随新智能体配置 +// 知识库:用新智能体配置的列表替换当前选中,使已选与可@列表一致(含共享智能体) +watch([selectedAgentId, agentKnowledgeBases, agentKBSelectionMode], ([newAgentId, newAgentKbs, newKbMode], [oldAgentId]) => { + if (newAgentId !== oldAgentId && oldAgentId !== undefined) { + if (newKbMode === 'none') { + settingsStore.selectKnowledgeBases([]); + } else { + settingsStore.selectKnowledgeBases(newAgentKbs && newAgentKbs.length > 0 ? [...newAgentKbs] : []); + } + // 若 @ 面板已打开,刷新可@列表以立即反映新智能体的知识库范围 + if (showMention.value) { + loadMentionItems(mentionQuery.value, true); + } + } +}, { immediate: true }); + +// 共享智能体时预取该智能体知识库列表,使已选标签在未打开 @ 时也能显示共享空间角标 +watch([selectedAgentId, () => settingsStore.selectedAgentSourceTenantId], async ([agentId, sourceTenantId]) => { + if (sourceTenantId && agentId) { + try { + const res: any = await listKnowledgeBases({ agent_id: agentId }); + const list = res?.data && Array.isArray(res.data) ? res.data : []; + sharedAgentKbList.value = list.map((kb: any) => ({ + id: kb.id, + name: kb.name, + type: kb.type || 'document', + knowledge_count: kb.knowledge_count, + chunk_count: kb.chunk_count + })); + } catch { + sharedAgentKbList.value = []; + } + } else { + sharedAgentKbList.value = []; + } +}, { immediate: true }); + // 智能体是否启用了网络搜索 const agentWebSearchEnabled = computed(() => { if (!hasAgentConfig.value) return null; // null 表示不受智能体控制 @@ -159,6 +192,20 @@ const mentionLoading = ref(false); const mentionOffset = ref(0); const MENTION_PAGE_SIZE = 20; +// 共享智能体时用于标识「共享空间」的展示名(组织名或共享者),供 @ 列表与已选标签显示角标 +const sharedAgentOrgName = computed(() => { + const sourceTenantId = settingsStore.selectedAgentSourceTenantId; + const agentId = selectedAgentId.value; + if (!sourceTenantId || !agentId || !orgStore.sharedAgents?.length) return ''; + const shared = orgStore.sharedAgents.find( + (s: any) => s.agent?.id === agentId && String(s.source_tenant_id) === sourceTenantId + ); + return shared?.org_name || shared?.shared_by_username || ''; +}); + +// 共享智能体下的知识库列表(来自 listKnowledgeBases(agent_id)),用于已选知识库展示与 org 角标 +const sharedAgentKbList = ref>([]); + const props = defineProps({ isReplying: { type: Boolean, @@ -184,7 +231,7 @@ const isWebSearchConfigured = ref(false); const knowledgeBases = ref>([]); const fileList = ref>([]); -// 选中的知识库:包含自己的 + 别人共享的(用于展示已选列表) +// 选中的知识库:包含自己的 + 组织共享的 + 共享智能体下的(用于展示已选列表与 org 角标) const selectedKbs = computed(() => { const own = knowledgeBases.value.filter(kb => selectedKbIds.value.includes(kb.id)); const sharedList = orgStore.sharedKnowledgeBases || []; @@ -200,7 +247,18 @@ const selectedKbs = computed(() => { })); const ownIds = new Set(own.map(kb => kb.id)); const sharedOnly = sharedMapped.filter((kb: any) => !ownIds.has(kb.id)); - return [...own, ...sharedOnly]; + const sharedOnlyIds = new Set(sharedOnly.map((kb: any) => kb.id)); + // 共享智能体下的知识库:从 sharedAgentKbList 中取在选中列表里的,并打上共享空间标识 + const agentOrg = sharedAgentOrgName.value; + const sharedFromAgent = (sharedAgentKbList.value || []).filter(kb => selectedKbIds.value.includes(kb.id) && !ownIds.has(kb.id) && !sharedOnlyIds.has(kb.id)).map(kb => ({ + id: kb.id, + name: kb.name, + type: kb.type || 'document', + knowledge_count: kb.knowledge_count, + chunk_count: kb.chunk_count, + org_name: agentOrg || '' + })); + return [...own, ...sharedOnly, ...sharedFromAgent]; }); const selectedFiles = computed(() => { @@ -226,13 +284,18 @@ const selectedFiles = computed(() => { isAgentConfigured: agentKbIds.includes(kb.id) })); - // 用户选择的文件(根据 fileIdToKbId + 共享列表补全 org_name,用于角标) + // 用户选择的文件(根据 fileIdToKbId + 共享列表/共享智能体补全 org_name,用于角标) const sharedKbOrgMap: Record = {}; (orgStore.sharedKnowledgeBases || []).forEach((s: any) => { if (s.knowledge_base?.id != null && s.org_name) { sharedKbOrgMap[String(s.knowledge_base.id)] = s.org_name; } }); + if (sharedAgentOrgName.value) { + (sharedAgentKbList.value || []).forEach((kb) => { + sharedKbOrgMap[String(kb.id)] = sharedAgentOrgName.value; + }); + } const files = selectedFiles.value.map((f: { id: string; name: string }) => { const kbId = fileIdToKbId.value[f.id]; const org_name = kbId ? sharedKbOrgMap[String(kbId)] || '' : ''; @@ -361,10 +424,11 @@ const loadFiles = async () => { }); const allNewFiles: Array<{ id: string; name: string }> = []; - const runBatch = async (batchIds: string[], kbId?: string) => { + const agentIdForBatch = settingsStore.selectedAgentSourceTenantId ? settingsStore.selectedAgentId : undefined; + const runBatch = async (batchIds: string[], kbId?: string, agentId?: string) => { const query = new URLSearchParams(); batchIds.forEach((id: string) => query.append('ids', id)); - const res: any = await batchQueryKnowledge(query.toString(), kbId); + const res: any = await batchQueryKnowledge(query.toString(), kbId, agentId); if (res.data && Array.isArray(res.data)) { res.data.forEach((f: any) => allNewFiles.push({ id: f.id, name: f.title || f.file_name })); } @@ -374,7 +438,7 @@ const loadFiles = async () => { await runBatch(batchIds, kbId); } if (noKbId.length > 0) { - await runBatch(noKbId); + await runBatch(noKbId, undefined, agentIdForBatch); } if (allNewFiles.length > 0) { fileList.value = [...fileList.value, ...allNewFiles]; @@ -407,11 +471,14 @@ const loadWebSearchConfig = async () => { } }; -// 加载智能体列表 +// 加载智能体列表(我的 + 共享,供选中态与就绪检查用) const loadAgents = async () => { try { - const response = await listAgents(); - agents.value = response.data || []; + const [agentsRes] = await Promise.all([ + listAgents(), + orgStore.fetchSharedAgents(), + ]); + agents.value = agentsRes.data || []; } catch (error) { console.error('Failed to load agents:', error); } @@ -527,6 +594,16 @@ const selectedModel = computed(() => { return availableModels.value.find(model => model.id === selectedModelId.value); }); +// 模型展示名:本租户列表中有则用名称;若为共享智能体且其 model_id 不在本租户列表中则显示“共享智能体配置的模型” +const selectedModelDisplayName = computed(() => { + if (selectedModel.value) return selectedModel.value.name; + if (!selectedModelId.value) return t('input.notConfigured'); + const isSharedAgent = !!settingsStore.selectedAgentSourceTenantId; + const modelFromAgent = agentModelId.value && agentModelId.value === selectedModelId.value; + if (isSharedAgent && modelFromAgent) return t('input.sharedAgentModelLabel'); + return t('input.notConfigured'); +}); + const updateModelDropdownPosition = () => { const anchor = modelButtonRef.value; if (!anchor) { @@ -644,33 +721,61 @@ const loadMentionItems = async (q: string, resetIndex = true, append = false) => mentionOffset.value = 0; } - // 根据智能体的 kb_selection_mode 过滤知识库;合并「自己的」+「共享的」知识库 + // 根据智能体的 kb_selection_mode 过滤知识库;选中共享智能体时使用该租户下的知识库,否则使用本租户 + 共享给自己的 let kbItems: any[] = []; if (!append) { - // 自己的知识库(需有 embedding/summary 模型) - let availableKbs = [...knowledgeBases.value]; - // 共享的知识库(有权限的),映射为与 knowledgeBases 同结构便于合并 - const sharedList = orgStore.sharedKnowledgeBases || []; - const sharedKbsForMention = sharedList - .filter((s: any) => s.knowledge_base != null) - .map((s: any) => ({ - id: s.knowledge_base.id, - name: s.knowledge_base.name, - type: s.knowledge_base.type || 'document', - knowledge_count: s.knowledge_base.knowledge_count, - chunk_count: s.knowledge_base.chunk_count, - org_name: s.org_name || '' - })); - // 去重:若某 KB 既在自己列表又在共享列表,只保留一份(自己的优先) - const ownIds = new Set(availableKbs.map((kb: any) => kb.id)); - sharedKbsForMention.forEach((kb: any) => { - if (!ownIds.has(kb.id)) { - availableKbs.push(kb); - ownIds.add(kb.id); + let availableKbs: any[]; + const sourceTenantId = settingsStore.selectedAgentSourceTenantId; + const agentId = selectedAgentId.value; + if (sourceTenantId && agentId) { + // 共享智能体:按 agent_id 拉取该智能体配置的知识库范围(后端从共享关系解析租户) + try { + const res: any = await listKnowledgeBases({ agent_id: agentId }); + const list = res?.data && Array.isArray(res.data) ? res.data : []; + const orgLabel = sharedAgentOrgName.value || ''; + availableKbs = list.map((kb: any) => ({ + id: kb.id, + name: kb.name, + type: kb.type || 'document', + knowledge_count: kb.knowledge_count, + chunk_count: kb.chunk_count, + org_name: orgLabel + })); + sharedAgentKbList.value = list.map((kb: any) => ({ + id: kb.id, + name: kb.name, + type: kb.type || 'document', + knowledge_count: kb.knowledge_count, + chunk_count: kb.chunk_count + })); + } catch (e) { + console.error('[Mention] listKnowledgeBases(agent_id) error:', e); + availableKbs = []; + sharedAgentKbList.value = []; } - }); + } else { + sharedAgentKbList.value = []; + availableKbs = [...knowledgeBases.value]; + const sharedList = orgStore.sharedKnowledgeBases || []; + const sharedKbsForMention = sharedList + .filter((s: any) => s.knowledge_base != null) + .map((s: any) => ({ + id: s.knowledge_base.id, + name: s.knowledge_base.name, + type: s.knowledge_base.type || 'document', + knowledge_count: s.knowledge_base.knowledge_count, + chunk_count: s.knowledge_base.chunk_count, + org_name: s.org_name || '' + })); + const ownIds = new Set(availableKbs.map((kb: any) => kb.id)); + sharedKbsForMention.forEach((kb: any) => { + if (!ownIds.has(kb.id)) { + availableKbs.push(kb); + ownIds.add(kb.id); + } + }); + } - // 如果智能体有配置,根据 kb_selection_mode 过滤 if (hasAgentConfig.value) { const kbMode = agentKBSelectionMode.value; if (kbMode === 'none') { @@ -681,7 +786,6 @@ const loadMentionItems = async (q: string, resetIndex = true, append = false) => } } - // 按查询过滤 const kbs = availableKbs.filter((kb: any) => !q || (kb.name && kb.name.toLowerCase().includes(q.toLowerCase())) ); @@ -691,7 +795,7 @@ const loadMentionItems = async (q: string, resetIndex = true, append = false) => type: 'kb' as const, kbType: kb.type || 'document', count: kb.type === 'faq' ? (kb.chunk_count || 0) : (kb.knowledge_count || 0), - orgName: kb.org_name || undefined + orgName: kb.org_name || sharedAgentOrgName.value || undefined })); } @@ -703,35 +807,42 @@ const loadMentionItems = async (q: string, resetIndex = true, append = false) => if (shouldLoadFiles) { mentionLoading.value = true; try { - // 将文件类型过滤传递给后端 const fileTypesParam = agentSupportedFileTypes.value.length > 0 ? agentSupportedFileTypes.value : undefined; - const res: any = await searchKnowledge(q || '', mentionOffset.value, MENTION_PAGE_SIZE, fileTypesParam); + const sourceTenantId = settingsStore.selectedAgentSourceTenantId; + const agentId = selectedAgentId.value; + const searchOptions = sourceTenantId && agentId ? { agent_id: agentId } : undefined; + const res: any = await searchKnowledge( + q || '', + mentionOffset.value, + MENTION_PAGE_SIZE, + fileTypesParam, + searchOptions + ); console.log('[Mention] searchKnowledge response:', res); if (res.data && Array.isArray(res.data)) { let files = res.data; - - // 如果智能体配置了 kb_selection_mode === 'selected',只显示指定知识库中的文件 - if (hasAgentConfig.value && agentKBSelectionMode.value === 'selected') { + if (!sourceTenantId && hasAgentConfig.value && agentKBSelectionMode.value === 'selected') { const configuredKbIds = agentKnowledgeBases.value; files = files.filter((f: any) => configuredKbIds.includes(f.knowledge_base_id ?? f.kb_id)); } - // 共享知识库 kb_id -> org_name,用于文件项显示组织角标(key 统一转 string 避免类型不一致) const sharedKbOrgMap: Record = {}; (orgStore.sharedKnowledgeBases || []).forEach((s: any) => { if (s.knowledge_base?.id != null && s.org_name) { sharedKbOrgMap[String(s.knowledge_base.id)] = s.org_name; } }); + const agentOrgLabel = sourceTenantId && agentId ? sharedAgentOrgName.value : ''; fileItems = files.map((f: any) => { const kbId = f.knowledge_base_id ?? f.kb_id; const kbIdStr = kbId != null ? String(kbId) : ''; + const fileOrgName = agentOrgLabel || (kbIdStr ? sharedKbOrgMap[kbIdStr] : undefined); return { id: f.id, name: f.title || f.file_name, type: 'file' as const, kbName: f.knowledge_base_name || '', kbId: kbId || undefined, - orgName: kbIdStr ? sharedKbOrgMap[kbIdStr] || undefined : undefined + orgName: fileOrgName || undefined }; }); } @@ -961,6 +1072,7 @@ const onMentionSelect = (item: any) => { settingsStore.addFile(item.id); if (item.kbId) { fileIdToKbId.value[item.id] = item.kbId; + settingsStore.setFileKbMap({ [item.id]: item.kbId }); } // Add to local cache immediately if (!fileList.value.find(f => f.id === item.id)) { @@ -1065,6 +1177,17 @@ onMounted(() => { loadConversationConfig(); loadChatModels(); loadAgents(); + + // 从持久化恢复 fileId -> kbId,刷新后共享知识库文件可带 kb_id 拉取(仅保留当前仍选中的文件) + const persisted = settingsStore.settings.selectedFileKbMap; + const ids = settingsStore.settings.selectedFiles || []; + if (persisted && typeof persisted === 'object' && ids.length > 0) { + const next: Record = {}; + ids.forEach((id: string) => { + if (persisted[id]) next[id] = persisted[id]; + }); + fileIdToKbId.value = next; + } // 如果从知识库内部进入,自动选中该知识库 const kbId = (route.params as any)?.kbId as string; @@ -1298,8 +1421,8 @@ const selectAgentMode = (mode: 'quick-answer' | 'smart-reasoning') => { showAgentModeSelector.value = false; } -// 选择智能体(新版) -const handleSelectAgent = (agent: CustomAgent) => { +// 选择智能体(新版);sourceTenantId 为共享智能体时传入 +const handleSelectAgent = (agent: CustomAgent, sourceTenantId?: string) => { // 根据智能体的 agent_mode 判断是否为 Agent 模式 const isAgentType = agent.config?.agent_mode === 'smart-reasoning'; @@ -1317,27 +1440,23 @@ const handleSelectAgent = (agent: CustomAgent) => { return; } - selectedAgentId.value = agent.id; + settingsStore.selectAgent(agent.id, sourceTenantId); settingsStore.toggleAgent(!!isAgentType); - // 同步智能体的配置状态(包括内置和自定义智能体) + // 同步智能体的配置状态(含内置、自定义、共享智能体):模型、网络搜索、知识库由 watch 同步 // 1. 同步网络搜索状态 const agentWebSearch = agent.config?.web_search_enabled; if (agentWebSearch !== undefined) { - // 智能体配置了网络搜索设置,同步到 store settingsStore.toggleWebSearch(agentWebSearch); } else if (agent.is_builtin) { - // 如果是内置智能体且未配置网络搜索,不强制修改,保留当前用户设置 - // 或者可以考虑恢复默认值,视需求而定 + // 内置智能体未配置时保留当前用户设置 } - // 2. 同步模型 + // 2. 同步模型(选中的对话模型随智能体切换,含共享智能体) const agentModel = agent.config?.model_id; - if (agentModel) { + if (agentModel && agentModel.trim() !== '') { selectedModelId.value = agentModel; - } else if (agent.is_builtin) { - // 如果是内置智能体且未配置特定模型,恢复为系统默认模型 - // 这样可以确保从专用模型切换回普通模式时,模型也切回通用模型 + } else { if (conversationConfig.value?.summary_model_id) { selectedModelId.value = conversationConfig.value.summary_model_id; } @@ -1672,6 +1791,7 @@ onBeforeRouteUpdate((to, from, next) => { :visible="showAgentModeSelector" :anchorEl="agentModeButtonRef" :currentAgentId="selectedAgentId" + :agents="agents" @close="closeAgentModeSelector" @select="handleSelectAgent" /> @@ -1748,7 +1868,7 @@ onBeforeRouteUpdate((to, from, next) => { @click.stop="toggleModelSelector" > - {{ selectedModel?.name || $t('input.notConfigured') }} + {{ selectedModelDisplayName }} { border: 1px solid transparent; color: var(--td-text-color-primary, #333); - /* KB - Document (Greenish tint) */ - &.kb-tag { - background: rgba(16, 185, 129, 0.08); - color: #059669; - - .tag-icon { - color: #10b981; - } - } - - /* KB - FAQ (Blueish tint) */ - &.faq-tag { - background: rgba(0, 82, 217, 0.08); - color: #0052d9; - - .tag-icon { - color: #0052d9; - } - } - - /* File (Orange tint) */ + /* 知识库 / 文件 - 无背景,与整体一致 */ + &.kb-tag, + &.faq-tag, &.file-tag { - background: rgba(237, 123, 47, 0.08); - color: #e65100; + background: transparent; + color: var(--td-text-color-primary, #333); .tag-icon { - color: #ed7b2f; + color: var(--td-text-color-secondary, #666); } } diff --git a/frontend/src/components/MentionSelector.vue b/frontend/src/components/MentionSelector.vue index 1a293627..0908a4d6 100644 --- a/frontend/src/components/MentionSelector.vue +++ b/frontend/src/components/MentionSelector.vue @@ -18,19 +18,15 @@ @click="$emit('select', item)" @mouseenter="$emit('update:activeIndex', index)" > -
+
- - -
{{ item.name }} ({{ item.count || 0 }})
- {{ item.orgName }}