product

src/component/HomePage/ExportModel.vue

@@ -465,7 +465,8 @@ export default defineComponent({
 													position.y = maxHeight;
 												}
 											}
-											setCanvasImage(img,key,position.x,position.y)//设置图片
+											console.log(allItem,key);
+											setCanvasImage(img,key,position.x,position.y,allItem)//设置图片
 											position.height = img.height * scaleWH + margin;
 											if (key == "sketchboardFiles") {
 												if (sketchGroupingItem.length <3) {
@@ -611,7 +612,27 @@ export default defineComponent({
 			}
 			return imgWidth
 		}
-		let setCanvasImage = (img,key,left,top)=>{
+		let setCanvasImage = (img,key,left,top,data)=>{
+			// data
+			console.log(data);
+			let imgId = 0
+			let designType = ''//表示收藏或者generate
+			let level1Type = ''//表示sketch或者print
+			if(key == 'disposeMoodboard'){
+				imgId = data.id
+
+			}else if(key == 'moodboardFiles'){
+				
+			}else if(key == 'sketchboardFiles'){
+
+			}else if(key == 'printboardFiles'){
+				
+			}else if(key == 'likeDesignCollectionList'){
+				
+			}else if(key == 'upImgFiles'){
+				
+			}
+			// let id = 
 			let proportion = img.height / img.width; //计算图形宽高比例
 			let imgWidth = setImageWidth(key)
 			let scaleWH = imgWidth / img.width; //计算放到画布上缩小倍率
@@ -916,6 +937,10 @@ export default defineComponent({
 		//设置画布监听修改添加事件，用来做撤回功能
 		let updateCanvasState = (str) =>{
 				const canvasAsJson = JSON.stringify(canvas.toJSON());
+				console.log(canvas.toJSON());
+				var json = canvas.toJSON(['aaaID']);
+				const d = canvas.toObject(['myFabricType1', 'myFabricType2'])
+				console.log(json,d);
 				if(str == 'loadingCompleted'){
 					// reverseCanvasState.value.push(canvasAsJson);
 				}
@@ -1128,7 +1153,7 @@ export default defineComponent({
 				const reader = new FileReader();
 				reader.onload = (e) => {
 					fabric.Image.fromURL(e.target.result,(img) => {
-						setCanvasImage(img,"sketchboardFiles",0,canvas.wrapperEl.parentNode.scrollTop)
+						setCanvasImage(img,"upImgFiles",0,canvas.wrapperEl.parentNode.scrollTop,e.target.result)
 						canvas.add(img);
 					},{ crossOrigin: "Anonymous" })
 					input.value = ''