修复快捷键bug

This commit is contained in:
X1627315083
2025-01-27 16:22:34 +08:00
parent 1640fed81e
commit 19b942743e
2 changed files with 13 additions and 16 deletions

View File

@@ -314,7 +314,7 @@
</div> </div>
</a-modal> </a-modal>
<publish ref="publish" @clearPublish="clearPublish"></publish> <publish ref="publish" @clearPublish="clearPublish"></publish>
<liquefaction ref="liquefaction" @submitLiquefaction="submitLiquefaction"></liquefaction> <liquefaction ref="liquefaction" @submitLiquefaction="submitLiquefaction" @clearLiquefaction="clearLiquefaction"></liquefaction>
</a-modal> </a-modal>
</div> </div>
</template> </template>
@@ -556,7 +556,6 @@ export default defineComponent({
showUpgradePlan.value = true; showUpgradePlan.value = true;
clearTimeout(submitCanvasContent) clearTimeout(submitCanvasContent)
setCanvasKeyDown() setCanvasKeyDown()
clearCanvasKeyDown()
// document.addEventListener("keydown", setCanvasKeyDown); // document.addEventListener("keydown", setCanvasKeyDown);
// document.addEventListener("keyup", clearCanvasKeyDown); // document.addEventListener("keyup", clearCanvasKeyDown);
normalCanvasState.value = [] normalCanvasState.value = []
@@ -595,12 +594,6 @@ export default defineComponent({
}); });
canvas.preserveObjectStacking = true; 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:move", event =>setCanvasMove(event));
canvas.on("mouse:down", event=>setCanvasDown(event)); canvas.on("mouse:down", event=>setCanvasDown(event));
canvas.on("mouse:up", event=>setCanvasUp(event)); canvas.on("mouse:up", event=>setCanvasUp(event));
@@ -953,7 +946,6 @@ export default defineComponent({
centered:true, centered:true,
onOk() { onOk() {
showUpgradePlan.value = false; showUpgradePlan.value = false;
canvas.off("mouse:out", clearCanvasKeyDown);
canvas.dispose(); canvas.dispose();
position = { position = {
//设置每个图形位置的初始值 //设置每个图形位置的初始值
@@ -2096,12 +2088,12 @@ export default defineComponent({
userlikeGroupId:userlikeGroupId, userlikeGroupId:userlikeGroupId,
} }
publishModal.init(data) publishModal.init(data)
document.removeEventListener("keydown", setCanvasKeyDown); document.removeEventListener('keydown',canvasKeyDown);
document.removeEventListener("keyup", clearCanvasKeyDown); document.removeEventListener('keyup', canvasKeyUp);
} }
const clearPublish = ()=>{ const clearPublish = ()=>{
document.addEventListener("keydown", setCanvasKeyDown); document.addEventListener('keydown',canvasKeyDown);
document.addEventListener("keyup", clearCanvasKeyDown); document.addEventListener('keyup', canvasKeyUp);
} }
let setSubmit = ()=>{ let setSubmit = ()=>{
let data = setCanvasContent(false) let data = setCanvasContent(false)
@@ -2159,11 +2151,15 @@ export default defineComponent({
updateCanvasState() updateCanvasState()
}); });
} }
const clearLiquefaction = ()=>{
setCanvasKeyDown()
}
let setLiquefaction = ()=>{ let setLiquefaction = ()=>{
const activeObjects = canvas.getActiveObjects(); // 获取选中的对象 const activeObjects = canvas.getActiveObjects(); // 获取选中的对象
if (activeObjects.length === 1 && activeObjects[0].type === 'image') { if (activeObjects.length === 1 && activeObjects[0].type === 'image') {
liquefactionData = activeObjects[0] liquefactionData = activeObjects[0]
liquefaction.value.init(activeObjects[0]) liquefaction.value.init(activeObjects[0])
clearCanvasKeyDown()
} else { } else {
message.info(useI18.t('exportModel.jsContent6')) message.info(useI18.t('exportModel.jsContent6'))
return null; return null;
@@ -2192,8 +2188,7 @@ export default defineComponent({
}); });
onBeforeUnmount(()=>{ onBeforeUnmount(()=>{
document.removeEventListener("keydown", setCanvasKeyDown); clearCanvasKeyDown()
document.removeEventListener("keyup", clearCanvasKeyDown);
}) })
return { return {
toSvg, toSvg,
@@ -2259,6 +2254,7 @@ export default defineComponent({
//液化 //液化
liquefaction, liquefaction,
submitLiquefaction, submitLiquefaction,
clearLiquefaction,
setLiquefaction, setLiquefaction,
}; };
}, },

View File

@@ -68,7 +68,7 @@ import { getMousePosition } from "@/tool/mdEvent";
export default defineComponent({ export default defineComponent({
components: { components: {
}, },
emits: ['submitLiquefaction'], emits: ['submitLiquefaction','clearLiquefaction'],
setup(props,{emit}) { setup(props,{emit}) {
// let presentState = ref('paypal'); // let presentState = ref('paypal');
let liqufeaction = ref(false); let liqufeaction = ref(false);
@@ -357,6 +357,7 @@ export default defineComponent({
} }
let cancelDsign = ()=>{ let cancelDsign = ()=>{
liqufeaction.value = false liqufeaction.value = false
emit('clearLiquefaction')
} }
let routesChange = (str)=>{ let routesChange = (str)=>{
liqufeactionData[str] = Math.round(liqufeactionData[str]/10)*10; liqufeactionData[str] = Math.round(liqufeactionData[str]/10)*10;