center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge branch 'v1.7' of github.com:dataease/dataease into v1.7

Browse Source
This commit is contained in:
taojinlong 2022-01-25 13:53:24 +08:00
commit 27027ecf1c
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -245,7 +245,7 @@ public class ChartViewService {
fields = permissionService.filterColumnPermissons(fields, desensitizationList, datasetTable.getId(), requestList.getUser());
//将没有权限的列删掉
List<String> 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());

6
frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
View File

@ -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'])
}
},

10
frontend/src/components/canvas/components/Editor/Preview.vue
View File

@ -40,7 +40,6 @@
<!--手机视图详情-->
<el-dialog
:title="'['+showChartInfo.name+']'+$t('chart.chart_details')"
:visible.sync="mobileChartDetailsVisible"
:fullscreen="true"
class="mobile-dialog-css"
@ -297,7 +296,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 (key === 'fontSize' && this.terminal === 'mobile') {
// do nothing 移动端字符大小无需按照比例缩放，当前保持不变(包括 v-text 和 过滤组件)
} else {
component.style[key] = this.format(component.style[key], this.scaleWidth)
}
}
})
})
@ -374,6 +377,9 @@ export default {
padding: 10px 20px 20px;
}
.mobile-dialog-css > > > .el-dialog__headerbtn {
top: 7px
}
.mobile-dialog-css > > > .el-dialog__body {
padding: 0px;
}

1
frontend/src/components/canvas/custom-component/UserViewMobileDialog.vue
View File

@ -89,5 +89,6 @@ export default {
}
.full-div{
background-size:100% 100% !important;
padding: 5px 0px 5px 0px !important;
}
</style>