From 4a651ced7de7262cb41c4f43a974f4eac6ab98a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jack=E9=AD=8F?= <weihaohao2@huawei.com>
Date: Tue, 9 Sep 2025 19:21:27 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9AMCP=E7=BC=96=E8=BE=91config?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98=E3=80=82=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=B1=95=E7=A4=BA=E4=BA=A4=E4=BA=92=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/dialoguePanel/DialogueFlow.vue | 35 +++++++++++------
 src/store/conversation.ts                     | 29 ++++++++++++--
 src/views/api/components/McpDrawer.vue        | 38 ++++++++++++-------
 .../dialogue/components/DialogueSession.vue   |  1 +
 4 files changed, 73 insertions(+), 30 deletions(-)

diff --git a/src/components/dialoguePanel/DialogueFlow.vue b/src/components/dialoguePanel/DialogueFlow.vue
index 884ea2b..66816eb 100644
--- a/src/components/dialoguePanel/DialogueFlow.vue
+++ b/src/components/dialoguePanel/DialogueFlow.vue
@@ -20,7 +20,6 @@ const props = withDefaults(
 const contents = ref();
 const exData = ref(<any>[]);
 const exParam = ref(<any>[]);
-const dataStatus = ref(false);
 const paramIndex = ref(0);
 const taskId = ref();
 const totalTime = ref(0);
@@ -32,7 +31,6 @@ if (props.flowdata) {
     for (const item of props.flowdata.data[0]) {
       if (item && item?.data.exData) {
         if (item.data.exData.reason) {
-          exData.value.push(item.data.exData);
         } else if (item.data.exData.message) {
           exParam.value.push(item.data.exData);
         }
@@ -55,6 +53,7 @@ function getRiskType(risk) {
 
 const doFlow = async (type) => {
   if (taskId) {
+    exData.value.pop();
     taskId.value = null;
     let content = '';
     await sendQuestion(
@@ -68,7 +67,6 @@ const doFlow = async (type) => {
       null,
       'wait',
     );
-    dataStatus.value = true;
   }
 };
 
@@ -112,10 +110,25 @@ watch(
       if (props.flowdata?.data.exParam) {
         exParam.value.push(props.flowdata?.data.exParam);
       } else {
-        dataStatus.value = false;
         exData.value.push(props.flowdata?.data.exData);
       }
       taskId.value = props.flowdata?.taskId;
+    } else {
+      let newContentList = props.flowdata?.data;
+      for (const newContent of newContentList) {
+        if (!(newContent instanceof Array)) {
+          continue;
+        }
+        for (const item of newContent) {
+          let input = item.data.input;
+          const isDuplicate = contents.value[0].data[0].some(
+            (it) => it.id === item.id,
+          );
+          if (!isDuplicate && input) {
+            contents.value[0].data[0].push(item);
+          }
+        }
+      }
     }
   },
   { deep: true, immediate: true },
@@ -133,7 +146,7 @@ watch(
     }"
   >
     <section>
-      <el-collapse v-model="activeNames" class="o-hpc-collapse">
+      <el-collapse v-model="activeNames" class="o-hpc-collapse" accordion>
         <el-collapse-item
           v-for="item in contents"
           class="title"
@@ -202,11 +215,7 @@ watch(
               />
             </el-icon>
           </template>
-          <template
-            v-for="(p, $index) in item.data"
-            :key="$index"
-            class="6645ds"
-          >
+          <template v-for="(p, $index) in item.data" :key="p.id">
             <div v-if="!Array.isArray(p)" class="o-collapse-content">
               {{ p }}
             </div>
@@ -219,6 +228,7 @@ watch(
                 class="o-collapse-item normal"
                 v-for="secItem in p"
                 :key="secItem.id"
+                :title="secItem.title"
                 :name="secItem.id"
               >
                 <template #title>
@@ -279,7 +289,7 @@ watch(
           </template>
         </el-collapse-item>
       </el-collapse>
-      <div>
+      <div style="margin 0px 16px;">
         <el-alert
           class="wait-div"
           v-for="(item, index) in exData"
@@ -289,8 +299,9 @@ watch(
           :description="item?.reason"
           show-icon
           :closable="false"
+          style="background: #FBF6E5;"
         />
-        <div class="flow-button" v-if="taskId && exData && !dataStatus">
+        <div class="flow-button" v-if="taskId && exData">
           <el-button @click="doFlow(false)">
             {{ t('common.cancel') }}
           </el-button>
diff --git a/src/store/conversation.ts b/src/store/conversation.ts
index b894418..a462446 100644
--- a/src/store/conversation.ts
+++ b/src/store/conversation.ts
@@ -147,7 +147,7 @@ export const useSessionStore = defineStore('conversation', () => {
       );
       if (target) {
         target.data.output = message.content;
-        target.status = flow.stepStatus;
+        target.status = 'success';
         // 工作流添加每阶段的时间耗时
         target['costTime'] = metadata.timeCost;
         if (flow.step_status === 'error' && conversationItem.flowdata) {
@@ -268,6 +268,23 @@ export const useSessionStore = defineStore('conversation', () => {
         data: conversationItem?.flowdata?.data,
       };
     },
+    flowSuccess: (
+      conversationItem: RobotConversationItem,
+      message: Record<string, unknown>,
+      isFlowDebug: boolean,
+    ) => {
+      const content = (message.content || {}) as Record<string, unknown>;
+      const contentFlow = (content.flow || {}) as Record<string, string>;
+      const messageFlow = (message.flow || {}) as Record<string, string>;
+      conversationItem.flowdata = {
+        id: contentFlow.stepId,
+        title: i18n.global.t('flow.flow_end'),
+        progress: contentFlow.stepProgress,
+        status: 'success',
+        display: true,
+        data: conversationItem?.flowdata?.data,
+      };
+    },
   };
 
   // chat message回调
@@ -349,6 +366,10 @@ export const useSessionStore = defineStore('conversation', () => {
           //时间流结束
           dataTransfers.flowStop(conversationItem, message, !!params.type);
           break;
+        case 'flow.success':
+          //时间流结束
+          dataTransfers.flowSuccess(conversationItem, message, !!params.type);
+          break;
         default:
           break;
       }
@@ -863,8 +884,8 @@ export const useSessionStore = defineStore('conversation', () => {
   const generateFlowData = (record: any): FlowDataType => {
     const flowData = {
       id: record.recordId,
-      title: record.id,
-      status: 'success',
+      title: record.flowName,
+      status: record.flowStatus,
       display: true,
       flowId: record.flowId,
       data: [[]] as any[],
@@ -874,7 +895,7 @@ export const useSessionStore = defineStore('conversation', () => {
     for (let i = 0; i < record.steps.length; i++) {
       flowData.data[0].push({
         id: record.steps[i].stepId,
-        title: record.steps[i].stepId,
+        title: record.steps[i].stepName,
         status: record.steps[i].stepStatus,
         data: {
           input: record.steps[i].input,
diff --git a/src/views/api/components/McpDrawer.vue b/src/views/api/components/McpDrawer.vue
index ccf2060..f54c049 100644
--- a/src/views/api/components/McpDrawer.vue
+++ b/src/views/api/components/McpDrawer.vue
@@ -32,25 +32,20 @@ const COMMAND_TEMPLATE = {
   command: '',
   args: [],
   env: {},
-  autoApprove: [],
-  autoInstall: true,
-  disabled: false,
 };
 const URL_TEMPLATE = {
+  headers: '',
   url: '',
-  env: {},
-  autoApprove: [],
-  autoInstall: true,
-  disabled: false,
 };
+const STREAM = {};
 
 const loading = ref(false);
 
-const mcpConfigTemplate = {
+const mcpConfigTemplate = ref({
   stdio: COMMAND_TEMPLATE,
   sse: URL_TEMPLATE,
-  stream: URL_TEMPLATE,
-};
+  stream: STREAM,
+});
 
 const form = reactive<McpDetail>({
   icon: '',
@@ -178,7 +173,6 @@ async function onConfirm(formEl: FormInstance | undefined) {
     jsonEditorRef.value.setJsonValue('{\n  \n}');
     emits('success');
     loading.value = false;
-
   } catch (error) {
     console.error('Create or update MCP service failed:', error);
     ElMessage({
@@ -200,13 +194,23 @@ async function getMcpServiceDetail(serviceId: string) {
     form.description = description;
     form.type = mcpType;
     form.mcpConfig = data;
-    jsonEditorRef.value.setJsonValue(form.mcpConfig);
+    let json = {};
+    if (mcpType === 'stdio') {
+      json.command = data.command;
+      json.args = data.args;
+      json.env = data.env;
+    } else if (mcpType === 'sse') {
+      json.headers = data.headers;
+      json.url = data.url;
+    }
+    jsonEditorRef.value.setJsonValue(JSON.stringify(json, null, 2));
+    mcpConfigTemplate.value[mcpType] = json;
   }
 }
 
 async function setMcpConfig(type: string) {
   jsonEditorRef.value.setJsonValue(
-    JSON.stringify(mcpConfigTemplate[type], null, 2),
+    JSON.stringify(mcpConfigTemplate.value[type], null, 2),
   );
 }
 
@@ -222,6 +226,12 @@ watch(
       }
       getMcpServiceDetail(props.serviceId);
     } else {
+      // 初始化
+      mcpConfigTemplate.value = {
+        stdio: COMMAND_TEMPLATE,
+        sse: URL_TEMPLATE,
+        stream: STREAM,
+      };
       if (formRef.value) formRef.value.resetFields();
       setMcpConfig(form.type);
     }
@@ -240,7 +250,7 @@ watch(
       :model-value="visible"
       @close="emits('update:visible', false)"
     >
-    <CustomLoading :loading="loading"></CustomLoading>
+      <CustomLoading :loading="loading"></CustomLoading>
       <div class="wrapper">
         <div class="content">
           <el-form
diff --git a/src/views/dialogue/components/DialogueSession.vue b/src/views/dialogue/components/DialogueSession.vue
index 27c8ce1..ea2e727 100644
--- a/src/views/dialogue/components/DialogueSession.vue
+++ b/src/views/dialogue/components/DialogueSession.vue
@@ -561,6 +561,7 @@ const getProviderLLM = async () => {
 const autoExecuteChange = (value) => {
   autoExecuteRef.value = value;
   api.updateUserInfo({ autoExecute: value });
+  api.getPartAppConfgUser();
 };
 
 onMounted(() => {
-- 
Gitee