diff --git a/core/core-backend/src/main/resources/db/desktop/V2.10.3__ddl.sql b/core/core-backend/src/main/resources/db/desktop/V2.10.3__ddl.sql index e8570bb31b..2fe81c2a7f 100644 --- a/core/core-backend/src/main/resources/db/desktop/V2.10.3__ddl.sql +++ b/core/core-backend/src/main/resources/db/desktop/V2.10.3__ddl.sql @@ -18,4 +18,14 @@ ALTER TABLE `visualization_link_jump_target_view_info` update visualization_link_jump_target_view_info set target_type = 'view'; ALTER TABLE `data_visualization_info` ADD COLUMN `check_version` varchar(50) NULL DEFAULT '1' COMMENT '内容检查标识'; -update data_visualization_info set check_version = '1'; \ No newline at end of file +update data_visualization_info set check_version = '1'; + +UPDATE `visualization_background` SET `name` = 'Board1' WHERE `id` = 'board_1'; +UPDATE `visualization_background` SET `name` = 'Board2' WHERE `id` = 'board_2'; +UPDATE `visualization_background` SET `name` = 'Board3' WHERE `id` = 'board_3'; +UPDATE `visualization_background` SET `name` = 'Board4' WHERE `id` = 'board_4'; +UPDATE `visualization_background` SET `name` = 'Board5' WHERE `id` = 'board_5'; +UPDATE `visualization_background` SET `name` = 'Board6' WHERE `id` = 'board_6'; +UPDATE `visualization_background` SET `name` = 'Board7' WHERE `id` = 'board_7'; +UPDATE `visualization_background` SET `name` = 'Board8' WHERE `id` = 'board_8'; +UPDATE `visualization_background` SET `name` = 'Board9' WHERE `id` = 'board_9'; \ No newline at end of file diff --git a/core/core-backend/src/main/resources/db/migration/V2.10.3__ddl.sql b/core/core-backend/src/main/resources/db/migration/V2.10.3__ddl.sql index b912d2baff..9b7a96b1f2 100644 --- a/core/core-backend/src/main/resources/db/migration/V2.10.3__ddl.sql +++ b/core/core-backend/src/main/resources/db/migration/V2.10.3__ddl.sql @@ -21,4 +21,14 @@ ALTER TABLE `visualization_link_jump_target_view_info` update visualization_link_jump_target_view_info set target_type = 'view'; ALTER TABLE `data_visualization_info` ADD COLUMN `check_version` varchar(50) NULL DEFAULT '1' COMMENT '内容检查标识'; -update data_visualization_info set check_version = '1'; \ No newline at end of file +update data_visualization_info set check_version = '1'; + +UPDATE `visualization_background` SET `name` = 'Board1' WHERE `id` = 'board_1'; +UPDATE `visualization_background` SET `name` = 'Board2' WHERE `id` = 'board_2'; +UPDATE `visualization_background` SET `name` = 'Board3' WHERE `id` = 'board_3'; +UPDATE `visualization_background` SET `name` = 'Board4' WHERE `id` = 'board_4'; +UPDATE `visualization_background` SET `name` = 'Board5' WHERE `id` = 'board_5'; +UPDATE `visualization_background` SET `name` = 'Board6' WHERE `id` = 'board_6'; +UPDATE `visualization_background` SET `name` = 'Board7' WHERE `id` = 'board_7'; +UPDATE `visualization_background` SET `name` = 'Board8' WHERE `id` = 'board_8'; +UPDATE `visualization_background` SET `name` = 'Board9' WHERE `id` = 'board_9'; \ No newline at end of file diff --git a/core/core-backend/src/main/resources/i18n/core_en_US.properties b/core/core-backend/src/main/resources/i18n/core_en_US.properties index c3e65682d8..6a08534d56 100644 --- a/core/core-backend/src/main/resources/i18n/core_en_US.properties +++ b/core/core-backend/src/main/resources/i18n/core_en_US.properties @@ -10,7 +10,7 @@ i18n_menu.system=System i18n_menu.view=Data Display i18n_menu.data=Data preparation i18n_menu.panel=Panel -i18n_menu.screen=Big screen +i18n_menu.screen=Data screen i18n_menu.dataset=Dataset i18n_menu.datasource=datasource i18n_menu.user=User diff --git a/core/core-frontend/src/components/data-visualization/DvToolbar.vue b/core/core-frontend/src/components/data-visualization/DvToolbar.vue index fbc6cf3df2..2f15b5a928 100644 --- a/core/core-frontend/src/components/data-visualization/DvToolbar.vue +++ b/core/core-frontend/src/components/data-visualization/DvToolbar.vue @@ -271,11 +271,11 @@ eventBus.on('clearCanvas', clearCanvas) const openOuterParamsSet = () => { if (componentData.value.length === 0) { - ElMessage.warning('当前仪表板为空，请先添加组件') + ElMessage.warning(t('components.add_components_first')) return } if (!dvInfo.value.id) { - ElMessage.warning('请先保存当前页面') + ElMessage.warning(t('components.current_page_first')) return } //设置需要先触发保存 diff --git a/core/core-frontend/src/components/visualization/CanvasCacheDialog.vue b/core/core-frontend/src/components/visualization/CanvasCacheDialog.vue index a6c65b8807..10bceaddc6 100644 --- a/core/core-frontend/src/components/visualization/CanvasCacheDialog.vue +++ b/core/core-frontend/src/components/visualization/CanvasCacheDialog.vue @@ -3,7 +3,7 @@ ref="canvasCacheDialogRef" :append-to-body="true" v-model="dialogShow" - width="340px" + width="360px" :show-close="false" trigger="click" > diff --git a/core/core-frontend/src/components/visualization/common/DragInfo.vue b/core/core-frontend/src/components/visualization/common/DragInfo.vue index df78bc02c2..e3c92a7427 100644 --- a/core/core-frontend/src/components/visualization/common/DragInfo.vue +++ b/core/core-frontend/src/components/visualization/common/DragInfo.vue @@ -23,7 +23,7 @@ const dvMainStore = dvMainStoreWithOut() const { dvInfo, mobileInPc } = storeToRefs(dvMainStore) const tips = - '从顶部工具栏中选择组件，添加到这里创建' + + t('visualization.resource_create_tips') + (dvInfo.value.type === 'dashboard' ? t('work_branch.dashboard') : t('work_branch.big_data_screen')) diff --git a/core/core-frontend/src/custom-component/common/CommonBorderSetting.vue b/core/core-frontend/src/custom-component/common/CommonBorderSetting.vue index 49f5cd68f9..37a08f2cc1 100644 --- a/core/core-frontend/src/custom-component/common/CommonBorderSetting.vue +++ b/core/core-frontend/src/custom-component/common/CommonBorderSetting.vue @@ -34,9 +34,9 @@ const styleMounted = ref({ }) const borderStyleList = [ - { name: '实线', value: 'solid' }, - { name: '虚线', value: 'dashed' }, - { name: '点线', value: 'dotted' } + { name: t('visualization.border_style_solid'), value: 'solid' }, + { name: t('visualization.border_style_dashed'), value: 'dashed' }, + { name: t('visualization.border_style_dotted'), value: 'dotted' } ] const styleInit = () => { diff --git a/core/core-frontend/src/custom-component/de-frame/Attr.vue b/core/core-frontend/src/custom-component/de-frame/Attr.vue index c00c85bbc5..3855dd64a7 100644 --- a/core/core-frontend/src/custom-component/de-frame/Attr.vue +++ b/core/core-frontend/src/custom-component/de-frame/Attr.vue @@ -3,7 +3,7 @@ @@ -18,8 +18,10 @@ import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain' import CommonAttr from '@/custom-component/common/CommonAttr.vue' import { storeToRefs } from 'pinia' import FrameLinks from '@/custom-component/de-frame/FrameLinks.vue' +import { useI18n } from '@/hooks/web/useI18n' const dvMainStore = dvMainStoreWithOut() const { curComponent, mobileInPc } = storeToRefs(dvMainStore) +const { t } = useI18n() const props = withDefaults( defineProps<{ themes?: EditorTheme diff --git a/core/core-frontend/src/custom-component/de-stream-media/Attr.vue b/core/core-frontend/src/custom-component/de-stream-media/Attr.vue index 812657f08f..58b8182e17 100644 --- a/core/core-frontend/src/custom-component/de-stream-media/Attr.vue +++ b/core/core-frontend/src/custom-component/de-stream-media/Attr.vue @@ -3,7 +3,7 @@ @@ -21,8 +21,10 @@ import { dvMainStoreWithOut } from '@/store/modules/data-visualization/dvMain' import CommonAttr from '@/custom-component/common/CommonAttr.vue' import { storeToRefs } from 'pinia' import StreamMediaLinks from '@/custom-component/de-stream-media/StreamMediaLinks.vue' +import { useI18n } from '@/hooks/web/useI18n' const dvMainStore = dvMainStoreWithOut() const { curComponent, mobileInPc } = storeToRefs(dvMainStore) +const { t } = useI18n() withDefaults( defineProps<{ themes?: EditorTheme diff --git a/core/core-frontend/src/custom-component/de-time-clock/Attr.vue b/core/core-frontend/src/custom-component/de-time-clock/Attr.vue index bc4469c095..61fff72f60 100644 --- a/core/core-frontend/src/custom-component/de-time-clock/Attr.vue +++ b/core/core-frontend/src/custom-component/de-time-clock/Attr.vue @@ -6,7 +6,8 @@ import { ref, onMounted, onBeforeUnmount, watch } from 'vue' import { imgUrlTrans } from '@/utils/imgUtils' import eventBus from '@/utils/eventBus' import TimeClockFormat from '@/custom-component/de-time-clock/TimeClockFormat.vue' - +import { useI18n } from '@/hooks/web/useI18n' +const { t } = useI18n() withDefaults( defineProps<{ themes?: EditorTheme @@ -62,7 +63,7 @@ onBeforeUnmount(() => { > diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts index e8a8863a53..abc10e9693 100644 --- a/core/core-frontend/src/locales/en.ts +++ b/core/core-frontend/src/locales/en.ts @@ -1302,8 +1302,8 @@ export default { custom_count: 'Number of records', table_title_fontsize: 'Header font size', table_item_fontsize: 'Table font size', - table_header_bg: 'Header background', - table_item_bg: 'Table background', + table_header_bg: 'Header Bg', + table_item_bg: 'Table Bg', table_header_font_color: 'Header font', table_item_font_color: 'Table font', table_show_index: 'Show serial number', @@ -2568,7 +2568,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr condition_cascade_configuration: 'Query condition cascade configuration', not_reverse_cascade: '(Only the upper level can cascade the lower level, not reverse cascade)', must_be_met: - 'Based on the query condition of the current query component, if cascade configuration is required, the following conditions must be met:', + 'Based on the condition of the current component, if cascade configuration is required, the following conditions must be met:', select_data_set: '1. Display type: text drop-down component and number drop-down component; 2. Option value source: select Dataset', add_cascade_configuration: 'Add cascade configuration', @@ -2596,7 +2596,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr cannot_be_empty_name: 'Field name cannot be empty', query_condition_setting: 'Query condition setting', query_condition: 'Query condition', - chart_and_field: 'Select the associated chart and field', + chart_and_field: 'Select the associated chart&field', be_switched_to: 'Note: Automatic mode supports automatic association of fields with the same Dataset, which can be switched to', to_automatic_again: @@ -2647,6 +2647,9 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr column_name: 'Field name' }, visualization: { + resource_create_tips: 'Select components from the top toolbar and add them here to create.', + component_select_tips: 'Please elect a component...', + border_style_dotted: 'Dotted', app_export: 'App Export', app_name: 'App Name', app_version: 'App Version', @@ -2735,7 +2738,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr no_screen: 'No data screens available', query: 'Query', carousel: 'Carousel', - carousel_time: 'Carousel Time (seconds)', + carousel_time: 'Carousel Time(s)', carousel_tips: 'Carousel will only take effect after exiting edit mode', carousel_tips2: 'Carousel will be disabled after enabling conditional styling', background: 'Background', @@ -2762,7 +2765,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr pop_area_tips: 'Click or drag the query component to this position, click preview to view the pop-up area', view: 'View', - query_component: 'Query Component', + query_component: 'Query', media: 'Media', more: 'More', source_material: 'Material', @@ -2782,13 +2785,13 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr size: 'Size', font_family_select: 'Dashboard Font Selection', screen_font_family_select: 'Data Screen Font Selection', - button_tips: 'Display zoom, export, and other floating buttons', + button_tips: 'Display floating buttons', display_auxiliary_grid: 'Display Auxiliary Grid', show_pop_button: 'Show Pop-up Area Query Button', show_zoom_button: 'Show floating buttons', keep_ratio: 'Keep Aspect Ratio', rotation_3d: '3D Rotation', - keep_size: 'Adjust size while keeping internal component size', + keep_size: 'Adjust size & keeping inner', no_save_tips: 'There are unsaved {0}', no_save_tips2: 'There are unsaved changes, restore now?', locate_tips: 'Locate to Center', @@ -3004,7 +3007,7 @@ Scatter chart (bubble) chart: {a} (series name), {b} (data name), {c} (value arr stream_mobile_tips: 'May not be displayed on IOS devices', json_params_error: 'Failed to parse third-party parameters. Please check the parameter format.', inner_padding: 'Inner Padding', - board_radio: 'Rounded Corners', + board_radio: 'Corners', web_set_tips: 'Some websites may not allow embedding and will not display.', repeat_params: 'Duplicate parameter names exist.', enable_outer_param_set: 'Enable External Parameter Settings', diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts index ddfa8f023e..e0326ac8aa 100644 --- a/core/core-frontend/src/locales/tw.ts +++ b/core/core-frontend/src/locales/tw.ts @@ -2585,6 +2585,9 @@ export default { column_name: '欄位名稱' }, visualization: { + resource_create_tips: '從頂部工具欄中選擇組件，添加到這裡創建。', + component_select_tips: '請選擇組件...', + border_style_dotted: '點線', app_export: '應用導出', app_name: '應用名稱', app_version: '應用版本號', diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index 6fd78ea03e..2d475bdda1 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -2587,6 +2587,9 @@ export default { column_name: '字段名称' }, visualization: { + resource_create_tips: '从顶部工具栏中选择组件，添加到这里创建', + component_select_tips: '请选择组件...', + border_style_dotted: '点线', app_export: '应用导出', app_name: '应用名称', app_version: '应用版本号', diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyleBatchSet.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyleBatchSet.vue index 29a18f7bda..8a7f8f52a8 100644 --- a/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyleBatchSet.vue +++ b/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyleBatchSet.vue @@ -37,7 +37,7 @@ :themes="themes" > - 请选择组件... + {{ t('visualization.component_select_tips') }} @@ -51,7 +51,8 @@ import { snapshotStoreWithOut } from '@/store/modules/data-visualization/snapsho import CommonAttr from '@/custom-component/common/CommonAttr.vue' const dvMainStore = dvMainStoreWithOut() const snapshotStore = snapshotStoreWithOut() - +import { useI18n } from '@/hooks/web/useI18n' +const { t } = useI18n() const { batchOptComponentInfo, batchOptComponentType, mixProperties, mixPropertiesInner } = storeToRefs(dvMainStore) const param = { id: 'mixId', optType: 'edit' }