From 153de27df1ec07213ba76e4a3ddbc27c56d3e623 Mon Sep 17 00:00:00 2001
From: Ethan-Zhang <ethanzhang55@outlook.com>
Date: Fri, 24 Oct 2025 11:38:50 +0800
Subject: [PATCH] =?UTF-8?q?Fix:=20=E5=BC=95=E7=94=A8=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=B8=B2=E6=9F=93=E9=97=AE=E9=A2=98&?=
 =?UTF-8?q?=E5=AF=B9=E8=AF=9D=E8=AE=B0=E5=BD=95=E6=9F=A5=E8=AF=A2=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BD=BD=E6=A0=B7=E5=BC=8F&=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E5=AF=B9=E8=AF=9D=E5=BA=94=E7=94=A8=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=BC=BA=E5=88=B6=E4=B8=AD=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/variables/theme.scss        |   2 +
 src/assets/svgs/search_dark.svg               |   1 +
 src/components/JSONMonacoEditor.vue           |  23 +-
 src/components/StartNodeVariableManager.vue   |   2 +-
 src/components/VariableSelector.vue           |   2 +-
 src/components/YAMLMonacoEditor.vue           |   2 +-
 src/components/dialoguePanel/DialogueFlow.vue |  63 ++--
 .../dialoguePanel/DialoguePanel.vue           |  20 +-
 src/components/dialoguePanel/FlowCode.vue     | 114 +------
 src/components/sessionCard/SessionCard.vue    |   1 -
 src/i18n/lang/en.ts                           |  11 +
 src/i18n/lang/zh-cn.ts                        |  11 +
 src/router/index.ts                           |   3 +
 src/store/conversation.ts                     | 128 +++++++-
 src/store/historySession.ts                   | 190 ++++++++----
 src/views/chat/Sender.vue                     |  21 +-
 src/views/chat/index.vue                      | 152 +++++++++-
 src/views/createapp/components/McpDrawer.vue  |   2 +-
 src/views/createapp/components/workFlow.vue   |  27 +-
 .../workFlowConfig/ChoiceBranchDrawer.vue     |   2 +-
 .../workFlowConfig/NodeListPanel.vue          |  20 +-
 .../workFlowConfig/NodeSelector.vue           |  14 +-
 .../workFlowConfig/PluginListPanel.vue        | 160 +++++++---
 .../VariableBasedStartNodeDrawer.vue          |   4 +-
 .../dialogue/components/DialogueAside.vue     |  26 +-
 .../dialogue/components/DialogueSession.vue   | 279 ++++++++++++++++--
 .../dialogue/components/MultiSelectTags.vue   |  61 +++-
 27 files changed, 1000 insertions(+), 341 deletions(-)
 create mode 100644 src/assets/svgs/search_dark.svg

