From abc633b9672dd3b213775b6ee6f651f298f37cae Mon Sep 17 00:00:00 2001 From: jianneng-fit2cloud Date: Mon, 9 Dec 2024 11:18:59 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E5=9B=BE=E8=A1=A8):=20=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96(=E6=8C=87=E6=A0=87=E5=8D=A1)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/desktop/V2.10.4__ddl.sql | 1 + .../main/resources/db/migration/V2.10.4__ddl.sql | 1 + core/core-frontend/src/locales/en.ts | 6 +++++- core/core-frontend/src/locales/tw.ts | 6 +++++- core/core-frontend/src/locales/zh-CN.ts | 6 +++++- .../components/dialog/AssistLineEdit.vue | 2 +- .../components/dialog/TextThresholdEdit.vue | 2 +- .../editor/editor-style/ChartStyle.vue | 2 +- .../components/DualYAxisSelectorInner.vue | 4 ++-- .../components/FlowMapPointSelector.vue | 2 +- .../components/IndicatorNameSelector.vue | 2 +- .../components/IndicatorValueSelector.vue | 4 ++-- .../editor-style/components/LabelSelector.vue | 12 ++++++------ .../editor-style/components/LegendSelector.vue | 2 +- .../editor-style/components/TitleSelector.vue | 2 +- .../editor-style/components/TooltipSelector.vue | 2 +- .../editor-style/components/XAxisSelector.vue | 4 ++-- .../editor-style/components/YAxisSelector.vue | 4 ++-- .../views/chart/components/editor/util/chart.ts | 16 ++++++++-------- 19 files changed, 47 insertions(+), 33 deletions(-) create mode 100644 core/core-backend/src/main/resources/db/desktop/V2.10.4__ddl.sql create mode 100644 core/core-backend/src/main/resources/db/migration/V2.10.4__ddl.sql diff --git 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 new file mode 100644 index 0000000000..147db64566 --- /dev/null +++ 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'; diff --git 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 new file mode 100644 index 0000000000..147db64566 --- /dev/null +++ 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'; diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts index 64fcead8ec..c4ee197309 100644 --- 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', diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts index c183df69b5..6571231b61 100644 --- 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: '僅編輯時生效', diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index 9a1a1ed3e6..eff79a24d0 100644 --- 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: '仅编辑时生效', diff --git 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 index 05647b78fd..e843ce0a0d 100644 --- 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(() => { - + - + { v-if="showProperty('fontSize')" style="padding-left: 4px" > - + { - + { - + - + - + - + { v-if="showProperty('fontSize')" > - + { v-if="showProperty('totalFontSize')" > - + { - + { v-if="showProperty('fontSize')" > - + { v-if="showProperty('fontSize')" > - + { v-if="showProperty('fontSize')" > - + { v-if="showProperty('fontSize')" > - + - + { v-if="showProperty('fontSize')" > - + { style="padding-left: 4px" > - + { - + { style="padding-left: 4px" > - + { - +