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

src/components/Canvas/FlowCanvas/components/header-tools.vue

@@ -15,9 +15,9 @@
 			<span class="icon"><svg-icon name="export" size="11" /></span>
 			<span class="text">Export</span>
 		</button>
-		<button class="import" @click="emit('import')">
+		<!-- <button class="import" @click="emit('import')">
 			<span class="text">Import</span>
-		</button>
+		</button> -->
 	</div>
 </template>
 

src/components/Canvas/FlowCanvas/components/nodes/cards/index.vue

@@ -153,6 +153,7 @@
 				}
 			})
 		})
+		stateManager.recordState()
 		// } else {
 			// subordNode.data.data.url =
 			// 	'https://s3-alpha-sig.figma.com/img/8ce2/f1a4/12b93da90e5f17109e7430f14837fd14?Expires=1773619200&Key-Pair-Id=APKAQ4GOSFWCW27IBOMQ&Signature=kmLsTFtXJqfvuxj6husWlDkRDMOIRDjzUUjb7zh79GkBKihUHc0f59k5OAImHTPdaiEREUCCpn~8sQ-si5lenuauJpApCmAU~NsxjfQhuh9m5O~GiHenr2fKu0DIJ75-oCE3859fyxoSFXQgZ9PRmeb98kikMR6uRX9nI5TPUHgKO8ZgkhDBTW~iyaDT~1ybnoK7elPa6T2VzfO-bpIyY-MZ71VRq3RxwmZRxduqHEb3Dh-jjrHyh2SoQsHmUjSJOf-uYilfvpGUResZAjAq8ZVLEjvhzKC2bmCNZIp3RmhYO8ctU7pd5t91J6Xaa6jBLtGfMxbqIm652EC79K0RoA__'

src/components/Canvas/FlowCanvas/components/nodes/result-image.vue

@@ -17,7 +17,7 @@
 				<span class="icon" @click="onDownload(item?.url)">
 					<svg-icon name="download" size="20" size-unit="px" />
 				</span>
-				<button class="edit" @click="onEdit(item?.url)">
+				<button class="edit" @click="onEdit(item)">
 					<span class="icon"><svg-icon name="edit" size="13" /></span>
 					<span class="text">Edit</span>
 				</button>
@@ -90,6 +90,7 @@
 	const showMenu = ref(false)
 	const clickTaskId = ref('')
 	const generateManager = inject('generateManager') as any
+	const stateManager = inject('stateManager') as any
 	const clickimageProcessTaskItem = (taskId: string) => {
 		if(clickTaskId.value == taskId){
 			showMenu.value = !showMenu.value
@@ -158,6 +159,7 @@
 					}
 					item.scale.x = -item.scale.x
 				})
+				stateManager.recordState()
 			}
 		},
 		{
@@ -170,10 +172,12 @@
 					}
 					item.scale.y = -item.scale.y
 				})
+				stateManager.recordState()
 			}
 		}
 	])
 	const onPreview = (url: string) => {
+		console.log(data.superiorNodeType == NODE_DATATYPE.TO_3D_MODEL)
 		if(data.superiorNodeType == NODE_DATATYPE.TO_3D_MODEL){
 			openThreeModelPreview(url)
 		}else{
@@ -192,8 +196,8 @@
 		showMenu.value = false
 		clickTaskId.value = ''
 	}
-	const onEdit = (url: string) => {
-		myEvent.emit('openDepthCanvas', { url })
+	const onEdit = (item: any) => {
+		myEvent.emit('openDepthCanvas', { url:item.url,id: item.taskId })
 	}
 	document.addEventListener('mousedown', hideMenu)
 	onBeforeUnmount(() => {
@@ -269,6 +273,7 @@
 				align-items: center;
 				justify-content: center;
 				gap: 8px;
+				cursor: pointer;
 				&:active {
 					opacity: 0.8;
 				}

src/components/Canvas/FlowCanvas/flow-canvas.vue

@@ -64,7 +64,7 @@
 
 <script setup lang="ts">
 	import { VueFlow, useVueFlow } from '@vue-flow/core'
-	import { computed, ref, watch, onMounted, nextTick, provide, onBeforeMount, onBeforeUnmount } from 'vue'
+	import { computed, ref, watch, onMounted, nextTick, provide, onBeforeUnmount } from 'vue'
 	import { useLayout } from '@/utils/treeDiagram'
 	import { NODE_TYPE, NODE_COMPONENT } from './tools/index.d'
 	// 组件

src/components/Canvas/components/image-preview.vue

@@ -51,6 +51,7 @@
 		width: 100%;
 		height: 70vh;
 		padding: 67px;
+		display: flex;
 		> .image-box {
 			margin: auto;
 			max-width: 90%;