Skip to content

Commit ac6716b

Browse files
dataeaseShudataeaseShu
authored
fix(knowledge base): knowledge base lark upload (#3255)
1 parent 67ec3c1 commit ac6716b

File tree

9 files changed

+284
-121
lines changed

9 files changed

+284
-121
lines changed

‎ui/src/api/knowledge/knowledge.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,13 @@ const importLarkDocument: (
275275
return post(`${prefix}/lark/${knowledge_id}/import`, data, null, loading)
276276
}
277277

278+
const postLarkKnowledge: (data: any, loading?: Ref<boolean>) => Promise<Result<Array<any>>> = (
279+
data,
280+
loading,
281+
) => {
282+
return post(`${prefix}/knowledge/lark/save`, data, null, loading)
283+
}
284+
278285
export default {
279286
getKnowledgeByFolder,
280287
getKnowledgeList,
@@ -294,4 +301,5 @@ export default {
294301

295302
getLarkDocumentList,
296303
importLarkDocument,
304+
postLarkKnowledge,
297305
}

‎ui/src/api/shared/knowledge.ts‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,13 @@ const importLarkDocument: (
333333
return post(`${prefix}/lark/${knowledge_id}/import`, data, null, loading)
334334
}
335335

336+
const postLarkKnowledge: (data: any, loading?: Ref<boolean>) => Promise<Result<Array<any>>> = (
337+
data,
338+
loading,
339+
) => {
340+
return post(`${prefix}/knowledge/lark/save`, data, null, loading)
341+
}
342+
336343
export default {
337344
getKnowledgeByFolder,
338345
getKnowledgeList,
@@ -349,9 +356,6 @@ export default {
349356
postKnowledge,
350357
getKnowledgeModel,
351358
postWebKnowledge,
352-
353-
getLarkDocumentList,
354-
importLarkDocument,
355359
getSharedWorkspaceKnowledge,
356360
getSharedWorkspaceKnowledgePage,
357361
getSharedAuthorizationKnowledgeGet,
@@ -360,4 +364,8 @@ export default {
360364
getSharedAuthorizationToolPost,
361365
getSharedAuthorizationModelGet,
362366
getSharedAuthorizationModelPost,
367+
368+
getLarkDocumentList,
369+
importLarkDocument,
370+
postLarkKnowledge,
363371
}

‎ui/src/assets/knowledge/icon_file-folder_colorful.svg‎

Lines changed: 4 additions & 0 deletions
Loading

‎ui/src/components/app-icon/KnowledgeIcon.vue‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<template>
2-
<el-avatar v-if="type === 1" class="avatar-purple" shape="square" :size="32">
2+
<el-avatar v-if="type === 1" class="avatar-purple" shape="square" :size="size">
33
<img src="@/assets/knowledge/icon_web.svg" style="width: 58%" alt="" />
44
</el-avatar>
55
<el-avatar
66
v-else-if="type === 2"
77
class="avatar-purple"
88
shape="square"
9-
:size="32"
9+
:size="size"
1010
style="background: none"
1111
>
1212
<img src="@/assets/knowledge/logo_lark.svg" style="width: 100%" alt="" />
1313
</el-avatar>
14-
<el-avatar v-else class="avatar-blue" shape="square" :size="32">
14+
<el-avatar v-else class="avatar-blue" shape="square" :size="size">
1515
<img src="@/assets/knowledge/icon_document.svg" style="width: 58%" alt="" />
1616
</el-avatar>
1717
</template>
@@ -22,5 +22,9 @@ const props = defineProps({
2222
type: [String, Number],
2323
default: '',
2424
},
25+
size: {
26+
type: [String, Number],
27+
default: 32,
28+
},
2529
})
2630
</script>

‎ui/src/views/knowledge-shared-system/create-component/CreateLarkKnowledgeDialog.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
<script setup lang="ts">
5555
import { ref, watch, reactive } from 'vue'
5656
import { useRouter, useRoute } from 'vue-router'
57-
import BaseForm from '@/views/knowledge/component/BaseForm.vue'
58-
import KnowledgeApi from '@/api/knowledge/knowledge'
57+
import BaseForm from '@/views/knowledge-shared-system/component/BaseForm.vue'
58+
import KnowledgeApi from '@/api/shared/knowledge'
5959
import { MsgSuccess, MsgAlert } from '@/utils/message'
6060
import { t } from '@/locales'
6161
import { ComplexPermission } from '@/utils/permission/type'
@@ -142,7 +142,7 @@ const submitHandle = async () => {
142142
await DatasetFormRef.value.validate((valid: any) => {
143143
if (valid) {
144144
const obj = { ...BaseFormRef.value.form, ...datasetForm.value }
145-
KnowledgeApi.postLarkKnowledge(obj, loading).then((res) => {
145+
KnowledgeApi.postLarkKnowledge({...obj, embedding_model_id: obj.embedding }, loading).then((res) => {
146146
MsgSuccess(t('common.createSuccess'))
147147
router.push({ path: `/knowledge/${res.data.id}/document` })
148148
emit('refresh')

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ function refreshMigrateParagraph() {}
165165
border: 1px solid #ffffff;
166166
box-shadow: none !important;
167167
position: relative;
168+
overflow: inherit;
168169
&:hover {
169170
background: rgba(31, 35, 41, 0.1);
170171
border: 1px solid #dee0e3;
@@ -173,7 +174,9 @@ function refreshMigrateParagraph() {}
173174
position: absolute;
174175
right: 0;
175176
top: 0;
177+
overflow: inherit;
176178
border: 1px solid #dee0e3;
179+
z-index: 10;
177180
}
178181
}
179182
</style>

‎ui/src/views/paragraph/index.vue‎

Lines changed: 38 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -65,38 +65,39 @@
6565
<div v-else>
6666
<el-scrollbar class="paragraph-scollbar">
6767
<div class="paragraph-detail">
68-
<InfiniteScroll
69-
:size="paragraphDetail.length"
70-
:total="paginationConfig.total"
71-
:page_size="paginationConfig.page_size"
72-
v-model:current_page="paginationConfig.current_page"
73-
@load="getParagraphList"
74-
:loading="loading"
75-
>
76-
<VueDraggable
77-
ref="el"
78-
v-bind:modelValue="paragraphDetail"
79-
:disabled="isBatch === true"
80-
handle=".handle"
81-
:animation="150"
82-
ghostClass="ghost"
83-
@end="onEnd"
68+
<el-checkbox-group v-model="multipleSelection">
69+
<InfiniteScroll
70+
:size="paragraphDetail.length"
71+
:total="paginationConfig.total"
72+
:page_size="paginationConfig.page_size"
73+
v-model:current_page="paginationConfig.current_page"
74+
@load="getParagraphList"
75+
:loading="loading"
8476
>
85-
<el-checkbox-group v-model="multipleSelection">
77+
<VueDraggable
78+
ref="el"
79+
v-model="paragraphDetail"
80+
:disabled="isBatch === true"
81+
handle=".handle"
82+
:animation="150"
83+
ghostClass="ghost"
84+
>
8685
<template v-for="(item, index) in paragraphDetail" :key="item.id">
87-
<!-- 批量操作 -->
88-
<div class="paragraph-card flex" :id="item.id" v-if="isBatch === true">
89-
<el-checkbox :value="item.id" />
90-
<ParagraphCard :data="item" class="mb-8 w-full" />
91-
</div>
92-
<!-- 非批量操作 -->
93-
<div class="handle paragraph-card flex" :id="item.id" v-else>
94-
<img
95-
src="@/assets/sort.svg"
96-
alt=""
97-
height="15"
98-
class="handle-img mr-8 mt-24 cursor"
99-
/>
86+
<div style="display: flex; margin-bottom: 16px">
87+
<!-- 批量操作 -->
88+
<div class="paragraph-card flex" :id="item.id" v-if="isBatch === true">
89+
<el-checkbox :value="item.id" />
90+
<ParagraphCard :data="item" class="mb-8 w-full" />
91+
</div>
92+
<!-- 非批量操作 -->
93+
<div class="handle paragraph-card flex" :id="item.id" v-else>
94+
<img
95+
src="@/assets/sort.svg"
96+
alt=""
97+
height="15"
98+
class="handle-img mr-8 mt-24 cursor"
99+
/>
100+
</div>
100101
<ParagraphCard
101102
:data="item"
102103
class="mb-8 w-full"
@@ -105,9 +106,9 @@
105106
/>
106107
</div>
107108
</template>
108-
</el-checkbox-group>
109-
</VueDraggable>
110-
</InfiniteScroll>
109+
</VueDraggable>
110+
</InfiniteScroll>
111+
</el-checkbox-group>
111112
</div>
112113
</el-scrollbar>
113114
</div>
@@ -341,6 +342,10 @@ onMounted(() => {
341342
height: calc(100vh - 215px);
342343
max-width: 1000px;
343344
margin: 16px auto;
345+
346+
// .el-checkbox-group {
347+
// display: flex;
348+
// }
344349
}
345350
346351
&__main {

0 commit comments

Comments
 (0)