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

src/component/Administrator/affiliate/affiliateAudit/affiliateAudit.vue

@@ -75,7 +75,7 @@
 			</a-table>
 		</div>
 		<itemAffiliateDetail ref="itemAffiliateDetail"></itemAffiliateDetail>
-		<editAudit ref="editAudit"></editAudit>
+		<editAudit ref="editAudit" @searchHistoryList="searchHistoryList"></editAudit>
     </div>
 </template>
 <script lang="ts">

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/Canvas/CanvasEditor/managers/liquify/LiquifyCPUManager.js

@@ -5,7 +5,7 @@
 export class LiquifyCPUManager {
 	constructor(options = {}) {
 		this.config = {
-			gridSize: 8, // 稍微增大网格提高性能
+			gridSize: 100, // 稍微增大网格提高性能
 			maxStrength: 200, // 适度降低最大强度
 			smoothingIterations: 1, // 增加平滑处理
 			relaxFactor: 0.05, // 适度松弛

src/component/Detail/DesignDetail.vue

@@ -391,7 +391,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/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,