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 471297caff..3fd116cee9 100644
--- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java
+++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java
@@ -72,11 +72,12 @@ public class DataSetTableController {
}, logical = Logical.AND)
@ApiOperation("更新")
@PostMapping("update")
- public List save(@RequestBody DataSetTableRequest datasetTable) throws Exception {
+ public List save(@RequestBody DataSetTableRequest datasetTable) throws Exception {
if (datasetTable.getType().equalsIgnoreCase("excel")) {
- return dataSetTableService.saveExcel(datasetTable);
+ List ids = dataSetTableService.saveExcel(datasetTable).stream().map(DatasetTable::getId).collect(Collectors.toList());
+ return vAuthModelService.queryAuthModelByIds("dataset", ids);
} else {
- return Collections.singletonList(dataSetTableService.save(datasetTable));
+ return vAuthModelService.queryAuthModelByIds("dataset", Collections.singletonList(dataSetTableService.save(datasetTable).getId()));
}
}
diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
index 582eae1a61..fb4ea88283 100644
--- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
+++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
@@ -529,6 +529,9 @@ public class ChartViewService {
xAxisForRequest.addAll(xAxis);
xAxisForRequest.addAll(extStack);
datasourceRequest.setXAxis(xAxisForRequest);
+ List yAxisForRequest = new ArrayList<>();
+ yAxisForRequest.addAll(yAxis);
+ datasourceRequest.setYAxis(yAxisForRequest);
data = datasourceProvider.getData(datasourceRequest);
} else if (table.getMode() == 1) {// 抽取
datasourceRequest.setDatasource(ds);
@@ -1037,6 +1040,7 @@ public class ChartViewService {
}
if (StringUtils.isNotEmpty(totalPageSql) && StringUtils.equalsIgnoreCase((String) mapSize.get("tablePageMode"), "page")) {
datasourceRequest.setQuery(totalPageSql);
+ datasourceRequest.setTotalPageFlag(true);
java.util.List tmpData = datasourceProvider.getData(datasourceRequest);
totalItems = CollectionUtils.isEmpty(tmpData) ? 0 : Long.valueOf(tmpData.get(0)[0]);
totalPage = (totalItems / pageInfo.getPageSize()) + (totalItems % pageInfo.getPageSize() > 0 ? 1 : 0);
@@ -1047,6 +1051,10 @@ public class ChartViewService {
xAxisForRequest.addAll(xAxis);
xAxisForRequest.addAll(extStack);
datasourceRequest.setXAxis(xAxisForRequest);
+ List yAxisForRequest = new ArrayList<>();
+ yAxisForRequest.addAll(yAxis);
+ datasourceRequest.setYAxis(yAxisForRequest);
+ datasourceRequest.setTotalPageFlag(false);
data = datasourceProvider.getData(datasourceRequest);
if (CollectionUtils.isNotEmpty(assistFields)) {
datasourceAssistRequest.setQuery(assistSQL(datasourceRequest.getQuery(), assistFields));
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 fd494179ea..2a6ba0f346 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -34,6 +34,7 @@ import io.dataease.plugins.common.base.mapper.*;
import io.dataease.plugins.common.constants.DatasetType;
import io.dataease.plugins.common.constants.DatasourceTypes;
import io.dataease.plugins.common.constants.DeTypeConstants;
+import io.dataease.plugins.common.dto.chart.ChartViewFieldDTO;
import io.dataease.plugins.common.dto.dataset.SqlVariableDetails;
import io.dataease.plugins.common.dto.datasource.DataSourceType;
import io.dataease.plugins.common.dto.datasource.TableField;
@@ -712,6 +713,7 @@ public class DataSetTableService {
datasourceRequest.setPreviewData(true);
try {
datasourceRequest.setPageable(true);
+ datasourceRequest.setPermissionFields(fields);
data.addAll(datasourceProvider.getData(datasourceRequest));
} catch (Exception e) {
logger.error(e.getMessage());
diff --git a/backend/src/main/java/io/dataease/service/dataset/impl/direct/DirectFieldService.java b/backend/src/main/java/io/dataease/service/dataset/impl/direct/DirectFieldService.java
index 4ad4eb61e4..a06283d097 100644
--- a/backend/src/main/java/io/dataease/service/dataset/impl/direct/DirectFieldService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/impl/direct/DirectFieldService.java
@@ -195,6 +195,7 @@ public class DirectFieldService implements DataSetFieldService {
datasourceRequest.setQuery(qp.createQuerySQL(tableName, permissionFields, !needSort, null, customFilter, rowPermissionsTree, deSortFields));
}
LogUtil.info(datasourceRequest.getQuery());
+ datasourceRequest.setPermissionFields(permissionFields);
List rows = datasourceProvider.getData(datasourceRequest);
if (!needMapping) {
List
-
- {{ $t('dataset.excel_info_1') }}
- {{ $t('dataset.excel_info_2') }}
- {{ $t('dataset.excel_info_3') }}
-
-
-
+
+ {{ $t('dataset.excel_info_1') }}
+ {{ $t('dataset.excel_info_2') }}
+ {{ $t('dataset.excel_info_3') }}
+
+
+
handleCommand(type, field)"
>
-
+
-
+
{
+ if (!table.id) {
+ updateCacheTree('batchNew', 'dataset-tree', response.data, JSON.parse(localStorage.getItem('dataset-tree')))
+ }
this.openMessageSuccess('deDataset.set_saved_successfully')
this.cancel(response.data)
})
@@ -590,6 +594,9 @@ export default {
this.loading = true
post('/dataset/table/update', table)
.then((response) => {
+ if (!table.id) {
+ updateCacheTree('batchNew', 'dataset-tree', response.data, JSON.parse(localStorage.getItem('dataset-tree')))
+ }
this.openMessageSuccess('deDataset.set_saved_successfully')
this.cancel(response.data)
})
@@ -645,10 +652,12 @@ export default {
border-top-right-radius: 13px;
border-bottom-right-radius: 13px;
}
+
.table-list {
p {
margin: 0;
}
+
height: 100%;
width: 240px;
padding: 16px 12px;
@@ -661,6 +670,7 @@ export default {
display: flex;
justify-content: space-between;
color: var(--deTextPrimary, #1f2329);
+
i {
font-size: 14px;
color: var(--deTextPlaceholder, #8f959e);
@@ -674,10 +684,12 @@ export default {
.table-checkbox-list {
height: calc(100% - 100px);
overflow-y: auto;
+
.custom-tree-node {
position: relative;
width: 80%;
display: flex;
+
.label {
overflow: hidden;
white-space: nowrap;
@@ -685,11 +697,13 @@ export default {
width: 85%;
}
}
+
.error-name-exist {
position: absolute;
top: 0;
right: 0;
}
+
.item {
height: 40px;
width: 215px;
@@ -727,6 +741,7 @@ export default {
display: flex;
align-items: center;
position: relative;
+
.name {
font-size: 14px;
font-weight: 400;
@@ -757,10 +772,12 @@ export default {
padding: 2px 1.5px;
display: inline-block;
cursor: pointer;
+
i {
margin-left: 4px;
font-size: 12px;
}
+
&:hover {
background: rgba(31, 35, 41, 0.1);
border-radius: 4px;
diff --git a/frontend/src/views/dataset/add/AddSQL.vue b/frontend/src/views/dataset/add/AddSQL.vue
index d3cef63e5c..fb193a2f0e 100644
--- a/frontend/src/views/dataset/add/AddSQL.vue
+++ b/frontend/src/views/dataset/add/AddSQL.vue
@@ -70,7 +70,7 @@
class="de-text-btn"
@click="dataReference = true"
>
-
+
{{ $t('deDataset.data_reference') }}
-
+
{{ $t('sql_variable.variable_mgm') }}
-
+
-
+
{{ $t('deDataset.run_a_query') }}
@@ -111,7 +111,7 @@
dataTable = ''
;keywords = ''
"
- > {{ $t('chart.back') }}
+ > {{ $t('chart.back') }}
{{ $t('deDataset.data_reference') }}
-
+
{{ (showTable && dataTable) || selectedDatasource.name }}
@@ -146,59 +146,61 @@
v-if="!dataSource"
class="no-select-datasource"
>{{
- $t('deDataset.to_start_using')
- }}
+ $t('deDataset.to_start_using')
+ }}
-
+
-
+
{{ ele.fieldName }}
-
+
+
-
-
+
{{
- `(${$t('dataset.preview_show')} 1000 ${$t(
- 'dataset.preview_item'
- )})`
- }}
+ `(${$t('dataset.preview_show')} 1000 ${$t(
+ 'dataset.preview_item'
+ )})`
+ }}
{{ errMsgCont }}
+ >{{ errMsgCont }}
+
-
+
{{ $t('dataset.sql_variable_limit_1') }}
{{ $t('dataset.sql_variable_limit_2') }}
@@ -451,7 +454,7 @@
:content="$t('commons.parameter_effect')"
placement="top"
>
-
+
@@ -519,14 +522,16 @@
secondary
@click="closeVariableMgm"
>{{
- $t('dataset.cancel')
- }}
+ $t('dataset.cancel')
+ }}
+
{{
- $t('dataset.confirm')
- }}
+ $t('dataset.confirm')
+ }}
+
@@ -536,9 +541,8 @@