diff --git a/nezha-fronted/package-lock.json b/nezha-fronted/package-lock.json index 120aec352..d277ba116 100644 --- a/nezha-fronted/package-lock.json +++ b/nezha-fronted/package-lock.json @@ -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": { diff --git a/nezha-fronted/src/assets/css/components/chart/chart.scss b/nezha-fronted/src/assets/css/components/chart/chart.scss index 0a1564981..e3094f8fd 100644 --- a/nezha-fronted/src/assets/css/components/chart/chart.scss +++ b/nezha-fronted/src/assets/css/components/chart/chart.scss @@ -412,6 +412,9 @@ .nz-icon{ color: $--background-color-1 !important; } + .nz-icon-override{ + color: $--color-text-regular !important; + } } } .nz-icon-override{ @@ -419,6 +422,7 @@ font-size: 15px; margin-left: 5px; vertical-align: middle; + color: $--color-text-regular !important; } .legend-item:hover { background-color: $--background-color-1; diff --git a/nezha-fronted/src/assets/css/components/common/bottomBox/dashboardTab.scss b/nezha-fronted/src/assets/css/components/common/bottomBox/dashboardTab.scss index 8e98db7fe..fb50e2eb3 100644 --- a/nezha-fronted/src/assets/css/components/common/bottomBox/dashboardTab.scss +++ b/nezha-fronted/src/assets/css/components/common/bottomBox/dashboardTab.scss @@ -229,7 +229,7 @@ color: #F0BF84; } } -.dashboard-tab-temp { +.dashboard-tab-template { .el-tabs__item{ width: 175px !important; } diff --git a/nezha-fronted/src/assets/css/components/common/rightBox/alertSilenceBox.scss b/nezha-fronted/src/assets/css/components/common/rightBox/alertSilenceBox.scss index d6fd145db..94127f8fd 100644 --- a/nezha-fronted/src/assets/css/components/common/rightBox/alertSilenceBox.scss +++ b/nezha-fronted/src/assets/css/components/common/rightBox/alertSilenceBox.scss @@ -48,7 +48,7 @@ left: 0; } .el-form-item__error{ - left: 126px; + left: 0px; padding-top: 5px; } .matchers-type{ diff --git a/nezha-fronted/src/components/chart/chart.vue b/nezha-fronted/src/components/chart/chart.vue index 20a22f901..8d7bd52cf 100644 --- a/nezha-fronted/src/components/chart/chart.vue +++ b/nezha-fronted/src/components/chart/chart.vue @@ -190,6 +190,7 @@ :panelLock="panelLock" :chart-data="chartData" :chart-info="chartInfo" + :showTool="showTool" :is-fullscreen="isFullscreen" @chartIsNoData="chartIsNoData" :chart-option="chartOption" @@ -345,6 +346,10 @@ export default { type: Boolean, default: false }, + showTool: { + type: Boolean, + default: true + }, globalVariables: {} }, data () { diff --git a/nezha-fronted/src/components/chart/chart/chartGroup.vue b/nezha-fronted/src/components/chart/chart/chartGroup.vue index ae522151e..f48ab278b 100644 --- a/nezha-fronted/src/components/chart/chart/chartGroup.vue +++ b/nezha-fronted/src/components/chart/chart/chartGroup.vue @@ -12,6 +12,7 @@ :from="from" :panel-lock="panelLock" :isGroup="true" + :showTool="showTool" :time-range="searchTime" :groupInfo="chartInfo" @on-refresh-time="refreshTime" @@ -29,7 +30,11 @@ export default { props: { panelLock: Boolean, from: String, - filter: {} + filter: {}, + showTool: { + type: Boolean, + default: true + } }, mixins: [chartMixin, chartFormat], computed: { diff --git a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue index c58148b39..435d443a2 100644 --- a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue +++ b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue @@ -261,9 +261,31 @@ export default { } myChart.on('mouseover', (params) => { + if (this.chartInfo.type !== 'point') { + if (this.tooltip.activeIndex != params.seriesIndex) { + const option = myChart.getOption() + option.series[params.seriesIndex].symbol = 'circle' + option.series[params.seriesIndex].emphasis.itemStyle = { + opacity: 1, + borderColor: this.hexToRgb(params.color, 0.4), + borderWidth: 6 + } + myChart.setOption(option, true) + } + } this.tooltip.activeIndex = params.seriesIndex }) - myChart.on('mouseout', () => { + myChart.on('mouseout', (params) => { + if (this.chartInfo.type !== 'point') { + const option = myChart.getOption() + option.series.forEach(item => { + item.symbol = 'emptyCircle' + item.emphasis.itemStyle = { + opacity: 1 + } + }) + myChart.setOption(option, true) + } this.tooltip.activeIndex = undefined }) @@ -484,7 +506,7 @@ export default { // 鼠标悬浮 series data symbol 时,tooltip 中相应的legend 高亮显示 str += ` -
+
${seriesName} diff --git a/nezha-fronted/src/components/chart/chart/legend.vue b/nezha-fronted/src/components/chart/chart/legend.vue index e7f6f7593..0c9ffcea4 100644 --- a/nezha-fronted/src/components/chart/chart/legend.vue +++ b/nezha-fronted/src/components/chart/chart/legend.vue @@ -272,10 +272,12 @@ export default { this.$emit('clickLegendD3', this.isGrey) }, hoverLegend (legendName, index, type) { + // legend 已经取消显示,鼠标悬浮,不开启 高亮效果 + if (this.isGrey[index]) { + return false + } if (this.chartInfo.type === 'pie' || this.chartInfo.type === 'doughnut' || this.chartInfo.type === 'rose') { - if (!this.isGrey[index]) { - this.$emit('hoverLegendD3', legendName, index, type) - } + this.$emit('hoverLegendD3', legendName, index, type) } else if (this.isTimeSeries) { getChart(this.chartId) && getChart(this.chartId).dispatchAction({ type: type, diff --git a/nezha-fronted/src/components/chart/chart/options/chartTimeSeries.js b/nezha-fronted/src/components/chart/chart/options/chartTimeSeries.js index dfbed0bc4..13eb34bbf 100644 --- a/nezha-fronted/src/components/chart/chart/options/chartTimeSeries.js +++ b/nezha-fronted/src/components/chart/chart/options/chartTimeSeries.js @@ -152,16 +152,27 @@ export const chartTimeSeriesLineOption = { type: 'line', symbol: 'emptyCircle', // 去掉点 connectNulls: true, - symbolSize: [2, 2], + symbolSize: [6, 6], smooth: 0.2, // 曲线变平滑 - showSymbol: false, + // showSymbol: false, + itemStyle: { + opacity: 0 + }, data: [], lineStyle: { width: 1, opacity: 0.9 }, emphasis: { - focus: 'series' + focus: 'series', + itemStyle: { + opacity: 1 + } + }, + blur: { + lineStyle: { + opacity: 0.3 + } } }], useUTC: false // 使用本地时间 diff --git a/nezha-fronted/src/components/chart/panelChart.vue b/nezha-fronted/src/components/chart/panelChart.vue index 9146d1254..429ee98cc 100644 --- a/nezha-fronted/src/components/chart/panelChart.vue +++ b/nezha-fronted/src/components/chart/panelChart.vue @@ -52,6 +52,7 @@ :isExportHtml="isExportHtml" :filter="filter" :from="from" + :showTool="showTool" @refreshLogs="refreshLogs" :show-header="showHeader" :isError="isError" diff --git a/nezha-fronted/src/components/common/alert/alertLabel.vue b/nezha-fronted/src/components/common/alert/alertLabel.vue index e675f0b5c..9919ff893 100644 --- a/nezha-fronted/src/components/common/alert/alertLabel.vue +++ b/nezha-fronted/src/components/common/alert/alertLabel.vue @@ -645,17 +645,19 @@ {{ alertLabelData && alertLabelData.id ? alertLabelData.id : "--" }}
-
+
{{$t('overall.name')}}
-
+
{{ alertLabelData && alertLabelData.name ? alertLabelData.name : "--" }}
+
-
+
{{ $t("profile.username") }}
-
+
{{ alertLabelData && alertLabelData.username ? alertLabelData.username : "--" }}
+
{{ $t("profile.role") }}
diff --git a/nezha-fronted/src/components/common/alert/terminalLogInfo.vue b/nezha-fronted/src/components/common/alert/terminalLogInfo.vue index 281cd9d95..c4e9bb16f 100644 --- a/nezha-fronted/src/components/common/alert/terminalLogInfo.vue +++ b/nezha-fronted/src/components/common/alert/terminalLogInfo.vue @@ -6,7 +6,7 @@ ref="alertLabels" >
- +
{{getRemoteText(alertLabelData)}}
@@ -33,11 +33,10 @@ {{ alertLabelData && alertLabelData.username ? alertLabelData.username: "--" }}
-
+
{{$t('ping.sourceIp')}}
-
- {{ alertLabelData && alertLabelData.remoteAddr ? alertLabelData.remoteAddr: "--" }} -
+
{{alertLabelData && alertLabelData.remoteAddr ? alertLabelData.remoteAddr : '--'}}
+
{{$t('config.terminallog.loginUser')}}
@@ -51,11 +50,10 @@ {{ alertLabelData && alertLabelData.host ? alertLabelData.host: "--" }}
-
+
{{$t('config.terminallog.remote')}}
-
- {{getRemoteText(alertLabelData)}} -
+
{{getRemoteText(alertLabelData)}}
+
{{$t('webshell.protocol')}}
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue index 28c7d3ff3..1e1c11580 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue @@ -402,7 +402,7 @@ export default { // } else { // url = this.url // } - url = this.urlNew + url = this.url this.$delete(url + '?ids=' + row.id + '&state=' + row.state).then(response => { if (response.code === 200) { self.delFlag = true @@ -604,7 +604,7 @@ export default { this.alertSilenceUrl = `/alert/silence/${this.obj.id}/rel` url = this.alertSilenceUrl } else { - url = this.urlNew + url = this.url } this.$put(url, this.deleteBox).then(res => { if (res.code === 200) { diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue index 7f8f935d0..333328157 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/dashboardTab.vue @@ -9,7 +9,7 @@ :targetTab="targetTab" @changeTab="changeTab" class="full-width-height" - :customClassName="'dashboard-tab-temp'" + :customClassName="paramsType === 'template' ? 'dashboard-tab-temp dashboard-tab-template' : 'dashboard-tab-temp'" :showPagination="false" > diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue index 8cdec9f66..8136b9d69 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue @@ -39,18 +39,23 @@
- + -
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/recordRulesQuery.vue b/nezha-fronted/src/components/common/bottomBox/tabs/recordRulesQuery.vue index 56764a619..d4549a10f 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/recordRulesQuery.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/recordRulesQuery.vue @@ -36,18 +36,23 @@
- + -
diff --git a/nezha-fronted/src/components/common/detailView/list/terminalLogDetail/terminalLogDetail.vue b/nezha-fronted/src/components/common/detailView/list/terminalLogDetail/terminalLogDetail.vue index 0fd7301ce..2145770d9 100644 --- a/nezha-fronted/src/components/common/detailView/list/terminalLogDetail/terminalLogDetail.vue +++ b/nezha-fronted/src/components/common/detailView/list/terminalLogDetail/terminalLogDetail.vue @@ -49,6 +49,7 @@ :that="alertLabelObj" :detailList="true" :type="alertLabelType" + :width="305" @tipHover='tipHover' ref="nzTooltip" class="data-column__" diff --git a/nezha-fronted/src/components/common/detailView/list/userDetail/userDetail.vue b/nezha-fronted/src/components/common/detailView/list/userDetail/userDetail.vue index a33281d26..3f6676b87 100644 --- a/nezha-fronted/src/components/common/detailView/list/userDetail/userDetail.vue +++ b/nezha-fronted/src/components/common/detailView/list/userDetail/userDetail.vue @@ -50,6 +50,7 @@ :id="alertLabelId" :that="alertLabelObj" :type="alertLabelType" + @tipHover='tipHover' :detail-list="true" >
diff --git a/nezha-fronted/src/components/common/rightBox/administration/modelBox.vue b/nezha-fronted/src/components/common/rightBox/administration/modelBox.vue index 812d367dc..9db660cb3 100644 --- a/nezha-fronted/src/components/common/rightBox/administration/modelBox.vue +++ b/nezha-fronted/src/components/common/rightBox/administration/modelBox.vue @@ -15,7 +15,7 @@ - + diff --git a/nezha-fronted/src/components/common/rightBox/ipamBox.vue b/nezha-fronted/src/components/common/rightBox/ipamBox.vue index c9a826386..03eee84ec 100644 --- a/nezha-fronted/src/components/common/rightBox/ipamBox.vue +++ b/nezha-fronted/src/components/common/rightBox/ipamBox.vue @@ -31,13 +31,14 @@
CIDR
- + @@ -91,9 +92,10 @@