center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge branch 'dev' of github.com:dataease/dataease into dev

Browse Source
This commit is contained in:
taojinlong 2022-09-29 16:44:06 +08:00
commit dda88f9312
7 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/src/main/java/io/dataease/service/chart/ViewPluginBaseServiceImpl.java
View File

@ -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<String, Object> sqlMap = dataSetTableService.getUnionSQLDatasource(dataTableInfoDTO, datasource);
tableName = (String) sqlMap.get("sql");
tableName = "(" + ((String) sqlMap.get("sql")) + ")";
break;
default:
tableName = dataTableInfoDTO.getTable();

1
frontend/src/lang/en.js
View File

@ -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',

1
frontend/src/lang/tw.js
View File

@ -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: '外徑大小',

1
frontend/src/lang/zh.js
View File

@ -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: '外径大小',

2
frontend/src/views/chart/components/component-style/XAxisSelector.vue
View File

@ -51,7 +51,7 @@
<el-form-item :label="$t('chart.axis_value_split')" class="form-item">
<span slot="label">
<span class="span-box">
<span>{{ $t('chart.axis_value_split_count') }}</span>
<span>{{ $t('chart.axis_value_split_space') }}</span>
<el-tooltip class="item" effect="dark" placement="bottom">
<div slot="content">
间隔表示两个刻度之间的单位长度。

2
frontend/src/views/chart/components/component-style/YAxisExtSelector.vue
View File

@ -51,7 +51,7 @@
<el-form-item :label="$t('chart.axis_value_split')" class="form-item">
<span slot="label">
<span class="span-box">
<span>{{ $t('chart.axis_value_split_count') }}</span>
<span>{{ $t('chart.axis_value_split_space') }}</span>
<el-tooltip class="item" effect="dark" placement="bottom">
<div slot="content">
间隔表示两个刻度之间的单位长度。

2
frontend/src/views/chart/components/component-style/YAxisSelector.vue
View File

@ -51,7 +51,7 @@
<el-form-item :label="$t('chart.axis_value_split')" class="form-item">
<span slot="label">
<span class="span-box">
<span>{{ $t('chart.axis_value_split_count') }}</span>
<span>{{ $t('chart.axis_value_split_space') }}</span>
<el-tooltip class="item" effect="dark" placement="bottom">
<div slot="content">
间隔表示两个刻度之间的单位长度。