From 6a381dd7820558ca6d8d808132832322b00123d4 Mon Sep 17 00:00:00 2001 From: junjun Date: Tue, 31 May 2022 16:52:42 +0800 Subject: [PATCH 01/10] =?UTF-8?q?refactor:=20=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/dataset/group/Group.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frontend/src/views/dataset/group/Group.vue b/frontend/src/views/dataset/group/Group.vue index 91b952da3d..10d34fc7eb 100644 --- a/frontend/src/views/dataset/group/Group.vue +++ b/frontend/src/views/dataset/group/Group.vue @@ -531,6 +531,9 @@ export default { if (!userCache) { this.tData = res.data } + this.$nextTick(() => { + this.$refs.datasetTreeRef.filter(this.filterText) + }) }) }, From 9371b19e5e32073a8d1709323dfe8bbb76bad3f1 Mon Sep 17 00:00:00 2001 From: junjun Date: Tue, 31 May 2022 16:53:40 +0800 Subject: [PATCH 02/10] =?UTF-8?q?fix:=20=E6=81=A2=E5=A4=8D=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E8=BD=B4=E5=80=BC=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/chart/util.js | 75 ++++++++++++++++++++------ 1 file changed, 58 insertions(+), 17 deletions(-) diff --git a/frontend/src/views/chart/chart/util.js b/frontend/src/views/chart/chart/util.js index 81371bf86a..17375a8f6f 100644 --- a/frontend/src/views/chart/chart/util.js +++ b/frontend/src/views/chart/chart/util.js @@ -342,6 +342,7 @@ export const TYPE_CONFIGS = [ 'position', 'name', 'nameTextStyle', + 'axisValue', 'splitLine', 'axisForm', 'axisLabel' @@ -415,6 +416,7 @@ export const TYPE_CONFIGS = [ 'position', 'name', 'nameTextStyle', + 'axisValue', 'splitLine', 'axisForm', 'axisLabel' @@ -488,6 +490,7 @@ export const TYPE_CONFIGS = [ 'position', 'name', 'nameTextStyle', + 'axisValue', 'splitLine', 'axisForm', 'axisLabel' @@ -560,6 +563,7 @@ export const TYPE_CONFIGS = [ 'position', 'name', 'nameTextStyle', + 'axisValue', 'splitLine', 'axisForm', 'axisLabel' @@ -625,6 +629,7 @@ export const TYPE_CONFIGS = [ 'position', 'name', 'nameTextStyle', + 'axisValue', 'splitLine', 'axisForm', 'axisLabel' @@ -764,7 +769,6 @@ export const TYPE_CONFIGS = [ 'position', 'name', 'nameTextStyle', - 'axisValue', 'splitLine', 'axisForm', 'axisLabel' @@ -1069,6 +1073,7 @@ export const TYPE_CONFIGS = [ 'position', 'name', 'nameTextStyle', + 'axisValue', 'splitLine', 'axisForm', 'axisLabel' @@ -1367,18 +1372,23 @@ export const TYPE_CONFIGS = [ 'formatter' ], 'x-axis-selector': [ + 'axisForm', 'show', 'position', 'name', 'nameTextStyle', - 'splitLine' + 'splitLine', + 'axisLabel' ], 'y-axis-selector': [ + 'axisForm', 'show', 'position', 'name', 'nameTextStyle', - 'splitLine' + 'axisValue', + 'splitLine', + 'axisLabel' ], 'title-selector': [ 'show', @@ -1441,18 +1451,23 @@ export const TYPE_CONFIGS = [ 'formatter' ], 'x-axis-selector': [ + 'axisForm', 'show', 'position', 'name', 'nameTextStyle', - 'splitLine' + 'splitLine', + 'axisLabel' ], 'y-axis-selector': [ + 'axisForm', 'show', 'position', 'name', 'nameTextStyle', - 'splitLine' + 'axisValue', + 'splitLine', + 'axisLabel' ], 'title-selector': [ 'show', @@ -1527,14 +1542,17 @@ export const TYPE_CONFIGS = [ 'position', 'name', 'nameTextStyle', - 'splitLine' + 'splitLine', + 'axisLabel' ], 'y-axis-selector': [ 'show', 'position', 'name', 'nameTextStyle', - 'splitLine' + 'axisValue', + 'splitLine', + 'axisLabel' ], 'y-axis-ext-selector': [ 'show', @@ -1605,18 +1623,23 @@ export const TYPE_CONFIGS = [ 'formatter' ], 'x-axis-selector': [ + 'axisForm', 'show', 'position', 'name', 'nameTextStyle', - 'splitLine' + 'splitLine', + 'axisLabel' ], 'y-axis-selector': [ + 'axisForm', 'show', 'position', 'name', 'nameTextStyle', - 'splitLine' + 'axisValue', + 'splitLine', + 'axisLabel' ], 'title-selector': [ 'show', @@ -1679,18 +1702,23 @@ export const TYPE_CONFIGS = [ 'formatter' ], 'x-axis-selector': [ + 'axisForm', 'show', 'position', 'name', 'nameTextStyle', - 'splitLine' + 'splitLine', + 'axisLabel' ], 'y-axis-selector': [ + 'axisForm', 'show', 'position', 'name', 'nameTextStyle', - 'splitLine' + 'axisValue', + 'splitLine', + 'axisLabel' ], 'title-selector': [ 'show', @@ -1753,19 +1781,23 @@ export const TYPE_CONFIGS = [ 'formatter' ], 'x-axis-selector': [ + 'axisForm', 'show', 'position', 'name', 'nameTextStyle', 'axisValue', - 'splitLine' + 'splitLine', + 'axisLabel' ], 'y-axis-selector': [ + 'axisForm', 'show', 'position', 'name', 'nameTextStyle', - 'splitLine' + 'splitLine', + 'axisLabel' ], 'title-selector': [ 'show', @@ -1828,20 +1860,24 @@ export const TYPE_CONFIGS = [ 'formatter' ], 'x-axis-selector': [ + 'axisForm', 'show', 'position', 'name', 'nameTextStyle', 'axisValue', - 'splitLine' + 'splitLine', + 'axisLabel' ], 'y-axis-selector': [ + 'axisForm', 'show', 'position', 'name', 'nameTextStyle', 'axisValue', - 'splitLine' + 'splitLine', + 'axisLabel' ], 'title-selector': [ 'show', @@ -2134,18 +2170,23 @@ export const TYPE_CONFIGS = [ 'formatter' ], 'x-axis-selector': [ + 'axisForm', 'show', 'position', 'name', 'nameTextStyle', - 'splitLine' + 'splitLine', + 'axisLabel' ], 'y-axis-selector': [ + 'axisForm', 'show', 'position', 'name', 'nameTextStyle', - 'splitLine' + 'axisValue', + 'splitLine', + 'axisLabel' ], 'title-selector': [ 'show', From d69ebb8ea735fe3607743c7a55d327bf3099402f Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 31 May 2022 16:54:19 +0800 Subject: [PATCH 03/10] =?UTF-8?q?refactor:=20=E6=A8=A1=E6=9D=BF=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E9=80=82=E9=85=8D=E6=96=B0=E7=9A=84=E8=A7=86=E5=9B=BE?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/dto/chart/ChartViewDTO.java | 9 +++++++++ .../src/views/chart/chart/table/table-info.js | 13 ++++++++----- frontend/src/views/chart/chart/util.js | 16 +++++++++------- 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/backend/src/main/java/io/dataease/dto/chart/ChartViewDTO.java b/backend/src/main/java/io/dataease/dto/chart/ChartViewDTO.java index b63b12c58e..2c6da656f9 100644 --- a/backend/src/main/java/io/dataease/dto/chart/ChartViewDTO.java +++ b/backend/src/main/java/io/dataease/dto/chart/ChartViewDTO.java @@ -1,5 +1,6 @@ package io.dataease.dto.chart; +import com.google.gson.annotations.SerializedName; import io.dataease.plugins.common.base.domain.ChartViewWithBLOBs; import io.dataease.plugins.common.request.chart.ChartExtFilterRequest; import io.swagger.annotations.ApiModelProperty; @@ -32,4 +33,12 @@ public class ChartViewDTO extends ChartViewWithBLOBs { private List drillFilters; @ApiModelProperty("视图存放位置") private String position; + @SerializedName("xaxis") + private String xAxis; + @SerializedName("xaxisExt") + private String xAxisExt; + @SerializedName("yaxis") + private String yAxis; + @SerializedName("yaxisExt") + private String yAxisExt; } diff --git a/frontend/src/views/chart/chart/table/table-info.js b/frontend/src/views/chart/chart/table/table-info.js index 4c96177f2d..8751c8eea9 100644 --- a/frontend/src/views/chart/chart/table/table-info.js +++ b/frontend/src/views/chart/chart/table/table-info.js @@ -412,12 +412,15 @@ function getCurrentField(valueFieldList, field) { } catch (err) { list = JSON.parse(JSON.stringify(valueFieldList)) } - for (let i = 0; i < list.length; i++) { - const f = list[i] - if (field.dataeaseName === f.dataeaseName) { - res = f - break + if (list) { + for (let i = 0; i < list.length; i++) { + const f = list[i] + if (field.dataeaseName === f.dataeaseName) { + res = f + break + } } } + return res } diff --git a/frontend/src/views/chart/chart/util.js b/frontend/src/views/chart/chart/util.js index 81371bf86a..a120fae960 100644 --- a/frontend/src/views/chart/chart/util.js +++ b/frontend/src/views/chart/chart/util.js @@ -2355,13 +2355,15 @@ export function getColors(chart, colors, reset) { } else { series = JSON.parse(chart.yaxis) } - for (let i = 0; i < series.length; i++) { - const s = series[i] - seriesColors.push({ - name: s.name, - color: colors[i % colors.length], - isCustom: false - }) + if (series) { + for (let i = 0; i < series.length; i++) { + const s = series[i] + seriesColors.push({ + name: s.name, + color: colors[i % colors.length], + isCustom: false + }) + } } } else { if (chart.data) { From 0d1863741ec8235615b57aa1453ecfd4804ca3d3 Mon Sep 17 00:00:00 2001 From: junjun Date: Tue, 31 May 2022 16:52:42 +0800 Subject: [PATCH 04/10] =?UTF-8?q?refactor:=20=E6=95=B0=E6=8D=AE=E9=9B=86?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/dataset/group/Group.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frontend/src/views/dataset/group/Group.vue b/frontend/src/views/dataset/group/Group.vue index 91b952da3d..10d34fc7eb 100644 --- a/frontend/src/views/dataset/group/Group.vue +++ b/frontend/src/views/dataset/group/Group.vue @@ -531,6 +531,9 @@ export default { if (!userCache) { this.tData = res.data } + this.$nextTick(() => { + this.$refs.datasetTreeRef.filter(this.filterText) + }) }) }, From dee05a5d94fd6600f6e32d6d3ffd4081326d1931 Mon Sep 17 00:00:00 2001 From: junjun Date: Tue, 31 May 2022 16:53:40 +0800 Subject: [PATCH 05/10] =?UTF-8?q?fix:=20=E6=81=A2=E5=A4=8D=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E8=BD=B4=E5=80=BC=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/chart/util.js | 75 ++++++++++++++++++++------ 1 file changed, 58 insertions(+), 17 deletions(-) diff --git a/frontend/src/views/chart/chart/util.js b/frontend/src/views/chart/chart/util.js index 81371bf86a..17375a8f6f 100644 --- a/frontend/src/views/chart/chart/util.js +++ b/frontend/src/views/chart/chart/util.js @@ -342,6 +342,7 @@ export const TYPE_CONFIGS = [ 'position', 'name', 'nameTextStyle', + 'axisValue', 'splitLine', 'axisForm', 'axisLabel' @@ -415,6 +416,7 @@ export const TYPE_CONFIGS = [ 'position', 'name', 'nameTextStyle', + 'axisValue', 'splitLine', 'axisForm', 'axisLabel' @@ -488,6 +490,7 @@ export const TYPE_CONFIGS = [ 'position', 'name', 'nameTextStyle', + 'axisValue', 'splitLine', 'axisForm', 'axisLabel' @@ -560,6 +563,7 @@ export const TYPE_CONFIGS = [ 'position', 'name', 'nameTextStyle', + 'axisValue', 'splitLine', 'axisForm', 'axisLabel' @@ -625,6 +629,7 @@ export const TYPE_CONFIGS = [ 'position', 'name', 'nameTextStyle', + 'axisValue', 'splitLine', 'axisForm', 'axisLabel' @@ -764,7 +769,6 @@ export const TYPE_CONFIGS = [ 'position', 'name', 'nameTextStyle', - 'axisValue', 'splitLine', 'axisForm', 'axisLabel' @@ -1069,6 +1073,7 @@ export const TYPE_CONFIGS = [ 'position', 'name', 'nameTextStyle', + 'axisValue', 'splitLine', 'axisForm', 'axisLabel' @@ -1367,18 +1372,23 @@ export const TYPE_CONFIGS = [ 'formatter' ], 'x-axis-selector': [ + 'axisForm', 'show', 'position', 'name', 'nameTextStyle', - 'splitLine' + 'splitLine', + 'axisLabel' ], 'y-axis-selector': [ + 'axisForm', 'show', 'position', 'name', 'nameTextStyle', - 'splitLine' + 'axisValue', + 'splitLine', + 'axisLabel' ], 'title-selector': [ 'show', @@ -1441,18 +1451,23 @@ export const TYPE_CONFIGS = [ 'formatter' ], 'x-axis-selector': [ + 'axisForm', 'show', 'position', 'name', 'nameTextStyle', - 'splitLine' + 'splitLine', + 'axisLabel' ], 'y-axis-selector': [ + 'axisForm', 'show', 'position', 'name', 'nameTextStyle', - 'splitLine' + 'axisValue', + 'splitLine', + 'axisLabel' ], 'title-selector': [ 'show', @@ -1527,14 +1542,17 @@ export const TYPE_CONFIGS = [ 'position', 'name', 'nameTextStyle', - 'splitLine' + 'splitLine', + 'axisLabel' ], 'y-axis-selector': [ 'show', 'position', 'name', 'nameTextStyle', - 'splitLine' + 'axisValue', + 'splitLine', + 'axisLabel' ], 'y-axis-ext-selector': [ 'show', @@ -1605,18 +1623,23 @@ export const TYPE_CONFIGS = [ 'formatter' ], 'x-axis-selector': [ + 'axisForm', 'show', 'position', 'name', 'nameTextStyle', - 'splitLine' + 'splitLine', + 'axisLabel' ], 'y-axis-selector': [ + 'axisForm', 'show', 'position', 'name', 'nameTextStyle', - 'splitLine' + 'axisValue', + 'splitLine', + 'axisLabel' ], 'title-selector': [ 'show', @@ -1679,18 +1702,23 @@ export const TYPE_CONFIGS = [ 'formatter' ], 'x-axis-selector': [ + 'axisForm', 'show', 'position', 'name', 'nameTextStyle', - 'splitLine' + 'splitLine', + 'axisLabel' ], 'y-axis-selector': [ + 'axisForm', 'show', 'position', 'name', 'nameTextStyle', - 'splitLine' + 'axisValue', + 'splitLine', + 'axisLabel' ], 'title-selector': [ 'show', @@ -1753,19 +1781,23 @@ export const TYPE_CONFIGS = [ 'formatter' ], 'x-axis-selector': [ + 'axisForm', 'show', 'position', 'name', 'nameTextStyle', 'axisValue', - 'splitLine' + 'splitLine', + 'axisLabel' ], 'y-axis-selector': [ + 'axisForm', 'show', 'position', 'name', 'nameTextStyle', - 'splitLine' + 'splitLine', + 'axisLabel' ], 'title-selector': [ 'show', @@ -1828,20 +1860,24 @@ export const TYPE_CONFIGS = [ 'formatter' ], 'x-axis-selector': [ + 'axisForm', 'show', 'position', 'name', 'nameTextStyle', 'axisValue', - 'splitLine' + 'splitLine', + 'axisLabel' ], 'y-axis-selector': [ + 'axisForm', 'show', 'position', 'name', 'nameTextStyle', 'axisValue', - 'splitLine' + 'splitLine', + 'axisLabel' ], 'title-selector': [ 'show', @@ -2134,18 +2170,23 @@ export const TYPE_CONFIGS = [ 'formatter' ], 'x-axis-selector': [ + 'axisForm', 'show', 'position', 'name', 'nameTextStyle', - 'splitLine' + 'splitLine', + 'axisLabel' ], 'y-axis-selector': [ + 'axisForm', 'show', 'position', 'name', 'nameTextStyle', - 'splitLine' + 'axisValue', + 'splitLine', + 'axisLabel' ], 'title-selector': [ 'show', From d03245ddc32bb7a361080230a47649512022a633 Mon Sep 17 00:00:00 2001 From: junjun Date: Tue, 31 May 2022 17:07:55 +0800 Subject: [PATCH 06/10] =?UTF-8?q?fix:=20=E6=81=A2=E5=A4=8D=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E8=BD=B4=E5=80=BC=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/chart/util.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/frontend/src/views/chart/chart/util.js b/frontend/src/views/chart/chart/util.js index dec42e6b29..886dbfbe98 100644 --- a/frontend/src/views/chart/chart/util.js +++ b/frontend/src/views/chart/chart/util.js @@ -944,6 +944,11 @@ export const TYPE_CONFIGS = [ 'orient', 'textStyle', 'hPosition' + ], + 'split-selector-ant-v': [ + 'splitForm', + 'name', + 'lineStyle' ] } }, From ad5f8f688497b5cd1a81035cedc01a151ef2dd9e Mon Sep 17 00:00:00 2001 From: junjun Date: Tue, 31 May 2022 17:07:55 +0800 Subject: [PATCH 07/10] =?UTF-8?q?fix:=20=E6=81=A2=E5=A4=8D=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E8=BD=B4=E5=80=BC=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/chart/util.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/frontend/src/views/chart/chart/util.js b/frontend/src/views/chart/chart/util.js index dec42e6b29..886dbfbe98 100644 --- a/frontend/src/views/chart/chart/util.js +++ b/frontend/src/views/chart/chart/util.js @@ -944,6 +944,11 @@ export const TYPE_CONFIGS = [ 'orient', 'textStyle', 'hPosition' + ], + 'split-selector-ant-v': [ + 'splitForm', + 'name', + 'lineStyle' ] } }, From 05acc8feee5bc4bd4aa021cd46a1a03e3ab88390 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 31 May 2022 18:21:45 +0800 Subject: [PATCH 08/10] =?UTF-8?q?refactor:=20=E6=96=B0=E5=BB=BA=E7=9A=84?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=E7=BB=84=E4=BB=B6=E5=A2=9E=E5=8A=A0=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E8=B7=B3=E8=BD=AC=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/panel/edit/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue index 0516c57943..4a2b2c8bc8 100644 --- a/frontend/src/views/panel/edit/index.vue +++ b/frontend/src/views/panel/edit/index.vue @@ -809,7 +809,8 @@ export default { } this.currentFilterCom.id = newComponentId this.currentFilterCom.auxiliaryMatrix = this.canvasStyleData.auxiliaryMatrix - this.currentFilterCom.mobileStyle = BASE_MOBILE_STYLE + this.currentFilterCom.mobileStyle = deepCopy(BASE_MOBILE_STYLE) + this.currentFilterCom['hyperlinks'] = deepCopy(HYPERLINKS) this.currentFilterCom.commonBackground = this.currentFilterCom.commonBackground || deepCopy(COMMON_BACKGROUND) if (this.currentWidget.filterDialog) { From c3a3891578798298db35c3ba50654ccf272b6449 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Tue, 31 May 2022 18:29:14 +0800 Subject: [PATCH 09/10] =?UTF-8?q?style:=20=E6=A0=B7=E5=BC=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/view/ChartEdit.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue index 4ca7b6734e..f04f4f9e67 100644 --- a/frontend/src/views/chart/view/ChartEdit.vue +++ b/frontend/src/views/chart/view/ChartEdit.vue @@ -2521,8 +2521,7 @@ export default { .view-panel-Mask { display: flex; height: calc(100vh - 60px); - background-color: #5c5e61; - opacity: 0.7; + background-color: rgba(92,94,97, 0.7); position:absolute; top:0px; left: 0px; From 01c1a50029563f95d8d91f201ed19c45debd8c10 Mon Sep 17 00:00:00 2001 From: junjun Date: Tue, 31 May 2022 19:36:04 +0800 Subject: [PATCH 10/10] =?UTF-8?q?fix:=20=E6=81=A2=E5=A4=8D=E9=A5=BC?= =?UTF-8?q?=E5=9B=BE=E6=A0=87=E7=AD=BE=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/chart/util.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/chart/chart/util.js b/frontend/src/views/chart/chart/util.js index 886dbfbe98..820119b829 100644 --- a/frontend/src/views/chart/chart/util.js +++ b/frontend/src/views/chart/chart/util.js @@ -1934,7 +1934,7 @@ export const TYPE_CONFIGS = [ 'labelLine', 'fontSize', 'color', - 'position-v', + 'position-pie', 'formatter' ], 'tooltip-selector': [