From 1734e134405764ffd8566a1f37273fc1042a5dc2 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Tue, 31 Jan 2023 23:46:13 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E8=8E=B7=E5=8F=96=20API=20=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=9B=86=E9=A2=84=E8=A7=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/datasource/DsConfiguration.vue | 26 +++++++------------ 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/frontend/src/views/system/datasource/DsConfiguration.vue b/frontend/src/views/system/datasource/DsConfiguration.vue index f1eaa8c582..c4362e3e78 100644 --- a/frontend/src/views/system/datasource/DsConfiguration.vue +++ b/frontend/src/views/system/datasource/DsConfiguration.vue @@ -1143,6 +1143,7 @@ export default { this.$message.error(i18n.t('datasource.please_input_dataPath')) return } + this.originFieldItem.jsonFields = [] this.$refs.apiItemBasicInfo.validate((valid) => { if (valid) { const data = Base64.encode(JSON.stringify(this.apiItem)) @@ -1158,9 +1159,7 @@ export default { this.apiItem.jsonFields = res.data.jsonFields this.apiItem.fields = [] this.handleFiledChange(this.apiItem) - this.$nextTick(() => { - this.$refs.plxTable?.reloadData(this.previewData(this.apiItem)) - }) + this.previewData(this.apiItem) }) .catch((res) => { this.loading = false @@ -1183,7 +1182,7 @@ export default { res.data.jsonFields.forEach(((item) => { item.checked = false })) - this.originFieldItem.jsonFields = res.data.jsonFields + this.originFieldItem.jsonFields = res.data.jsonFields this.loading = false this.$success(i18n.t('commons.success')) }) @@ -1301,15 +1300,7 @@ export default { this.handleCheckChange(this.apiItem, row) this.apiItem.fields = [] this.handleFiledChange(this.apiItem, row) - if(ref === 'plxTable'){ - this.$nextTick(() => { - this.$refs.plxTable?.reloadData(this.previewData(this.apiItem)) - }) - }else { - this.$nextTick(() => { - this.$refs.originPlxTable?.reloadData(this.previewData(this.apiItem)) - }) - } + this.previewData(this.apiItem) if (this.errMsg.length) { this.$message.error( @@ -1347,7 +1338,7 @@ export default { apiItem.fields.push(jsonFields[i]) } if (jsonFields[i].children !== undefined) { - this.handleFiledChange2(jsonFields[i].children) + this.handleFiledChange2(apiItem, jsonFields[i].children) } } }, @@ -1374,6 +1365,9 @@ export default { apiItem.fields[i].value[j] ) } + this.$nextTick(() => { + this.$refs.plxTable?.reloadData(data) + }) } this.showEmpty = apiItem.fields.length === 0 return data @@ -1387,9 +1381,7 @@ export default { } }, fieldNameChange(row) { - this.$nextTick(() => { - this.$refs.plxTable?.reloadData(this.previewData(this.apiItem)) - }) + this.previewData(this.apiItem) }, fieldTypeChange(row) {} } From bfec117fb62dad0cc2691e8372df2b188c6ff674 Mon Sep 17 00:00:00 2001 From: junjun Date: Wed, 1 Feb 2023 10:26:29 +0800 Subject: [PATCH 2/4] =?UTF-8?q?refactor(=E6=95=B0=E6=8D=AE=E9=9B=86):=20?= =?UTF-8?q?=E9=9D=9E=E7=9B=B4=E8=BF=9E=E6=95=B0=E6=8D=AE=E9=9B=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AD=97=E6=AE=B5=E5=89=8D=E9=9C=80=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/dataset/DataSetTableFieldController.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableFieldController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableFieldController.java index c46495afce..de3d1db042 100644 --- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableFieldController.java +++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableFieldController.java @@ -155,8 +155,14 @@ public class DataSetTableFieldController { public DatasetTableField save(@RequestBody DatasetTableField datasetTableField) { dataSetTableFieldsService.checkFieldName(datasetTableField); try { - // 执行一次sql，确保数据集中所有字段均能正确执行 + // 非直连数据集需先完成数据同步 DatasetTable datasetTable = dataSetTableService.get(datasetTableField.getTableId()); + if (datasetTable.getMode() == 1) { + if (!dataSetTableService.checkEngineTableIsExists(datasetTableField.getTableId())) { + throw new RuntimeException(Translator.get("i18n_data_not_sync")); + } + } + // 执行一次sql，确保数据集中所有字段均能正确执行 DataSetTableRequest dataSetTableRequest = new DataSetTableRequest(); BeanUtils.copyProperties(datasetTable, dataSetTableRequest); dataSetTableService.getPreviewData(dataSetTableRequest, 1, 1, Collections.singletonList(datasetTableField), null); From 24a8da3b7d3e9e272cbb93982e262fa170942c5b Mon Sep 17 00:00:00 2001 From: junjun Date: Wed, 1 Feb 2023 10:49:07 +0800 Subject: [PATCH 3/4] =?UTF-8?q?refactor(=E6=95=B0=E6=8D=AE=E9=9B=86):=20?= =?UTF-8?q?=E9=9D=9E=E7=9B=B4=E8=BF=9E=E6=95=B0=E6=8D=AE=E9=9B=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=AD=97=E6=AE=B5=E5=89=8D=E9=9C=80=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataset/DataSetTableFieldController.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableFieldController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableFieldController.java index de3d1db042..21d2dc6b19 100644 --- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableFieldController.java +++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableFieldController.java @@ -152,16 +152,16 @@ public class DataSetTableFieldController { @DePermission(type = DePermissionType.DATASET, value = "tableId", level = ResourceAuthLevel.DATASET_LEVEL_MANAGE) @ApiOperation("保存") @PostMapping("save") - public DatasetTableField save(@RequestBody DatasetTableField datasetTableField) { + public DatasetTableField save(@RequestBody DatasetTableField datasetTableField) throws Exception { dataSetTableFieldsService.checkFieldName(datasetTableField); - try { - // 非直连数据集需先完成数据同步 - DatasetTable datasetTable = dataSetTableService.get(datasetTableField.getTableId()); - if (datasetTable.getMode() == 1) { - if (!dataSetTableService.checkEngineTableIsExists(datasetTableField.getTableId())) { - throw new RuntimeException(Translator.get("i18n_data_not_sync")); - } + // 非直连数据集需先完成数据同步 + DatasetTable datasetTable = dataSetTableService.get(datasetTableField.getTableId()); + if (datasetTable.getMode() == 1) { + if (!dataSetTableService.checkEngineTableIsExists(datasetTableField.getTableId())) { + throw new RuntimeException(Translator.get("i18n_data_not_sync")); } + } + try { // 执行一次sql，确保数据集中所有字段均能正确执行 DataSetTableRequest dataSetTableRequest = new DataSetTableRequest(); BeanUtils.copyProperties(datasetTable, dataSetTableRequest); From 0dd1e02a2105cb8a565e2429d460264ba51205c4 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 1 Feb 2023 10:58:07 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix(=E5=BA=94=E7=94=A8):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E5=BA=94=E7=94=A8=E6=9B=B4=E6=96=B0=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E7=BC=A9=E7=95=A5=E5=9B=BE=E6=9C=AA=E6=98=BE=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/controller/panel/PanelAppTemplateController.java | 2 +- .../java/io/dataease/service/panel/PanelAppTemplateService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/io/dataease/controller/panel/PanelAppTemplateController.java b/backend/src/main/java/io/dataease/controller/panel/PanelAppTemplateController.java index 56d3d7e222..308d02012f 100644 --- a/backend/src/main/java/io/dataease/controller/panel/PanelAppTemplateController.java +++ b/backend/src/main/java/io/dataease/controller/panel/PanelAppTemplateController.java @@ -17,7 +17,7 @@ import java.util.List; * Date: 2022/9/8 * Description: */ -@Api(tags = "仪表板：应该关系") +@Api(tags = "仪表板：应用关系") @ApiSupport(order = 170) @RestController @RequestMapping("appTemplate") diff --git a/backend/src/main/java/io/dataease/service/panel/PanelAppTemplateService.java b/backend/src/main/java/io/dataease/service/panel/PanelAppTemplateService.java index fe726d488f..bd0b44d568 100644 --- a/backend/src/main/java/io/dataease/service/panel/PanelAppTemplateService.java +++ b/backend/src/main/java/io/dataease/service/panel/PanelAppTemplateService.java @@ -103,7 +103,7 @@ public class PanelAppTemplateService { PanelAppTemplateWithBLOBs requestTemplate = new PanelAppTemplateWithBLOBs(); BeanUtils.copyBean(requestTemplate, request); //Store static resource into the server - if (StringUtils.isNotEmpty(request.getSnapshot())) { + if (StringUtils.isNotEmpty(request.getSnapshot()) && request.getSnapshot().indexOf("static-resource") == -1) { String snapshotName = "app-template-" + UUIDUtil.getUUIDAsString() + ".jpeg"; staticResourceService.saveSingleFileToServe(snapshotName, request.getSnapshot().replace("data:image/jpeg;base64,", "")); requestTemplate.setSnapshot("/" + UPLOAD_URL_PREFIX + '/' + snapshotName);