From f38186cee065b30b874a7ab0100ca3f02a58095e Mon Sep 17 00:00:00 2001 From: junjie Date: Tue, 2 Nov 2021 10:32:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=E8=B0=83=E8=89=B2=E6=9D=BF=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/views/chart/chart/chart.js b/frontend/src/views/chart/chart/chart.js index 77a8cd1007..043268e780 100644 --- a/frontend/src/views/chart/chart/chart.js +++ b/frontend/src/views/chart/chart/chart.js @@ -864,6 +864,6 @@ export const COLOR_PANEL = [ '#1e90ff', '#c71585', '#999999', - '#ffffff', + '#00008b', '#000000' ] From ab57e66b72efcd5e992097f92b5f0bfdaf3d8020 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 2 Nov 2021 10:41:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?style:=20=E6=97=B6=E9=97=B4=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/canvas/components/Editor/DateFormat.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/canvas/components/Editor/DateFormat.vue b/frontend/src/components/canvas/components/Editor/DateFormat.vue index cbf7b2f4ef..d1a513aac6 100644 --- a/frontend/src/components/canvas/components/Editor/DateFormat.vue +++ b/frontend/src/components/canvas/components/Editor/DateFormat.vue @@ -114,7 +114,8 @@ export default { }, computed: { ...mapState([ - 'curComponent' + 'curComponent', + 'curCanvasScale' ]) }, created() { @@ -135,10 +136,13 @@ export default { modelChange(val) { if (val === '0') { this.curComponent.style.height = 100 + this.curComponent.sizey = Math.round(this.curComponent.style.height / this.curCanvasScale.matrixStyleOriginHeight) } else if (val === '1') { this.curComponent.style.height = 150 + this.curComponent.sizey = Math.round(this.curComponent.style.height / this.curCanvasScale.matrixStyleOriginHeight) } else { this.curComponent.style.height = 300 + this.curComponent.sizey = Math.round(this.curComponent.style.height / this.curCanvasScale.matrixStyleOriginHeight) } } }