diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTableMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTableMapper.java index 5b942d801d..5261a66430 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTableMapper.java +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTableMapper.java @@ -7,4 +7,6 @@ import java.util.List; public interface ExtDataSetTableMapper { List search(DataSetTableRequest request); + + DataSetTableDTO searchOne(DataSetTableRequest request); } diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTableMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTableMapper.xml index 1f1d6ad214..cf157449e8 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTableMapper.xml +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTableMapper.xml @@ -7,6 +7,33 @@ + diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java index 3fe41d449a..0f51a4ccc3 100644 --- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java +++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java @@ -54,6 +54,11 @@ public class DataSetTableController { return dataSetTableService.get(id); } + @PostMapping("getWithPermission/{id}") + public DataSetTableDTO getWithPermission(@PathVariable String id) { + return dataSetTableService.getWithPermission(id); + } + @PostMapping("getFields") public List getFields(@RequestBody DataSetTableRequest dataSetTableRequest) throws Exception { return dataSetTableService.getFields(dataSetTableRequest); diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java index 2365207c18..b2720f0451 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -215,6 +215,14 @@ public class DataSetTableService { return datasetTableMapper.selectByPrimaryKey(id); } + public DataSetTableDTO getWithPermission(String id) { + DataSetTableRequest dataSetTableRequest = new DataSetTableRequest(); + dataSetTableRequest.setId(id); + dataSetTableRequest.setUserId(String.valueOf(AuthUtils.getUser().getUserId())); + dataSetTableRequest.setTypeFilter(dataSetTableRequest.getTypeFilter()); + return extDataSetTableMapper.searchOne(dataSetTableRequest); + } + public List getFields(DataSetTableRequest dataSetTableRequest) throws Exception { Datasource ds = datasourceMapper.selectByPrimaryKey(dataSetTableRequest.getDataSourceId()); DatasourceProvider datasourceProvider = ProviderFactory.getProvider(ds.getType()); diff --git a/frontend/src/views/chart/components/component-style/BackgroundColorSelector.vue b/frontend/src/views/chart/components/component-style/BackgroundColorSelector.vue index e802ac43d2..92bb45d204 100644 --- a/frontend/src/views/chart/components/component-style/BackgroundColorSelector.vue +++ b/frontend/src/views/chart/components/component-style/BackgroundColorSelector.vue @@ -17,7 +17,7 @@ - {{ $t('chart.background') }} + {{ $t('chart.background') }} @@ -29,6 +29,10 @@ import { DEFAULT_BACKGROUND_COLOR } from '../../chart/chart' export default { name: 'BackgroundColorSelector', props: { + param: { + type: Object, + required: false + }, chart: { type: Object, required: true diff --git a/frontend/src/views/chart/components/component-style/LegendSelector.vue b/frontend/src/views/chart/components/component-style/LegendSelector.vue index 476c4b5590..d515035912 100644 --- a/frontend/src/views/chart/components/component-style/LegendSelector.vue +++ b/frontend/src/views/chart/components/component-style/LegendSelector.vue @@ -53,10 +53,11 @@ - + {{ $t('chart.legend') }} - + {{ $t('chart.split') }} @@ -62,6 +62,10 @@ import { DEFAULT_SPLIT } from '../../chart/chart' export default { name: 'SplitSelector', props: { + param: { + type: Object, + required: true + }, chart: { type: Object, required: true diff --git a/frontend/src/views/chart/components/component-style/TitleSelector.vue b/frontend/src/views/chart/components/component-style/TitleSelector.vue index 1a031b82e4..5851a92787 100644 --- a/frontend/src/views/chart/components/component-style/TitleSelector.vue +++ b/frontend/src/views/chart/components/component-style/TitleSelector.vue @@ -51,10 +51,11 @@ - + {{ $t('chart.title') }} - + {{ $t('chart.xAxis') }} - + {{ $t('chart.yAxis') }} {{ item.name }} - + @@ -80,6 +80,10 @@ export default { name: 'DimensionItem', props: { + param: { + type: Object, + required: true + }, item: { type: Object, required: true diff --git a/frontend/src/views/chart/components/drag-item/QuotaItem.vue b/frontend/src/views/chart/components/drag-item/QuotaItem.vue index d748213e11..eb6921e9a7 100644 --- a/frontend/src/views/chart/components/drag-item/QuotaItem.vue +++ b/frontend/src/views/chart/components/drag-item/QuotaItem.vue @@ -1,13 +1,13 @@