fix
This commit is contained in:
@@ -357,8 +357,13 @@ export default defineComponent({
|
|||||||
updateCanvasState()
|
updateCanvasState()
|
||||||
});
|
});
|
||||||
canvas.preserveObjectStacking = true;
|
canvas.preserveObjectStacking = true;
|
||||||
|
console.log(canvas.wrapperEl);
|
||||||
//鼠标移动
|
//鼠标移动
|
||||||
|
// canvas.wrapperEl.onmouseover = setCanvasKeyDown;//document上添加按下和抬起事件
|
||||||
|
// canvas.wrapperEl.onmouseout = clearCanvasKeyDown;//document上添加按下和抬起事件
|
||||||
canvas.on("mouse:over", event =>setCanvasKeyDown());//document上添加按下和抬起事件
|
canvas.on("mouse:over", event =>setCanvasKeyDown());//document上添加按下和抬起事件
|
||||||
|
canvas.on("mouse:out", event =>clearCanvasKeyDown(e));//document上添加按下和抬起事件
|
||||||
|
|
||||||
canvas.on("mouse:move", event =>setCanvasMove(event));
|
canvas.on("mouse:move", event =>setCanvasMove(event));
|
||||||
canvas.on("mouse:out", event=>setCanvasOut(event));
|
canvas.on("mouse:out", event=>setCanvasOut(event));
|
||||||
canvas.on("mouse:down", event=>setCanvasDown(event));
|
canvas.on("mouse:down", event=>setCanvasDown(event));
|
||||||
@@ -799,7 +804,6 @@ export default defineComponent({
|
|||||||
switch (currentType.value.type) {
|
switch (currentType.value.type) {
|
||||||
case 'colorBoards':
|
case 'colorBoards':
|
||||||
let rect = setGroup(currentType.value.data)
|
let rect = setGroup(currentType.value.data)
|
||||||
console.log(rect);
|
|
||||||
setCanvasColor(pointerVpt.y, pointerVpt.x,rect)
|
setCanvasColor(pointerVpt.y, pointerVpt.x,rect)
|
||||||
break
|
break
|
||||||
case 'moodboardFiles':
|
case 'moodboardFiles':
|
||||||
@@ -919,6 +923,8 @@ export default defineComponent({
|
|||||||
// 监听键盘的 keydown 和 keyup 事件
|
// 监听键盘的 keydown 和 keyup 事件
|
||||||
let keyDown = []
|
let keyDown = []
|
||||||
let canvasKeyDown = (event) => {
|
let canvasKeyDown = (event) => {
|
||||||
|
console.log(123);
|
||||||
|
console.log(event);
|
||||||
if(keyDown.indexOf(event.key)>-1){
|
if(keyDown.indexOf(event.key)>-1){
|
||||||
}else{
|
}else{
|
||||||
keyDown.push(event.code)
|
keyDown.push(event.code)
|
||||||
@@ -942,13 +948,26 @@ export default defineComponent({
|
|||||||
return event.code !== item;
|
return event.code !== item;
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
let setCanvasKeyDown = ()=>{
|
let setCanvasKeyDown = (event)=>{
|
||||||
document.addEventListener('keydown',canvasKeyDown );
|
let e = event || window.event
|
||||||
document.addEventListener('keyup', canvasKeyUp);
|
e.stopPropagation();
|
||||||
|
document.addEventListener('keydown',canvasKeyDown,true);
|
||||||
|
document.addEventListener('keyup', canvasKeyUp,true);
|
||||||
}
|
}
|
||||||
let clearCanvasKeyDown = ()=>{
|
let clearCanvasKeyDown = (pointer)=>{
|
||||||
document.removeEventListener('keydown',canvasKeyDown );
|
console.log(123222);
|
||||||
document.removeEventListener('keyup', canvasKeyUp);
|
var pointer = canvas.getPointer(options.e);
|
||||||
|
var x = pointer.x;
|
||||||
|
var y = pointer.y;
|
||||||
|
|
||||||
|
// 检查是否鼠标离开了画布
|
||||||
|
if (x < 0 || x > canvas.width || y < 0 || y > canvas.height) {
|
||||||
|
// 执行你的操作
|
||||||
|
console.log('鼠标离开了画布');
|
||||||
|
}
|
||||||
|
|
||||||
|
document.removeEventListener('keydown',canvasKeyDown,true);
|
||||||
|
document.removeEventListener('keyup', canvasKeyUp,true);
|
||||||
}
|
}
|
||||||
let canvasPencilColor = ref('#000000')
|
let canvasPencilColor = ref('#000000')
|
||||||
let canvasPencilWidth = ref(20)
|
let canvasPencilWidth = ref(20)
|
||||||
@@ -1471,7 +1490,6 @@ export default defineComponent({
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
Https.axiosPost(Https.httpUrls.prepareForSR, data).then((rv) => {
|
Https.axiosPost(Https.httpUrls.prepareForSR, data).then((rv) => {
|
||||||
store.dispatch('getCredits')
|
|
||||||
emit('setTask',rv)
|
emit('setTask',rv)
|
||||||
cancelSRExport()
|
cancelSRExport()
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -195,6 +195,7 @@ export default defineComponent({
|
|||||||
rv.forEach((rvItem:any) => {
|
rv.forEach((rvItem:any) => {
|
||||||
if(item.taskId==rvItem.taskId && rvItem.status == 'success'){
|
if(item.taskId==rvItem.taskId && rvItem.status == 'success'){
|
||||||
downloadIamge(rvItem.outputImage,rvItem.imageName)
|
downloadIamge(rvItem.outputImage,rvItem.imageName)
|
||||||
|
this.store.dispatch('getCredits')
|
||||||
let itemIndex = item.index
|
let itemIndex = item.index
|
||||||
this.taskListUnfinished[index] = rvItem
|
this.taskListUnfinished[index] = rvItem
|
||||||
this.taskListUnfinished[index].index = itemIndex
|
this.taskListUnfinished[index].index = itemIndex
|
||||||
|
|||||||
Reference in New Issue
Block a user