center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge pull request #6719 from ulleo/dev

Browse Source 
feat: 调整AntV表格斑马纹颜色配置与Echarts统一
This commit is contained in:
ulleo 2023-11-16 14:46:35 +08:00 committed by GitHub
commit da43c446ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/frontend/src/lang/en.js
View File

@ -1147,7 +1147,7 @@ export default {
table_header_bg: 'Header Background',
table_item_bg: 'Table Background',
table_item_sub_enable: 'Enable CrossBackgroundColor',
table_item_sub_bg: 'Table CrossBackgroundColor',
table_item_sub_bg: 'CrossBackgroundColor',
table_header_font_color: 'Header Font',
table_item_font_color: 'Table Font',
table_show_index: 'Show Index',

2
core/frontend/src/lang/tw.js
View File

@ -1146,7 +1146,7 @@ export default {
table_header_bg: '表頭背景',
table_item_bg: '表格背景',
table_item_sub_enable: '斑馬紋',
table_item_sub_bg: '奇數行表格背景',
table_item_sub_bg: '斑馬紋顏色',
table_header_font_color: '表頭字體',
table_item_font_color: '表格字體',
table_show_index: '顯示序號',

2
core/frontend/src/lang/zh.js
View File

@ -1145,7 +1145,7 @@ export default {
table_header_bg: '表头背景',
table_item_bg: '表格背景',
table_item_sub_enable: '斑马纹',
table_item_sub_bg: '奇数行表格背景',
table_item_sub_bg: '斑马纹颜色',
table_header_font_color: '表头字体',
table_item_font_color: '表格字体',
table_show_index: '显示序号',

9
core/frontend/src/views/chart/chart/common/common_table.js
View File

@ -165,9 +165,14 @@ export function getCustomTheme(chart) {
theme.colCell.text.fill = c.tableHeaderFontColor ? c.tableHeaderFontColor : c.tableFontColor
theme.colCell.measureText.fill = c.tableHeaderFontColor ? c.tableHeaderFontColor : c.tableFontColor
// 奇数行单元格背景色
theme.dataCell.cell.crossBackgroundColor = enableTableCrossBG ? i_s_c : i_c
// 为了与Echarts统一，奇数行是原来颜色
if (enableTableCrossBG) {
theme.dataCell.cell.crossBackgroundColor = i_c
theme.dataCell.cell.backgroundColor = i_s_c
} else {
theme.dataCell.cell.crossBackgroundColor = i_c
theme.dataCell.cell.backgroundColor = i_c
}
theme.dataCell.cell.horizontalBorderColor = b_c
theme.dataCell.cell.verticalBorderColor = b_c
theme.dataCell.bolderText.fill = c.tableFontColor