From 20ca335a4a5ac3be42e14881ed84f0a1e1293d5f Mon Sep 17 00:00:00 2001 From: junjie Date: Mon, 10 May 2021 18:41:49 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=95=B0=E6=8D=AE=E9=9B=86):=E8=87=AA?= =?UTF-8?q?=E5=8A=A9=E6=95=B0=E6=8D=AE=E9=9B=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/service/dataset/DataSetTableService.java | 4 +++- frontend/src/views/dataset/add/AddCustom.vue | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) 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 1283fa0a49..40cc45087e 100644 --- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java +++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java @@ -475,6 +475,9 @@ public class DataSetTableService { List fieldList = new ArrayList<>(); list.forEach(ele -> { List listByIds = dataSetTableFieldsService.getListByIds(ele.getCheckedFields()); + listByIds.forEach(f -> { + f.setDataeaseName(DorisTableUtils.dorisFieldName(ele.getTableId() + "_" + f.getDataeaseName())); + }); fieldList.addAll(listByIds); }); for (int i = 0; i < fieldList.size(); i++) { @@ -482,7 +485,6 @@ public class DataSetTableService { datasetTableField.setId(null); datasetTableField.setTableId(datasetTable.getId()); datasetTableField.setColumnIndex(i); - datasetTableField.setDataeaseName(DorisTableUtils.dorisFieldName(datasetTable.getId() + "_" + datasetTableField.getDataeaseName())); } dataSetTableFieldsService.batchEdit(fieldList); // custom 创建doris视图 diff --git a/frontend/src/views/dataset/add/AddCustom.vue b/frontend/src/views/dataset/add/AddCustom.vue index 8eed6691e0..13a416e714 100644 --- a/frontend/src/views/dataset/add/AddCustom.vue +++ b/frontend/src/views/dataset/add/AddCustom.vue @@ -101,7 +101,7 @@ export default { const that = this setTimeout(function() { const currentHeight = document.documentElement.clientHeight - that.height = currentHeight - 56 - 15 - 26 - 25 - 43 + that.height = currentHeight - 56 - 15 - 26 - 25 - 43 - 10 }, 10) },