From 524f2929ba86745ea05ea7ed51c3a218e965c954 Mon Sep 17 00:00:00 2001 From: ulleo Date: Mon, 6 Jan 2025 16:42:10 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BE=E8=A1=A8):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E5=8F=8C=E7=BA=BF=E7=BB=84=E5=90=88=E5=9B=BE=E5=B7=A6=E5=8F=B3?= =?UTF-8?q?=E8=BD=B4=E7=BA=BF=E5=AE=BD=E4=B8=8E=E6=8A=98=E7=82=B9=E5=A4=A7?= =?UTF-8?q?=E5=B0=8F=E6=A0=B7=E5=BC=8F=E8=AE=BE=E7=BD=AE=E5=90=8C=E6=A0=B7?= =?UTF-8?q?=E6=95=B0=E5=80=BC=E4=BD=86=E6=98=AF=E5=B1=95=E7=A4=BA=E5=A4=A7?= =?UTF-8?q?=E5=B0=8F=E4=B8=8D=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/utils/canvasStyle.ts | 9 ++++++++- core/core-frontend/src/utils/sizeAdaptor.ts | 2 ++ .../chart/components/js/panel/charts/others/chart-mix.ts | 4 ++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/core/core-frontend/src/utils/canvasStyle.ts b/core/core-frontend/src/utils/canvasStyle.ts index 0936cac276..f894001463 100644 --- a/core/core-frontend/src/utils/canvasStyle.ts +++ b/core/core-frontend/src/utils/canvasStyle.ts @@ -116,7 +116,14 @@ export function colorRgb(color, opacity) { } export const customAttrTrans = { - basicStyle: ['barWidth', 'lineWidth', 'lineSymbolSize', 'tableColumnWidth'], + basicStyle: [ + 'barWidth', + 'lineWidth', + 'lineSymbolSize', + 'leftLineWidth', + 'leftLineSymbolSize', + 'tableColumnWidth' + ], tableHeader: [ 'tableTitleFontSize', 'tableTitleColFontSize', diff --git a/core/core-frontend/src/utils/sizeAdaptor.ts b/core/core-frontend/src/utils/sizeAdaptor.ts index 6e854af6cd..af2fd10707 100644 --- a/core/core-frontend/src/utils/sizeAdaptor.ts +++ b/core/core-frontend/src/utils/sizeAdaptor.ts @@ -4,7 +4,9 @@ export const customAttrTrans = { size: [ 'barWidth', 'lineWidth', + 'leftLineWidth', 'lineSymbolSize', + 'leftLineSymbolSize', 'funnelWidth', // 漏斗图 最大宽度 'tableTitleFontSize', 'tableTitleColFontSize', diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/others/chart-mix.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/others/chart-mix.ts index da84fd6dcd..87f67e508c 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/others/chart-mix.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/others/chart-mix.ts @@ -320,6 +320,10 @@ export class ColumnLineMix extends G2PlotChartView { tempOption.geometryOptions[0].columnWidthRatio = columnWidthRatio } + if (super.name !== 'chart-mix-dual-line') { + tempOption.geometryOptions[0].appendPadding = getPadding(chart) + } + return tempOption }