From 000b4acd960b945b12099de8610ab9b17600813d Mon Sep 17 00:00:00 2001 From: wisonic-s Date: Mon, 26 Feb 2024 17:42:53 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):=20=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E8=A1=A8/=E6=B1=87=E6=80=BB=E8=A1=A8=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E6=8C=89=E5=88=97=E8=AE=BE=E7=BD=AE=E5=AE=BD=E5=BA=A6=EF=BC=8C?= =?UTF-8?q?=E6=8B=96=E6=8B=BD=E8=B0=83=E6=95=B4=E5=AE=BD=E5=BA=A6=E3=80=82?= =?UTF-8?q?#7707?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core-frontend/src/locales/zh-CN.ts | 3 +- .../src/models/chart/chart-attr.d.ts | 19 +- .../components/editor/common/TableTooltip.vue | 2 +- .../components/BasicStyleSelector.vue | 182 ++++++++++++++++-- .../views/chart/components/editor/index.vue | 15 +- .../chart/components/editor/util/chart.ts | 1 + .../js/panel/charts/table/table-info.ts | 4 +- .../js/panel/charts/table/table-normal.ts | 4 +- .../js/panel/charts/table/table-pivot.ts | 8 + .../js/panel/common/common_table.ts | 37 +++- .../components/js/panel/types/impl/s2.ts | 1 + .../views/components/ChartComponentS2.vue | 20 +- 12 files changed, 261 insertions(+), 35 deletions(-) diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index 8a58280f51..53582f1d93 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -865,6 +865,7 @@ export default { table_config: '表格配置', table_column_width_config: '列宽调整', table_column_adapt: '自适应', + table_column_fixed: '固定列宽', table_column_custom: '自定义', chart_table_pivot: '透视表', table_pivot_row: '数据行', @@ -1005,7 +1006,7 @@ export default { table_scroll_tip: '明细表仅在分页模式为"下拉"时生效。', table_threshold_tip: '提示:请勿重复选择字段,若同一字段重复配置,则只有最后的字段配置生效', table_column_width_tip: - '列宽并非任何时候都能生效。
容器宽度优先级高于列宽,即(表格容器宽度 / 列数 > 指定列宽),则列宽优先取(容器宽度 / 列数)。', + '固定列宽并非任何时候都能生效。
容器宽度优先级高于列宽,即(表格容器宽度 / 列数 > 指定列宽),则列宽优先取(容器宽度 / 列数)。', reference_field_tip: '引用字段以 "[" 开始, "]" 结束。
请勿修改引用内容,否则将引用失败。
若输入与引用字段相同格式的内容,将被当作引用字段处理。', scatter_tip: '该指标生效时,样式大小中的气泡大小属性将失效', 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 5c96d15a1d..eb72efea88 100644 --- a/core/core-frontend/src/models/chart/chart-attr.d.ts +++ b/core/core-frontend/src/models/chart/chart-attr.d.ts @@ -54,11 +54,28 @@ declare interface ChartBasicStyle { /** * 表格列宽模式: 自适应和自定义 */ - tableColumnMode: 'adapt' | 'custom' + tableColumnMode: 'adapt' | 'custom' | 'field' /** * 表格列宽 */ tableColumnWidth: number + /** + * 表格字段列宽 + */ + tableFieldWidth: { + /** + * 字段ID + */ + fieldId: string, + /** + * 字段名称 + */ + name: string, + /** + * 字段宽度占比 + */ + width: number + }[] /** * 表格分页模式 */ diff --git a/core/core-frontend/src/views/chart/components/editor/common/TableTooltip.vue b/core/core-frontend/src/views/chart/components/editor/common/TableTooltip.vue index a37248bdfa..48640d00f2 100644 --- a/core/core-frontend/src/views/chart/components/editor/common/TableTooltip.vue +++ b/core/core-frontend/src/views/chart/components/editor/common/TableTooltip.vue @@ -26,7 +26,7 @@ const sort = type => { }