fix
This commit is contained in:
@@ -117,7 +117,7 @@
|
||||
</div>
|
||||
<div
|
||||
class="delete_file_block"
|
||||
@click="deleteFile(index)"
|
||||
@click.stop="deleteFile(index)"
|
||||
>
|
||||
<span class="icon iconfont icon-shanchu"></span>
|
||||
</div>
|
||||
@@ -614,6 +614,7 @@ export default defineComponent({
|
||||
},
|
||||
deleteFile(item: any) {
|
||||
// this.sketchboardList
|
||||
this.collectionElementid = ''
|
||||
this.sketchboardList.splice(item, 1);
|
||||
// if (item.type_ == "generate" || item.type_ == "material") {
|
||||
// let maxImg = 8
|
||||
|
||||
@@ -100,9 +100,7 @@ export default defineComponent({
|
||||
// this.sketchList = []
|
||||
// this.sketch = [[],[],[]]
|
||||
// this.sketchList = this.allBoardData.sketchboardFiles
|
||||
console.log(oldVal,newVal);
|
||||
|
||||
if(oldVal && oldVal?.length != 0){
|
||||
if(oldVal && oldVal?.length != 0 && newVal && newVal?.length != 0){
|
||||
let oldArr:any = []
|
||||
let newArr:any = []
|
||||
oldVal.forEach((item:any,index:any) => {
|
||||
@@ -129,51 +127,41 @@ export default defineComponent({
|
||||
},
|
||||
methods: {
|
||||
setSketch(){
|
||||
console.log(123123);
|
||||
|
||||
if(!this.imgOpen){
|
||||
return
|
||||
}
|
||||
this.imgOpen = false
|
||||
this.sketch = [[],[],[]]
|
||||
let sketchH = [0,0,0]
|
||||
nextTick().then(async ()=>{
|
||||
let sketch1:any = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item0')[0]?.getBoundingClientRect()
|
||||
let sketch2:any = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item1')[0]?.getBoundingClientRect()
|
||||
let sketch3:any = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item2')[0]?.getBoundingClientRect()
|
||||
sketch1.num = 0
|
||||
sketch2.num = 1
|
||||
sketch3.num = 2
|
||||
if(this.sketchList && this.sketchList!=null){
|
||||
for (let i = 0; i < this.sketchList?.length; i++) {
|
||||
let sketch1:any = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item0')[0]?.getBoundingClientRect()
|
||||
let sketch2:any = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item1')[0]?.getBoundingClientRect()
|
||||
let sketch3:any = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item2')[0]?.getBoundingClientRect()
|
||||
sketch1.num = 0
|
||||
sketch2.num = 1
|
||||
sketch3.num = 2
|
||||
let min = Math.min.apply(null, sketchH);
|
||||
let index = sketchH.indexOf(min);
|
||||
let arr = [sketch1,sketch2,sketch3]
|
||||
let image = new Image()
|
||||
let image:any = new Image()
|
||||
image.src = this.sketchList[i].urlWithWhiteSide
|
||||
arr.sort((a,b)=>{
|
||||
var a_num = a["height"];
|
||||
var b_num = b["height"];
|
||||
return a_num - b_num;
|
||||
})
|
||||
// console.log(arr);
|
||||
this.sketch[arr[0].num]?.push(this.sketchList[i])
|
||||
// arr.sort((a,b)=>{
|
||||
// var a_num = a["height"];
|
||||
// var b_num = b["height"];
|
||||
// return a_num - b_num;
|
||||
// })
|
||||
this.sketch[index]?.push(this.sketchList[i])
|
||||
// this.sketch[arr[0].num]?.push(this.sketchList[i])
|
||||
let dom = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item'+arr[0].num)[0]
|
||||
let img = dom.querySelector('.element:last-child')
|
||||
console.log(img);
|
||||
|
||||
// console.log([sketch1.height,sketch2.height,sketch3.height]);
|
||||
await new Promise((resolve:any)=>{
|
||||
image.onload = ()=>{
|
||||
sketch1 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item0')[0]?.getBoundingClientRect()
|
||||
sketch2 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item1')[0]?.getBoundingClientRect()
|
||||
sketch3 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item2')[0]?.getBoundingClientRect()
|
||||
sketch1.num = 0
|
||||
sketch2.num = 1
|
||||
sketch3.num = 2
|
||||
sketchH[index]+=image.height * (300/image.width)
|
||||
nextTick().then(()=>{
|
||||
|
||||
resolve()
|
||||
|
||||
setTimeout(()=>{
|
||||
},500)
|
||||
})
|
||||
}
|
||||
})
|
||||
|
||||
@@ -575,7 +575,7 @@ export default defineComponent({
|
||||
level2Type:'',
|
||||
text:this.captionGeneration,
|
||||
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
|
||||
version:generage.printModel.num,//为1就是Print
|
||||
version:generage.printModel.num?generage.printModel.num:1,//为1就是Print
|
||||
gender:'',
|
||||
}
|
||||
if(generateType == 'image'){
|
||||
|
||||
@@ -172,7 +172,7 @@ export default defineComponent({
|
||||
//操作移动
|
||||
layout:{
|
||||
mounted (el,layout:any,binding) {
|
||||
el.addEventListener('mousedown',(e: MouseEvent)=>{
|
||||
let mousedown = function(e: MouseEvent){
|
||||
e.stopPropagation()
|
||||
el.parentElement.children.forEach((v:any) => {
|
||||
v.style.left = v.offsetLeft+'px'
|
||||
@@ -210,9 +210,16 @@ export default defineComponent({
|
||||
}
|
||||
document.onmouseup = function(){
|
||||
mouse = false
|
||||
document.onmousemove = ()=>{
|
||||
|
||||
}
|
||||
// el.removeEventListener('mousedown',mousedown)
|
||||
|
||||
// el.removeEventListener('mousedown',mousedown)
|
||||
// document.onmousemove = false;
|
||||
}
|
||||
})
|
||||
}
|
||||
el.addEventListener('mousedown',mousedown)
|
||||
},
|
||||
updated (el,layout) {
|
||||
|
||||
@@ -284,6 +291,7 @@ export default defineComponent({
|
||||
}
|
||||
document.onmouseup = function(){
|
||||
mouse = false
|
||||
document.onmousemove = ()=>{}
|
||||
}
|
||||
})
|
||||
}
|
||||
@@ -302,7 +310,7 @@ export default defineComponent({
|
||||
num = Number(transform[3])
|
||||
}
|
||||
// 添加鼠标按下事件监听器
|
||||
el.addEventListener('mousedown', (e:MouseEvent) => {
|
||||
let mousedown = (e:MouseEvent) => {
|
||||
e.stopPropagation()
|
||||
mouse = true;
|
||||
// let eX = (e.pageX - el.offsetLeft) + el.offsetLeft
|
||||
@@ -324,12 +332,14 @@ export default defineComponent({
|
||||
});
|
||||
|
||||
// 添加鼠标松开事件监听器
|
||||
document.addEventListener('mouseup', () => {
|
||||
mouse = false;
|
||||
// x = e.pageX
|
||||
// y = e.pageY
|
||||
});
|
||||
});
|
||||
document.addEventListener('mouseup',mouseup );
|
||||
}
|
||||
let mouseup = () => {
|
||||
mouse = false;
|
||||
// el.removeEventListener('mousedown',mousedown)
|
||||
document.removeEventListener('mouseup',mouseup)
|
||||
}
|
||||
el.addEventListener('mousedown',mousedown);
|
||||
//缩放
|
||||
let timeSwitch = true
|
||||
el.parentNode.addEventListener('mousemove', (e:MouseEvent) => {
|
||||
@@ -446,15 +456,17 @@ export default defineComponent({
|
||||
}
|
||||
}
|
||||
// 添加鼠标松开事件监听器
|
||||
document.addEventListener('mouseup', () => {
|
||||
mouse = false;
|
||||
el.removeEventListener('mousemove',mouseMove)
|
||||
el.parentNode.children.forEach((v:any) =>{
|
||||
v.classList.remove('eventNode')
|
||||
})
|
||||
});
|
||||
document.addEventListener('mouseup', mouseup);
|
||||
|
||||
}
|
||||
let mouseup = () => {
|
||||
mouse = false;
|
||||
el.parentNode.removeEventListener('mousemove',mouseMove)
|
||||
el.parentNode.children.forEach((v:any) =>{
|
||||
v.classList.remove('eventNode')
|
||||
})
|
||||
document.removeEventListener('mouseup', mouseup);
|
||||
}
|
||||
el.parentNode.addEventListener('mousemove', mouseMove);
|
||||
|
||||
})
|
||||
@@ -516,6 +528,7 @@ export default defineComponent({
|
||||
}
|
||||
document.onmouseup = function(){
|
||||
mouse = false
|
||||
document.onmousemove = ()=>{}
|
||||
}
|
||||
})
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user