dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4438 from dataease/dev

Browse Source 
merge dev
This commit is contained in:
fit2cloudrd 2023-02-01 15:29:48 +08:00 committed by GitHub
commit a31651a144
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backend/src/main/java/io/dataease/controller/dataset/DataSetTableFieldController.java
View File

@ -152,11 +152,17 @@ public class DataSetTableFieldController {
@DePermission(type = DePermissionType.DATASET, value = "tableId", level = ResourceAuthLevel.DATASET_LEVEL_MANAGE) @DePermission(type = DePermissionType.DATASET, value = "tableId", level = ResourceAuthLevel.DATASET_LEVEL_MANAGE)
@ApiOperation("保存") @ApiOperation("保存")
@PostMapping("save") @PostMapping("save")
public DatasetTableField save(@RequestBody DatasetTableField datasetTableField) { public DatasetTableField save(@RequestBody DatasetTableField datasetTableField) throws Exception {
dataSetTableFieldsService.checkFieldName(datasetTableField); dataSetTableFieldsService.checkFieldName(datasetTableField);
// 非直连数据集需先完成数据同步
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 { try {
// 执行一次sql，确保数据集中所有字段均能正确执行 // 执行一次sql，确保数据集中所有字段均能正确执行
DatasetTable datasetTable = dataSetTableService.get(datasetTableField.getTableId());
DataSetTableRequest dataSetTableRequest = new DataSetTableRequest(); DataSetTableRequest dataSetTableRequest = new DataSetTableRequest();
BeanUtils.copyProperties(datasetTable, dataSetTableRequest); BeanUtils.copyProperties(datasetTable, dataSetTableRequest);
dataSetTableService.getPreviewData(dataSetTableRequest, 1, 1, Collections.singletonList(datasetTableField), null); dataSetTableService.getPreviewData(dataSetTableRequest, 1, 1, Collections.singletonList(datasetTableField), null);

2
backend/src/main/java/io/dataease/controller/panel/PanelAppTemplateController.java
View File

@ -17,7 +17,7 @@ import java.util.List;
* Date: 2022/9/8 * Date: 2022/9/8
* Description: * Description:
*/ */
@Api(tags = "仪表板：应该关系") @Api(tags = "仪表板：应用关系")
@ApiSupport(order = 170) @ApiSupport(order = 170)
@RestController @RestController
@RequestMapping("appTemplate") @RequestMapping("appTemplate")

2
backend/src/main/java/io/dataease/service/panel/PanelAppTemplateService.java
View File

@ -103,7 +103,7 @@ public class PanelAppTemplateService {
PanelAppTemplateWithBLOBs requestTemplate = new PanelAppTemplateWithBLOBs(); PanelAppTemplateWithBLOBs requestTemplate = new PanelAppTemplateWithBLOBs();
BeanUtils.copyBean(requestTemplate, request); BeanUtils.copyBean(requestTemplate, request);
//Store static resource into the server //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"; String snapshotName = "app-template-" + UUIDUtil.getUUIDAsString() + ".jpeg";
staticResourceService.saveSingleFileToServe(snapshotName, request.getSnapshot().replace("data:image/jpeg;base64,", "")); staticResourceService.saveSingleFileToServe(snapshotName, request.getSnapshot().replace("data:image/jpeg;base64,", ""));
requestTemplate.setSnapshot("/" + UPLOAD_URL_PREFIX + '/' + snapshotName); requestTemplate.setSnapshot("/" + UPLOAD_URL_PREFIX + '/' + snapshotName);

3
frontend/src/views/system/datasource/DsConfiguration.vue
View File

@ -583,8 +583,7 @@
class-name="checkbox-table" class-name="checkbox-table"
prop="originName" prop="originName"
:label="$t('dataset.parse_filed')" :label="$t('dataset.parse_filed')"
:show-overflow-tooltip="true" show-overflow-tooltip
width="255"
> >
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.originName }} {{ scope.row.originName }}