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

Merge branch 'dev' of github.com:dataease/dataease into dev

Browse Source
This commit is contained in:
taojinlong 2022-08-04 00:09:42 +08:00
commit 18c4961f63
8 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java
View File

@ -877,12 +877,11 @@ public class ChartDataBuild {
// 表格
public static Map<String, Object> transTableNormal(Map<String, List<ChartViewFieldDTO>> fieldMap, ChartViewWithBLOBs view, List<String[]> data, List<String> desensitizationList) {
// List<ChartViewFieldDTO> fields = fieldMap.entrySet().stream().map(Map.Entry::getValue).flatMap(List::stream).collect(Collectors.toList());
// 上面乱序了
List<ChartViewFieldDTO> fields = new ArrayList<>();
if (CollectionUtils.isNotEmpty(fieldMap.get("xAxis")))fields.addAll(fieldMap.get("xAxis"));
if (CollectionUtils.isNotEmpty(fieldMap.get("labelAxis")))fields.addAll(fieldMap.get("labelAxis"));
if (CollectionUtils.isNotEmpty(fieldMap.get("tooltipAxis")))fields.addAll(fieldMap.get("tooltipAxis"));
if (CollectionUtils.isNotEmpty(fieldMap.get("labelAxis")))fields.addAll(fieldMap.get("labelAxis"));
if (CollectionUtils.isNotEmpty(fieldMap.get("yAxis")))fields.addAll(fieldMap.get("yAxis"));
return transTableNormal(fields, view, data, desensitizationList);
}

6
frontend/src/components/business/DeLayoutContent.vue
View File

@ -49,7 +49,7 @@ export default {
border-radius: 4px;
box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 14%);
box-sizing: border-box;
background: #f5f6f7;
background-color: var(--MainBG,#f5f6f7);
overflow: hidden;
padding: 24px 24px 24px 24px;
height: 100%;
@ -61,14 +61,14 @@ export default {
font-weight: 500;
line-height: 28px;
text-align: left;
color: #1F2329;
color: var(--TextPrimary, #1F2329);
width: 100%;
margin: 0;
}
.container-wrapper {
width: 100%;
overflow: auto;
background: #fff;
background-color: var(--ContentBG, #FFFFFF);
margin-top: 24px;
padding: 24px;
flex: 1;

4
frontend/src/views/panel/templateMarket/component/MarketPreview.vue
View File

@ -303,7 +303,7 @@ export default {
height: calc(100vh - 56px);
overflow-x: hidden;
overflow-y: auto;
background: #fff;
background-color: var(--ContentBG,#ffffff);
}
.aside-inActive{
@ -337,6 +337,7 @@ export default {
font-weight: 500;
font-size: 16px;
line-height: 24px;
color: var(--TextPrimary, #1F2329);
}
.insert-filter {
@ -403,6 +404,7 @@ export default {
font-size: 20px;
line-height: 28px;
margin-bottom: 24px;
color: var(--TextPrimary, #1F2329);
}
.margin-top16 {

1
frontend/src/views/panel/templateMarket/component/TemplateMarketItem.vue
View File

@ -88,6 +88,7 @@ export default {
white-space:nowrap;
overflow:hidden;
text-overflow:ellipsis;
color: var(--TextPrimary, #1F2329);
}
.template-img {

2
frontend/src/views/panel/templateMarket/component/TemplateMarketPreviewItem.vue
View File

@ -67,7 +67,7 @@ export default {
box-sizing: border-box;
width: 182px;
height: 116px;
background: #ffffff;
background-color: var(--ContentBG,#ffffff);
border: 1px solid #DEE0E3 ;
border-radius: 4px;
flex: none;

7
frontend/src/views/panel/templateMarket/index.vue
View File

@ -158,7 +158,7 @@ export default {
_this.$nextTick(() => {
const curSeparator = Math.trunc(templateMainDom.offsetWidth / _this.templateMiniWidth)
_this.templateSpan = (100 / Math.trunc(templateMainDom.offsetWidth / _this.templateMiniWidth)) + '%'
_this.templateCurWidth = Math.trunc(templateMainDom.offsetWidth / curSeparator) - 32
_this.templateCurWidth = Math.trunc(templateMainDom.offsetWidth / curSeparator) - 33
})
})
},
@ -266,7 +266,7 @@ export default {
height: calc(100vh - 190px)!important;
overflow-x: hidden;
overflow-y: auto;
background: #fff ;
background-color: var(--ContentBG,#ffffff);
}
.market-main{
padding:24px
@ -276,6 +276,7 @@ export default {
font-size: 20px;
font-weight: 500;
line-height: 28px;
color: var(--TextPrimary, #1F2329);
}
.title-right{
float: right;
@ -322,7 +323,7 @@ export default {
.outer-body{
width: 100%;
height: calc(100vh - 56px);
background: #f5f6f7;
background-color: var(--MainBG,#f5f6f7);
}
.market-dialog-css{

2
frontend/src/views/system/SysParam/MapSetting/MapSettingLeft.vue
View File

@ -100,7 +100,7 @@ export default {
filterNode(value, data) {
if (!value) return true
return data.label.indexOf(value) !== -1
return data.name.indexOf(value) !== -1
},
nodeClick(data, node) {

2
frontend/src/views/system/user/filterUser.vue
View File

@ -421,8 +421,8 @@ export default {
}
}
.user-popper {
background: transparent;
padding: 0;
background: #fff;
.popper__arrow {
display: none;
}