From 8fd12f4cf02cbd7a7ab97efc6bf328820a525004 Mon Sep 17 00:00:00 2001
From: li-shengren-123456 <lishengren@h-partners.com>
Date: Mon, 24 Feb 2025 16:17:42 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=B0=83=E8=AF=95?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/conversation.ts                     |  2 +-
 src/views/createapp/components/appConfig.vue  |  2 +-
 .../components/codeMirror/nodeMirrorText.vue  |  6 +-
 src/views/createapp/components/workFlow.vue   | 26 ++++---
 .../workFlowConfig/workFlowDialog.vue         | 10 ++-
 .../workFlowConfig/yamlEditDrawer.vue         | 10 +--
 src/views/createapp/index.vue                 | 75 +++++++++++++++----
 src/views/styles/workFlowArrange.scss         |  1 +
 8 files changed, 93 insertions(+), 39 deletions(-)

diff --git a/src/store/conversation.ts b/src/store/conversation.ts
index 9057a9d..1d62d6e 100644
--- a/src/store/conversation.ts
+++ b/src/store/conversation.ts
@@ -315,7 +315,7 @@ export const useSessionStore = defineStore('conversation', () => {
                 target.data.output = message.content
                 target.status = message.flow?.stepStatus;
                 // 工作流添加每阶段的时间耗时
-                target['costTime'] = message.time_cost;
+                target['costTime'] = message.metadata?.time_cost;
                 if(message.flow.step_status === "error"){
                   conversationItem.flowdata.status = message.flow?.stepStatus;
                 }
diff --git a/src/views/createapp/components/appConfig.vue b/src/views/createapp/components/appConfig.vue
index b39a3ff..e8b7969 100644
--- a/src/views/createapp/components/appConfig.vue
+++ b/src/views/createapp/components/appConfig.vue
@@ -138,7 +138,7 @@ watch(
   async () => {
     if (createAppFormRef.value && props.handleValidateContent) {
       const formBalidate = await validateForm();
-      props.handleValidateContent(!formBalidate);
+      props.handleValidateContent(formBalidate);
     }
   },
   { deep: true, immediate: true },
diff --git a/src/views/createapp/components/codeMirror/nodeMirrorText.vue b/src/views/createapp/components/codeMirror/nodeMirrorText.vue
index e72724d..ba8073c 100644
--- a/src/views/createapp/components/codeMirror/nodeMirrorText.vue
+++ b/src/views/createapp/components/codeMirror/nodeMirrorText.vue
@@ -5,7 +5,7 @@
     <el-collapse-item v-for="(item, index) in resultInfo.infoList" :key="index" :name="item.id">
       <template #title>
         <span class="icon" :class="`${resultInfo.status}Icon`"></span>
-        <span>{{ item.title }}</span>
+        <span>{{ resultInfo.title }}</span>
         <!-- 这里接口返回的需要限制最大位数 -->
         <span class="time" :class="`${resultInfo.status}Bg`" v-if="resultInfo.time">{{ resultInfo.time }}</span>
         <span class="flexRight">展开结果</span>
@@ -51,10 +51,10 @@ const nodeResult = ref();
 const resultInfo = ref({
   time: '3.1s',
   status: '', // 成功/失败/运行中三种状态
+  title: '运行成功',
   infoList: [
     {
       id: '1',
-      title: '运行成功',
       desc: [
         // 定义的假数据，后期由接口获取
         {
@@ -75,7 +75,7 @@ watch(
   () => {
     resultInfo.value.status = props.status;
     // 目前props.status只有success、error、running三种
-    resultInfo.value.infoList[0].title = StatusInfoTitle[props.status];
+    resultInfo.value.title = StatusInfoTitle[props.status];
     if (props?.inputAndOutput) {
 
       resultInfo.value.time = props.inputAndOutput.input_parameters.timeout ?? 0;
diff --git a/src/views/createapp/components/workFlow.vue b/src/views/createapp/components/workFlow.vue
index ae8ba3f..69fc297 100644
--- a/src/views/createapp/components/workFlow.vue
+++ b/src/views/createapp/components/workFlow.vue
@@ -42,7 +42,7 @@ const apiServiceList = ref([]);
 const allApiServiceList = ref([]);
 const yamlContent = ref();
 const nodeYamlId = ref();
-const emits = defineEmits(['validateConnect']);
+const emits = defineEmits(['validateConnect', 'updateFlowsDebug']);
 const route = useRoute();
 const workFlowList = ref([]);
 const props = defineProps(['flowList']);
@@ -80,7 +80,7 @@ const { onDragOver, onDrop, onDragLeave, onDragStart } = useDragAndDrop();
 // 这里是初始化的开始结束的节点
 const initNodes = ref([
   {
-    id: 'node1',
+    id: 'start',
     type: 'start',
     data: {
       name: '开始',
@@ -92,7 +92,7 @@ const initNodes = ref([
     position: { x: 100, y: 160 },
   },
   {
-    id: 'node2',
+    id: 'end',
     type: 'end',
     data: {
       name: '结束',
@@ -276,7 +276,6 @@ const handleDebugDialogOps = (visible) => {
   })
   // 调试弹窗关闭时---需要将边状态清空
   getEdges.value.forEach(edge => {
-    console.log(edge, 'ecge')
     // 更新节点的起源与终点
     updateEdgeData(edge.id, {targetStatus: 'default'})
     updateEdgeData(edge.id, {sourceStatus: 'default'})
@@ -340,6 +339,8 @@ const queryFlow = (deal: string) => {
               choiceFlowId(workFlowList.value[0]);
             }
           }
+          // 更新当前publish状态
+          emits('updateFlowsDebug');
         }
       });
   }
@@ -395,6 +396,8 @@ const redrageFlow = (nodesList, edgesList) => {
         name: node.name,
         description: node.description,
         parameters: node.parameters,
+        nodeMetaDataId: node.nodeMetaDataId,
+        serviceId: node.serviceId,
       },
       position: node.position,
       deletable: true,
@@ -441,6 +444,7 @@ $bus.on('getNodesStatue', lines => {
         totalTime.value = 0;
         debugTime.value = '';
         debugStatus.value = newLines.data.flow?.stepStatus;
+        updateNodeFunc('start', 'success', '')
       }
       
       // 这里判断是否有调试状态的值，无值不处理
@@ -452,13 +456,17 @@ $bus.on('getNodesStatue', lines => {
           // output-节点运行结束时，获取节点运行的耗时
           let constTime = '';
           if (newLines.data.event === 'step.output') {
-            totalTime.value += newLines.data?.time_cost;
-            constTime = `${newLines.data?.time_cost?.toFixed(3)}s`
+            totalTime.value += newLines.data?.metadata?.time_cost;
+            constTime = `${newLines.data?.metadata?.time_cost?.toFixed(3)}s`
           }
+          console.log(newLines.data, 'step---id', newLines.data.flow?.stepStatus, '---', constTime)
           updateNodeFunc(newLines.data.flow.stepId, newLines.data.flow?.stepStatus, constTime);
       } else if (newLines?.data?.event === 'flow.stop') {
         debugStatus.value = newLines.data.flow?.stepStatus;
+
         debugTime.value = `${totalTime.value.toFixed(3)}s`
+        // 最后更新-调用一下接口
+        emits('updateFlowsDebug')
       } else {
         // do nothing
       }
@@ -503,6 +511,7 @@ const saveFlow = (updateNodeParameter?) => {
       position: item.position,
       apiId: item.data.nodeMetaDataId,
       serviceId: item.data.serviceId,
+      nodeMetaDataId: item.data.nodeMetaDataId,
       nodeId: item.id,
       ...item.data,
     };
@@ -548,7 +557,6 @@ const saveFlow = (updateNodeParameter?) => {
       }
     });
   }
-  // return;
   // 更新最新的节点与边的数据
   api
     .createOrUpdateFlowTopology(
@@ -779,10 +787,6 @@ defineExpose({
   ></EditYamlDrawer>
 </template>
 <style lang="scss">
-// @keyframes spin {
-//   0% {transform: rotate(0deg);}
-//   100% {transform: rotate(0deg);}
-// }
 .debugStatus {
   display: flex;
   height: 32px;
diff --git a/src/views/createapp/components/workFlowConfig/workFlowDialog.vue b/src/views/createapp/components/workFlowConfig/workFlowDialog.vue
index 8564ce7..0e4b341 100644
--- a/src/views/createapp/components/workFlowConfig/workFlowDialog.vue
+++ b/src/views/createapp/components/workFlowConfig/workFlowDialog.vue
@@ -92,13 +92,14 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
               nodes: [
                 {
                   apiId: 'startId',
+                  nodeMetaDataId: 'start',
+                  serviceId: 'start',
                   name: '开始',
-                  serviceId: 'startService',
                   type: 'start',
                   description: 'startNode',
                   editable: false,
                   enable: true,
-                  nodeId: 'node1',
+                  nodeId: 'start',
                   position: {
                     x: 100,
                     y: 160,
@@ -106,13 +107,14 @@ const handleSubmit = (formEl: FormInstance | undefined) => {
                 },
                 {
                   apiId: 'endId',
+                  nodeMetaDataId: 'end',
+                  serviceId: 'end',
                   name: '结束',
-                  serviceId: 'endService',
                   type: 'end',
                   description: 'endNode',
                   editable: false,
                   enable: true,
-                  nodeId: 'node2',
+                  nodeId: 'end',
                   position: {
                     x: 600,
                     y: 160,
diff --git a/src/views/createapp/components/workFlowConfig/yamlEditDrawer.vue b/src/views/createapp/components/workFlowConfig/yamlEditDrawer.vue
index 79aff4d..8e5052f 100644
--- a/src/views/createapp/components/workFlowConfig/yamlEditDrawer.vue
+++ b/src/views/createapp/components/workFlowConfig/yamlEditDrawer.vue
@@ -92,13 +92,13 @@ const updateNodeYaml = () => {
   let transResult;
   try {
     transResult = yaml.load(yamlExpress.value[0].yamlCode);
-  } catch(error) {
+    // 调用接口并更新
+    emits('saveNode', transResult, props.nodeYamlId);
+    closeDrawer();
+  } catch (error) {
     ElMessage.error('请检查格式是否正确');
   }
-  // 调用接口并更新
-  emits('saveNode', transResult, props.nodeYamlId);
-  closeDrawer();
-}
+};
 </script>
 
 <style lang="scss">
diff --git a/src/views/createapp/index.vue b/src/views/createapp/index.vue
index 8c1ccdf..53d0893 100644
--- a/src/views/createapp/index.vue
+++ b/src/views/createapp/index.vue
@@ -12,8 +12,8 @@ import { IconSuccess,  IconRemind} from '@computing/opendesign-icons';
 const router = useRouter();
 const route = useRoute();
 const publishStatus = ref('未发布');
-const publishValidate = ref(true);
-const appFormValidate = ref(true);
+const publishValidate = ref(false);
+const appFormValidate = ref(false);
 const createAppType = ref('appConfig');
 const appConfigRef = ref();
 const workFlowRef = ref();
@@ -47,14 +47,36 @@ const handleValidateContent = valid => {
 
 // 获取工作流组件中的节点连接状态校验
 const validateConnect = valid => {
-  publishValidate.value = !valid;
+  // publishValidate.value = !valid;
 };
 
+// 获取当前的应用中的各flowsDebug的情况
+const updateFlowsDebug = () => {
+  api.querySingleAppData({
+        id: route.query?.appId as string,
+      })
+      .then(res => {
+        if (res?.[1]?.result) {
+          flowList.value = res?.[1]?.result?.workflows || [];
+          judgeAppFlowsDebug();
+        }
+      })
+}
+
 // 获取工作流列表
 const getFlowList = flowDataList => {
   flowList.value = flowDataList;
+  judgeAppFlowsDebug()
 };
 
+const judgeAppFlowsDebug = () => {
+  // 判断应用下的所有工作流当前是否debug通过
+  const flowsDebug = flowList.value.every(item => item?.debug);
+  // 初始化时，获取发布的校验结果---必须有工作流且所有工作流必须debug通过
+  publishValidate.value = flowList.value?.length > 0 && flowsDebug;
+
+}
+
 // 保存按钮
 const saveConfigOrFlow = () => {
   if (createAppType.value === 'appConfig') {
@@ -122,7 +144,9 @@ const handleJumperAppCenter = () => {
           <span>/</span>
           <span class="createAppContainerMenuText">创建应用</span>
         </div>
-        <div class="createAppContainerStatus" :class="{ debugSuccess: publishStatus === '已发布'}">{{ publishStatus }}</div>
+        <div class="createAppContainerStatus" :class="{ debugSuccess: publishStatus === '已发布' }">
+          {{ publishStatus }}
+        </div>
       </div>
       <div class="createAppContainerType">
         <div
@@ -131,34 +155,57 @@ const handleJumperAppCenter = () => {
           @click="handleChangeAppType('appConfig')"
         >
           <div>界面配置</div>
-          <el-icon class="warningRemind" v-if="appFormValidate">
-            <IconRemind />
-          </el-icon>
-          
-          <el-icon v-else>
+
+          <el-icon v-if="appFormValidate">
             <IconSuccess />
           </el-icon>
+          <el-icon v-else class="warningRemind">
+            <IconRemind />
+          </el-icon>
         </div>
         <div
           class="createAppBtn"
           :class="{ createAppBtnActive: createAppType !== 'appConfig' }"
           @click="handleChangeAppType('workFlow')"
         >
-          工作流编排<span>{{ flowValid }}</span>
+          <div>工作流编排</div>
+          <el-icon v-if="publishValidate">
+            <IconSuccess />
+          </el-icon>
+          <el-icon v-else class="warningRemind">
+            <IconRemind />
+          </el-icon>
         </div>
       </div>
     </div>
     <div class="createAppContainerMain" v-show="createAppType === 'appConfig'">
-      <AppConfig :handleValidateContent="handleValidateContent" @getFlowList="getFlowList" @getPublishStatus="getPublishStatus" ref="appConfigRef" />
+      <AppConfig
+        :handleValidateContent="handleValidateContent"
+        @getFlowList="getFlowList"
+        @getPublishStatus="getPublishStatus"
+        ref="appConfigRef"
+      />
     </div>
     <div class="createWorkFlowContainerMain" v-show="createAppType !== 'appConfig'">
-      <WorkFlow @validateConnect="validateConnect" :flowList="flowList" ref="workFlowRef" />
+      <WorkFlow
+        @validateConnect="validateConnect"
+        @updateFlowsDebug="updateFlowsDebug"
+        :flowList="flowList"
+        ref="workFlowRef"
+      />
     </div>
     <div class="createAppContainerFooter">
       <el-button @click="handleJumperAppCenter">取消</el-button>
-      <el-button @click="saveConfigOrFlow" :disabled="createAppType === 'appConfig' ? appFormValidate : false">保存</el-button>
+      <el-button @click="saveConfigOrFlow" :disabled="createAppType === 'appConfig' ? !appFormValidate : false"
+        >保存</el-button
+      >
       <el-button :disabled="true">预览</el-button>
-      <el-button type="primary" @click="handlePulishApp()">发布</el-button>
+      <el-tooltip :disabled="publishValidate" content="需要当前应用中所有工作流调试成功才能发布应用" placement="top">
+        <!-- 需要多一层，不然影响当前 -->
+        <div>
+          <el-button type="primary" :disabled="!publishValidate" @click="handlePulishApp()">发布</el-button>
+        </div>
+      </el-tooltip>
     </div>
   </div>
 </template>
diff --git a/src/views/styles/workFlowArrange.scss b/src/views/styles/workFlowArrange.scss
index 909414d..a1cf5b3 100644
--- a/src/views/styles/workFlowArrange.scss
+++ b/src/views/styles/workFlowArrange.scss
@@ -90,6 +90,7 @@
   .apiCenterBox {
     height: 100%;
     display: flex;
+    min-width: 264px;
     flex-direction: column;
     .apiCenterTitle {
       color: var(--o-text-color-primary);
-- 
Gitee


From 234cb4addde77ae9a8030d9042e437cae7d1d7b2 Mon Sep 17 00:00:00 2001
From: li-shengren-123456 <lishengren@h-partners.com>
Date: Mon, 24 Feb 2025 16:27:05 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dialogue/components/DialogueSession.vue | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/views/dialogue/components/DialogueSession.vue b/src/views/dialogue/components/DialogueSession.vue
index 876a762..799915e 100644
--- a/src/views/dialogue/components/DialogueSession.vue
+++ b/src/views/dialogue/components/DialogueSession.vue
@@ -581,16 +581,6 @@ onMounted(() => {
   inputRef.value.focus();
 });
 
-watch(
-  () => props,
-  () => {
-    modeOptions.value = props.modeOptions;
-  },
-  {
-    deep: true,
-  },
-);
-
 watch(selectMode, (newValue, oldValue) => {
   user_selected_app.value = [];
   let first = true;
-- 
Gitee