Merge branch 'main' of http://18.167.251.121:10003/aidlab/FiDA_Front

src/api/flow-canvas.ts

@@ -115,6 +115,7 @@ export const toRealStyleApi = (data:toRealStyleData) => {
  * @param data.mode 选择的模型
  * @param data.size 生成图片的大小
  * @param data.userPrompt 生成图片的提示词
+ * @param data.original3dUrl 原始3d模型的url
  * @returns 图片转真是风格
  */
 export interface toRealStyleData {
@@ -123,17 +124,19 @@ export interface toRealStyleData {
 	mode?: string
 	size?: string
 	userPrompt?: string
+	original3dUrl?: string
 }
 export const toRealVariantsApi = (data:toRealStyleData) => {
 	return request({
-		url: `/api/image/to-real-style`,
+		url: `/api/image/to-real-variants`,
 		method: 'post',
 		data:{
 			sketchId: data.sketchId,
 			imageUrl: data.imageUrl,
 			mode: data.mode,
 			size: data.size,
-			userPrompt: data.userPrompt
+			userPrompt: data.userPrompt,
+			original3dUrl: data.original3dUrl,
 		}
 	})
 }

src/components/Canvas/FlowCanvas/components/nodes/cards/index.vue

@@ -46,7 +46,7 @@
 	import { useI18n } from 'vue-i18n'
 	import { ElMessageBox } from 'element-plus'
 
-	import { toRealStyleApi, toColorPaletteApi, toSceneCompositionApi, sketchAddPrintApi, sketchToThreeApi, threeToThreeViewsApi } from '@/api/flow-canvas'
+	import { toRealStyleApi, toColorPaletteApi, toSceneCompositionApi, sketchAddPrintApi, sketchToThreeApi, threeToThreeViewsApi, toRealVariantsApi } from '@/api/flow-canvas'
 
 	// import ToVideo from './to-video.vue'
 	// import AddPrint from './add-print.vue'
@@ -73,9 +73,9 @@
 		{
 			tier: NODE_DATATIER.TO_REAL_VARIANTS,
 			type: NODE_DATATYPE.TO_REAL_VARIANTS,
-			title: t('FlowCanvas.toRealVariantsTitle'),
+			title: 'To Real Variants',
 			component: ToRealVariants,
-			api: toRealStyleApi
+			api: toRealVariantsApi
 		},
 		{
 			tier: NODE_DATATIER.Fast_MODE,

src/components/Canvas/FlowCanvas/components/nodes/cards/to-3d-model.vue

@@ -19,7 +19,7 @@
 	const attrs = useAttrs()
 	const stateManager = inject('stateManager') as any
 	const data = reactive({
-		url: computed(()=>stateManager.getSuperiorNodeImage(attrs.node?.data?.superiorID)),
+		url: stateManager.getSuperiorNodeImage(attrs.node?.data?.superiorID),
 		mode: 'Advanced',
 	})
 	const modeList = ref([

src/components/Canvas/FlowCanvas/components/nodes/cards/to-real-variants.vue

@@ -13,8 +13,8 @@
 				{{ v.label }}
 			</div>
 		</div>
-		<p class="label">{{ t('FlowCanvas.mode') }}</p>
-		<my-select v-model="data.mode" :list="modeList" />
+		<!-- <p class="label">{{ t('FlowCanvas.mode') }}</p>
+		<my-select v-model="data.mode" :list="modeList" /> -->
 		<p class="label">{{ t('FlowCanvas.size') }}</p>
 		<pixel-ratio-selection v-model="data.pixelRatio" />
 	</div>
@@ -68,7 +68,7 @@
 			mode: data.mode,
 			size: data.pixelRatio,
 			userPrompt: data.prompt,
-			aaa: superior?.data?.superiorGenerateImg,
+			original3dUrl: superior?.data?.superiorGenerateImg,
 		}
 	}
 

src/components/Canvas/FlowCanvas/components/tools/threeModel/detail.vue

@@ -90,7 +90,7 @@ const {} = toRefs(data);
 		}
 		> .captureView ,
 		> .download{
-			margin-left: 4.2rem;
+			transform: translateX(calc(13rem / 2));
 			line-height: 3rem;
 			width: 20rem;
 			border-radius: 1.5rem;