-
+
+
+
+
+
+
+
diff --git a/src/components/Canvas/FlowCanvas/components/nodes/cards/index.vue b/src/components/Canvas/FlowCanvas/components/nodes/cards/index.vue
index ee7c74c..5957efa 100644
--- a/src/components/Canvas/FlowCanvas/components/nodes/cards/index.vue
+++ b/src/components/Canvas/FlowCanvas/components/nodes/cards/index.vue
@@ -2,13 +2,13 @@
Output
+
+ ![]()
+
+
-
+
![]()
import myEvent from '@/utils/myEvent'
- import { downloadImage, base64Tofile } from '../../../tools/tools'
+ 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'
- import { uploadImage } from '@/api/upload'
const openImagePreview = inject('openImagePreview') as (url: string) => void
const openThreeModelPreview = inject('openThreeModelPreview') as (url: string) => void
const props = defineProps({
@@ -88,7 +86,8 @@
'update-data'
])
// const attrs = useAttrs()
- const showHeader = ref(!!props.node?.data?.isHeader)
+ const showHeader = ref(true)
+ // const showHeader = ref(!!props.node?.data?.isHeader)
const showMenu = ref(false)
const clickTaskId = ref('')
const generateManager = inject('generateManager') as any
@@ -183,7 +182,7 @@
])
const onPreview = (item: any) => {
if(data.superiorNodeType == NODE_DATATYPE.TO_3D_MODEL){
- openThreeModelPreview({url:item?.glbPath,glbInfoObj:item?.glbInfoObj})
+ openThreeModelPreview({glbPath:item?.glbPath,glbInfoObj:item?.glbInfoObj})
}else{
openImagePreview(item.url)
}
@@ -205,25 +204,19 @@
eventManager.registerEvents()
}
const depthCanvasWorkbench = (options)=>{
- console.log(options)
- // 1. 提取 MIME 类型和 Base64 数据
- const file = base64Tofile(options.url,'image.png')
- const formData = new FormData()
- formData.append('file', file)
- uploadImage(formData).then((res) => {
- data.imageProcessTasks.forEach((item) => {
- if(item.taskId == options.taskId){
- item.url = res
- }
- })
+ data.imageProcessTasks.forEach((item) => {
+ if(item.taskId == options.taskId){
+ item.url = options.url
+ item.canvasId = options.canvasId || null
+ }
})
-
}
const onEdit = (item: any) => {
const data = {
url:item.url,
- id: item.taskId,
+ canvasId: item?.canvasId || null,
+ sketchId: stateManager.sketchId.value,
onWorkbench:(options)=>{
let workbenchData = {
...item,
diff --git a/src/components/Canvas/FlowCanvas/components/tools/threeModel/index.vue b/src/components/Canvas/FlowCanvas/components/tools/threeModel/index.vue
index fc522db..dee681c 100644
--- a/src/components/Canvas/FlowCanvas/components/tools/threeModel/index.vue
+++ b/src/components/Canvas/FlowCanvas/components/tools/threeModel/index.vue
@@ -18,8 +18,7 @@ let data = reactive({
const modelRef = ref(null)
onMounted(()=>{
- console.log(props?.currentData?.url)
- if(props?.currentData?.url)modelRef.value.open(props?.currentData?.url)
+ if(props?.currentData?.glbPath)modelRef.value.open(props?.currentData?.glbPath)
})
onUnmounted(()=>{
})
diff --git a/src/components/Canvas/FlowCanvas/index.vue b/src/components/Canvas/FlowCanvas/index.vue
index 1d3c144..bc65895 100644
--- a/src/components/Canvas/FlowCanvas/index.vue
+++ b/src/components/Canvas/FlowCanvas/index.vue
@@ -8,7 +8,7 @@
import FullscreenDialog from '../components/fullscreen-dialog.vue'
import flowCanvas from './flow-canvas.vue'
import { ref } from 'vue'
- import { getSketchFlowCanvas, putSketchFlowCanvas } from '@/api/flow-canvas'
+ import { getSketchFlowCanvas } from '@/api/flow-canvas'
import { useI18n } from 'vue-i18n'
const dialogVisible = ref(false)
diff --git a/src/components/Canvas/FlowCanvas/manager/StateManager.ts b/src/components/Canvas/FlowCanvas/manager/StateManager.ts
index 0b0ee25..891d17c 100644
--- a/src/components/Canvas/FlowCanvas/manager/StateManager.ts
+++ b/src/components/Canvas/FlowCanvas/manager/StateManager.ts
@@ -63,8 +63,7 @@ export class StateManager {
this.mxHistory = ref(50)
this.historyList = ref([])
this.historyIndex = ref(0)
-
- this.sketchId = options.sketchId
+ this.sketchId = ref(options.sketchId)
this.saveCanvasTimeInterval = 6000
this.saveCanvasTime = null
@@ -188,12 +187,12 @@ export class StateManager {
}
/** 画布数据存储 */
async exportFlow (time:number = 0){
- if(!this.sketchId)return
+ if(!this.sketchId.value)return
clearTimeout(this.saveCanvasTime)
await new Promise((resolve) => {
this.saveCanvasTime = setTimeout(()=>{
putSketchFlowCanvas({
- id: this.sketchId,
+ id: this.sketchId.value,
canvasData: JSON.stringify(this.nodes.value) }).then(() => {
resolve(true)
}).catch(() => {
diff --git a/src/components/Canvas/FlowCanvas/tools/index.d.ts b/src/components/Canvas/FlowCanvas/tools/index.d.ts
index 49c4d93..0cd2e03 100644
--- a/src/components/Canvas/FlowCanvas/tools/index.d.ts
+++ b/src/components/Canvas/FlowCanvas/tools/index.d.ts
@@ -25,6 +25,8 @@ export const NODE_DATATYPE = {
CARDS_SELECT: 'cards-select',
TO_REAL_STYLE: 'to-real-style',
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',
@@ -38,6 +40,8 @@ export const NODE_DATATIER = {
CARDS_SELECT: 0,
TO_REAL_STYLE: 1,
SURFACE_EDIT: 1,
+ CANVAS_MODE: 1,
+ Fast_MODE: 1,
SCENE_COMPOSITION: 2,
COLOR_PALETTE: 2,
TO_3D_MODEL: 2,
diff --git a/src/components/Canvas/tools/tools.ts b/src/components/Canvas/tools/tools.ts
index 3e8dab7..e08e6f5 100644
--- a/src/components/Canvas/tools/tools.ts
+++ b/src/components/Canvas/tools/tools.ts
@@ -77,4 +77,16 @@ export const base64Tofile = (base64: string,name: string) => {
// 4. 创建 File 对象（可选）
const file = new File([blob], name, { type: mime })
return file
+}
+//获取当前时间2026-03-20 11:38:29
+export const getCurrentTime = () => {
+ const now = new Date()
+ const currentTime =
+ now.getFullYear() + '-' +
+ String(now.getMonth() + 1).padStart(2, '0') + '-' +
+ String(now.getDate()).padStart(2, '0') + ' ' +
+ String(now.getHours()).padStart(2, '0') + ':' +
+ String(now.getMinutes()).padStart(2, '0') + ':' +
+ String(now.getSeconds()).padStart(2, '0')
+ return currentTime
}
\ No newline at end of file
diff --git a/src/views/home/test.vue b/src/views/home/test.vue
index 2f910ec..7f4f9d7 100644
--- a/src/views/home/test.vue
+++ b/src/views/home/test.vue
@@ -10,7 +10,7 @@
import { computed, onMounted } from 'vue'
import { useRoute } from 'vue-router'
const route = useRoute()
- const url = ''
+ const url = 'https://www.minio-api.aida.com.hk/fida-test/furniture/sketches/1a48ed3a-1faa-4fcd-bf07-765dba1702c5.png?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=admin%2F20260320%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20260320T020948Z&X-Amz-Expires=604800&X-Amz-SignedHeaders=host&X-Amz-Signature=7dc192bac887bce7b02c99d7037c08d9d684310f00add9b0e63b74b36ee63d37'
const openCanvas = () => {
myEvent.emit('openFlowCanvas', { url })
}