From 15dd9fce18c8936bb4a591e0f34429d8d1b53226 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 3 Aug 2022 18:34:22 +0800 Subject: [PATCH 1/5] =?UTF-8?q?style:=20=E4=B8=BB=E9=A2=98=E9=80=82?= =?UTF-8?q?=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/business/DeLayoutContent.vue | 6 +++--- .../views/panel/templateMarket/component/MarketPreview.vue | 4 +++- .../panel/templateMarket/component/TemplateMarketItem.vue | 1 + .../templateMarket/component/TemplateMarketPreviewItem.vue | 2 +- frontend/src/views/panel/templateMarket/index.vue | 7 ++++--- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/frontend/src/components/business/DeLayoutContent.vue b/frontend/src/components/business/DeLayoutContent.vue index 39a0daa9fa..e38271e634 100644 --- a/frontend/src/components/business/DeLayoutContent.vue +++ b/frontend/src/components/business/DeLayoutContent.vue @@ -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; diff --git a/frontend/src/views/panel/templateMarket/component/MarketPreview.vue b/frontend/src/views/panel/templateMarket/component/MarketPreview.vue index c15ba178da..6cee4cf5b8 100644 --- a/frontend/src/views/panel/templateMarket/component/MarketPreview.vue +++ b/frontend/src/views/panel/templateMarket/component/MarketPreview.vue @@ -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 { diff --git a/frontend/src/views/panel/templateMarket/component/TemplateMarketItem.vue b/frontend/src/views/panel/templateMarket/component/TemplateMarketItem.vue index 333334b857..d355433757 100644 --- a/frontend/src/views/panel/templateMarket/component/TemplateMarketItem.vue +++ b/frontend/src/views/panel/templateMarket/component/TemplateMarketItem.vue @@ -88,6 +88,7 @@ export default { white-space:nowrap; overflow:hidden; text-overflow:ellipsis; + color: var(--TextPrimary, #1F2329); } .template-img { diff --git a/frontend/src/views/panel/templateMarket/component/TemplateMarketPreviewItem.vue b/frontend/src/views/panel/templateMarket/component/TemplateMarketPreviewItem.vue index 8ae016594f..294978e7de 100644 --- a/frontend/src/views/panel/templateMarket/component/TemplateMarketPreviewItem.vue +++ b/frontend/src/views/panel/templateMarket/component/TemplateMarketPreviewItem.vue @@ -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; diff --git a/frontend/src/views/panel/templateMarket/index.vue b/frontend/src/views/panel/templateMarket/index.vue index 6e34c31f9f..573666d355 100644 --- a/frontend/src/views/panel/templateMarket/index.vue +++ b/frontend/src/views/panel/templateMarket/index.vue @@ -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{ From 14b1a2994fd5b921b18f394dd67fc4f3b9d59364 Mon Sep 17 00:00:00 2001 From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com> Date: Wed, 3 Aug 2022 19:46:11 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=A1=86=E8=83=8C=E6=99=AF=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/system/user/filterUser.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/system/user/filterUser.vue b/frontend/src/views/system/user/filterUser.vue index 16a89a77d6..8dec097357 100644 --- a/frontend/src/views/system/user/filterUser.vue +++ b/frontend/src/views/system/user/filterUser.vue @@ -421,8 +421,8 @@ export default { } } .user-popper { - background: transparent; padding: 0; + background: #fff; .popper__arrow { display: none; } From df1272d1201318d1c925c6ecee037da340bc0ee0 Mon Sep 17 00:00:00 2001 From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com> Date: Wed, 3 Aug 2022 19:46:11 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E6=A1=86=E8=83=8C=E6=99=AF=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/system/user/filterUser.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/system/user/filterUser.vue b/frontend/src/views/system/user/filterUser.vue index 16a89a77d6..8dec097357 100644 --- a/frontend/src/views/system/user/filterUser.vue +++ b/frontend/src/views/system/user/filterUser.vue @@ -421,8 +421,8 @@ export default { } } .user-popper { - background: transparent; padding: 0; + background: #fff; .popper__arrow { display: none; } From b74970bbf66082fdc22425d69dd06b6b872e66d3 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 3 Aug 2022 20:28:39 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E8=AE=BE=E7=BD=AE):=20=E5=9C=B0=E5=9B=BE?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD=E5=A4=B1?= =?UTF-8?q?=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/system/SysParam/MapSetting/MapSettingLeft.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/system/SysParam/MapSetting/MapSettingLeft.vue b/frontend/src/views/system/SysParam/MapSetting/MapSettingLeft.vue index 203da13b9b..b54f537ec1 100644 --- a/frontend/src/views/system/SysParam/MapSetting/MapSettingLeft.vue +++ b/frontend/src/views/system/SysParam/MapSetting/MapSettingLeft.vue @@ -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) { From 8fc62ab079e6a5cdf85a18c01d3fee367d13f903 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 3 Aug 2022 21:37:57 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE-=E7=AC=A6=E5=8F=B7?= =?UTF-8?q?=E5=9C=B0=E5=9B=BE):=20=E5=90=8C=E6=97=B6=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=AD=97=E6=AE=B5=E5=92=8C=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/service/chart/util/ChartDataBuild.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java b/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java index 4d79b53bbe..ed6085ecc3 100644 --- a/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java +++ b/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java @@ -877,12 +877,11 @@ public class ChartDataBuild { // 表格 public static Map transTableNormal(Map> fieldMap, ChartViewWithBLOBs view, List data, List desensitizationList) { - // List fields = fieldMap.entrySet().stream().map(Map.Entry::getValue).flatMap(List::stream).collect(Collectors.toList()); - // 上面乱序了 + List 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); }