From d6ebb8c7a72b485a32cb4a06e9f8aa20a531a6da Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Wed, 6 Sep 2023 23:48:11 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E4=BB=AA?= =?UTF-8?q?=E8=A1=A8=E6=9D=BF=E8=83=8C=E6=99=AF=E4=B8=8D=E9=80=8F=E6=98=8E?= =?UTF-8?q?=20=E5=BA=A60=E7=9A=84=E6=97=B6=E5=80=99=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/canvas/components/editor/DeEditor.vue | 2 +- .../src/components/canvas/customComponent/UserViewDialog.vue | 2 +- .../components/canvas/customComponent/UserViewMobileDialog.vue | 2 +- core/frontend/src/views/background/BackgroundOverall.vue | 2 +- core/frontend/src/views/background/index.vue | 2 +- .../chart/components/componentStyle/dialog/RemarkEditor.vue | 2 +- core/frontend/src/views/panel/edit/index.vue | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/frontend/src/components/canvas/components/editor/DeEditor.vue b/core/frontend/src/components/canvas/components/editor/DeEditor.vue index 9b93983894..2407a73cb2 100644 --- a/core/frontend/src/components/canvas/components/editor/DeEditor.vue +++ b/core/frontend/src/components/canvas/components/editor/DeEditor.vue @@ -985,7 +985,7 @@ export default { ...style } } else if (this.canvasStyleData.panel.backgroundType === 'color') { - const colorRGBA = hexColorToRGBA(this.canvasStyleData.panel.color, this.canvasStyleData.panel.alpha||100) + const colorRGBA = hexColorToRGBA(this.canvasStyleData.panel.color, this.canvasStyleData.panel.alpha === undefined ? 100 : this.canvasStyleData.panel.alpha) style = { background: colorRGBA, ...style diff --git a/core/frontend/src/components/canvas/customComponent/UserViewDialog.vue b/core/frontend/src/components/canvas/customComponent/UserViewDialog.vue index 58ea21f700..4f23338f6c 100644 --- a/core/frontend/src/components/canvas/customComponent/UserViewDialog.vue +++ b/core/frontend/src/components/canvas/customComponent/UserViewDialog.vue @@ -144,7 +144,7 @@ export default { ...style } } else if (this.canvasStyleData.panel.backgroundType === 'color') { - const colorRGBA = hexColorToRGBA(this.canvasStyleData.panel.color, this.canvasStyleData.panel.alpha||100) + const colorRGBA = hexColorToRGBA(this.canvasStyleData.panel.color, this.canvasStyleData.panel.alpha === undefined ? 100 : this.canvasStyleData.panel.alpha) style = { background: colorRGBA, ...style diff --git a/core/frontend/src/components/canvas/customComponent/UserViewMobileDialog.vue b/core/frontend/src/components/canvas/customComponent/UserViewMobileDialog.vue index be0d4e4af8..50d142f3e3 100644 --- a/core/frontend/src/components/canvas/customComponent/UserViewMobileDialog.vue +++ b/core/frontend/src/components/canvas/customComponent/UserViewMobileDialog.vue @@ -102,7 +102,7 @@ export default { ...style } } else if (this.canvasStyleData.panel.backgroundType === 'color') { - const colorRGBA = hexColorToRGBA(this.canvasStyleData.panel.color, this.canvasStyleData.panel.alpha||100) + const colorRGBA = hexColorToRGBA(this.canvasStyleData.panel.color, this.canvasStyleData.panel.alpha === undefined ? 100 : this.canvasStyleData.panel.alpha) style = { background: colorRGBA, ...style diff --git a/core/frontend/src/views/background/BackgroundOverall.vue b/core/frontend/src/views/background/BackgroundOverall.vue index 5a9a6a9af7..a6bd5e5f85 100644 --- a/core/frontend/src/views/background/BackgroundOverall.vue +++ b/core/frontend/src/views/background/BackgroundOverall.vue @@ -228,7 +228,7 @@ export default { ...style } } else if (this.canvasStyleData.panel.backgroundType === 'color') { - const colorRGBA = hexColorToRGBA(this.canvasStyleData.panel.color, this.canvasStyleData.panel.alpha||100) + const colorRGBA = hexColorToRGBA(this.canvasStyleData.panel.color, this.canvasStyleData.panel.alpha === undefined ? 100 : this.canvasStyleData.panel.alpha) style = { background: colorRGBA, ...style diff --git a/core/frontend/src/views/background/index.vue b/core/frontend/src/views/background/index.vue index 505cc1517e..2e5a05762d 100644 --- a/core/frontend/src/views/background/index.vue +++ b/core/frontend/src/views/background/index.vue @@ -291,7 +291,7 @@ export default { ...style } } else if (this.canvasStyleData.panel.backgroundType === 'color') { - const colorRGBA = hexColorToRGBA(this.canvasStyleData.panel.color, this.canvasStyleData.panel.alpha||100) + const colorRGBA = hexColorToRGBA(this.canvasStyleData.panel.color, this.canvasStyleData.panel.alpha === undefined ? 100 : this.canvasStyleData.panel.alpha) style = { background: colorRGBA, ...style diff --git a/core/frontend/src/views/chart/components/componentStyle/dialog/RemarkEditor.vue b/core/frontend/src/views/chart/components/componentStyle/dialog/RemarkEditor.vue index 2a214c5dc1..94897e9c9d 100644 --- a/core/frontend/src/views/chart/components/componentStyle/dialog/RemarkEditor.vue +++ b/core/frontend/src/views/chart/components/componentStyle/dialog/RemarkEditor.vue @@ -99,7 +99,7 @@ export default { ...style } } else if (this.canvasStyleData.panel.backgroundType === 'color') { - const colorRGBA = hexColorToRGBA(this.canvasStyleData.panel.color, this.canvasStyleData.panel.alpha||100) + const colorRGBA = hexColorToRGBA(this.canvasStyleData.panel.color, this.canvasStyleData.panel.alpha === undefined ? 100 : this.canvasStyleData.panel.alpha) style = { background: colorRGBA, ...style diff --git a/core/frontend/src/views/panel/edit/index.vue b/core/frontend/src/views/panel/edit/index.vue index 91d7ff559a..be1304153c 100644 --- a/core/frontend/src/views/panel/edit/index.vue +++ b/core/frontend/src/views/panel/edit/index.vue @@ -747,7 +747,7 @@ export default { ...style } } else if (this.canvasStyleData.panel.backgroundType === 'color') { - const colorRGBA = hexColorToRGBA(this.canvasStyleData.panel.color, this.canvasStyleData.panel.alpha||100) + const colorRGBA = hexColorToRGBA(this.canvasStyleData.panel.color, this.canvasStyleData.panel.alpha === undefined ? 100 : this.canvasStyleData.panel.alpha) style = { background: colorRGBA, ...style