diff --git a/frontend/src/views/chart/components/ChartComponentS2.vue b/frontend/src/views/chart/components/ChartComponentS2.vue index 39c91a2c90..3b9cfbaa8c 100644 --- a/frontend/src/views/chart/components/ChartComponentS2.vue +++ b/frontend/src/views/chart/components/ChartComponentS2.vue @@ -61,7 +61,10 @@ class="table-page" :style="autoStyle" > - + {{ $t('chart.total') }} {{ chart.datasetMode === 0 ? chart.totalItems : ((chart.data && chart.data.tableRow) ? chart.data.tableRow.length : 0) @@ -165,6 +168,9 @@ export default { remarkCfg: { show: false, content: '' + }, + totalStyle: { + color: '#606266' } } }, @@ -424,6 +430,8 @@ export default { this.title_class.fontFamily = customStyle.text.fontFamily ? customStyle.text.fontFamily : DEFAULT_TITLE_STYLE.fontFamily this.title_class.letterSpacing = (customStyle.text.letterSpace ? customStyle.text.letterSpace : DEFAULT_TITLE_STYLE.letterSpace) + 'px' this.title_class.textShadow = customStyle.text.fontShadow ? '2px 2px 4px' : 'none' + // 表格总计与分页颜色,取标题颜色 + this.totalStyle.color = customStyle.text.color } if (customStyle.background) { this.title_class.background = hexColorToRGBA(customStyle.background.color, customStyle.background.alpha) diff --git a/frontend/src/views/chart/components/table/TableNormal.vue b/frontend/src/views/chart/components/table/TableNormal.vue index d99837281f..c0338e4571 100644 --- a/frontend/src/views/chart/components/table/TableNormal.vue +++ b/frontend/src/views/chart/components/table/TableNormal.vue @@ -49,7 +49,10 @@ class="table-page-inner" :style="autoStyle" > - + {{ $t('chart.total') }} {{ chart.datasetMode === 0 ? chart.totalItems : ((chart.data && chart.data.tableRow) ? chart.data.tableRow.length : 0) @@ -156,7 +159,10 @@ export default { showIndex: false, indexLabel: '序号', scrollBarColor: DEFAULT_COLOR_CASE.tableScrollBarColor, - scrollBarHoverColor: DEFAULT_COLOR_CASE.tableScrollBarHoverColor + scrollBarHoverColor: DEFAULT_COLOR_CASE.tableScrollBarHoverColor, + totalStyle: { + color: '#606266' + } } }, computed: { @@ -361,6 +367,8 @@ export default { this.title_class.textAlign = customStyle.text.hPosition this.title_class.fontStyle = customStyle.text.isItalic ? 'italic' : 'normal' this.title_class.fontWeight = customStyle.text.isBolder ? 'bold' : 'normal' + // 表格总计与分页颜色,取标题颜色 + this.totalStyle.color = customStyle.text.color } if (customStyle.background) { this.bg_class.background = hexColorToRGBA(customStyle.background.color, customStyle.background.alpha)