diff --git a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/numeric/NumericalChartHandler.java b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/numeric/NumericalChartHandler.java index 7ffe2b9345..62530e0fbf 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/charts/impl/numeric/NumericalChartHandler.java +++ b/core/core-backend/src/main/java/io/dataease/chart/charts/impl/numeric/NumericalChartHandler.java @@ -60,6 +60,9 @@ public class NumericalChartHandler extends DefaultChartHandler { String maxType = (String) target.get(type); if (StringUtils.equalsIgnoreCase("dynamic", maxType)) { Map maxField = (Map) target.get(field); + if (maxField.get("id") == null || StringUtils.isEmpty(maxField.get("id").toString())) { + DEException.throwException(Translator.get("i18n_gauge_field_delete")); + } Long id = Long.valueOf((String) maxField.get("id")); String summary = (String) maxField.get("summary"); DatasetTableFieldDTO datasetTableField = datasetTableFieldManage.selectById(id); diff --git a/core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java b/core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java index 3ae742deb7..31c18fc1b4 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/provider/ExcelUtils.java @@ -486,6 +486,7 @@ public class ExcelUtils { tableFiled.setName(filedName); tableFiled.setOriginName(filedName); tableFiled.setFieldType(null); + tableFiled.setChecked(true); fields.add(tableFiled); } diff --git a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java b/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java index a22481598a..6fe37d53a9 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/server/DatasourceServer.java @@ -808,19 +808,11 @@ public class DatasourceServer implements DatasourceApi { datasourceRequest.setDatasource(transDTO(coreDatasource)); List datasetTableDTOS = ExcelUtils.getTables(datasourceRequest); for (ExcelSheetData sheet : excelFileData.getSheets()) { - boolean find = false; for (DatasetTableDTO datasetTableDTO : datasetTableDTOS) { if (excelDataTableName(datasetTableDTO.getTableName()).equals(sheet.getTableName()) || isCsv(file.getOriginalFilename())) { - find = true; sheet.setDeTableName(datasetTableDTO.getTableName()); - datasourceRequest.setTable(datasetTableDTO.getTableName()); - List oldTableFields = ExcelUtils.getTableFields(datasourceRequest); - mergeFields(oldTableFields, sheet.getFields()); } } - if (!find) { - sheet.setNewSheet(true); - } } } } diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/ApiHttpRequestDraw.vue b/core/core-frontend/src/views/visualized/data/datasource/form/ApiHttpRequestDraw.vue index 7dc1fba8c2..c6f2c62281 100644 --- a/core/core-frontend/src/views/visualized/data/datasource/form/ApiHttpRequestDraw.vue +++ b/core/core-frontend/src/views/visualized/data/datasource/form/ApiHttpRequestDraw.vue @@ -289,7 +289,11 @@ const saveItem = () => { } } else { for (let i = 0; i < apiItem.fields.length; i++) { - if (apiItem.fields[i].primaryKey && !apiItem.fields[i].length) { + if ( + apiItem.fields[i].primaryKey && + !apiItem.fields[i].length && + apiItem.fields[i].deExtractType === 0 + ) { ElMessage.error(t('datasource.primary_key_length') + apiItem.fields[i].name) return } diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/ExcelDetail.vue b/core/core-frontend/src/views/visualized/data/datasource/form/ExcelDetail.vue index 5c79d1feed..7c9f7e2d49 100644 --- a/core/core-frontend/src/views/visualized/data/datasource/form/ExcelDetail.vue +++ b/core/core-frontend/src/views/visualized/data/datasource/form/ExcelDetail.vue @@ -644,7 +644,7 @@ defineExpose({ >
-
+