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(); diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 7188f098f6..c3c2c32097 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 83bc402e2f..3171a10bec 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 c68d420719..143435d13a 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') }}
间隔表示两个刻度之间的单位长度。