Merge remote-tracking branch 'origin/StableVersion' into dev_vite
This commit is contained in:
@@ -857,7 +857,6 @@ export default defineComponent({
|
||||
dataDom.createBrand.openAddBrand()
|
||||
}
|
||||
const editImg = (item:any,index:number)=>{
|
||||
console.log(item)
|
||||
pageData.editIndex = index
|
||||
dataDom.modalCanvas.init(item,'')
|
||||
// imgList
|
||||
@@ -995,7 +994,7 @@ export default defineComponent({
|
||||
label:''
|
||||
}
|
||||
}else{
|
||||
if(newVal.value == "Pattern"){
|
||||
if(newVal.value == "Pattern" || this.selectCode == 'Sketchboard'){
|
||||
this.speedData = this.speedList[1]
|
||||
}else{
|
||||
this.speedData = this.speedList[0]
|
||||
@@ -1935,6 +1934,7 @@ export default defineComponent({
|
||||
scaleImage.init(list,index)
|
||||
},
|
||||
onPaste(e:any){
|
||||
if(this.selectGenerateList.length != 0)return
|
||||
if(e.clipboardData.files[0] && !this.isTextarea && this.selectCode !== 'Moodboard' && this.scene?.value != 'Slogan' && this.scene?.value != 'Logo'){
|
||||
let param = new FormData();
|
||||
param.append('inPin','0')
|
||||
|
||||
Reference in New Issue
Block a user