布局修改 部分bug修复

src/component/home/design/tools.vue

@@ -17,7 +17,7 @@
 	>
 		<div class="generalModel_btn">
 			<div class="generalModel_closeIcon" @click.stop="cleardata()">
-				<svg width="46" height="46" viewBox="0 0 46 46" fill="none" xmlns="http://www.w3.org/2000/svg">
+				<svg width="100%" height="100%" viewBox="0 0 46 46" fill="none" xmlns="http://www.w3.org/2000/svg">
 					<circle cx="23" cy="23" r="23" fill="#000" fill-opacity="0.3"/>
 					<rect x="32.5063" y="12" width="3" height="29" rx="1.5" transform="rotate(45 32.5063 12)" fill="white"/>
 					<rect x="34.6274" y="32.5059" width="3" height="29" rx="1.5" transform="rotate(135 34.6274 32.5059)" fill="white"/>
@@ -64,9 +64,9 @@
 
 					</div>
 					<div class="btn">
-						<div class="gallery_btn" @click="saveCanvas">Save</div>
-						<div class="gallery_btn" @click="share">Share</div>
-						<div class="gallery_btn" @click="exportElement">Export</div>
+						<div class="gallery_btn" @click="saveCanvas">{{ $t('exportModel.Save') }}</div>
+						<div class="gallery_btn" @click="share">{{ $t('exportModel.Share') }}</div>
+						<div class="gallery_btn" @click="exportElement">{{ $t('exportModel.Export') }}</div>
 					</div>
 				</div>
 			</div>
@@ -82,6 +82,7 @@ import { defineComponent,computed,ref,provide,nextTick,inject,toRefs, reactive,
 import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
 import { Https } from "@/tool/https";
 import { useStore } from "vuex";
+import { Modal,message } from 'ant-design-vue';
 import { downloadIamge,getMinioUrl } from "@/tool/util";
 import { useI18n } from 'vue-i18n'
 import toProductRelight from '../tools/toProduct/index.vue'
@@ -106,6 +107,8 @@ export default defineComponent({
 	emits:['editToolsSuccess'],
 	setup(props,{emit}) {
 		const store = useStore();
+		let locale = null as any;
+		let t = null as any;
 		const data = reactive({
 			designTools:false,
 			isShowMark:false,
@@ -117,6 +120,9 @@ export default defineComponent({
 			canvasSelectList:[] as any,
 			canvasDetailData:null as any,
 			unLikeList:[],
+			locale:null as any,
+			t:null as any,
+
 		})
 		const dataDom = reactive({
 			toProduct:null as any,
@@ -125,13 +131,18 @@ export default defineComponent({
 			editCanvas:null as any,
 			publish:null as any,
 		}) as any
-		const init = (value:any,list:any)=>{
+		const init = async (value:any,list:any,t:any,locale:any)=>{
 			store.commit('toolsClear')
+			data.t = t
+			data.locale = locale.value
 			data.designTools = true
+			if(value == 'editCanvas')await getCanvasData('canvas')
 			data.openType = value
 			if(value == 'editCanvas'){
-				getSelectCanvasImg()
-				return
+				nextTick(()=>{
+					getSelectCanvasImg()
+					return
+				})
 			}
 			data.likeDesignList = list
 			nextTick(()=>{
@@ -179,7 +190,7 @@ export default defineComponent({
 					console.log(likeData)
 					store.commit("setPoseTransfer", likeData);
 				}
-				dataDom[value].openSetData(fileList)
+				if(dataDom[value]?.openSetData)dataDom[value]?.openSetData(fileList)
 			})
 		}
 		const unLike = (item)=>{
@@ -194,9 +205,11 @@ export default defineComponent({
 			}else if(data.openType == 'poseTransfer'){
 				list = store.state.HomeStoreModule.poseTransfer.likedList
 			}
-			let generateCourse = list.filter((item)=>item.oldSort)
-			generateCourse = generateCourse.map(item => {
-				return item.oldSort ? { ...item, sort: item.oldSort } : item;
+			let generateCourse = list.filter((item) => item.newLike)
+			.map(item => {
+				// 删除 newLike 字段
+				const { newLike, ...rest } = item; // 解构赋值移除 newLike
+				return item.oldSort ? { ...rest, sort: item.oldSort } : rest;
 			});
 			let emitData = {
 				status:'add',
@@ -215,15 +228,30 @@ export default defineComponent({
 
 
 		//画布相关
+		const getCanvasData = (str:any)=>{
+			return new Promise((resolve, reject) => {
+				let value = {
+					module:str,
+					projectId:data.selectObject.id,
+				}
+				Https.axiosPost(Https.httpUrls.exportSearch, value)
+				.then((rv) => {
+					store.commit("setCanvasData", {type:str,file:rv});
+					resolve('')
+				})
+				.catch((rv) => {
+					resolve(null)
+				});
+			})
+		}
 		const getSelectCanvasImg = ()=>{
 			data.canvasSelectList = []
 			let allCollection = store.state.UploadFilesModule.allBoardData
-			console.log(allCollection)
 			let allCollectionStr = [
-				{value:'disposeMoodboard',name:'Entirety Moodboard'},
-				{value:'moodboardFiles',name:'Moodboard'},
-				{value:'printboardFiles',name:'Printboard'},
-				{value:'sketchboardFiles',name:'Sketchboard'},
+				{value:'disposeMoodboard',name:'Entirety Moodboard',nameCn:'整体情绪版'},
+				{value:'moodboardFiles',name:'Moodboard',nameCn:'情绪版'},
+				{value:'printboardFiles',name:'Printboard',nameCn:'印花板'},
+				{value:'sketchboardFiles',name:'Sketchboard',nameCn:'整体情绪版'},
 			]
 			allCollectionStr.forEach((itemStr:any)=>{
 				let list = [] as any
@@ -232,7 +260,7 @@ export default defineComponent({
 				})
 				let obj = {
 					value:itemStr.value,
-					type:itemStr.name,
+					type:data.locale == "ENGLISH"?itemStr.name:itemStr.nameCn,
 					imgList:list,
 				}
 				if(list.length > 0){
@@ -252,7 +280,7 @@ export default defineComponent({
 				})
 				let obj = {
 					value:'design',
-					type:'Design',
+					type:data.locale == "ENGLISH"?'Design':'设计',
 					imgList:list
 				}
 				if(list.length > 0){
@@ -284,7 +312,6 @@ export default defineComponent({
 			canvasData.canvas.objects.forEach((objectsItem:any) => {
 				if(objectsItem.type == 'image')objectsItem.minioUrl = getMinioUrl(objectsItem.src)
 			});
-			console.log(canvasData)
 			let blob = new Blob([JSON.stringify(canvasData)], { type: "application/json" });
 			let formData = new FormData();
 			formData.append("file", blob, "data.json");
@@ -295,7 +322,7 @@ export default defineComponent({
 			};
 			Https.axiosPost(Https.httpUrls.exportSave, formData, config).then(
 				(rv) => {
-					console.log(rv)
+					message.success(data.t('exportModel.jsContent7'))
 				}
 			);
 		}
@@ -485,7 +512,7 @@ export default defineComponent({
 		.fullScreen{
 			 .generalModel_btn {
 				.generalModel_closeIcon{
-					transform: translate(-10%, 10%);
+					transform: translate(-100%, 50%);
 				}
 			}
 		}