diff --git a/src/components/Canvas/FlowCanvas/components/nodes/cards/index.vue b/src/components/Canvas/FlowCanvas/components/nodes/cards/index.vue index 105c0bd..2a1d122 100644 --- a/src/components/Canvas/FlowCanvas/components/nodes/cards/index.vue +++ b/src/components/Canvas/FlowCanvas/components/nodes/cards/index.vue @@ -132,7 +132,6 @@ imageUrl: attrs.node?.data?.originalImage, ...data, } - console.log(subordNode) const taskList = await currentComponent.value.api(apiData).then((rv)=>{ return rv }) || [] @@ -143,6 +142,7 @@ positionY: (index + subordNodes.length) * (50 + 250), data: { superiorID: attrs.node.id, + superiorNodeType: attrs.node?.data?.type, createIndexPosition: index, tier: currentComponent.value.tier, isActive: index == 0 && subordNodes.length == 0, diff --git a/src/components/Canvas/FlowCanvas/components/nodes/result-image.vue b/src/components/Canvas/FlowCanvas/components/nodes/result-image.vue index 102b109..b445a74 100644 --- a/src/components/Canvas/FlowCanvas/components/nodes/result-image.vue +++ b/src/components/Canvas/FlowCanvas/components/nodes/result-image.vue @@ -7,7 +7,7 @@ :class="{'active': config.isActive}" @click="setSelectTaskId(item.taskId)" > -
+
@@ -61,7 +61,9 @@ import { downloadImage } from '../../../tools/tools' import { reactive, ref, onBeforeUnmount, useAttrs, inject, watch, computed, onMounted } from 'vue' import HighlightAdmin from '@/components/highlightAdmin.vue' + import { NODE_DATATYPE } from '../../tools/index.d' const openImagePreview = inject('openImagePreview') as (url: string) => void + const openThreeModelPreview = inject('openThreeModelPreview') as (url: string) => void const props = defineProps({ node: { type: Object, @@ -83,8 +85,8 @@ 'send-to-back', 'update-data' ]) - const attrs = useAttrs() - const showHeader = ref(!!attrs.node?.data?.isHeader) + // const attrs = useAttrs() + const showHeader = ref(!!props.node?.data?.isHeader) const showMenu = ref(false) const clickTaskId = ref('') const generateManager = inject('generateManager') as any @@ -97,6 +99,7 @@ const data = reactive({ selectTaskId: props.data?.selectTaskId || '', imageProcessTasks: props.data?.imageProcessTasks, + superiorNodeType: props?.node?.data?.superiorNodeType, isActive: props.data?.isActive || false, }) const setSelectTaskId = (taskId: string) => { @@ -171,7 +174,11 @@ } ]) const onPreview = (url: string) => { - openImagePreview(url) + if(data.superiorNodeType == NODE_DATATYPE.TO_3D_MODEL){ + openThreeModelPreview(url) + }else{ + openImagePreview(url) + } } const onDownload = (url: string) => { downloadImage(url, 'image.png') diff --git a/src/components/Canvas/FlowCanvas/components/tools/threeModel/index.vue b/src/components/Canvas/FlowCanvas/components/tools/threeModel/index.vue index 7f12bfa..7f97de2 100644 --- a/src/components/Canvas/FlowCanvas/components/tools/threeModel/index.vue +++ b/src/components/Canvas/FlowCanvas/components/tools/threeModel/index.vue @@ -1,18 +1,25 @@