From 6e1b76bba51486e91dc61d36fd311a2fc88768cd Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Mon, 31 Oct 2022 16:06:22 +0800 Subject: [PATCH 1/5] =?UTF-8?q?refactor(=E8=A7=86=E5=9B=BE):=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E6=A8=AA=E7=BA=B5=E8=BD=B4=E7=BD=91=E6=A0=BC=E7=BA=BF?= =?UTF-8?q?=E6=B7=B1=E8=89=B2=E8=83=8C=E6=99=AF=E4=B8=8B=E7=9A=84=E9=A2=9C?= =?UTF-8?q?=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/canvas/utils/style.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/canvas/utils/style.js b/frontend/src/components/canvas/utils/style.js index bc34e44c0c..98a1cfbfcf 100644 --- a/frontend/src/components/canvas/utils/style.js +++ b/frontend/src/components/canvas/utils/style.js @@ -8,7 +8,7 @@ export const LIGHT_THEME_PANEL_BACKGROUND = '#F1F3F5' export const LIGHT_THEME_COMPONENT_BACKGROUND = '#FFFFFF' export const DARK_THEME_COLOR_MAIN = '#FFFFFF' -export const DARK_THEME_COLOR_SLAVE1 = '#CCCCCC' +export const DARK_THEME_COLOR_SLAVE1 = '#858383' export const DARK_THEME_PANEL_BACKGROUND = '#030B2E' export const DARK_THEME_COMPONENT_BACKGROUND = '#131E42' export const DARK_THEME_COMPONENT_BACKGROUND_BACK = '#5a5c62' From 0a2b75ea2c6a6f4249f210599119a826bf6a26c1 Mon Sep 17 00:00:00 2001 From: junjun <junjie.xia@fit2cloud.com> Date: Mon, 31 Oct 2022 16:26:38 +0800 Subject: [PATCH 2/5] =?UTF-8?q?refactor(=E8=A7=86=E5=9B=BE):=20=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E5=A4=87=E6=B3=A8=E4=B8=8E=E6=A0=87=E9=A2=98=E5=AF=B9?= =?UTF-8?q?=E9=BD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/components/ChartComponentG2.vue | 2 +- frontend/src/views/chart/components/ChartComponentS2.vue | 2 +- frontend/src/views/chart/components/normal/LabelNormal.vue | 2 +- frontend/src/views/chart/components/normal/LabelNormalText.vue | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/src/views/chart/components/ChartComponentG2.vue b/frontend/src/views/chart/components/ChartComponentG2.vue index 1f9c1f6a5d..fe9cca5dfa 100644 --- a/frontend/src/views/chart/components/ChartComponentG2.vue +++ b/frontend/src/views/chart/components/ChartComponentG2.vue @@ -18,7 +18,7 @@ :style="title_class" style="cursor: default;display: block;" > - <div style="padding:6px 4px 0;margin: 0;"> + <div style="padding:6px 4px 0;margin: 0;display: flex;"> <chart-title-update :chart-info="chartInfo" /> <title-remark v-if="remarkCfg.show" diff --git a/frontend/src/views/chart/components/ChartComponentS2.vue b/frontend/src/views/chart/components/ChartComponentS2.vue index 50cfcb3476..dc66a0e7db 100644 --- a/frontend/src/views/chart/components/ChartComponentS2.vue +++ b/frontend/src/views/chart/components/ChartComponentS2.vue @@ -18,7 +18,7 @@ :style="title_class" style="cursor: default;display: block;" > - <div style="padding:6px 4px 0;margin: 0;"> + <div style="padding:6px 4px 0;margin: 0;display: flex;"> <chart-title-update :chart-info="chartInfo" /> <title-remark v-if="remarkCfg.show" diff --git a/frontend/src/views/chart/components/normal/LabelNormal.vue b/frontend/src/views/chart/components/normal/LabelNormal.vue index a2bce9adfd..a83de2a35a 100644 --- a/frontend/src/views/chart/components/normal/LabelNormal.vue +++ b/frontend/src/views/chart/components/normal/LabelNormal.vue @@ -10,7 +10,7 @@ :style="title_class" style="cursor: default;display: block;" > - <div> + <div style="display: flex;"> <chart-title-update :chart-info="chartInfo" /> <title-remark v-if="chart.render && chart.render === 'antv' && remarkCfg.show" diff --git a/frontend/src/views/chart/components/normal/LabelNormalText.vue b/frontend/src/views/chart/components/normal/LabelNormalText.vue index 131cf96f45..a334114921 100644 --- a/frontend/src/views/chart/components/normal/LabelNormalText.vue +++ b/frontend/src/views/chart/components/normal/LabelNormalText.vue @@ -17,7 +17,7 @@ :style="title_class" style="cursor: default;display: block;" > - <div> + <div style="display: flex;"> <chart-title-update :chart-info="chartInfo" /> <title-remark v-if="chart.render && chart.render === 'antv' && remarkCfg.show" From 527ec29bf87adbec042d5df129e27ef21d561f02 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw <yawen.chen@fit2cloud.com> Date: Mon, 31 Oct 2022 16:40:30 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix(=E5=AE=9A=E6=97=B6=E6=8A=A5=E5=91=8A):?= =?UTF-8?q?=20=E6=95=B0=E5=AD=97=E5=8C=BA=E9=97=B4=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E5=99=A8=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sechedule/strategy/impl/EmailTaskHandler.java | 2 +- .../io/dataease/service/chart/ViewExportExcel.java | 4 ++-- .../service/chart/build/NumberRangeBuild.java | 14 ++++++++++---- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java b/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java index a6dc65e2e8..d96be6a985 100644 --- a/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java +++ b/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java @@ -212,7 +212,7 @@ public class EmailTaskHandler extends TaskHandler implements Job { List<String> viewIdList = Arrays.asList(viewIds.split(",")).stream().map(s -> s.trim()).filter(viewId -> StringUtils.isNotBlank(viewId) && viewOptionIdList.contains(viewId)).collect(Collectors.toList()); PermissionProxy proxy = new PermissionProxy(); proxy.setUserId(user.getUserId()); - files = viewExportExcel.export(panelId, viewIdList, proxy, justExportView); + files = viewExportExcel.export(panelId, viewIdList, proxy, justExportView, taskInstance.getTaskId().toString()); } List<String> channels = null; 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 baa47a3053..d442916cf0 100644 --- a/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java +++ b/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java @@ -40,7 +40,7 @@ public class ViewExportExcel { }.getType(); @DePermissionProxy(paramIndex = 2) - public List<File> export(String panelId, List<String> viewIds, PermissionProxy proxy, Boolean justView) throws Exception { + public List<File> export(String panelId, List<String> viewIds, PermissionProxy proxy, Boolean justView, String taskId) throws Exception { if (CollectionUtils.isEmpty(viewIds)) { return null; } @@ -51,7 +51,7 @@ public class ViewExportExcel { Map<String, ChartExtRequest> stringChartExtRequestMap = buildViewRequest(panelDto, justView); List<File> results = new ArrayList<>(); List<ExcelSheetModel> sheets = viewIds.stream().map(viewId -> viewFiles(viewId, stringChartExtRequestMap.get(viewId))).collect(Collectors.toList()); - File excelFile = ExcelUtils.exportExcel(sheets, panelDto.getName(), panelDto.getId()); + File excelFile = ExcelUtils.exportExcel(sheets, panelDto.getName(), panelDto.getId() + "_" + taskId); results.add(excelFile); return results; } diff --git a/backend/src/main/java/io/dataease/service/chart/build/NumberRangeBuild.java b/backend/src/main/java/io/dataease/service/chart/build/NumberRangeBuild.java index 42ea023770..abcec34ca9 100644 --- a/backend/src/main/java/io/dataease/service/chart/build/NumberRangeBuild.java +++ b/backend/src/main/java/io/dataease/service/chart/build/NumberRangeBuild.java @@ -7,8 +7,10 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.stream.Collectors; @Service("numberRangeWidget") public class NumberRangeBuild extends FilterBuildTemplate { @@ -24,18 +26,22 @@ public class NumberRangeBuild extends FilterBuildTemplate { Map<String, Object> options = null; List<String> values = null; - if((optionObj = component.get("options")) != null && (valueObj = (options = (Map<String, Object>) optionObj).get("value")) != null && CollectionUtil.isNotEmpty((values = (List<String>) valueObj))) { + if ((optionObj = component.get("options")) != null && (valueObj = (options = (Map<String, Object>) optionObj).get("value")) != null) { + if (valueObj instanceof List) { + values = (List<String>) valueObj; + } else { + return result; + } String min = values.get(0); String max = null; - if(values.size() > 1) { + if (values.size() > 1) { max = values.get(1); } result.setOperator("between"); - result.getValue().set(0, min); - result.getValue().set(1, max); if (StringUtils.isNotBlank(min) && StringUtils.isNotBlank(max)) { + result.setValue(values); return result; } From 64b0b91fe382b27a59f0d21af119ce43376abee6 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Mon, 31 Oct 2022 16:53:34 +0800 Subject: [PATCH 4/5] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E4=B8=BB=E9=A2=98=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E9=85=8D=E8=89=B2=E3=80=81=E6=96=87=E6=A1=88=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/resources/db/migration/V42__1.16.sql | 4 ++++ frontend/src/lang/en.js | 1 + frontend/src/lang/tw.js | 1 + frontend/src/lang/zh.js | 1 + frontend/src/views/chart/chart/chart.js | 4 ++-- .../panel/SubjectSetting/PanelStyle/ComponentStyle.vue | 6 +++--- 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/backend/src/main/resources/db/migration/V42__1.16.sql b/backend/src/main/resources/db/migration/V42__1.16.sql index 715e8f55b4..06804d06f3 100644 --- a/backend/src/main/resources/db/migration/V42__1.16.sql +++ b/backend/src/main/resources/db/migration/V42__1.16.sql @@ -281,3 +281,7 @@ RETURN 'success'; END ;; delimiter ; + +UPDATE `panel_subject` +SET `details` = '{\"width\":1600,\"height\":900,\"scale\":100,\"scaleWidth\":100,\"scaleHeight\":100,\"selfAdaption\":true,\"auxiliaryMatrix\":true,\"openCommonStyle\":true,\"panel\":{\"themeColor\":\"dark\",\"color\":\"#030B2E\",\"imageUrl\":{},\"backgroundType\":\"color\",\"gap\":\"yes\",\"resultMode\":\"all\",\"resultCount\":1000},\"aidedDesign\":{\"showGrid\":false,\"matrixBase\":4},\"refreshViewLoading\":true,\"refreshUnit\":\"minute\",\"refreshTime\":5,\"themeId\":\"f9f46a50-58f5-11ed-889b-91ab7371e877\",\"chartInfo\":{\"chartTitle\":{\"show\":true,\"fontSize\":\"18\",\"color\":\"#FFFFFF\",\"hPosition\":\"left\",\"vPosition\":\"top\",\"isItalic\":false,\"isBolder\":true,\"remarkShow\":false,\"remark\":\"\",\"remarkBackgroundColor\":\"#5A5C62\",\"fontFamily\":\"Microsoft YaHei\",\"letterSpace\":\"0\",\"fontShadow\":false},\"chartColor\":{\"value\":\"default\",\"colors\":[\"#5470c6\",\"#91cc75\",\"#fac858\",\"#ee6666\",\"#73c0de\",\"#3ba272\",\"#fc8452\",\"#9a60b4\",\"#ea7ccc\"],\"alpha\":100,\"tableHeaderBgColor\":\"#5470C6\",\"tableItemBgColor\":\"#131E42\",\"tableFontColor\":\"#ffffff\",\"tableStripe\":true,\"dimensionColor\":\"#ffffff\",\"quotaColor\":\"#5470C6\",\"tableBorderColor\":\"#CCCCCC\",\"seriesColors\":[],\"areaBorderColor\":\"#EBEEF5\",\"tableHeaderFontColor\":\"#ffffff\",\"modifyName\":\"colors\"},\"chartCommonStyle\":{\"backgroundColorSelect\":true,\"color\":\"#131E42\",\"alpha\":100,\"borderRadius\":5,\"innerPadding\":0},\"filterStyle\":{\"horizontal\":\"left\",\"vertical\":\"top\",\"color\":\"#FFFFFF\",\"brColor\":\"#4E4B4B\",\"wordColor\":\"#FFFFFF\",\"innerBgColor\":\"#131E42\"},\"tabStyle\":{\"headFontColor\":\"#FFFFFF\",\"headFontActiveColor\":\"#FFFFFF\",\"headBorderColor\":\"#FFFFFF\",\"headBorderActiveColor\":\"#FFFFFF\",\"headPosition\":\"left\"}}}' +WHERE `id` = 'system_2'; diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 29d3cb0bc2..996fec93ea 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -913,6 +913,7 @@ export default { password_input_error: 'Original password input error' }, chart: { + chart_background: 'Component background', solid_color: 'Solid color', split_gradient: 'Split gradient', continuous_gradient: 'Continuous gradient', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 2d7e10c045..dd773ea421 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -913,6 +913,7 @@ export default { password_input_error: '原始密碼輸入錯誤' }, chart: { + chart_background: '組件背景', solid_color: '純色', split_gradient: '分離漸變', continuous_gradient: '連續漸變', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index c0f7053b22..40b0369420 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -912,6 +912,7 @@ export default { password_input_error: '原始密码输入错误' }, chart: { + chart_background: '组件背景', solid_color: '纯色', split_gradient: '分离渐变', continuous_gradient: '连续渐变', diff --git a/frontend/src/views/chart/chart/chart.js b/frontend/src/views/chart/chart/chart.js index e7056cccce..256ba7924e 100644 --- a/frontend/src/views/chart/chart/chart.js +++ b/frontend/src/views/chart/chart/chart.js @@ -1,8 +1,8 @@ export const DEFAULT_TAB_COLOR_CASE_DARK = { headFontColor: '#FFFFFF', headFontActiveColor: '#FFFFFF', - headBorderColor: '#FFFFFF', - headBorderActiveColor: '#FFFFFF', + headBorderColor: '#131E42', + headBorderActiveColor: '#131E42', headPosition: 'left' } diff --git a/frontend/src/views/panel/SubjectSetting/PanelStyle/ComponentStyle.vue b/frontend/src/views/panel/SubjectSetting/PanelStyle/ComponentStyle.vue index 6e7de0d7be..f69f7d9746 100644 --- a/frontend/src/views/panel/SubjectSetting/PanelStyle/ComponentStyle.vue +++ b/frontend/src/views/panel/SubjectSetting/PanelStyle/ComponentStyle.vue @@ -7,7 +7,7 @@ style="margin-right: 10px;float: right" @change="themeChange('backgroundColorSelect')" > - <span style="font-size: 12px">{{ $t('panel.color') }}</span> + <span style="font-size: 12px">{{ $t('chart.chart_background') }}</span> </el-checkbox> </el-col> <el-col :span="10"> @@ -100,10 +100,10 @@ export default { font-size: 12px; } .custom-item{ - width: 70px; + width: 90px; } .custom-item-value{ - width: calc(100% - 70px);; + width: calc(100% - 90px);; } </style> From f91ad37e764f838cd6aaaf8567d82a5bdf83a84b Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Mon, 31 Oct 2022 17:13:40 +0800 Subject: [PATCH 5/5] =?UTF-8?q?refactor:=20=E4=BF=AE=E6=94=B9=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E4=B8=BB=E9=A2=98=E9=80=89=E9=A1=B9=E5=8D=A1=E9=85=8D?= =?UTF-8?q?=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/chart/chart.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/src/views/chart/chart/chart.js b/frontend/src/views/chart/chart/chart.js index 256ba7924e..6442254fae 100644 --- a/frontend/src/views/chart/chart/chart.js +++ b/frontend/src/views/chart/chart/chart.js @@ -24,7 +24,7 @@ export const DEFAULT_COLOR_CASE = { tableFontColor: '#000000', tableStripe: true, dimensionColor: '#000000', - quotaColor: '#4E81BB', + quotaColor: '#5470c6', tableBorderColor: '#E6E7E4', seriesColors: [], // 格式:{"name":"s1","color":"","isCustom":false} areaBorderColor: '#303133' @@ -34,12 +34,12 @@ export const DEFAULT_COLOR_CASE_DARK = { value: 'default', colors: ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc'], alpha: 100, - tableHeaderBgColor: '#4E81BB', + tableHeaderBgColor: '#5470c6', tableItemBgColor: '#131E42', tableFontColor: '#ffffff', tableStripe: true, dimensionColor: '#ffffff', - quotaColor: '#4E81BB', + quotaColor: '#5470c6', tableBorderColor: '#CCCCCC', seriesColors: [], // 格式:{"name":"s1","color":"","isCustom":false} areaBorderColor: '#EBEEF5'