From cf823c26eeb7c2db56ab7c120f3d40dff487397b Mon Sep 17 00:00:00 2001
From: cc500 <2014434568@qq.com>
Date: Sun, 23 Feb 2025 16:03:03 +0800
Subject: [PATCH 1/6] =?UTF-8?q?1.=E8=AF=AD=E4=B9=89=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=8A=9F=E8=83=BD=E5=85=A8=E9=83=A8=E8=B0=83?=
 =?UTF-8?q?=E9=80=9A=202.=E4=BF=AE=E6=94=B9=20initCopilot=20=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E5=89=8D=E7=BD=AE=E5=9C=A8=20DialogueView=20=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Upload/index.vue               |  53 ++++++--
 src/store/account.ts                          |   5 +-
 src/views/api/index.vue                       |  35 ++---
 src/views/dialogue/Copilot.vue                |  77 +----------
 .../dialogue/components/DialogueSession.vue   | 127 +-----------------
 src/views/dialogue/dialogueView.vue           |  33 ++++-
 6 files changed, 101 insertions(+), 229 deletions(-)

diff --git a/src/components/Upload/index.vue b/src/components/Upload/index.vue
index 667955d..b79a5d7 100644
--- a/src/components/Upload/index.vue
+++ b/src/components/Upload/index.vue
@@ -5,15 +5,14 @@ import * as jsYaml from 'js-yaml';
 import { IconUpload, IconVisible, IconDelete } from '@computing/opendesign-icons';
 import type { UploadFile, ElUploadProgressEvent, ElFile } from 'element-plus/es/components/upload/src/upload.type';
 import { Codemirror } from 'vue-codemirror';
-import { onMounted } from 'vue';
 import { api } from 'src/apis';
 import { IconChevronDown } from '@computing/opendesign-icons';
 
