修复快捷键bug
This commit is contained in:
@@ -314,7 +314,7 @@
|
||||
</div>
|
||||
</a-modal>
|
||||
<publish ref="publish" @clearPublish="clearPublish"></publish>
|
||||
<liquefaction ref="liquefaction" @submitLiquefaction="submitLiquefaction"></liquefaction>
|
||||
<liquefaction ref="liquefaction" @submitLiquefaction="submitLiquefaction" @clearLiquefaction="clearLiquefaction"></liquefaction>
|
||||
</a-modal>
|
||||
</div>
|
||||
</template>
|
||||
@@ -556,7 +556,6 @@ export default defineComponent({
|
||||
showUpgradePlan.value = true;
|
||||
clearTimeout(submitCanvasContent)
|
||||
setCanvasKeyDown()
|
||||
clearCanvasKeyDown()
|
||||
// document.addEventListener("keydown", setCanvasKeyDown);
|
||||
// document.addEventListener("keyup", clearCanvasKeyDown);
|
||||
normalCanvasState.value = []
|
||||
@@ -595,12 +594,6 @@ export default defineComponent({
|
||||
});
|
||||
canvas.preserveObjectStacking = true;
|
||||
//鼠标移动
|
||||
// canvas.wrapperEl.onmouseover = setCanvasKeyDown;//document上添加按下和抬起事件
|
||||
// canvas.wrapperEl.onmouseout = clearCanvasKeyDown;//document上添加按下和抬起事件
|
||||
|
||||
// canvas.on("mouse:over", event =>setCanvasKeyDown(event));//document上添加按下和抬起事件
|
||||
// canvas.on("mouse:out", clearCanvasKeyDown);//document上添加按下和抬起事件
|
||||
|
||||
canvas.on("mouse:move", event =>setCanvasMove(event));
|
||||
canvas.on("mouse:down", event=>setCanvasDown(event));
|
||||
canvas.on("mouse:up", event=>setCanvasUp(event));
|
||||
@@ -953,7 +946,6 @@ export default defineComponent({
|
||||
centered:true,
|
||||
onOk() {
|
||||
showUpgradePlan.value = false;
|
||||
canvas.off("mouse:out", clearCanvasKeyDown);
|
||||
canvas.dispose();
|
||||
position = {
|
||||
//设置每个图形位置的初始值
|
||||
@@ -2096,12 +2088,12 @@ export default defineComponent({
|
||||
userlikeGroupId:userlikeGroupId,
|
||||
}
|
||||
publishModal.init(data)
|
||||
document.removeEventListener("keydown", setCanvasKeyDown);
|
||||
document.removeEventListener("keyup", clearCanvasKeyDown);
|
||||
document.removeEventListener('keydown',canvasKeyDown);
|
||||
document.removeEventListener('keyup', canvasKeyUp);
|
||||
}
|
||||
const clearPublish = ()=>{
|
||||
document.addEventListener("keydown", setCanvasKeyDown);
|
||||
document.addEventListener("keyup", clearCanvasKeyDown);
|
||||
document.addEventListener('keydown',canvasKeyDown);
|
||||
document.addEventListener('keyup', canvasKeyUp);
|
||||
}
|
||||
let setSubmit = ()=>{
|
||||
let data = setCanvasContent(false)
|
||||
@@ -2159,11 +2151,15 @@ export default defineComponent({
|
||||
updateCanvasState()
|
||||
});
|
||||
}
|
||||
const clearLiquefaction = ()=>{
|
||||
setCanvasKeyDown()
|
||||
}
|
||||
let setLiquefaction = ()=>{
|
||||
const activeObjects = canvas.getActiveObjects(); // 获取选中的对象
|
||||
if (activeObjects.length === 1 && activeObjects[0].type === 'image') {
|
||||
liquefactionData = activeObjects[0]
|
||||
liquefaction.value.init(activeObjects[0])
|
||||
clearCanvasKeyDown()
|
||||
} else {
|
||||
message.info(useI18.t('exportModel.jsContent6'))
|
||||
return null;
|
||||
@@ -2192,8 +2188,7 @@ export default defineComponent({
|
||||
|
||||
});
|
||||
onBeforeUnmount(()=>{
|
||||
document.removeEventListener("keydown", setCanvasKeyDown);
|
||||
document.removeEventListener("keyup", clearCanvasKeyDown);
|
||||
clearCanvasKeyDown()
|
||||
})
|
||||
return {
|
||||
toSvg,
|
||||
@@ -2259,6 +2254,7 @@ export default defineComponent({
|
||||
//液化
|
||||
liquefaction,
|
||||
submitLiquefaction,
|
||||
clearLiquefaction,
|
||||
setLiquefaction,
|
||||
};
|
||||
},
|
||||
|
||||
@@ -68,7 +68,7 @@ import { getMousePosition } from "@/tool/mdEvent";
|
||||
export default defineComponent({
|
||||
components: {
|
||||
},
|
||||
emits: ['submitLiquefaction'],
|
||||
emits: ['submitLiquefaction','clearLiquefaction'],
|
||||
setup(props,{emit}) {
|
||||
// let presentState = ref('paypal');
|
||||
let liqufeaction = ref(false);
|
||||
@@ -357,6 +357,7 @@ export default defineComponent({
|
||||
}
|
||||
let cancelDsign = ()=>{
|
||||
liqufeaction.value = false
|
||||
emit('clearLiquefaction')
|
||||
}
|
||||
let routesChange = (str)=>{
|
||||
liqufeactionData[str] = Math.round(liqufeactionData[str]/10)*10;
|
||||
|
||||
Reference in New Issue
Block a user