Merge branch 'main' of ssh://18.167.251.121:10002/aidlab/FiDA_Front

src/views/home/agent/components/versionTree/index.vue

@@ -58,6 +58,9 @@ const setVersionsList = (res)=>{
 	}
 	traverseArray(res,'',(item,i,father)=>{
 		item.versionId = father?`${father.versionId}-${i+1}`:'1'
+		if(item.id == projectStore.state.nodeId){
+			selectItem.value = {...item}
+		}
 	})
 	versionsList.value = res
 }
@@ -110,10 +113,6 @@ const versionDelete = (versionDetail)=>{
 	treeKey.value++
 }
 
-watch(()=>projectStore.state.nodeId,(newVal,oldVal)=>{
-	if(!newVal || newVal === selectItem?.value?.id)return
-	selectItem.value = {id:newVal}
-})
 
 let data = reactive({})
 // onMounted(() => {setVersionsList('')})
@@ -126,7 +125,6 @@ const {} = toRefs(data)
 		<el-drawer
 			v-model="versionTreeData.drawer"
 			:close-on-press-escape="false"
-			:close-on-click-modal="false"
 			:size="treeState ? '73.5rem' : '73.5rem'"
 			body-class="versionTreeBody"
 			:with-header="false"

src/views/home/agent/components/versionTree/tree/view2/index.vue

@@ -7,6 +7,8 @@ import InputNode from './InputNode.vue'//主
 import SecondaryNode from './secondaryNode.vue'//分支
 import { useLayout } from '@/utils/treeDiagram'
 import dialogVue from "../../components/dialog.vue";
+import { ElMessageBox } from 'element-plus'
+import { useI18n } from 'vue-i18n'
 const props = defineProps({
 	selectItem: {
 		type: Object,
@@ -22,7 +24,7 @@ const emit = defineEmits([
 	'versionRestore',
 	'versionDelete',
 ])
-
+const {t:$t} = useI18n()
 const dialogDeleteRef = ref()
 const dialogRestoreRef = ref()
 
@@ -89,9 +91,8 @@ watch(()=>props.treeList.length, (newVal, oldVal) => {
 watch(()=>props.selectItem.versionId, (newVal, oldVal) => {
 })
 
-const versionRestore = ()=>{
-	emit('versionRestore')
-	// dialogRestoreRef.value?.open()
+const versionRestore = async ()=>{
+	dialogDeleteRef.value?.open()
 }
 
 const versionDelete = ()=>{
@@ -139,24 +140,24 @@ defineExpose({push})
 				</div> -->
 			</div>
 		</div>
-		<!-- <dialogVue 
+		<dialogVue 
 			:textData="{
 				title: $t('VersionTree.deleteChat'),
 				text: $t('VersionTree.deleteHint'),
 				submitText: $t('VersionTree.delete'),
-				cancelText: $t('VersionTree.cancel'),
+				cancelText: $t('VersionTree.Cancel'),
 			}"
 			:styleData="{
 				width: '40.6rem'
 			}"
-			:callBack="()=>emit('versionDelete')"
+			:callBack="()=>emit('versionRestore')"
 			ref="dialogDeleteRef" />
-		<dialogVue 
+		<!-- <dialogVue 
 			:textData="{
 				title: $t('VersionTree.restoreChat'),
 				text: $t('VersionTree.restoreHint'),
 				submitText: $t('VersionTree.confirm'),
-				cancelText: $t('VersionTree.cancel'),
+				cancelText: $t('VersionTree.Cancel'),
 			}"
 			:styleData="{
 				width: '40.6rem'
@@ -225,10 +226,9 @@ defineExpose({push})
 				margin-bottom: 2rem;
 				background-color: #ffffff;
 				cursor: pointer;
-				pointer-events: none;
+				display: none;
 				&.active{
-					background-color: #f5f5f5;
-					pointer-events: auto;
+					display: flex;
 				}
 				&:hover{
 					background-color: #f5f5f5;

src/views/home/left-nav.vue

@@ -44,7 +44,7 @@
 					<span class="label" v-show="!item.edit">{{ item.name }}</span>
 					<el-popover
 						placement="right"
-						trigger="click"
+						trigger="contextmenu"
 						width="10rem"
 						popper-style="
 							padding: .6rem 0.7rem;
@@ -54,7 +54,9 @@
 						v-model:visible="item.visible"
 					>
 						<template #reference>
-							<span @click.stop class="icon"><svg-icon name="more" size="16" /></span>
+							<span @click.stop="item.visible = !item.visible" class="icon">
+								<svg-icon name="more" size="16" />
+							</span>
 						</template>
 						<div class="history-item-menu">
 							<div class="rename" @click="onRenameHistoryItem(item)">