center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix: 主题名称重复提示国际化

Browse Source
This commit is contained in:
fit2cloud-chenyw 2022-01-27 14:14:56 +08:00
parent 9b98736627
commit 60b8842c5e
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backend/src/main/java/io/dataease/plugins/server/ThemeServer.java
View File

@ -2,6 +2,7 @@ package io.dataease.plugins.server;
import java.util.List;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@ -11,6 +12,7 @@ import org.springframework.web.multipart.MultipartFile;
import io.dataease.commons.exception.DEException;
import io.dataease.commons.utils.LogUtil;
import io.dataease.i18n.Translator;
import io.dataease.plugins.config.SpringContextUtil;
import io.dataease.plugins.xpack.theme.dto.ThemeDto;
import io.dataease.plugins.xpack.theme.dto.ThemeItem;
@ -42,7 +44,13 @@ public class ThemeServer {
themeXpackService.save(request, bodyFile);
} catch (Exception e) {
LogUtil.error(e.getMessage(), e);
DEException.throwException(e);
if (ObjectUtils.isNotEmpty(e.getMessage()) && e.getMessage().indexOf("theme_name_repeat") != -1) {
DEException.throwException(Translator.get("theme_name_repeat"));
} else if (ObjectUtils.isNotEmpty(e.getMessage()) && e.getMessage().indexOf("theme_name_empty") != -1) {
DEException.throwException(Translator.get("theme_name_empty"));
} else {
DEException.throwException(e);
}
}
}

2
backend/src/main/resources/i18n/messages_en_US.properties
View File

@ -117,3 +117,5 @@ i18n_field_name_repeat=Field name can't repeat
i18n_calc_field_error=Field expression error
i18n_cp_exist=Column permission of the same type already exists
connection_failed=Connection Failed
theme_name_repeat=name of theme has been existed
theme_name_empty=name can not be empty

2
backend/src/main/resources/i18n/messages_zh_CN.properties
View File

@ -116,3 +116,5 @@ i18n_field_name_repeat=字段名不能重复
i18n_calc_field_error=字段表达式语法错误
i18n_cp_exist=已有同类型的列权限存在
connection_failed=连接失败
theme_name_repeat=名称已存在
theme_name_empty=名称不能为空

2
backend/src/main/resources/i18n/messages_zh_TW.properties
View File

@ -117,3 +117,5 @@ i18n_field_name_repeat=字段名不能重復
i18n_calc_field_error=字段表達式語法錯誤
i18n_cp_exist=已有同類型的列權限存在
connection_failed=連接失敗
theme_name_repeat=名稱已存在
theme_name_empty=名稱不能為空