From 736411a6e762c74050dbac7e5a39d63d22c506d1 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Mon, 1 Nov 2021 16:36:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?refactor:=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/lang/zh.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 7c134219ab..4c2207422d 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -1253,7 +1253,7 @@ export default { export_to_pdf: '导出为PDF', preview: '预览', fullscreen_preview: '全屏预览', - ta: '新Tab页预览', + new_tab_preview: '新Tab页预览', select_panel_from_left: '请从左侧选择仪表板', template_nale: '模板名称', template: '模板', From 83d6a83a6b5feed1b893430c7469d58cddb6e08d Mon Sep 17 00:00:00 2001 From: junjie Date: Mon, 1 Nov 2021 16:38:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:=E7=80=91=E5=B8=83=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/chart/waterfall/waterfall.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/frontend/src/views/chart/chart/waterfall/waterfall.js b/frontend/src/views/chart/chart/waterfall/waterfall.js index a234fac2f5..4432fe6c7a 100644 --- a/frontend/src/views/chart/chart/waterfall/waterfall.js +++ b/frontend/src/views/chart/chart/waterfall/waterfall.js @@ -20,10 +20,12 @@ export function baseWaterfallOptionAntV(plot, container, chart, action) { const xAxis = getXAxis(chart) const yAxis = getYAxis(chart) // fix yAxis - yAxis.min = yAxis.minLimit - yAxis.max = yAxis.maxLimit - delete yAxis.minLimit - delete yAxis.maxLimit + if (yAxis) { + yAxis.min = yAxis.minLimit + yAxis.max = yAxis.maxLimit + delete yAxis.minLimit + delete yAxis.maxLimit + } // data const data = chart.data.datas // total