diff --git a/src/assets/styles/variables/theme.scss b/src/assets/styles/variables/theme.scss
index 490de276..0b2e5047 100644
--- a/src/assets/styles/variables/theme.scss
+++ b/src/assets/styles/variables/theme.scss
@@ -115,6 +115,7 @@ body[theme='dark'] {
   --o-fill-color-extra-light: #2a2f37;
   --o-fill-color-light: #343a43;
   --o-color-success: #67c23a;
+  --o-color-success-light-7: #354a2c;
   --o-color-success-light-9: #1f2b1a;
   --o-color-warning: #e6a23c;
   --o-color-warning-light-9: #2b261a;
@@ -248,6 +249,7 @@ body[theme='light'] {
   --o-fill-color-extra-light: #f8f9fa;
   --o-fill-color-light: #f5f7fa;
   --o-color-success: #67c23a;
+  --o-color-success-light-7: rgb(194, 231, 199);
   --o-color-success-light-9: #f0f9ff;
   --o-color-warning: #e6a23c;
   --o-color-warning-light-9: #fdf6ec;
diff --git a/src/assets/svgs/search_dark.svg b/src/assets/svgs/search_dark.svg
new file mode 100644
index 00000000..618cba5b
--- /dev/null
+++ b/src/assets/svgs/search_dark.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1708239719781" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6116" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M865.2 830.1L745.5 710.5c21.4-25.5 38.8-53.9 51.8-84.7 17.5-41.3 26.3-85.2 26.3-130.4s-8.9-89.1-26.3-130.4c-16.9-39.9-41-75.7-71.8-106.4-30.7-30.7-66.6-54.9-106.4-71.8-41.3-17.5-85.2-26.3-130.4-26.3s-89.1 8.9-130.4 26.3c-39.9 16.9-75.7 41-106.4 71.8-30.7 30.7-54.9 66.6-71.8 106.4-17.5 41.3-26.3 85.2-26.3 130.4s8.9 89.1 26.3 130.4c16.9 39.9 41 75.7 71.8 106.4 30.7 30.7 66.6 54.9 106.4 71.8 41.3 17.5 85.2 26.3 130.4 26.3s89.1-8.9 130.4-26.3c33.6-14.2 64.2-33.6 91.4-57.7l119.2 119.2c4.9 4.9 11.3 7.3 17.7 7.3s12.8-2.4 17.7-7.3c9.8-9.8 9.8-25.6 0.1-35.4z m-376.4-49.8c-157 0-284.8-127.8-284.8-284.9s127.8-284.9 284.9-284.9 284.9 127.8 284.9 284.9-127.9 284.9-285 284.9z" p-id="6117" fill="#8d98aa"></path></svg>
diff --git a/src/components/JSONMonacoEditor.vue b/src/components/JSONMonacoEditor.vue
index 809a68b5..529bf4a0 100644
--- a/src/components/JSONMonacoEditor.vue
+++ b/src/components/JSONMonacoEditor.vue
@@ -1,10 +1,5 @@
 <template>
   <div class="json-monaco-editor">
-    <!-- 简化调试信息 -->
-    <div v-if="props.modelValue && props.modelValue.trim() !== '{}'" style="background: #e0f7fa; padding: 2px; font-size: 9px; color: #666;">
-      📝 {{ props.modelValue.length }}
-    </div>
-    
     <div 
       ref="editorContainer" 
       class="editor-container"
@@ -91,6 +86,8 @@ const initMonacoEditor = async () => {
       'editor.background': '#1E1E1E',
       'editor.foreground': '#D4D4D4',
       'editorLineNumber.foreground': '#858585',
+      'editorLineNumber.background': '#1E1E1E',
+      'editorGutter.background': '#1E1E1E',
       'editor.selectionBackground': '#264F78',
       'editor.lineHighlightBackground': '#2A2D2E'
     }
@@ -258,7 +255,7 @@ defineExpose({
 <style lang="scss" scoped>
 .json-monaco-editor {
   .editor-container {
-    border: 1px solid var(--el-border-color);
+    border: 1px solid var(--o-border-color);
     border-radius: 4px;
     overflow: hidden;
     min-height: 120px; // 确保最小高度
@@ -292,11 +289,21 @@ defineExpose({
 :deep(.monaco-editor) {
   &.vs-dark {
     .margin {
-      background-color: #1e1e1e;
+      background-color: #1e1e1e !important;
+    }
+    
+    .margin-view-overlays {
+      background-color: #1e1e1e !important;
     }
     
     .monaco-editor-background {
-      background-color: #1e1e1e;
+      background-color: #1e1e1e !important;
+    }
+    
+    // 确保行号区域背景色正确
+    .line-numbers {
+      background-color: #1e1e1e !important;
+      color: #858585 !important;
     }
   }
 }
diff --git a/src/components/StartNodeVariableManager.vue b/src/components/StartNodeVariableManager.vue
index a800419c..89064908 100644
--- a/src/components/StartNodeVariableManager.vue
+++ b/src/components/StartNodeVariableManager.vue
@@ -584,7 +584,7 @@ onMounted(() => {
         background-color: var(--el-fill-color-extra-light);
         padding: 2px 6px;
         border-radius: 4px;
-        border: 1px solid var(--el-border-color);
+        border: 1px solid var(--o-border-color);
       }
       
       .variable-reference {
diff --git a/src/components/VariableSelector.vue b/src/components/VariableSelector.vue
index cb12f156..2334789a 100644
--- a/src/components/VariableSelector.vue
+++ b/src/components/VariableSelector.vue
@@ -589,7 +589,7 @@ watch([() => props.flowId, () => props.conversationId, () => props.currentStepId
             background-color: var(--el-fill-color-extra-light);
             padding: 2px 6px;
             border-radius: 4px;
-            border: 1px solid var(--el-border-color);
+            border: 1px solid var(--o-border-color);
             
             body[theme='dark'] & {
               background-color: #1f2329;
diff --git a/src/components/YAMLMonacoEditor.vue b/src/components/YAMLMonacoEditor.vue
index 88837528..ef8c61d4 100644
--- a/src/components/YAMLMonacoEditor.vue
+++ b/src/components/YAMLMonacoEditor.vue
@@ -217,7 +217,7 @@ defineExpose({
   .editor-container {
     height: 100%;
     width: 100%;
-    border: 1px solid var(--el-border-color);
+    border: 1px solid var(--o-border-color);
     border-radius: 4px;
     overflow: hidden;
     
diff --git a/src/components/dialoguePanel/DialogueFlow.vue b/src/components/dialoguePanel/DialogueFlow.vue
index ba127f4d..0eaed35b 100644
--- a/src/components/dialoguePanel/DialogueFlow.vue
+++ b/src/components/dialoguePanel/DialogueFlow.vue
@@ -326,7 +326,7 @@ watch(
           :description="item?.reason"
           show-icon
           :closable="false"
-          style="background: #FBF6E5;"
+          :style="{ background: 'var(--o-color-warning-light-9)' }"
         />
         <div class="flow-button" v-if="taskId && exData">
           <el-button @click="doFlow(false)">
@@ -386,15 +386,15 @@ watch(
   border-radius: 0px !important;
 }
 .demo-collapse.border-red .title .el-collapse-item__header:first-child {
-  background-color: rgb(247, 193, 193);
+  background-color: var(--o-color-danger-light-9);
   border-radius: 0px !important;
 }
 .demo-collapse.border-green .title .el-collapse-item__header:first-child {
-  background-color: rgb(194, 231, 199);
+  background-color: var(--o-color-success-light-7);
   border-radius: 0px !important;
 }
 .demo-collapse.border-grey .title .el-collapse-item__header:first-child {
-  background-color: rgb(208, 211, 216);
+  background-color: var(--o-fill-color-light);
   border-radius: 0px !important;
 }
 .o-collapse-icon {
@@ -405,7 +405,8 @@ watch(
 }
 
 .o-collapse-content:hover {
-  background-color: var(--o-bg-color-light);
+  background-color: var(--o-fill-color-extra-light);
+  transition: background-color 0.2s ease;
 }
 .normal {
   border-bottom: 1px dashed var(--o-border-color-lighter) !important;
@@ -414,11 +415,15 @@ watch(
     height: 40px;
     line-height: 40px;
     font-size: 14px;
-    color: #303133;
+    color: var(--o-text-color-primary);
     cursor: pointer;
   }
   .el-collapse-item__header::after {
-    background-color: var(--o-bg-color-light2) !important;
+    background-color: var(--o-fill-color-light) !important;
+  }
+  .el-collapse-item__header:hover {
+    background-color: var(--o-fill-color-extra-light);
+    transition: background-color 0.2s ease;
   }
 }
 .o-nest-collapse {
@@ -428,7 +433,7 @@ watch(
 }
 .title {
   .el-collapse-item__wrap {
-    background-color: var(--o-bg-color-light2);
+    background-color: var(--o-fill-color-light);
   }
   .el-collapse-item__header {
     padding-left: 8px;
@@ -492,19 +497,19 @@ watch(
 }
 
 .border-red {
-  border: 1px solid #f7c1c1;
+  border: 1px solid var(--o-color-danger);
 }
 
 .border-green {
-  border: 1px solid #c2e7c7;
+  border: 1px solid var(--o-color-success);
 }
 
 .border-blue {
   border: 1px solid transparent;
   border-radius: 4px;
   background:
-    linear-gradient(white, white) padding-box,
-    linear-gradient(180deg, #6c77fa, #6db9f9) border-box;
+    linear-gradient(var(--o-bg-color-base), var(--o-bg-color-base)) padding-box,
+    linear-gradient(180deg, var(--o-color-primary), var(--o-color-primary-light-3)) border-box;
 }
 .demo-collapse {
   margin-bottom: 16px;
@@ -523,11 +528,6 @@ watch(
   display: flex;
   height: auto;
   width: 100%;
-  background-color: linear-gradient(
-    127.95deg,
-    rgba(109, 227, 250, 0.2) -1.967%,
-    rgba(90, 179, 255, 0.2) 98.202%
-  );
   border-radius: 8px;
   border-top-left-radius: 0px;
   margin-left: 8px;
@@ -591,27 +591,24 @@ watch(
   border-radius: 4px;
 }
 .totalTime.errorBg {
-  background-color: rgba(227, 32, 32, 0.2);
+  background-color: var(--o-color-danger-light-9);
 }
 .totalTime.cancelledBg {
-  background-color: rgba(208, 211, 216, 0.2);
+  background-color: var(--o-fill-color-light);
 }
-.border-grey {
-  border: 1px solid #d0d3d8;
+.totalTime.successBg {
+  background-color: var(--o-color-success-light-9);
 }
-
-.border-red {
-  border: 1px solid #f7c1c1;
+.time .successBg {
+  background-color: var(--o-color-success-light-9);
 }
-
-.border-green {
-  border: 1px solid #c2e7c7;
+.time .errorBg {
+  background-color: var(--o-color-danger-light-9);
 }
-
-.border-blue {
-  border: 1px solid transparent;
-  border-radius: 4px;
-  background: linear-gradient(white, white) padding-box,
-    linear-gradient(180deg, #6c77fa, #6db9f9) border-box;
+.time .cancelledBg {
+  background-color: var(--o-fill-color-light);
+}
+.border-grey {
+  border: 1px solid var(--o-border-color);
 }
 </style>
diff --git a/src/components/dialoguePanel/DialoguePanel.vue b/src/components/dialoguePanel/DialoguePanel.vue
index 138fae2f..e889eac1 100644
--- a/src/components/dialoguePanel/DialoguePanel.vue
+++ b/src/components/dialoguePanel/DialoguePanel.vue
@@ -109,6 +109,7 @@ const props = withDefaults(defineProps<DialoguePanelProps>(), {
   needRegernerate: false,
 });
 
+
 // 🔑 目标分支：emits定义
 const emits = defineEmits<{
   (e: 'handleReport', qaRecordId: string, reason_type: string, reason?: string): void;
@@ -170,15 +171,24 @@ provide('registerFileAttachments', registerFileAttachments);
 const generateContent = (content: string) => {
   if (!content) return '';
   let result = '';
+  
   props.fileList?.forEach((file) => {
-    if (file.documentOrder === Number(content)) {
-      result += `<img src="${typeSvgMap[file?.documentType]}" crossOrigin="anonymous" alt="">`;
-      result += `<div class="tooltip-name">${file?.documentName || ''}</div>`;
+    // 兼容两种数据格式：格式化后的 documentOrder 和原始的 order
+    const fileOrder = file.documentOrder || file.order;
+    
+    if (fileOrder === Number(content)) {
+      // 兼容两种数据格式的字段名
+      const documentType = file.documentType || file.type;
+      const documentName = file.documentName || file.name;
+      const documentAbstract = file.documentAbstract || file.abstract;
+      
+      result += `<img src="${typeSvgMap[documentType]}" crossOrigin="anonymous" alt="">`;
+      result += `<div class="tooltip-name">${documentName || ''}</div>`;
       result = `<div class="tooltip-title">${result}</div>`;
-      result += `<div class="tooltip-abstract">${file?.documentAbstract || ''}</div>`;
+      result += `<div class="tooltip-abstract">${documentAbstract || ''}</div>`;
     }
   });
-  console.log('生成的内容:', result);
+  
   result = `<div class="tooltip-container">${result}</div>`;
   return result;
 };
diff --git a/src/components/dialoguePanel/FlowCode.vue b/src/components/dialoguePanel/FlowCode.vue
index f4d4c2a9..5a02a329 100644
--- a/src/components/dialoguePanel/FlowCode.vue
+++ b/src/components/dialoguePanel/FlowCode.vue
@@ -3,13 +3,13 @@ import { ref, watch, computed, nextTick, onMounted, onBeforeUnmount, inject } fr
 import JSONMonacoEditor from '@/components/JSONMonacoEditor.vue';
 import { storeToRefs } from 'pinia';
 import { useChangeThemeStore, useHistorySessionStore } from '@/store/';
+import { ElMessage } from 'element-plus';
 
 const { params } = storeToRefs(useHistorySessionStore());
 const themeStore = useChangeThemeStore();
 
 // 🔑 注入全局文件附件注册函数
 const registerFileAttachment = inject<(file: any) => void>('registerFileAttachment', () => {});
-const registerFileAttachments = inject<(files: any[]) => void>('registerFileAttachments', () => {});
 
 const CODE_STYLE = {
   width: '100%',
@@ -38,7 +38,6 @@ const props = withDefaults(
 const code = ref('');
 const monacoEditorRef = ref();
 const showMonacoEditor = ref(false);
-const useTextarea = ref(false);
 const fileAttachments = ref<any[]>([]);
 
 // 计算属性：判断是否为错误状态
@@ -65,41 +64,11 @@ const displayError = computed(() => {
   return '';
 });
 
-// 🔑 获取当前对话ID的函数
-const getCurrentConversationId = (): string => {
-  // 尝试从多个可能的来源获取对话ID
-  const urlParams = new URLSearchParams(window.location.search);
-  const conversationId = urlParams.get('conversation_id') || 
-                         sessionStorage.getItem('currentConversationId') ||
-                         localStorage.getItem('currentConversationId') ||
-                         (window as any).currentConversationId ||
-                         Date.now().toString(); // 如果都没有，生成一个基于时间的ID
-  return conversationId;
-};
-
-// 🔑 每个FlowCode组件实例的唯一ID（只生成一次）
-const panelInstanceId = `panel_${Date.now()}_${Math.random().toString(36).substr(2, 9)}`;
-
-// 🔑 获取当前DialoguePanel实例ID的函数
-const getCurrentPanelInstanceId = (): string => {
-  return panelInstanceId;
-};
-
 let updateTimer: NodeJS.Timeout | null = null;
 let lastUpdateTime = 0;
 const UPDATE_DEBOUNCE_DELAY = 300; // 防抖延迟
 const MIN_UPDATE_INTERVAL = 100; // 最小更新间隔
 
-// 全局Monaco Editor实例计数器和限制
-const MAX_MONACO_INSTANCES = 5; // 最大同时存在的Monaco Editor实例数
-let globalMonacoInstanceCount = 0;
-
-// 获取全局实例计数
-const getGlobalMonacoCount = () => {
-  const containers = document.querySelectorAll('.monaco-editor');
-  return containers.length;
-};
-
 // 智能处理不同类型的数据
 const formatCodeData = (data: any) => {
   
@@ -275,19 +244,6 @@ const formatCodeData = (data: any) => {
   return String(data);
 };
 
-// 检查是否应该使用Monaco Editor
-const shouldUseMonacoEditor = () => {
-  const currentCount = getGlobalMonacoCount();
-  const codeLength = code.value?.length || 0;
-  
-  // 如果当前Monaco实例太多，或代码量小，使用textarea
-  if (currentCount >= MAX_MONACO_INSTANCES || codeLength < 100) {
-    return false;
-  }
-  
-  return true;
-};
-
 // 防抖更新Monaco编辑器
 const debouncedUpdateEditor = (newValue: string) => {
   const now = Date.now();
@@ -323,27 +279,12 @@ const debouncedUpdateEditor = (newValue: string) => {
 // 初始化数据
 code.value = formatCodeData(props.code);
 
-// 延迟决定是否显示Monaco Editor
-onMounted(() => {
-  // 延迟100ms后决定使用哪种编辑器
-  setTimeout(() => {
-    if (shouldUseMonacoEditor()) {
-      showMonacoEditor.value = true;
-      useTextarea.value = false;
-    } else {
-      showMonacoEditor.value = false;
-      useTextarea.value = true;
-    }
-  }, 100);
-});
-
 const currentTheme = computed(() => {
   return themeStore.theme === 'dark' ? 'dark' : 'light';
 });
 
 const handleReady = (payload: any) => {
   monacoEditorRef.value = payload.editor;
-  globalMonacoInstanceCount++;
   
   // 确保编辑器显示当前内容（初始化时不需要防抖）
   if (payload.editor && code.value) {
@@ -365,18 +306,6 @@ const handleChange = (value: string) => {
   params.value = value;
 };
 
-// 安全的强制刷新编辑器
-const forceRefresh = () => {
-  if (monacoEditorRef.value) {
-    try {
-      // 只触发布局更新，不重新设置值
-      monacoEditorRef.value.layout && monacoEditorRef.value.layout();
-    } catch (error) {
-      console.error('Monaco编辑器刷新失败:', error);
-    }
-  }
-};
-
 const copy = () => {
   const textToCopy = code.value || JSON.stringify(props.code, null, 2);
   
@@ -384,7 +313,7 @@ const copy = () => {
     navigator.clipboard
       .writeText(textToCopy)
       .then(() => {
-        // 移除成功日志
+        ElMessage.success('复制成功');
       })
       .catch((err) => {
         console.error('复制文本时出错:', err);
@@ -402,9 +331,15 @@ const fallbackCopy = (text: string) => {
   textArea.focus();
   textArea.select();
   try {
-    document.execCommand('copy');
+    const successful = document.execCommand('copy');
+    if (successful) {
+      ElMessage.success('复制成功');
+    } else {
+      ElMessage.error('复制失败');
+    }
   } catch (err) {
     console.error('降级复制方法也失败了:', err);
+    ElMessage.error('复制失败');
   }
   document.body.removeChild(textArea);
 };
@@ -439,10 +374,6 @@ onBeforeUnmount(() => {
     clearTimeout(updateTimer);
     updateTimer = null;
   }
-  
-  if (monacoEditorRef.value) {
-    globalMonacoInstanceCount = Math.max(0, globalMonacoInstanceCount - 1);
-  }
 });
 </script>
 
@@ -456,12 +387,6 @@ onBeforeUnmount(() => {
       </span>
       <span v-else-if="props.title === 'params'">{{ $t('flow.params')}}</span>
       <span v-else>{{ $t('flow.supplementaryParameters')}} {{ props.title }}</span>
-      <span
-        v-if="showMonacoEditor"
-        @click="forceRefresh()"
-        style="cursor: pointer; margin-right: 8px; font-size: 12px; color: #666; padding: 2px 4px; border-radius: 3px; background: #f0f0f0;"
-        title="刷新编辑器"
-      >🔄</span>
       <span
         @click="copy()"
         class="copyIcon"
@@ -481,14 +406,8 @@ onBeforeUnmount(() => {
     </div>
     
     <div class="code-container" :class="{ 'error-state': isErrorState }">
-      <!-- 调试信息：显示当前数据和编辑器类型 -->
-      <div v-if="code && code.trim() !== '{}'" style="background: #e8f5e8; padding: 4px; font-size: 10px; border-bottom: 1px solid #ccc; color: #666;">
-        {{ isErrorState ? '❌' : '✅' }} 数据: {{ code.length }} 字符 | {{ showMonacoEditor ? 'Monaco' : 'Textarea' }}
-      </div>
-      
       <!-- Monaco Editor（当实例数量允许时） -->
       <JSONMonacoEditor
-        v-if="showMonacoEditor"
         v-model="code"
         placeholder="Code goes here..."
         :style="CODE_STYLE"
@@ -498,21 +417,6 @@ onBeforeUnmount(() => {
         @ready="handleReady"
         @change="handleChange"
       />
-      
-      <!-- 降级Textarea（当Monaco实例太多时） -->
-      <textarea
-        v-else-if="useTextarea"
-        v-model="code"
-        :disabled="props.disabled"
-        placeholder="Code goes here..."
-        style="width: 100%; height: 100%; max-height: 200px; overflow-y: auto; font-size: 14px; line-height: 16px; border: none; outline: none; resize: none; font-family: monospace; padding: 8px; background-color: transparent;"
-        @input="handleChange(($event.target as HTMLTextAreaElement).value)"
-      />
-      
-      <!-- 加载状态 -->
-      <div v-else style="padding: 20px; text-align: center; color: #666;">
-        加载中...
-      </div>
     </div>
     
     <!-- 🔑 文件附件已移至DialoguePanel统一显示，不在FlowCode组件内显示 -->
diff --git a/src/components/sessionCard/SessionCard.vue b/src/components/sessionCard/SessionCard.vue
index 9384c130..39ce9a51 100644
--- a/src/components/sessionCard/SessionCard.vue
+++ b/src/components/sessionCard/SessionCard.vue
@@ -120,7 +120,6 @@ const deleteOne = (name: string, list: string[]) => {
 <template>
   <div
     class="conversation-card"
-    :style="isAnswerGenerating ? 'cursor: not-allowed' : 'cursor: pointer'"
     @mouseleave="handleLeave"
   >
     <div class="conversation-card-item">
diff --git a/src/i18n/lang/en.ts b/src/i18n/lang/en.ts
index 49477552..6f3db55e 100644
--- a/src/i18n/lang/en.ts
+++ b/src/i18n/lang/en.ts
@@ -20,6 +20,17 @@ export default {
     setting: '设置',
     reply: 'Reply',
   },
+  conversation: {
+    interrupt_title: 'Interrupt Conversation',
+    interrupt_warning: 'A conversation is currently in progress. Exiting will interrupt the current conversation. Are you sure you want to continue?',
+    loading_history: 'Loading conversation history...',
+    guard: {
+      title: 'Confirm Leave',
+      message: 'A conversation is currently in progress. Leaving the page will interrupt the conversation. Are you sure you want to leave?',
+      confirm: 'Leave',
+      cancel: 'Cancel',
+    },
+  },
   settings: {
     model: 'Model',
     setting: 'Settings',
diff --git a/src/i18n/lang/zh-cn.ts b/src/i18n/lang/zh-cn.ts
index 75b8e30a..fcdaa7b9 100644
--- a/src/i18n/lang/zh-cn.ts
+++ b/src/i18n/lang/zh-cn.ts
@@ -19,6 +19,17 @@ export default {
     setting: '设置',
     reply: '回复',
   },
+  conversation: {
+    interrupt_title: '中断对话',
+    interrupt_warning: '当前对话正在进行中，退出将会中断当前对话。确定要继续吗？',
+    loading_history: '正在加载历史对话...',
+    guard: {
+      title: '确认离开',
+      message: '当前有对话正在进行中，离开页面将中断对话。确定要离开吗？',
+      confirm: '确定离开',
+      cancel: '取消',
+    },
+  },
   settings: {
     model: '模型',
     setting: '设置',
diff --git a/src/router/index.ts b/src/router/index.ts
index 1fa0a405..4a6fef10 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -81,4 +81,7 @@ const router = createRouter({
   routes,
 });
 
+// 移除路由拦截逻辑，改为在页面销毁时自动停止对话生成
+// router.beforeEach 已被移除，现在依赖组件的 onBeforeUnmount 生命周期
+
 export default router;
diff --git a/src/store/conversation.ts b/src/store/conversation.ts
index a28a27e6..7cb10272 100644
--- a/src/store/conversation.ts
+++ b/src/store/conversation.ts
@@ -8,8 +8,9 @@
 // PURPOSE.
 // See the Mulan PSL v2 for more details.
 import { defineStore } from 'pinia';
-import { ref } from 'vue';
+import { ref, nextTick } from 'vue';
 import { fetchEventSource } from '@microsoft/fetch-event-source';
+// conversationGuard 已移除，不再使用路由拦截逻辑
 
 import { useHistorySessionStore, useLangStore } from 'src/store';
 import {
@@ -65,6 +66,9 @@ export const useSessionStore = defineStore('conversation', () => {
   const appList = ref<Application[]>();
   // ai回复是否还在生成中
   const isAnswerGenerating = ref(false);
+  
+  // 历史对话加载状态
+  const isLoadingHistory = ref(false);
 
   const currentTaskId = ref<string | null>(null);
 
@@ -205,6 +209,7 @@ export const useSessionStore = defineStore('conversation', () => {
       }
       conversationItem.isFinish = true;
       isAnswerGenerating.value = false;
+      // 对话拦截状态管理已移除
       // 如果是工作流的调试功能-调试对话结束时-发送调试对话结束
       if (isFlowDebug) {
         $bus.emit('debugChatEnd');
@@ -297,8 +302,10 @@ export const useSessionStore = defineStore('conversation', () => {
     msgData: Record<string, unknown>,
     conversationItem: RobotConversationItem,
   ) => {
-    if (isPaused.value) {
-      // 手动暂停输出
+    // 🔑 关键修复：检查暂停状态和生成状态，双重保险
+    if (isPaused.value || !isAnswerGenerating.value) {
+      // 手动暂停输出或已停止生成
+      console.log('🛑 [handleMsgDataShow] 检测到暂停状态或已停止生成，忽略消息处理');
       isAnswerGenerating.value = false;
       return;
     }
@@ -578,7 +585,7 @@ export const useSessionStore = defineStore('conversation', () => {
         await funcFetch.fetchHistory(streamUrl, params, pp, fetchParams);
       } else if (params.user_selected_app) {
         // 新的工作流调试记录
-        await funcFetch.fetchAppNew(streamUrl, params, pp, fetchParams);
+        await funcFetch.fetchAppNew(streamUrl, params, pp, fetchParams, false);
       } else if (waitType) {
         if (waitType === 'params') {
           await funcFetch.fetchWait(streamUrl, params, pp, fetchParams);
@@ -649,6 +656,16 @@ export const useSessionStore = defineStore('conversation', () => {
     waitType?: string,
     isDebug?: boolean,
   ): Promise<void> => {
+    // 如果当前有对话正在生成，先停止它
+    if (isAnswerGenerating.value) {
+      forceStopGeneration();
+      // 等待一小段时间确保停止操作完成
+      await new Promise(resolve => setTimeout(resolve, 100));
+    }
+    
+    // 重置暂停状态，确保新对话可以正常发送
+    isPaused.value = false;
+    
     const { updateSessionTitle, currentSelectedSession } =
       useHistorySessionStore();
     if (conversationList.value.length === 0) {
@@ -698,6 +715,7 @@ export const useSessionStore = defineStore('conversation', () => {
       );
     }
     isAnswerGenerating.value = true;
+    // 对话拦截状态管理已移除
     scrollToBottom(true);
 
     let getStreamParams: Parameters<typeof getStream>[0] = {
@@ -745,6 +763,7 @@ export const useSessionStore = defineStore('conversation', () => {
     const resp = await api.stopGeneration(currentTaskId.value || '');
     if (resp?.[1]?.code === 200) {
       isAnswerGenerating.value = false;
+      // 对话拦截状态管理已移除
     }
   };
 
@@ -830,12 +849,19 @@ export const useSessionStore = defineStore('conversation', () => {
   /**
    * 获取历史对话数据
    * @param conversationId
+   * @param manageLoadingState 是否由此方法管理loading状态，默认为true
    */
-  const getConversation = async (conversationId: string): Promise<void> => {
-    const [err, res] = await api.getHistoryConversation(conversationId);
-    if (!err && res) {
-      conversationList.value = [];
-      const cList = conversationList.value as RobotConversationItem[];
+  const getConversation = async (conversationId: string, manageLoadingState: boolean = true): Promise<void> => {
+    // 如果需要管理loading状态，则设置为true
+    if (manageLoadingState) {
+      isLoadingHistory.value = true;
+    }
+    
+    try {
+      const [err, res] = await api.getHistoryConversation(conversationId);
+      if (!err && res) {
+        conversationList.value = [];
+        const cList = conversationList.value as RobotConversationItem[];
       res.result.records.forEach((record) => {
         const targetRecord = cList.find((i) => i.groupId === record.groupId);
         if (targetRecord) {
@@ -879,7 +905,7 @@ export const useSessionStore = defineStore('conversation', () => {
             conversationId: record.conversationId,
             groupId: record.groupId,
             metadata: record.metadata,
-            document: record.document,
+            files: record.document,
             flowdata: record?.flow
               ? (generateFlowData(record.flow) as FlowType)
               : undefined,
@@ -887,6 +913,16 @@ export const useSessionStore = defineStore('conversation', () => {
         );
         scrollToBottom();
       });
+      
+      // 🔑 重要：确保DOM更新后再滚动到底部
+      await nextTick();
+      scrollToBottom(true);
+      }
+    } catch (error) {
+      console.error('获取历史对话失败:', error);
+    } finally {
+      // 无论成功或失败都重置加载状态
+      isLoadingHistory.value = false;
     }
   };
 
@@ -937,6 +973,7 @@ export const useSessionStore = defineStore('conversation', () => {
     const resp = await api.stopGeneration(currentTaskId.value || '');
     if (resp?.[1]?.code === 200) {
       isAnswerGenerating.value = false;
+      // 对话拦截状态管理已移除
     }
   };
 
@@ -944,10 +981,80 @@ export const useSessionStore = defineStore('conversation', () => {
     controller.abort();
   };
 
+  // 强制停止对话生成 - 用于页面销毁时清理
+  const forceStopGeneration = (): void => {
+    console.log('🛑 [forceStopGeneration] 开始强制停止对话生成，当前状态:', isAnswerGenerating.value);
+    
+    if (isAnswerGenerating.value) {
+      // 🔑 立即设置状态，阻止新的流式数据处理
+      isPaused.value = true;
+      isAnswerGenerating.value = false;
+      
+      // 立即取消当前请求
+      cancel();
+      
+      // 🔑 关键修复：确保最后一个对话项标记为完成，允许后续发送
+      if (conversationList.value.length > 0) {
+        const lastItem = conversationList.value[conversationList.value.length - 1] as RobotConversationItem;
+        if (lastItem && lastItem.belong === 'robot' && !lastItem.isFinish) {
+          lastItem.isFinish = true;
+          // 添加中断标记
+          if (lastItem.message && Array.isArray(lastItem.message)) {
+            lastItem.message[lastItem.currentInd || 0] += ' [已中断]';
+          }
+          console.log('✅ [forceStopGeneration] 已标记最后一个对话项为完成状态');
+        }
+      }
+      
+      // 🔑 新增：调用后端停止接口，使用Promise但不等待响应
+      if (currentTaskId.value) {
+        console.log('🔄 [forceStopGeneration] 调用后端停止接口，taskId:', currentTaskId.value);
+        
+        // 使用api.stopGeneration但不等待响应
+        api.stopGeneration(currentTaskId.value).then(([error, response]) => {
+          if (!error && response?.code === 200) {
+            console.log('✅ [forceStopGeneration] 后端停止成功');
+          } else {
+            console.warn('⚠️ [forceStopGeneration] 后端停止失败:', error);
+          }
+        }).catch((err) => {
+          console.warn('⚠️ [forceStopGeneration] 后端停止接口调用异常:', err);
+        });
+        
+        // 降级方案：使用fetch with keepalive作为备用
+        const stopData = JSON.stringify({ taskId: currentTaskId.value });
+        
+        if (navigator.sendBeacon) {
+          // 使用sendBeacon确保在页面卸载时也能发送请求
+          const blob = new Blob([stopData], { type: 'application/json' });
+          navigator.sendBeacon('/api/stop-generation', blob);
+        } else {
+          // 降级方案：使用fetch with keepalive
+          fetch('/api/stop-generation', {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: stopData,
+            keepalive: true
+          }).catch(() => {
+            // 静默处理错误
+          });
+        }
+      }
+      
+      // 清理当前任务ID
+      currentTaskId.value = null;
+      
+      console.log('✅ [forceStopGeneration] 强制停止完成，最终状态:', isAnswerGenerating.value);
+    } else {
+      console.log('ℹ️ [forceStopGeneration] 当前没有对话在生成，无需停止');
+    }
+  };
+
   return {
     isPaused,
     conversationList,
     isAnswerGenerating,
+    isLoadingHistory,
     dialogueRef,
     app,
     appList,
@@ -960,5 +1067,6 @@ export const useSessionStore = defineStore('conversation', () => {
     reGenerateAnswer,
     getConversation,
     cancel,
+    forceStopGeneration,
   };
 });
\ No newline at end of file
diff --git a/src/store/historySession.ts b/src/store/historySession.ts
index 9068c8fb..7af0927b 100644
--- a/src/store/historySession.ts
+++ b/src/store/historySession.ts
@@ -45,15 +45,47 @@ export const useHistorySessionStore = defineStore(
     /**
      * 选择历史会话
      * @param conversationId 会话id
+     * @param setLoadingState 是否设置loading状态，默认为true
      */
-    const changeSession = async (conversationId: string): Promise<void> => {
-      const { isAnswerGenerating } = useSessionStore();
-      if (
-        currentSelectedSession.value === conversationId ||
-        isAnswerGenerating
-      ) {
+    const changeSession = async (conversationId: string, setLoadingState: boolean = true): Promise<void> => {
+      const sessionStore = useSessionStore();
+      const { isAnswerGenerating, isLoadingHistory, conversationList } = storeToRefs(sessionStore);
+      const { forceStopGeneration } = sessionStore;
+      
+      // 如果是相同会话，直接返回
+      if (currentSelectedSession.value === conversationId) {
         return;
       }
+      
+      // 🔑 重要：根据参数决定是否设置loading状态
+      if (setLoadingState) {
+        isLoadingHistory.value = true;
+      }
+      
+      try {
+        // 🔑 关键修复：如果当前有对话正在生成，强制停止它
+      if (isAnswerGenerating.value) {
+        console.log('🛑 [changeSession] 检测到对话正在生成，强制停止...');
+        
+        // 立即设置暂停状态，阻止新的流式数据处理
+        forceStopGeneration();
+        
+        // 🔑 重要：等待足够时间让前端和后端完成清理操作
+        await new Promise(resolve => setTimeout(resolve, 300));
+        
+        // 🔑 双重保险：再次检查并确保生成状态已停止
+        if (isAnswerGenerating.value) {
+          console.warn('⚠️ [changeSession] 第一次停止未完成，再次尝试停止...');
+          forceStopGeneration();
+          await new Promise(resolve => setTimeout(resolve, 200));
+        }
+        
+        console.log('✅ [changeSession] 对话生成已停止，当前状态:', isAnswerGenerating.value);
+      }
+      
+      // 🔑 新增：清空当前对话列表，避免显示上一个会话的内容
+      conversationList.value = [];
+      
       currentSelectedSession.value = conversationId;
       
       // 🔑 关键修复：根据当前对话的appId更新app选择状态
@@ -105,12 +137,20 @@ export const useHistorySessionStore = defineStore(
       });
       
       const { getConversation } = useSessionStore();
-      await getConversation(currentSelectedSession.value).then(() => {
-        const a = document.getElementsByClassName('draw');
-        for (const i of a) {
-          (i as HTMLElement).style.display = 'none';
+        await getConversation(currentSelectedSession.value, false).then(() => {
+          const a = document.getElementsByClassName('draw');
+          for (const i of a) {
+            (i as HTMLElement).style.display = 'none';
+          }
+        });
+      } catch (error) {
+        console.error('切换会话失败:', error);
+      } finally {
+        // 确保loading状态被重置（只有当我们设置了loading状态时才重置）
+        if (setLoadingState) {
+          isLoadingHistory.value = false;
         }
-      });
+      }
     };
     // #region -----------------------------------------< select conversation >------------------------------------------------
     // 被选中的会话id列表
@@ -180,64 +220,93 @@ export const useHistorySessionStore = defineStore(
     const initSessionList = (): void => {
       selectedSessionIds.value = [];
     };
+    // 🔑 新增：防重复调用标志
+    let isLoadingSessionRecord = false;
+    
     /**
      * 获取历史会话列表
      * @returns
      */
     const getHistorySession = async (): Promise<void> => {
-      const conversationId = localStorage.getItem('conversationId');
-      const [err, res] = await api.getSessionRecord();
-      const { conversationList } = storeToRefs(useSessionStore());
-      if (!err && res) {
-        // 🔑 关键修复：根据当前选择的app过滤对话记录
-        const currentAppId = user_selected_app.value || '';
-        console.log('🔍 [getHistorySession] 当前选择的app:', currentAppId);
-        
-        const allConversations = res.result.conversations
-          .reverse()
-          .map((item) => ({
-            conversationId: item.conversationId,
-            createdTime: item.createdTime,
-            title: item.title,
-            docCount: item.docCount || 0,
-            appId: item.appId || '', // 🔑 关键修复：添加appId字段
-            debug: item.debug || false, // 🔑 添加debug字段
-            kbList: item.kbList || [], // 🔑 添加kbList字段
-            llm: item.llm || {},
-          }))
-          .filter((item) => item.conversationId !== conversationId);
-        
-        // 🔑 新增：按app分离对话记录
-        historySession.value = allConversations.filter((item) => {
-          const itemAppId = item.appId || '';
-          const matches = itemAppId === currentAppId;
-          return matches;
-        });
+      // 🔑 防重复调用：如果正在加载中，直接返回
+      if (isLoadingSessionRecord) {
+        console.log('🔄 [getHistorySession] 正在加载中，跳过重复调用');
+        return;
+      }
+      
+      isLoadingSessionRecord = true;
+      
+      try {
+        const conversationId = localStorage.getItem('conversationId');
+        const [err, res] = await api.getSessionRecord();
+        const { conversationList } = storeToRefs(useSessionStore());
         
-        // 🔑 修复：当当前app没有对话时，自动创建新对话
-        if (historySession.value.length === 0) {
-          console.log('🔍 [getHistorySession] 当前app无对话记录，自动创建新对话，appId:', currentAppId);
-          await generateSession(false);
-          // 🔑 关键修复：创建新对话后需要重新加载历史记录
-          await getHistorySession();
-          return;
-        }
-        if (!currentSelectedSession.value) {
-          currentSelectedSession.value =
-            res.result.conversations[0]?.conversationId;
-        }
-        if (currentSelectedSession.value) {
-          const { getConversation, isAnswerGenerating } = useSessionStore();
-          if (isAnswerGenerating) {
+        if (!err && res) {
+          // 🔑 关键修复：根据当前选择的app过滤对话记录
+          const currentAppId = user_selected_app.value || '';
+          console.log('🔍 [getHistorySession] 当前选择的app:', currentAppId);
+          
+          const allConversations = res.result.conversations
+            .reverse()
+            .map((item: any) => ({
+              conversationId: item.conversationId,
+              createdTime: item.createdTime,
+              title: item.title,
+              docCount: item.docCount || 0,
+              appId: item.appId || '', // 🔑 关键修复：添加appId字段
+              debug: item.debug || false, // 🔑 添加debug字段
+              kbList: item.kbList || [], // 🔑 添加kbList字段
+              llm: item.llm || { icon: '', modelName: '', llmId: '' },
+            }))
+            .filter((item) => item.conversationId !== conversationId);
+          
+          // 🔑 新增：按app分离对话记录
+          historySession.value = allConversations.filter((item) => {
+            const itemAppId = item.appId || '';
+            const matches = itemAppId === currentAppId;
+            return matches;
+          });
+          
+          // 🔑 修复：当当前app没有对话时，自动创建新对话（但避免递归）
+          if (historySession.value.length === 0) {
+            console.log('🔍 [getHistorySession] 当前app无对话记录，自动创建新对话，appId:', currentAppId);
+            // 🔑 重要修复：先释放锁，再创建新对话，避免死锁
+            isLoadingSessionRecord = false;
+            await generateSession(false);
+            return; // 🔑 generateSession内部会调用getHistorySession，所以这里直接返回
+          }
+          
+          if (!currentSelectedSession.value) {
+            currentSelectedSession.value =
+              res.result.conversations[0]?.conversationId;
+          }
+          
+          if (currentSelectedSession.value) {
+            const sessionStore = useSessionStore();
+            const { isAnswerGenerating } = storeToRefs(sessionStore);
+            const { getConversation, forceStopGeneration } = sessionStore;
+            
+            // 如果当前有对话正在生成，先停止它
+            if (isAnswerGenerating.value) {
+              forceStopGeneration();
+              // 等待一小段时间确保停止操作完成
+              await new Promise(resolve => setTimeout(resolve, 100));
+            }
+            
+            await getConversation(currentSelectedSession.value);
             return;
           }
-          await getConversation(currentSelectedSession.value);
-          return;
-        }
-        await createNewSession();
-        if (res.result.conversations.length === 0) {
-          conversationList.value = [];
+          
+          await createNewSession();
+          if (res.result.conversations.length === 0) {
+            conversationList.value = [];
+          }
         }
+      } catch (error) {
+        console.error('🔥 [getHistorySession] 获取历史会话失败:', error);
+      } finally {
+        // 🔑 确保无论成功失败都释放锁
+        isLoadingSessionRecord = false;
       }
     };
     /**
@@ -305,6 +374,7 @@ export const useHistorySessionStore = defineStore(
           query: currentQuery
         });
         
+        // 🔑 优化：创建新会话后刷新历史记录，但要确保防重复机制生效
         await getHistorySession();
       }
     };
diff --git a/src/views/chat/Sender.vue b/src/views/chat/Sender.vue
index 2735e434..547c35e1 100644
--- a/src/views/chat/Sender.vue
+++ b/src/views/chat/Sender.vue
@@ -1,6 +1,8 @@
 <script lang="ts" setup>
 import { ref } from 'vue';
 import CopilotIconSelected from '@/assets/svgs/routerCopilotSelected.svg';
+import SendEnabled from '@/assets/svgs/send_enabled.svg';
+import SendDisabled from '@/assets/svgs/send_disabled.svg';
 
 const props = defineProps<{
   isStreaming: boolean;
@@ -13,8 +15,19 @@ const emits = defineEmits<{
 
 const senderInput = ref('');
 
+// 输入法组合状态
+const isComposing = ref(false);
+
+function onCompositionStart() {
+  isComposing.value = true;
+}
+
+function onCompositionEnd() {
+  isComposing.value = false;
+}
+
 function onKeyDown(e: KeyboardEvent) {
-  if (e.key === 'Enter' && !e.shiftKey) {
+  if (e.key === 'Enter' && !e.shiftKey && !isComposing.value) {
     e.preventDefault();
     if (props.isStreaming) return;
     emits('send', senderInput.value);
@@ -40,16 +53,18 @@ function onSendClick() {
         placeholder="在此输入你想了解的内容，输入Shift+Enter换行"
         maxlength="2000"
         @keydown="onKeyDown"
+        @compositionstart="onCompositionStart"
+        @compositionend="onCompositionEnd"
       />
       <img
         v-if="isStreaming"
-        src="@/assets/svgs/send_disabled.svg"
+        :src="SendDisabled"
         alt=""
         @click="onSendClick"
       />
       <img
         v-else
-        src="@/assets/svgs/send_enabled.svg"
+        :src="SendEnabled"
         alt=""
         @click="onSendClick"
       />
diff --git a/src/views/chat/index.vue b/src/views/chat/index.vue
index 896642bb..e27a41b9 100644
--- a/src/views/chat/index.vue
+++ b/src/views/chat/index.vue
@@ -17,7 +17,7 @@ import {
 } from 'vue';
 import { fetchStream } from '@/utils/fetchStream';
 import marked from '@/utils/marked';
-import { useHistorySessionStore, useLangStore } from '@/store';
+import { useHistorySessionStore, useLangStore, useSessionStore } from '@/store';
 import { storeToRefs } from 'pinia';
 import { getCookie } from '@/apis/tools';
 import { useScrollBottom } from '@/hooks/useScrollBottom';
@@ -25,6 +25,13 @@ import { api } from 'src/apis';
 import { ElMessage } from 'element-plus';
 
 onMounted(() => {
+  // 🔑 注意：chat页面通常不需要加载历史对话，所以不设置loading状态
+  // 如果有conversations数据，说明不需要loading
+  if (conversations.value.length === 0) {
+    // 只有在没有对话数据时才可能需要loading，但chat页面通常是新对话
+    // 这里暂不设置loading状态
+  }
+  
   if (window.eulercopilot?.chat?.onCleanStorage) {
     window.eulercopilot.chat.onCleanStorage(() => {
       //恢复初始状态
@@ -56,6 +63,7 @@ function storageListener(e: StorageEvent) {
 
 const { currentSelectedSession } = storeToRefs(useHistorySessionStore());
 const { language } = storeToRefs(useLangStore());
+const { isLoadingHistory } = storeToRefs(useSessionStore());
 
 const { conversations, setConversations } = useConversations();
 
@@ -234,6 +242,12 @@ function useConversations() {
 }
 
 async function onSend(q: string) {
+  // 如果当前正在streaming，直接返回，不允许发送新消息
+  // 这与Sender组件的逻辑保持一致
+  if (isStreaming.value) {
+    return;
+  }
+  
   conversations.value.push({
     id: `user-${conversations.value.length / 2 + 1}`,
     content: q,
@@ -294,6 +308,10 @@ onBeforeMount(() => {
 });
 
 onBeforeUnmount(() => {
+  // 页面销毁时强制停止对话生成
+  if (isStreaming.value) {
+    isStreaming.value = false;
+  }
   window.removeEventListener('storage', storageListener);
 });
 </script>
@@ -315,10 +333,27 @@ onBeforeUnmount(() => {
 
     <div class="chat-container">
       <div class="chat-container-main">
+        <!-- 历史对话加载状态 -->
+        <div v-if="isLoadingHistory" class="loading-container">
+          <div class="loading-skeleton">
+            <div class="skeleton-item" v-for="i in 3" :key="i">
+              <div class="skeleton-avatar"></div>
+              <div class="skeleton-content">
+                <div class="skeleton-line skeleton-line-1"></div>
+                <div class="skeleton-line skeleton-line-2"></div>
+                <div class="skeleton-line skeleton-line-3"></div>
+              </div>
+            </div>
+          </div>
+          <div class="loading-text">
+            <span>{{ $t('conversation.loading_history') }}</span>
+          </div>
+        </div>
+        
         <div
           ref="chatContainerRef"
           class="chat-container-bubble"
-          v-if="conversations.length"
+          v-else-if="conversations.length"
         >
           <div
             v-for="({ id, role, content, metadata }, idx) in conversations"
@@ -374,7 +409,7 @@ onBeforeUnmount(() => {
             </Bubble>
           </div>
         </div>
-        <Welcome class="welcome" v-else />
+        <Welcome class="welcome" v-else-if="!isLoadingHistory" />
 
         <Sender
           :is-streaming="isStreaming"
@@ -481,4 +516,115 @@ onBeforeUnmount(() => {
     margin-top: 25px;
   }
 }
+
+/* 历史对话加载状态样式 */
+.loading-container {
+  width: 100%;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  gap: 24px;
+  padding: 40px 20px;
+}
+
+.loading-skeleton {
+  width: 100%;
+  max-width: 800px;
+  display: flex;
+  flex-direction: column;
+  gap: 24px;
+}
+
+.skeleton-item {
+  display: flex;
+  gap: 24px; /* 匹配Bubble组件的margin-right: 24px */
+  align-items: flex-start;
+}
+
+.skeleton-avatar {
+  width: 48px; /* 匹配Bubble组件的头像尺寸 */
+  height: 48px;
+  border-radius: 50%;
+  background: linear-gradient(90deg, #f0f0f0 25%, #e0e0e0 50%, #f0f0f0 75%);
+  background-size: 200% 100%;
+  animation: skeleton-loading 1.5s infinite;
+  flex-shrink: 0;
+}
+
+.skeleton-content {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+
+.skeleton-line {
+  height: 16px;
+  border-radius: 4px;
+  background: linear-gradient(90deg, #f0f0f0 25%, #e0e0e0 50%, #f0f0f0 75%);
+  background-size: 200% 100%;
+  animation: skeleton-loading 1.5s infinite;
+}
+
+.skeleton-line-1 {
+  width: 80%;
+}
+
+.skeleton-line-2 {
+  width: 60%;
+}
+
+.skeleton-line-3 {
+  width: 40%;
+}
+
+.loading-text {
+  font-size: 14px;
+  color: var(--o-text-color-secondary);
+  display: flex;
+  align-items: center;
+  width: 100%;
+  max-width: 800px;
+  position: relative;
+}
+
+.loading-text::before {
+  content: '';
+  width: 16px;
+  height: 16px;
+  border: 2px solid var(--o-color-primary);
+  border-top-color: transparent;
+  border-radius: 50%;
+  animation: spin 1s linear infinite;
+  position: absolute;
+  left: 16px; /* 图标位置：在skeleton头像中心位置 (48px/2 - 16px/2 = 16px) */
+}
+
+.loading-text span {
+  margin-left: 72px; /* 文字位置：skeleton内容开始位置 (48px头像 + 24px间距) */
+}
+
+@keyframes skeleton-loading {
+  0% {
+    background-position: -200% 0;
+  }
+  100% {
+    background-position: 200% 0;
+  }
+}
+
+@keyframes spin {
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+/* 暗色主题适配 */
+[theme="dark"] .skeleton-avatar,
+[theme="dark"] .skeleton-line {
+  background: linear-gradient(90deg, #2a2a2a 25%, #3a3a3a 50%, #2a2a2a 75%);
+  background-size: 200% 100%;
+}
 </style>
diff --git a/src/views/createapp/components/McpDrawer.vue b/src/views/createapp/components/McpDrawer.vue
index 4420802a..b1aaa92c 100644
--- a/src/views/createapp/components/McpDrawer.vue
+++ b/src/views/createapp/components/McpDrawer.vue
@@ -284,7 +284,7 @@ async function onActiveService(
           display: flex;
           flex-direction: row-reverse;
           .el-icon:not(:last-child) {
-            border-left: 1px solid var(--el-border-color);
+            border-left: 1px solid var(--o-border-color);
             padding-left: 8px;
           }
         }
diff --git a/src/views/createapp/components/workFlow.vue b/src/views/createapp/components/workFlow.vue
index 5c4c9f18..b9edae37 100644
--- a/src/views/createapp/components/workFlow.vue
+++ b/src/views/createapp/components/workFlow.vue
@@ -217,17 +217,8 @@ const yamlExportFileName = ref('workflow.yaml');
 
 // 注释相关状态（已简化，注释现在直接在CommentNode中编辑）
 
-// 额外的内置节点类型
-const extraNodeTypes = ref([
-  {
-    nodeId: 'FileExtract',
-    callId: 'FileExtract',
-    name: i18n.global.t('flow.node_names.file_extractor'),
-    description: '从文件中提取文本内容，支持多种文件格式',
-    type: 'transform',
-    serviceId: 'system'
-  }
-]);
+// 额外的内置节点类型 - 现在完全依赖后端数据，不再有静态定义
+const extraNodeTypes = ref([]);
 
 const hanleAsideVisible = () => {
   if (!copilotAside.value) return;
@@ -1375,16 +1366,14 @@ const nodesChange = (nodes) => {
     removeSelectedNodes([getSelectedNodes.value[0]]);
   }
   if (nodes?.[0]?.type === 'remove') {
-    // TODO 为什么0.10.0删除了delNode？
-    delNode(nodes[0].id);
-    // 节点增加删除时直接将工作流debug状态置为false
+    // 节点删除时直接将工作流debug状态置为false
     emits('updateFlowsDebug', false);
     nextTick(() => {
       debouncedNodeAndLineConnection();
     });
   }
   if (nodes?.[0]?.type === 'add') {
-    // 节点增加删除时直接将工作流debug状态置为false
+    // 节点增加时直接将工作流debug状态置为false
     emits('updateFlowsDebug', false);
     nextTick(() => {
       debouncedNodeAndLineConnection();
@@ -2887,11 +2876,6 @@ const saveFlow = async (updateNodeParameter?, debug?) => {
       queryFlow('update');
       const updatedCurFlow = response[1].result.flow;
       isNodeConnect.value = updatedCurFlow.connectivity;
-      if (!isNodeConnect.value) {
-        ElMessage.error(i18n.global.t('semantic.check_connect'));
-      }
-      
-      
       redrageFlow(updatedCurFlow?.nodes, updatedCurFlow?.edges, updatedCurFlow?.notes || []);
     }
 
@@ -3639,9 +3623,10 @@ defineExpose({
   
   .aside-content {
     flex: 1;
-    overflow: hidden;
+    overflow: visible;
     display: flex;
     flex-direction: column;
+    min-height: 0;
   }
 }
 
diff --git a/src/views/createapp/components/workFlowConfig/ChoiceBranchDrawer.vue b/src/views/createapp/components/workFlowConfig/ChoiceBranchDrawer.vue
index 550d3bac..4c4192e2 100644
--- a/src/views/createapp/components/workFlowConfig/ChoiceBranchDrawer.vue
+++ b/src/views/createapp/components/workFlowConfig/ChoiceBranchDrawer.vue
@@ -736,7 +736,7 @@ const formatValue = (value, type) => {
       body[theme='dark'] & {
         background-color: #1f2329;
         color: #e4e8ee;
-        border: 1px solid var(--el-border-color);
+        border: 1px solid var(--o-border-color);
       }
       
       svg {
diff --git a/src/views/createapp/components/workFlowConfig/NodeListPanel.vue b/src/views/createapp/components/workFlowConfig/NodeListPanel.vue
index 50d82f0f..94b09bcb 100644
--- a/src/views/createapp/components/workFlowConfig/NodeListPanel.vue
+++ b/src/views/createapp/components/workFlowConfig/NodeListPanel.vue
@@ -95,16 +95,15 @@ const searchKeyword = ref('');
 // 计算属性：获取service类型的节点数据
 const serviceNodes = computed(() => {
   const nodes: any[] = [];
+  // 现在 apiServiceList 已经在父组件中过滤为只包含 system 类型的服务
   props.apiServiceList.forEach(service => {
-    if (service.type === 'system' || !service.type) { // 兼容没有type字段的情况
-      if (service.nodeMetaDatas && Array.isArray(service.nodeMetaDatas)) {
-        // 为每个节点添加serviceId信息
-        const nodesWithServiceId = service.nodeMetaDatas.map(node => ({
-          ...node,
-          serviceId: service.serviceId
-        }));
-        nodes.push(...nodesWithServiceId);
-      }
+    if (service.nodeMetaDatas && Array.isArray(service.nodeMetaDatas)) {
+      // 为每个节点添加serviceId信息
+      const nodesWithServiceId = service.nodeMetaDatas.map(node => ({
+        ...node,
+        serviceId: service.serviceId
+      }));
+      nodes.push(...nodesWithServiceId);
     }
   });
   return nodes;
@@ -275,7 +274,8 @@ defineExpose({
   
   .nodes-list {
     flex: 1;
-    overflow: visible;
+    overflow-y: auto;
+    overflow-x: hidden;
     min-height: 0;
     
     .node-group {
diff --git a/src/views/createapp/components/workFlowConfig/NodeSelector.vue b/src/views/createapp/components/workFlowConfig/NodeSelector.vue
index a1922da9..73a82e54 100644
--- a/src/views/createapp/components/workFlowConfig/NodeSelector.vue
+++ b/src/views/createapp/components/workFlowConfig/NodeSelector.vue
@@ -22,7 +22,7 @@
       <!-- 节点Tab Panel -->
       <div v-if="activeTab === 'nodes'" class="tab-panel">
         <NodeListPanel
-          :api-service-list="apiServiceList"
+          :api-service-list="systemServices"
           :exclude-node-types="excludeNodeTypes"
           :extra-node-types="extraNodeTypes"
           :search-placeholder="searchPlaceholder"
@@ -35,6 +35,7 @@
       <!-- 插件Tab Panel  -->
       <div v-if="activeTab === 'plugins'" class="tab-panel">
         <PluginListPanel
+          :plugin-services="pluginServices"
           :search-placeholder="$t('common.search')"
           :enable-drag="enableDrag"
           :on-drag-start="onDragStart"
@@ -47,7 +48,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, watch } from 'vue';
+import { ref, watch, computed } from 'vue';
 import NodeListPanel from './NodeListPanel.vue';
 import PluginListPanel from './PluginListPanel.vue';
 
@@ -84,6 +85,15 @@ const emit = defineEmits<Emits>();
 // 响应式数据
 const activeTab = ref('nodes');
 
+// 计算属性：分离不同类型的服务数据
+const systemServices = computed(() => {
+  return props.apiServiceList.filter(service => service.type === 'system');
+});
+
+const pluginServices = computed(() => {
+  return props.apiServiceList.filter(service => service.type === 'plugin');
+});
+
 // 监听resetTabOnShow变化，用于外部控制重置标签页
 watch(() => props.resetTabOnShow, (shouldReset) => {
   if (shouldReset) {
diff --git a/src/views/createapp/components/workFlowConfig/PluginListPanel.vue b/src/views/createapp/components/workFlowConfig/PluginListPanel.vue
index a82e8f8d..327e26fe 100644
--- a/src/views/createapp/components/workFlowConfig/PluginListPanel.vue
+++ b/src/views/createapp/components/workFlowConfig/PluginListPanel.vue
@@ -128,7 +128,7 @@
       </div>
       <div v-else class="appCenterNoData">
         <div class="noDataIcon"></div>
-        <div class="desc">{{ $t('common.no_data') }}</div>
+        <div class="desc">{{ $t('semantic.no_data') }}</div>
       </div>
     </div>
     
@@ -161,17 +161,20 @@
 import { ref, computed, watch, onMounted } from 'vue';
 import { ElMessage } from 'element-plus';
 import { api } from 'src/apis';
+// 移除了 workFlowApi 和 useLangStore 的导入，因为现在数据由父组件提供
 import { IconFavorite, IconUnfavorite } from '@computing/opendesign-icons';
 import DefaultIcon from '@/assets/svgs/defaultIcon.webp';
 
 // Props
 interface Props {
+  pluginServices?: any[]; // 插件类型的服务数据，由父组件传入
   searchPlaceholder?: string;
   enableDrag?: boolean;
   onDragStart?: (event: DragEvent, plugin: any) => void;
 }
 
 const props = withDefaults(defineProps<Props>(), {
+  pluginServices: () => [],
   searchPlaceholder: '搜索插件...',
   enableDrag: false,
   onDragStart: undefined
@@ -276,41 +279,21 @@ const handlePluginClick = (plugin: any) => {
     return;
   }
   
-  // 创建PluginNode节点数据结构
-  const nodeData = {
-    // 基础节点信息
-    nodeId: 'Plugin',
-    callId: 'Plugin',
-    type: 'plugin-node', // 标识为PluginNode类型
-    
-    // PluginNode专用数据
-    data: {
-      serviceId: plugin.serviceId,
+  // 如果是从/api/flow/services获取的插件数据，直接使用节点信息
+  if (plugin.nodeId && plugin.callId) {
+    const nodeData = {
+      nodeId: plugin.nodeId,
+      callId: plugin.callId,
       name: plugin.name,
       description: plugin.description,
-      icon: plugin.icon,
-      author: plugin.author,
-      pluginType: plugin.type, // 'semantic_interface' 或 'mcp'
-      type: 'plugin',
-      isActive: plugin.isActive,
-      status: plugin.status,
-      published: plugin.published,
-      parameters: {} // 插件节点的默认参数
-    }
-  };
-  
-  emit('pluginClick', nodeData);
-};
-
-const handleDragStart = (event: DragEvent, plugin: any) => {
-  // 检查MCP插件是否已激活，未激活则阻止拖拽
-  if (activeTab.value === 'mcp' && plugin.isActive === false) {
-    event.preventDefault();
-    return;
-  }
-  
-  if (props.enableDrag) {
-    // 创建与点击时相同的PluginNode节点数据结构
+      type: plugin.nodeType || plugin.callId, // 使用节点的type字段
+      serviceId: plugin.serviceId,
+      parameters: plugin.parameters || {},
+      pluginType: 'plugin'
+    };
+    emit('pluginClick', nodeData);
+  } else {
+    // 兼容原有的插件数据结构
     const nodeData = {
       // 基础节点信息
       nodeId: 'Plugin',
@@ -324,7 +307,6 @@ const handleDragStart = (event: DragEvent, plugin: any) => {
         description: plugin.description,
         icon: plugin.icon,
         author: plugin.author,
-        authorName: plugin.authorName,
         pluginType: plugin.type, // 'semantic_interface' 或 'mcp'
         type: 'plugin',
         isActive: plugin.isActive,
@@ -334,6 +316,58 @@ const handleDragStart = (event: DragEvent, plugin: any) => {
       }
     };
     
+    emit('pluginClick', nodeData);
+  }
+};
+
+const handleDragStart = (event: DragEvent, plugin: any) => {
+  // 检查MCP插件是否已激活，未激活则阻止拖拽
+  if (activeTab.value === 'mcp' && plugin.isActive === false) {
+    event.preventDefault();
+    return;
+  }
+  
+  if (props.enableDrag) {
+    let nodeData;
+    
+    // 如果是从/api/flow/services获取的插件数据，直接使用节点信息
+    if (plugin.nodeId && plugin.callId) {
+      nodeData = {
+        nodeId: plugin.nodeId,
+        callId: plugin.callId,
+        name: plugin.name,
+        description: plugin.description,
+        type: plugin.nodeType || plugin.callId, // 使用节点的type字段
+        serviceId: plugin.serviceId,
+        parameters: plugin.parameters || {},
+        pluginType: 'plugin'
+      };
+    } else {
+      // 兼容原有的插件数据结构
+      nodeData = {
+        // 基础节点信息
+        nodeId: 'Plugin',
+        callId: 'Plugin',
+        type: 'plugin-node', // 标识为PluginNode类型
+        
+        // PluginNode专用数据
+        data: {
+          serviceId: plugin.serviceId,
+          name: plugin.name,
+          description: plugin.description,
+          icon: plugin.icon,
+          author: plugin.author,
+          authorName: plugin.authorName,
+          pluginType: plugin.type, // 'semantic_interface' 或 'mcp'
+          type: 'plugin',
+          isActive: plugin.isActive,
+          status: plugin.status,
+          published: plugin.published,
+          parameters: {} // 插件节点的默认参数
+        }
+      };
+    }
+    
     if (props.onDragStart) {
       props.onDragStart(event, nodeData);
     }
@@ -382,8 +416,8 @@ const loadPlugins = async () => {
   
   try {
     if (activeTab.value === 'api') {
-      // 加载语义接口数据
-      await loadSemanticInterfaces();
+      // 加载插件服务数据（直接使用传入的pluginServices）
+      loadPluginServices();
     } else if (activeTab.value === 'mcp') {
       // 加载MCP数据
       await loadMcpServices();
@@ -395,6 +429,51 @@ const loadPlugins = async () => {
   }
 };
 
+// 加载插件数据 - 直接使用传入的pluginServices
+const loadPluginServices = () => {
+  try {
+    // 将plugin服务转换为插件列表格式
+    const plugins = props.pluginServices.flatMap(service => {
+      if (service.nodeMetaDatas && Array.isArray(service.nodeMetaDatas)) {
+        return service.nodeMetaDatas.map(node => ({
+          serviceId: service.serviceId,
+          name: node.name,
+          description: node.description,
+          icon: '', // 插件节点暂时没有图标
+          author: 'System', // 暂时使用系统作为作者
+          authorName: 'System',
+          published: true,
+          favorited: false,
+          type: 'semantic_interface' as const, // 保持兼容性
+          nodeId: node.nodeId,
+          callId: node.callId,
+          nodeType: node.type,
+          parameters: node.parameters,
+          createdAt: node.createdAt
+        }));
+      }
+      return [];
+    });
+    
+    // 应用搜索过滤
+    let filteredPlugins = plugins;
+    if (searchKeyword.value?.trim()) {
+      const keyword = searchKeyword.value.toLowerCase().trim();
+      filteredPlugins = plugins.filter(plugin => 
+        plugin.name?.toLowerCase().includes(keyword) ||
+        plugin.description?.toLowerCase().includes(keyword)
+      );
+    }
+    
+    pluginLists.value = filteredPlugins;
+    totalCount.value = filteredPlugins.length;
+  } catch (error) {
+    console.error('加载插件服务数据失败:', error);
+    pluginLists.value = [];
+    totalCount.value = 0;
+  }
+};
+
 // 加载语义接口数据 - 使用/api/service接口，只显示已发布的数据
 const loadSemanticInterfaces = async () => {
   const searchParams: any = {
@@ -468,6 +547,13 @@ watch(searchKeyword, () => {
   }, 300); // 300ms防抖
 });
 
+// 监听 pluginServices 变化，重新加载数据
+watch(() => props.pluginServices, () => {
+  if (activeTab.value === 'api') {
+    loadPluginServices();
+  }
+}, { deep: true, immediate: true });
+
 
 // 组件挂载时加载数据
 onMounted(() => {
diff --git a/src/views/createapp/components/workFlowConfig/VariableBasedStartNodeDrawer.vue b/src/views/createapp/components/workFlowConfig/VariableBasedStartNodeDrawer.vue
index 26e155cd..d01785bb 100644
--- a/src/views/createapp/components/workFlowConfig/VariableBasedStartNodeDrawer.vue
+++ b/src/views/createapp/components/workFlowConfig/VariableBasedStartNodeDrawer.vue
@@ -1320,7 +1320,7 @@ const toggleUploadMethod = (method: 'manual' | 'url') => {
       .descDisplay {
         cursor: pointer;
         padding: 12px 16px;
-        border: 1px solid var(--el-border-color);
+        border: 1px solid var(--o-border-color);
         border-radius: 6px;
         background: var(--el-fill-color-extra-light);
         font-size: 14px;
@@ -1730,7 +1730,7 @@ const toggleUploadMethod = (method: 'manual' | 'url') => {
       flex: 1;
       padding: 8px 16px;
       text-align: center;
-      border: 1px solid var(--el-border-color);
+      border: 1px solid var(--o-border-color);
       border-radius: 6px;
       cursor: pointer;
       font-size: 13px;
diff --git a/src/views/dialogue/components/DialogueAside.vue b/src/views/dialogue/components/DialogueAside.vue
index e1af4e65..361cb48a 100644
--- a/src/views/dialogue/components/DialogueAside.vue
+++ b/src/views/dialogue/components/DialogueAside.vue
@@ -32,7 +32,7 @@ import { useRouter, useRoute } from 'vue-router';
 
 const router = useRouter();
 const route = useRoute();
-const { user_selected_app } = storeToRefs(useHistorySessionStore());
+const { user_selected_app, historySession, currentSelectedSession } = storeToRefs(useHistorySessionStore());
 const { getHistorySession, generateSession } = useHistorySessionStore();
 
 interface HistorySession {
@@ -51,10 +51,8 @@ const props = withDefaults(
 );
 const { t } = useI18n();
 const {
-  historySession,
   selectedSessionIds,
   isSelectedAll,
-  currentSelectedSession,
 } = storeToRefs(useHistorySessionStore());
 const { app, appList } = storeToRefs(useSessionStore());
 const { createNewSession, currentLLM } =
@@ -132,6 +130,8 @@ function checkDate(date: string | Date): string {
 }
 
 onMounted(() => {
+  // 🔑 优化：DialogueAside负责初始化历史记录，但要避免与DialogueSession重复调用
+  // 使用防重复机制确保只有一个组件成功加载
   getHistorySession();
 });
 
@@ -308,8 +308,25 @@ const selectApp = async (id) => {
       // 注意：清空所有query参数，包括conversationId，确保不会嫁接app对话到无app模式
     });
     
-    // 🔑 新增：重新加载无app的历史记录，如果没有记录会自动创建新对话
+    // 🔑 修复：切换到无应用对话的最新conversation
     await getHistorySession();
+    const noAppSessions = historySession.value.filter(session => !session.appId || session.appId.trim() === '');
+    if (noAppSessions.length > 0) {
+      // 找到最新的无应用对话
+      const latestNoAppSession = noAppSessions.sort((a, b) => 
+        new Date(b.createdTime).getTime() - new Date(a.createdTime).getTime()
+      )[0];
+      currentSelectedSession.value = latestNoAppSession.conversationId;
+      
+      // 更新URL参数
+      router.replace({ 
+        path: '/', 
+        query: { conversationId: latestNoAppSession.conversationId } 
+      });
+    } else {
+      // 没有无应用对话，创建新对话
+      await generateSession(false);
+    }
   } else {
     // 找到选中的应用信息
     const selectedApp = apps.value.find(app => app.appId === id);
@@ -437,7 +454,6 @@ watch(
   (newConversationId) => {
     if (newConversationId && typeof newConversationId === 'string') {
       // 从URL参数恢复对话选择
-      console.log('🔍 [DialogueAside] 从路由恢复conversationId:', newConversationId);
       currentSelectedSession.value = newConversationId;
     }
   },
diff --git a/src/views/dialogue/components/DialogueSession.vue b/src/views/dialogue/components/DialogueSession.vue
index f8419e7e..52a714a4 100644
--- a/src/views/dialogue/components/DialogueSession.vue
+++ b/src/views/dialogue/components/DialogueSession.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import { computed, onMounted, ref, watch, nextTick } from 'vue';
+import { computed, onMounted, onBeforeUnmount, ref, watch, nextTick } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import DialoguePanel from 'src/components/dialoguePanel/DialoguePanel.vue';
 import UploadFileGroup from 'src/components/uploadFile/UploadFileGroup.vue';
@@ -38,7 +38,7 @@ import zipSvg from '@/assets/svgs/zip.svg';
 const isDropdownOpen = ref(false);
 const { appList } = storeToRefs(useSessionStore());
 const { user_selected_app, selectLLM, historySession } = storeToRefs(useHistorySessionStore());
-const { getHistorySession } = useHistorySessionStore();
+const { getHistorySession, changeSession } = useHistorySessionStore();
 
 // 🔑 文件类型图标映射
 const typeSvgMap = {
@@ -86,7 +86,34 @@ const closeShowFileSource = () => {
 };
 const openShowFileSource = (fileList: Array<any>) => {
   showFileSource.value = true;
-  curFileList.value = fileList;
+  
+  // 🔑 确保数据格式正确：如果是原始格式，则转换为drawer期望的格式
+  if (fileList && fileList.length > 0) {
+    const formattedList = fileList.map(file => {
+      // 检查是否已经是格式化后的数据
+      if (file.documentName !== undefined) {
+        // 已经是格式化后的数据，直接使用
+        return file;
+      } else {
+        // 原始数据，需要转换格式
+        return {
+          documentId: file._id,
+          documentName: file.name,
+          documentAbstract: file.abstract,
+          documentType: file.type,
+          documentSize: file.size,
+          sourceUrl: file.sourceUrl,
+          documentOrder: file.order,
+          createdAt: file.created_at,
+          documentAuthor: file.author,
+        };
+      }
+    });
+    
+    curFileList.value = formattedList;
+  } else {
+    curFileList.value = [];
+  }
 };
 
 // 对话输入内容
@@ -101,8 +128,8 @@ const conversationStarted = ref(false);
 const currentFlowId = ref<string>('');
 
 // 对话列表
-const { sendQuestion } = useSessionStore();
-const { conversationList, isAnswerGenerating, dialogueRef } = storeToRefs(
+const { sendQuestion, forceStopGeneration } = useSessionStore();
+const { conversationList, isAnswerGenerating, isLoadingHistory, dialogueRef } = storeToRefs(
   useSessionStore(),
 );
 const { generateSession } = useHistorySessionStore();
@@ -238,13 +265,28 @@ const handleSendMessage = async (
   question: string,
   user_selected_flow?: string,
 ) => {
-  if (isAnswerGenerating.value || !isAllowToSend.value) return;
-  const len = conversationList.value.length;
-  if (
-    len > 0 &&
-    !(conversationList.value[len - 1] as RobotConversationItem).isFinish
-  )
-    return;
+  // 标记是否刚刚停止了对话生成
+  let justStoppedGeneration = false;
+  
+  // 如果当前有对话正在生成，先停止它
+  if (isAnswerGenerating.value) {
+    forceStopGeneration();
+    justStoppedGeneration = true;
+    // 等待一小段时间确保停止操作完成和状态更新
+    await new Promise(resolve => setTimeout(resolve, 200));
+  }
+  
+  if (!isAllowToSend.value) return;
+  
+  // 检查最后一个对话是否完成，但如果刚刚停止了生成，则跳过这个检查
+  if (!justStoppedGeneration) {
+    const len = conversationList.value.length;
+    if (
+      len > 0 &&
+      !(conversationList.value[len - 1] as RobotConversationItem).isFinish
+    )
+      return;
+  }
   dialogueInput.value = '';
   if (uploadFilesView.value.length > 0) {
     // 发送文件则刷新左侧会话列表
@@ -330,12 +372,23 @@ const handleSendMessage = async (
   }
 };
 
+// 输入法组合状态
+const isComposing = ref(false);
+
+const handleCompositionStart = () => {
+  isComposing.value = true;
+};
+
+const handleCompositionEnd = () => {
+  isComposing.value = false;
+};
+
 /**
- * 处理鼠标事件
+ * 处理键盘事件
  * @param event
  */
 const handleKeydown = (event: KeyboardEvent) => {
-  if (event.key === 'Enter' && !event.shiftKey) {
+  if (event.key === 'Enter' && !event.shiftKey && !isComposing.value) {
     event.preventDefault();
     if (dialogueInput.value !== '' && isAllowToSend.value) {
       handleSendMessage(undefined, dialogueInput.value);
@@ -348,7 +401,6 @@ const handleKeydown = (event: KeyboardEvent) => {
  * @param item
  */
 const getItem = <T>(item: ConversationItem, field: string): T | undefined => {
-  
   if (field in item) {
     return (item as RobotConversationItem)[field] as T;
   }
@@ -824,16 +876,46 @@ const handleRootPathRedirect = async () => {
   }
 };
 
-onMounted(() => {
-  // 数据初始化
-  AppForm.value = props.createAppForm;
-  if (!inputRef.value) return;
-  inputRef.value.focus();
-  getProviderLLM();
+onMounted(async () => {
+  // 🔑 重要：页面挂载时立即设置loading状态
+  isLoadingHistory.value = true;
   
-  // 🔑 修复：从路由参数中恢复conversationId
-  if (route.query?.conversationId && typeof route.query.conversationId === 'string') {
-    currentSelectedSession.value = route.query.conversationId;
+  try {
+    // 数据初始化
+    AppForm.value = props.createAppForm;
+    if (!inputRef.value) return;
+    inputRef.value.focus();
+    getProviderLLM();
+    
+    // 🔑 修复：从路由参数中恢复conversationId并同步左侧对话记录栏选中状态
+    if (route.query?.conversationId && typeof route.query.conversationId === 'string') {
+      const conversationId = route.query.conversationId;
+      currentSelectedSession.value = conversationId;
+      
+      // 🔑 优化：只在DialogueAside没有加载历史记录时才调用getHistorySession
+      // 避免与DialogueAside的onMounted重复调用
+      if (historySession.value.length === 0) {
+        await getHistorySession();
+      }
+      
+      // 检查该conversationId是否存在于历史记录中
+      const sessionExists = historySession.value.some(session => session.conversationId === conversationId);
+      if (sessionExists) {
+        // 如果存在，调用changeSession来同步状态（不重复设置loading状态）
+        await changeSession(conversationId, false);
+      }
+    } else {
+      // 🔑 优化：如果没有conversationId且没有历史记录，才调用getHistorySession
+      if (historySession.value.length === 0) {
+        await getHistorySession();
+      }
+      // 重置loading状态
+      isLoadingHistory.value = false;
+    }
+  } catch (error) {
+    console.error('页面初始化失败:', error);
+    // 出错时也要重置loading状态
+    isLoadingHistory.value = false;
   }
   
   // 🔑 新增：处理根路径访问逻辑
@@ -1160,6 +1242,11 @@ const getFormatFileList = (ConversationItem, str) => {
   return newFileList;
 };
 
+// 页面销毁时强制停止对话生成
+onBeforeUnmount(() => {
+  forceStopGeneration();
+});
+
 </script>
 
 <template>
@@ -1250,8 +1337,26 @@ const getFormatFileList = (ConversationItem, str) => {
 
 
 
+        <!-- 历史对话加载状态 -->
+        <div v-if="isLoadingHistory" class="loading-container">
+          <div class="loading-skeleton">
+            <div class="skeleton-item" v-for="i in 3" :key="i">
+              <div class="skeleton-avatar"></div>
+              <div class="skeleton-content">
+                <div class="skeleton-line skeleton-line-1"></div>
+                <div class="skeleton-line skeleton-line-2"></div>
+                <div class="skeleton-line skeleton-line-3"></div>
+              </div>
+            </div>
+          </div>
+          <div class="loading-text">
+            <span>{{ $t('conversation.loading_history') }}</span>
+          </div>
+        </div>
+
         <DialoguePanel
           v-for="(item, index) in conversationList"
+          v-show="!isLoadingHistory"
           :cid="item.cid"
           :key="index"
           :groupId="getItem(item, 'groupId')"
@@ -1270,7 +1375,7 @@ const getFormatFileList = (ConversationItem, str) => {
           :test="getItem(item, 'test')"
           :metadata="getItem(item, 'metadata')"
           :flowdata="getItem(item, 'flowdata')"
-          :fileList="getItem(item, 'files')"
+          :fileList="getItem(item, 'files') || getFormatFileList(item, 'document')"
           :created-at="item.createdAt"
           :current-selected="item.currentInd"
           :need-regernerate="item.cid === conversationList.slice(-1)[0].cid"
@@ -1286,8 +1391,9 @@ const getFormatFileList = (ConversationItem, str) => {
           @openShowFileSource="openShowFileSource"
         />
 
-        <template v-if="conversationList.length === 0">
+        <template v-if="conversationList.length === 0 && !isLoadingHistory">
           <!-- 🔑 修复：InterPreview应该在两种情况下都显示，不受变量面板影响 -->
+          <!-- 只有在不是loading状态且没有对话记录时才显示初始内容 -->
           <InitalPanel
             v-if="app.selectedAppId === '' || !app.selectedAppId"
             @selectQuestion="selectQuestion"
@@ -1390,6 +1496,8 @@ const getFormatFileList = (ConversationItem, str) => {
                 maxlength="2000"
                 :placeholder="$t('main.ask_me_anything')"
                 @keydown="handleKeydown"
+                @compositionstart="handleCompositionStart"
+                @compositionend="handleCompositionEnd"
               />
             </div>
             <!-- 上传 -->
@@ -1523,7 +1631,7 @@ const getFormatFileList = (ConversationItem, str) => {
           <div class="file-source__item-header">
             <div class="file-source__item-header-left">
               <span class="file-source__order">
-                {{ file?.documentorder ?? index + 1 }}
+                {{ file?.documentOrder ?? index + 1 }}
               </span>
               <div class="file-source__type-icon">
                 <el-icon :size="16" class="file-type-icon">
@@ -1831,9 +1939,10 @@ button[disabled]:hover {
         width: 120px;
         height: 32px;
         box-sizing: border-box;
-        border: 1px solid rgba(223, 229, 239);
+        border: 1px solid var(--o-border-color);
         border-radius: 8px;
-        background: rgb(253, 254, 255);
+        background: var(--o-bg-color-base);
+        color: var(--o-text-color-primary);
 
         .switch-wrapper {
           position: absolute;
@@ -1841,6 +1950,7 @@ button[disabled]:hover {
           height: 32px;
           line-height: 30px;
           text-align: center;
+          color: var(--o-text-color-primary);
         }
       }
 
@@ -2293,4 +2403,115 @@ button[disabled]:hover {
   }
 }
 
+/* 历史对话加载状态样式 */
+.loading-container {
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  gap: 24px;
+  padding: 40px 20px;
+  min-height: 200px;
+}
+
+.loading-skeleton {
+  width: 100%;
+  max-width: 800px;
+  display: flex;
+  flex-direction: column;
+  gap: 24px;
+}
+
+.skeleton-item {
+  display: flex;
+  gap: 24px; /* 匹配Bubble组件的margin-right: 24px */
+  align-items: flex-start;
+}
+
+.skeleton-avatar {
+  width: 48px; /* 匹配Bubble组件的头像尺寸 */
+  height: 48px;
+  border-radius: 50%;
+  background: linear-gradient(90deg, #f0f0f0 25%, #e0e0e0 50%, #f0f0f0 75%);
+  background-size: 200% 100%;
+  animation: skeleton-loading 1.5s infinite;
+  flex-shrink: 0;
+}
+
+.skeleton-content {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+
+.skeleton-line {
+  height: 16px;
+  border-radius: 4px;
+  background: linear-gradient(90deg, #f0f0f0 25%, #e0e0e0 50%, #f0f0f0 75%);
+  background-size: 200% 100%;
+  animation: skeleton-loading 1.5s infinite;
+}
+
+.skeleton-line-1 {
+  width: 80%;
+}
+
+.skeleton-line-2 {
+  width: 60%;
+}
+
+.skeleton-line-3 {
+  width: 40%;
+}
+
+.loading-text {
+  font-size: 14px;
+  color: var(--o-text-color-secondary);
+  display: flex;
+  align-items: center;
+  width: 100%;
+  max-width: 800px;
+  position: relative;
+}
+
+.loading-text::before {
+  content: '';
+  width: 16px;
+  height: 16px;
+  border: 2px solid var(--o-color-primary);
+  border-top-color: transparent;
+  border-radius: 50%;
+  animation: spin 1s linear infinite;
+  position: absolute;
+  left: 16px; /* 图标位置：在skeleton头像中心位置 (48px/2 - 16px/2 = 16px) */
+}
+
+.loading-text span {
+  margin-left: 72px; /* 文字位置：skeleton内容开始位置 (48px头像 + 24px间距) */
+}
+
+@keyframes skeleton-loading {
+  0% {
+    background-position: -200% 0;
+  }
+  100% {
+    background-position: 200% 0;
+  }
+}
+
+@keyframes spin {
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+/* 暗色主题适配 */
+[theme="dark"] .skeleton-avatar,
+[theme="dark"] .skeleton-line {
+  background: linear-gradient(90deg, #2a2a2a 25%, #3a3a3a 50%, #2a2a2a 75%);
+  background-size: 200% 100%;
+}
+
 </style>
diff --git a/src/views/dialogue/components/MultiSelectTags.vue b/src/views/dialogue/components/MultiSelectTags.vue
index ac06ba44..98a49e61 100644
--- a/src/views/dialogue/components/MultiSelectTags.vue
+++ b/src/views/dialogue/components/MultiSelectTags.vue
@@ -210,7 +210,14 @@ const checkTagsOverflow = () => {
           >
             <template #suffix>
               <el-icon :size="16" class="search-input__icon">
-                <img src="@/assets/svgs/search.svg" />
+                <img 
+                  v-if="themeStore.theme === 'light'"
+                  src="@/assets/svgs/search.svg" 
+                />
+                <img 
+                  v-else
+                  src="@/assets/svgs/search_dark.svg" 
+                />
               </el-icon>
             </template>
           </ElInput>
@@ -319,6 +326,11 @@ const checkTagsOverflow = () => {
   & i {
     margin-right: 4px;
   }
+  
+  // 深色主题样式
+  body[theme='dark'] & {
+    color: #a3a6ad;
+  }
 }
 
 :deep(.el-collapse-item__arrow) {
@@ -444,6 +456,12 @@ const checkTagsOverflow = () => {
   white-space: nowrap; /* 防止标签内容换行 */
   overflow: hidden;
   text-overflow: ellipsis;
+  
+  // 深色主题样式
+  body[theme='dark'] & {
+    background-color: #2a3441;
+    color: #7aa5ff;
+  }
   .tag-text {
     white-space: nowrap; /* 防止标签内容换行 */
     overflow: hidden;
@@ -470,6 +488,16 @@ const checkTagsOverflow = () => {
       background-color: rgba(245, 108, 108, 0.1);
       border-radius: 50%;
     }
+    
+    // 深色主题样式
+    body[theme='dark'] & {
+      color: #8d98aa;
+      
+      &:hover {
+        color: #ff7875;
+        background-color: rgba(255, 120, 117, 0.15);
+      }
+    }
   }
 }
 </style>
@@ -513,6 +541,15 @@ const checkTagsOverflow = () => {
     &:hover {
       color: #f56c6c;
     }
+    
+    // 深色主题样式
+    body[theme='dark'] & {
+      color: #8d98aa;
+      
+      &:hover {
+        color: #ff7875;
+      }
+    }
   }
 }
 
@@ -546,9 +583,24 @@ const checkTagsOverflow = () => {
   transition: all 0.2s ease;
   width: calc(100% - 48px);
   margin-top: 8px;
+  
+  // 深色主题下的渐变背景
+  body[theme='dark'] & {
+    background-image: linear-gradient(
+      to right,
+      rgb(52, 58, 67),
+      rgb(42, 47, 55)
+    );
+  }
   &:hover {
     outline: 1px solid #7aa5ff;
     box-shadow: 0 4px 8px rgba(0, 0, 0, 0.05);
+    
+    // 深色主题下的hover效果
+    body[theme='dark'] & {
+      outline: 1px solid #6395fd;
+      box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
+    }
   }
 
   &.selected {
@@ -586,7 +638,7 @@ const checkTagsOverflow = () => {
   margin: 0;
   font-size: 16px;
   font-weight: 600;
-  color: var(--o-text-color-primary);
+  color: var(--o-text-color);
 }
 
 .checkmark {
@@ -627,6 +679,11 @@ const checkTagsOverflow = () => {
   text-overflow: ellipsis;
   color: #999;
   margin-top: 8px;
+  
+  // 深色主题样式
+  body[theme='dark'] & {
+    color: #8d98aa;
+  }
 }
 .global-modal-overlay {
   position: fixed;
-- 
Gitee