fix:修改测试出的问题
This commit is contained in:
@ -49,9 +49,19 @@ export default {
|
||||
|
||||
},
|
||||
mounted() {
|
||||
window.addEventListener("keydown", this.handlekeydown)
|
||||
// 仅注册总线,键盘监听放在 activated
|
||||
EventBus.on('SetMenubutton', this.setbutton);
|
||||
},
|
||||
activated() {
|
||||
window.addEventListener("keydown", this.handlekeydown);
|
||||
},
|
||||
deactivated() {
|
||||
window.removeEventListener("keydown", this.handlekeydown);
|
||||
},
|
||||
beforeUnmount() {
|
||||
window.removeEventListener("keydown", this.handlekeydown);
|
||||
EventBus.off && EventBus.off('SetMenubutton', this.setbutton);
|
||||
},
|
||||
methods: {
|
||||
setbutton(command) {
|
||||
if (command.name == "DC") {
|
||||
@ -66,6 +76,15 @@ export default {
|
||||
showbox() {
|
||||
EventBus.emit('showbox', "hello", "提示11")
|
||||
},
|
||||
|
||||
quit() {
|
||||
EventBus.emit('triggerClearData');
|
||||
setTimeout(() => {
|
||||
EventBus.emit('changemainvue');
|
||||
}, 100);
|
||||
},
|
||||
|
||||
|
||||
changemainvue() {
|
||||
EventBus.emit('changemainvue');
|
||||
},
|
||||
@ -83,7 +102,20 @@ export default {
|
||||
// this.$emit("menubalclicked", command)
|
||||
},
|
||||
handlekeydown(event) {
|
||||
// console.log(event.key);
|
||||
const t = event.target || {};
|
||||
const tag = (t.tagName || '').toLowerCase();
|
||||
const isEditable = t.isContentEditable || tag === 'input' || tag === 'textarea' || tag === 'select';
|
||||
if (isEditable) return;
|
||||
|
||||
// 只处理来自 #app 内部的事件,忽略外部悬浮窗/插件
|
||||
const appRoot = document.getElementById('app');
|
||||
if (!appRoot || !appRoot.contains(event.target)) return;
|
||||
|
||||
// 不劫持系统复制快捷键 Ctrl+C
|
||||
if (event.ctrlKey && !event.shiftKey && (event.key === 'c' || event.key === 'C')) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (event.ctrlKey) {
|
||||
if (event.key == "n" || event.key == "N") {
|
||||
this.onmenuclick('Set', 'Workmode');
|
||||
@ -94,15 +126,16 @@ export default {
|
||||
if (event.key == "w" || event.key == "W") {
|
||||
this.onmenuclick('Set', 'Weavelenth');
|
||||
}
|
||||
if (event.key == "c" || event.key == "C") {
|
||||
// 与采集页保持一致:定标改为 Ctrl + Shift + C
|
||||
if (event.shiftKey && (event.key == "c" || event.key == "C")) {
|
||||
this.onmenuclick('Set', 'Calibrate');
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
},
|
||||
|
||||
openFolder() {
|
||||
// 打开:先清理再打开
|
||||
EventBus.emit('triggerClearData');
|
||||
EventBus.emit('triggerOpenFolder');
|
||||
},
|
||||
|
||||
@ -130,27 +163,27 @@ export default {
|
||||
|
||||
<BNavbarNav>
|
||||
<BNavItemDropdown text="文件" right>
|
||||
<BDropdownItem href="#">新建</BDropdownItem>
|
||||
<!-- <BDropdownItem href="#">新建</BDropdownItem> -->
|
||||
<BDropdownItem href="#" @click="openFolder">打开</BDropdownItem>
|
||||
<BDropdownItem href="#" @click="saveFiles">保存</BDropdownItem>
|
||||
<BDropdownItem href="#">另存为</BDropdownItem>
|
||||
<!-- <BDropdownItem href="#">另存为</BDropdownItem> -->
|
||||
<BDropdownDivider></BDropdownDivider>
|
||||
<BDropdownItem href="#">退出</BDropdownItem>
|
||||
<BDropdownItem href="#" @click="onmenuclick('File', 'Advance')">高级</BDropdownItem>
|
||||
<BDropdownItem @click="onmenuclick('info', 'help')">帮助</BDropdownItem>
|
||||
<BDropdownItem href="#" @click="quit()">退出</BDropdownItem>
|
||||
<!-- <BDropdownItem href="#" @click="onmenuclick('File', 'Advance')">高级</BDropdownItem> -->
|
||||
<!-- <BDropdownItem @click="onmenuclick('info', 'help')">帮助</BDropdownItem> -->
|
||||
</BNavItemDropdown>
|
||||
|
||||
<!-- <!– Navbar dropdowns –>-->
|
||||
|
||||
|
||||
<BNavItemDropdown text="设置" right>
|
||||
<!-- <BDropdownItem @click="onmenuclick('Set','Workmode')">工作模式</BDropdownItem>
|
||||
<!-- <BNavItemDropdown text="设置" right> -->
|
||||
<!-- <BDropdownItem @click="onmenuclick('Set','Workmode')">工作模式</BDropdownItem>
|
||||
<BDropdownItem @click="onmenuclick('Set','DevInfo')">设备信息</BDropdownItem> -->
|
||||
<!-- <BDropdownItem @click="onmenuclick('Set','Weavelenth')">波长系数</BDropdownItem> -->
|
||||
<!-- <BDropdownItem @click="onmenuclick('Set','Weavelenthcoeff')">波长设定</BDropdownItem>
|
||||
<!-- <BDropdownItem @click="onmenuclick('Set','Weavelenth')">波长系数</BDropdownItem> -->
|
||||
<!-- <BDropdownItem @click="onmenuclick('Set','Weavelenthcoeff')">波长设定</BDropdownItem>
|
||||
<BDropdownItem @click="onmenuclick('Set','Calibrate')">定标</BDropdownItem>
|
||||
<BDropdownItem @click="onmenuclick('Set','CalibrateHH3')">HH3定标</BDropdownItem> -->
|
||||
</BNavItemDropdown>
|
||||
<!-- </BNavItemDropdown> -->
|
||||
|
||||
<BNavItemDropdown text="窗口" right>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user