From 6517560bd84b58675b079aaa8f071fe35d984b30 Mon Sep 17 00:00:00 2001 From: "X1627315083@163.com" <1627315083@qq.com> Date: Fri, 17 Apr 2026 15:46:28 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=BB=E5=B8=83=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E4=BA=A4=E4=BA=92=E9=80=BB=E8=BE=91=EF=BC=8C=E7=94=BB?= =?UTF-8?q?=E5=B8=83=E7=94=9F=E6=88=90=E6=88=96=E7=94=BB=E5=B8=83=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=9B=BE=E7=89=87=E6=9B=B4=E6=96=B0=E5=A4=96=E9=9D=A2?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/flow-canvas.ts | 21 +++++++++++++ .../components/nodes/cards/cards-select.vue | 21 ++++++++++++- .../components/nodes/cards/fast-mode.vue | 10 ++++-- .../components/nodes/cards/index.vue | 31 ++++++++++++++++--- .../components/nodes/result-image.vue | 6 ++++ src/components/Canvas/FlowCanvas/index.vue | 2 ++ .../FlowCanvas/manager/GenerateManager.ts | 7 +++++ .../Canvas/FlowCanvas/tools/index.d.ts | 12 +++++-- 8 files changed, 100 insertions(+), 10 deletions(-) diff --git a/src/api/flow-canvas.ts b/src/api/flow-canvas.ts index ad2e4dc..0eae81b 100644 --- a/src/api/flow-canvas.ts +++ b/src/api/flow-canvas.ts @@ -279,3 +279,24 @@ export const threeToThreeViewsApi = (data:threeToThreeViewsData) => { } }) } + +/** + * 根据sketchId更新VersionNode的sketch的URL值 + * @param data 根据sketchId更新VersionNode的sketchL值的参数 + * @param data.sketchId sketch id + * @param data.newUrl 生成的3d模型地址 + * @returns 根据sketchId更新VersionNode的sketch的URL值 + */ +export interface threeToThreeViewsData { + sketchId?: string + newUrl?: string +} +export const updateVersionSketchUrlApi = (data:threeToThreeViewsData) => { + return request({ + url: `/api/canvas/sketchIdAndUrl/${data.sketchId}`, + method: 'put', + data:{ + newUrl: data.newUrl, + } + }) +} diff --git a/src/components/Canvas/FlowCanvas/components/nodes/cards/cards-select.vue b/src/components/Canvas/FlowCanvas/components/nodes/cards/cards-select.vue index 77e665b..8bb856b 100644 --- a/src/components/Canvas/FlowCanvas/components/nodes/cards/cards-select.vue +++ b/src/components/Canvas/FlowCanvas/components/nodes/cards/cards-select.vue @@ -12,7 +12,7 @@ " > - + {{ v.title }} @@ -63,6 +63,25 @@ }, ] } + },{ + tier: NODE_DATATIER.SURFACE_EDIT_, + type: NODE_DATATYPE.SURFACE_EDIT_, + title: t('FlowCanvas.surfaceEditTitle'), + secondaryMenu: { + title: t('FlowCanvas.surfaceEditTitle'), + icon: NODE_DATATYPE.SURFACE_EDIT_, + selectList: [ + { + tier: NODE_DATATIER.CANVAS_MODE_, + type: NODE_DATATYPE.CANVAS_MODE_, + title: t('FlowCanvas.surfaceEditCanvasTitle'), + },{ + tier: NODE_DATATIER.Fast_MODE_, + type: NODE_DATATYPE.Fast_MODE_, + title: t('FlowCanvas.surfaceEditTitle'), + }, + ] + } }, { tier: NODE_DATATIER.SCENE_COMPOSITION, diff --git a/src/components/Canvas/FlowCanvas/components/nodes/cards/fast-mode.vue b/src/components/Canvas/FlowCanvas/components/nodes/cards/fast-mode.vue index 007b5ea..bbc4ac4 100644 --- a/src/components/Canvas/FlowCanvas/components/nodes/cards/fast-mode.vue +++ b/src/components/Canvas/FlowCanvas/components/nodes/cards/fast-mode.vue @@ -13,6 +13,7 @@ import myEvent from '@/utils/myEvent' import { getCurrentTime } from '../../../../tools/tools.ts' import { NODE_DATATIER } from '../../../tools/index.d' + import { updateVersionSketchUrlApi } from '@/api/flow-canvas' const attrs = useAttrs() const stateManager = inject('stateManager') as any const nodeManager = inject('nodeManager') as any @@ -24,7 +25,7 @@ return { } } - const opCanvas = ()=>{ + const opCanvas = (tier)=>{ const superiorNodeUrl = stateManager.getSuperiorNodeImage(attrs?.node?.data?.superiorID || null) if (!superiorNodeUrl) console.log('superiorNodeUrl 找不到原始图片') const data = { @@ -46,7 +47,7 @@ superiorID: attrs.node.id, superiorNodeType: attrs.node?.data?.type, createIndexPosition: 0 + subordNodes.length, - tier: NODE_DATATIER.RESULT_IMAGE, + tier, isActive: subordNodes.length == 0, data: { imageProcessTasks:[workbenchData], @@ -54,6 +55,11 @@ } } }) + //更新VersionNode的sketchIDAndUrl中指定key的URL值 + updateVersionSketchUrlApi({ + sketchId: stateManager.sketchId.value, + newUrl: options.url, + }) }, } eventManager.removeEvents() diff --git a/src/components/Canvas/FlowCanvas/components/nodes/cards/index.vue b/src/components/Canvas/FlowCanvas/components/nodes/cards/index.vue index 878283c..7693726 100644 --- a/src/components/Canvas/FlowCanvas/components/nodes/cards/index.vue +++ b/src/components/Canvas/FlowCanvas/components/nodes/cards/index.vue @@ -3,7 +3,7 @@
{ - componentRef.value?.opCanvas() + componentRef.value?.opCanvas(0) + } + }, + { + tier: NODE_DATATIER.Fast_MODE_, + type: NODE_DATATYPE.Fast_MODE_, + title: t('FlowCanvas.surfaceEditTitle'), + component: SurfaceEdit, + api: sketchAddPrintApi + }, + { + tier: NODE_DATATIER.CANVAS_MODE_, + type: NODE_DATATYPE.CANVAS_MODE_, + title: t('FlowCanvas.surfaceEditCanvasTitle'), + component: FastMode, + hideFooter: true, + showCanvasEdit: true, + on: ()=>{ + componentRef.value?.opCanvas(1) } }, { @@ -155,6 +173,7 @@ const onGenerateClick = async () => { const data = componentRef.value?.getApiData?.() || {} const subordNodes = stateManager.getSubordNodes(attrs.node.id) + const maxPosition = subordNodes.length == 0?0:(subordNodes[subordNodes.length - 1].data.createIndexPosition + 1) const superiorNodeUrl = stateManager.getSuperiorNodeImage(attrs.node.data.superiorID) if(!superiorNodeUrl)return console.log('superiorNodeUrl 找不到原始图片') emit('update-data', componentRef.value?.data) @@ -175,12 +194,16 @@ NODE_DATATYPE.CANVAS_MODE, NODE_DATATYPE.SCENE_COMPOSITION, NODE_DATATYPE.COLOR_PALETTE, + NODE_DATATYPE.Fast_MODE_, + NODE_DATATYPE.CANVAS_MODE_, ] let tritList = [ NODE_DATATIER.Fast_MODE, NODE_DATATIER.CANVAS_MODE, NODE_DATATIER.SCENE_COMPOSITION, NODE_DATATIER.COLOR_PALETTE, + NODE_DATATIER.Fast_MODE_, + NODE_DATATIER.CANVAS_MODE_, ] let tier = (tritList.includes(currentComponent.value.tier) && typeList.includes(currentComponent.value.type))?currentComponent.value.tier - 1:currentComponent.value.tier if(NODE_DATATYPE.TO_REAL_STYLE == currentComponent.value.type && false){ @@ -206,7 +229,7 @@ superiorID: attrs.node.id, superiorNodeType: attrs.node?.data?.type, superiorGenerateImg: superiorNodeUrl || null, - createIndexPosition: index + subordNodes.length, + createIndexPosition: index + maxPosition, tier: tier, isActive: index == 0 && subordNodes.length == 0, data: { diff --git a/src/components/Canvas/FlowCanvas/components/nodes/result-image.vue b/src/components/Canvas/FlowCanvas/components/nodes/result-image.vue index 78c7666..b725c8b 100644 --- a/src/components/Canvas/FlowCanvas/components/nodes/result-image.vue +++ b/src/components/Canvas/FlowCanvas/components/nodes/result-image.vue @@ -66,6 +66,7 @@ import HighlightAdmin from '@/components/highlightAdmin.vue' import { NODE_DATATIER, NODE_DATATYPE } from '../../tools/index.d' import { useI18n } from 'vue-i18n' + import { updateVersionSketchUrlApi } from '@/api/flow-canvas' const { t } = useI18n() const openImagePreview = inject('openImagePreview') as (url: string) => void const openThreeModelPreview = inject('openThreeModelPreview') as (obj: any) => void @@ -225,6 +226,11 @@ } depthCanvasWorkbench(workbenchData) depthCanvasClose() + //更新VersionNode的sketchIDAndUrl中指定key的URL值 + updateVersionSketchUrlApi({ + sketchId: stateManager.sketchId.value, + newUrl: options.url, + }) }, onClose:depthCanvasClose } diff --git a/src/components/Canvas/FlowCanvas/index.vue b/src/components/Canvas/FlowCanvas/index.vue index bc65895..d79ff73 100644 --- a/src/components/Canvas/FlowCanvas/index.vue +++ b/src/components/Canvas/FlowCanvas/index.vue @@ -10,6 +10,7 @@ import { ref } from 'vue' import { getSketchFlowCanvas } from '@/api/flow-canvas' import { useI18n } from 'vue-i18n' + import myEvent from '@/utils/myEvent' const dialogVisible = ref(false) const config = ref({}) as any @@ -33,6 +34,7 @@ } const close = async () => { dialogVisible.value = false + myEvent.emit('closeFlowCanvas') } defineExpose({ open, diff --git a/src/components/Canvas/FlowCanvas/manager/GenerateManager.ts b/src/components/Canvas/FlowCanvas/manager/GenerateManager.ts index 30ac6ef..2571c30 100644 --- a/src/components/Canvas/FlowCanvas/manager/GenerateManager.ts +++ b/src/components/Canvas/FlowCanvas/manager/GenerateManager.ts @@ -1,5 +1,6 @@ import { getTaskidResult } from '@/api/flow-canvas' import { ElMessage } from 'element-plus' +import { updateVersionSketchUrlApi } from '@/api/flow-canvas' // interface NodeOptions { // } @@ -54,6 +55,12 @@ export class GenerateManager { nodeDataItem.url = item.url nodeDataItem.createTime = item.createTime nodeDataItem.status = item.status + + //更新VersionNode的sketchIDAndUrl中指定key的URL值 + updateVersionSketchUrlApi({ + sketchId: this.stateManager.sketchId.value, + newUrl: item.url, + }) if(item.glbPath){ nodeDataItem.glbPath = item.glbPath nodeDataItem.glbInfoObj = item.glbInfoObj diff --git a/src/components/Canvas/FlowCanvas/tools/index.d.ts b/src/components/Canvas/FlowCanvas/tools/index.d.ts index d0e95af..557cc45 100644 --- a/src/components/Canvas/FlowCanvas/tools/index.d.ts +++ b/src/components/Canvas/FlowCanvas/tools/index.d.ts @@ -28,6 +28,9 @@ export const NODE_DATATYPE = { SURFACE_EDIT: 'surface-edit', CANVAS_MODE: 'canvas-mode', Fast_MODE: 'fast-mode', + SURFACE_EDIT_: 'surface-edit_', + CANVAS_MODE_: 'canvas-mode_', + Fast_MODE_: 'fast-mode_', SCENE_COMPOSITION: 'scene-composition', COLOR_PALETTE: 'color-palette', TO_3D_MODEL: 'to-3d-model', @@ -41,9 +44,12 @@ export const NODE_DATATIER = { CARDS_SELECT: 0, TO_REAL_STYLE: 1, TO_REAL_VARIANTS: 1, - SURFACE_EDIT: 2, - CANVAS_MODE: 2, - Fast_MODE: 2, + SURFACE_EDIT: 1, + CANVAS_MODE: 1, + Fast_MODE: 1, + SURFACE_EDIT_: 2, + CANVAS_MODE_: 2, + Fast_MODE_: 2, SCENE_COMPOSITION: 2, COLOR_PALETTE: 2, TO_3D_MODEL: 2,