From f786616c774a2511109bba037d796dd1766291e7 Mon Sep 17 00:00:00 2001 From: wisonic-s Date: Fri, 8 Sep 2023 17:30:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20Doris=20=E6=97=A5=E6=9C=9F=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=8C=96=E5=B9=B4=E5=AD=A3=E5=BA=A6=E6=97=A0=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/provider/engine/doris/DorisQueryProvider.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java b/core/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java index b68fb346ac..25a98a15d5 100644 --- a/core/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java +++ b/core/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java @@ -1220,8 +1220,8 @@ public class DorisQueryProvider extends QueryProvider { if (x.getDeExtractType() == 0) { if (StringUtils.equalsIgnoreCase(x.getDateStyle(), "y_Q")) { fieldName = String.format(format, - String.format(DorisConstants.DATE_FORMAT, String.format(DorisConstants.STR_TO_DATE, originField, DorisConstants.DEFAULT_DATE_FORMAT), "%Y"), - String.format(DorisConstants.QUARTER, String.format(DorisConstants.STR_TO_DATE, originField, DorisConstants.DEFAULT_DATE_FORMAT))); + String.format(DorisConstants.DATE_FORMAT, String.format(DorisConstants.STR_TO_DATE, originField, StringUtils.isNotEmpty(x.getDateFormat()) ? x.getDateFormat() : DorisConstants.DEFAULT_DATE_FORMAT), "%Y"), + String.format(DorisConstants.QUARTER, String.format(DorisConstants.STR_TO_DATE, originField, StringUtils.isNotEmpty(x.getDateFormat()) ? x.getDateFormat() : DorisConstants.DEFAULT_DATE_FORMAT))); } else { fieldName = String.format(DorisConstants.DATE_FORMAT, String.format(DorisConstants.STR_TO_DATE, originField, StringUtils.isNotEmpty(x.getDateFormat()) ? x.getDateFormat() : DorisConstants.DEFAULT_DATE_FORMAT), format); } From 726168d526bcbda2b84c4c931c8cb8c08ff09f6d Mon Sep 17 00:00:00 2001 From: wisonic-s Date: Fri, 8 Sep 2023 17:39:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E6=A1=91=E5=9F=BA=E5=9B=BE=E5=92=8C?= =?UTF-8?q?=E6=B7=B7=E5=90=88=E5=9B=BE=E6=A0=87=E9=A2=98=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=97=A0=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/antv/chartmix/index.vue | 1 - .../src/views/antv/sankey/index.vue | 15 ++------------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/index.vue b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/index.vue index 70f57ce6dd..29e5a6af84 100644 --- a/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/index.vue +++ b/extensions/dataease-extensions-view/view-chartmix/view-chartmix-frontend/src/views/antv/chartmix/index.vue @@ -242,7 +242,6 @@ export default { this.titleClass.textAlign = customStyle.text.hPosition this.titleClass.fontStyle = customStyle.text.isItalic ? 'italic' : 'normal' this.titleClass.fontWeight = customStyle.text.isBolder ? 'bold' : 'normal' - this.titleClass.fontSize = customStyle.text.isBolder ? 'bold' : 'normal' this.titleClass.fontFamily = customStyle.text.fontFamily ? this.CHART_CONT_FAMILY_MAP[customStyle.text.fontFamily] : 'Microsoft YaHei' this.titleClass.letterSpacing = (customStyle.text.letterSpace ? customStyle.text.letterSpace : '0') + 'px' diff --git a/extensions/dataease-extensions-view/view-sankey/view-sankey-frontend/src/views/antv/sankey/index.vue b/extensions/dataease-extensions-view/view-sankey/view-sankey-frontend/src/views/antv/sankey/index.vue index 3a51f98150..b756954650 100644 --- a/extensions/dataease-extensions-view/view-sankey/view-sankey-frontend/src/views/antv/sankey/index.vue +++ b/extensions/dataease-extensions-view/view-sankey/view-sankey-frontend/src/views/antv/sankey/index.vue @@ -9,12 +9,12 @@ v-if="chart.type && antVRenderStatus" v-show="title_show" ref="title" - :style="title_class" + :style="titleClass" style="cursor: default;display: block;" >