diff --git a/src/api/flow-canvas.ts b/src/api/flow-canvas.ts index d4590cc..b499d31 100644 --- a/src/api/flow-canvas.ts +++ b/src/api/flow-canvas.ts @@ -79,17 +79,17 @@ export const getTaskidResult = (data:taskIdList) => { * 图片转真是风格 * @param data 图片转真是风格的参数 * @param data.sketchId sketch id + * @param data.imageUrl 进行生成的图片。minio地址和正常地址都可以 * @param data.mode 选择的模型 * @param data.size 生成图片的大小 - * @param data.imageUrl 进行生成的图片。minio地址和正常地址都可以 * @param data.userPrompt 生成图片的提示词 * @returns 图片转真是风格 */ export interface toRealStyleData { sketchId?: string + imageUrl?: string mode?: string size?: string - imageUrl?: string userPrompt?: string } export const toRealStyleApi = (data:toRealStyleData) => { @@ -98,11 +98,66 @@ export const toRealStyleApi = (data:toRealStyleData) => { method: 'post', data:{ sketchId: data.sketchId, + imageUrl: data.imageUrl, mode: data.mode, size: data.size, - imageUrl: data.imageUrl, userPrompt: data.userPrompt } }) } +/** + * 线稿图上色 + * @param data 线稿图上色的参数 + * @param data.sketchId sketch id + * @param data.imageUrl 进行生成的图片。minio地址和正常地址都可以 + * @param data.variantCount 生成图片的数量 + * @param data.colors 生成上色的图片颜色列表 + * @returns 线稿图上色 + */ +export interface toColorPaletteData { + sketchId?: string + imageUrl?: string + variantCount?: string + colors?: Array +} +export const toColorPaletteApi = (data:toColorPaletteData) => { + return request({ + url: `/api/image/color-palette`, + method: 'post', + data:{ + sketchId: data.sketchId, + imageUrl: data.imageUrl, + variantCount: data.variantCount, + colors: data.colors + } + }) +} + +/** + * 场景构图 + * @param data 场景构图的参数 + * @param data.sketchId sketch id + * @param data.imageUrl 进行生成的图片。minio地址和正常地址都可以 + * @param data.styles 生成上色的图片颜色列表 + * @param data.userPrompt 生成上色的图片颜色列表 + * @returns 场景构图 + */ +export interface toSceneCompositionData { + sketchId?: string + imageUrl?: string + userPrompt?: string + styles?: Array +} +export const toSceneCompositionApi = (data:toSceneCompositionData) => { + return request({ + url: `/api/image/scene-composition`, + method: 'post', + data:{ + sketchId: data.sketchId, + imageUrl: data.imageUrl, + userPrompt: data.userPrompt, + styles: data.styles + } + }) +} diff --git a/src/assets/images/generateLoading.png b/src/assets/images/generateLoading.png new file mode 100644 index 0000000..1df9d8b Binary files /dev/null and b/src/assets/images/generateLoading.png differ diff --git a/src/components/Canvas/DepthCanvas/components/details-panel/index.vue b/src/components/Canvas/DepthCanvas/components/details-panel/index.vue index 3439d21..1ea4906 100644 --- a/src/components/Canvas/DepthCanvas/components/details-panel/index.vue +++ b/src/components/Canvas/DepthCanvas/components/details-panel/index.vue @@ -51,7 +51,8 @@ const activeObject = ref(null) const updateActiveObject = () => { const obj = layers.value.find((v: any) => v.info.id === activeID.value) - activeObject.value = obj?.toJSON('info') || null + // activeObject.value = obj?.toJSON('info') || null + activeObject.value = obj } watch(layers, () => updateActiveObject()) watch(activeID, () => updateActiveObject()) 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 7f45ef1..51f044a 100644 --- a/src/components/Canvas/DepthCanvas/components/layer-panel/layer-item.vue +++ b/src/components/Canvas/DepthCanvas/components/layer-panel/layer-item.vue @@ -1,7 +1,9 @@