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

src/component/Canvas/CanvasEditor/index.vue

@@ -1040,6 +1040,7 @@
 		},
 		// 导出图片
 		exportImage: async ({
+			isFrontBackUpdata = false, // 更新红绿图时候需要用，直接更新红绿图
 			isContainBg = false, // 是否包含背景图层
 			isContainFixed = false, // 是否包含固定图层
 			isContainFixedOther = true, // 是否包含其他固定图层--颜色图层
@@ -1056,6 +1057,7 @@
 		} = {}) => {
 			loading.value = true
 			canvasManager?.canvas?.discardActiveObject()
+			if(isFrontBackUpdata)await canvasManager?.changeCanvas()
 			var base64 = await canvasManager.exportImage({
 				isContainBg,
 				isContainFixed,