From 4b3bc551f0b25916c651acfebe369bc3cbf63508 Mon Sep 17 00:00:00 2001
From: zhangzhanwei <zhanwei.zhang@fit2cloud.com>
Date: Thu, 2 Apr 2026 11:13:50 +0800
Subject: [PATCH] fix: Knowledge export error

---
 apps/knowledge/serializers/knowledge.py       |  8 +++--
 .../component/KnowledgeListContainer.vue      | 36 +++++++++++++++++++
 2 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/apps/knowledge/serializers/knowledge.py b/apps/knowledge/serializers/knowledge.py
index 7d630ea8953..e83166f504f 100644
--- a/apps/knowledge/serializers/knowledge.py
+++ b/apps/knowledge/serializers/knowledge.py
@@ -633,6 +633,8 @@ def _get_knowledge_workbook(data_dict: dict, document_dict: dict, doc_tag_map: d
                 data = [header]
                 for row_idx, row in enumerate(rows):
                     para_active = para_active_list[row_idx] if row_idx < len(para_active_list) else '1'
+                    # None 转为 ''
+                    row = [col if col is not None else '' for col in row]
                     if row_idx == 0:
                         data.append(
                             [*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):
                     doc_tags_map[document_id] = tags_str
                 # 逐行创建 para + problem
                 for row_idx, row in enumerate(rows):
-                    title = row[0] or '' if len(row) > 0 else ''
-                    content = row[1] or '' if len(row) > 1 else ''
-                    problems_str = row[2] or '' if len(row) > 2 else ''
+                    title = str(row[0]) if len(row) > 0 and row[0] is not None else ''
+                    content = str(row[1]) if len(row) > 1 and row[1] is not None else ''
+                    problems_str = str(row[2]) if len(row) > 2 and row[2] is not None else ''
                     para_is_active = row[7] if len(row) > 7 and row[7] else '1'
 
                     # 图片 link 替换
diff --git a/ui/src/views/knowledge/component/KnowledgeListContainer.vue b/ui/src/views/knowledge/component/KnowledgeListContainer.vue
index 6fc8e673e86..46585ca59ce 100644
--- a/ui/src/views/knowledge/component/KnowledgeListContainer.vue
+++ b/ui/src/views/knowledge/component/KnowledgeListContainer.vue
@@ -310,6 +310,7 @@
                               {{ $t('common.moveTo') }}
                             </el-dropdown-item>
 
+<<<<<<< Updated upstream
                             <el-dropdown-item
                               @click.stop="
                                 router.push({
@@ -342,6 +343,41 @@
                               <AppIcon iconName="app-export" class="color-secondary"></AppIcon
                               >{{ $t('views.document.setting.export') }} 知识库
                             </el-dropdown-item>
+=======
+                          <el-dropdown-item
+                            @click.stop="
+                              router.push({
+                                path: `/knowledge/${item.id}/${folder.currentFolder.id || 'shared'}/${item.type}/setting`,
+                              })
+                            "
+                            v-if="permissionPrecise.edit(item.id)"
+                          >
+                            <AppIcon iconName="app-setting" class="color-secondary"></AppIcon>
+                            {{ $t('common.setting') }}
+                          </el-dropdown-item>
+                          <el-dropdown-item
+                            @click.stop="exportKnowledge(item)"
+                            v-if="permissionPrecise.export(item.id)"
+                          >
+                            <AppIcon iconName="app-export" class="color-secondary"></AppIcon
+                            >{{ $t('views.document.setting.export') }} Excel
+                          </el-dropdown-item>
+                          <el-dropdown-item
+                            @click.stop="exportZipKnowledge(item)"
+                            v-if="permissionPrecise.export(item.id)"
+                          >
+                            <AppIcon iconName="app-export" class="color-secondary"></AppIcon
+                            >{{ $t('views.document.setting.export') }} ZIP</el-dropdown-item
+                          >
+                          <el-dropdown-item
+                            @click.stop="exportKnowledgeBundle(item)"
+                            v-if="permissionPrecise.export(item.id)"
+                          >
+                            <AppIcon iconName="app-export" class="color-secondary"></AppIcon
+                            >{{ $t('views.document.setting.export') }}
+                            {{ $t('views.knowledge.title') }}
+                          </el-dropdown-item>
+>>>>>>> Stashed changes
 
                             <el-dropdown-item
                               type="danger"