diff --git a/.env.development b/.env.development index 8eca712..f844c2d 100644 --- a/.env.development +++ b/.env.development @@ -1,5 +1,5 @@ # VITE_APP_URL = http://192.168.31.82:8771 VITE_APP_URL = http://18.167.251.121:10015 # VITE_APP_URL = http://192.168.31.118:8080 -VITE_APP_URL = http://192.168.31.82:8755 +# VITE_APP_URL = http://192.168.31.82:8755 VITE_GOOGLE_CLIENT_ID = 216037134725-7q8vqp0ohtmohlosltkfg7bd2v29rm5a.apps.googleusercontent.com diff --git a/src/api/flow-canvas.ts b/src/api/flow-canvas.ts index 062708d..d4590cc 100644 --- a/src/api/flow-canvas.ts +++ b/src/api/flow-canvas.ts @@ -31,6 +31,9 @@ export const putSketchFlowCanvas = (data:saveSketchFlowCanvasData) => { return request({ url: `/api/canvas/detail/${data.id}`, method: 'put', + headers: { + 'Content-Type': 'application/json' + }, data: data.canvasData }) } @@ -52,3 +55,54 @@ export const deleteSketchFlowCanvas = (data:deleteSketchFlowCanvasData) => { method: 'delete', }) } + +/** + * 根据taskId查询结果 + * @param data 根据taskId查询结果的参数 + * @param data.taskIds taskIds列表 + * @returns 根据taskId查询结果 + */ +export interface taskIdList { + taskIds?: Array +} +export const getTaskidResult = (data:taskIdList) => { + return request({ + url: `/api/image/tasks/batch`, + method: 'post', + data: { + taskIds: data.taskIds + } + }) +} + +/** + * 图片转真是风格 + * @param data 图片转真是风格的参数 + * @param data.sketchId sketch id + * @param data.mode 选择的模型 + * @param data.size 生成图片的大小 + * @param data.imageUrl 进行生成的图片。minio地址和正常地址都可以 + * @param data.userPrompt 生成图片的提示词 + * @returns 图片转真是风格 + */ +export interface toRealStyleData { + sketchId?: string + mode?: string + size?: string + imageUrl?: string + userPrompt?: string +} +export const toRealStyleApi = (data:toRealStyleData) => { + return request({ + url: `/api/image/to-real-style`, + method: 'post', + data:{ + sketchId: data.sketchId, + mode: data.mode, + size: data.size, + imageUrl: data.imageUrl, + userPrompt: data.userPrompt + } + }) +} + diff --git a/src/components/Canvas/DepthCanvas/components/brush-control-panel.vue b/src/components/Canvas/DepthCanvas/components/brush-control-panel.vue new file mode 100644 index 0000000..af24f34 --- /dev/null +++ b/src/components/Canvas/DepthCanvas/components/brush-control-panel.vue @@ -0,0 +1,118 @@ + + + + diff --git a/src/components/Canvas/DepthCanvas/components/header-tools.vue b/src/components/Canvas/DepthCanvas/components/depth-header-tools.vue similarity index 87% rename from src/components/Canvas/DepthCanvas/components/header-tools.vue rename to src/components/Canvas/DepthCanvas/components/depth-header-tools.vue index 172dce0..d153721 100644 --- a/src/components/Canvas/DepthCanvas/components/header-tools.vue +++ b/src/components/Canvas/DepthCanvas/components/depth-header-tools.vue @@ -15,7 +15,13 @@ Export - + + @@ -29,7 +35,8 @@ zoom: { default: 1, type: Number }, step: { default: 0.1, type: Number } }) - const emit = defineEmits(['export', 'import']) + const emit = defineEmits(['export', 'export-local', 'import-local', 'export-close']) + const importLocalImage = inject('importLocalImage') as () => void const stateManager = inject('stateManager') as any const toolManager = inject('toolManager') as any const tool = computed(() => toolManager.currentTool.value) @@ -42,7 +49,13 @@ { name: OperationType.PAN, icon: 'dc-move', iconSize: 18, disabled: ref(false) }, { name: OperationType.DRAW, icon: 'dc-brush', iconSize: 18, disabled: ref(false) }, { name: OperationType.ERASER, icon: 'dc-eraser', iconSize: 18, disabled: ref(false) }, - { name: OperationType.IMAGE, icon: 'dc-image', iconSize: 17, disabled: ref(false) }, + { + name: OperationType.IMAGE, + icon: 'dc-image', + iconSize: 17, + disabled: ref(false), + on: () => importLocalImage() + }, { name: OperationType.SELECTBOX, icon: 'dc-selectbox', iconSize: 16, disabled: ref(false) }, { name: OperationType.RECTANGLE, icon: 'dc-rectangle', iconSize: 16, disabled: ref(false) }, { type: 'line' }, diff --git a/src/components/Canvas/DepthCanvas/components/details-panel/index.vue b/src/components/Canvas/DepthCanvas/components/details-panel/index.vue index 289ec28..3439d21 100644 --- a/src/components/Canvas/DepthCanvas/components/details-panel/index.vue +++ b/src/components/Canvas/DepthCanvas/components/details-panel/index.vue @@ -7,16 +7,57 @@ -
- 这是一些设置参数... +
+
+ X: + {{ activeObject.left }} +
+
+ Y: + {{ activeObject.top }} +
+
+ Width: + {{ activeObject.width }} +
+
+ Height: + {{ activeObject.height }} +
+
+ 缩放X: + {{ activeObject.scaleX }} +
+
+ 缩放Y: + {{ activeObject.scaleY }} +
+
+ Angle: + {{ activeObject.angle }} +
diff --git a/src/components/Canvas/DepthCanvas/components/layer-panel/layer-item.vue b/src/components/Canvas/DepthCanvas/components/layer-panel/layer-item.vue index a54bebb..7f45ef1 100644 --- a/src/components/Canvas/DepthCanvas/components/layer-panel/layer-item.vue +++ b/src/components/Canvas/DepthCanvas/components/layer-panel/layer-item.vue @@ -3,7 +3,7 @@
-
+
{{ layer.info.name || '未命名图层' }}
- - +
@@ -27,7 +27,10 @@ diff --git a/src/components/Canvas/DepthCanvas/components/tools/depth-offset-tool.vue b/src/components/Canvas/DepthCanvas/components/tools/depth-offset-tool.vue new file mode 100644 index 0000000..742e288 --- /dev/null +++ b/src/components/Canvas/DepthCanvas/components/tools/depth-offset-tool.vue @@ -0,0 +1,217 @@ + + + + + diff --git a/src/components/Canvas/DepthCanvas/components/tools/depth-select.vue b/src/components/Canvas/DepthCanvas/components/tools/depth-select.vue new file mode 100644 index 0000000..43804df --- /dev/null +++ b/src/components/Canvas/DepthCanvas/components/tools/depth-select.vue @@ -0,0 +1,52 @@ + + + + diff --git a/src/components/Canvas/DepthCanvas/components/tools/depth-slider.vue b/src/components/Canvas/DepthCanvas/components/tools/depth-slider.vue new file mode 100644 index 0000000..a14b319 --- /dev/null +++ b/src/components/Canvas/DepthCanvas/components/tools/depth-slider.vue @@ -0,0 +1,171 @@ + + + + + diff --git a/src/components/Canvas/DepthCanvas/depth-canvas.vue b/src/components/Canvas/DepthCanvas/depth-canvas.vue index 4a8c5bd..c4a086f 100644 --- a/src/components/Canvas/DepthCanvas/depth-canvas.vue +++ b/src/components/Canvas/DepthCanvas/depth-canvas.vue @@ -3,38 +3,46 @@
- - - - +