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

src/component/home/design/editDesignType/index.vue

@@ -812,31 +812,32 @@ methods: {
 	},
 	setImageIndex(index:any){
 		if(this.isNext)return
-		let this_ = this
-		if(this.isCanvas){
-			this.isNext = true
-			new Promise((resolve,reject)=>{
-				Modal.confirm({
-					title: this.t('scaleImage.submitCanvas'),
-					icon: createVNode(ExclamationCircleOutlined),
-					okText: 'Yes',
-					cancelText: 'No',
-					mask:false,
-					centered:true,
-					onOk() {
-						this_.scaleImageIndex = index
-						this_.isNext = false
-						resolve('') 
-					},
-					onCancel(){
-						this_.isNext = false
-						resolve('') 
-					}
-				});
-			})
-		}else{
-			this.scaleImageIndex = index
-		}
+		// let this_ = this
+		// if(this.isCanvas){
+		// 	this.isNext = true
+		// 	new Promise((resolve,reject)=>{
+		// 		Modal.confirm({
+		// 			title: this.t('scaleImage.submitCanvas'),
+		// 			icon: createVNode(ExclamationCircleOutlined),
+		// 			okText: 'Yes',
+		// 			cancelText: 'No',
+		// 			mask:false,
+		// 			centered:true,
+		// 			onOk() {
+		// 				this_.scaleImageIndex = index
+		// 				this_.isNext = false
+		// 				resolve('') 
+		// 			},
+		// 			onCancel(){
+		// 				this_.isNext = false
+		// 				resolve('') 
+		// 			}
+		// 		});
+		// 	})
+		// }else{
+		// 	this.scaleImageIndex = index
+		// }
+		this.scaleImageIndex = index
 	},
 	LikeFile(item:any,str:string){
 		let parent:any = this.$parent