Merge branch 'dev_vite' of http://18.167.251.121:10003/aidlab/aida_front into dev_vite

src/component/Canvas/CanvasEditor/commands/LayerCommands.js

@@ -70,7 +70,7 @@ export class AddLayerCommand extends Command {
 
   undo() {
     // 从图层列表删除该图层
-    this.layers.value = [...this.beforeLayers];
+	this.layers.value = [...this.beforeLayers];
 
     // 恢复原活动图层
     this.activeLayerId.value = this.oldActiveLayerId;
@@ -564,12 +564,11 @@ export class RemoveLayerCommand extends Command {
       }
     }
 	layer.fabricObjects?.forEach((fabric) => {
-      const { object } = findObjectById(this.canvas, fabric.id);
-      if (object && !allObjects.includes(object)) {
-        allObjects.push(object);
-      }
-	});
-
+		const { object } = findObjectById(this.canvas, fabric.id);
+		if (object && !allObjects.includes(object)) {
+		  allObjects.push(object);
+		}
+	  });
     // 递归收集子图层的对象
     if (layer.children && Array.isArray(layer.children)) {
       layer.children.forEach((childLayer) => {

src/component/Canvas/CanvasEditor/index.vue

@@ -706,7 +706,7 @@ function removeLayer(layerId) {
     return;
 	}
 
-  layerManager.removeLayer(layerId);
+	layerManager.removeLayer(layerId);
 //   此处删除画布上内容导致撤回操作无效（多余）
 //   if (canvasManager && canvasManager.canvas) {
 //     const layerToRemove = layers.value.find((l) => l.id === layerId);

src/component/Detail/DesignDetail.vue

@@ -403,7 +403,7 @@ export default defineComponent({
 					rv:rv,
 					fun:setRevocation
 				}
-				detailData.designDetail.oldModel = detailData.designDetail.newModel
+				if(detailData?.designDetail?.newModel)detailData.designDetail.oldModel = JSON.parse(JSON.stringify(detailData.designDetail.newModel))
 				delete detailData.designDetail.newModel
 				store.commit('DesignDetail/setPraeview',value)
 				detailData.loadingShow = false

src/component/home/design/collection/PrintboardUpload.vue

@@ -1,6 +1,5 @@
 <template>
     <div class="printboard_upload_modal" :class="[driver__.driver?'showEvents':'']">
-		
         <div class="printboard_left_upload modal_left">
             <div class="left_upload_header">
                 <div class="upload_header_item">

src/component/home/index.vue

@@ -97,7 +97,8 @@ export default defineComponent({
 				}
 				
 				// 如果是同一个项目且openType为history，跳过重新初始化
-				if(isSameProject){
+				console.log(isSameProject,data.openType)
+				if(isSameProject || (!query.history && !query.id)){
 					data.dataLoad = false
 					console.log(dataDom.design)
 					// dataDom.design?.init()

src/component/home/tools/toProduct/index.vue

@@ -587,8 +587,9 @@ export default defineComponent({
 				toProductImageVOList:selectArr,
 				// userLikeGroupId:upload.value.userlikeGroupId,
 				projectId:productImgData.selectObject.id,
-				modelName:obj.elementType == 'Relight'?'flux':speed.speedData.value,
+				modelName:props.productimgMenu.value == 'Relight'?'flux':speed.speedData.value,
 				direction:RelightDirection.value,
+				ageGroup:store.state.Workspace.probjects.ageGroup,
 				brightenValue:productImgData.brightenValue,
 				imageStrength:(100 - imageStrength)/100,
 				

src/lang/cn.ts

@@ -345,8 +345,8 @@ export default {
 		StartDate: "开始日期",
 		EndDate: "结束日期",
 		inputContent1: "输入名字进行搜索",
-		Detail: "细节",
-		Edit: "编辑",
+		Detail: "结果",
+		Edit: "设置",
 		Rename: "重命名",
 		Retrieve: "选择",
 		Delete: "删除",

src/lang/en.ts

@@ -346,7 +346,7 @@ export default {
 		EndDate: "End Date",
 		inputContent1: "Search by collection name",
 		Detail: "Result",
-		Edit: "Edit",
+		Edit: "Setting",
 		Rename: "Rename",
 		Retrieve: "Retrieve",
 		Delete: "Delete",