mirror of
https://github.com/fofolee/uTools-quickcommand.git
synced 2025-06-08 06:16:27 +08:00
修复 subinput 和 selectList 的冲突
This commit is contained in:
parent
2c6076c5ee
commit
b0a9f07e3c
@ -28,6 +28,7 @@ export default defineComponent({
|
||||
utools: UTOOLS,
|
||||
cronJobs: {},
|
||||
enterData: {},
|
||||
subInputEvent: null,
|
||||
};
|
||||
},
|
||||
created: function () {
|
||||
|
@ -84,7 +84,6 @@ export default {
|
||||
runResult: [],
|
||||
runResultStatus: true,
|
||||
subInputValue: "",
|
||||
subInputListener: null,
|
||||
ctrlCListener: null,
|
||||
quickcommandListener: null,
|
||||
history: [],
|
||||
@ -226,7 +225,7 @@ export default {
|
||||
setTimeout(() => {
|
||||
if (this.subInputValue) querySubInput();
|
||||
}, 100);
|
||||
this.subInputListener = (event) => {
|
||||
let listener = (event) => {
|
||||
event.preventDefault();
|
||||
switch (event.keyCode) {
|
||||
case 13:
|
||||
@ -248,7 +247,8 @@ export default {
|
||||
break;
|
||||
}
|
||||
};
|
||||
document.addEventListener("keydown", this.subInputListener, true);
|
||||
this.$root.subInputEvent = ["keydown", listener, true];
|
||||
document.addEventListener(...this.$root.subInputEvent);
|
||||
},
|
||||
// payload 临时赋值
|
||||
async getTempPayload(currentCommand) {
|
||||
@ -308,10 +308,10 @@ export default {
|
||||
},
|
||||
stopRun() {
|
||||
this.runResult = [];
|
||||
if (!!this.subInputListener) {
|
||||
if (!!this.$root.subInputEvent) {
|
||||
this.subInputValue = "";
|
||||
utools.removeSubInput();
|
||||
document.removeEventListener("keydown", this.subInputListener, true);
|
||||
document.removeEventListener(...this.$root.subInputEvent);
|
||||
}
|
||||
this.clear();
|
||||
this.frameInitHeight = 0;
|
||||
|
@ -205,12 +205,15 @@ export default {
|
||||
|
||||
clear() {
|
||||
utools.removeSubInput();
|
||||
document.removeEventListener("keydown", this.keyHandler);
|
||||
document.removeEventListener("keydown", this.keyHandler, true);
|
||||
this.setUtoolsHeight(this.listMaxHeight);
|
||||
},
|
||||
|
||||
addListeners() {
|
||||
document.addEventListener("keydown", this.keyHandler);
|
||||
// 如果之前启用了子输入框,先移除监听
|
||||
if (this.$root.subInputEvent)
|
||||
document.removeEventListener(...this.$root.subInputEvent);
|
||||
document.addEventListener("keydown", this.keyHandler, true);
|
||||
},
|
||||
},
|
||||
};
|
||||
|
Loading…
x
Reference in New Issue
Block a user