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 index 147db64566..66edf3f1fd 100644 --- 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 @@ -1 +1,3 @@ UPDATE `visualization_background` SET `name` = 'Board10' WHERE `id` = 'dark_1'; +UPDATE `visualization_subject` SET `name` = 'chart.light_theme' WHERE `id` = '10001'; +UPDATE `visualization_subject` SET `name` = 'chart.dark_theme' WHERE `id` = '10002'; 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 index 147db64566..66edf3f1fd 100644 --- 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 @@ -1 +1,3 @@ UPDATE `visualization_background` SET `name` = 'Board10' WHERE `id` = 'dark_1'; +UPDATE `visualization_subject` SET `name` = 'chart.light_theme' WHERE `id` = '10001'; +UPDATE `visualization_subject` SET `name` = 'chart.dark_theme' WHERE `id` = '10002'; diff --git a/core/core-frontend/src/components/dashboard/subject-setting/pre-subject/SubjectTemplateItem.vue b/core/core-frontend/src/components/dashboard/subject-setting/pre-subject/SubjectTemplateItem.vue index 9c815dc9ae..acf3c9f69c 100644 --- a/core/core-frontend/src/components/dashboard/subject-setting/pre-subject/SubjectTemplateItem.vue +++ b/core/core-frontend/src/components/dashboard/subject-setting/pre-subject/SubjectTemplateItem.vue @@ -22,8 +22,8 @@
- {{ - subjectItem.name + {{ + t(subjectItem.name) }}
diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts index b943fad3dc..7b69c701ed 100644 --- a/core/core-frontend/src/locales/en.ts +++ b/core/core-frontend/src/locales/en.ts @@ -1623,7 +1623,7 @@ export default { value_formatter_auto: 'Automatic', value_formatter_value: 'Number', value_formatter_percent: 'Percentage', - value_formatter_unit: 'Unit of quantity', + value_formatter_unit: 'Unit', value_formatter_decimal_count: 'Number of decimal places', value_formatter_suffix: 'Unit suffix', show_gap: 'Show interval value', @@ -1855,7 +1855,10 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr font_family_ya_hei: 'Microsoft YaHei', font_family_song_ti: 'SimSun', font_family_kai_ti: 'KaiTi', - font_family_hei_ti: 'SimHei' + font_family_hei_ti: 'SimHei', + gauge_condition_style_tips: `Condition style settings, determine dashboard interval colors, leave blank to disable thresholds, range (0-100), incremental levels
Example: input 30,70; this means: divided into 3 segments, namely [0,30], (30,70], (70,100]`, + light_theme: 'Light Theme', + dark_theme: 'Dark Theme' }, 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 8217960769..02366c3fdc 100644 --- a/core/core-frontend/src/locales/tw.ts +++ b/core/core-frontend/src/locales/tw.ts @@ -1815,7 +1815,10 @@ export default { font_family_ya_hei: '微軟雅黙', font_family_song_ti: '宋體', font_family_kai_ti: '楷體', - font_family_hei_ti: '黑體' + font_family_hei_ti: '黑體', + gauge_condition_style_tips: `條件樣式設定,決定儀表板區間顏色,為空則不啟用閾值,範圍(0-100),逐級遞增
例如:輸入 30,70;表示:分為3段,分別為[0,30],(30,70],(70,100]`, + light_theme: '浅色主題', + dark_theme: '暗色主題' }, dataset: { scope_edit: '僅編輯時生效', diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index 8cca16f1bd..5b7ab64779 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -1817,7 +1817,10 @@ export default { font_family_ya_hei: '微软雅黑', font_family_song_ti: '宋体', font_family_kai_ti: '楷体', - font_family_hei_ti: '黑体' + font_family_hei_ti: '黑体', + gauge_condition_style_tips: `条件样式设置,决定仪表盘区间颜色,为空则不开启阈值,范围(0-100),逐级递增
例如:输入 30,70;表示:分为3段,分别为[0,30],(30,70],(70,100]`, + light_theme: '浅色主题', + dark_theme: '深色主题' }, dataset: { scope_edit: '仅编辑时生效', diff --git a/core/core-frontend/src/utils/canvasStyle.ts b/core/core-frontend/src/utils/canvasStyle.ts index 4c764c9066..77542b376d 100644 --- a/core/core-frontend/src/utils/canvasStyle.ts +++ b/core/core-frontend/src/utils/canvasStyle.ts @@ -270,7 +270,10 @@ export const THEME_STYLE_TRANS_SLAVE1 = { } export const THEME_ATTR_TRANS_MAIN = { - label: ['color'], + label: { + color: 'color', + proportionSeriesFormatter: ['color'] + }, tooltip: ['color'], indicatorName: ['color'] } diff --git a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/Threshold.vue b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/Threshold.vue index a8baef03ad..f6749e6bbd 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-senior/components/Threshold.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-senior/components/Threshold.vue @@ -383,9 +383,7 @@ init()