From 8ed84706a09f013cbde8113918a513d1aa255758 Mon Sep 17 00:00:00 2001 From: junjun Date: Thu, 29 Sep 2022 14:50:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?refactor(=E8=A7=86=E5=9B=BE):=20=E8=BD=B4?= =?UTF-8?q?=E5=80=BC=E4=B8=AD=E5=88=BB=E5=BA=A6=E9=97=B4=E9=9A=94=E6=96=87?= =?UTF-8?q?=E6=A1=88=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/lang/en.js | 1 + frontend/src/lang/tw.js | 1 + frontend/src/lang/zh.js | 1 + .../views/chart/components/component-style/XAxisSelector.vue | 2 +- .../views/chart/components/component-style/YAxisExtSelector.vue | 2 +- .../views/chart/components/component-style/YAxisSelector.vue | 2 +- 6 files changed, 6 insertions(+), 3 deletions(-) diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 178a099f0f..11ef03843b 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -1249,6 +1249,7 @@ export default { liquid_shape_rect: 'Rect', dimension_or_quota: 'Dimension Or Quota', axis_value_split_count: 'Tick Count', + axis_value_split_space: 'Tick Interval', chart_waterfall: 'Waterfall', pie_inner_radius_percent: 'Inner Radius(%)', pie_outer_radius_size: 'Outer Radius', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 9e18c8acca..3798ba8d9f 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -1249,6 +1249,7 @@ export default { liquid_shape_rect: '矩形', dimension_or_quota: '維度或指標', axis_value_split_count: '刻度數', + axis_value_split_space: '刻度間距', chart_waterfall: '瀑佈圖', pie_inner_radius_percent: '內徑佔比', pie_outer_radius_size: '外徑大小', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index 425c1d028d..960f50fdd2 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -1248,6 +1248,7 @@ export default { liquid_shape_rect: '矩形', dimension_or_quota: '维度或指标', axis_value_split_count: '刻度数', + axis_value_split_space: '刻度间距', chart_waterfall: '瀑布图', pie_inner_radius_percent: '内径占比', pie_outer_radius_size: '外径大小', diff --git a/frontend/src/views/chart/components/component-style/XAxisSelector.vue b/frontend/src/views/chart/components/component-style/XAxisSelector.vue index 34994eca40..f0882b1544 100644 --- a/frontend/src/views/chart/components/component-style/XAxisSelector.vue +++ b/frontend/src/views/chart/components/component-style/XAxisSelector.vue @@ -51,7 +51,7 @@ - {{ $t('chart.axis_value_split_count') }} + {{ $t('chart.axis_value_split_space') }}
间隔表示两个刻度之间的单位长度。 diff --git a/frontend/src/views/chart/components/component-style/YAxisExtSelector.vue b/frontend/src/views/chart/components/component-style/YAxisExtSelector.vue index 6e28b3799c..a59d0f859c 100644 --- a/frontend/src/views/chart/components/component-style/YAxisExtSelector.vue +++ b/frontend/src/views/chart/components/component-style/YAxisExtSelector.vue @@ -51,7 +51,7 @@ - {{ $t('chart.axis_value_split_count') }} + {{ $t('chart.axis_value_split_space') }}
间隔表示两个刻度之间的单位长度。 diff --git a/frontend/src/views/chart/components/component-style/YAxisSelector.vue b/frontend/src/views/chart/components/component-style/YAxisSelector.vue index 92893357cd..834f6cef73 100644 --- a/frontend/src/views/chart/components/component-style/YAxisSelector.vue +++ b/frontend/src/views/chart/components/component-style/YAxisSelector.vue @@ -51,7 +51,7 @@ - {{ $t('chart.axis_value_split_count') }} + {{ $t('chart.axis_value_split_space') }}
间隔表示两个刻度之间的单位长度。 From 6ac864e17073f5e87acaf405b880ec431f4eaddc Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 29 Sep 2022 15:59:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E8=A7=86=E5=9B=BE=E6=97=A0=E6=B3=95=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E5=85=B3=E8=81=94=E6=95=B0=E6=8D=AE=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/service/chart/ViewPluginBaseServiceImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/chart/ViewPluginBaseServiceImpl.java b/backend/src/main/java/io/dataease/service/chart/ViewPluginBaseServiceImpl.java index a1160b5f42..5e992c7ee6 100644 --- a/backend/src/main/java/io/dataease/service/chart/ViewPluginBaseServiceImpl.java +++ b/backend/src/main/java/io/dataease/service/chart/ViewPluginBaseServiceImpl.java @@ -124,10 +124,9 @@ public class ViewPluginBaseServiceImpl implements ViewPluginBaseService { tableName = dataSetTableService.getCustomSQLDatasource(dataTableInfoDTO, list, ds); break; case UNION: - Datasource datasource = new Datasource(); - datasource.setType(pluginViewSet.getDsType()); + Datasource datasource = ((PluginViewSetImpl) pluginViewSet).getDs(); Map sqlMap = dataSetTableService.getUnionSQLDatasource(dataTableInfoDTO, datasource); - tableName = (String) sqlMap.get("sql"); + tableName = "(" + ((String) sqlMap.get("sql")) + ")"; break; default: tableName = dataTableInfoDTO.getTable();