-const handleCreateapi = (data: any) => {
+const handleCreateapi = () => {
   api
     .createOrUpdateApi({
-      serviceId: '',
-      data,
+      serviceId: props.serviceId||'',
+      data:yamlToJsonContent.value,
     })
     .then(res => {
       getServiceJson.value = res[1].result.apis;
@@ -59,14 +58,27 @@ const handleClose = () => {
   emits('closeDrawer');
 };
 
-const uploadtype = ref(props.type);
+const handleEditClose = () => {
+  //清空数据
+  // getServiceYaml.value = '';
+  // yamlToJsonContent.value = '';
+  // getServiceJson.value = '';
+  emits('closeDrawer');
+};
 
+const handleEdit = () => {
+  //edit数据
+  editable.value = true;
+};
+
+const uploadtype = ref(props.type);
 const getServiceYaml = ref('');
 const yamlToJsonContent = ref('');
 const getServiceJson = ref('');
 const imageUrl = ref('');
 const progressVal = ref(0);
 const uploadDone = ref(false);
+const editable = ref(false);
 // 上传前检查
 const beforeUpload = async (file: ElFile) => {
   const isYaml = file.type === 'application/x-yaml' || file.type === 'text/yaml'; // 也可能遇到 text/yaml 类型
@@ -85,7 +97,6 @@ const beforeUpload = async (file: ElFile) => {
     });
     return false;
   }
-
   try {
     const reader = new FileReader();
     reader.onload = async event => {
@@ -146,18 +157,37 @@ const doPreview = (e: Event) => {
   e.stopPropagation();
 };
 
+const getServiceYamlFun = async (id: string) => {
+  await api.querySingleApiData({serviceId:id,edit:true}).then((res) => {
+      if(res) {
+        getServiceYaml.value = jsYaml.dump(res[1]?.result.data);
+      }
+  })
+}
+const handleChange = (payload) => {
+  yamlToJsonContent.value = jsYaml.load(payload);
+  setTimeout(() => {
+    payload.view.scrollDOM.scrollTop = 0;
+  }, 100);
+};
 watch(
   () => props,
   () => {
     getServiceJson.value = props.getServiceJson;
     getServiceYaml.value = props.getServiceYaml;
     if (props.type === 'edit' && props) {
-      console.log('edit');
-      // getServiceYamlFun(props.serviceId);
+      getServiceYamlFun(props.serviceId);
     }
   },
   { immediate: true, deep: true },
 );
+
+watch(
+  () => getServiceYaml,
+  () => {
+    yamlToJsonContent.value = jsYaml.load(getServiceYaml.value);
+  }
+)
 </script>
 <template>
   <el-upload
@@ -209,8 +239,9 @@ watch(
       :indent-with-tab="true"
       :tab-size="2"
       :extensions="extensions"
-      :disabled="disabled"
+      :disabled="!editable"
       @ready="handleReady"
+      @change="handleChange"
     />
   </div>
   <div class="json-container" v-if="uploadtype === 'get'">
@@ -239,8 +270,8 @@ watch(
   </div>
   <div class="drawerFooter" v-if="uploadtype === 'edit'">
     <el-button @click="handleClose">取消</el-button>
-    <el-button @click="handleClose">编辑</el-button>
-    <el-button type="primary" @click="handleCreateapi(yamlToJsonContent)">解析</el-button>
+    <el-button @click="handleEdit">编辑</el-button>
+    <el-button type="primary" @click="handleCreateapi()">解析</el-button>
   </div>
   <div class="drawerFooter" v-if="uploadtype === 'get'">
     <el-button @click="handleClose">取消</el-button>
diff --git a/src/store/account.ts b/src/store/account.ts
index 55a278a..eb52afe 100644
--- a/src/store/account.ts
+++ b/src/store/account.ts
@@ -24,10 +24,12 @@ export const useAccountStore = defineStore('account', () => {
     username: string;
     revsionNumber: string | null;
     organization: string;
+    user_sub: string;
   }>({
     username: '',
     revsionNumber: null,
     organization: '',
+    user_sub:'', // 用户唯一标识
   });
 
   /**
@@ -93,8 +95,9 @@ export const useAccountStore = defineStore('account', () => {
   const getUserInfo = async (): Promise<boolean> => {
     const [_, res] = await api.authorizeUser();
     if (!_ && res) {
-      const { organization, username, revision_number } = res.result;
+      const { organization, username, revision_number, user_sub } = res.result;
       userinfo.username = username;
+      userinfo.user_sub = user_sub;
       userinfo.organization = organization;
       userinfo.revsionNumber = revision_number;
       return true;
diff --git a/src/views/api/index.vue b/src/views/api/index.vue
index 30f6a18..91eb764 100644
--- a/src/views/api/index.vue
+++ b/src/views/api/index.vue
@@ -62,7 +62,7 @@
             </div>
             <div class="apiCenterCardBottom">
               <div class="apiCenterCardUser">@{{ apiItem.author }}</div>
-              <div class="apiCenterCardOps">
+              <div class="apiCenterCardOps" v-if="userinfo.user_sub === apiItem.author">
                 <el-button text @click="openSidebar('edit', apiItem.serviceId)">编辑</el-button>
                 <el-button text @click="handleDelapi(apiItem)">删除</el-button>
               </div>
@@ -86,7 +86,7 @@
         <Upload type="get" @closeDrawer="handleClose" :serviceId="selectedServiceId" :getServiceJson="getServiceJson" />
       </div>
       <div v-if="actions === 'edit'">
-        <Upload type="edit" @closeDrawer="handleClose" :serviceId="selectedServiceId" />
+        <Upload type="edit" @closeDrawer="handleClose" :serviceId="selectedServiceId" :getServiceYaml="getServiceYaml"/>
       </div>
     </el-drawer>
   </div>
@@ -102,6 +102,9 @@ import { ElMessageBox } from 'element-plus';
 import { IconAlarm } from '@computing/opendesign-icons';
 import Upload from '@/components/Upload/index.vue';
 import { successMsg } from 'src/components/Message';
+import { useAccountStore } from 'src/store';
+import { storeToRefs } from 'pinia';
+import * as jsYaml from 'js-yaml';
 
 const apiList = ref([1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
 const drawer = ref(false);
@@ -115,6 +118,7 @@ const selectedServiceId = ref('');
 const getServiceJson = ref('');
 const getServiceYaml = ref('');
 const apiSearchValue = ref();
+const { userinfo } = storeToRefs(useAccountStore());
 const pagination = ref({
   pageSizes: [16, 32, 64],
   layout: 'total,sizes,prev,pager,next,jumper',
@@ -129,30 +133,23 @@ const handleChangePage = (pageNum: number, pageSize: number) => {
   handleParmasQueryapiList();
 };
 
+const getServiceYamlFun = async (id: string) => {
+  await api.querySingleApiData({serviceId:id,edit:true}).then((res) => {
+      if(res) {
+        getServiceYaml.value = jsYaml.dump(res[1]?.result.data);
+      }
+  })
+}
+
 const getServiceJsonFun = async (id: string) => {
   await api.querySingleApiData({ serviceId: id }).then(res => {
     if (res) {
       getServiceJson.value = res[1]?.result.apis;
-    } else {
-      console.log(res);
     }
   });
 };
 
-// const getServiceYamlFun = async (id: string) => {
-//   await api.querySingleApiData({serviceId:id,edit:true}).then((res) => {
-//       if(res) {
-//         console.log(res[1]?.result.data);
-//         // getServiceYaml.value = res[1]?.result.data;
-//         console.log(getServiceYaml.value);
-//       } else {
-//       console.log(res);
-//     }
-//   })
-// }
-
 const openSidebar = (action: string, id: string) => {
-  console.log(id);
   drawer.value = true;
   actions.value = action;
   if (action === 'upload') {
@@ -162,6 +159,7 @@ const openSidebar = (action: string, id: string) => {
     // 展示编辑的框架
     actionName.value = '编辑语义接口';
     selectedServiceId.value = id;
+    getServiceYamlFun(id);
   } else if (action === 'get') {
     // 展示查看的框架
     actionName.value = '查看语义接口';
@@ -171,6 +169,9 @@ const openSidebar = (action: string, id: string) => {
 };
 
 const handleClose = () => {
+  actions.value = '';
+  getServiceJson.value = '';
+  getServiceYaml.value = '';
   drawer.value = false;
 };
 
diff --git a/src/views/dialogue/Copilot.vue b/src/views/dialogue/Copilot.vue
index 9761e3d..04ac62d 100644
--- a/src/views/dialogue/Copilot.vue
+++ b/src/views/dialogue/Copilot.vue
@@ -1,73 +1,13 @@
 <script setup lang="ts">
-import { onMounted, reactive, ref, watch } from 'vue';
-import { api } from 'src/apis';
-import { useRouter, useRoute } from 'vue-router';
-import { useHistorySessionStore, useAccountStore, useChangeThemeStore, useSessionStore } from 'src/store';
-import { storeToRefs } from 'pinia';
-import { useI18n } from 'vue-i18n';
+import { onMounted, ref } from 'vue';
+import { useAccountStore } from 'src/store';
 import { ARGEEMENT_VERSION } from 'src/conf/version';
 import DialogueAside from './components/DialogueAside.vue';
 import DialogueSession from './components/DialogueSession.vue';
 import EulerDialog from 'src/components/EulerDialog.vue';
 import { qiankunWindow } from 'vite-plugin-qiankun/dist/helper';
-const { user_selected_app } = storeToRefs(useHistorySessionStore());
-const route = useRoute();
-const router = useRouter();
-const { t } = useI18n();
 
-const { theme } = storeToRefs(useChangeThemeStore());
-const { userinfo } = storeToRefs(useAccountStore());
-const { getUserInfo, updateAgreement } = useAccountStore();
-const { getHistorySession } = useHistorySessionStore();
-const { app, appList } = storeToRefs(useSessionStore());
-const modeOptions = reactive([
-  {
-    label: t('main.Automatic'),
-    value: 'auto',
-    disabled: false,
-  },
-]);
-
-const setApps = async () => {
-  const [_, res] = await api.getRecognitionMode();
-  if (!_ && res) {
-    res.result.app.forEach(item => {
-      const opt = {
-        label: item.name,
-        value: item.id,
-        disabled: false,
-      };
-      modeOptions.push(opt);
-    });
-  }
-};
-
-const type = import.meta.env.VITE_USER_TYPE;
-const initCopilot = async (): Promise<void> => {
-  if (localStorage.getItem('theme')) {
-    theme.value = localStorage.getItem('theme') || 'light';
-  } else {
-    localStorage.setItem('theme', 'light');
-  }
-  const currRoute = router.currentRoute;
-  if (currRoute.value.query.appId) {
-    app.value = {
-      appId: String(currRoute.value.query.appId),
-      name: String(currRoute.value.query.name),
-    };
-  }
-  userinfo.value.organization = type;
-  if ( ['/copilot','/'].includes(currRoute.value?.path)) {
-    const isLogin = await getUserInfo();
-    if (isLogin) {
-      // await api.getRecognitionMode();
-      await api.stopGeneration();
-      await getHistorySession();
-      // setApps();
-  }
-    return;
-  } 
-};
+const { updateAgreement } = useAccountStore();
 
 const dialogVisible = ref(false);
 const agreeDialogVisiable = ref(false);
@@ -112,21 +52,12 @@ onMounted(async() => {
   });
 });
 
-watch(
-  () => route.path,
-  () => {
-    initCopilot();
-  },
-  {
-    immediate: true,
-  },
-);
 </script>
 <template>
   <div class="copilot-container" :class="qiankunWindow.__POWERED_BY_QIANKUN__ ? 'micro-copilot-container' : ''">
     <div class="copilot-container-main">
       <DialogueAside />
-      <DialogueSession :modeOptions="modeOptions" />
+      <DialogueSession/>
     </div>
   </div>
 
diff --git a/src/views/dialogue/components/DialogueSession.vue b/src/views/dialogue/components/DialogueSession.vue
index ee8decb..c397fb6 100644
--- a/src/views/dialogue/components/DialogueSession.vue
+++ b/src/views/dialogue/components/DialogueSession.vue
@@ -8,22 +8,17 @@ import { storeToRefs } from 'pinia';
 import { useSessionStore, useChangeThemeStore } from 'src/store';
 import type { ConversationItem, RobotConversationItem } from '../types';
 import type { UploadFileCard } from 'src/components/uploadFile/type.ts';
-import { UploadTypeName, UploadStatus, UploadType } from 'src/components/uploadFile/type';
+import { UploadTypeName, UploadStatus } from 'src/components/uploadFile/type';
 import CommonFooter from 'src/components/commonFooter/CommonFooter.vue';
 import { api } from 'src/apis';
 import { useHistorySessionStore } from 'src/store/historySession';
 import { successMsg, errorMsg } from 'src/components/Message';
-import { FitAddon } from 'xterm-addon-fit';
-import { AttachAddon } from 'xterm-addon-attach';
-import { Terminal } from 'xterm';
 import 'xterm/css/xterm.css';
 import i18n from 'src/i18n';
 const { user_selected_app, selectMode } = storeToRefs(useHistorySessionStore());
 const { getHistorySession } = useHistorySessionStore();
-const {session,app} = storeToRefs(useSessionStore());
 
 export interface DialogueSession {
-  modeOptions: any;
   isCreateApp: any;
   createAppForm: any;
 }
@@ -37,7 +32,6 @@ enum SupportMap {
 // const dialogueRef = ref();
 const { pausedStream} = useSessionStore();
 const themeStore = useChangeThemeStore();
-const modeOptions = ref(props.modeOptions);
 const isCreateApp = ref(props?.isCreateApp);
 const questions = [
   {
@@ -179,7 +173,6 @@ const handleSendMessage = async (groupId: string | undefined, question: string,
   if (!currentSelectedSession.value) {
     await generateSession();
   }
-  console.log("user_selected_app",user_selected_app.value);
   if (user_selected_flow) {
     await sendQuestion(groupId, question, user_selected_app.value, undefined, undefined, user_selected_flow, undefined);
   } else {
@@ -267,118 +260,6 @@ const handleReport = async (qaRecordId: string, reason: string) => {
   }
 };
 
-const changeProblem = () => {
-  groupid.value++;
-};
-
-const selectQuestion = event => {
-  dialogueInput.value = event.target.innerText;
-};
-
-const getMode = async () => {
-  if (modeOptions.value.length === 1) {
-    const [_, res] = await api.getRecognitionMode();
-    if (!_ && res) {
-      res.result.forEach(item => {
-        const opt = {
-          label: item.plugin_name,
-          value: item.plugin_name,
-          disabled: false,
-        };
-        opt ? modeOptions.value.push(opt) : '';
-      });
-    }
-  } else {
-    return;
-  }
-};
-
-const setOptionDisabled = () => {
-  if (selectMode.value.length === 0) {
-    modeOptions.value.map(item => {
-      item.disabled = false;
-      return item;
-    });
-  } else {
-    const isAuto = selectMode.value.some(item => item === 'auto');
-    let first = true;
-    modeOptions.value.map(item => {
-      if (!first) {
-        item.disabled = isAuto ? true : false;
-      } else {
-        item.disabled = isAuto ? false : true;
-      }
-      first = false;
-      return item;
-    });
-  }
-};
-
-let socket = ref(null);
-const terminal = ref(null);
-const fitAddon = new FitAddon();
-
-let term = ref(null);
-let termLoading = ref(false);
-let isTermShow = ref(false);
-const activePane = ref('shell');
-
-const fnChangeShellBox = isShow => {
-  if (isShow) {
-    if (!socket.value) {
-      termLoading.value = true;
-      createWs();
-    }
-  } else {
-    // 关闭连接
-    if (socket.value) {
-      socket.value.close();
-      socket.value = null;
-    }
-    if (term.value) {
-      term.value.dispose();
-    }
-  }
-};
-
-// 创建WebSocket
-const createWs = () => {
-  socket.value = new WebSocket('ws://10.24.107.18:8002/shell/ws/1/213');
-  socket.value.onopen = () => {
-    termLoading.value = false;
-    // socket.value.send(JSON.stringify({
-    //   ctrl: 'resize',
-    //   data: {
-    //     width: 500,
-    //   }
-    // }));
-  };
-  socket.value.onclose = () => {
-    // console.log('close');
-  };
-  socket.value.onerror = e => {
-    term.value.write(`\x1b[31m${e}\x1b[m\r\n`);
-  };
-  initTerm();
-};
-
-const initTerm = () => {
-  term.value = new Terminal({
-    fontSize: 14,
-    cursorBlink: true,
-    row: 32,
-  });
-  const attachAddon = new AttachAddon(socket.value);
-  term.value.open(terminal.value);
-  fitAddon.activate(term.value); // 自适应尺寸
-  attachAddon.activate(term.value);
-
-  nextTick(() => {
-    fitAddon.fit();
-  });
-  term.value.focus();
-};
-
 // 上传按钮对象
 const uploadButton = ref();
 // 最大上传数量
@@ -710,7 +591,6 @@ watch(
 );
 
 watch(selectMode, (newValue, oldValue) => {
-  setOptionDisabled();
   user_selected_app.value = [];
   let first = true;
   if (selectMode.value.length !== 0) {
@@ -762,11 +642,6 @@ watch(selectMode, (newValue, oldValue) => {
     }
   });
 });
-
-watch(isTermShow, (newValue, oldValue) => {
-  fnChangeShellBox(newValue);
-});
-
 /**
  * 暂停和重新生成问答
  */
diff --git a/src/views/dialogue/dialogueView.vue b/src/views/dialogue/dialogueView.vue
index b5b89b7..eb152e4 100644
--- a/src/views/dialogue/dialogueView.vue
+++ b/src/views/dialogue/dialogueView.vue
@@ -13,7 +13,7 @@ import { ElMessage } from 'element-plus';
 import { watch } from 'vue';
 import i18n from 'src/i18n';
 import { reactive } from 'vue';
-import { useRouter } from 'vue-router';
+import { useRouter, useRoute } from 'vue-router';
 import CopilotIcon from '@/assets/images/routerCopilot.png';
 import CopilotIconSelected from '@/assets/images/routerCopilotSelected.png';
 import WitchainDIcon from '@/assets/images/witchainD.png';
@@ -23,6 +23,12 @@ import AppIcon from '@/assets/images/routerApp.png';
 import AppIconSelected from '@/assets/svgs/appIconSelected.svg';
 import WitchainDIconSelected from '@/assets/svgs/WitchainDSelected.svg';
 import tools from '../tools/index.vue';
+const route = useRoute();
+
+const { userinfo } = storeToRefs(useAccountStore());
+const { getUserInfo } = useAccountStore();
+const { getHistorySession } = useHistorySessionStore();
+const { app } = storeToRefs(useSessionStore());
 const { createNewSession } = useHistorySessionStore();
 
 // 挂载全局事件
@@ -42,6 +48,7 @@ const revoke = ref(true);
 const isSubmitDisabled = ref(true);
 const ruleFormRef = ref<any>();
 const router = useRouter();
+const type = import.meta.env.VITE_USER_TYPE;
 const routerList = [
   { name: '对话', path: '/' , src:CopilotIcon , selectedSrc:CopilotIconSelected ,routerName: 'dialogue' },
   { name: '语义中心', path: '/api' , src:ApiIcon , selectedSrc:ApiIconSelected ,routerName: 'api' },
@@ -185,6 +192,7 @@ onMounted(() => {
   const iframe = document.getElementById('my-iframe');
   console.log('iframe',`${window.location.origin}/witchaind`);
   iframe.src = `${window.location.origin}/witchaind`;
+  initCopilot();
   // iframe.src = `http://localhost:3002`;
 });
 
@@ -210,6 +218,29 @@ const addNewSession = async (routerName: string) => {
     await createNewSession();
   }
 };
+
+const initCopilot = async (): Promise<void> => {
+  if (localStorage.getItem('theme')) {
+    theme.value = localStorage.getItem('theme') || 'light';
+  } else {
+    localStorage.setItem('theme', 'light');
+  }
+  const currRoute = router.currentRoute;
+  if (currRoute.value.query.appId) {
+    app.value = {
+      appId: String(currRoute.value.query.appId),
+      name: String(currRoute.value.query.name),
+    };
+  }
+  userinfo.value.organization = type;
+    const isLogin = await getUserInfo();
+    if (isLogin) {
+      await api.stopGeneration();
+      await getHistorySession();
+  }
+    return;
+};
+
 </script>
 
 <template>
-- 
Gitee


From b2281ccf18f711a671583141f205f189fdd0da13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=A8=9C?= <lnlnln629@163.com>
Date: Fri, 21 Feb 2025 16:23:05 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E7=83=AD=E9=97=A8=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9hover=E6=A0=B7=E5=BC=8F=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dialogue/components/InitalPanel.vue | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/views/dialogue/components/InitalPanel.vue b/src/views/dialogue/components/InitalPanel.vue
index f6ce140..7ba4725 100644
--- a/src/views/dialogue/components/InitalPanel.vue
+++ b/src/views/dialogue/components/InitalPanel.vue
@@ -303,14 +303,7 @@ onMounted(() => {
       }
 
       &:hover {
-        box-shadow: 0 5.18px 20.72px 0 rgba(221, 225, 240, 0.5);
-        background: linear-gradient(
-          270deg,
-          rgb(229, 239, 248),
-          rgb(199, 227, 250) 24.366%,
-          rgba(175, 205, 242) 57.543%,
-          rgb(152, 162, 247) 96.781%
-        );
+        cursor: pointer;
       }
 
       img {
@@ -341,5 +334,8 @@ onMounted(() => {
       }
     }
   }
+  .eg-btn{
+    cursor: pointer;
+  }
 }
 </style>
-- 
Gitee


From 1dbb94631b2c9fea212a0be3bb8659d7ae92a11a Mon Sep 17 00:00:00 2001
From: li-shengren-123456 <lishengren@h-partners.com>
Date: Fri, 21 Feb 2025 18:04:54 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E6=B5=81=E5=88=A0=E9=99=A4=E5=AF=B9=E8=AF=9D=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=92=8C=E8=80=97=E6=97=B6=E5=B1=95=E7=A4=BA=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E8=B7=B3=E8=BD=AC=E5=A4=8D=E5=88=B6=E7=AD=89=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/dialoguePanel/DialogueFlow.vue | 260 +++++++++++-------
 .../dialoguePanel/DialoguePanel.vue           |  72 ++++-
 src/store/conversation.ts                     |  14 +-
 src/views/app/index.vue                       |   2 +-
 .../components/codeMirror/nodeMirrorText.vue  |  20 +-
 src/views/createapp/components/types.ts       |   8 +
 src/views/createapp/components/workFlow.vue   |  45 +--
 .../components/workFlowConfig/BranchNode.vue  |   2 +-
 .../workFlowConfig/CustomSaENode.vue          |   2 +-
 .../createapp/components/workFlowDebug.vue    |  34 ++-
 src/views/createapp/index.vue                 |   2 +-
 .../dialogue/components/DialogueSession.vue   |   1 +
 src/views/styles/createApp.scss               |   9 +
 13 files changed, 328 insertions(+), 143 deletions(-)

diff --git a/src/components/dialoguePanel/DialogueFlow.vue b/src/components/dialoguePanel/DialogueFlow.vue
index 8ad097e..0aec7d1 100644
--- a/src/components/dialoguePanel/DialogueFlow.vue
+++ b/src/components/dialoguePanel/DialogueFlow.vue
@@ -1,19 +1,25 @@
 <script setup lang="ts">
 import { OutputFileType } from 'typescript';
-import { ref , watch } from 'vue';
+import { ref, watch } from 'vue';
 import FlowCode from './FlowCode.vue';
-import {input , output} from './data'
+import { input, output } from './data';
+import { StatusInfoTitle } from '@/views/createapp/components/types';
 // import { IconCaretRight } from '@computing/opendesign2';
 
-
 // const props = defineProps({
 //   flowdata:any,
 // })
-const props = defineProps<{
-    flowdata: any
-  }>()
+const props = withDefaults(
+  defineProps<{
+    flowdata: any;
+    // isWorkFlowDebug用于判断是否是工作流的
+    isWorkFlowDebug: boolean | undefined;
+  }>(),
+  {},
+);
 const contents = ref();
-if(props.flowdata){
+const totalTime = ref(0);
+if (props.flowdata) {
   contents.value = [props.flowdata];
 }
 
@@ -27,50 +33,109 @@ const handleChange = (val: number[]) => {
 const handleSecondChange = (val: number[]) => {
   secondCollapseActiveName.value = val;
 };
-
-//缺少状态判断
+watch(
+  () => props,
+  () => {
+    if (props.isWorkFlowDebug) {
+      totalTime.value = 0; // 清空
+      // 将每阶段节点耗时累加
+      props.flowdata?.data[0].forEach(item => {
+        totalTime.value += item.costTime || 0;
+      })
+    }
+  },
+  { deep: true, immediate: true },
+);
 </script>
 
 <template>
-  <div class="demo-collapse" :class="{
-    'border-blue': props.flowdata.status === 'running',
-    'border-green': props.flowdata.status === 'success',
-    'border-red': props.flowdata.status === 'error',
-  }">
+  <div
+    class="demo-collapse"
+    :class="{
+      'border-blue': props.flowdata.status === 'running',
+      'border-green': props.flowdata.status === 'success',
+      'border-red': props.flowdata.status === 'error',
+    }"
+  >
     <section>
       <el-collapse v-model="activeNames" class="o-hpc-collapse">
-        <el-collapse-item v-for="item in contents" class="title" :key="item.id" :name="item.id" >
+        <el-collapse-item v-for="item in contents" class="title" :key="item.id" :name="item.id">
           <template #title>
             <div class="loading">
-             <img v-if="props.flowdata.status === 'running'" src="@/assets/images/loading.png" alt="" class="loading-icon">
-             <img v-if="props.flowdata.status === 'success'" src="@/assets/images/flow_success.png" alt="" class="o-collapse-icon">
-             <img v-if="props.flowdata.status === 'error'" src="@/assets/images/flow_fail.png" alt="" class="o-collapse-icon">
-             <div class="loading-text">{{props.flowdata.title}}</div>
+              <img
+                v-if="props.flowdata.status === 'running'"
+                src="@/assets/images/loading.png"
+                alt=""
+                class="loading-icon"
+              />
+              <img
+                v-if="props.flowdata.status === 'success'"
+                src="@/assets/images/flow_success.png"
+                alt=""
+                class="o-collapse-icon"
+              />
+              <img
+                v-if="props.flowdata.status === 'error'"
+                src="@/assets/images/flow_fail.png"
+                alt=""
+                class="o-collapse-icon"
+              />
+              <div v-if="!props.isWorkFlowDebug" class="loading-text">{{ props.flowdata.title }}</div>
+              <div v-else class="loading-text">
+                <div class="textTitle">{{StatusInfoTitle[props.flowdata.status]}}</div>
+                <div v-if="props.flowdata.status === 'success' || props.flowdata.status === 'error'" :class="`${props.flowdata.status}Bg`" class="totalTime">{{ totalTime?.toFixed(3) }}s</div>
+              </div>
             </div>
-            <div class="loading-progress">{{props.flowdata.progress}}</div>
+            <div class="loading-progress">{{ props.flowdata.progress }}</div>
             <el-icon class="el-collapse-item__arrow" :class="{ 'is-active': activeNames.includes(item.id) }">
-                    <!-- <i class="el-icon-edit"></i> -->
-                     <img src="@/assets/images/flow_arrow.png" alt="" class="o-collapse-icon">
-                  </el-icon>
-        </template>
+              <!-- <i class="el-icon-edit"></i> -->
+              <img src="@/assets/images/flow_arrow.png" alt="" class="o-collapse-icon" />
+            </el-icon>
+          </template>
           <template v-for="(p, $index) in item.data" :key="$index" class="6645ds">
             <div v-if="!Array.isArray(p)" class="o-collapse-content">{{ p }}</div>
-            <el-collapse v-else v-model="secondCollapseActiveName" class="o-nest-collapse" >
-              <el-collapse-item class="o-collapse-item normal" v-for="secItem in p" :key="secItem.id" :name="secItem.id">
+            <el-collapse v-else v-model="secondCollapseActiveName" class="o-nest-collapse">
+              <el-collapse-item
+                class="o-collapse-item normal"
+                v-for="secItem in p"
+                :key="secItem.id"
+                :name="secItem.id"
+              >
                 <template #title>
-                  <img v-if="secItem.status === 'running'" src="@/assets/images/loading.png" alt="" class="loading-icon">
-                  <img v-if="secItem.status === 'success'" src="@/assets/images/flow_success.png" alt="" class="o-collapse-icon">
-                  <img v-if="secItem.status === 'error'" src="@/assets/images/flow_fail.png" alt="" class="o-collapse-icon">
-                  <el-icon class="el-collapse-item__arrow" :class="{ 'is-active': secondCollapseActiveName.includes(secItem.id) }">
+                  <img
+                    v-if="secItem.status === 'running'"
+                    src="@/assets/images/loading.png"
+                    alt=""
+                    class="loading-icon"
+                  />
+                  <img
+                    v-if="secItem.status === 'success'"
+                    src="@/assets/images/flow_success.png"
+                    alt=""
+                    class="o-collapse-icon"
+                  />
+                  <img
+                    v-if="secItem.status === 'error'"
+                    src="@/assets/images/flow_fail.png"
+                    alt=""
+                    class="o-collapse-icon"
+                  />
+                  <el-icon
+                    class="el-collapse-item__arrow"
+                    :class="{ 'is-active': secondCollapseActiveName.includes(secItem.id) }"
+                  >
                     <!-- <i class="el-icon-edit"></i> -->
-                     <img src="@/assets/images/flow_arrow.png" alt="" class="o-collapse-icon">
+                    <img src="@/assets/images/flow_arrow.png" alt="" class="o-collapse-icon" />
                   </el-icon>
-                  <span>{{ secItem.title }}</span>
+                  <span class="title">{{ secItem.title }}</span>
+                  <span v-if="secItem.costTime" class="time" :class="`${secItem.status}Bg`">
+                    {{ secItem.costTime.toFixed(3) }}s
+                  </span>
                 </template>
                 <div v-for="(desc, index) in secItem.data" :key="index" class="o-collapse-content">
-                    <div class="code-bar">
-                        <FlowCode :code="desc" :title="index" :disabled='true'/>
-                    </div>
+                  <div class="code-bar">
+                    <FlowCode :code="desc" :title="index" :disabled="true" />
+                  </div>
                 </div>
               </el-collapse-item>
             </el-collapse>
@@ -82,35 +147,35 @@ const handleSecondChange = (val: number[]) => {
 </template>
 
 <style lang="scss">
-.el-collapse-item__content{
+.el-collapse-item__content {
   margin: 0px 16px 16px 16px;
 }
 
-.el-collapse-item:last-child{
+.el-collapse-item:last-child {
   margin-bottom: 0px;
 }
-.demo-collapse.border-blue .title  .el-collapse-item__header:first-child{
+.demo-collapse.border-blue .title .el-collapse-item__header:first-child {
   background: linear-gradient(127.95deg, rgba(109, 117, 250, 0.2) -1.967%, rgba(90, 179, 255, 0.2) 98.202%);
   border-radius: 0px !important;
 }
-.demo-collapse.border-red .title  .el-collapse-item__header:first-child{
-  background-color: rgb(247,193,193);
+.demo-collapse.border-red .title .el-collapse-item__header:first-child {
+  background-color: rgb(247, 193, 193);
   border-radius: 0px !important;
 }
-.demo-collapse.border-green .title  .el-collapse-item__header:first-child{
-  background-color: rgb(194,231,199);
+.demo-collapse.border-green .title .el-collapse-item__header:first-child {
+  background-color: rgb(194, 231, 199);
   border-radius: 0px !important;
 }
-.o-collapse-icon{
+.o-collapse-icon {
   padding: 0px;
   margin-left: 0px;
-  margin-right: 8px; 
+  margin-right: 8px;
 }
 .normal {
   .el-collapse-item__header {
-    background-color: rgb(253,254,255) !important;
+    background-color: rgb(253, 254, 255) !important;
     border-bottom: 1px dashed transparent !important;
-    background: rgb(253,254,255) !important;
+    background: rgb(253, 254, 255) !important;
     border-bottom: 1px dotted;
     padding-left: 8px;
     height: 40px;
@@ -118,10 +183,10 @@ const handleSecondChange = (val: number[]) => {
     font-size: 14px;
     color: #303133;
     cursor: pointer;
-}}
+  }
+}
 .title {
   // background: linear-gradient(127.95deg, rgba(109, 117, 250, 0.2) -1.967%, rgba(90, 179, 255, 0.2) 98.202%) !important;
-
   .el-collapse-item__header {
     border-bottom: 1px solid #e4e7ed;
     padding-left: 8px;
@@ -132,33 +197,33 @@ const handleSecondChange = (val: number[]) => {
     cursor: pointer;
     position: relative;
   }
-  .el-collapse-item+.el-collapse-item {
+  .el-collapse-item + .el-collapse-item {
     margin-top: 0px;
   }
-  .el-collapse-item__arrow.is-active{
+  .el-collapse-item__arrow.is-active {
     transform: rotate(90deg);
     top: 3px;
     padding-left: 3px;
   }
 }
-.el-collapse-item__arrow{
+.el-collapse-item__arrow {
   margin: 0px;
 }
-.loading-progress{
+.loading-progress {
   margin-right: 8px;
 }
 .normal {
   // background-color: pink !important;
 }
-.border-red{
+.border-red {
   border: 1px solid red;
 }
 
-.border-green{
+.border-green {
   border: 1px solid green;
 }
 
-.border-blue{
+.border-blue {
   border: 1px solid rgba(109, 117, 250, 0.2);
 }
 
@@ -172,53 +237,52 @@ const handleSecondChange = (val: number[]) => {
   background-color: rgb(253, 254, 255);
 
   :deep(.el-collapse-item__wragop) {
-  // border-bottom: 5px;
-  margin-top: 12px !important;
-  margin-bottom: 2px !important;
-}
+    // border-bottom: 5px;
+    margin-top: 12px !important;
+    margin-bottom: 2px !important;
+  }
 }
 .loading {
-      display: flex;
-      height: auto;
-      width: 100%;
-      // padding: 12px;
-      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;
-      @keyframes rotate-img {
-        from {
-          transform: rotate(0);
-        }
-
-        to {
-          transform: rotate(360deg);
-        }
-      }
-
-      &-icon {
-        animation: rotate-img 1s infinite linear;
-      }
-
-      &-text {
-        font-size: 16px;
-        line-height: 24px;
-        // padding-left: 12px;
-        width: 100%;
-        color: var(--o-text-color-primary);
-      }
-      &-progress {
-        // right: 8px;
-      }
+  display: flex;
+  height: auto;
+  width: 100%;
+  // padding: 12px;
+  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;
+  @keyframes rotate-img {
+    from {
+      transform: rotate(0);
     }
 
-    .demo-collapse .el-collapse-item__header {
-      // background-color: greenyellow ;
-      // background: linear-gradient(127.95deg, rgba(109, 227, 250, 0.2) -1.967%, rgba(90, 179, 255, 0.2) 98.202%);
+    to {
+      transform: rotate(360deg);
     }
-    .o-collapse-item {
-        // background-color: aliceblue !important;
-        // background-color: pink !important;
+  }
 
-    }
+  &-icon {
+    animation: rotate-img 1s infinite linear;
+  }
+
+  &-text {
+    font-size: 16px;
+    line-height: 24px;
+    // padding-left: 12px;
+    width: 100%;
+    color: var(--o-text-color-primary);
+  }
+  &-progress {
+    // right: 8px;
+  }
+}
+
+.demo-collapse .el-collapse-item__header {
+  // background-color: greenyellow ;
+  // background: linear-gradient(127.95deg, rgba(109, 227, 250, 0.2) -1.967%, rgba(90, 179, 255, 0.2) 98.202%);
+}
+.o-collapse-item {
+  // background-color: aliceblue !important;
+  // background-color: pink !important;
+}
 </style>
diff --git a/src/components/dialoguePanel/DialoguePanel.vue b/src/components/dialoguePanel/DialoguePanel.vue
index 751cf80..e50b9f4 100644
--- a/src/components/dialoguePanel/DialoguePanel.vue
+++ b/src/components/dialoguePanel/DialoguePanel.vue
@@ -469,7 +469,7 @@ const handleSendMessage = async (question, user_selected_flow, user_selected_app
       <div class="dialogue-panel__robot-content">
         <!-- 这里是flowData -->
       <DialogueThought :content=thoughtContent v-if="thoughtContent" />
-      <DialogueFlow v-if="flowdata"  :flowdata="props.flowdata"/> 
+      <DialogueFlow v-if="flowdata" :isWorkFlowDebug="props.isWorkFlowDebug"  :flowdata="props.flowdata"/> 
       <div v-if="contentAfterMark" id="markdown-preview">
         <div v-html="contentAfterMark"></div>
       <a v-if="props.paramsList" @click="visible = true">补充参数</a>
@@ -1152,6 +1152,76 @@ const handleSendMessage = async (question, user_selected_flow, user_selected_app
     padding-left: 64px;
     .dialogue-panel__robot-content {
       border-radius: 8px;
+      // 工作流调试时控制显示
+      .dialogue-thought {
+        // ai思考无需显示
+        display: none;
+      }
+      ::v-deep(.demo-collapse) {
+        border-radius: 4px;
+        .title.el-collapse-item {
+          .loading-text {
+            display: flex;
+            text-align: left;
+            align-items: center;
+            .textTitle {
+              flex: 1;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              white-space: nowrap;
+            }
+            .totalTime {
+              min-width: 54px;
+              width: fit-content;
+              padding: 0px 8px;
+              height: 16px;
+              line-height: 16px;
+              font-size: 12px;
+              border-radius: 4px;
+            }
+            .totalTime.errorBg {
+              background-color: rgba(227, 32, 32, 0.2);
+            }
+          }
+        }
+        .normal.el-collapse-item {
+          border-bottom: 1px dashed #dfe5ef;
+          .el-collapse-item__header {
+            background-color: var(--o-bg-color-base) !important;
+            color: var(--o-text-color-primary);
+            padding-right: 0px;
+            .o-collapse-icon {
+              width: 16px;
+              height: 16px;
+            }
+            .title {
+              flex: 1;
+              text-align: left;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              white-space: nowrap;
+            }
+            .time {
+              min-width: 54px;
+              width: fit-content;
+              padding: 0px 8px;
+              height: 16px;
+              line-height: 16px;
+              border-radius: 4px;
+              font-size: 12px;
+            }
+            &::after {
+              background-color: transparent;
+            }
+          }
+          &:last-child {
+            border-bottom: 1px solid transparent;
+          }
+        }
+        .el-collapse-item__content {
+          margin:0px 16px;
+        }
+      }
       // 调试抽屉中echarts无需显示
       .answer_img {
         display: none;
diff --git a/src/store/conversation.ts b/src/store/conversation.ts
index a962de8..9057a9d 100644
--- a/src/store/conversation.ts
+++ b/src/store/conversation.ts
@@ -314,6 +314,8 @@ export const useSessionStore = defineStore('conversation', () => {
               if (target) {
                 target.data.output = message.content
                 target.status = message.flow?.stepStatus;
+                // 工作流添加每阶段的时间耗时
+                target['costTime'] = message.time_cost;
                 if(message.flow.step_status === "error"){
                   conversationItem.flowdata.status = message.flow?.stepStatus;
                 }
@@ -322,7 +324,17 @@ export const useSessionStore = defineStore('conversation', () => {
             else if(message["event"] === "flow.stop") {
               //时间流结束
               let flow = message.content.flow;
-              if(message.content.type !== "schema"){
+              if (params.type) {
+                // 如果是工作流的调试功能-添加status/data
+                conversationItem.flowdata = {
+                  id: flow?.stepName,
+                  title: i18n.global.t('flow.flow_end'),
+                  progress: flow?.stepProgress,
+                  status: message.flow?.stepStatus,
+                  display:true,
+                  data:conversationItem?.flowdata?.data,
+                };
+              }else if(message.content.type !== "schema"){
                 conversationItem.flowdata?.data[0].push({
                   id:"end",
                   title:"end",
diff --git a/src/views/app/index.vue b/src/views/app/index.vue
index 5d2fece..f7d212a 100644
--- a/src/views/app/index.vue
+++ b/src/views/app/index.vue
@@ -136,7 +136,7 @@ const handleCreateApp = () => {
 };
 
 const routerToDetail = appItem => {
-  if (!appItem.published && appType.value === 'createdByMe') {
+  if (!appItem.published) {
     return;
   }
   //获取appItem.id & appItem.name
diff --git a/src/views/createapp/components/codeMirror/nodeMirrorText.vue b/src/views/createapp/components/codeMirror/nodeMirrorText.vue
index a9a24d1..e72724d 100644
--- a/src/views/createapp/components/codeMirror/nodeMirrorText.vue
+++ b/src/views/createapp/components/codeMirror/nodeMirrorText.vue
@@ -36,6 +36,7 @@ import { useChangeThemeStore } from 'src/store/conversation';
 import yaml from 'js-yaml';
 import { writeText } from 'src/utils';
 import { errorMsg, successMsg } from 'src/components/Message';
+import { StatusInfoTitle } from '../types';
 const props = defineProps({
   status: {
     default: 'default',
@@ -69,19 +70,12 @@ const resultInfo = ref({
   ],
 });
 
-const statusInfoTitle = ref({
-  default: '',
-  success: '运行成功',
-  error: '运行失败',
-  running: '运行中',
-});
-
 watch(
   () => props,
   () => {
     resultInfo.value.status = props.status;
     // 目前props.status只有success、error、running三种
-    resultInfo.value.infoList[0].title = statusInfoTitle.value[props.status];
+    resultInfo.value.infoList[0].title = StatusInfoTitle[props.status];
     if (props?.inputAndOutput) {
 
       resultInfo.value.time = props.inputAndOutput.input_parameters.timeout ?? 0;
@@ -104,7 +98,7 @@ const handleCopy = code => {
     errorMsg('无可复制的信息');
     return;
   }
-  writeText(code);
+  writeText(yaml.dump(code));
   successMsg('复制成功');
 };
 </script>
@@ -157,14 +151,6 @@ const handleCopy = code => {
       padding: 0px 8px;
       border-radius: 4px;
     }
-    .successBg {
-      background-color: rgba(36, 171, 54, 0.2);
-      color: #24ab36;
-    }
-    .errorBg {
-      background-color: #fbdede;
-      color: #e32020;
-    }
     .flexRight {
       margin-left: auto;
       margin-right: -4px;
diff --git a/src/views/createapp/components/types.ts b/src/views/createapp/components/types.ts
index cfa0953..3319152 100644
--- a/src/views/createapp/components/types.ts
+++ b/src/views/createapp/components/types.ts
@@ -17,6 +17,14 @@ export enum BranchSourceIdType {
   SOURCEB = "source_b",
 }
 
+export const StatusInfoTitle = {
+  default: '',
+  success: '运行成功',
+  error: '运行失败',
+  running: '运行中',
+  pending: '运行中',
+};
+
 export interface LinkItem {
   key: string;
   label: string;
diff --git a/src/views/createapp/components/workFlow.vue b/src/views/createapp/components/workFlow.vue
index 344e332..e684e12 100644
--- a/src/views/createapp/components/workFlow.vue
+++ b/src/views/createapp/components/workFlow.vue
@@ -18,7 +18,7 @@ import { useLayout } from './workFlowConfig/useLayout';
 import { IconSearch, IconCaretRight, IconCaretDown, IconPlusCircle } from '@computing/opendesign-icons';
 import EditYamlDrawer from './workFlowConfig/yamlEditDrawer.vue';
 import { api } from 'src/apis';
-import { BranchSourceIdType } from './types';
+import { BranchSourceIdType, StatusInfoTitle } from './types';
 import { useRoute } from 'vue-router';
 import yaml from 'js-yaml';
 import $bus from 'src/bus/index';
@@ -48,7 +48,9 @@ const workFlowList = ref([]);
 const props = defineProps(['flowList']);
 const flowObj = ref({});
 const nodes = ref([]);
-const debugResult = ref('success');
+const debugResult = ref('');
+const debugTime = ref('');
+const totalTime = ref(0);
 const hanleAsideVisible = () => {
   if (!copilotAside.value) return;
   if (isCopilotAsideVisible.value) {
@@ -264,8 +266,10 @@ const searchApiList = () => {
   });
 };
 
-const handleDebugDialogOps = visible => {
+const handleDebugDialogOps = (visible) => {
   debugDialogVisible.value = visible;
+  // 调试弹窗关闭时---结果清空
+  debugResult.value = '';
 };
 
 const edgesChange = edges => {
@@ -329,7 +333,6 @@ const queryFlow = (deal: string) => {
       });
   }
 };
-
 // 点击编辑工作流--查询当前工作流数据-后续添加回显
 const editFlow = item => {
   api
@@ -424,11 +427,22 @@ $bus.on('getNodesStatue', lines => {
       const newLines = yaml.load(item);
       // step.input和step.output对应的节点状态需要修改
       if (newLines?.data?.event === 'step.input' || newLines?.data?.event === 'step.output') {
-        if (newLines?.data?.flow?.stepId) {
           // output-节点运行结束时，获取节点运行的耗时
-          const constTime = newLines.data.event === 'step.output' ? `${newLines.data?.time_cost?.toFixed(3)}s` : '';
+          let constTime = '';
+          if (newLines.data.event === 'step.output') {
+            totalTime.value += newLines.data?.time_cost;
+            constTime = `${newLines.data?.time_cost?.toFixed(3)}s`
+          }
           updateNodeFunc(newLines.data.flow.stepId, newLines.data.flow?.stepStatus, constTime);
-        }
+      } else if (newLines?.data?.event === 'flow.stop') {
+        debugResult.value = newLines.data.flow?.stepStatus;
+        debugTime.value = `${totalTime.value.toFixed(3)}s`
+      } else if (newLines?.data?.event === 'flow.start'){
+        totalTime.value = 0;
+        debugTime.value = '';
+        debugResult.value = newLines.data.flow?.stepStatus;
+      } else {
+        // do nothing
       }
     });
   } catch (error) {
@@ -711,10 +725,11 @@ defineExpose({
           <img src="@/assets/images/debugBtn.png" v-else />
         </div>
         <div class="debugStatus"></div>
-        <div class="debugResult" style="display: none">
+        <!-- 这里显示调试最终结果与耗时 -->
+        <div class="debugResult" v-if="debugResult">
           <div class="icon" :class="`${debugResult}Icon`"></div>
-          <div class="resultText">运行成功 -- 暂不展示</div>
-          <span class="time" :class="`${debugResult}Bg`">0.132s</span>
+          <div class="resultText">{{ StatusInfoTitle[debugResult] }}</div>
+          <span class="time" :class="`${debugResult}Bg`" v-if="debugResult !=='running'">{{ debugTime }}</span>
         </div>
       </div>
       <!-- 暂无工作流展示 -->
@@ -765,7 +780,7 @@ defineExpose({
     background: url(@/assets/images/flow_fail.png) center center no-repeat;
   }
 
-  .runningIcon {
+  .runningIcon, .pendingIcon {
     background: url(@/assets/images/loading.png) center center no-repeat;
   }
   .time {
@@ -774,14 +789,6 @@ defineExpose({
     padding: 0px 8px;
     border-radius: 4px;
   }
-  .successBg {
-    background-color: rgba(36, 171, 54, 0.2);
-    color: #24ab36;
-  }
-  .errorBg {
-    background-color: #fbdede;
-    color: #e32020;
-  }
   .flexRight {
     margin-left: auto;
     margin-right: -4px;
diff --git a/src/views/createapp/components/workFlowConfig/BranchNode.vue b/src/views/createapp/components/workFlowConfig/BranchNode.vue
index 96dcb38..318542c 100644
--- a/src/views/createapp/components/workFlowConfig/BranchNode.vue
+++ b/src/views/createapp/components/workFlowConfig/BranchNode.vue
@@ -23,7 +23,7 @@ const props = defineProps({
 });
 const emits = defineEmits(['delNode', 'editYamlDrawer']);
 
-const statusList = ref(['pending', 'success', 'error']);
+const statusList = ref(['running', 'success', 'error']);
 
 const branchIdList = ref([]);
 
diff --git a/src/views/createapp/components/workFlowConfig/CustomSaENode.vue b/src/views/createapp/components/workFlowConfig/CustomSaENode.vue
index 45722b4..17902c5 100644
--- a/src/views/createapp/components/workFlowConfig/CustomSaENode.vue
+++ b/src/views/createapp/components/workFlowConfig/CustomSaENode.vue
@@ -24,7 +24,7 @@ const props = defineProps({
   },
 });
 
-const statusList = ref(['waiting', 'success', 'error', 'default']);
+const statusList = ref(['running', 'success', 'error']);
 
 const curStatus = ref('');
 
diff --git a/src/views/createapp/components/workFlowDebug.vue b/src/views/createapp/components/workFlowDebug.vue
index 9e94fd9..0abe336 100644
--- a/src/views/createapp/components/workFlowDebug.vue
+++ b/src/views/createapp/components/workFlowDebug.vue
@@ -6,7 +6,7 @@
     </div>
     <div class="divider"></div>
     <div class="debugContent">
-      <div class="debugCheckArea">
+      <div class="debugCheckArea" v-if="testFlag">
         <DialoguePanel
           v-for="(item, index) in conversationList"
           :cid="item.cid"
@@ -63,12 +63,16 @@ import type { ConversationItem, RobotConversationItem } from 'src/views/dialogue
 import { useSessionStore, useChangeThemeStore } from 'src/store';
 import { useHistorySessionStore } from 'src/store/historySession';
 import { storeToRefs } from 'pinia';
+import { api } from '@/apis';
+import { onBeforeRouteLeave } from 'vue-router';
 // 对话列表
 const { sendQuestion } = useSessionStore();
+const testFlag = ref(true);
 const { conversationList, isAnswerGenerating } = storeToRefs(useSessionStore());
 const { user_selected_app } = storeToRefs(useHistorySessionStore());
 const { generateSession, generateSessionDebug } = useHistorySessionStore();
-const { currentSelectedSession } = storeToRefs(useHistorySessionStore());
+const { historySession, currentSelectedSession, isSelectedAll, selectedSessionIds } = storeToRefs(useHistorySessionStore());
+const { app, appList } = storeToRefs(useSessionStore());
 const themeStore = useChangeThemeStore();
 const props = defineProps({
   flowId: {
@@ -87,7 +91,6 @@ interface DebugProps {
 
 // 对话输入内容
 const dialogueInput = ref<string>('');
-
 /**
  *
  * @param item
@@ -134,6 +137,31 @@ const handleKeydown = (event: KeyboardEvent) => {
 };
 
 const handleCloseDebugDialog = () => {
+  testFlag.value = false
+  delChat();
   props.handleDebugDialogOps(false);
 };
+
+// 关闭或者跳转前需要将会话删除
+const delChat = async () => {
+  if (!currentSelectedSession.value) {
+    // 如果还没生成会话Id, 无需调用接口删除
+    return;
+  } else {
+    // 调用接口，删除当前对话
+    const res = await api.deleteSession({ conversationList: [currentSelectedSession.value] });
+    if (res[1]?.result) {
+      // 删除成功
+      conversationList.value = [];
+      selectedSessionIds.value = [];
+      currentSelectedSession.value = '';
+      historySession.value = [];=
+    }
+  }
+}
+
+onBeforeRouteLeave((to, from ,next) => {
+  handleCloseDebugDialog();
+  next();
+})
 </script>
diff --git a/src/views/createapp/index.vue b/src/views/createapp/index.vue
index e21a293..7f46c0a 100644
--- a/src/views/createapp/index.vue
+++ b/src/views/createapp/index.vue
@@ -139,7 +139,7 @@ const handleJumperAppCenter = () => {
       <WorkFlow @validateConnect="validateConnect" :flowList="flowList" ref="workFlowRef" />
     </div>
     <div class="createAppContainerFooter">
-      <el-button>取消</el-button>
+      <el-button @click="handleJumperAppCenter">取消</el-button>
       <el-button @click="saveConfigOrFlow">保存</el-button>
       <el-button :disabled="true">预览</el-button>
       <el-button type="primary" @click="handlePulishApp()">发布</el-button>
diff --git a/src/views/dialogue/components/DialogueSession.vue b/src/views/dialogue/components/DialogueSession.vue
index c397fb6..876a762 100644
--- a/src/views/dialogue/components/DialogueSession.vue
+++ b/src/views/dialogue/components/DialogueSession.vue
@@ -292,6 +292,7 @@ const isAllowToSend = computed(() => {
 
 // 会话切换时
 watch(currentSelectedSession, async newVal => {
+  if (!newVal) return;
   const newExistList = existUploadMap.get(newVal);
   const newFileView = uploadViewsMap.get(newVal);
   let curPolling = pollingMap.get(newVal);
diff --git a/src/views/styles/createApp.scss b/src/views/styles/createApp.scss
index b737cb8..c0ee53e 100644
--- a/src/views/styles/createApp.scss
+++ b/src/views/styles/createApp.scss
@@ -337,6 +337,15 @@
     border-color: var(--o-color-primary) !important;
     color: var(--o-color-white) !important;
   }
+  // 成功失败样式
+  .successBg {
+    background-color: rgba(36, 171, 54, 0.2);
+    color: #24ab36;
+  }
+  .errorBg {
+    background-color: #fbdede;
+    color: #e32020;
+  }
 }
 
 .w320 {
-- 
Gitee


From 78f8e823ad196bb39a9afc593088a9778dd2ffb3 Mon Sep 17 00:00:00 2001
From: li-shengren-123456 <lishengren@h-partners.com>
Date: Sat, 22 Feb 2025 16:21:48 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=A4=A7=E5=B0=8F=EF=BC=8C=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=3D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/app/style.scss                      | 21 +++++++--
 src/views/createapp/components/workFlow.vue   | 47 ++++++++++++++-----
 .../createapp/components/workFlowDebug.vue    |  2 +-
 3 files changed, 53 insertions(+), 17 deletions(-)

diff --git a/src/views/app/style.scss b/src/views/app/style.scss
index 878576c..574b1af 100644
--- a/src/views/app/style.scss
+++ b/src/views/app/style.scss
@@ -60,6 +60,7 @@
       padding-top: 16px;
       max-width: 1336px;
       max-height: calc(100vh - 327px);
+      min-height: 324px;
       overflow-y: scroll;
       .appCenterCardBox {
         width: fit-content;
@@ -157,10 +158,22 @@
         }
       }
       .appCenterNoData {
-        width: 480px;
-        height: 240px;
-        background-image: var(--no-work-flow);
-        background-size: contain;
+        display: flex;
+        flex-direction: column;
+        gap: 8px;
+        align-items: center;
+        margin-top: 16px;
+        .noDataIcon {
+          width: 320px;
+          height: 130px;
+          background: var(--no-work-flow) center center no-repeat;
+          background-size: contain;
+        }
+        .desc {
+          height: 16px;
+          font-size: 12px;
+          color: var(--o-text-color-primary);
+        }
       }
     }
     ::-webkit-scrollbar {
diff --git a/src/views/createapp/components/workFlow.vue b/src/views/createapp/components/workFlow.vue
index e684e12..ae8ba3f 100644
--- a/src/views/createapp/components/workFlow.vue
+++ b/src/views/createapp/components/workFlow.vue
@@ -48,7 +48,7 @@ const workFlowList = ref([]);
 const props = defineProps(['flowList']);
 const flowObj = ref({});
 const nodes = ref([]);
-const debugResult = ref('');
+const debugStatus = ref('');
 const debugTime = ref('');
 const totalTime = ref(0);
 const hanleAsideVisible = () => {
@@ -269,7 +269,18 @@ const searchApiList = () => {
 const handleDebugDialogOps = (visible) => {
   debugDialogVisible.value = visible;
   // 调试弹窗关闭时---结果清空
-  debugResult.value = '';
+  debugStatus.value = '';
+  // 调试弹窗关闭时---节点状态清空
+  getNodes.value.forEach(node => {
+    updateNode(node.id, {data: {...node.data, status:'default', costTime: ''} });
+  })
+  // 调试弹窗关闭时---需要将边状态清空
+  getEdges.value.forEach(edge => {
+    console.log(edge, 'ecge')
+    // 更新节点的起源与终点
+    updateEdgeData(edge.id, {targetStatus: 'default'})
+    updateEdgeData(edge.id, {sourceStatus: 'default'})
+  })
 };
 
 const edgesChange = edges => {
@@ -425,6 +436,17 @@ $bus.on('getNodesStatue', lines => {
   try {
     lines?.forEach(item => {
       const newLines = yaml.load(item);
+      // 工作流开始时更新debugResult
+      if (newLines?.data?.event === 'flow.start'){
+        totalTime.value = 0;
+        debugTime.value = '';
+        debugStatus.value = newLines.data.flow?.stepStatus;
+      }
+      
+      // 这里判断是否有调试状态的值，无值不处理
+      if (!debugStatus.value) {
+        return;
+      }
       // step.input和step.output对应的节点状态需要修改
       if (newLines?.data?.event === 'step.input' || newLines?.data?.event === 'step.output') {
           // output-节点运行结束时，获取节点运行的耗时
@@ -435,12 +457,8 @@ $bus.on('getNodesStatue', lines => {
           }
           updateNodeFunc(newLines.data.flow.stepId, newLines.data.flow?.stepStatus, constTime);
       } else if (newLines?.data?.event === 'flow.stop') {
-        debugResult.value = newLines.data.flow?.stepStatus;
+        debugStatus.value = newLines.data.flow?.stepStatus;
         debugTime.value = `${totalTime.value.toFixed(3)}s`
-      } else if (newLines?.data?.event === 'flow.start'){
-        totalTime.value = 0;
-        debugTime.value = '';
-        debugResult.value = newLines.data.flow?.stepStatus;
       } else {
         // do nothing
       }
@@ -726,10 +744,10 @@ defineExpose({
         </div>
         <div class="debugStatus"></div>
         <!-- 这里显示调试最终结果与耗时 -->
-        <div class="debugResult" v-if="debugResult">
-          <div class="icon" :class="`${debugResult}Icon`"></div>
-          <div class="resultText">{{ StatusInfoTitle[debugResult] }}</div>
-          <span class="time" :class="`${debugResult}Bg`" v-if="debugResult !=='running'">{{ debugTime }}</span>
+        <div class="debugStatus" v-if="debugStatus">
+          <div class="icon" :class="`${debugStatus}Icon`"></div>
+          <div class="resultText">{{ StatusInfoTitle[debugStatus] }}</div>
+          <span class="time" :class="`${debugStatus}Bg`" v-if="debugStatus !=='running'">{{ debugTime }}</span>
         </div>
       </div>
       <!-- 暂无工作流展示 -->
@@ -761,7 +779,11 @@ defineExpose({
   ></EditYamlDrawer>
 </template>
 <style lang="scss">
-.debugResult {
+// @keyframes spin {
+//   0% {transform: rotate(0deg);}
+//   100% {transform: rotate(0deg);}
+// }
+.debugStatus {
   display: flex;
   height: 32px;
   padding: 8px 0px;
@@ -782,6 +804,7 @@ defineExpose({
 
   .runningIcon, .pendingIcon {
     background: url(@/assets/images/loading.png) center center no-repeat;
+    animation: spin 2s linear infinite;
   }
   .time {
     height: 16px;
diff --git a/src/views/createapp/components/workFlowDebug.vue b/src/views/createapp/components/workFlowDebug.vue
index 0abe336..fa31360 100644
--- a/src/views/createapp/components/workFlowDebug.vue
+++ b/src/views/createapp/components/workFlowDebug.vue
@@ -155,7 +155,7 @@ const delChat = async () => {
       conversationList.value = [];
       selectedSessionIds.value = [];
       currentSelectedSession.value = '';
-      historySession.value = [];=
+      historySession.value = [];
     }
   }
 }
-- 
Gitee


From 57b924523a149b0d9b558ebf90210da6baa00706 Mon Sep 17 00:00:00 2001
From: li-shengren-123456 <lishengren@h-partners.com>
Date: Sun, 23 Feb 2025 16:00:27 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E8=B0=83=E8=AF=95=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E5=BA=94=E7=94=A8=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E6=B7=BB=E5=8A=A0=E8=A1=A8=E6=A0=BC=E5=8D=A1?=
 =?UTF-8?q?=E7=89=87=E6=97=A0=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA=E7=AD=89?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apis/appCenter/appCenterService.ts       | 13 ++-
 src/components/textMoreTootip/index.vue      |  7 +-
 src/views/api/index.vue                      |  7 +-
 src/views/api/style.scss                     | 18 +++++
 src/views/app/index.vue                      | 18 +++--
 src/views/createapp/components/appConfig.vue | 85 ++++++++++++++------
 src/views/createapp/index.vue                | 26 ++++--
 src/views/styles/InterPreview.scss           |  3 +-
 src/views/styles/createApp.scss              | 17 ++++
 9 files changed, 155 insertions(+), 39 deletions(-)

diff --git a/src/apis/appCenter/appCenterService.ts b/src/apis/appCenter/appCenterService.ts
index 00e30c3..682a752 100644
--- a/src/apis/appCenter/appCenterService.ts
+++ b/src/apis/appCenter/appCenterService.ts
@@ -58,6 +58,14 @@ export const changeSingleAppCollect = (params: { id: string,favorited:boolean })
   return put(`/api/app/${params.id}`, {favorited:params.favorited});
 };
 
+/**
+ * 获取
+ * @param params
+ * @returns
+ */
+export const getPartAppConfgUser = (): Promise<[any, FcResponse<unknown> | undefined]> => {
+  return get("/api/user");
+};
 
 
 export const appCenterApi = {
@@ -66,5 +74,6 @@ export const appCenterApi = {
   querySingleAppData,
   deleteSingleAppData,
   releaseSingleAppData,
-  changeSingleAppCollect
-};
\ No newline at end of file
+  changeSingleAppCollect,
+  getPartAppConfgUser,
+}
\ No newline at end of file
diff --git a/src/components/textMoreTootip/index.vue b/src/components/textMoreTootip/index.vue
index d6cde21..fe0e0e3 100644
--- a/src/components/textMoreTootip/index.vue
+++ b/src/components/textMoreTootip/index.vue
@@ -7,6 +7,8 @@
     @mouseleave="mouseleave"
   >
     <el-tooltip
+      :disabled="isShowHover"
+      :enterable="false"
       class="box-item"
       effect="dark"
       :content="value"
@@ -81,7 +83,7 @@ export default {
         getComputedStyle(this.text).lineHeight.replace("px", "") - 0 || 20;
       let height = getComputedStyle(this.text).height.replace("px", "") - 0;
       if (height > lineHeight * val) {
-        this.isShowHover = true;
+        this.isShowHover = false;
         this.textStyle = {
           height: `${lineHeight * val}px`,
           overflow: "hidden",
@@ -92,7 +94,7 @@ export default {
           cursor: "pointer",
         };
       } else {
-        this.isShowHover = false;
+        this.isShowHover = true;
         this.textStyle = {
           cursor: "text",
         };
@@ -154,6 +156,7 @@ export default {
 .vue-text {
   word-break: break-all;
   word-wrap: break-word;
+  user-select: none;
 }
 .hover-wrap.active {
   z-index: 1999;
diff --git a/src/views/api/index.vue b/src/views/api/index.vue
index 91eb764..ce99d52 100644
--- a/src/views/api/index.vue
+++ b/src/views/api/index.vue
@@ -35,7 +35,7 @@
         </div>
       </div>
       <div class="apiCenterCardContainer">
-        <div class="apiCenterCardBox">
+        <div class="apiCenterCardBox" v-if="apiList?.length">
           <div v-for="apiItem in apiList" class="apiCenterCardSingle">
             <div class="apiCenterCardTop" @click="openSidebar('get', apiItem.serviceId)">
               <div class="apiCenterCardIcon">
@@ -69,6 +69,11 @@
             </div>
           </div>
         </div>
+        
+        <div class="appCenterNoData" v-else>
+          <div class="noDataIcon"></div>
+          <div class="desc">暂无数据</div>
+        </div>
       </div>
     </div>
     <el-drawer
diff --git a/src/views/api/style.scss b/src/views/api/style.scss
index ba203f2..749fa9c 100644
--- a/src/views/api/style.scss
+++ b/src/views/api/style.scss
@@ -156,6 +156,24 @@
           ) !important;
         }
       }
+      .appCenterNoData {
+        display: flex;
+        flex-direction: column;
+        gap: 8px;
+        align-items: center;
+        margin-top: 16px;
+        .noDataIcon {
+          width: 320px;
+          height: 130px;
+          background: var(--no-work-flow) center center no-repeat;
+          background-size: contain;
+        }
+        .desc {
+          height: 16px;
+          font-size: 12px;
+          color: var(--o-text-color-primary);
+        }
+      }
     }
     ::-webkit-scrollbar {
       width: 4px;
diff --git a/src/views/app/index.vue b/src/views/app/index.vue
index f7d212a..0c9b11a 100644
--- a/src/views/app/index.vue
+++ b/src/views/app/index.vue
@@ -35,7 +35,7 @@
         </div>
       </div>
       <div class="appCenterCardContainer">
-        <div class="appCenterCardBox" v-if="appList.length">
+        <div class="appCenterCardBox" v-if="appList?.length">
           <div
             v-for="(appItem, index) in appList"
             :key="index"
@@ -45,7 +45,7 @@
             <div class="appCenterCardTop">
               <div class="appCenterCardIcon">
                 <el-icon class="menu-icon">
-                  <img class="create-button__icon" src="@/assets/svgs/robot_icon.svg" />
+                  <img class="create-button__icon" :src="getImgBg(appItem)" />
                 </el-icon>
               </div>
               <div class="appCenterCardContent">
@@ -74,11 +74,14 @@
             </div>
             <div class="unPublishSymbol" v-if="!appItem.published && appType === 'createdByMe'">
               <div class="coverIcon"></div>
-              <div class="textDesc">未发布</div>
+              <div class="textDesc">{{ publishStatus }}</div>
             </div>
           </div>
         </div>
-        <div class="appCenterNoData" v-else></div>
+        <div class="appCenterNoData" v-else>
+          <div class="noDataIcon"></div>
+          <div class="desc">暂无数据</div>
+        </div>
       </div>
       <el-pagination
         v-if="totalCount >= 16"
@@ -103,6 +106,8 @@ import { useRouter } from 'vue-router';
 import { api } from 'src/apis';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { IconAlarm } from '@computing/opendesign-icons';
+import RobotIcon from '../../assets/svgs/robot_icon.svg'
+const publishStatus = ref('未发布');
 const router = useRouter();
 const appType = ref('my');
 const appSearchType = ref('all');
@@ -115,13 +120,16 @@ const pagination = ref({
 const currentPage = ref(1);
 const totalCount = ref(0);
 const currentPageSize = ref(pagination.value.pageSizes[0]);
-
 const handleChangePage = (pageNum: number, pageSize: number) => {
   currentPage.value = pageNum;
   currentPageSize.value = pageSize;
   handleParmasQueryAppList();
 };
 
+const getImgBg = (appItem) => {
+  return appItem.icon ||  RobotIcon;
+}
+
 const handleCreateApp = () => {
   api
     .createOrUpdateApp({
diff --git a/src/views/createapp/components/appConfig.vue b/src/views/createapp/components/appConfig.vue
index 7a015d4..b39a3ff 100644
--- a/src/views/createapp/components/appConfig.vue
+++ b/src/views/createapp/components/appConfig.vue
@@ -9,8 +9,10 @@ import { api } from 'src/apis';
 const activeName = ref([1, 2, 3]);
 const activeNames = ref([1, 2, 3]);
 const route = useRoute();
-const props = withDefaults(defineProps(), {});
-const emits = defineEmits(['getFlowList']);
+const props = withDefaults(defineProps<{
+  handleValidateContent: Function,
+}>(), {});
+const emits = defineEmits(['getFlowList', 'getPublishStatus']);
 
 const createAppForm = ref({
   icon: '',
@@ -19,8 +21,10 @@ const createAppForm = ref({
   links: [],
   recommendedQuestions: [],
   dialogRounds: 3,
-  permissionType: 'private',
-  selectedPeople: [],
+  permission: {
+    visibility: 'private',
+    authorizedUsers: [],
+  },
 });
 const flowDataList = ref([]);
 const searchName = ref('');
@@ -38,14 +42,14 @@ const permissionTypeList = [
     value: 'protected',
   },
 ];
-const permissionList = ref(['zjq', 'zhouweitong', 'wst', 'shihy', 'ouyangnana', 'testname1', 'testname2']);
-const curPersonList = ref([...permissionList.value]);
+const permissionList = ref([]);
+const curPersonList = ref([]);
+const publishStatus = ref(false);
 // 这里后面需要换为变量-以便于中英文切换
 const createAppRole = ref({
   name: [{ required: true, message: '应用名称不能为空', trigger: 'blur' }],
   description: [{ required: true, message: '应用简介不能为空', trigger: 'change' }],
   dialogRounds: [{ required: true, message: '对话轮次不能为空', trigger: 'change' }],
-  descripermissionTypeption: [{ required: true, message: '权限不能为空', trigger: 'change' }],
 });
 const createAppFormRef = ref();
 const modeOptions = reactive([
@@ -71,18 +75,29 @@ const delRecommendItem = idx => {
   createAppForm.value.recommendedQuestions.splice(idx, 1);
 };
 const searchPerson = () => {
-  curPersonList.value = permissionList.value.filter(item => item.toLowerCase().includes(searchName.value));
+  curPersonList.value = permissionList.value.filter(item => item?.userName?.toLowerCase()?.includes(searchName.value));
 };
-
 const handleAvatarSuccess = (res, file) => {
   createAppForm.value.icon = URL.createObjectURL(file.raw);
 };
 
+watch(
+  () => publishStatus.value,
+  () => {
+    if (publishStatus.value) {
+      emits('getPublishStatus', publishStatus.value);
+    }
+  },
+  { deep: true, immediate: true },
+);
+
+
 const httpRequest = res => {
   res.onSuccess();
 };
 
 onMounted(() => {
+  // 判断是否编辑--是否需要查询回显数据
   if (route.query?.appId) {
     api
       .querySingleAppData({
@@ -98,29 +113,47 @@ onMounted(() => {
             links: appInfo.links.map(item => item.url),
             recommendedQuestions: appInfo.recommendedQuestions,
             dialogRounds: appInfo.dialogRounds,
-            permission: { visibility: appInfo.permission.visibility },
-            permissionType: appInfo.permission.visibility,
+            permission: {
+              visibility: appInfo.permission.visibility,
+              authorizedUsers: appInfo.permission.authorizedUsers,
+            },
           };
+          publishStatus.value = appInfo.published;
           flowDataList.value = appInfo.workflows;
           emits('getFlowList', flowDataList.value);
         }
       });
   }
+  // 获取当前权限配置-部分人可见的部分人列表数据
+  api.getPartAppConfgUser().then(res => {
+    if (res[1]?.result) {
+      permissionList.value = res[1]?.result?.userInfoList;
+      curPersonList.value = res[1]?.result?.userInfoList;
+    }
+  });
 });
 
 watch(
   () => createAppForm.value,
   async () => {
     if (createAppFormRef.value && props.handleValidateContent) {
-      let formBalidate = await createAppFormRef.value.validate();
-      if (formBalidate) {
-        props.handleValidateContent(!formBalidate);
-      }
+      const formBalidate = await validateForm();
+      props.handleValidateContent(!formBalidate);
     }
   },
   { deep: true, immediate: true },
 );
 
+// 获取界面配置的校验结果
+const validateForm = async () => {
+  try {
+    const resulst = await createAppFormRef.value.validate();
+    return true;
+  } catch (error) {
+    return false;
+  }
+}
+
 defineExpose({
   createAppForm,
   createAppFormRef,
@@ -183,7 +216,13 @@ defineExpose({
             <span class="linkText">最多添加5个链接</span>
           </div>
           <div class="linkArea" v-for="(item, index) in createAppForm.links">
-            <el-input class="w320" maxlength="200" v-model="createAppForm.links[index]" placeholder="请输入" clearable></el-input>
+            <el-input
+              class="w320"
+              maxlength="200"
+              v-model="createAppForm.links[index]"
+              placeholder="请输入"
+              clearable
+            ></el-input>
             <el-icon class="delIcon" @click="delConnectItem(index)">
               <IconDelete />
             </el-icon>
@@ -224,7 +263,7 @@ defineExpose({
         </template>
         <el-form-item label="请选择对话轮次" prop="dialogRounds">
           <div class="multiSessionItem">
-            <el-input-number v-model="createAppForm.dialogRounds" :step="1" :min="1" :max="10"></el-input-number>
+            <el-input-number v-model="createAppForm.dialogRounds" :step="1" :value-on-clear="3" :min="1" :max="10"></el-input-number>
             <span class="sessionUnit">(1 ~ 10)</span>
           </div>
         </el-form-item>
@@ -236,15 +275,15 @@ defineExpose({
             <IconCaretRight />
           </el-icon>
         </template>
-        <el-form-item label="权限" prop="permissionType" class="permissionItem">
+        <el-form-item label="权限" prop="permission" class="permissionItem">
           <div class="permissionSelect">
-            <el-radio-group v-model="createAppForm.permissionType">
+            <el-radio-group v-model="createAppForm.permission.visibility">
               <el-radio v-for="(item, index) in permissionTypeList" :key="index" :value="item.value">
                 {{ item.label }}
               </el-radio>
             </el-radio-group>
           </div>
-          <div class="partPermissionPerson" v-if="createAppForm.permissionType === 'protected'">
+          <div class="partPermissionPerson" v-if="createAppForm.permission.visibility === 'protected'">
             <el-input
               ref="inputRef"
               v-model="searchName"
@@ -255,10 +294,10 @@ defineExpose({
               :prefix-icon="IconSearch"
             ></el-input>
             <div class="personList">
-              <el-checkbox-group v-model="createAppForm.selectedPeople">
-                <el-checkbox v-for="(item, index) in curPersonList" :key="index" :label="item">
+              <el-checkbox-group v-model="createAppForm.permission.authorizedUsers">
+                <el-checkbox v-for="(item, index) in curPersonList" :key="index" :value="item?.userSub">
                   <span class="circle"></span>
-                  {{ item }}
+                  {{ item?.userName }}
                 </el-checkbox>
               </el-checkbox-group>
             </div>
diff --git a/src/views/createapp/index.vue b/src/views/createapp/index.vue
index 7f46c0a..8c1ccdf 100644
--- a/src/views/createapp/index.vue
+++ b/src/views/createapp/index.vue
@@ -8,9 +8,10 @@ const { t } = useI18n();
 import { useRouter, useRoute } from 'vue-router';
 import { api } from 'src/apis';
 import { ElMessage } from 'element-plus';
-import { IconSuccess } from '@computing/opendesign-icons';
+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 createAppType = ref('appConfig');
@@ -24,6 +25,7 @@ const handleChangeAppType = type => {
   createAppType.value = type;
 };
 
+// 需要界面配置校验与工作流校验同时通过
 const handlePulishApp = () => {
   // 发布接口
   api
@@ -40,6 +42,7 @@ const handlePulishApp = () => {
 
 const handleValidateContent = valid => {
   appFormValidate.value = valid;
+  // console.log(appFormValidate.value, 'value')
 };
 
 // 获取工作流组件中的节点连接状态校验
@@ -87,6 +90,12 @@ const saveConfigOrFlow = () => {
     workFlowRef.value.saveFlow();
   }
 };
+
+const getPublishStatus = (status) => {
+  if (status) {
+    publishStatus.value = '已发布'
+  }
+}
 watch(
   () => router,
   () => {
@@ -113,7 +122,7 @@ const handleJumperAppCenter = () => {
           <span>/</span>
           <span class="createAppContainerMenuText">创建应用</span>
         </div>
-        <div class="createAppContainerStatus">未发布</div>
+        <div class="createAppContainerStatus" :class="{ debugSuccess: publishStatus === '已发布'}">{{ publishStatus }}</div>
       </div>
       <div class="createAppContainerType">
         <div
@@ -121,7 +130,14 @@ const handleJumperAppCenter = () => {
           :class="{ createAppBtnActive: createAppType === 'appConfig' }"
           @click="handleChangeAppType('appConfig')"
         >
-          界面配置<span>{{ interfaceValid }}</span>
+          <div>界面配置</div>
+          <el-icon class="warningRemind" v-if="appFormValidate">
+            <IconRemind />
+          </el-icon>
+          
+          <el-icon v-else>
+            <IconSuccess />
+          </el-icon>
         </div>
         <div
           class="createAppBtn"
@@ -133,14 +149,14 @@ const handleJumperAppCenter = () => {
       </div>
     </div>
     <div class="createAppContainerMain" v-show="createAppType === 'appConfig'">
-      <AppConfig :handleValidateContent="handleValidateContent" @getFlowList="getFlowList" 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" />
     </div>
     <div class="createAppContainerFooter">
       <el-button @click="handleJumperAppCenter">取消</el-button>
-      <el-button @click="saveConfigOrFlow">保存</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>
     </div>
diff --git a/src/views/styles/InterPreview.scss b/src/views/styles/InterPreview.scss
index 3ca3654..eb19e1d 100644
--- a/src/views/styles/InterPreview.scss
+++ b/src/views/styles/InterPreview.scss
@@ -103,6 +103,7 @@
               display: flex;
               flex-wrap: wrap;
               gap: 8px;
+              flex-direction: column;
               .connectCard {
                 display: flex;
                 height: 32px;
@@ -111,6 +112,7 @@
                 padding: 0 8px 0 4px;
                 border-radius: 20px;
                 gap: 6px;
+                width: fit-content;
                 .connectBoxIndex {
                   width: 24px;
                   height: 24px;
@@ -127,7 +129,6 @@
                   font-size: 14px;
                   cursor: pointer;
                   font-weight: 400;
-                  max-width: 100px;
                 }
               }
             }
diff --git a/src/views/styles/createApp.scss b/src/views/styles/createApp.scss
index c0ee53e..1351166 100644
--- a/src/views/styles/createApp.scss
+++ b/src/views/styles/createApp.scss
@@ -61,6 +61,19 @@
         border-radius: 4px;
         cursor: pointer;
         color: var(--o-text-color-primary);
+        gap: 8px;
+        .el-icon, svg {
+          width: 16px;
+          height: 16px;
+        }
+        .warningRemind svg path{
+          &:first-child {
+            fill :#ebaf00;
+          }
+          &:last-child {
+            fill: #fff
+          }
+        }
       }
     }
   }
@@ -346,6 +359,10 @@
     background-color: #fbdede;
     color: #e32020;
   }
+  .debugSuccess {
+    background-color: var(--o-color-success) !important;
+    color: var(--o-bg-color-base) !important;
+  }
 }
 
 .w320 {
-- 
Gitee


From 41bcbb7278c283af65e0baee313e765740c27aae Mon Sep 17 00:00:00 2001
From: cc500 <2014434568@qq.com>
Date: Sun, 23 Feb 2025 17:25:10 +0800
Subject: [PATCH 6/6] =?UTF-8?q?1.=E8=AF=AD=E4=B9=89=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=B7=BB=E5=8A=A0=E5=88=86=E9=A1=B5=E5=99=A8?=
 =?UTF-8?q?=202.=E4=B8=8A=E4=BC=A0=E8=AF=AD=E4=B9=89=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=E7=B1=BB=E5=9E=8B=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Upload/index.vue |  8 +++++---
 src/views/api/index.vue         | 11 +++++++++++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/components/Upload/index.vue b/src/components/Upload/index.vue
index b79a5d7..e5b8470 100644
--- a/src/components/Upload/index.vue
+++ b/src/components/Upload/index.vue
@@ -81,7 +81,7 @@ const uploadDone = ref(false);
 const editable = ref(false);
 // 上传前检查
 const beforeUpload = async (file: ElFile) => {
-  const isYaml = file.type === 'application/x-yaml' || file.type === 'text/yaml'; // 也可能遇到 text/yaml 类型
+  const isYaml = file.type === 'application/x-yaml' || file.type === 'text/yaml' || file.name.indexOf('.yaml') > -1 || file.name.indexOf('.yml') > -1; // 也可能遇到 text/yaml 类型
   const isLt2M = file.size / 1024 / 1024 < 2;
   if (!isYaml) {
     ElMessage({
@@ -298,7 +298,9 @@ watch(
     outline: none;
   }
 }
-
+::v-deep(.el-upload.is-drag) {
+  display: block !important;
+}
 .drawerFooter {
   position: absolute;
   bottom: 12px;
@@ -308,7 +310,7 @@ watch(
   cursor: pointer;
   position: relative;
   overflow: hidden;
-  width: 400px;
+  width: 100%;
   height: 200px;
   display: flex;
   align-items: center;
diff --git a/src/views/api/index.vue b/src/views/api/index.vue
index ce99d52..185171b 100644
--- a/src/views/api/index.vue
+++ b/src/views/api/index.vue
@@ -74,6 +74,16 @@
           <div class="noDataIcon"></div>
           <div class="desc">暂无数据</div>
         </div>
+        <el-pagination
+        v-if="totalCount >= 16"
+        v-model:current-page="currentPage"
+        v-model:page-size="currentPageSize"
+        :page-sizes="pagination.pageSizes"
+        :layout="pagination.layout"
+        :total="totalCount"
+        popper-class="appPagination"
+        @change="handleChangePage"
+      />
       </div>
     </div>
     <el-drawer
@@ -178,6 +188,7 @@ const handleClose = () => {
   getServiceJson.value = '';
   getServiceYaml.value = '';
   drawer.value = false;
+  handleParmasQueryapiList();
 };
 
 const handleParmasQueryapiList = (params?: any) => {
-- 
Gitee