From 6a381dd7820558ca6d8d808132832322b00123d4 Mon Sep 17 00:00:00 2001 From: junjun Date: Tue, 31 May 2022 16:52:42 +0800 Subject: [PATCH 1/2] =?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 2/2] =?UTF-8?q?fix:=20=E6=81=A2=E5=A4=8D=E8=A7=86=E5=9B=BE?= =?UTF-8?q?=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',