From 42b300688acfda7e99dd3903aab296d05f258e2a 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: Thu, 11 Sep 2025 10:48:28 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BB=AA=E8=A1=A8=E6=9D=BF=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E5=90=8E=EF=BC=8C=E4=B9=8B=E5=89=8D=E9=A2=84=E8=A7=88?= =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E9=A1=B5=E9=9D=A2=E5=88=B7=E6=96=B0?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=BC=82=E5=B8=B8=E4=BF=A1=E6=81=AF=E4=BC=98?= =?UTF-8?q?=E5=8C=96=20(#16964)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visualization/server/DataVisualizationServer.java | 9 ++++----- .../src/main/resources/i18n/core_en_US.properties | 1 + .../src/main/resources/i18n/core_zh_CN.properties | 2 ++ .../src/main/resources/i18n/core_zh_TW.properties | 2 ++ 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java b/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java index 1f719d64df..2492c81149 100644 --- a/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java +++ b/core/core-backend/src/main/java/io/dataease/visualization/server/DataVisualizationServer.java @@ -231,7 +231,7 @@ public class DataVisualizationServer implements DataVisualizationApi { result.setWeight(9); return result; } else { - DEException.throwException("资源不存在或已经被删除..."); + DEException.throwException(Translator.get("i18n_resource_not_exists")); } return null; } @@ -746,11 +746,10 @@ public class DataVisualizationServer implements DataVisualizationApi { @Override public String findDvType(Long dvId) { DataVisualizationInfo dataVisualizationInfo = dataVisualizationInfoRepository.findById(dvId).orElse(null); - if (dataVisualizationInfo != null) { - return dataVisualizationInfo.getType(); - } else { - return null; + if (dataVisualizationInfo == null) { + DEException.throwException(Translator.get("i18n_resource_not_exists")); } + return dataVisualizationInfo.getType(); } 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 33f9c064fc..6ed10eeec2 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 @@ -212,3 +212,4 @@ i18n_unsupported_protocol=Unsupported protocol! i18n_excel_error_first_row=Empty cells are not allowed in the middle of the first row! i18n_app_error_no_api=Current API data source is not supported. i18n_sql_variable_name_empty=Variable name cannot be empty! +i18n_resource_not_exists=Resource does not exist or has been deleted... 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 4a83bd0ca9..c20c094129 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 @@ -211,3 +211,5 @@ i18n_unsupported_protocol=\u4E0D\u652F\u6301\u7684\u534F\u8BAE\uFF01 i18n_excel_error_first_row=\u9996\u884C\u884C\u4E2D\u4E0D\u5141\u8BB8\u6709\u7A7A\u5355\u5143\u683C\uFF01 i18n_app_error_no_api=\u5F53\u524D\u4E0D\u652F\u6301API\u6570\u636E\u6E90\u3002 i18n_sql_variable_name_empty=\u53d8\u91cf\u4e0d\u80fd\u4e3a\u7a7a\uff01 +i18n_resource_not_exists=\u8D44\u6E90\u4E0D\u5B58\u5728\u6216\u5DF2\u7ECF\u88AB\u5220\u9664... + 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 e7c9395bc2..0e4748fdf9 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 @@ -211,3 +211,5 @@ i18n_unsupported_protocol=\u4E0D\u652F\u63F4\u7684\u5354\u8B70\uFF01 i18n_excel_error_first_row=\u9996\u884C\u884C\u4E2D\u4E0D\u5141\u8A31\u6709\u7A7A\u5132\u5B58\u683C\uFF01 i18n_app_error_no_api=\u7576\u524D\u4E0D\u652F\u63F4API\u6578\u64DA\u6E90\u3002 i18n_sql_variable_name_empty=\u8b8a\u6578\u4e0d\u80fd\u70ba\u7a7a\uff01 +i18n_resource_not_exists=\u8CC7\u6E90\u4E0D\u5B58\u5728\u6216\u5DF2\u7D93\u88AB\u522A\u9664... +