From ad6133c2f0a56bc52de11a28dfe213b070462325 Mon Sep 17 00:00:00 2001 From: "X1627315083@163.com" <1627315083@qq.com> Date: Wed, 25 Mar 2026 13:04:31 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=9A=84=E9=A2=9C?= =?UTF-8?q?=E8=89=B2=E5=8D=A1=E7=89=87=E5=92=8C=E5=9C=BA=E6=99=AF=E5=8D=A1?= =?UTF-8?q?=E7=89=87=E7=9A=84=E8=8A=82=E7=82=B9=E5=B1=82=E7=BA=A7=E4=B8=BA?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FlowCanvas/components/nodes/cards/index.vue | 14 +++++++++++++- .../FlowCanvas/components/nodes/result-image.vue | 4 ++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/components/Canvas/FlowCanvas/components/nodes/cards/index.vue b/src/components/Canvas/FlowCanvas/components/nodes/cards/index.vue index 00d979c..945e8d6 100644 --- a/src/components/Canvas/FlowCanvas/components/nodes/cards/index.vue +++ b/src/components/Canvas/FlowCanvas/components/nodes/cards/index.vue @@ -162,7 +162,19 @@ // if (!subordNode) { //如果是添加印花的结果就作为一级节点可以再次选择添加印花或者生成真实图 - let tier = (NODE_DATATIER.Fast_MODE == currentComponent.value.tier && currentComponent.value.type == NODE_DATATYPE.Fast_MODE)?0:currentComponent.value.tier + let typeList = [ + NODE_DATATYPE.Fast_MODE, + NODE_DATATYPE.CANVAS_MODE, + NODE_DATATYPE.SCENE_COMPOSITION, + NODE_DATATYPE.COLOR_PALETTE, + ] + let tritList = [ + NODE_DATATIER.Fast_MODE, + NODE_DATATIER.CANVAS_MODE, + NODE_DATATIER.SCENE_COMPOSITION, + NODE_DATATIER.COLOR_PALETTE, + ] + let tier = (tritList.includes(currentComponent.value.tier) && typeList.includes(currentComponent.value.type))?currentComponent.value.tier - 1:currentComponent.value.tier taskList.forEach((item,index) => { nodeManager.createResultNode({ data: { diff --git a/src/components/Canvas/FlowCanvas/components/nodes/result-image.vue b/src/components/Canvas/FlowCanvas/components/nodes/result-image.vue index 55c5997..bfefd15 100644 --- a/src/components/Canvas/FlowCanvas/components/nodes/result-image.vue +++ b/src/components/Canvas/FlowCanvas/components/nodes/result-image.vue @@ -236,7 +236,7 @@ const isSubord = computed(() => props.node.id == stateManager.activeNodeID.value) const tier = computed(() => Number(props.node?.data?.tier || 0)) //只有3d模型才有三级菜单,目前三级菜单内容少直接禁用按钮 - const isAdd3d = computed(() => (tier.value === 2 && props.node?.data?.superiorNodeType === NODE_DATATYPE.TO_3D_MODEL) || props.node?.data?.superiorNodeType !== NODE_DATATYPE.TO_3D_MODEL) + // const isAdd3d = computed(() => (tier.value === 2 && props.node?.data?.superiorNodeType === NODE_DATATYPE.TO_3D_MODEL) || (props.node?.data?.superiorNodeType !== NODE_DATATYPE.TO_3D_MODEL && tier.value !== 2)) const isReturned = computed(() => { return ( props.node.data.type == NODE_DATATYPE.RESULT_IMAGE && @@ -248,7 +248,7 @@ NODE_DATATYPE.RESULT_IMAGE === props.node.data.type && !(tier.value === NODE_DATATIER.TO_3VIEW) && isReturned.value && - isAdd3d.value && + // isAdd3d.value && isSubord.value ) const onAdd = () => { From a07e7b6173685666f92d8396c34ba1b764613358 Mon Sep 17 00:00:00 2001 From: "X1627315083@163.com" <1627315083@qq.com> Date: Wed, 25 Mar 2026 13:11:02 +0800 Subject: [PATCH 2/3] fix --- .../Canvas/FlowCanvas/components/tools/upload-file.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/Canvas/FlowCanvas/components/tools/upload-file.vue b/src/components/Canvas/FlowCanvas/components/tools/upload-file.vue index 09be9ed..20bb8cf 100644 --- a/src/components/Canvas/FlowCanvas/components/tools/upload-file.vue +++ b/src/components/Canvas/FlowCanvas/components/tools/upload-file.vue @@ -96,18 +96,18 @@ } } > .preview { - width: 80px; height: 80px; + max-height: 100%; position: relative; > img { height: 100%; - width: 100%; + max-height: 100%; object-fit: contain; } > .close { position: absolute; - top: 0.1px; - right: 0.1px; + top: -10px; + right: -10px; border-radius: 50%; background-color: #fff; cursor: pointer; From 61b18d67f4fe06a18b6a8387f079a6e155053d9a Mon Sep 17 00:00:00 2001 From: "X1627315083@163.com" <1627315083@qq.com> Date: Wed, 25 Mar 2026 13:35:28 +0800 Subject: [PATCH 3/3] fix --- .../Canvas/FlowCanvas/components/nodes/result-image.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/Canvas/FlowCanvas/components/nodes/result-image.vue b/src/components/Canvas/FlowCanvas/components/nodes/result-image.vue index bfefd15..bddef15 100644 --- a/src/components/Canvas/FlowCanvas/components/nodes/result-image.vue +++ b/src/components/Canvas/FlowCanvas/components/nodes/result-image.vue @@ -213,6 +213,8 @@ item.canvasId = options.canvasId || null } }) + stateManager.recordState() + stateManager.exportFlow() } const onEdit = (item: any) => {