Merge branch 'master' of http://192.168.5.5:10010/r/web/flow_web

zhangxiao

2024-08-16 4718ea9d48c62bcfc8640d42411ce191e01584b0

Merge branch 'master' of http://192.168.5.5:10010/r/web/flow_web

 src/views/sessionManager/components/agentSession.vue

@@ -321,6 +321,7 @@
              console.info('done');
              displayedText.value = '';
              queryAgentSessionDetail(agentObj.id);
              EventBus.emit('queryAppUsageList');
              break;
            }
          }
@@ -375,9 +376,14 @@
  EventBus.on('createAgent', (data) => {
    createNewAgent(data);
  });
  EventBus.on('queryAgentSessionDetail', (data) => {
    Object.assign(agentObj, data);
    queryAgentSessionDetail(data.id);
  });
});
onBeforeUnmount(() => {
  EventBus.off('createAgent');
  EventBus.off('queryAgentSessionDetail');
});

watch(

 src/views/sessionManager/components/chatMenu.vue

@@ -86,13 +86,13 @@
              <div class="myAgentBoxImgLayout___u69B_">
                <div class="MuiBox-root css-5nczy5">
                  <img
                    src="https://kimi-img.moonshot.cn/prod-chat-kimi/avatar/kimiplus/guess.png"
                    :src="item.icon ? httpUrl + item.icon:'https://kimi-img.moonshot.cn/prod-chat-kimi/avatar/kimiplus/guess.png'"
                    alt=""
                    style="border-radius: 50%; width: 100%; height: 100%;">
                </div>
                <span class="myAgentBoxImgLayoutTip___xHV4m">{{item.name}}</span>
              </div>
              <div data-testid="msh-sidebar-bot-delete" class="myAgentBoxImgDelete___qXZuq"  @click="deleteSession(item)">
              <div data-testid="msh-sidebar-bot-delete" class="myAgentBoxImgDelete___qXZuq"  @click.stop="deleteSession(item)">
                <div class="myAgentBoxImgDeleteInner____Hawc"  >从侧边栏移除</div>
              </div>
            </div>
@@ -120,10 +120,12 @@
  sessionListApi
} from "@/api/session";
import { Message } from "@arco-design/web-vue";
const httpUrl = localStorage.getItem('httpUrl');
import EventBus from '@/utils/EventBus';
const emit = defineEmits(["querySessionDetail","changeAgentType","createSession"]);
import logo from "@/assets/images/model.png";
import { appUsageSessionListApi, deleteAppUsage } from "@/api/Agent";
import { getAgentSessionDetailsApi } from "@/api/agentSession";
const activeSessionId = ref("");
const fieldNames = { value: "id", label: "name" };
const dialogs = ref([]);
@@ -159,15 +161,26 @@
const createNewSession = async (session) => {
  console.log(session, 'session');
  // 查询历史记录
  // if (session.type == '1') {
  //   // 生成智能体新的对话
  //   emit('createSession',session.id);
  //   emit('changeAgentType','1');
  // } else {
  //   // 生成agent新的对话
  //   EventBus.emit("createAgent",session);
  //   emit('changeAgentType','2');
  // }
  if (session.app_type == '1') {
    // 生成智能体新的对话
    emit('createSession',session.app_id);
    emit('changeAgentType','1');
  } else {
    // 生成agent新的对话
    // agent对象数据封装
    const { code, data } = await getAgentSessionDetailsApi(session.app_id);
    if (code == 0) {
      console.log(data,'会话详情');
      let sessionObj = {
        id: session.app_id,
        dsl: data.dsl,
        title: session.name,
      }
      EventBus.emit("createAgent",sessionObj);
      emit('changeAgentType','2');
    }

  }



@@ -179,11 +192,23 @@
//根据会话id删除会话
const deleteSession = async (session) => {
  const { code } = await deleteAppUsage({
    app_id:session.id
    app_id:session.app_id
  });
  if (code === 200) {
    // Message.success('删除成功');
    querySessionList('');
    const { code, data } = await appUsageSessionListApi('');
    if (code === 200) {
      sessionList.value = data;
      // sessionList.value.splice(0, 5);
      console.log(sessionList.value,'用户习惯会话列表');
      if(sessionList.value.length == 0){
        // 生成智能体新的对话
        emit('createSession','');
        emit('changeAgentType','1');
      }
    } else {
      // Message.warning("查询失败");
    }
  }
};

@@ -197,10 +222,12 @@
})

onMounted(() => {

  EventBus.on("queryAppUsageList", (data) => {
    querySessionList('');
  })
})
onBeforeUnmount(() => {

  EventBus.off("queryAppUsageList");
});



 src/views/sessionManager/components/historySession.vue

@@ -54,7 +54,7 @@
                      <img
                        :style="{ width: '16px' }"
                        alt="dessert"
                        :src="session.avatar || imgSrc"
                        :src="session.icon ? httpUrl + session.icon : imgSrc"
                      />
                      {{ session.name }}
                    </div>
@@ -101,6 +101,7 @@
const emit = defineEmits(["querySessionDetail","changeAgentType"]);
import logo from "@/assets/images/model.png";
import { deleteKnow } from "@/api/kbList";
import { getAgentSessionDetailsApi } from "@/api/agentSession";
const sessionList = ref([]); //会话列表
const activeSessionId = ref("");
const fieldNames = { value: "id", label: "name" };
@@ -111,6 +112,7 @@
const searchValue = ref("");
const selectValue = ref("");
const sectionList = ref({});
const httpUrl = localStorage.getItem('httpUrl');
const imgSrc = ref(logo);
const DialogList = async () => {
  const { code, data } = await getDialogListApi();
@@ -198,8 +200,34 @@

const querySessionDetail = async (session) => {
  console.log(session, 'session');
  emit('changeAgentType','1');
  emit('querySessionDetail',session);


  // 查询历史记录
  if (session.base == 'agent') {
    // agent对象数据封装
    // const { code, data } = await getAgentSessionDetailsApi(session.app_id);
    // if (code == 0) {
    //   console.log(data,'会话详情');
    //   let sessionObj = {
    //     id: session.app_id,
    //     dsl: data.dsl,
    //     title: session.name,
    //   }
    //
    // }
    EventBus.emit("queryAgentSessionDetail",{
      ...sessionObj,
      id: session.app_id,
    });
    emit('changeAgentType','2');
  } else {
    // 生成智能体新的对话
    emit('changeAgentType','1');
    emit('querySessionDetail',session);
  }



}



 src/views/sessionManager/index.vue

@@ -356,6 +356,7 @@
              console.info("done");
              displayedText.value = "";
              queryNewSessionDetail(activeSessionId.value);
              EventBus.emit('queryAppUsageList');
              break;
            }
          }
@@ -377,6 +378,7 @@
  activeSessionId.value = id;
  const { code, data } = await getSessionDetailsApi(id);
  if (code === 200) {
    console.log(data, "新建会话详情");
    sessionDetailList.value = data.message;
    agentTitle.value = data.name;
    refreshScroll(); //刷新滚动条位置