Skip to content

Commit 4b3bc55

Browse files
committed
fix: Knowledge export error
1 parent 8cdacdb commit 4b3bc55

File tree

2 files changed

+41
-3
lines changed

2 files changed

+41
-3
lines changed

apps/knowledge/serializers/knowledge.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -633,6 +633,8 @@ def _get_knowledge_workbook(data_dict: dict, document_dict: dict, doc_tag_map: d
633633
data = [header]
634634
for row_idx, row in enumerate(rows):
635635
para_active = para_active_list[row_idx] if row_idx < len(para_active_list) else '1'
636+
# None 转为 ''
637+
row = [col if col is not None else '' for col in row]
636638
if row_idx == 0:
637639
data.append(
638640
[*row, tags_str, hit_method, similarity, is_active, para_active, doc_type, doc_meta])
@@ -787,9 +789,9 @@ def import_knowledge(self, file, is_import_tool=False, with_valid=True):
787789
doc_tags_map[document_id] = tags_str
788790
# 逐行创建 para + problem
789791
for row_idx, row in enumerate(rows):
790-
title = row[0] or '' if len(row) > 0 else ''
791-
content = row[1] or '' if len(row) > 1 else ''
792-
problems_str = row[2] or '' if len(row) > 2 else ''
792+
title = str(row[0]) if len(row) > 0 and row[0] is not None else ''
793+
content = str(row[1]) if len(row) > 1 and row[1] is not None else ''
794+
problems_str = str(row[2]) if len(row) > 2 and row[2] is not None else ''
793795
para_is_active = row[7] if len(row) > 7 and row[7] else '1'
794796

795797
# 图片 link 替换

ui/src/views/knowledge/component/KnowledgeListContainer.vue

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,7 @@
310310
{{ $t('common.moveTo') }}
311311
</el-dropdown-item>
312312

313+
<<<<<<< Updated upstream
313314
<el-dropdown-item
314315
@click.stop="
315316
router.push({
@@ -342,6 +343,41 @@
342343
<AppIcon iconName="app-export" class="color-secondary"></AppIcon
343344
>{{ $t('views.document.setting.export') }} 知识库
344345
</el-dropdown-item>
346+
=======
347+
<el-dropdown-item
348+
@click.stop="
349+
router.push({
350+
path: `/knowledge/${item.id}/${folder.currentFolder.id || 'shared'}/${item.type}/setting`,
351+
})
352+
"
353+
v-if="permissionPrecise.edit(item.id)"
354+
>
355+
<AppIcon iconName="app-setting" class="color-secondary"></AppIcon>
356+
{{ $t('common.setting') }}
357+
</el-dropdown-item>
358+
<el-dropdown-item
359+
@click.stop="exportKnowledge(item)"
360+
v-if="permissionPrecise.export(item.id)"
361+
>
362+
<AppIcon iconName="app-export" class="color-secondary"></AppIcon
363+
>{{ $t('views.document.setting.export') }} Excel
364+
</el-dropdown-item>
365+
<el-dropdown-item
366+
@click.stop="exportZipKnowledge(item)"
367+
v-if="permissionPrecise.export(item.id)"
368+
>
369+
<AppIcon iconName="app-export" class="color-secondary"></AppIcon
370+
>{{ $t('views.document.setting.export') }} ZIP</el-dropdown-item
371+
>
372+
<el-dropdown-item
373+
@click.stop="exportKnowledgeBundle(item)"
374+
v-if="permissionPrecise.export(item.id)"
375+
>
376+
<AppIcon iconName="app-export" class="color-secondary"></AppIcon
377+
>{{ $t('views.document.setting.export') }}
378+
{{ $t('views.knowledge.title') }}
379+
</el-dropdown-item>
380+
>>>>>>> Stashed changes
345381

346382
<el-dropdown-item
347383
type="danger"

0 commit comments

Comments
 (0)