diff --git a/ui/src/api/knowledge/knowledge.ts b/ui/src/api/knowledge/knowledge.ts index 2054d2d67..eb64d73f8 100644 --- a/ui/src/api/knowledge/knowledge.ts +++ b/ui/src/api/knowledge/knowledge.ts @@ -21,6 +21,23 @@ const getKnowledgeByFolder: (data?: any, loading?: Ref) => Promise) => Promise> = ( + param, + loading, +) => { + return get(`${prefix}/knowledge`, param, loading) +} + /** * 知识库分页列表 * @param 参数 @@ -31,7 +48,7 @@ const getKnowledgeByFolder: (data?: any, loading?: Ref) => Promise, @@ -234,14 +251,6 @@ const postWebKnowledge: (data: any, loading?: Ref) => Promise) => Promise> = (loading) => { - return get(`${prefix}`, undefined, loading) -} - /** * 获取飞书文档列表 * @param knowledge_id @@ -269,6 +278,7 @@ const importLarkDocument: ( export default { getKnowledgeByFolder, getKnowledgeList, + getKnowledgeListPage, getKnowledgeDetail, putKnowledge, delKnowledge, @@ -284,5 +294,4 @@ export default { getLarkDocumentList, importLarkDocument, - getAllKnowledge, } diff --git a/ui/src/api/shared/knowledge.ts b/ui/src/api/shared/knowledge.ts index 8bbe54321..5e5052dbb 100644 --- a/ui/src/api/shared/knowledge.ts +++ b/ui/src/api/shared/knowledge.ts @@ -79,6 +79,23 @@ const getKnowledgeByFolder: (data?: any, loading?: Ref) => Promise) => Promise> = ( + param, + loading, +) => { + return get(`${prefix}/knowledge`, param, loading) +} + /** * 知识库分页列表 * @param 参数 @@ -89,7 +106,7 @@ const getKnowledgeByFolder: (data?: any, loading?: Ref) => Promise, @@ -292,14 +309,6 @@ const postWebKnowledge: (data: any, loading?: Ref) => Promise) => Promise> = (loading) => { - return get(`${prefix}/knowledge`, undefined, loading) -} - /** * 获取飞书文档列表 * @param knowledge_id @@ -327,6 +336,7 @@ const importLarkDocument: ( export default { getKnowledgeByFolder, getKnowledgeList, + getKnowledgeListPage, getKnowledgeDetail, putKnowledge, delKnowledge, @@ -342,7 +352,6 @@ export default { getLarkDocumentList, importLarkDocument, - getAllKnowledge, getSharedWorkspaceKnowledge, getSharedWorkspaceKnowledgePage, getSharedAuthorizationKnowledgeGet, diff --git a/ui/src/layout/components/breadcrumb/index.vue b/ui/src/layout/components/breadcrumb/index.vue index 3d1bdcf46..48b71b49e 100644 --- a/ui/src/layout/components/breadcrumb/index.vue +++ b/ui/src/layout/components/breadcrumb/index.vue @@ -169,7 +169,7 @@ function changeMenu(id: string) { function getDataset() { loading.value = true knowledge - .asyncGetAllKnowledge() + .asyncGetRootKnowledge() .then((res: any) => { list.value = res.data common.saveBreadcrumb(list.value) diff --git a/ui/src/locales/lang/en-US/views/application.ts b/ui/src/locales/lang/en-US/views/application.ts index 72010cb83..008e569c9 100644 --- a/ui/src/locales/lang/en-US/views/application.ts +++ b/ui/src/locales/lang/en-US/views/application.ts @@ -131,7 +131,6 @@ export default { addKnowledge: 'Add Related Knowledge', addKnowledgePlaceholder: 'The selected knowledge must use the same embedding model', selected: 'Selected', - countDataset: 'Knowledge', selectSearchMode: 'Retrieval Mode', vectorSearch: 'Vector Search', diff --git a/ui/src/locales/lang/zh-CN/views/application.ts b/ui/src/locales/lang/zh-CN/views/application.ts index e2f33277f..615821a4d 100644 --- a/ui/src/locales/lang/zh-CN/views/application.ts +++ b/ui/src/locales/lang/zh-CN/views/application.ts @@ -122,7 +122,6 @@ export default { addKnowledge: '添加关联知识库', addKnowledgePlaceholder: '所选知识库必须使用相同的 Embedding 模型', selected: '已选', - countDataset: '个知识库', selectSearchMode: '检索模式', vectorSearch: '向量检索', diff --git a/ui/src/locales/lang/zh-Hant/views/application.ts b/ui/src/locales/lang/zh-Hant/views/application.ts index 792241a6a..f1dec8256 100644 --- a/ui/src/locales/lang/zh-Hant/views/application.ts +++ b/ui/src/locales/lang/zh-Hant/views/application.ts @@ -122,7 +122,6 @@ export default { addKnowledge: '新增關聯知識庫', addKnowledgePlaceholder: '所選知識庫必須使用相同的 Embedding 模型', selected: '已選', - countDataset: '個知識庫', selectSearchMode: '檢索模式', vectorSearch: '向量檢索', diff --git a/ui/src/stores/modules-shared-system/knowledge.ts b/ui/src/stores/modules-shared-system/knowledge.ts index 7ce8c5cfc..1f224ab0c 100644 --- a/ui/src/stores/modules-shared-system/knowledge.ts +++ b/ui/src/stores/modules-shared-system/knowledge.ts @@ -1,8 +1,8 @@ -import {defineStore} from 'pinia' -import type {knowledgeData} from '@/api/type/knowledge' -import type {UploadUserFile} from 'element-plus' +import { defineStore } from 'pinia' +import type { knowledgeData } from '@/api/type/knowledge' +import type { UploadUserFile } from 'element-plus' import knowledgeApi from '@/api/shared/knowledge' -import {type Ref} from 'vue' +import { type Ref } from 'vue' export interface knowledgeStateTypes { baseInfo: knowledgeData | null @@ -31,10 +31,13 @@ const useKnowledgeStore = defineStore('knowledg', { saveDocumentsFile(file: UploadUserFile[]) { this.documentsFiles = file }, - async asyncGetAllKnowledge(loading?: Ref) { + async asyncGetRootKnowledge(loading?: Ref) { return new Promise((resolve, reject) => { + const params = { + folder_id: localStorage.getItem('workspace_id'), + } knowledgeApi - .getAllKnowledge(loading) + .getKnowledgeList(params, loading) .then((data) => { resolve(data) }) @@ -43,10 +46,7 @@ const useKnowledgeStore = defineStore('knowledg', { }) }) }, - async asyncGetKnowledgeDetail( - knowledge_id: string, - loading?: Ref, - ) { + async asyncGetKnowledgeDetail(knowledge_id: string, loading?: Ref) { return new Promise((resolve, reject) => { knowledgeApi .getKnowledgeDetail(knowledge_id, loading) @@ -58,11 +58,7 @@ const useKnowledgeStore = defineStore('knowledg', { }) }) }, - async asyncSyncKnowledge( - id: string, - sync_type: string, - loading?: Ref, - ) { + async asyncSyncKnowledge(id: string, sync_type: string, loading?: Ref) { return new Promise((resolve, reject) => { knowledgeApi .putSyncWebKnowledge(id, sync_type, loading) diff --git a/ui/src/stores/modules/application.ts b/ui/src/stores/modules/application.ts index 7c803e921..d2bf3d724 100644 --- a/ui/src/stores/modules/application.ts +++ b/ui/src/stores/modules/application.ts @@ -1,6 +1,5 @@ import { defineStore } from 'pinia' import applicationApi from '@/api/application/application' -import knowledgeAPI from '@/api/knowledge/knowledge.ts' import applicationXpackApi from '@/api/application/application-xpack' import { type Ref } from 'vue' import { getBrowserLang } from '@/locales/index' @@ -36,19 +35,6 @@ const useApplicationStore = defineStore('application', { }) }, - async asyncGetApplicationKnowledge(id: string, loading?: Ref) { - return new Promise((resolve, reject) => { - knowledgeAPI - .getAllKnowledge(loading) - .then((data) => { - resolve(data) - }) - .catch((error) => { - reject(error) - }) - }) - }, - async asyncGetAccessToken(id: string, loading?: Ref) { return new Promise((resolve, reject) => { const user = useUserStore() diff --git a/ui/src/stores/modules/knowledge.ts b/ui/src/stores/modules/knowledge.ts index b0a63c4ce..a00b7558e 100644 --- a/ui/src/stores/modules/knowledge.ts +++ b/ui/src/stores/modules/knowledge.ts @@ -1,8 +1,8 @@ -import {defineStore} from 'pinia' -import type {knowledgeData} from '@/api/type/knowledge' -import type {UploadUserFile} from 'element-plus' +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 Ref} from 'vue' +import { type Ref } from 'vue' export interface knowledgeStateTypes { baseInfo: knowledgeData | null @@ -31,10 +31,13 @@ const useKnowledgeStore = defineStore('knowledge', { saveDocumentsFile(file: UploadUserFile[]) { this.documentsFiles = file }, - async asyncGetAllKnowledge(loading?: Ref) { + async asyncGetRootKnowledge(loading?: Ref) { return new Promise((resolve, reject) => { + const params = { + folder_id: localStorage.getItem('workspace_id'), + } knowledgeApi - .getAllKnowledge(loading) + .getKnowledgeList(params, loading) .then((data) => { resolve(data) }) @@ -43,10 +46,7 @@ const useKnowledgeStore = defineStore('knowledge', { }) }) }, - async asyncGetKnowledgeDetail( - knowledge_id: string, - loading?: Ref, - ) { + async asyncGetKnowledgeDetail(knowledge_id: string, loading?: Ref) { return new Promise((resolve, reject) => { knowledgeApi .getKnowledgeDetail(knowledge_id, loading) @@ -58,11 +58,7 @@ const useKnowledgeStore = defineStore('knowledge', { }) }) }, - async asyncSyncKnowledge( - id: string, - sync_type: string, - loading?: Ref, - ) { + async asyncSyncKnowledge(id: string, sync_type: string, loading?: Ref) { return new Promise((resolve, reject) => { knowledgeApi .putSyncWebKnowledge(id, sync_type, loading) diff --git a/ui/src/views/application/ApplicationSetting.vue b/ui/src/views/application/ApplicationSetting.vue index 7f36e5770..dd55fdb53 100644 --- a/ui/src/views/application/ApplicationSetting.vue +++ b/ui/src/views/application/ApplicationSetting.vue @@ -185,6 +185,7 @@
{ + knowledge.asyncGetRootKnowledge(knowledgeLoading).then((res: any) => { knowledgeList.value = res.data }) } @@ -706,8 +707,7 @@ function refresh() { onMounted(() => { getModel() - // todo - // getKnowledge() + getKnowledge() getDetail() getSTTModel() getTTSModel() diff --git a/ui/src/views/application/component/AddKnowledgeDialog.vue b/ui/src/views/application/component/AddKnowledgeDialog.vue index 44feb35b7..895611381 100644 --- a/ui/src/views/application/component/AddKnowledgeDialog.vue +++ b/ui/src/views/application/component/AddKnowledgeDialog.vue @@ -35,23 +35,39 @@
- -
- - - - {{ item.name }} - - - -
-
+ + + +
+ + + + {{ item.name }} + + + +
+
+
+ diff --git a/ui/src/views/application/component/ParamSettingDialog.vue b/ui/src/views/application/component/ParamSettingDialog.vue index ed3bb1aa8..a169a111b 100644 --- a/ui/src/views/application/component/ParamSettingDialog.vue +++ b/ui/src/views/application/component/ParamSettingDialog.vue @@ -10,182 +10,174 @@ :close-on-press-escape="false" > -
- - - - - -

- {{ $t('views.application.dialog.vectorSearch') }} -

- {{ - $t('views.application.dialog.vectorSearchTooltip') - }} -
-
- - -

- {{ $t('views.application.dialog.fullTextSearch') }} -

- {{ - $t('views.application.dialog.fullTextSearchTooltip') - }} -
-
- - -

- {{ $t('views.application.dialog.hybridSearch') }} -

- {{ - $t('views.application.dialog.hybridSearchTooltip') - }} -
-
-
-
- - - - - - - - - - - - - - - - - - - + + - - - -

- {{ $t('views.application.dialog.continueQuestioning') }} -

-
- - -

{{ $t('views.application.dialog.provideAnswer') }}

- +

+ {{ $t('views.application.dialog.vectorSearch') }} +

+ {{ + $t('views.application.dialog.vectorSearchTooltip') + }} +
+ + + +

+ {{ $t('views.application.dialog.fullTextSearch') }} +

+ {{ + $t('views.application.dialog.fullTextSearchTooltip') + }} +
+
+ + +

+ {{ $t('views.application.dialog.hybridSearch') }} +

+ {{ + $t('views.application.dialog.hybridSearchTooltip') + }} +
+
+
+
+ + + + + + + + + + + + + - - - - - + + + + + - - -
-
+ + +

+ {{ $t('views.application.dialog.continueQuestioning') }} +

+
+ + +

{{ $t('views.application.dialog.provideAnswer') }}

+ + + +
+
+ + + + + + + + + + +