Merge pull request #13901 from dataease/pr@dev-v2@chart-indicator-i18n

feat(图表): 国际化(指标卡)
2026-05-15 05:22:13 +08:00 · 2024-12-09 11:22:10 +08:00
parent 0cd6e1c4e9 abc633b967
commit 3fa3e404bb
19 changed files with 47 additions and 33 deletions
--- a/core/core-backend/src/main/resources/db/desktop/V2.10.4__ddl.sql
+++ b/core/core-backend/src/main/resources/db/desktop/V2.10.4__ddl.sql
@@ -0,0 +1 @@
+UPDATE `visualization_background` SET `name` = 'Board10' WHERE `id` = 'dark_1';
--- a/core/core-backend/src/main/resources/db/migration/V2.10.4__ddl.sql
+++ b/core/core-backend/src/main/resources/db/migration/V2.10.4__ddl.sql
@@ -0,0 +1 @@
+UPDATE `visualization_background` SET `name` = 'Board10' WHERE `id` = 'dark_1';
--- a/core/core-frontend/src/locales/en.ts
+++ b/core/core-frontend/src/locales/en.ts
@@ -1850,7 +1850,11 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr
    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',
-    merge_cells_break_line_tip: 'after merging cells, automatic line wrapping is not supported'
+    merge_cells_break_line_tip: 'after merging cells, automatic line wrapping is not supported',
+    font_family_ya_hei: 'Microsoft YaHei',
+    font_family_song_ti: 'SimSun',
+    font_family_kai_ti: 'KaiTi',
+    font_family_hei_ti: 'SimHei'
  },
  dataset: {
    scope_edit: 'only effective when editing',
--- a/core/core-frontend/src/locales/tw.ts
+++ b/core/core-frontend/src/locales/tw.ts
@@ -1810,7 +1810,11 @@ export default {
    radar_area_color: '開啟面積',
    table_freeze_tip: '合併儲存格後，不支持行列凍結',
    merge_cells_tips: '合併儲存格後，行列凍結、自動換行會失效',
-    merge_cells_break_line_tip: '合併儲存格後，不支持自動換行'
+    merge_cells_break_line_tip: '合併儲存格後，不支持自動換行',
+    font_family_ya_hei: '微軟雅黙',
+    font_family_song_ti: '宋體',
+    font_family_kai_ti: '楷體',
+    font_family_hei_ti: '黑體'
  },
  dataset: {
    scope_edit: '僅編輯時生效',
--- a/core/core-frontend/src/locales/zh-CN.ts
+++ b/core/core-frontend/src/locales/zh-CN.ts
@@ -1812,7 +1812,11 @@ export default {
    radar_area_color: '开启面积',
    table_freeze_tip: '合并单元格后，不支持行列冻结',
    merge_cells_tips: '合并单元格后，行列冻结、自动换行会失效',
-    merge_cells_break_line_tip: '合并单元格后，不支持自动换行'
+    merge_cells_break_line_tip: '合并单元格后，不支持自动换行',
+    font_family_ya_hei: '微软雅黑',
+    font_family_song_ti: '宋体',
+    font_family_kai_ti: '楷体',
+    font_family_hei_ti: '黑体'
  },
  dataset: {
    scope_edit: '仅编辑时生效',
--- a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/AssistLineEdit.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/AssistLineEdit.vue
@@ -272,7 +272,7 @@ onMounted(() => {
          </el-select>
        </el-col>
        <el-col :span="useQuotaExt ? 2 : 3">
-          <el-tooltip effect="dark" content="字号" placement="top">
+          <el-tooltip effect="dark" :content="t('chart.font_size')" placement="top">
            <el-select
              v-model="item.fontSize"
              class="select-item"
--- a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/TextThresholdEdit.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/dialog/TextThresholdEdit.vue
@@ -129,7 +129,7 @@ init()
            </el-select>
          </el-form-item>
        </el-col>
-        <el-col :span="9" style="text-align: center">
+        <el-col :span="8" style="text-align: center">
          <el-form-item class="form-item" v-if="item.term !== 'between'">
            <el-input-number
              controls-position="right"
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue
@@ -375,7 +375,7 @@ watch(
            :effect="themes"
            v-if="showProperties('indicator-value-selector')"
            name="indicator-value"
-            title="指标值"
+            :title="t('chart.indicator_value')"
          >
            <indicator-value-selector
              ref="indicatorValueRef"
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/DualYAxisSelectorInner.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/DualYAxisSelectorInner.vue
@@ -175,7 +175,7 @@ onMounted(() => {
        v-if="showProperty('fontSize')"
        style="padding-left: 4px"
      >
-        <el-tooltip content="字号" :effect="toolTip" placement="top">
+        <el-tooltip :content="t('chart.font_size')" :effect="toolTip" placement="top">
          <el-select
            style="width: 108px"
            :effect="props.themes"
@@ -384,7 +384,7 @@ onMounted(() => {
          </el-form-item>
          <el-form-item class="form-item" :class="'form-item-' + themes" style="padding-left: 4px">
            <template #label>&nbsp;</template>
-            <el-tooltip content="字号" :effect="toolTip" placement="top">
+            <el-tooltip :content="t('chart.font_size')" :effect="toolTip" placement="top">
              <el-select
                :disabled="!state.axisForm.axisLabel.show"
                style="width: 108px"
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/FlowMapPointSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/FlowMapPointSelector.vue
@@ -109,7 +109,7 @@ onMounted(() => {

        <el-form-item class="form-item" :class="'form-item-' + themes">
          <template #label>&nbsp;</template>
-          <el-tooltip content="字号" :effect="toolTip" placement="top">
+          <el-tooltip :content="t('chart.font_size')" :effect="toolTip" placement="top">
            <el-select
              size="small"
              style="width: 108px"
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/IndicatorNameSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/IndicatorNameSelector.vue
@@ -162,7 +162,7 @@ defineExpose({ getFormData })
          />
        </el-form-item>
        <el-form-item class="form-item" :class="'form-item-' + themes" style="padding: 0 4px">
-          <el-tooltip content="字号" :effect="toolTip" placement="top">
+          <el-tooltip :content="t('chart.font_size')" :effect="toolTip" placement="top">
            <el-select
              style="width: 56px"
              :effect="themes"
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/IndicatorValueSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/IndicatorValueSelector.vue
@@ -172,7 +172,7 @@ defineExpose({ getFormData })
          />
        </el-form-item>
        <el-form-item class="form-item" :class="'form-item-' + themes" style="padding: 0 4px">
-          <el-tooltip content="字号" :effect="toolTip" placement="top">
+          <el-tooltip :content="t('chart.font_size')" :effect="toolTip" placement="top">
            <el-select
              style="width: 56px"
              :effect="themes"
@@ -472,7 +472,7 @@ defineExpose({ getFormData })
            />
          </el-form-item>
          <el-form-item class="form-item" :class="'form-item-' + themes" style="padding: 0 4px">
-            <el-tooltip content="字号" :effect="toolTip" placement="top">
+            <el-tooltip :content="t('chart.font_size')" :effect="toolTip" placement="top">
              <el-select
                :disabled="!state.indicatorValueForm.suffixEnable"
                style="width: 56px"
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/LabelSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/LabelSelector.vue
@@ -548,7 +548,7 @@ const isProgressBar = computed(() => {
          v-if="showProperty('fontSize')"
        >
          <template #label>&nbsp;</template>
-          <el-tooltip content="字号" :effect="toolTip" placement="top">
+          <el-tooltip :content="t('chart.font_size')" :effect="toolTip" placement="top">
            <el-select
              size="small"
              style="width: 108px"
@@ -812,7 +812,7 @@ const isProgressBar = computed(() => {
            v-if="showProperty('totalFontSize')"
          >
            <template #label>&nbsp;</template>
-            <el-tooltip content="字号" :effect="toolTip" placement="top">
+            <el-tooltip :content="t('chart.font_size')" :effect="toolTip" placement="top">
              <el-select
                size="small"
                style="width: 108px"
@@ -1198,7 +1198,7 @@ const isProgressBar = computed(() => {
            </el-form-item>
            <el-form-item class="form-item" :class="'form-item-' + themes">
              <template #label>&nbsp;</template>
-              <el-tooltip content="字号" :effect="toolTip" placement="top">
+              <el-tooltip :content="t('chart.font_size')" :effect="toolTip" placement="top">
                <el-select
                  size="small"
                  :disabled="!curSeriesFormatter.show"
@@ -1377,7 +1377,7 @@ const isProgressBar = computed(() => {
            v-if="showProperty('fontSize')"
          >
            <template #label>&nbsp;</template>
-            <el-tooltip content="字号" :effect="toolTip" placement="top">
+            <el-tooltip :content="t('chart.font_size')" :effect="toolTip" placement="top">
              <el-select
                :disabled="!state.labelForm.childrenShow"
                size="small"
@@ -1640,7 +1640,7 @@ const isProgressBar = computed(() => {
            v-if="showProperty('fontSize')"
          >
            <template #label>&nbsp;</template>
-            <el-tooltip content="字号" :effect="toolTip" placement="top">
+            <el-tooltip :content="t('chart.font_size')" :effect="toolTip" placement="top">
              <el-select
                :disabled="!state.labelForm.childrenShow"
                size="small"
@@ -1789,7 +1789,7 @@ const isProgressBar = computed(() => {
            v-if="showProperty('fontSize')"
          >
            <template #label>&nbsp;</template>
-            <el-tooltip content="字号" :effect="toolTip" placement="top">
+            <el-tooltip :content="t('chart.font_size')" :effect="toolTip" placement="top">
              <el-select
                :disabled="!state.labelForm.proportionSeriesFormatter.show"
                size="small"
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/LegendSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/LegendSelector.vue
@@ -303,7 +303,7 @@ onMounted(() => {
        v-if="showProperty('fontSize')"
      >
        <template #label> &nbsp; </template>
-        <el-tooltip content="字号" :effect="toolTip" placement="top">
+        <el-tooltip :content="t('chart.font_size')" :effect="toolTip" placement="top">
          <el-select
            style="width: 108px"
            :effect="themes"
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/TitleSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/TitleSelector.vue
@@ -183,7 +183,7 @@ watch(
          />
        </el-form-item>
        <el-form-item class="form-item" :class="'form-item-' + themes" style="padding: 0 4px">
-          <el-tooltip content="字号" :effect="toolTip" placement="top">
+          <el-tooltip :content="t('chart.font_size')" :effect="toolTip" placement="top">
            <el-select
              style="width: 56px"
              :effect="themes"
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/TooltipSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/TooltipSelector.vue
@@ -479,7 +479,7 @@ onMounted(() => {
        v-if="showProperty('fontSize')"
      >
        <template #label>&nbsp;</template>
-        <el-tooltip content="字号" :effect="toolTip" placement="top">
+        <el-tooltip :content="t('chart.font_size')" :effect="toolTip" placement="top">
          <el-select
            size="small"
            style="width: 108px"
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/XAxisSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/XAxisSelector.vue
@@ -193,7 +193,7 @@ onMounted(() => {
        style="padding-left: 4px"
      >
        <template #label>&nbsp;</template>
-        <el-tooltip content="字号" :effect="toolTip" placement="top">
+        <el-tooltip :content="t('chart.font_size')" :effect="toolTip" placement="top">
          <el-select
            style="width: 108px"
            :effect="props.themes"
@@ -401,7 +401,7 @@ onMounted(() => {
        </el-form-item>
        <el-form-item class="form-item" :class="'form-item-' + themes" style="padding-left: 4px">
          <template #label>&nbsp;</template>
-          <el-tooltip content="字号" :effect="toolTip" placement="top">
+          <el-tooltip :content="t('chart.font_size')" :effect="toolTip" placement="top">
            <el-select
              :disabled="!state.axisForm.axisLabel.show"
              style="width: 108px"
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/YAxisSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/YAxisSelector.vue
@@ -160,7 +160,7 @@ onMounted(() => {
        style="padding-left: 4px"
      >
        <template #label>&nbsp;</template>
-        <el-tooltip content="字号" :effect="toolTip" placement="top">
+        <el-tooltip :content="t('chart.font_size')" :effect="toolTip" placement="top">
          <el-select
            style="width: 108px"
            :effect="props.themes"
@@ -377,7 +377,7 @@ onMounted(() => {
          </el-form-item>
          <el-form-item class="form-item" :class="'form-item-' + themes" style="padding-left: 4px">
            <template #label>&nbsp;</template>
-            <el-tooltip content="字号" :effect="toolTip" placement="top">
+            <el-tooltip :content="t('chart.font_size')" :effect="toolTip" placement="top">
              <el-select
                :disabled="!state.axisForm.axisLabel.show"
                style="width: 108px"
--- a/core/core-frontend/src/views/chart/components/editor/util/chart.ts
+++ b/core/core-frontend/src/views/chart/components/editor/util/chart.ts
@@ -1113,10 +1113,10 @@ export const BASE_ECHARTS_SELECT = {
 }

 export const CHART_FONT_FAMILY_ORIGIN = [
-  { name: '微软雅黑', value: 'Microsoft YaHei' },
-  { name: '宋体', value: 'SimSun, "Songti SC", STSong' },
-  { name: '黑体', value: 'SimHei, Helvetica' },
-  { name: '楷体', value: 'KaiTi, "Kaiti SC", STKaiti' }
+  { name: t('chart.font_family_ya_hei'), value: 'Microsoft YaHei' },
+  { name: t('chart.font_family_song_ti'), value: 'SimSun, "Songti SC", STSong' },
+  { name: t('chart.font_family_hei_ti'), value: 'SimHei, Helvetica' },
+  { name: t('chart.font_family_kai_ti'), value: 'KaiTi, "Kaiti SC", STKaiti' }
 ]

 export const CHART_FONT_FAMILY_MAP_TRANS = {
@@ -1127,10 +1127,10 @@ export const CHART_FONT_FAMILY_MAP_TRANS = {
 }

 export const CHART_FONT_FAMILY = [
-  { name: '微软雅黑', value: 'Microsoft YaHei' },
-  { name: '宋体', value: 'SimSun' },
-  { name: '黑体', value: 'SimHei' },
-  { name: '楷体', value: 'KaiTi' }
+  { name: t('chart.font_family_ya_hei'), value: 'Microsoft YaHei' },
+  { name: t('chart.font_family_song_ti'), value: 'SimSun' },
+  { name: t('chart.font_family_hei_ti'), value: 'SimHei' },
+  { name: t('chart.font_family_kai_ti'), value: 'KaiTi' }
 ]

 export const CHART_FONT_FAMILY_MAP = {
				`@@ -0,0 +1 @@`
				UPDATE `visualization_background` SET `name` = 'Board10' WHERE `id` = 'dark_1';