Skip to content

Commit 37c9ef3

Browse files
wangdan-fit2cloudwangdan-fit2cloud
committed
fix: document
1 parent a6b8cc4 commit 37c9ef3

File tree

12 files changed

+91
-81
lines changed

12 files changed

+91
-81
lines changed

‎ui/src/layout/components/breadcrumb/index.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ function changeMenu(id: string) {
165165
function getKnowledge() {
166166
loading.value = true
167167
knowledge
168-
.asyncGetRootKnowledge()
168+
.asyncGetFolderKnowledge()
169169
.then((res: any) => {
170170
list.value = res.data
171171
common.saveBreadcrumb(list.value)

‎ui/src/stores/modules-resource-management/knowledge.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const useKnowledgeStore = defineStore('knowled', {
3131
saveDocumentsFile(file: UploadUserFile[]) {
3232
this.documentsFiles = file
3333
},
34-
async asyncGetRootKnowledge(loading?: Ref<boolean>) {
34+
async asyncGetFolderKnowledge(loading?: Ref<boolean>) {
3535
return new Promise((resolve, reject) => {
3636
const params = {
3737
folder_id: localStorage.getItem('workspace_id'),

‎ui/src/stores/modules-shared-system/knowledge.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const useKnowledgeStore = defineStore('knowledg', {
3131
saveDocumentsFile(file: UploadUserFile[]) {
3232
this.documentsFiles = file
3333
},
34-
async asyncGetRootKnowledge(loading?: Ref<boolean>) {
34+
async asyncGetFolderKnowledge(loading?: Ref<boolean>) {
3535
return new Promise((resolve, reject) => {
3636
const params = {
3737
folder_id: 'default',

‎ui/src/stores/modules/knowledge.ts‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ const useKnowledgeStore = defineStore('knowledge', {
3232
saveDocumentsFile(file: UploadUserFile[]) {
3333
this.documentsFiles = file
3434
},
35-
async asyncGetRootKnowledge(loading?: Ref<boolean>) {
35+
async asyncGetFolderKnowledge(folder_id?: string, loading?: Ref<boolean>) {
3636
return new Promise((resolve, reject) => {
3737
const params = {
38-
folder_id: localStorage.getItem('workspace_id'),
38+
folder_id: folder_id || localStorage.getItem('workspace_id'),
3939
}
4040
knowledgeApi
4141
.getKnowledgeList(params, loading)
@@ -47,46 +47,46 @@ const useKnowledgeStore = defineStore('knowledge', {
4747
})
4848
})
4949
},
50-
async asyncGetTreeRootKnowledge(loading?: Ref<boolean>) {
51-
const folder = useFolderStore()
52-
return Promise.all([
53-
folder.asyncGetFolder('KNOWLEDGE', {}, loading),
54-
this.asyncGetRootKnowledge(loading),
55-
])
56-
.then((res: any) => {
57-
const folderList = res[0].data
58-
const knowledgeList = res[1].data
59-
const arrMap: any = {}
60-
function buildIdMap(arr: any) {
61-
arr.forEach((item: any) => {
62-
arrMap[item.id] = item
63-
// 递归处理子节点
64-
if (item.children && item.children.length > 0) {
65-
buildIdMap(item.children)
66-
}
67-
})
68-
}
69-
buildIdMap(folderList)
70-
knowledgeList
71-
.filter((v: any) => v.resource_type !== 'folder')
72-
.forEach((item: any) => {
73-
const targetFolder = arrMap[item.folder_id]
74-
if (targetFolder) {
75-
// 检查是否已有相同ID的子节点（避免重复插入）
76-
const existingChild = targetFolder.children.find(
77-
(child: any) => child.id === item.id,
78-
)
79-
if (!existingChild) {
80-
targetFolder.children.push(item)
81-
}
82-
}
83-
})
84-
return Promise.resolve(folderList)
85-
})
86-
.catch((error) => {
87-
return Promise.reject(error)
88-
})
89-
},
50+
// async asyncGetTreeRootKnowledge(loading?: Ref<boolean>) {
51+
// const folder = useFolderStore()
52+
// return Promise.all([
53+
// folder.asyncGetFolder('KNOWLEDGE', {}, loading),
54+
// this.asyncGetFolderKnowledge(loading),
55+
// ])
56+
// .then((res: any) => {
57+
// const folderList = res[0].data
58+
// const knowledgeList = res[1].data
59+
// const arrMap: any = {}
60+
// function buildIdMap(arr: any) {
61+
// arr.forEach((item: any) => {
62+
// arrMap[item.id] = item
63+
// // 递归处理子节点
64+
// if (item.children && item.children.length > 0) {
65+
// buildIdMap(item.children)
66+
// }
67+
// })
68+
// }
69+
// buildIdMap(folderList)
70+
// knowledgeList
71+
// .filter((v: any) => v.resource_type !== 'folder')
72+
// .forEach((item: any) => {
73+
// const targetFolder = arrMap[item.folder_id]
74+
// if (targetFolder) {
75+
// // 检查是否已有相同ID的子节点（避免重复插入）
76+
// const existingChild = targetFolder.children.find(
77+
// (child: any) => child.id === item.id,
78+
// )
79+
// if (!existingChild) {
80+
// targetFolder.children.push(item)
81+
// }
82+
// }
83+
// })
84+
// return Promise.resolve(folderList)
85+
// })
86+
// .catch((error) => {
87+
// return Promise.reject(error)
88+
// })
89+
// },
9090
async asyncGetKnowledgeDetail(knowledge_id: string, loading?: Ref<boolean>) {
9191
return new Promise((resolve, reject) => {
9292
knowledgeApi

‎ui/src/views/application/ApplicationSetting.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,7 @@ function getDetail() {
633633
}
634634
635635
function getKnowledge() {
636-
knowledge.asyncGetRootKnowledge(knowledgeLoading).then((res: any) => {
636+
knowledge.asyncGetFolderKnowledge(knowledgeLoading).then((res: any) => {
637637
knowledgeList.value = res.data
638638
})
639639
}

‎ui/src/views/application/component/AddKnowledgeDialog.vue‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,17 @@
4949
<el-scrollbar>
5050
<div class="max-height layout-bg p-16-24">
5151
<el-row :gutter="12" v-loading="loading">
52-
<el-col :span="12" v-for="(item, index) in filterData" :key="index" class="mb-16">
52+
<el-col
53+
:span="12"
54+
v-for="(item, index) in filterData.filter((v:any) => v.resource_type !== 'folder')"
55+
:key="index"
56+
class="mb-16"
57+
>
5358
<CardCheckbox
5459
value-field="id"
5560
:data="item"
5661
v-model="checkList"
5762
@change="changeHandle"
58-
v-if="item.resource_type !== 'folder'"
5963
>
6064
<span class="ellipsis cursor ml-12" :title="item.name"> {{ item.name }}</span>
6165
</CardCheckbox>
@@ -100,7 +104,7 @@ const props = defineProps({
100104
})
101105
102106
const emit = defineEmits(['addData', 'refresh'])
103-
const { folder, user } = useStore()
107+
const { folder, user,knowledge } = useStore()
104108
105109
const dialogVisible = ref<boolean>(false)
106110
const checkList = ref([])
@@ -191,7 +195,7 @@ function getList() {
191195
const params = {
192196
folder_id: currentFolder.value?.id || user.getWorkspaceId(),
193197
}
194-
KnowledgeApi.getKnowledgeList(params, loading).then((res) => {
198+
knowledge.asyncGetFolderKnowledge(params, loading).then((res) => {
195199
searchDate.value = res.data
196200
})
197201
}

‎ui/src/views/document/component/SelectKnowledgeDialog.vue‎

Lines changed: 32 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,28 @@
1111
<h4 :id="titleId" :class="titleClass">{{ '文档迁移到' }}</h4>
1212
</template>
1313
<el-form
14-
class="p-24"
1514
ref="FormRef"
1615
:model="form"
1716
label-position="top"
1817
require-asterisk-position="right"
19-
v-loading="loading"
2018
>
2119
<el-form-item :label="$t('views.chatLog.selectKnowledge')" required>
2220
<el-tree-select
2321
v-model="form.selectKnowledge"
24-
:data="knowledgeList"
2522
:props="defaultProps"
2623
node-key="id"
24+
:default-expanded-keys="['default']"
25+
lazy
26+
:load="loadTree"
2727
>
2828
<template #default="{ data }">
2929
<div class="flex align-center">
30-
<KnowledgeIcon class="mr-12" :size="20" v-if="data.resource_type" :type="data.type" />
30+
<KnowledgeIcon
31+
class="mr-12"
32+
:size="20"
33+
v-if="data.resource_type !== 'folder'"
34+
:type="data.type"
35+
/>
3136
<el-avatar v-else class="mr-12" shape="square" :size="20" style="background: none">
3237
<img
3338
src="@/assets/knowledge/icon_file-folder_colorful.svg"
@@ -80,9 +85,9 @@ const documentList = ref<any>([])
8085
const defaultProps = {
8186
children: 'children',
8287
label: 'name',
88+
isLeaf: (data: any) => data.resource_type && data.resource_type !== 'folder',
8389
disabled: (data: any, node: any) => {
84-
console.log(data, node)
85-
return data.id === id || (node?.isLeaf && !data.resource_type)
90+
return data.id === id
8691
},
8792
}
8893
@@ -100,9 +105,17 @@ watch(dialogVisible, (bool) => {
100105
101106
const open = (list: any) => {
102107
documentList.value = list
103-
getKnowledge()
104108
dialogVisible.value = true
105109
}
110+
111+
const loadTree = (node: any, resolve: any) => {
112+
console.log(node)
113+
if (node.isLeaf) return resolve([])
114+
const folder_id = node.level === 0 ? '' : node.data.id
115+
knowledge.asyncGetFolderKnowledge(folder_id, loading).then((res: any) => {
116+
resolve(res.data)
117+
})
118+
}
106119
const submitHandle = () => {
107120
documentApi
108121
.putMigrateMulDocument(id, form.value.selectKnowledge, documentList.value, loading)
@@ -112,26 +125,19 @@ const submitHandle = () => {
112125
})
113126
}
114127
115-
function getKnowledge() {
116-
knowledge.asyncGetTreeRootKnowledge(loading).then((res: any) => {
117-
knowledgeList.value = res || []
118-
console.log(knowledgeList.value)
119-
})
120-
}
121-
122128
defineExpose({ open })
123129
</script>
124130
<style lang="scss">
125-
.select-knowledge-dialog {
126-
padding: 0;
127-
.el-dialog__header {
128-
padding: 24px 24px 0 24px;
129-
}
130-
.el-dialog__body {
131-
padding: 8px !important;
132-
}
133-
.el-dialog__footer {
134-
padding: 0 24px 24px;
135-
}
136-
}
131+
// .select-knowledge-dialog {
132+
// padding: 0;
133+
// .el-dialog__header {
134+
// padding: 24px 24px 0 24px;
135+
// }
136+
// .el-dialog__body {
137+
// padding: 8px !important;
138+
// }
139+
// .el-dialog__footer {
140+
// padding: 0 24px 24px;
141+
// }
142+
// }
137143
</style>

‎ui/src/views/paragraph/component/SelectDocumentDialog.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ function getDocument(id: string) {
121121
}
122122
123123
function getDataset() {
124-
knowledge.asyncGetRootKnowledge(loading).then((res: any) => {
124+
knowledge.asyncGetFolderKnowledge(loading).then((res: any) => {
125125
datasetList.value = res.data
126126
})
127127
}

‎ui/src/views/resource-management/document/component/SelectKnowledgeDialog.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ const submitHandle = () => {
9292
}
9393
9494
function getKnowledge() {
95-
knowledge.asyncGetRootKnowledge(loading).then((res: any) => {
95+
knowledge.asyncGetFolderKnowledge(loading).then((res: any) => {
9696
knowledgeList.value = res.data?.filter((v: any) => v.id !== id)
9797
})
9898
}

‎ui/src/views/resource-management/paragraph/component/SelectDocumentDialog.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ function getDocument(id: string) {
121121
}
122122
123123
function getDataset() {
124-
knowledge.asyncGetRootKnowledge(loading).then((res: any) => {
124+
knowledge.asyncGetFolderKnowledge(loading).then((res: any) => {
125125
datasetList.value = res.data
126126
})
127127
}

0 commit comments

Comments
 (0)