gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NEZ-1999 fix : metric 二级下拉列表 一级菜单未正确合并

Browse Source
This commit is contained in:
likexuan
2022-07-04 14:46:10 +08:00
parent c9c1ccced2
commit 2a21578480
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nezha-fronted/src/assets/css/components/page/config/backups.scss
View File

@@ -129,7 +129,7 @@
display: flex;
justify-content: center;
align-items: center;
width: 90px;
width: calc(100% / 7.1) !important;
height: 34px;
border: 1px solid $--border-color-light;
margin-right: -1px;
@@ -164,7 +164,7 @@
display: flex;
justify-content: center;
align-items: center;
width: 90px;
width: calc(100% / 7.1) !important;
height: 35px;
border: 1px solid $--border-color-light;
margin-right: -1px;

4
nezha-fronted/src/assets/css/components/page/dashboard/explore/promqlInput.scss
View File

@@ -57,7 +57,7 @@
margin-left: 1px;
}
.el-cascader-menu {
width: 200px;
width: 300px;
height: 100%;
}
.metric-btn:hover, .metric-btn:focus {
@@ -66,7 +66,7 @@
}
.metric-selector .el-cascader-panel {
height: 300px;
height: 500px;
position: absolute;
z-index: 2100;
background-color: $--background-color-empty;

2
nezha-fronted/src/components/common/mixin/promqlInput.js
View File

@@ -15,7 +15,7 @@ export default {
const metricMap = new Map()
metrics.forEach((item) => {
let key = ''
if (/^[a-zA-Z]+?_[a-zA-Z]*/.test(item)) {
if (/^[a-zA-Z0-9]+?_[a-zA-Z0-9]*/.test(item)) {
key = item.split('_')[0]
} else if (/^_\w*/.test(item)) {
key = ' '

4
nezha-fronted/src/components/page/dashboard/explore/promqlInput.vue
View File

@@ -114,8 +114,8 @@
class="top-tool-btn"
@click="enableExpression"
>
<i v-if="state" class="nz-icon nz-icon-mimakejian"></i>
<i v-else class="nz-icon nz-icon-mimabukejian" style="fontSize:16px"></i>
<i v-if="state" class="nz-icon nz-icon-mimakejian" :title="$t('overall.visible')"></i>
<i v-else class="nz-icon nz-icon-mimabukejian" style="fontSize:16px" :title="$t('overall.invisible')"></i>
</button>
<button
v-if="plugins.indexOf('add') > -1"