From 4f35f5acb5a4b1911e5a506648619c6bab253ef1 Mon Sep 17 00:00:00 2001 From: junjun Date: Wed, 21 Dec 2022 12:49:29 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D=E6=98=8E=E7=BB=86=E8=A1=A8=E7=BB=93=E6=9E=9C=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E6=9D=A1=E6=95=B0=E4=B8=8E=E5=88=86=E9=A1=B5=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E5=86=B2=E7=AA=81=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/chart/ChartViewService.java | 36 ++++++++++++++----- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java index 24f8b99a41..593e285603 100644 --- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -279,6 +279,12 @@ public class ChartViewService { if (result == null) { DataEaseException.throwException(Translator.get("i18n_chart_delete")); } + DatasetTable datasetTable = dataSetTableService.get(result.getTableId()); + if (ObjectUtils.isNotEmpty(datasetTable)) { + result.setDatasetMode(datasetTable.getMode()); + Datasource datasource = datasourceService.get(datasetTable.getDataSourceId()); + result.setDatasourceType(datasource != null ? datasource.getType() : null); + } return result; } catch (Exception e) { e.printStackTrace(); @@ -645,13 +651,23 @@ public class ChartViewService { // 直连明细表分页 Map mapAttr = gson.fromJson(view.getCustomAttr(), Map.class); Map mapSize = (Map) mapAttr.get("size"); - if (StringUtils.equalsIgnoreCase(view.getType(), "table-info") && table.getMode() == 0 && StringUtils.equalsIgnoreCase((String) mapSize.get("tablePageMode"), "page")) { - if (chartExtRequest.getGoPage() == null) { - chartExtRequest.setGoPage(1L); - } - if (chartExtRequest.getPageSize() == null) { - String pageSize = (String) mapSize.get("tablePageSize"); - chartExtRequest.setPageSize(Long.parseLong(pageSize)); + if (StringUtils.equalsIgnoreCase(view.getType(), "table-info") && table.getMode() == 0) { + if (StringUtils.equalsIgnoreCase((String) mapSize.get("tablePageMode"), "page")) { + if (chartExtRequest.getGoPage() == null) { + chartExtRequest.setGoPage(1L); + } + if (chartExtRequest.getPageSize() == null) { + String pageSize = (String) mapSize.get("tablePageSize"); + chartExtRequest.setPageSize(Math.min(Long.parseLong(pageSize), view.getResultCount().longValue())); + } + } else { + if (StringUtils.equalsIgnoreCase(view.getResultMode(), "custom")) { + chartExtRequest.setGoPage(1L); + chartExtRequest.setPageSize(view.getResultCount().longValue()); + } else { + chartExtRequest.setGoPage(null); + chartExtRequest.setPageSize(null); + } } } else { chartExtRequest.setGoPage(null); @@ -910,7 +926,11 @@ public class ChartViewService { String totalPageSql = null; PageInfo pageInfo = new PageInfo(); pageInfo.setGoPage(chartExtRequest.getGoPage()); - pageInfo.setPageSize(chartExtRequest.getPageSize()); + if (StringUtils.equalsIgnoreCase(view.getResultMode(), "custom")) { + pageInfo.setPageSize(Math.min(view.getResultCount() - (chartExtRequest.getGoPage() - 1) * chartExtRequest.getPageSize(), chartExtRequest.getPageSize())); + } else { + pageInfo.setPageSize(chartExtRequest.getPageSize()); + } List detailFieldList = new ArrayList<>(); String detailFieldSql = null; From f216b25c7bf27912850a41c9c514e4f764fa94ed Mon Sep 17 00:00:00 2001 From: junjun Date: Wed, 21 Dec 2022 13:12:48 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):=20=E6=9F=B1?= =?UTF-8?q?=E7=8A=B6=E5=9B=BE=E3=80=81=E6=8A=98=E7=BA=BF=E5=9B=BE=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E7=BB=93=E6=9E=9C=E9=9A=90=E8=97=8F=E7=A9=BA=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/service/chart/ChartViewService.java | 4 +++- frontend/src/views/chart/chart/common/common_antv.js | 2 +- frontend/src/views/chart/chart/formatter.js | 3 +++ frontend/src/views/chart/components/senior/FunctionCfg.vue | 7 ++----- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java index 593e285603..d06d88f47f 100644 --- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -927,7 +927,9 @@ public class ChartViewService { PageInfo pageInfo = new PageInfo(); pageInfo.setGoPage(chartExtRequest.getGoPage()); if (StringUtils.equalsIgnoreCase(view.getResultMode(), "custom")) { - pageInfo.setPageSize(Math.min(view.getResultCount() - (chartExtRequest.getGoPage() - 1) * chartExtRequest.getPageSize(), chartExtRequest.getPageSize())); + if (StringUtils.equalsIgnoreCase(view.getType(), "table-info") && table.getMode() == 0) { + pageInfo.setPageSize(Math.min(view.getResultCount() - (chartExtRequest.getGoPage() - 1) * chartExtRequest.getPageSize(), chartExtRequest.getPageSize())); + } } else { pageInfo.setPageSize(chartExtRequest.getPageSize()); } diff --git a/frontend/src/views/chart/chart/common/common_antv.js b/frontend/src/views/chart/chart/common/common_antv.js index 32a1e2f091..fa3921da31 100644 --- a/frontend/src/views/chart/chart/common/common_antv.js +++ b/frontend/src/views/chart/chart/common/common_antv.js @@ -371,7 +371,7 @@ export function getTooltip(chart) { } else { res = param.value } - obj.value = res + obj.value = res === null ? '' : res return obj } } diff --git a/frontend/src/views/chart/chart/formatter.js b/frontend/src/views/chart/chart/formatter.js index 9c3be428e3..5a51c89dda 100644 --- a/frontend/src/views/chart/chart/formatter.js +++ b/frontend/src/views/chart/chart/formatter.js @@ -23,6 +23,9 @@ export const formatterType = [ ] export function valueFormatter(value, formatter) { + if (value === null || value === undefined) { + return null + } // 1.unit 2.decimal 3.thousand separator and suffix let result if (formatter.type === 'auto') { diff --git a/frontend/src/views/chart/components/senior/FunctionCfg.vue b/frontend/src/views/chart/components/senior/FunctionCfg.vue index 835e6b48fc..31f96f2968 100644 --- a/frontend/src/views/chart/components/senior/FunctionCfg.vue +++ b/frontend/src/views/chart/components/senior/FunctionCfg.vue @@ -76,11 +76,8 @@ v-model="functionForm.emptyDataStrategy" @change="changeFunctionCfg" > - {{ chart.type.includes('bar')?$t('chart.set_zero'):$t('chart.break_line') }} - {{ $t('chart.set_zero') }} + {{ $t('chart.break_line') }} + {{ $t('chart.set_zero') }} {{ $t('chart.ignore_data') }} From 6b2b4083e4baf5823673d05cd9b0ff310559668f Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 21 Dec 2022 16:00:32 +0800 Subject: [PATCH 3/4] =?UTF-8?q?refactor(=E8=A7=86=E5=9B=BE):=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E6=B7=B1=E8=89=B2=E4=B8=BB=E9=A2=98=E4=B8=8B=E5=9B=BE?= =?UTF-8?q?=E4=BE=8B=E7=BF=BB=E9=A1=B5=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/chart/components/ChartComponent.vue | 7 ++++++ .../chart/components/ChartComponentG2.vue | 24 ++++++++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/frontend/src/views/chart/components/ChartComponent.vue b/frontend/src/views/chart/components/ChartComponent.vue index 5b5c9f6fd4..6b5057a14f 100644 --- a/frontend/src/views/chart/components/ChartComponent.vue +++ b/frontend/src/views/chart/components/ChartComponent.vue @@ -332,6 +332,13 @@ export default { }) return } + if (this.canvasStyleData.panel.themeColor === 'dark') { + chart_option.legend['pageIconColor'] = '#ffffff' + chart_option.legend['pageIconInactiveColor'] = '#8c8c8c' + } else { + chart_option.legend['pageIconColor'] = '#000000' + chart_option.legend['pageIconInactiveColor'] = '#8c8c8c' + } this.myEcharts(chart_option) this.$nextTick(() => (this.linkageActive())) }, diff --git a/frontend/src/views/chart/components/ChartComponentG2.vue b/frontend/src/views/chart/components/ChartComponentG2.vue index 5c1a727b62..650a73cf27 100644 --- a/frontend/src/views/chart/components/ChartComponentG2.vue +++ b/frontend/src/views/chart/components/ChartComponentG2.vue @@ -58,6 +58,7 @@ import { DEFAULT_TITLE_STYLE } from '@/views/chart/chart/chart' import { baseMixOptionAntV } from '@/views/chart/chart/mix/mix_antv' import ChartTitleUpdate from './ChartTitleUpdate.vue' import { equalsAny } from '@/utils/StringUtils' +import { mapState } from 'vuex' export default { name: 'ChartComponentG2', @@ -140,7 +141,10 @@ export default { chartInfo() { const { id, title } = this.chart return { id, title } - } + }, + ...mapState([ + 'canvasStyleData' + ]) }, watch: { chart: { @@ -280,6 +284,24 @@ export default { if (this.myChart && chart.type !== 'liquid' && this.searchCount > 0) { this.myChart.options.animation = false } + if (this.myChart.options.legend) { + let pageNavigatorInactiveFill, pageNavigatorFill + if (this.canvasStyleData.panel.themeColor === 'dark') { + pageNavigatorFill = '#ffffff' + pageNavigatorInactiveFill = '#8c8c8c' + } else { + pageNavigatorFill = '#000000' + pageNavigatorInactiveFill = '#8c8c8c' + } + this.myChart.options.legend['pageNavigator'] = { + marker: { + style: { + inactiveFill: pageNavigatorInactiveFill, // 不能点击的颜色 + fill: pageNavigatorFill // 正常的颜色 + } + } + } + } if (this.antVRenderStatus) { this.myChart.render() From cf5bf866af5d33c8ea4851752e3f71229cab20cd Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 21 Dec 2022 16:16:30 +0800 Subject: [PATCH 4/4] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=AA=E8=A1=A8=E6=9D=BF=E6=8B=96=E6=8B=BD?= =?UTF-8?q?=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/deDrag/index.vue | 28 ++++++++++++------------ 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/frontend/src/components/deDrag/index.vue b/frontend/src/components/deDrag/index.vue index 18d983d94d..2591f61ad6 100644 --- a/frontend/src/components/deDrag/index.vue +++ b/frontend/src/components/deDrag/index.vue @@ -66,7 +66,7 @@ @mousedown.stop.prevent="handleDown(handlei, $event)" @touchstart.stop.prevent="handleTouchDown(handlei, $event)" > - +
- +
@@ -2170,31 +2170,31 @@ export default { } .de-drag-top { - left: 0; - top: 0; + left: 1px; + top: 1px; height: 12px; - width: 100%; + width: calc(100% - 2px); } .de-drag-right { - right: 0; - top: 0; + right: 1px; + top: 1px; width: 16px; - height: 100%; + height: calc(100% - 30px); } .de-drag-bottom { - left: 0; - bottom: 0; + left: 1px; + bottom: 1px; height: 12px; - width: 100%; + width: calc(100% - 2px); } .de-drag-left { - left: 0; - top: 0; + left: 1px; + top: 1px; width: 16px; - height: 100%; + height: calc(100% - 2px); }