From 41217a142eddc871af2627264b75c16eccebe4d1 Mon Sep 17 00:00:00 2001 From: jianneng-fit2cloud Date: Wed, 30 Oct 2024 14:14:22 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=9B=BE=E8=A1=A8):=20=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=A0=B7=E5=BC=8F=EF=BC=8C=E8=BE=B9=E6=A1=86?= =?UTF-8?q?=E9=A2=9C=E8=89=B2=E6=94=AF=E6=8C=81=E9=80=8F=E6=98=8E=E5=BA=A6?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../editor/editor-style/components/BasicStyleSelector.vue | 3 ++- .../src/views/chart/components/js/panel/common/common_table.ts | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue index 6aa4ae4a6d..4f773eebe5 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue @@ -845,8 +845,9 @@ onMounted(() => { :effect="themes" is-custom :trigger-width="108" - color-format="hex" + color-format="rgb" :predefine="predefineColors" + show-alpha @change="changeBasicStyle('tableBorderColor')" /> diff --git a/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts b/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts index c53fd02f05..7436169b47 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts @@ -168,7 +168,7 @@ export function getCustomTheme(chart: Chart): S2Theme { const { basicStyle, tableHeader, tableCell } = customAttr // basic if (basicStyle) { - const tableBorderColor = hexColorToRGBA(basicStyle.tableBorderColor, basicStyle.alpha) + const tableBorderColor = basicStyle.tableBorderColor const tableScrollBarColor = basicStyle.tableScrollBarColor const tmpTheme: S2Theme = { splitLine: {