Merge pull request #13630 from dataease/pr@dev-v2@chart-table-info

style(图表): 明细表自动换行配置的提示修改

core/core-frontend/src/locales/en.ts

@@ -1741,7 +1741,8 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     p_bottom: 'Bottom alignment',
     p_center: 'Center',
     table_auto_break_line: 'Automatic line break',
-    table_break_line_tip: 'After merging cells, automatic line wrapping is not supported',
+    table_break_line_tip:
+      'Turn on automatic line break, the table header row height setting will be invalid',
     table_break_line_max_lines: 'Maximum number of lines',
     step: 'Step length (px)',
     no_function:
@@ -1855,7 +1856,8 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
     radar_area_color: 'enable area',
     table_freeze_tip: 'after merging cells, column and row freezing is not supported',
     merge_cells_tips:
-      'after merging cells, freezing rows and columns and automatic line wrapping will become invalid'
+      'after merging cells, freezing rows and columns and automatic line wrapping will become invalid',
+    merge_cells_break_line_tip: 'after merging cells, automatic line wrapping is not supported'
   },
   dataset: {
     scope_edit: 'only effective when editing',

core/core-frontend/src/locales/tw.ts

@@ -1705,7 +1705,7 @@ export default {
     p_bottom: '下對齊',
     p_center: '居中',
     table_auto_break_line: '自動換行',
-    table_break_line_tip: '合併儲存格後，不支持自動換行',
+    table_break_line_tip: '開啟自動換行，表頭行高設定將失效',
     table_break_line_max_lines: '最大行數',
     step: '步長(px)',
     no_function: '函數尚未支援直接引用，請在欄位表達式中手動輸入。 ',
@@ -1815,7 +1815,8 @@ export default {
     radar_point_size: '輔助點大小',
     radar_area_color: '開啟面積',
     table_freeze_tip: '合併儲存格後，不支持行列凍結',
-    merge_cells_tips: '合併儲存格後，行列凍結、自動換行會失效'
+    merge_cells_tips: '合併儲存格後，行列凍結、自動換行會失效',
+    merge_cells_break_line_tip: '合併儲存格後，不支持自動換行'
   },
   dataset: {
     scope_edit: '僅編輯時生效',

core/core-frontend/src/locales/zh-CN.ts

@@ -1708,7 +1708,7 @@ export default {
     p_bottom: '下对齐',
     p_center: '居中',
     table_auto_break_line: '自动换行',
-    table_break_line_tip: '合并单元格后，不支持自动换行',
+    table_break_line_tip: '开启自动换行，表头行高设置将失效',
     table_break_line_max_lines: '最大行数',
     step: '步长(px)',
     no_function: '函数尚未支持直接引用，请在字段表达式中手动输入。',
@@ -1818,7 +1818,8 @@ export default {
     radar_point_size: '辅助点大小',
     radar_area_color: '开启面积',
     table_freeze_tip: '合并单元格后，不支持行列冻结',
-    merge_cells_tips: '合并单元格后，行列冻结、自动换行会失效'
+    merge_cells_tips: '合并单元格后，行列冻结、自动换行会失效',
+    merge_cells_break_line_tip: '合并单元格后，不支持自动换行'
   },
   dataset: {
     scope_edit: '仅编辑时生效',

core/core-frontend/src/views/chart/components/editor/editor-style/components/BasicStyleSelector.vue

@@ -1075,6 +1075,14 @@ onMounted(() => {
         <span class="data-area-label">
           <span style="margin-right: 4px">{{ t('chart.table_auto_break_line') }}</span>
           <el-tooltip class="item" effect="dark" placement="bottom" v-if="mergeCell">
+            <template #content>
+              <div>{{ t('chart.merge_cells_break_line_tip') }}</div>
+            </template>
+            <el-icon class="hint-icon" :class="{ 'hint-icon--dark': themes === 'dark' }">
+              <Icon name="icon_info_outlined"><icon_info_outlined class="svg-icon" /></Icon>
+            </el-icon>
+          </el-tooltip>
+          <el-tooltip class="item" effect="dark" placement="bottom" v-else>
             <template #content>
               <div>{{ t('chart.table_break_line_tip') }}</div>
             </template>