From cc20e20f610d6534bd671f3f7e0bb5f1858a67d7 Mon Sep 17 00:00:00 2001 From: wangdan-fit2cloud Date: Fri, 27 Jun 2025 11:37:53 +0800 Subject: [PATCH] feat: bugs --- .../component/SelectKnowledgeDialog.vue | 8 +++--- .../paragraph/component/ParagraphCard.vue | 6 ++++- .../component/SelectDocumentDialog.vue | 25 ++++++++----------- ui/src/views/paragraph/index.vue | 6 ++++- 4 files changed, 24 insertions(+), 21 deletions(-) diff --git a/ui/src/views/document/component/SelectKnowledgeDialog.vue b/ui/src/views/document/component/SelectKnowledgeDialog.vue index b004ca045..80c15cf8b 100644 --- a/ui/src/views/document/component/SelectKnowledgeDialog.vue +++ b/ui/src/views/document/component/SelectKnowledgeDialog.vue @@ -59,7 +59,7 @@ import { ref, watch, computed } from 'vue' import { useRoute } from 'vue-router' import { loadSharedApi } from '@/utils/dynamics-api/shared-api' -import useStore from "@/stores"; +import useStore from '@/stores' const route = useRoute() const { params: { id }, // id为knowledgeID @@ -90,18 +90,18 @@ const form = ref({ const defaultProps = { children: 'children', label: 'name', - isLeaf: (data: any) => data.resource_type && data.resource_type !== 'folder', + isLeaf: (data: any) => + data.resource_type ? data.resource_type !== 'folder' : data.workspace_id === 'None', disabled: (data: any, node: any) => { return data.id === id }, } const loadTree = (node: any, resolve: any) => { - console.log(node) if (node.isLeaf) return resolve([]) const folder_id = node.level === 0 ? user.getWorkspaceId() : node.data.id loadSharedApi({ type: 'knowledge', systemType: apiType.value }) - .getKnowledgeList({folder_id: folder_id}, loading) + .getKnowledgeList({ folder_id: folder_id }, loading) .then((res: any) => { resolve(res.data) }) diff --git a/ui/src/views/paragraph/component/ParagraphCard.vue b/ui/src/views/paragraph/component/ParagraphCard.vue index 9e0f54d27..3fd57ce97 100644 --- a/ui/src/views/paragraph/component/ParagraphCard.vue +++ b/ui/src/views/paragraph/component/ParagraphCard.vue @@ -72,7 +72,11 @@ @refresh="refresh" :apiType="apiType" /> - + diff --git a/ui/src/views/paragraph/component/SelectDocumentDialog.vue b/ui/src/views/paragraph/component/SelectDocumentDialog.vue index 9d1d4cd46..c92ff874b 100644 --- a/ui/src/views/paragraph/component/SelectDocumentDialog.vue +++ b/ui/src/views/paragraph/component/SelectDocumentDialog.vue @@ -80,9 +80,12 @@ import { ref, watch, reactive, computed } from 'vue' import { useRoute } from 'vue-router' import type { FormInstance, FormRules } from 'element-plus' import { loadSharedApi } from '@/utils/dynamics-api/shared-api' +import useStore from '@/stores' import { t } from '@/locales' -import useStore from "@/stores"; +const props = defineProps<{ + apiType: 'systemShare' | 'workspace' | 'systemManage' +}>() const route = useRoute() const { params: { id, documentId }, // id为knowledgeID @@ -90,15 +93,6 @@ const { const { user } = useStore() -const apiType = computed(() => { - if (route.path.includes('shared')) { - return 'systemShare' - } else if (route.path.includes('resource-management')) { - return 'systemManage' - } else { - return 'workspace' - } -}) const emit = defineEmits(['refresh']) const formRef = ref() @@ -138,7 +132,8 @@ watch(dialogVisible, (bool) => { const defaultProps = { children: 'children', label: 'name', - isLeaf: (data: any) => data.resource_type && data.resource_type !== 'folder', + isLeaf: (data: any) => + data.resource_type ? data.resource_type !== 'folder' : data.workspace_id === 'None', disabled: (data: any, node: any) => { return data.id === id }, @@ -147,8 +142,8 @@ const defaultProps = { const loadTree = (node: any, resolve: any) => { if (node.isLeaf) return resolve([]) const folder_id = node.level === 0 ? user.getWorkspaceId() : node.data.id - loadSharedApi({ type: 'knowledge', systemType: apiType.value }) - .getKnowledgeList({folder_id: folder_id}, optionLoading) + loadSharedApi({ type: 'knowledge', systemType: props.apiType }) + .getKnowledgeList({ folder_id: folder_id }, optionLoading) .then((res: any) => { resolve(res.data) }) @@ -160,7 +155,7 @@ function changeKnowledge(id: string) { } function getDocument(id: string) { - loadSharedApi({ type: 'document', systemType: apiType.value }) + loadSharedApi({ type: 'document', systemType: props.apiType }) .getDocumentList(id, optionLoading) .then((res: any) => { documentList.value = res.data?.filter((v: any) => v.id !== documentId) @@ -179,7 +174,7 @@ const submitForm = async (formEl: FormInstance | undefined) => { const obj = { id_list: paragraphList.value, } - loadSharedApi({ type: 'paragraph', systemType: apiType.value }) + loadSharedApi({ type: 'paragraph', systemType: props.apiType }) .putMigrateMulParagraph( id, documentId, diff --git a/ui/src/views/paragraph/index.vue b/ui/src/views/paragraph/index.vue index 6b1933314..fd1dc44a2 100644 --- a/ui/src/views/paragraph/index.vue +++ b/ui/src/views/paragraph/index.vue @@ -142,7 +142,11 @@ :apiType="apiType" @refresh="refresh" /> - +