合并代码

src/component/HomePage/ExportModel.vue

@@ -8,6 +8,7 @@
         :centered="true"
         :closable="false"
         :keyboard="false"
+		:destroyOnClose="true"
     >
         <div class="UpgradePlan_closeIcon generalModelOperate_closeIcon ">
             <i class="fi fi-rr-cross-small" @click.stop="cancelDsign()"></i>
@@ -362,8 +363,13 @@ export default defineComponent({
 		let normalCanvasState = ref([])//存放canvas操作
 		let isLoadCanvas = false//撤回或者反撤回false为撤回
 		let userlikeGroupId = 0
+
+		let submitCanvasContent = null
         let init = (productData) => {
 			userlikeGroupId = productData.userlikeGroupId
+
+			clearTimeout(submitCanvasContent)
+			
 			canvasWH.value.height = 100
 			normalCanvasState.value = []
 			reverseCanvasState.value = []
@@ -446,16 +452,42 @@ export default defineComponent({
 					userLikeGroupId:userlikeGroupId
 				}
 				isShowMark.value = true
-				let oldExportCanvas = await new Promise((resolve, reject) => {
-					Https.axiosPost(Https.httpUrls.exportSearch, data)
-					.then((rv) => {
-						resolve(rv)
-					})
-					.catch((rv) => {
+				let oldExportCanvas
+				let localCanvas = localStorage.getItem('canvasContent')
+				let localUserlikeGroupId = localStorage.getItem('userlikeGroupId')
+				oldExportCanvas = await new Promise((resolve, reject) => {
+					if(localUserlikeGroupId == userlikeGroupId){
+						Modal.confirm({
+							title: useI18.t('exportModel.jsContent8'),
+							okText: 'Yes',
+							cancelText: 'No',
+							mask:false,
+							centered:true,
+							onOk() {
+								localCanvas = localCanvas?JSON.parse(localCanvas):null
+								resolve(localCanvas)
+							},
+							onCancel(){
+								resolve(null)
+							}
+						});
+					}else{
 						resolve(null)
-					});
+					}
 				})
+				if(!oldExportCanvas){
+					oldExportCanvas = await new Promise((resolve, reject) => {
+						Https.axiosPost(Https.httpUrls.exportSearch, data)
+						.then((rv) => {
+							resolve(rv)
+						})
+						.catch((rv) => {
+							resolve(null)
+						});
+					})
+				}
 				
+				console.log(oldExportCanvas);
                 // arr.forEach((item,index)=>{
                 if(oldExportCanvas){
 					canvasWH.value.height = oldExportCanvas.canvasHeight
@@ -579,6 +611,16 @@ export default defineComponent({
 				updateCanvasState('')//加载完成后记录一下
 				setOperation('move')
 				closeNav.value.tool = true
+				submitCanvasContent = setInterval(()=>{
+					let data = setCanvasContent(true)
+					if(data.objects.length == 0){
+						clearTimeout(submitCanvasContent)
+						return
+					}
+					data.canvasHeight = canvasWH.value.height
+					localStorage.setItem('canvasContent',JSON.stringify(data))
+					localStorage.setItem('userlikeGroupId',userlikeGroupId)
+				},3000)
 				if(driver__.value.driver){
 					driverObj__.moveNext()
 				}
@@ -1864,7 +1906,7 @@ export default defineComponent({
 			publishModal.init(data)
 		}
 		let setSubmit = ()=>{
-			let data = setCanvasContent()
+			let data = setCanvasContent(false)
 			data.canvasHeight = canvasWH.value.height
 			let blob = new Blob([JSON.stringify(data)], { type: "application/json" });
 			let formData = new FormData();
@@ -1875,14 +1917,16 @@ export default defineComponent({
 				message.success(t('exportModel.jsContent7'))
             })
 		}
-		let setCanvasContent = ()=>{
+		let setCanvasContent = (isSaveImg)=>{
 			var json = canvas.toJSON(['imgId','minioUrl']);
 			// console.log(JSON.stringify(json));
-			json.objects.forEach(item=>{
-				if(item.type == 'image'){
-					delete item.src
-				}
-			})
+			if(!isSaveImg){
+				json.objects.forEach(item=>{
+					if(item.type == 'image'){
+						delete item.src
+					}
+				})
+			}
 			return json
 		}
 		let textDataShow = ref(false)
@@ -1921,6 +1965,7 @@ export default defineComponent({
 				]
 			textFontFamilyList.value = arr
 			fontFamily.value = arr[0].value
+			
 		});
         return {
 			toSvg,