From 809987a63ced6f35a7d37623af33bdba31ca6c93 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 08 十月 2022 15:24:03 +0800
Subject: [PATCH] 2022-10-08
---
src/tabviews/commontable/index.jsx | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/src/tabviews/commontable/index.jsx b/src/tabviews/commontable/index.jsx
index e9d8ba6..940775d 100644
--- a/src/tabviews/commontable/index.jsx
+++ b/src/tabviews/commontable/index.jsx
@@ -69,7 +69,8 @@
absFields: [], // 缁濆鍊煎瓧娈�
loadCustomApi: true, // 鍔犺浇澶栭儴璧勬簮
hasReqFields: false,
- autoMatic: null
+ autoMatic: null,
+ visible: false
}
/**
@@ -432,7 +433,7 @@
chartId,
config,
statFields,
- shortcuts,
+ shortcuts: shortcuts.length > 0 ? shortcuts : null,
setting: config.setting,
searchlist: config.search,
actions: _actions,
@@ -463,11 +464,6 @@
setShortcut = () => {
const { shortcuts } = this.state
- if (!shortcuts || shortcuts.length === 0) {
- document.onkeydown = () => {}
- return
- }
-
document.onkeydown = (event) => {
let e = event || window.event
let keyCode = e.keyCode || e.which || e.charCode
@@ -484,6 +480,16 @@
if (!preKey || !keyCode) return
let _shortcut = `${preKey}+${keyCode}`
+
+ if (window.GLOB.breakpoint && _shortcut === 'ctrl+67') {
+ window.debugger = false
+ window.GLOB.breakpoint = false
+ sessionStorage.removeItem('breakpoint')
+
+ MKEmitter.emit('debugChange')
+ }
+
+ if (!shortcuts) return
shortcuts.some(item => {
if (item.$shortcut === _shortcut) {
@@ -1090,6 +1096,10 @@
}
}
+ debugChange = () => {
+ this.setState({visible: !this.state.visible})
+ }
+
UNSAFE_componentWillMount () {
// 缁勪欢鍔犺浇鏃讹紝鑾峰彇鑿滃崟鏁版嵁
this.loadconfig()
@@ -1101,6 +1111,7 @@
componentDidMount () {
MKEmitter.addListener('reloadData', this.reloadData)
+ MKEmitter.addListener('debugChange', this.debugChange)
MKEmitter.addListener('reloadMenuView', this.reloadMenuView)
MKEmitter.addListener('changeTableLine', this.changeTableLine)
MKEmitter.addListener('resetActiveMenu', this.resetActiveMenu)
@@ -1117,6 +1128,7 @@
}
document.onkeydown = () => {}
MKEmitter.removeListener('reloadData', this.reloadData)
+ MKEmitter.removeListener('debugChange', this.debugChange)
MKEmitter.removeListener('reloadMenuView', this.reloadMenuView)
MKEmitter.removeListener('changeTableLine', this.changeTableLine)
MKEmitter.removeListener('resetActiveMenu', this.resetActiveMenu)
@@ -1276,7 +1288,7 @@
{setting && window.GLOB.breakpoint ? <DebugTable /> : null}
{!window.GLOB.mkHS && autoMatic ? <AutoMatic autoMatic={autoMatic} config={config} /> : null}
{!window.GLOB.mkHS && window.GLOB.systemType !== 'production' ? <PagemsgComponent menu={{MenuName: this.props.MenuName, MenuNo: this.props.MenuNo}} config={config} dict={this.state.dict} /> : null}
- {!window.GLOB.mkHS && shortcuts ? <SettingComponent config={config} dict={this.state.dict} shortcuts={shortcuts}/> : null}
+ {!window.GLOB.mkHS && setting ? <SettingComponent config={config} dict={this.state.dict} shortcuts={shortcuts || []}/> : null}
{viewlost ? <NotFount msg={this.state.lostmsg} /> : null}
</div>
)
--
Gitblit v1.8.0