diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java index 1eca1ea7d4..83a8946f65 100644 --- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -245,7 +245,7 @@ public class ChartViewService { fields = permissionService.filterColumnPermissons(fields, desensitizationList, datasetTable.getId(), requestList.getUser()); //将没有权限的列删掉 List dataeaseNames = fields.stream().map(DatasetTableField::getDataeaseName).collect(Collectors.toList()); - dataeaseNames.add("count"); + dataeaseNames.add("*"); fieldCustomFilter = fieldCustomFilter.stream().filter(item -> !desensitizationList.contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); extStack = extStack.stream().filter(item -> !desensitizationList.contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); extBubble = extBubble.stream().filter(item -> !desensitizationList.contains(item.getDataeaseName()) && dataeaseNames.contains(item.getDataeaseName())).collect(Collectors.toList()); diff --git a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue index 86b7d657fe..bfb04d56e0 100644 --- a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue +++ b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue @@ -150,11 +150,7 @@ export default { height: '100%' } } else { - if (this.terminal === 'pc') { - return getStyle(style, ['top', 'left', 'width', 'height', 'rotate']) - } else { - return getStyle(style, ['top', 'left', 'width', 'height', 'rotate', 'fontSize']) - } + return getStyle(style, ['top', 'left', 'width', 'height', 'rotate']) } }, diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue index 534a6fa3dc..17690278c3 100644 --- a/frontend/src/components/canvas/components/Editor/Preview.vue +++ b/frontend/src/components/canvas/components/Editor/Preview.vue @@ -40,7 +40,6 @@ > > .el-dialog__headerbtn { + top: 7px + } .mobile-dialog-css > > > .el-dialog__body { padding: 0px; } diff --git a/frontend/src/components/canvas/custom-component/UserViewMobileDialog.vue b/frontend/src/components/canvas/custom-component/UserViewMobileDialog.vue index 5825da271f..87a4f60b24 100644 --- a/frontend/src/components/canvas/custom-component/UserViewMobileDialog.vue +++ b/frontend/src/components/canvas/custom-component/UserViewMobileDialog.vue @@ -89,5 +89,6 @@ export default { } .full-div{ background-size:100% 100% !important; + padding: 5px 0px 5px 0px !important; }