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

Merge branch 'dev' into pr@dev_memory_component

Browse Source
This commit is contained in:
dataeaseShu 2022-11-09 10:43:33 +08:00
commit f7ef2f6cfb
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
View File

@ -2886,6 +2886,7 @@ public class DataSetTableService {
if (StringUtils.isNotEmpty(request.getExpressionTree())) { if (StringUtils.isNotEmpty(request.getExpressionTree())) {
Gson gson = new Gson(); Gson gson = new Gson();
tree = gson.fromJson(request.getExpressionTree(), DatasetRowPermissionsTreeObj.class); tree = gson.fromJson(request.getExpressionTree(), DatasetRowPermissionsTreeObj.class);
permissionsTreeService.getField(tree);
} }
Map<String, Object> previewData = getPreviewData(request, 1, 100000, null, tree); Map<String, Object> previewData = getPreviewData(request, 1, 100000, null, tree);
List<DatasetTableField> fields = (List<DatasetTableField>) previewData.get("fields"); List<DatasetTableField> fields = (List<DatasetTableField>) previewData.get("fields");

2
backend/src/main/java/io/dataease/service/dataset/PermissionsTreeService.java
View File

@ -153,7 +153,7 @@ public class PermissionsTreeService {
return result; return result;
} }
private void getField(DatasetRowPermissionsTreeObj tree) { public void getField(DatasetRowPermissionsTreeObj tree) {
if (ObjectUtils.isNotEmpty(tree)) { if (ObjectUtils.isNotEmpty(tree)) {
if (ObjectUtils.isNotEmpty(tree.getItems())) { if (ObjectUtils.isNotEmpty(tree.getItems())) {
for (DatasetRowPermissionsTreeItem item : tree.getItems()) { for (DatasetRowPermissionsTreeItem item : tree.getItems()) {

2
frontend/src/views/dataset/data/ViewTable.vue
View File

@ -187,6 +187,7 @@
<!--导出数据集弹框--> <!--导出数据集弹框-->
<el-dialog <el-dialog
v-if="showExport"
v-dialogDrag v-dialogDrag
:visible.sync="showExport" :visible.sync="showExport"
width="600px" width="600px"
@ -470,6 +471,7 @@ export default {
this.showExport = true this.showExport = true
this.fetchFiledList() this.fetchFiledList()
this.exportForm.name = this.table.name this.exportForm.name = this.table.name
this.exportForm.expressionTree = ''
}, },
closeExport() { closeExport() {
this.showExport = false this.showExport = false