From 538abcf44eb6d80dacf613e6cccee8a23ae70812 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=98=89=E8=B1=AA?= <42510293+ziyujiahao@users.noreply.github.com> Date: Fri, 3 Jan 2025 15:06:34 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF=E3=80=81?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E9=80=82=E9=85=8D=20(#14496)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/VisualizationBackgroundService.java | 2 ++ .../src/main/resources/i18n/core_en_US.properties | 1 + .../src/main/resources/i18n/core_zh_CN.properties | 1 + .../src/main/resources/i18n/core_zh_TW.properties | 1 + .../src/custom-component/common/CommonEvent.vue | 14 +++++++++++++- .../src/custom-component/component-list.ts | 14 +++++++------- core/core-frontend/src/locales/en.ts | 1 + core/core-frontend/src/locales/tw.ts | 1 + core/core-frontend/src/locales/zh-CN.ts | 1 + .../src/views/common/MultiplexingCanvas.vue | 2 +- .../visualization/VisualizationBackgroundApi.java | 2 ++ 11 files changed, 31 insertions(+), 9 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationBackgroundService.java b/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationBackgroundService.java index 1772709773..da326e8fd4 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationBackgroundService.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/server/VisualizationBackgroundService.java @@ -3,6 +3,7 @@ package io.dataease.visualization.server; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.dataease.api.visualization.VisualizationBackgroundApi; import io.dataease.api.visualization.vo.VisualizationBackgroundVO; +import io.dataease.i18n.Translator; import io.dataease.utils.BeanUtils; import io.dataease.visualization.dao.auto.entity.VisualizationBackground; import io.dataease.visualization.dao.auto.mapper.VisualizationBackgroundMapper; @@ -30,6 +31,7 @@ public class VisualizationBackgroundService implements VisualizationBackgroundAp return result.stream().map(vb ->{ VisualizationBackgroundVO vbVO = new VisualizationBackgroundVO(); BeanUtils.copyBean(vbVO,vb); + vbVO.setName(Translator.get("i18n_board")+vbVO.getName()); return vbVO; }).collect(Collectors.groupingBy(VisualizationBackgroundVO::getClassification)); } 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 e7c98be5ca..b135e8e615 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 @@ -190,5 +190,6 @@ i18n_dataset_create_error=Create error,please try again i18n_dataset_ds_delete=Datasource deleted,this dataset can not be show i18n_dataset_plugin_error=Datasource plugin is not exist i18n_dataset_cross_error=Dataset with more than two data sources is not supported +i18n_board=Board diff --git a/core/core-backend/src/main/resources/i18n/core_zh_CN.properties b/core/core-backend/src/main/resources/i18n/core_zh_CN.properties index 6719736432..a4c58a4826 100644 --- a/core/core-backend/src/main/resources/i18n/core_zh_CN.properties +++ b/core/core-backend/src/main/resources/i18n/core_zh_CN.properties @@ -189,3 +189,4 @@ i18n_dataset_create_error=\u6570\u636e\u96c6\u56e0\u5f02\u5e38\u5bfc\u81f4\u65e0 i18n_dataset_ds_delete=\u7531\u4e8e\u6570\u636e\u96c6\u6240\u7528\u7684\u6570\u636e\u6e90\u5df2\u88ab\u5220\u9664\2c\u65e0\u6cd5\u663e\u793a\u6570\u636e\u96c6 i18n_dataset_plugin_error=\u5f53\u524d\u6570\u636e\u6e90\u63d2\u4ef6\u4e0d\u5b58\u5728 i18n_dataset_cross_error=\u8de8\u6e90\u6570\u636e\u96c6\u4e0d\u652f\u6301\u8be5\u529f\u80fd +i18n_board=\u8fb9\u6846 diff --git a/core/core-backend/src/main/resources/i18n/core_zh_TW.properties b/core/core-backend/src/main/resources/i18n/core_zh_TW.properties index 930e643284..3896c5b400 100644 --- a/core/core-backend/src/main/resources/i18n/core_zh_TW.properties +++ b/core/core-backend/src/main/resources/i18n/core_zh_TW.properties @@ -189,4 +189,5 @@ i18n_dataset_create_error=\u6578\u64da\u96c6\u56e0\u7570\u5e38\u5c0e\u81f4\u7121 i18n_dataset_ds_delete=\u7531\u4e8e\u6578\u64da\u96c6\u6240\u7528\u7684\u6578\u64da\u6e90\u5df2\u88ab\u522a\u9664\2c\u7121\u6cd5\u986f\u793a\u6578\u64da\u96c6 i18n_dataset_plugin_error=\u7576\u524d\u6578\u64da\u6e90\u63d2\u4ef6\u4e0d\u5b58\u5728 i18n_dataset_cross_error=\u8de8\u6e90\u6578\u64da\u96c6\u4e0d\u652f\u6301\u8a72\u529f\u80fd +i18n_board=\u908a\u6846 diff --git a/core/core-frontend/src/custom-component/common/CommonEvent.vue b/core/core-frontend/src/custom-component/common/CommonEvent.vue index 91face3bac..c382a66ae1 100644 --- a/core/core-frontend/src/custom-component/common/CommonEvent.vue +++ b/core/core-frontend/src/custom-component/common/CommonEvent.vue @@ -37,6 +37,18 @@ const onEventChange = () => { const onJumpValueChange = () => { snapshotStore.recordSnapshotCacheToMobile('events') } +const getTypeLabel = type => { + return typeMap[type] || type +} +const typeMap = { + jump: t('visualization.jump'), + download: t('visualization.download'), + share: t('visualization.share'), + fullScreen: t('visualization.fullscreen'), + showHidden: t('visualization.pop_area'), + refreshDataV: t('visualization.refresh'), + refreshView: t('visualization.refresh_view') +}