diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index c9bdf9d60..bb3af7a50 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -848,6 +848,14 @@ li{ .nz-table + .to-top-is-hover{ display: none; } +revogr-header .data-header-cell .resizable:hover { + background-color: #ccc !important; + width: 6px; +} +revo-grid[theme=compact] revogr-viewport revogr-header .data-header-cell { + border-right: 1px solid #eee; +} + .nz-table + .to-top-is-hover:hover{ display: block; } @@ -925,6 +933,33 @@ li{ padding:2px 5px; border-radius: 4px; } +.data-cell { + font-size: 12px; +} +.data-cell .danger { + background-color: $danger-color; + color: white; + padding:2px 5px; + border-radius: 4px; +} +.data-cell .success { + background-color: $success-color; + color: white; + padding:2px 5px; + border-radius: 4px; +} +.data-cell .suspended { + background-color: $suspended-color; + color: white; + padding:2px 5px; + border-radius: 4px; +} +.data-cell .warning { + background-color: $warning-color; + color: white; + padding:2px 5px; + border-radius: 4px; +} .nz-table th { padding: 0; } diff --git a/nezha-fronted/src/components/charts/line-chart-block.vue b/nezha-fronted/src/components/charts/line-chart-block.vue index a74b7195d..e6f805f35 100644 --- a/nezha-fronted/src/components/charts/line-chart-block.vue +++ b/nezha-fronted/src/components/charts/line-chart-block.vue @@ -320,39 +320,48 @@ mouseEnterChart(){ this.caretShow=true; if (getChart(this.chartIndex)) { - getChart(this.chartIndex).setOption({ - toolbox: { - show:true, - } - }) + setTimeout(() => { + getChart(this.chartIndex).setOption({ + toolbox: { + show:true, + } + }) + }, 300); + } }, mouseLeaveChart(){ this.caretShow=false; if (getChart(this.chartIndex)) { - getChart(this.chartIndex).setOption({ - toolbox: { - show:false, - } - }) + setTimeout(() => { + getChart(this.chartIndex).setOption({ + toolbox: { + show: false, + } + }) + }, 300); } }, mouseEnterFullChart(){ if (this.echartModalStore) { - this.echartModalStore.setOption({ - toolbox: { - show:true, - } - }) + setTimeout(() => { + this.echartModalStore.setOption({ + toolbox: { + show:true, + } + }) + }, 300); } }, mouseLeaveFullChart(){ if (this.echartModalStore) { - this.echartModalStore.setOption({ - toolbox: { - show:false, - } - }) + setTimeout(() => { + this.echartModalStore.setOption({ + toolbox: { + show: false, + } + }) + }, 300); } }, clickLegend(legendName, index){ @@ -1432,6 +1441,7 @@ const filterItem = ele; let query = encodeURIComponent(filterItem.expression); if(this.chartInfo.type==='line'||this.chartInfo.type==='bar'||this.chartInfo.type==='stackArea'){//如果是这三个 默认给connected + !this.chartInfo.param && (this.chartInfo.param = {}); this.chartInfo.param.nullType=this.chartInfo.param.nullType||'connected'; query+='&nullType='+this.chartInfo.param.nullType; }