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

src/components/Canvas/FlowCanvas/components/cards/cards-select.vue

@@ -41,15 +41,15 @@
 			type: NODE_DATATYPE.COLOR_PALETTE,
 			title: 'Color Palette'
 		},
-		{
-			tier: NODE_DATATIER.TO_3VIEW,
-			type: NODE_DATATYPE.TO_3VIEW,
-			title: 'To 3-View'
-		},
 		{
 			tier: NODE_DATATIER.TO_3D_MODEL,
 			type: NODE_DATATYPE.TO_3D_MODEL,
 			title: 'To 3D Model'
+		},
+		{
+			tier: NODE_DATATIER.TO_3VIEW,
+			type: NODE_DATATYPE.TO_3VIEW,
+			title: 'To 3-View'
 		}
 	])
 	const onClickItem = (v) => {

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

@@ -69,17 +69,17 @@
 			title: 'Color Palette',
 			component: ColorPalette
 		},
-		{
-			tier: NODE_DATATIER.TO_3VIEW,
-			type: NODE_DATATYPE.TO_3VIEW,
-			title: 'To 3-View',
-			component: To3View
-		},
 		{
 			tier: NODE_DATATIER.TO_3D_MODEL,
 			type: NODE_DATATYPE.TO_3D_MODEL,
 			title: 'To 3D Model',
 			component: To3DModel
+		},
+		{
+			tier: NODE_DATATIER.TO_3VIEW,
+			type: NODE_DATATYPE.TO_3VIEW,
+			title: 'To 3-View',
+			component: To3View
 		}
 	]
 	const nodeManager = inject('nodeManager') as any

src/components/Canvas/FlowCanvas/components/node.vue

@@ -45,7 +45,7 @@
 		() =>
 			props.node.id === lastNode.value.id &&
 			NODE_DATATYPE.RESULT_IMAGE === props.node.data.type &&
-			!(tier.value === NODE_DATATIER.TO_3D_MODEL)
+			!(tier.value === NODE_DATATIER.TO_3VIEW)
 	)
 	const onAdd = () => {
 		const tier_ = tier.value + 1

src/components/Canvas/FlowCanvas/tools/index.d.ts

@@ -17,8 +17,8 @@ export const NODE_DATATYPE = {
 	SURFACE_EDIT: 'surface-edit',
 	SCENE_COMPOSITION: 'scene-composition',
 	COLOR_PALETTE: 'color-palette',
-	TO_3VIEW: 'to-3view',
 	TO_3D_MODEL: 'to-3d-model',
+	TO_3VIEW: 'to-3view',
 }
 /**
  * 节点数据层级
@@ -30,6 +30,6 @@ export const NODE_DATATIER = {
 	SURFACE_EDIT: 1,
 	SCENE_COMPOSITION: 2,
 	COLOR_PALETTE: 2,
-	TO_3VIEW: 2,
+	TO_3D_MODEL: 2,
-	TO_3D_MODEL: 3,
+	TO_3VIEW: 3,
 }

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

@@ -25,7 +25,7 @@ const props = defineProps<{
 		<!-- <div>{{ props.data.id }}</div> -->
 		<div class="item">
 			<!-- {{ props.data.url }} -->
-			<img :src="props.data?.url" />
+			<img v-if="props.data?.url" :src="props.data?.url" />
 			<div class="mask"></div>
 		</div>
 	</div>