diff --git a/ui/src/api/system-resource-management/application.ts b/ui/src/api/system-resource-management/application.ts index 6e1b0ef62..cb1b915ba 100644 --- a/ui/src/api/system-resource-management/application.ts +++ b/ui/src/api/system-resource-management/application.ts @@ -6,7 +6,17 @@ import { type Ref } from 'vue' const prefix = '/system/resource/application' - +/** + * 获取全部应用 + * @param param + * @param loading + */ +const getAllApplication: (param?: any, loading?: Ref) => Promise> = ( + param, + loading, +) => { + return get(`${prefix}`, param, loading) +} /** * 获取分页应用 * param { @@ -314,6 +324,7 @@ const getMcpTools: (application_id: string, loading?: Ref) => Promise, ) => Promise>> = (source, data, loading) => { - return get(`${prefix.value}/${source}/folder`, data, loading) + return get(`${prefix}/${source}/folder`, data, loading) } diff --git a/ui/src/components/workflow-dropdown-menu/application/index.vue b/ui/src/components/workflow-dropdown-menu/application/index.vue index 423005062..ee91cd277 100644 --- a/ui/src/components/workflow-dropdown-menu/application/index.vue +++ b/ui/src/components/workflow-dropdown-menu/application/index.vue @@ -153,7 +153,9 @@ const props = defineProps({ const emit = defineEmits(['clickNodes', 'onmousedown']) const apiType = computed(() => { - if (route.path.includes('resource-management')) { + if (route.path.includes('shared')) { + return 'systemShare' + } else if (route.path.includes('resource-management')) { return 'systemManage' } else { return 'workspace' @@ -247,7 +249,7 @@ const toolTreeData = ref([]) const toolList = ref([]) async function getToolFolder() { - const res: any = await folder.asyncGetFolder(SourceTypeEnum.TOOL, {}, apiType.value, loading) + const res: any = await folder.asyncGetFolder(SourceTypeEnum.TOOL, {id: props.id}, apiType.value, loading) toolTreeData.value = res.data folder.setCurrentFolder(res.data?.[0] || {}) } @@ -256,7 +258,7 @@ async function getToolList() { const res = await loadSharedApi({ type: 'tool', isShared: folder.currentFolder?.id === 'share', - systemType: 'workspace', + systemType: apiType.value, }).getToolList({ folder_id: folder.currentFolder?.id || user.getWorkspaceId(), tool_type: 'CUSTOM', @@ -269,7 +271,7 @@ const applicationTreeData = ref([]) const applicationList = ref([]) function getApplicationFolder() { - folder.asyncGetFolder(SourceTypeEnum.APPLICATION, {}, apiType.value, loading).then((res: any) => { + folder.asyncGetFolder(SourceTypeEnum.APPLICATION, {id: props.id}, apiType.value, loading).then((res: any) => { applicationTreeData.value = res.data folder.setCurrentFolder(res.data?.[0] || {}) }) @@ -278,7 +280,7 @@ function getApplicationFolder() { async function getApplicationList() { const res = await loadSharedApi({ type: 'application', - systemType: 'workspace', + systemType: apiType.value, }).getAllApplication({ folder_id: folder.currentFolder?.id || user.getWorkspaceId(), }) diff --git a/ui/src/components/workflow-dropdown-menu/knowledge-inner/index.vue b/ui/src/components/workflow-dropdown-menu/knowledge-inner/index.vue index 440f867d3..55c247c68 100644 --- a/ui/src/components/workflow-dropdown-menu/knowledge-inner/index.vue +++ b/ui/src/components/workflow-dropdown-menu/knowledge-inner/index.vue @@ -210,7 +210,7 @@ const toolTreeData = ref([]) const toolList = ref([]) async function getToolFolder() { - const res: any = await folder.asyncGetFolder(SourceTypeEnum.TOOL, {}, apiType.value, loading) + const res: any = await folder.asyncGetFolder(SourceTypeEnum.TOOL, {id: props.id}, apiType.value, loading) toolTreeData.value = res.data folder.setCurrentFolder(res.data?.[0] || {}) } diff --git a/ui/src/components/workflow-dropdown-menu/knowledge/index.vue b/ui/src/components/workflow-dropdown-menu/knowledge/index.vue index 2dcf5a4df..46dd864d4 100644 --- a/ui/src/components/workflow-dropdown-menu/knowledge/index.vue +++ b/ui/src/components/workflow-dropdown-menu/knowledge/index.vue @@ -230,7 +230,7 @@ const toolTreeData = ref([]) const toolList = ref([]) async function getToolFolder() { - const res: any = await folder.asyncGetFolder(SourceTypeEnum.TOOL, {}, apiType.value, loading) + const res: any = await folder.asyncGetFolder(SourceTypeEnum.TOOL, {id: props.id}, apiType.value, loading) toolTreeData.value = res.data folder.setCurrentFolder(res.data?.[0] || {}) }