Merge branch 'main' of http://18.167.251.121:10003/aidlab/FiDA_Front

src/lang/en.ts

@@ -173,16 +173,10 @@ export default {
 		deleteHint:'Once deleted, you won’t be able to view this conversation again.',
 		restoreChat:'Restore chat?',
 		restoreHint:'Once deleted, you won’t be able to view this conversation again.',
-		cancel: 'cancel',
+		Cancel: 'Cancel',
 		Confirm: 'Confirm',
 		export: 'Export',
 	},
-	//generateSketch
-	generateSketch: {
-		restore: 'Restore',
-		delete: 'Delete',
-		edit: 'Edit'
-	},
 	flowCanvas: {
 		deleteCardConfirm: 'Are you sure you want to delete this function card?',
 		confirm: 'Confirm',

src/lang/zh-cn.ts

@@ -168,9 +168,9 @@ export default {
 		deleteHint: '删除后将无法恢复该对话。',
 		restoreChat: '恢复对话？',
 		restoreHint: '恢复后将显示该对话。',
-		cancel: '取消',
+		Cancel: '取消',
 		Confirm: '确认',
-		export: '导出'
+		export: '导出',
 	},
 	//generateSketch
 	generateSketch: {

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 = ()=>{
+const versionRestore = async ()=>{
-	emit('versionRestore')
+	dialogDeleteRef.value?.open()
-	// dialogRestoreRef.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'