From 7509ef497a8cd8c7c5604c3b9be4734ecded5e17 Mon Sep 17 00:00:00 2001 From: wisonic-s Date: Fri, 29 Dec 2023 11:22:02 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E8=A7=86?= =?UTF-8?q?=E5=9B=BE=E8=AF=A6=E6=83=85=E7=BB=9F=E4=B8=80=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/canvas/customComponent/UserView.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/frontend/src/components/canvas/customComponent/UserView.vue b/core/frontend/src/components/canvas/customComponent/UserView.vue index eb90163773..28f71b70da 100644 --- a/core/frontend/src/components/canvas/customComponent/UserView.vue +++ b/core/frontend/src/components/canvas/customComponent/UserView.vue @@ -1036,7 +1036,10 @@ export default { tableChart.customAttr.color.tableHeaderFontColor = '#7c7e81' tableChart.customAttr.color.tableFontColor = '#7c7e81' tableChart.customAttr.color.enableTableCrossBG = false + tableChart.customAttr.size.showTableHeader = true } + tableChart.customAttr.size.tableColumnFreezeHead = 0 + tableChart.customAttr.size.tableRowFreezeHead = 0 tableChart.customAttr.color.tableStripe = true tableChart.customAttr.size.tablePageMode = 'pull' tableChart.customStyle.text.show = false From 4f737e0b137f984cbe349df86b0aaccbcb254dc6 Mon Sep 17 00:00:00 2001 From: wisonic-s Date: Fri, 29 Dec 2023 15:04:36 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE-=E8=A1=A8=E6=A0=BC):?= =?UTF-8?q?=20=E8=A1=A8=E6=A0=BC=E6=96=91=E9=A9=AC=E7=BA=B9=E5=9C=A8?= =?UTF-8?q?=E5=BC=80=E5=90=AF=E9=98=88=E5=80=BC=E5=90=8E=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/chart/chart/table/table-info.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/core/frontend/src/views/chart/chart/table/table-info.js b/core/frontend/src/views/chart/chart/table/table-info.js index 40955fb143..bf9b4a3d16 100644 --- a/core/frontend/src/views/chart/chart/table/table-info.js +++ b/core/frontend/src/views/chart/chart/table/table-info.js @@ -576,7 +576,12 @@ function getConditions(chart) { if (customAttr.color) { const c = JSON.parse(JSON.stringify(customAttr.color)) valueColor = c.tableFontColor - valueBgColor = hexColorToRGBA(c.tableItemBgColor, c.alpha) + const enableTableCrossBG = c.enableTableCrossBG + if (!enableTableCrossBG) { + valueBgColor = hexColorToRGBA(c.tableItemBgColor, c.alpha) + } else { + valueBgColor = null + } } } @@ -594,9 +599,12 @@ function getConditions(chart) { res.background.push({ field: field.field.dataeaseName, mapping(value, rowData) { - return { - fill: mappingColor(value, valueBgColor, field, 'backgroundColor', filedValueMap, rowData) + const fill = mappingColor(value, valueBgColor, field, 'backgroundColor', filedValueMap, rowData) + if (fill) { + return { fill } } + // 返回 null 会使用主题中的背景色 + return null } }) }