From 164f97ff48b06863bb6a8651e2dc020b48e0adb8 Mon Sep 17 00:00:00 2001 From: junjie Date: Tue, 25 Jan 2022 10:29:03 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E5=88=97=E6=9D=83=E9=99=90=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=EF=BC=8C=E5=BA=94=E5=BF=BD=E7=95=A5=E8=A7=86=E5=9B=BE?= =?UTF-8?q?=E4=B8=AD'=E8=AE=B0=E5=BD=95=E6=95=B0*'=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/dataease/service/chart/ChartViewService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 1c835c47d3..1ea9ba9245 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()); From 65139d788a65aae5abc4db32b566a74f092d9cbe Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 25 Jan 2022 10:48:53 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E6=96=87=E4=BB=B6=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E8=AE=BE=E7=BD=AE=E5=9C=A8=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=E6=97=A0=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../canvas/components/Editor/ComponentWrapper.vue | 6 +----- .../src/components/canvas/components/Editor/Preview.vue | 6 +++++- 2 files changed, 6 insertions(+), 6 deletions(-) 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..ce4d28cf6c 100644 --- a/frontend/src/components/canvas/components/Editor/Preview.vue +++ b/frontend/src/components/canvas/components/Editor/Preview.vue @@ -297,7 +297,11 @@ export default { component.style[key] = this.format(component.style[key], this.scaleHeight) } if (this.needToChangeWidth.includes(key)) { - component.style[key] = this.format(component.style[key], this.scaleWidth) + if (component.type === 'v-text' && key === 'fontSize' && this.terminal === 'mobile') { + // do nothing 移动端字符大小无需按照比例缩放，当前保持不变 + } else { + component.style[key] = this.format(component.style[key], this.scaleWidth) + } } }) }) From 3f232a36a6f600aaea1839a8a13a2f4d489ac91e Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 25 Jan 2022 11:34:12 +0800 Subject: [PATCH 3/4] =?UTF-8?q?refactor:=20=E7=A7=BB=E5=8A=A8=E7=AB=AF?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6=E6=A0=87=E9=A2=98=E5=A4=A7?= =?UTF-8?q?=E5=B0=8F=E8=B7=9F=E9=9A=8Fpc=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/canvas/components/Editor/Preview.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue index ce4d28cf6c..98e5af8d00 100644 --- a/frontend/src/components/canvas/components/Editor/Preview.vue +++ b/frontend/src/components/canvas/components/Editor/Preview.vue @@ -297,8 +297,8 @@ export default { component.style[key] = this.format(component.style[key], this.scaleHeight) } if (this.needToChangeWidth.includes(key)) { - if (component.type === 'v-text' && key === 'fontSize' && this.terminal === 'mobile') { - // do nothing 移动端字符大小无需按照比例缩放，当前保持不变 + if (key === 'fontSize' && this.terminal === 'mobile') { + // do nothing 移动端字符大小无需按照比例缩放，当前保持不变(包括 v-text 和 过滤组件) } else { component.style[key] = this.format(component.style[key], this.scaleWidth) } From 8f2539cbdcd665cc2ce91f1f888d19194234f398 Mon Sep 17 00:00:00 2001 From: fit2cloudrd Date: Tue, 25 Jan 2022 12:02:51 +0800 Subject: [PATCH 4/4] =?UTF-8?q?refactor:=20=E7=A7=BB=E5=8A=A8=E7=AB=AF?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: wangjiahao <1522128093@qq.com> --- frontend/src/components/canvas/components/Editor/Preview.vue | 4 +++- .../canvas/custom-component/UserViewMobileDialog.vue | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue index 98e5af8d00..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; }