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..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) => { @@ -236,7 +238,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 +250,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 = () => { 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;