diff --git a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue index 6badbdb4d..eb07a7a81 100644 --- a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue +++ b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue @@ -3,6 +3,7 @@ :class="legendPlacement" class="nz-chart__component nz-chart__component--time-series" @mouseenter="mouseEnterChart" @mouseleave="mouseLeaveChart" + v-my-loading="chartLoading" >
@@ -52,7 +53,8 @@ export default { stackTotalColor: null, stackTotalColorRight: null, isStack: false, - hasRightYAxis: false + hasRightYAxis: false, + chartLoading: false } }, computed: { @@ -197,6 +199,7 @@ export default { } }) } + this.chartLoading = false this.isInit = false }, 200) }, diff --git a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js index 216d04186..ccc16176c 100644 --- a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js +++ b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js @@ -218,19 +218,18 @@ export default { this.timer3 = null } this.position.show = false - console.log(pen) if (!pen.type && pen.data.enable.tooltip) { if (!pen.data.tooltip.legends.length) { return } let positionShow = false - pen.data.tooltip.legends.forEach(item=>{ + pen.data.tooltip.legends.forEach(item => { if (item.legend) { positionShow = true } }) if (!positionShow) { - return; + return } this.chartParams = { ...pen.data.tooltip, @@ -259,6 +258,7 @@ export default { boxHeight = null }) this.position.show = true + // this.$refs.meta2dTooltip.$refs.panelChart && (this.$refs.meta2dTooltip.$refs.panelChart.loading = false) clearTimeout(this.timer3) }, 100) } diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue index 4d2c2df17..7bc1a424f 100644 --- a/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue +++ b/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue @@ -202,7 +202,7 @@ @blur="inputBlur" :step="1" :min="0" - :precision="0" + :precision="1" controls-position="right" size="small" name="globalAlpha" diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue index 33de63a95..99d88c721 100644 --- a/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue +++ b/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue @@ -36,6 +36,7 @@ }" >
diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dTooltip.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dTooltip.vue index f9e27eec9..9ac632251 100644 --- a/nezha-fronted/src/components/common/project/meta2d/meta2dTooltip.vue +++ b/nezha-fronted/src/components/common/project/meta2d/meta2dTooltip.vue @@ -85,6 +85,7 @@ export default { this.$refs.panelChart.chartData = chartData this.$refs.panelChart.loading = false this.$nextTick(() => { + this.$refs.panelChart.$refs.chart.$refs['chart' + this.chartInfo.id].chartLoading = true this.$refs.panelChart.$refs.chart.$refs['chart' + this.chartInfo.id].initChart() this.$refs.panelChart.$refs.chart.$refs['chart' + this.chartInfo.id].resize() })