Merge pull request #3914 from dataease/pr@dev@refactor_table

refactor(视图): 优化明细表下侧总计在切换主题时的颜色
This commit is contained in:
fit2cloud-chenyw 2022-11-29 10:47:38 +08:00 committed by GitHub
commit 5889369dea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 3 deletions

View File

@ -61,7 +61,10 @@
class="table-page"
:style="autoStyle"
>
<span class="total-style">
<span
class="total-style"
:style="totalStyle"
>
{{ $t('chart.total') }}
<span>{{
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)

View File

@ -49,7 +49,10 @@
class="table-page-inner"
:style="autoStyle"
>
<span class="total-style">
<span
class="total-style"
:style="totalStyle"
>
{{ $t('chart.total') }}
<span>{{
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)