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

src/api/versitonTree.ts

@@ -28,14 +28,29 @@ export const versionTree = (data) => {
 }
 
 /**
- * 获取版本树
+ * 获取节点缩略信息
- * @param data 获取版本树的参数
+ * @param data 获取节点缩略信息的参数
  * @param data.projectId 项目id
- * @returns 获取版本树
+ * @param data.id 节点id
+ * @returns 获取节点缩略信息
 */
 export const getNodeAncestors = (data) => {
 	return request({
 		url: `/api/version/${data.projectId}/chat/node/${data.id}/ancestors`,
 		method: 'get',
 	})
+}
+
+/**
+ * 清除未生成图片的节点对话
+ * @param data 清除未生成图片的节点对话的参数
+ * @param data.projectId 项目id
+ * @param data.id 节点id
+ * @returns 获取节点缩略信息
+*/
+export const clearNodeChat = (data) => {
+	return request({
+		url: `/api/version/${data.projectId}/chat/reStore/${data.id}`,
+		method: 'get',
+	})
 }

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

@@ -20,7 +20,7 @@ const props = defineProps({
 })
 
 const emit = defineEmits([
-	'restore'
+	'restore','update:versionTreeData','selectNode'
 ])
 
 const versionsList = ref([])
@@ -102,6 +102,7 @@ const versionRestore = () => {
 	selectItem.value = {...addObj}
 	treeKey.value++
 	emit('restore')
+	emit('update:versionTreeData', {...props.versionTreeData, drawer: false})
 }
 const versionDelete = (versionDetail)=>{
 	if(!selectItem.value?.versionId)return
@@ -133,7 +134,7 @@ const {} = toRefs(data)
 					</div>
 				</div>
 			</div>
-			<div class="expandBtnBox">
+			<div class="expandBtnBox" v-if="versionsList.length > 0">
 				<div class="btn" @click="openTree(true)">
 					<div class="versionExport">
 						<SvgIcon name="versionExport" size="17" color="rgba(0, 0, 0, 0.6)" />
@@ -151,7 +152,7 @@ const {} = toRefs(data)
 					<span>{{ $t('VersionTree.branchingNodeTree') }}</span>	
 				</div>
 			</div> -->
-			<div class="versionTreeBox">
+			<div class="versionTreeBox" v-if="versionsList.length > 0">
 				<div class="tree">
 					<Tree 
 						v-if="versionsList.length > 0"
@@ -161,6 +162,7 @@ const {} = toRefs(data)
 						v-model:selectItem="selectItem"
 						@versionRestore="versionRestore"
 						@versionDelete="versionDelete"
+						@selectNode="$emit('selectNode')"
 						:key="treeKey"
 					></Tree>
 				</div>

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

@@ -22,6 +22,7 @@ const emit = defineEmits([
 	'update:selectItem',
 	'versionRestore',
 	'versionDelete',
+	'selectNode'
 ])
 let data = reactive({
 })
@@ -75,6 +76,7 @@ const setSelectItem = (item)=>{
 	console.log(item)
 	projectStore.setProject({nodeId: item.id})
 	emit('update:selectItem', {...item})
+	emit('selectNode')
 }
 
 // 滚动到选中项

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

@@ -91,7 +91,7 @@ watch(()=>props.selectItem.versionId, (newVal, oldVal) => {
 
 const versionRestore = ()=>{
 	emit('versionRestore')
-	dialogRestoreRef.value?.open()
+	// dialogRestoreRef.value?.open()
 }
 
 const versionDelete = ()=>{
@@ -125,21 +125,21 @@ defineExpose({push})
 				</template> -->
 			</VueFlow>
 			<div class="btnBox">
-				<div class="item" @click="versionRestore">
+				<div class="item" v-if="selectItem.url" @click="versionRestore">
 					<div class="icon">
 						<SvgIcon name="versionRestore" size="12" />
 					</div>
 					<span>{{ $t('VersionTree.restore') }}</span>
 				</div>
-				<div class="item" @click="versionDelete">
+				<!-- <div class="item" @click="versionDelete">
 					<div class="icon">
 						<SvgIcon name="versionDelete" size="12" />
 					</div>
 					<span>{{ $t('VersionTree.delete') }}</span>
-				</div>
+				</div> -->
 			</div>
 		</div>
-		<dialogVue 
+		<!-- <dialogVue 
 			:textData="{
 				title: $t('VersionTree.deleteChat'),
 				text: $t('VersionTree.deleteHint'),
@@ -162,7 +162,7 @@ defineExpose({push})
 				width: '40.6rem'
 			}"
 			:callBack="()=>emit('versionRestore')"
-			ref="dialogRestoreRef" />
+			ref="dialogRestoreRef" /> -->
 	</div>
 </template>
 <style lang="less">