diff --git a/ui/src/components/folder-tree/index.vue b/ui/src/components/folder-tree/index.vue index 5484ede12..e4acc0118 100644 --- a/ui/src/components/folder-tree/index.vue +++ b/ui/src/components/folder-tree/index.vue @@ -33,7 +33,9 @@
- {{ node.label }} + {{ + node.label + }}
import { ref, watch } from 'vue' +import { onBeforeRouteLeave } from 'vue-router' import type { TreeInstance } from 'element-plus' import CreateFolderDialog from '@/components/folder-tree/CreateFolderDialog.vue' import { t } from '@/locales' import folderApi from '@/api/folder' import { EditionConst } from '@/utils/permission/data' import { hasPermission } from '@/utils/permission/index' +import useStore from '@/stores' + defineOptions({ name: 'FolderTree' }) const props = defineProps({ data: { @@ -116,6 +121,12 @@ const props = defineProps({ default: true, }, }) + +const { folder } = useStore() +onBeforeRouteLeave((to, from) => { + folder.setCurrentFolder({}) +}) + interface Tree { name: string children?: Tree[] diff --git a/ui/src/components/generate-related-shared-dialog/index.vue b/ui/src/components/generate-related-shared-dialog/index.vue deleted file mode 100644 index 1bfb02188..000000000 --- a/ui/src/components/generate-related-shared-dialog/index.vue +++ /dev/null @@ -1,204 +0,0 @@ - - - diff --git a/ui/src/router/modules/system.ts b/ui/src/router/modules/system.ts index b9cc24ec4..9e8105e86 100644 --- a/ui/src/router/modules/system.ts +++ b/ui/src/router/modules/system.ts @@ -135,7 +135,7 @@ const systemRouter = { parentPath: '/system', parentName: 'system', }, - component: () => import('@/views/shared/knowledge-shared/index.vue'), + component: () => import('@/views/system-shared/KnowLedgeSharedIndex.vue'), }, { path: '/system/shared/tool', diff --git a/ui/src/stores/modules/knowledge.ts b/ui/src/stores/modules/knowledge.ts index 37f673c37..a221445cc 100644 --- a/ui/src/stores/modules/knowledge.ts +++ b/ui/src/stores/modules/knowledge.ts @@ -1,15 +1,18 @@ import { defineStore } from 'pinia' import type { knowledgeData } from '@/api/type/knowledge' import type { UploadUserFile } from 'element-plus' -import knowledgeApi from '@/api/knowledge/knowledge' +import type { pageRequest } from '@/api/type/common' import { type Ref } from 'vue' +import useUserStore from './user' import useFolderStore from './folder' +import { loadSharedApi } from '@/utils/dynamics-api/shared-api' export interface knowledgeStateTypes { baseInfo: knowledgeData | null webInfo: any documentsType: string documentsFiles: UploadUserFile[] + knowledgeList: knowledgeData[] } const useKnowledgeStore = defineStore('knowledge', { @@ -18,6 +21,7 @@ const useKnowledgeStore = defineStore('knowledge', { webInfo: null, documentsType: '', documentsFiles: [], + knowledgeList: [], }), actions: { saveBaseInfo(info: knowledgeData | null) { @@ -32,6 +36,34 @@ const useKnowledgeStore = defineStore('knowledge', { saveDocumentsFile(file: UploadUserFile[]) { this.documentsFiles = file }, + setKnowledgeList(list: any[]) { + this.knowledgeList = list + }, + async asyncGetKnowledgeListPage( + page: pageRequest, + isShared?: boolean | undefined, + systemType: 'systemShare' | 'workspace' | 'systemManage' = 'workspace', + paramsData: any, + loading?: Ref, + ) { + return new Promise((resolve, reject) => { + const folder = useFolderStore() + const user = useUserStore() + const params = { + folder_id: folder.currentFolder?.id || user.getWorkspaceId(), + scope: systemType === 'systemShare' ? 'SHARED' : 'WORKSPACE', + ...paramsData, + } + loadSharedApi({ type: 'knowledge', isShared, systemType }) + .getToolListPage(page, params, loading) + .then((res: any) => { + resolve(res) + }) + .catch((error: any) => { + reject(error) + }) + }) + }, async asyncGetFolderKnowledge(folder_id?: string, loading?: Ref) { return new Promise((resolve, reject) => { const params = { @@ -59,46 +91,6 @@ const useKnowledgeStore = defineStore('knowledge', { }) }) }, - // async asyncGetTreeRootKnowledge(loading?: Ref) { - // const folder = useFolderStore() - // return Promise.all([ - // folder.asyncGetFolder('KNOWLEDGE', {}, loading), - // this.asyncGetFolderKnowledge(loading), - // ]) - // .then((res: any) => { - // const folderList = res[0].data - // const knowledgeList = res[1].data - // const arrMap: any = {} - // function buildIdMap(arr: any) { - // arr.forEach((item: any) => { - // arrMap[item.id] = item - // // 递归处理子节点 - // if (item.children && item.children.length > 0) { - // buildIdMap(item.children) - // } - // }) - // } - // buildIdMap(folderList) - // knowledgeList - // .filter((v: any) => v.resource_type !== 'folder') - // .forEach((item: any) => { - // const targetFolder = arrMap[item.folder_id] - // if (targetFolder) { - // // 检查是否已有相同ID的子节点(避免重复插入) - // const existingChild = targetFolder.children.find( - // (child: any) => child.id === item.id, - // ) - // if (!existingChild) { - // targetFolder.children.push(item) - // } - // } - // }) - // return Promise.resolve(folderList) - // }) - // .catch((error) => { - // return Promise.reject(error) - // }) - // }, }, }) diff --git a/ui/src/stores/modules/tool.ts b/ui/src/stores/modules/tool.ts index b5acdcabe..7843df207 100644 --- a/ui/src/stores/modules/tool.ts +++ b/ui/src/stores/modules/tool.ts @@ -15,8 +15,9 @@ const useToolStore = defineStore('tool', { }, async asyncGetToolListPage( page: pageRequest, - isShared?: boolean | undefined, + isShared: boolean | undefined, systemType: 'systemShare' | 'workspace' | 'systemManage' = 'workspace', + paramsData: any, loading?: Ref, ) { return new Promise((resolve, reject) => { @@ -25,6 +26,7 @@ const useToolStore = defineStore('tool', { const params = { folder_id: folder.currentFolder?.id || user.getWorkspaceId(), scope: systemType === 'systemShare' ? 'SHARED' : 'WORKSPACE', + ...paramsData, } loadSharedApi({ type: 'tool', isShared, systemType }) .getToolListPage(page, params, loading) diff --git a/ui/src/views/knowledge/component/KnowledgeListContainer.vue b/ui/src/views/knowledge/component/KnowledgeListContainer.vue new file mode 100644 index 000000000..064ebbdd1 --- /dev/null +++ b/ui/src/views/knowledge/component/KnowledgeListContainer.vue @@ -0,0 +1,472 @@ + + + + + diff --git a/ui/src/views/knowledge/index.vue b/ui/src/views/knowledge/index.vue index 0de0b50b0..1f1eded6b 100644 --- a/ui/src/views/knowledge/index.vue +++ b/ui/src/views/knowledge/index.vue @@ -13,321 +13,24 @@ @refreshTree="refreshFolder" /> - - - diff --git a/ui/src/views/shared/document-shared/UploadDocument.vue b/ui/src/views/shared/document-shared/UploadDocument.vue deleted file mode 100644 index a8c85dea0..000000000 --- a/ui/src/views/shared/document-shared/UploadDocument.vue +++ /dev/null @@ -1,216 +0,0 @@ - - - diff --git a/ui/src/views/shared/document-shared/component/EmbeddingContentDialog.vue b/ui/src/views/shared/document-shared/component/EmbeddingContentDialog.vue deleted file mode 100644 index 1aa740d6f..000000000 --- a/ui/src/views/shared/document-shared/component/EmbeddingContentDialog.vue +++ /dev/null @@ -1,48 +0,0 @@ - - - diff --git a/ui/src/views/shared/document-shared/component/ImportDocumentDialog.vue b/ui/src/views/shared/document-shared/component/ImportDocumentDialog.vue deleted file mode 100644 index b669f8a30..000000000 --- a/ui/src/views/shared/document-shared/component/ImportDocumentDialog.vue +++ /dev/null @@ -1,233 +0,0 @@ - - - diff --git a/ui/src/views/shared/document-shared/component/SelectKnowledgeDialog.vue b/ui/src/views/shared/document-shared/component/SelectKnowledgeDialog.vue deleted file mode 100644 index d65e8f04d..000000000 --- a/ui/src/views/shared/document-shared/component/SelectKnowledgeDialog.vue +++ /dev/null @@ -1,137 +0,0 @@ - - - diff --git a/ui/src/views/shared/document-shared/component/Status.vue b/ui/src/views/shared/document-shared/component/Status.vue deleted file mode 100644 index f73b823ac..000000000 --- a/ui/src/views/shared/document-shared/component/Status.vue +++ /dev/null @@ -1,87 +0,0 @@ - - - diff --git a/ui/src/views/shared/document-shared/component/StatusTable.vue b/ui/src/views/shared/document-shared/component/StatusTable.vue deleted file mode 100644 index 3f9a9b4ad..000000000 --- a/ui/src/views/shared/document-shared/component/StatusTable.vue +++ /dev/null @@ -1,109 +0,0 @@ - - - diff --git a/ui/src/views/shared/document-shared/index.vue b/ui/src/views/shared/document-shared/index.vue deleted file mode 100644 index f2e6a72a1..000000000 --- a/ui/src/views/shared/document-shared/index.vue +++ /dev/null @@ -1,1017 +0,0 @@ - - - diff --git a/ui/src/views/shared/document-shared/upload/ResultSuccess.vue b/ui/src/views/shared/document-shared/upload/ResultSuccess.vue deleted file mode 100644 index 2cafd176a..000000000 --- a/ui/src/views/shared/document-shared/upload/ResultSuccess.vue +++ /dev/null @@ -1,98 +0,0 @@ - - - diff --git a/ui/src/views/shared/document-shared/upload/SetRules.vue b/ui/src/views/shared/document-shared/upload/SetRules.vue deleted file mode 100644 index b3bdb8c67..000000000 --- a/ui/src/views/shared/document-shared/upload/SetRules.vue +++ /dev/null @@ -1,258 +0,0 @@ - - - diff --git a/ui/src/views/shared/document-shared/upload/UploadComponent.vue b/ui/src/views/shared/document-shared/upload/UploadComponent.vue deleted file mode 100644 index fe2c5c8f6..000000000 --- a/ui/src/views/shared/document-shared/upload/UploadComponent.vue +++ /dev/null @@ -1,327 +0,0 @@ - - - diff --git a/ui/src/views/shared/hit-test-shared/index.vue b/ui/src/views/shared/hit-test-shared/index.vue deleted file mode 100644 index 59ebe9b5b..000000000 --- a/ui/src/views/shared/hit-test-shared/index.vue +++ /dev/null @@ -1,434 +0,0 @@ - - - diff --git a/ui/src/views/shared/knowledge-shared/KnowledgeSetting.vue b/ui/src/views/shared/knowledge-shared/KnowledgeSetting.vue deleted file mode 100644 index 87737e896..000000000 --- a/ui/src/views/shared/knowledge-shared/KnowledgeSetting.vue +++ /dev/null @@ -1,284 +0,0 @@ - - - diff --git a/ui/src/views/shared/knowledge-shared/SharedWorkspace.vue b/ui/src/views/shared/knowledge-shared/SharedWorkspace.vue deleted file mode 100644 index 59af15e6b..000000000 --- a/ui/src/views/shared/knowledge-shared/SharedWorkspace.vue +++ /dev/null @@ -1,318 +0,0 @@ - - - - diff --git a/ui/src/views/shared/knowledge-shared/component/BaseForm.vue b/ui/src/views/shared/knowledge-shared/component/BaseForm.vue deleted file mode 100644 index d4f95e5a6..000000000 --- a/ui/src/views/shared/knowledge-shared/component/BaseForm.vue +++ /dev/null @@ -1,146 +0,0 @@ - - - diff --git a/ui/src/views/shared/knowledge-shared/component/EditParagraphDialog.vue b/ui/src/views/shared/knowledge-shared/component/EditParagraphDialog.vue deleted file mode 100644 index 9fffaddc7..000000000 --- a/ui/src/views/shared/knowledge-shared/component/EditParagraphDialog.vue +++ /dev/null @@ -1,135 +0,0 @@ - - - diff --git a/ui/src/views/shared/knowledge-shared/component/KnowledgeIcon.vue b/ui/src/views/shared/knowledge-shared/component/KnowledgeIcon.vue deleted file mode 100644 index f7405a6ec..000000000 --- a/ui/src/views/shared/knowledge-shared/component/KnowledgeIcon.vue +++ /dev/null @@ -1,25 +0,0 @@ - - diff --git a/ui/src/views/shared/knowledge-shared/component/ParagraphList.vue b/ui/src/views/shared/knowledge-shared/component/ParagraphList.vue deleted file mode 100644 index eed592425..000000000 --- a/ui/src/views/shared/knowledge-shared/component/ParagraphList.vue +++ /dev/null @@ -1,109 +0,0 @@ - - - diff --git a/ui/src/views/shared/knowledge-shared/component/ParagraphPreview.vue b/ui/src/views/shared/knowledge-shared/component/ParagraphPreview.vue deleted file mode 100644 index ae780c017..000000000 --- a/ui/src/views/shared/knowledge-shared/component/ParagraphPreview.vue +++ /dev/null @@ -1,70 +0,0 @@ - - - diff --git a/ui/src/views/shared/knowledge-shared/component/SyncWebDialog.vue b/ui/src/views/shared/knowledge-shared/component/SyncWebDialog.vue deleted file mode 100644 index b58ae930a..000000000 --- a/ui/src/views/shared/knowledge-shared/component/SyncWebDialog.vue +++ /dev/null @@ -1,84 +0,0 @@ - - - diff --git a/ui/src/views/shared/knowledge-shared/create-component/CreateKnowledgeDialog.vue b/ui/src/views/shared/knowledge-shared/create-component/CreateKnowledgeDialog.vue deleted file mode 100644 index 0dd1c5bb2..000000000 --- a/ui/src/views/shared/knowledge-shared/create-component/CreateKnowledgeDialog.vue +++ /dev/null @@ -1,70 +0,0 @@ - - - diff --git a/ui/src/views/shared/knowledge-shared/create-component/CreateLarkKnowledgeDialog.vue b/ui/src/views/shared/knowledge-shared/create-component/CreateLarkKnowledgeDialog.vue deleted file mode 100644 index f88103263..000000000 --- a/ui/src/views/shared/knowledge-shared/create-component/CreateLarkKnowledgeDialog.vue +++ /dev/null @@ -1,161 +0,0 @@ - - - diff --git a/ui/src/views/shared/knowledge-shared/create-component/CreateWebKnowledgeDialog.vue b/ui/src/views/shared/knowledge-shared/create-component/CreateWebKnowledgeDialog.vue deleted file mode 100644 index da0217c9f..000000000 --- a/ui/src/views/shared/knowledge-shared/create-component/CreateWebKnowledgeDialog.vue +++ /dev/null @@ -1,122 +0,0 @@ - - - diff --git a/ui/src/views/shared/knowledge-shared/index.vue b/ui/src/views/shared/knowledge-shared/index.vue deleted file mode 100644 index 3752c0cf0..000000000 --- a/ui/src/views/shared/knowledge-shared/index.vue +++ /dev/null @@ -1,464 +0,0 @@ - - - - diff --git a/ui/src/views/shared/paragraph-shared/component/ParagraphCard.vue b/ui/src/views/shared/paragraph-shared/component/ParagraphCard.vue deleted file mode 100644 index f1d86d89b..000000000 --- a/ui/src/views/shared/paragraph-shared/component/ParagraphCard.vue +++ /dev/null @@ -1,182 +0,0 @@ - - - diff --git a/ui/src/views/shared/paragraph-shared/component/ParagraphDialog.vue b/ui/src/views/shared/paragraph-shared/component/ParagraphDialog.vue deleted file mode 100644 index 146113b42..000000000 --- a/ui/src/views/shared/paragraph-shared/component/ParagraphDialog.vue +++ /dev/null @@ -1,152 +0,0 @@ - - - diff --git a/ui/src/views/shared/paragraph-shared/component/ParagraphForm.vue b/ui/src/views/shared/paragraph-shared/component/ParagraphForm.vue deleted file mode 100644 index 70d500e50..000000000 --- a/ui/src/views/shared/paragraph-shared/component/ParagraphForm.vue +++ /dev/null @@ -1,174 +0,0 @@ - - - diff --git a/ui/src/views/shared/paragraph-shared/component/ProblemComponent.vue b/ui/src/views/shared/paragraph-shared/component/ProblemComponent.vue deleted file mode 100644 index 1e16ef181..000000000 --- a/ui/src/views/shared/paragraph-shared/component/ProblemComponent.vue +++ /dev/null @@ -1,200 +0,0 @@ - - - diff --git a/ui/src/views/shared/paragraph-shared/component/SelectDocumentDialog.vue b/ui/src/views/shared/paragraph-shared/component/SelectDocumentDialog.vue deleted file mode 100644 index b1471fd90..000000000 --- a/ui/src/views/shared/paragraph-shared/component/SelectDocumentDialog.vue +++ /dev/null @@ -1,181 +0,0 @@ - - - diff --git a/ui/src/views/shared/paragraph-shared/index.vue b/ui/src/views/shared/paragraph-shared/index.vue deleted file mode 100644 index f35dbb331..000000000 --- a/ui/src/views/shared/paragraph-shared/index.vue +++ /dev/null @@ -1,364 +0,0 @@ - - - diff --git a/ui/src/views/shared/problem-shared/component/CreateProblemDialog.vue b/ui/src/views/shared/problem-shared/component/CreateProblemDialog.vue deleted file mode 100644 index 6d452b9e2..000000000 --- a/ui/src/views/shared/problem-shared/component/CreateProblemDialog.vue +++ /dev/null @@ -1,92 +0,0 @@ - - - diff --git a/ui/src/views/shared/problem-shared/component/DetailProblemDrawer.vue b/ui/src/views/shared/problem-shared/component/DetailProblemDrawer.vue deleted file mode 100644 index 7bbae79eb..000000000 --- a/ui/src/views/shared/problem-shared/component/DetailProblemDrawer.vue +++ /dev/null @@ -1,206 +0,0 @@ - - - - diff --git a/ui/src/views/shared/problem-shared/component/RelateProblemDialog.vue b/ui/src/views/shared/problem-shared/component/RelateProblemDialog.vue deleted file mode 100644 index 540e63075..000000000 --- a/ui/src/views/shared/problem-shared/component/RelateProblemDialog.vue +++ /dev/null @@ -1,330 +0,0 @@ - - - diff --git a/ui/src/views/shared/problem-shared/index.vue b/ui/src/views/shared/problem-shared/index.vue deleted file mode 100644 index 73d0b226d..000000000 --- a/ui/src/views/shared/problem-shared/index.vue +++ /dev/null @@ -1,388 +0,0 @@ - - - diff --git a/ui/src/views/system-shared/KnowLedgeSharedIndex.vue b/ui/src/views/system-shared/KnowLedgeSharedIndex.vue new file mode 100644 index 000000000..062b156d1 --- /dev/null +++ b/ui/src/views/system-shared/KnowLedgeSharedIndex.vue @@ -0,0 +1,26 @@ + + + + + diff --git a/ui/src/views/tool/component/ToolListContainer.vue b/ui/src/views/tool/component/ToolListContainer.vue index 0b61734e8..08b7547ea 100644 --- a/ui/src/views/tool/component/ToolListContainer.vue +++ b/ui/src/views/tool/component/ToolListContainer.vue @@ -150,9 +150,7 @@ :description="item.desc" class="cursor" @click.stop="openCreateDialog(item)" - :disabled=" - permissionPrecise.edit() - " + :disabled="permissionPrecise.edit()" >