diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9698d12d1..4f9d8cdbf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,8 +60,10 @@ dev_build: - zip -q -r $FILE_NAME ./* # 将 dist zip 上传到 minio + - md5sum $FILE_NAME > nz-gui-$CI_COMMIT_REF_NAME-latest.zip.md5sum.txt - mc cp $FILE_NAME nz/ci-cd/nz-gui/$FILE_NAME - mc cp $FILE_NAME nz/ci-cd/nz-gui/nz-gui-$CI_COMMIT_REF_NAME-latest.zip + - mc cp nz-gui-$CI_COMMIT_REF_NAME-latest.zip.md5sum.txt nz/ci-cd/nz-gui/nz-gui-$CI_COMMIT_REF_NAME-latest.zip.md5sum.txt artifacts: name: "nz-gui-$CI_COMMIT_REF_NAME-$CI_COMMIT_SHORT_SHA" when: on_success diff --git a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue index 8d8f5c832..f6e4c950b 100644 --- a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue +++ b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue @@ -535,7 +535,6 @@ export default { } else if (item.yAxisIndex == 1) { className = 'yAxis-icon nz-icon nz-icon-youzongzhou' } - str += `
@@ -572,7 +571,6 @@ export default { } color = self.stackTotalColorRight } - str += `
diff --git a/nezha-fronted/src/components/chart/chart/legend.vue b/nezha-fronted/src/components/chart/chart/legend.vue index be0bb04f9..028f35d23 100644 --- a/nezha-fronted/src/components/chart/chart/legend.vue +++ b/nezha-fronted/src/components/chart/chart/legend.vue @@ -40,7 +40,7 @@ {{item.alias ? item.alias : item.name}}
-
{{(keepTwoDecimalFull(statistics.value))}}
+
{{(keepTwoDecimalFull(statistics.value, 'right'))}}
@@ -243,12 +243,16 @@ export default { this.$emit('clickLegendD3', this.isGrey) }, // 四舍五入保留2位小数(不够位数,则用0替补) - keepTwoDecimalFull (num) { + keepTwoDecimalFull (num, type = 'left') { + let chartUnit = this.chartInfo.unit + if (type === 'right') { + chartUnit = this.chartInfo.param.rightYAxis.unit + } let result = parseFloat(num) if (isNaN(result)) { return '--' } - result = chartDataFormat.getUnit(this.chartInfo.unit ? this.chartInfo.unit : 2).compute(result, null, -1, 2) + result = chartDataFormat.getUnit(chartUnit || 2).compute(result, null, -1, 2) return result }, getMaxValue (dataArg, chartInfo) { diff --git a/nezha-fronted/src/components/chart/chartMixin.js b/nezha-fronted/src/components/chart/chartMixin.js index e63252db9..daa4999ef 100644 --- a/nezha-fronted/src/components/chart/chartMixin.js +++ b/nezha-fronted/src/components/chart/chartMixin.js @@ -117,9 +117,8 @@ export default { if (!this.dataLink.length) { s.cursor = 'default' } - - if (s.param && s.param.nullType) { - s.connectNulls = s.param.nullType !== 'null' + if (chartInfo.param && chartInfo.param.nullType) { + s.connectNulls = chartInfo.param.nullType !== 'null' } else { s.connectNulls = false } 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 6546c6d4f..0fd7301ce 100644 --- a/nezha-fronted/src/components/common/detailView/list/terminalLogDetail/terminalLogDetail.vue +++ b/nezha-fronted/src/components/common/detailView/list/terminalLogDetail/terminalLogDetail.vue @@ -27,8 +27,8 @@ @mouseenter="labelHover(item, 'other', true, false, $event)" @mouseleave="labelHover(item, 'other', false, false,)" > -
-
+
+
{{$t(getStatusText(item.status))}} diff --git a/nezha-fronted/src/components/common/js/tools.js b/nezha-fronted/src/components/common/js/tools.js index 8813150ff..a5e081bea 100644 --- a/nezha-fronted/src/components/common/js/tools.js +++ b/nezha-fronted/src/components/common/js/tools.js @@ -1061,6 +1061,9 @@ export function hideTableTooltip () { /* 数字转换保留小数,数字很小时转为科学计数法, dot为保留几位小数 */ export function formatScientificNotation (value, dot = 2) { + if (isNaN(value) || value === null) { + return value + } let val = value ? parseFloat(Number(value).toFixed(dot)) : 0 if (val === 0) { val = Number(value).toPrecision(dot + 1) diff --git a/nezha-fronted/src/components/common/table/settings/ipDetailsTable.vue b/nezha-fronted/src/components/common/table/settings/ipDetailsTable.vue index fedc632a1..a91452059 100644 --- a/nezha-fronted/src/components/common/table/settings/ipDetailsTable.vue +++ b/nezha-fronted/src/components/common/table/settings/ipDetailsTable.vue @@ -42,7 +42,7 @@
- {{ $t('overall.ipam.available') }} + {{ $t('overall.ipam.transient') }}
diff --git a/nezha-fronted/src/components/common/timePicker.vue b/nezha-fronted/src/components/common/timePicker.vue index 347dd4575..4b83253d0 100644 --- a/nezha-fronted/src/components/common/timePicker.vue +++ b/nezha-fronted/src/components/common/timePicker.vue @@ -564,6 +564,9 @@ export default { this.$set(this.searchTime, 2, val + 'd') } else { this.isCustom = true + if (!time[0]) { + this.isCustom = false + } this.$set(this.searchTime, 0, time[0]) this.$set(this.searchTime, 1, time[1]) }