diff --git a/src/views/home/agent/components/versionTree/index.vue b/src/views/home/agent/components/versionTree/index.vue index 7f71d0e..4bab113 100644 --- a/src/views/home/agent/components/versionTree/index.vue +++ b/src/views/home/agent/components/versionTree/index.vue @@ -29,7 +29,7 @@ const projectStore = useProjectStore() let oldProjectId:any = '' watch(()=>props.versionTreeData?.drawer, (newVal, oldVal) => { console.log(newVal,oldProjectId,projectStore.state.id) - if(newVal && oldProjectId !== projectStore.state.id && projectStore.state.id){ + if(newVal || (oldProjectId !== projectStore.state.id && projectStore.state.id)){ getVersionTree() oldProjectId = JSON.parse(JSON.stringify(projectStore.state.id)) } @@ -41,6 +41,7 @@ const getVersionTree = ()=>{ }).then(res => { if(!res)return setVersionsList([res]) + treeKey.value++ }) } diff --git a/src/views/home/agent/components/versionTree/tree/index.vue b/src/views/home/agent/components/versionTree/tree/index.vue index f3650fe..6713261 100644 --- a/src/views/home/agent/components/versionTree/tree/index.vue +++ b/src/views/home/agent/components/versionTree/tree/index.vue @@ -73,7 +73,6 @@ const initialize = ()=>{ const setSelectItem = (item)=>{ if(!item.versionId)return - console.log(item) projectStore.setProject({nodeId: item.id}) emit('update:selectItem', {...item}) emit('selectNode') @@ -97,10 +96,6 @@ watch(()=>treeStateTime.value,(newVal,oldVal)=>{ } }) -watch(()=>props.selectItem,(newVal,oldVal)=>{ - // scrollToActive() -},{immediate: true}) - onMounted(()=>{ initialize() }) diff --git a/src/views/home/agent/components/versionTree/tree/view2/index.vue b/src/views/home/agent/components/versionTree/tree/view2/index.vue index c93a3b1..9db3f8a 100644 --- a/src/views/home/agent/components/versionTree/tree/view2/index.vue +++ b/src/views/home/agent/components/versionTree/tree/view2/index.vue @@ -125,7 +125,7 @@ defineExpose({push}) -->
-
+
@@ -225,6 +225,11 @@ defineExpose({push}) margin-bottom: 2rem; background-color: #ffffff; cursor: pointer; + pointer-events: none; + &.active{ + background-color: #f5f5f5; + pointer-events: auto; + } &:hover{ background-color: #f5f5f5; } diff --git a/src/views/home/agent/index.vue b/src/views/home/agent/index.vue index cf8a1da..c902340 100644 --- a/src/views/home/agent/index.vue +++ b/src/views/home/agent/index.vue @@ -63,10 +63,13 @@ } const handleGetProjectInfoAndHistory = () => { - getProjectInfo({ id: projectStore.state.id }).then((res) => { - // console.log('1111111',res); - agentRef.value.setChatInfo(res.conversation) - projectStore.setProject(res.project) + getProjectInfo({ id: route.params.id }).then((res) => { + if(res?.conversation)agentRef.value.setChatInfo(res.conversation) + let data = res?.project || res + if(data?.latestNodeId)data.nodeId = data.latestNodeId + projectStore.setProject({ + ...data, + }) }) } @@ -75,15 +78,7 @@ watch( () => proJectId.value, (newVal, oldVal) => { - if (newVal) { - projectStore.clearProject() - projectStore.setId(newVal) - } - } - ) - watch( - () => projectStore.state.id, - (newVal, oldVal) => { + projectStore.clearProject() if (newVal) { handleGetProjectInfoAndHistory() } @@ -91,7 +86,8 @@ ) onMounted(() => { - if (projectStore.state.id) { + projectStore.clearProject() + if (proJectId.value) { handleGetProjectInfoAndHistory() } })