Merge remote-tracking branch 'origin/StableVersion' into develop

src/component/HomePage/ExportModel.vue

@@ -168,7 +168,6 @@
 						<i class="icon iconfont icon-move" @click="setOperation('move')" :class="{active:operation == 'move'}"></i>
 						<i class="icon iconfont icon-xiangpi_huaban1" @click="setOperation('eraser')" :class="{active:operation == 'eraser'}"></i>
 						<!-- <i class="icon iconfont icon-xiala" :class="closeNav.tool?'icon-rotate':''"  @click.stop="setCloseNav('tool')"></i> -->
-
 						<i class="icon iconfont icon-xian" @click="setOperation('fold')" :class="{active:operation == 'fold'}"></i>
 							<i class="icon iconfont icon-checkbox-full" @click="setOperation('rect')" :class="{active:operation == 'rect'}"></i>
 							<!-- <i class="icon iconfont icon-zhixian" @click="setOperation('line')" :class="{active:operation == 'line'}"></i> -->
@@ -180,6 +179,7 @@
 								<input type="file" @change="uploadImage">
 							</label>
 							<i class="icon iconfont" @click="setOperation('text')" :class="{active:operation == 'text'}">T</i>
+						<i @click="setLiquefaction()">液化</i>
 					</div>
 					<!-- <div class="exportCanvasBox_left_tool exportCanvasBox_left_item" :class="{'closeNav' :closeNav.tool}">
 						<div class="exportCanvasBox_left_tool_item">
@@ -287,6 +287,7 @@
 			</div>
 		</a-modal>
 		<publish ref="publish" @setPublish="setSubmit"></publish>
+		<liquefaction ref="liquefaction" @submitLiquefaction="submitLiquefaction"></liquefaction>
     </a-modal>
 </template>
 <script>
@@ -307,12 +308,14 @@ import { exportSele,JSRectUpdata,JSchangeType,JScanvasMouseDown,JScanvasMouseMov
 import { useI18n } from "vue-i18n";
 import {isMoible,calculateGradientCoordinate,base64ToFile} from '@/tool/util'
 import publish from "@/component/WorksPage/publish.vue";
+import liquefaction from "@/component/modules/liquefaction.vue";
 
 export default defineComponent({
     components: {
         scaleImage,
         ExportNewCoolection,
 		publish,
+		liquefaction,
     },
     props: ["msg", "sketchCatecoryList"],
     setup(props,{emit}) {
@@ -465,8 +468,9 @@ export default defineComponent({
 				let oldExportCanvas
 				let localCanvas = localStorage.getItem('canvasContent')
 				let localUserlikeGroupId = localStorage.getItem('userlikeGroupId')
+				let currentTime = localStorage.getItem('currentTime')
 				oldExportCanvas = await new Promise((resolve, reject) => {
-					if(localUserlikeGroupId == userlikeGroupId){
+					if(localUserlikeGroupId == userlikeGroupId && (new Date().getTime() - currentTime < 21600000)){
 						Modal.confirm({
 							title: useI18.t('exportModel.jsContent8'),
 							okText: 'Yes',
@@ -622,6 +626,7 @@ export default defineComponent({
 					data.canvasHeight = canvasWH.value.height
 					localStorage.setItem('canvasContent',JSON.stringify(data))
 					localStorage.setItem('userlikeGroupId',userlikeGroupId)
+					localStorage.setItem('currentTime',new Date().getTime())
 				},3000)
 				if(driver__.value.driver){
 					driverObj__.moveNext()
@@ -1931,6 +1936,46 @@ export default defineComponent({
 				canvas.renderAll();
 			}
 		}
+
+		//液化
+		let liquefaction = ref(null)
+		let submitLiquefaction = (rv)=>{
+
+		}
+		let setLiquefaction = ()=>{
+			const selectedObject = canvas.getActiveObjects();
+			if (selectedObject.length > 0) {
+				// 创建一个新的画布用于生成图片
+				const tempCanvas = new fabric.Canvas();
+				tempCanvas.setDimensions({
+				width: selectedObject.width,
+				height: selectedObject.height,
+				});
+				let cloneCount = 0;
+				selectedObject.forEach((obj) => {
+                    obj.clone((clonedObject) => {
+                        tempCanvas.add(clonedObject);
+                        clonedObject.set({ left: obj.left, top: obj.top }); // 设置位置
+                        cloneCount++;
+
+                        // 当所有对象都克隆完成后生成图片
+                        if (cloneCount === selectedObject.length) {
+                            const dataURL = tempCanvas.toDataURL();
+							console.log(dataURL);
+                            console.log('Image URL:', dataURL);
+                            // 可以根据需要使用 dataURL，例如显示在 img 标签中
+                        }
+                    });
+                });
+
+				// 生成图片的地址
+				
+			} else {
+				console.log('No object selected.');
+				return null;
+			}
+			// liquefaction.value.init()
+		}
         onMounted(() => {
 			let arr = [
 					{ value: 'Arial', name: 'select font' },
@@ -2009,6 +2054,10 @@ export default defineComponent({
 			fontFamily,
 			textDataShow,
 			setFontFamily,
+			//液化
+			liquefaction,
+			submitLiquefaction,
+			setLiquefaction,
         };
     },
     data(prop) {