From 15a72e7ec8599cc72f85bab369e24ac147a46848 Mon Sep 17 00:00:00 2001 From: wisonic Date: Thu, 11 Jul 2024 15:26:36 +0800 Subject: [PATCH 1/2] =?UTF-8?q?build(=E5=9B=BE=E8=A1=A8):=20=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=20L7=20=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/core-frontend/package.json b/core/core-frontend/package.json index 2056df8307..470b194fdd 100644 --- a/core/core-frontend/package.json +++ b/core/core-frontend/package.json @@ -15,7 +15,7 @@ }, "dependencies": { "@antv/g2plot": "^2.4.29", - "@antv/l7": "2.21.1", + "@antv/l7": "^2.22.0", "@antv/l7plot": "^0.5.5", "@antv/s2": "^1.49.0", "@codemirror/lang-sql": "^6.4.0", From ee25db13b0d38f8b0fd823f5267c732c103b9ffd Mon Sep 17 00:00:00 2001 From: wisonic Date: Thu, 11 Jul 2024 15:27:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?refactor(=E5=9B=BE=E8=A1=A8):=20=E6=B1=87?= =?UTF-8?q?=E6=80=BB=E8=A1=A8=E6=B1=87=E6=80=BB=E8=A1=8C=E5=AD=97=E4=BD=93?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=8D=95=E5=85=83=E6=A0=BC=E5=AF=B9=E9=BD=90?= =?UTF-8?q?=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chart/components/js/panel/charts/table/table-normal.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-normal.ts b/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-normal.ts index f1aafb80ab..4180aae321 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-normal.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/charts/table/table-normal.ts @@ -4,7 +4,7 @@ import { copyContent, SortTooltip } from '@/views/chart/components/js/panel/comm import { S2ChartView, S2DrawOptions } from '@/views/chart/components/js/panel/types/impl/s2' import { parseJson } from '@/views/chart/components/js/util' import { S2Event, S2Options, TableColCell, TableDataCell, TableSheet, ViewMeta } from '@antv/s2' -import { isNumber } from 'lodash-es' +import { cloneDeep, isNumber } from 'lodash-es' import { TABLE_EDITOR_PROPERTY, TABLE_EDITOR_PROPERTY_INNER } from './common' const { t } = useI18n() @@ -252,7 +252,9 @@ export class TableNormal extends S2ChartView { class SummaryCell extends TableDataCell { getTextStyle() { - return this.theme.colCell.bolderText + const textStyle = cloneDeep(this.theme.colCell.bolderText) + textStyle.textAlign = this.theme.dataCell.text.textAlign + return textStyle } getBackgroundColor() { const { backgroundColor, backgroundColorOpacity } = this.theme.colCell.cell