diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts index bcbfd5659c..c9001eb3f1 100644 --- a/core/core-frontend/src/locales/en.ts +++ b/core/core-frontend/src/locales/en.ts @@ -1714,6 +1714,7 @@ export default { table_column_adapt: 'Adaptive', table_column_fixed: 'Fixed column width', table_column_custom: 'Custom', + table_column_col_adapt: 'Column adaptive', chart_table_pivot: 'Pivot table', chart_table_heatmap: 'Heat map', table_pivot_row: 'Data row', diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts index 3bf965cffc..d08eccc7d2 100644 --- a/core/core-frontend/src/locales/tw.ts +++ b/core/core-frontend/src/locales/tw.ts @@ -1673,6 +1673,7 @@ export default { table_column_adapt: '自適應', table_column_fixed: '固定列寬', table_column_custom: '自訂', + table_column_col_adapt: '列自適應', chart_table_pivot: '透視表', chart_table_heatmap: '熱力圖', table_pivot_row: '資料行', diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index 085b16cbd6..600cdd350b 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -1678,6 +1678,7 @@ export default { table_column_adapt: '自适应', table_column_fixed: '固定列宽', table_column_custom: '自定义', + table_column_col_adapt: '列自适应', chart_table_pivot: '透视表', chart_table_heatmap: '热力图', table_pivot_row: '数据行', diff --git a/core/core-frontend/src/models/chart/chart-attr.d.ts b/core/core-frontend/src/models/chart/chart-attr.d.ts index 33b20ed72a..61eb3253f7 100644 --- a/core/core-frontend/src/models/chart/chart-attr.d.ts +++ b/core/core-frontend/src/models/chart/chart-attr.d.ts @@ -66,7 +66,7 @@ declare interface ChartBasicStyle { /** * 表格列宽模式: 自适应和自定义 */ - tableColumnMode: 'adapt' | 'custom' | 'field' | 'dialog' + tableColumnMode: 'adapt' | 'custom' | 'field' | 'colAdapt' | 'dialog' /** * 表格列宽 */ diff --git a/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts b/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts index 4e0d765c50..04501c8f6f 100644 --- a/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts +++ b/core/core-frontend/src/views/chart/components/js/panel/common/common_table.ts @@ -1941,18 +1941,12 @@ function extractNumber( numFmt } } - const value = parseFloat(result) - let numFmt = '#' - if (formatterCfg.thousandSeparator) { - numFmt += ',#' - } - if (Math.abs(value) < 1) { - numFmt = '0' - } + const value = parseFloat(result) / 100 + let numFmt = '0' if (formatterCfg.decimalCount > 0) { numFmt += `.${'0'.repeat(formatterCfg.decimalCount)}` } - numFmt += '"%"' + numFmt += '%' return { value, numFmt