Просмотр исходного кода

!1555 功能优化
Merge pull request !1555 from 喵你个汪/next

zuohuaijun 1 год назад
Родитель
Сommit
053c819338

+ 7 - 0
Admin.NET/Admin.NET.Core/Service/Config/Dto/InfoInput.cs

@@ -24,36 +24,43 @@ public class InfoSaveInput
     /// <summary>
     /// 系统主标题
     /// </summary>
+    [Required(ErrorMessage = "系统主标题不能为空")]
     public string SysTitle { get; set; }
 
     /// <summary>
     /// 系统副标题
     /// </summary>
+    [Required(ErrorMessage = "系统副标题不能为空")]
     public string SysViceTitle { get; set; }
 
     /// <summary>
     /// 系统描述
     /// </summary>
+    [Required(ErrorMessage = "系统描述不能为空")]
     public string SysViceDesc { get; set; }
 
     /// <summary>
     /// 水印内容
     /// </summary>
+    [Required(ErrorMessage = "水印内容不能为空")]
     public string SysWatermark { get; set; }
 
     /// <summary>
     /// 版权说明
     /// </summary>
+    [Required(ErrorMessage = "版权说明不能为空")]
     public string SysCopyright { get; set; }
 
     /// <summary>
     /// ICP备案号
     /// </summary>
+    [Required(ErrorMessage = "ICP备案号不能为空")]
     public string SysIcp { get; set; }
 
     /// <summary>
     /// ICP地址
     /// </summary>
+    [Required(ErrorMessage = "ICP地址不能为空")]
     public string SysIcpUrl { get; set; }
 
     /// <summary>

+ 1 - 1
Web/src/stores/userInfo.ts

@@ -126,7 +126,7 @@ export const useUserInfo = defineStore('userInfo', {
 
 // 处理字典国际化, 默认显示字典中的value值
 const setDictLangMessage = (dict: any) => {
-	dict.langMessage = `message.system.dictType.${dict.typeCode}.${dict.code}`;
+	dict.langMessage = `message.dictType.${dict.typeCode}_${dict.code}`;
 	const value = t(dict.langMessage);
 	dict.value = value !== dict.langMessage ? value : dict.value;
 }