Merge remote-tracking branch 'github_public/main'

This commit is contained in:
wizardchen
2026-01-15 14:39:35 +08:00
17 changed files with 301 additions and 63 deletions
+13 -4
View File
@@ -40,15 +40,24 @@ export function copyKnowledgeBase(data: { source_id: string; target_id?: string
}
// 知识文件 API(基于具体知识库)
export function uploadKnowledgeFile(kbId: string, data = {}, onProgress?: (progressEvent: any) => void) {
return postUpload(`/api/v1/knowledge-bases/${kbId}/knowledge/file`, data, onProgress);
// data.tag_id: 可选,指定知识所属的分类ID
export function uploadKnowledgeFile(kbId: string, data: { file: File; tag_id?: string; [key: string]: any } = { file: new File([], '') }, onProgress?: (progressEvent: any) => void) {
const formData = new FormData();
Object.keys(data).forEach(key => {
if (data[key] !== undefined) formData.append(key, data[key]);
});
return postUpload(`/api/v1/knowledge-bases/${kbId}/knowledge/file`, formData, onProgress);
}
export function createKnowledgeFromURL(kbId: string, data: { url: string; enable_multimodel?: boolean }) {
// 从URL创建知识
// data.tag_id: 可选,指定知识所属的分类ID
export function createKnowledgeFromURL(kbId: string, data: { url: string; enable_multimodel?: boolean; tag_id?: string }) {
return post(`/api/v1/knowledge-bases/${kbId}/knowledge/url`, data);
}
export function createManualKnowledge(kbId: string, data: { title: string; content: string; status: string }) {
// 手工创建知识
// data.tag_id: 可选,指定知识所属的分类ID
export function createManualKnowledge(kbId: string, data: { title: string; content: string; status: string; tag_id?: string }) {
return post(`/api/v1/knowledge-bases/${kbId}/knowledge/manual`, data);
}
@@ -579,7 +579,7 @@ const handleSave = async (targetStatus: ManualStatus) => {
saving.value = true
savingAction.value = targetStatus
try {
const payload = {
const payload: { title: string; content: string; status: string; tag_id?: string } = {
title: form.title.trim(),
content: form.content,
status: targetStatus,
@@ -591,6 +591,11 @@ const handleSave = async (targetStatus: ManualStatus) => {
if (mode.value === 'edit' && knowledgeId.value) {
response = await updateManualKnowledge(knowledgeId.value, payload)
} else {
// 创建新知识时,从 store 获取当前选中的分类ID
const tagIdToUpload = uiStore.selectedTagId !== '__untagged__' ? uiStore.selectedTagId : undefined
if (tagIdToUpload) {
payload.tag_id = tagIdToUpload
}
response = await createManualKnowledge(form.kbId, payload)
knowledgeID = response?.data?.id || knowledgeID
kbId = form.kbId
+6 -2
View File
@@ -823,9 +823,11 @@ const handleDocFileChange = async (event: Event) => {
}))
try {
// 获取当前选中的分类ID
const tagIdToUpload = uiStore.selectedTagId !== '__untagged__' ? uiStore.selectedTagId : undefined
await uploadKnowledgeFile(
kbId,
{ file },
{ file, tag_id: tagIdToUpload },
(progressEvent: any) => {
if (progressEvent.total) {
progress = Math.round((progressEvent.loaded * 100) / progressEvent.total)
@@ -1067,9 +1069,11 @@ const handleDocFolderChange = async (event: Event) => {
}))
try {
// 获取当前选中的分类ID
const tagIdToUpload = uiStore.selectedTagId !== '__untagged__' ? uiStore.selectedTagId : undefined
await uploadKnowledgeFile(
kbId,
{ file, fileName },
{ file, fileName, tag_id: tagIdToUpload },
(progressEvent: any) => {
if (progressEvent?.total) {
progress = Math.round((progressEvent.loaded * 100) / progressEvent.total)
+16 -4
View File
@@ -10,6 +10,7 @@ import {
getKnowledgeDetailsCon,
} from "@/api/knowledge-base/index";
import { knowledgeStore } from "@/stores/knowledge";
import { useUIStore } from "@/stores/ui";
import { useRoute } from 'vue-router';
const usemenuStore = knowledgeStore();
@@ -62,20 +63,27 @@ export default function (knowledgeBaseId?: string) {
})
.catch(() => {});
};
const delKnowledge = (index: number, item: any) => {
const delKnowledge = (index: number, item: any, onSuccess?: () => void) => {
cardList.value[index].isMore = false;
moreIndex.value = -1;
delKnowledgeDetails(item.id)
return delKnowledgeDetails(item.id)
.then((result: any) => {
if (result.success) {
MessagePlugin.info("知识删除成功!");
getKnowled();
if (onSuccess) {
onSuccess();
} else {
getKnowled();
}
return true;
} else {
MessagePlugin.error("知识删除失败!");
return false;
}
})
.catch(() => {
MessagePlugin.error("知识删除失败!");
return false;
});
};
const openMore = (index: number) => {
@@ -110,7 +118,11 @@ export default function (knowledgeBaseId?: string) {
return;
}
uploadKnowledgeFile(currentKbId, { file })
// 获取当前选中的分类ID
const uiStore = useUIStore();
const tagIdToUpload = uiStore.selectedTagId !== '__untagged__' ? uiStore.selectedTagId : undefined;
uploadKnowledgeFile(currentKbId, { file, tag_id: tagIdToUpload })
.then((result: any) => {
if (result.success) {
MessagePlugin.info("上传成功!");
+7
View File
@@ -7,6 +7,8 @@ export const useUIStore = defineStore('ui', {
kbEditorMode: 'create' as 'create' | 'edit',
currentKBId: null as string | null,
kbEditorType: 'document' as 'document' | 'faq',
// 当前选中的分类ID,用于文件上传时传递
selectedTagId: '__untagged__' as string,
kbEditorInitialSection: null as string | null,
settingsInitialSection: null as string | null,
settingsInitialSubSection: null as string | null,
@@ -101,6 +103,11 @@ export const useUIStore = defineStore('ui', {
}
}
this.manualEditorOnSuccess = null
},
// 设置当前选中的分类ID
setSelectedTagId(tagId: string) {
this.selectedTagId = tagId
}
}
})
+14 -3
View File
@@ -212,6 +212,8 @@ const loadTags = async (kbIdValue: string, reset = false) => {
const handleTagFilterChange = (value: string) => {
selectedTagId.value = value;
// 同步更新 store 中的 selectedTagId,供 menu.vue 上传时使用
uiStore.setSelectedTagId(value);
page = 1;
loadKnowledgeFiles(kbId.value);
};
@@ -635,9 +637,12 @@ const handleDocumentUpload = async (event: Event) => {
let failCount = 0;
const totalCount = validFiles.length;
// 获取当前选中的分类ID(如果不是"未分类"则传递)
const tagIdToUpload = selectedTagId.value !== '__untagged__' ? selectedTagId.value : undefined;
for (const file of validFiles) {
try {
const responseData: any = await uploadKnowledgeFile(kbId.value, { file });
const responseData: any = await uploadKnowledgeFile(kbId.value, { file, tag_id: tagIdToUpload });
const isSuccess = responseData?.success || responseData?.code === 200 || responseData?.status === 'success' || (!responseData?.error && responseData);
if (isSuccess) {
successCount++;
@@ -741,7 +746,9 @@ const handleURLImportConfirm = async () => {
urlImporting.value = true;
try {
const responseData: any = await createKnowledgeFromURL(kbId.value, { url });
// 获取当前选中的分类ID
const tagIdToUpload = selectedTagId.value !== '__untagged__' ? selectedTagId.value : undefined;
const responseData: any = await createKnowledgeFromURL(kbId.value, { url, tag_id: tagIdToUpload });
window.dispatchEvent(new CustomEvent('knowledgeFileUploaded', {
detail: { kbId: kbId.value }
}));
@@ -837,7 +844,11 @@ const getDoc = (page: number) => {
const delCardConfirm = () => {
delDialog.value = false;
delKnowledge(knowledgeIndex.value, knowledge.value);
delKnowledge(knowledgeIndex.value, knowledge.value, () => {
// 删除成功后刷新文档列表和分类数量
loadKnowledgeFiles(kbId.value);
loadTags(kbId.value);
});
};
// 处理知识库编辑成功后的回调