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

Merge pull request #4621 from dataease/dev

Browse Source 
merge dev
This commit is contained in:
fit2cloudrd 2023-02-23 19:14:41 +08:00 committed by GitHub
commit 66679edc7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/io/dataease/service/chart/ChartViewService.java
View File

@ -671,7 +671,7 @@ public class ChartViewService {
if (StringUtils.equalsIgnoreCase(view.getResultMode(), "custom")) {
chartExtRequest.setGoPage(1L);
chartExtRequest.setPageSize(view.getResultCount().longValue());
} else {
} else if (!chartExtRequest.getExcelExportFlag()) {
chartExtRequest.setGoPage(null);
chartExtRequest.setPageSize(null);
}
@ -847,7 +847,7 @@ public class ChartViewService {
List<ChartDrillRequest> drillRequestList = chartExtRequest.getDrill();
if (CollectionUtils.isNotEmpty(drillRequestList) && (drill.size() > drillRequestList.size())) {
// 如果是从子维度开始下钻，那么先把主维度的条件先加上去
if (CollectionUtils.isNotEmpty(xAxisExt) && StringUtils.equalsIgnoreCase(drill.get(0).getId(),xAxisExt.get(0).getId())) {
if (CollectionUtils.isNotEmpty(xAxisExt) && StringUtils.equalsIgnoreCase(drill.get(0).getId(), xAxisExt.get(0).getId())) {
ChartDrillRequest head = drillRequestList.get(0);
for (int i = 0; i < xAxisBase.size(); i++) {
ChartDimensionDTO dimensionDTO = head.getDimensionList().get(i);

6
frontend/src/styles/index.scss
View File

@ -1760,4 +1760,10 @@ div:focus {
.el-table__fixed-right::before {
display: none;
}
.auth-tab {
.custom-tree-node {
padding-right: 0 !important;
}
}