From 533c4855878efd8562a74f646f9b46b147c022e7 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Mon, 31 Oct 2022 15:26:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?refactor(=E8=A7=86=E5=9B=BE):=20=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E9=A2=98=E5=A4=87=E6=B3=A8=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=97=B6=E6=98=BE=E7=A4=BA=E5=A1=AB=E5=85=85=E8=83=8C=E6=99=AF?= =?UTF-8?q?=EF=BC=8C=E4=B8=BB=E9=A2=98=E8=89=B2=E5=88=87=E6=8D=A2=E4=BF=9D?= =?UTF-8?q?=E7=95=99=E5=A4=87=E6=B3=A8=E7=9A=84=E6=98=BE=E7=A4=BA=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/canvas/utils/style.js | 2 +- frontend/src/views/chart/chart/chart.js | 2 +- .../component-style/TitleSelectorAntV.vue | 1 + .../component-style/dialog/RemarkEditor.vue | 27 +++++++++---------- frontend/src/views/chart/view/TitleRemark.vue | 1 + 5 files changed, 16 insertions(+), 17 deletions(-) diff --git a/frontend/src/components/canvas/utils/style.js b/frontend/src/components/canvas/utils/style.js index 0cfe1137af..bc34e44c0c 100644 --- a/frontend/src/components/canvas/utils/style.js +++ b/frontend/src/components/canvas/utils/style.js @@ -361,7 +361,7 @@ export function adaptCurTheme(customStyle, customAttr, chartType) { } } customAttr['color'] = { ...canvasStyle.chartInfo.chartColor } - customStyle['text'] = { ...canvasStyle.chartInfo.chartTitle, title: customStyle['text']['title'], show: customStyle['text']['show'] } + customStyle['text'] = { ...canvasStyle.chartInfo.chartTitle, title: customStyle['text']['title'], show: customStyle['text']['show'], remarkShow: customStyle['text']['remarkShow'], remark: customStyle['text']['remark'] } if (customStyle.background) { delete customStyle.background } diff --git a/frontend/src/views/chart/chart/chart.js b/frontend/src/views/chart/chart/chart.js index 2ff280ca1a..e7056cccce 100644 --- a/frontend/src/views/chart/chart/chart.js +++ b/frontend/src/views/chart/chart/chart.js @@ -211,7 +211,7 @@ export const DEFAULT_TITLE_STYLE_DARK = { isBolder: true, remarkShow: false, remark: '', - remarkBackgroundColor: '#ffffffff', + remarkBackgroundColor: '#5A5C62', fontFamily: 'Microsoft YaHei', letterSpace: '0', fontShadow: false diff --git a/frontend/src/views/chart/components/component-style/TitleSelectorAntV.vue b/frontend/src/views/chart/components/component-style/TitleSelectorAntV.vue index 738bbae4b4..3168fe96f8 100644 --- a/frontend/src/views/chart/components/component-style/TitleSelectorAntV.vue +++ b/frontend/src/views/chart/components/component-style/TitleSelectorAntV.vue @@ -194,6 +194,7 @@ >
-
- -
+
@@ -30,6 +28,10 @@ export default { type: String, required: true }, + background: { + type: String, + required: false + }, showTable: { type: Boolean, default: true @@ -100,14 +102,9 @@ export default { return style }, commonStyle() { - const style = { - width: '100%', - height: '100%' + return { + background: this.background } - if (this.curComponent.commonBackground && this.curComponent.commonBackground.backgroundColorSelect) { - style['background-color'] = hexColorToRGBA(this.curComponent.commonBackground.color, this.curComponent.commonBackground.alpha) - } - return style }, ... mapState([ diff --git a/frontend/src/views/chart/view/TitleRemark.vue b/frontend/src/views/chart/view/TitleRemark.vue index 433d4d4763..151bb41d36 100644 --- a/frontend/src/views/chart/view/TitleRemark.vue +++ b/frontend/src/views/chart/view/TitleRemark.vue @@ -39,6 +39,7 @@ export default { max-height: 200px; overflow-y: auto; padding: 10px; + color: #000000; border-radius: 4px; } ::-webkit-scrollbar { From fc8b215ea68a16696815cad867a1543df0834320 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Mon, 31 Oct 2022 15:28:13 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix(=E5=AE=9A=E6=97=B6=E6=8A=A5=E5=91=8A):?= =?UTF-8?q?=20resultMode=E5=A2=9E=E5=8A=A0=E9=9D=9E=E7=A9=BA=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/dataease/service/chart/ViewExportExcel.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java b/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java index 60129c6f5a..baa47a3053 100644 --- a/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java +++ b/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java @@ -64,7 +64,10 @@ public class ViewExportExcel { Map map = gson.fromJson(panelStyle, Map.class); Map panelMap = (LinkedTreeMap) map.get("panel"); double resultCount = Double.parseDouble(panelMap.get("resultCount").toString()); - String resultMode = panelMap.get("resultMode").toString(); + String resultMode = null; + if (ObjectUtils.isNotEmpty(panelMap.get("resultMode"))) { + resultMode = panelMap.get("resultMode").toString(); + } Map result = new HashMap<>(); Map> panelFilters = justView ? FilterBuildTemplate.buildFilters(components) : FilterBuildTemplate.buildEmpty(components); From d7fd0471eef62301386ee817c79ea817134fe216 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Mon, 31 Oct 2022 15:37:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix(=E5=AE=9A=E6=97=B6=E6=8A=A5=E5=91=8A):?= =?UTF-8?q?=20=E4=B8=A4=E4=B8=AA=E4=BB=BB=E5=8A=A1=E9=80=89=E5=90=8C?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E4=BB=AA=E8=A1=A8=E6=9D=BF=E4=B8=8D=E5=90=8C?= =?UTF-8?q?=E8=A7=86=E5=9B=BE=E6=95=B0=E6=8D=AE=E8=A6=86=E7=9B=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/io/dataease/commons/utils/ExcelUtils.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/backend/src/main/java/io/dataease/commons/utils/ExcelUtils.java b/backend/src/main/java/io/dataease/commons/utils/ExcelUtils.java index 78394de43e..e03382babe 100644 --- a/backend/src/main/java/io/dataease/commons/utils/ExcelUtils.java +++ b/backend/src/main/java/io/dataease/commons/utils/ExcelUtils.java @@ -68,6 +68,9 @@ public class ExcelUtils { if (StringUtils.isNotBlank(folderId)) { folderPath = BASE_ROOT + folderId + "/"; } + + folderPath += Thread.currentThread().getId() + "/"; + if (!FileUtil.exist(folderPath)) { FileUtil.mkdir(folderPath); }