Merge branch 'dev-3.7' of git.mesalab.cn:nezha/nezha-fronted into dev-3.8

This commit is contained in:
zyh
2023-09-21 14:50:36 +08:00
2 changed files with 28 additions and 22 deletions

View File

@@ -14340,7 +14340,7 @@
},
"node-sass": {
"version": "4.14.1",
"resolved": "https://registry.npmmirror.com/node-sass/-/node-sass-4.14.1.tgz",
"resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz",
"integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==",
"dev": true,
"requires": {
@@ -20727,7 +20727,7 @@
},
"webpack-bundle-analyzer": {
"version": "2.13.1",
"resolved": "https://registry.npmmirror.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.13.1.tgz",
"resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.13.1.tgz",
"integrity": "sha512-rwxyfecTAxoarCC9VlHlIpfQCmmJ/qWD5bpbjkof+7HrNhTNZIwZITxN6CdlYL2axGmwNUQ+tFgcSOiNXMf/sQ==",
"dev": true,
"requires": {

View File

@@ -325,28 +325,34 @@ export default {
}, 200)
},
keydown (event) {
// 监听按键按下事件
// 判断是否按下了shift键
if (event.shiftKey) {
// 如果按下了shift键则启用Echarts的dataZoom功能
getChart(this.chartId).setOption({
dataZoom: [{
disabled: false
}]
})
}
clearTimeout(this.timer1)
this.timer1 = setTimeout(() => {
// 监听按键按下事件
// 判断是否按下了shift键
if (event.shiftKey) {
// 如果按下了shift键则启用Echarts的dataZoom功能
getChart(this.chartId).setOption({
dataZoom: [{
disabled: false
}]
})
}
}, 50)
},
keyup (event) {
// 监听按键松开事件
// 判断是否释放了shift键
if (!event.shiftKey) {
// 如果释放了shift键则禁用Echarts的dataZoom功能
getChart(this.chartId).setOption({
dataZoom: [{
disabled: true
}]
})
}
clearTimeout(this.timer2)
this.timer2 = setTimeout(() => {
// 监听按键松开事件
// 判断是否释放了shift键
if (!event.shiftKey) {
// 如果释放了shift键则禁用Echarts的dataZoom功能
getChart(this.chartId).setOption({
dataZoom: [{
disabled: true
}]
})
}
}, 50)
},
xAxisLabelFormatter (minTime, maxTime) {
const self = this