合并画布

src/component/modules/generalMiniCanvas.vue

@@ -1,8 +1,14 @@
 <template>
 	<div class="generalCanvas">
 		<div class="canvasBox" ref="canvasBox">
-			<editCanvas v-if="canvasLoad" :config="canvasConfig" :clothingImageUrl="imgUrl" ref="editCanvas"></editCanvas>
+			<editCanvas v-if="canvasLoad" :config="canvasConfig" 
+				:clothingImageUrl="imgUrl" 
+				:clothing-image-opts="{
+					imageMode:'contains',
+				}"
+				ref="editCanvas"></editCanvas>
 		</div>
+		<div class="gallery_btn" @click="canvasSave" style="width: min-content;margin: 0 auto;">Save</div>
 		<div class="mark_loading" v-show="isShowMark">
 			<a-spin size="large" />
 		</div>
@@ -63,14 +69,31 @@ export default defineComponent({
 			
 			return canvasExport
 		}
+		const canvasSave = ()=>{
+			dataDom.editCanvas.exportImage({isContainBg:false,isContainFixed:true}).then((rv)=>{
+				emit('submitBase64Data',rv)
+			})
+		}
         onMounted(() => {
 			if(props.imgUrl){
 				let img = new Image()
 				img.onload = ()=>{
-					let domHeight = dataDom.canvasBox.offsetHeight
+					let wH = [1,1]
+					// if(img.width > img.height){
+					// 	let domHeight = dataDom.canvasBox.offsetWidth
+					// 	let imgWidth = img.width
+					// 	data.canvasConfig.height = domHeight
+					// 	data.canvasConfig.width = imgHeight/domHeight * img.width
+					// }else{
+						
+					// }
+					
+					let domHeight = dataDom.canvasBox.offsetHeight - 200
 					let imgHeight = img.height
+					wH = [1,domHeight/imgHeight]
+					console.log(domHeight,img.height,img.width)
 					data.canvasConfig.height = domHeight
-					data.canvasConfig.width = imgHeight/domHeight * img.width
+					data.canvasConfig.width = wH[1] * img.width
 					// canvasWH.value = height
 					// // canvasBox.style.width = height+'px'
 					// let wScale = 1
@@ -107,6 +130,7 @@ export default defineComponent({
 			addImage,
 			getData,
 			getCanvasData,
+			canvasSave,
         };
     },
     data(prop) {