Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"dingtalk-jsapi": "^3.2.9",
"dompurify": "^3.4.14",
"echarts": "^6.1.0",
"element-plus": "^2.14.2",
"element-plus": "^2.14.7",
"highlight.js": "^11.12.0",
"jsencrypt": "^3.5.4",
"katex": "^0.16.47",
Expand Down
10 changes: 5 additions & 5 deletions ui/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion ui/src/components/COMPONENT_README.md
Original file line number Diff line number Diff line change
Expand Up @@ -821,7 +821,8 @@ Workspace 的文件夹虚拟树业务组件。组件根据当前资源上下文
切换选择,始终过滤掉 `embedding_model_id` 为空的知识库;选中后仅展示相同 Embedding 模型的选项,清空后恢复可选范围;悬停展示知识库详情。
按工作空间、System 资源管理、System 共享资源选择完整 Knowledge API 的 `getAllKnowledge`,
一次加载当前查询的全部知识库,不使用滚动分页,不增加 Workspace 共享页面来源分支。
仅普通工作空间显示只读 `FolderTree`,不显示共享目录、不调用 Workspace Shared API;其他范围不显示或查询文件夹。
仅普通工作空间显示只读 `FolderTree`,包含共享目录;选中共享目录时调用 Workspace Shared API 的
`getAllKnowledge`,不传文件夹参数;其他范围不显示或查询文件夹。
支持名称搜索和跨目录保留选择,调用方维护最终关联 ID 与快照。

### SelectApplicationDialog、SelectToolDialog
Expand Down
15 changes: 11 additions & 4 deletions ui/src/components/business/select-knowledge-dialog/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ import { computed, nextTick, ref, useTemplateRef } from 'vue'
import { cloneDeep } from 'lodash'
import { isSystemResource, isSystemSharedResource, isWorkspaceResource } from '@/utils/resource-context'
import KnowledgeApi from '@/api/admin/workspace/knowledge/knowledge'
import SharedKnowledgeApi from '@/api/admin/workspace/shared/knowledge/knowledge'
import SystemKnowledgeApi from '@/api/admin/system/resource-management/knowledge/knowledge'
import SystemSharedKnowledgeApi from '@/api/admin/system/shared-resources/knowledge/knowledge'
import type { FolderItem, KnowledgeItem } from '@/api/types'
import { RESOURCE_TYPE } from '@/api/enums'
import { FOLDER_ENTRIES } from '@/constants/folder'
import { FOLDER_ENTRIES, FOLDER_ENTRY_ID } from '@/constants/folder'
import FolderTree from '@/components/business/folder-tree/index.vue'
import MkCardCheckbox from '@/components/mk-card-checkbox/index.vue'
import KnowledgeCard from '@/views/knowledge/knowledge-card/KnowledgeCard.vue'
Expand Down Expand Up @@ -48,10 +49,17 @@ function refreshKnowledge() {
loading.value = true
knowledgeOptions.value = []
appliedSearchKeyword.value = searchKeyword.value.trim()
const requestApi = isSystemResource() ? SystemKnowledgeApi : isSystemSharedResource() ? SystemSharedKnowledgeApi : KnowledgeApi
const isSharedFolder = isWorkspaceScope.value && currentFolder.value.id === FOLDER_ENTRY_ID.SHARED
const requestApi = isSystemResource()
? SystemKnowledgeApi
: isSystemSharedResource()
? SystemSharedKnowledgeApi
: isSharedFolder
? SharedKnowledgeApi
: KnowledgeApi
return requestApi
.getAllKnowledge({
...(isWorkspaceScope.value ? { folder_id: currentFolder.value.id } : {}),
...(isWorkspaceScope.value && !isSharedFolder ? { folder_id: currentFolder.value.id } : {}),
...(appliedSearchKeyword.value ? { name: appliedSearchKeyword.value } : {}),
})
.then((knowledge) => {
Expand Down Expand Up @@ -123,7 +131,6 @@ defineExpose({ open })
ref="folderTreeRef"
class="pt-4"
:can-edit="false"
:show-shared="false"
:source="RESOURCE_TYPE.KNOWLEDGE"
@loaded="selectFolder"
@select="selectFolder"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import type { InjectionKey, ComputedRef } from 'vue'
import type ChatLogApi from '@/api/admin/workspace/application/chat-log'

export const LOG_IMPROVE_KEY: InjectionKey<
ComputedRef<{
api: Pick<typeof ChatLogApi, 'putChatRecordLog' | 'getMarkChatRecord' | 'deleteMarkChatRecord'>
applicationId: string
chatId: string
}>
> = Symbol('log-improve')
Loading