From 9d73a47f14f8279e0c9dc970151304d6d053c0a2 Mon Sep 17 00:00:00 2001 From: junjun Date: Fri, 19 Aug 2022 11:41:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E9=9D=A2=E7=A7=AF=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/chart/components/shape-attr/ColorSelector.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/src/views/chart/components/shape-attr/ColorSelector.vue b/frontend/src/views/chart/components/shape-attr/ColorSelector.vue index 685d93b27b..ed1a587b69 100644 --- a/frontend/src/views/chart/components/shape-attr/ColorSelector.vue +++ b/frontend/src/views/chart/components/shape-attr/ColorSelector.vue @@ -330,6 +330,7 @@ export default { if (!this.batchOptStatus && this.chart.render && this.chart.render === 'antv' && (this.chart.type.includes('bar') || this.chart.type.includes('line') || + this.chart.type.includes('area') || this.chart.type.includes('pie') || this.chart.type === 'funnel' || this.chart.type === 'radar' || From 42fc3546bd7ec679f76b61c0743a9aa6a944d69e Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Fri, 19 Aug 2022 13:52:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?perf(=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=AE=A1=E7=90=86):=20=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E8=A7=86=E5=9B=BE=E6=97=A5=E5=BF=97=E5=A2=9E=E5=8A=A0=E6=89=80?= =?UTF-8?q?=E5=B1=9E=E4=BB=AA=E8=A1=A8=E6=9D=BF=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/io/dataease/commons/utils/DeLogUtils.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/backend/src/main/java/io/dataease/commons/utils/DeLogUtils.java b/backend/src/main/java/io/dataease/commons/utils/DeLogUtils.java index 21f055f81c..2ae2dc8fb4 100644 --- a/backend/src/main/java/io/dataease/commons/utils/DeLogUtils.java +++ b/backend/src/main/java/io/dataease/commons/utils/DeLogUtils.java @@ -69,6 +69,9 @@ public class DeLogUtils { if(sourcetype == SOURCE_TYPE.DRIVER_FILE){ List parentsAndSelf = logManager.parentsAndSelf(positionId.toString(), SOURCE_TYPE.DRIVER); sysLogDTO.setPositions(parentsAndSelf); + }else if(sourcetype == SOURCE_TYPE.VIEW){ + List parentsAndSelf = logManager.parentsAndSelf(positionId.toString(), SOURCE_TYPE.PANEL); + sysLogDTO.setPositions(parentsAndSelf); }else { List parentsAndSelf = logManager.parentsAndSelf(positionId.toString(), sourcetype); sysLogDTO.setPositions(parentsAndSelf);