diff --git a/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java b/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java index 2afa50e916..50c8dec639 100644 --- a/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java +++ b/core/core-backend/src/main/java/io/dataease/chart/server/ChartDataServer.java @@ -38,6 +38,8 @@ import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import java.io.OutputStream; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -111,7 +113,7 @@ public class ChartDataServer implements ChartDataApi { Integer curLimit = getExportLimit(); if (ChartConstants.VIEW_RESULT_MODE.CUSTOM.equals(viewDTO.getResultMode())) { Integer limitCount = viewDTO.getResultCount(); - viewDTO.setResultCount(Math.min(curLimit,limitCount)); + viewDTO.setResultCount(Math.min(curLimit, limitCount)); } else { viewDTO.setResultCount(curLimit); } @@ -184,7 +186,7 @@ public class ChartDataServer implements ChartDataApi { response.setContentType("application/vnd.ms-excel"); //文件名称 - response.setHeader("Content-disposition", "attachment;filename=" + request.getViewName() + ".xlsx"); + response.setHeader("Content-disposition", "attachment;filename=" + URLEncoder.encode(request.getViewName(), StandardCharsets.UTF_8) + ".xlsx"); wb.write(outputStream); outputStream.flush(); outputStream.close(); 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 e927b6dca8..f41ac59953 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 @@ -311,7 +311,7 @@ public class ExcelUtils { if (StringUtils.isEmpty(value) || value.length() > 19) { return "TEXT"; } - String regex = "^\\d+(\\.\\d+)?$"; + String regex = "^-?\\d+(\\.\\d+)?$"; if (!value.matches(regex)) { return "TEXT"; } diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue b/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue index fc6f8b1566..43ca3f27e8 100644 --- a/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue +++ b/core/core-frontend/src/views/visualized/data/datasource/form/EditorDetail.vue @@ -697,7 +697,7 @@ const delParams = data => { autofocus: false, showClose: false }).then(() => { - gridData.value.splice(form.value.apiConfiguration.indexOf(data), 1) + gridData.value.splice(gridData.value.indexOf(data), 1) }) } const datasetTypeList = [