diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js index 86623f3306..1da7852bc2 100644 --- a/frontend/src/lang/en.js +++ b/frontend/src/lang/en.js @@ -1516,7 +1516,10 @@ export default { p_right: 'Right', p_top: 'Top', p_bottom: 'Bottom', - p_center: 'Center' + p_center: 'Center', + table_auto_break_line: 'Auto Line Feed', + table_break_line_tip: 'If open this option,the table item height will disabled.', + step: 'Step(px)' }, dataset: { scope_edit: 'Effective only when editing', diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js index 83d8445394..b5a32ea57c 100644 --- a/frontend/src/lang/tw.js +++ b/frontend/src/lang/tw.js @@ -1510,7 +1510,10 @@ export default { p_right: '右對齊', p_top: '上對齊', p_bottom: '下對齊', - p_center: '居中' + p_center: '居中', + table_auto_break_line: '自動換行', + table_break_line_tip: '開啟自動換行,表格行高設置將失效', + step: '步長(px)' }, dataset: { scope_edit: '僅編輯時生效', diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js index d4851c1e17..033438144b 100644 --- a/frontend/src/lang/zh.js +++ b/frontend/src/lang/zh.js @@ -1509,7 +1509,10 @@ export default { p_right: '右对齐', p_top: '上对齐', p_bottom: '下对齐', - p_center: '居中' + p_center: '居中', + table_auto_break_line: '自动换行', + table_break_line_tip: '开启自动换行,表格行高设置将失效', + step: '步长(px)' }, dataset: { scope_edit: '仅编辑时生效', diff --git a/frontend/src/views/chart/chart/chart.js b/frontend/src/views/chart/chart/chart.js index 86a5087fc5..5fc2fe9008 100644 --- a/frontend/src/views/chart/chart/chart.js +++ b/frontend/src/views/chart/chart/chart.js @@ -77,6 +77,7 @@ export const DEFAULT_SIZE = { tableColumnWidth: 100, tableHeaderAlign: 'left', tableItemAlign: 'right', + tableAutoBreakLine: false, gaugeMinType: 'fix', // fix or dynamic gaugeMinField: { id: '', @@ -462,7 +463,8 @@ export const DEFAULT_THRESHOLD = { export const DEFAULT_SCROLL = { open: false, row: 1, - interval: 2000 + interval: 2000, + step: 50 } // chart config export const BASE_BAR = { diff --git a/frontend/src/views/chart/chart/util.js b/frontend/src/views/chart/chart/util.js index 972c25c602..ce0b9696d0 100644 --- a/frontend/src/views/chart/chart/util.js +++ b/frontend/src/views/chart/chart/util.js @@ -1847,6 +1847,7 @@ export const TYPE_CONFIGS = [ 'tableItemBgColor', 'tableHeaderFontColor', 'tableFontColor', + 'tableBorderColor', 'tableScrollBarColor', 'alpha' ], @@ -1857,7 +1858,8 @@ export const TYPE_CONFIGS = [ 'tableItemHeight', 'tableColumnWidth', 'showIndex', - 'indexLabel' + 'indexLabel', + 'tableAutoBreakLine' ], 'title-selector': [ 'show', @@ -1887,6 +1889,7 @@ export const TYPE_CONFIGS = [ 'tableItemBgColor', 'tableHeaderFontColor', 'tableFontColor', + 'tableBorderColor', 'tableScrollBarColor', 'alpha' ], @@ -1899,7 +1902,8 @@ export const TYPE_CONFIGS = [ 'tableItemHeight', 'tableColumnWidth', 'showIndex', - 'indexLabel' + 'indexLabel', + 'tableAutoBreakLine' ], 'title-selector': [ 'show', diff --git a/frontend/src/views/chart/components/senior/ScrollCfg.vue b/frontend/src/views/chart/components/senior/ScrollCfg.vue index 1fc74415b3..90788f5609 100644 --- a/frontend/src/views/chart/components/senior/ScrollCfg.vue +++ b/frontend/src/views/chart/components/senior/ScrollCfg.vue @@ -31,6 +31,7 @@ @@ -43,6 +44,20 @@ @change="changeScrollCfg" /> + + +