wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

✨字典组件(DictTag)显示翻译

Browse Source
This commit is contained in:
不做码农 2023-09-13 18:40:34 +08:00
parent 54e5b46dbf
commit 0e08a7d102
4 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ZR.Admin.WebApi/wwwroot/data.xlsx
View File

Binary file not shown.

4
ZR.ServiceCore/Model/SysDictData.cs
View File

@ -53,5 +53,9 @@ namespace ZR.Model.System
/// </summary> /// </summary>
[SugarColumn(Length = 1)] [SugarColumn(Length = 1)]
public string Status { get; set; } public string Status { get; set; }
/// <summary>
/// 多语言翻译key值
/// </summary>
public string LangKey { get; set; } = string.Empty;
} }
} }

39
ZR.ServiceCore/Services/SeedDataService.cs
View File

@ -1,8 +1,5 @@
using Infrastructure.Extensions; using MiniExcelLibs;
using MiniExcelLibs;
using SqlSugar.IOC; using SqlSugar.IOC;
using System.Collections.Generic;
using System.Linq;
using ZR.Common; using ZR.Common;
using ZR.Model.System; using ZR.Model.System;
@ -37,7 +34,7 @@ namespace ZR.Service.System
//db.Ado.ExecuteCommand("SET IDENTITY_INSERT sys_user OFF"); //db.Ado.ExecuteCommand("SET IDENTITY_INSERT sys_user OFF");
db.Ado.CommitTran(); db.Ado.CommitTran();
string msg = $"[用户数据] 插入{x.InsertList.Count} 错误数据{x.ErrorList.Count} 总共{x.TotalList.Count}"; string msg = $"[用户数据] 插入{x.InsertList.Count} 错误{x.ErrorList.Count} 总共{x.TotalList.Count}";
return (msg, x.ErrorList, x.IgnoreList); return (msg, x.ErrorList, x.IgnoreList);
} }
@ -55,7 +52,7 @@ namespace ZR.Service.System
.ToStorage(); .ToStorage();
var result = x.AsInsertable.OffIdentity().ExecuteCommand();//插入可插入部分; var result = x.AsInsertable.OffIdentity().ExecuteCommand();//插入可插入部分;
string msg = $"[菜单数据] 插入{x.InsertList.Count} 错误数据{x.ErrorList.Count} 总共{x.TotalList.Count}"; string msg = $"[菜单数据] 插入{x.InsertList.Count} 错误{x.ErrorList.Count} 总共{x.TotalList.Count}";
return (msg, x.ErrorList, x.IgnoreList); return (msg, x.ErrorList, x.IgnoreList);
} }
/// <summary> /// <summary>
@ -72,7 +69,7 @@ namespace ZR.Service.System
.ToStorage(); .ToStorage();
var result = x.AsInsertable.ExecuteCommand();//插入可插入部分; var result = x.AsInsertable.ExecuteCommand();//插入可插入部分;
string msg = $"[角色菜单] 插入{x.InsertList.Count} 错误数据{x.ErrorList.Count} 总共{x.TotalList.Count}"; string msg = $"[角色菜单] 插入{x.InsertList.Count} 错误{x.ErrorList.Count} 总共{x.TotalList.Count}";
return (msg, x.ErrorList, x.IgnoreList); return (msg, x.ErrorList, x.IgnoreList);
} }
/// <summary> /// <summary>
@ -89,7 +86,7 @@ namespace ZR.Service.System
.ToStorage(); .ToStorage();
var result = x.AsInsertable.OffIdentity().ExecuteCommand(); var result = x.AsInsertable.OffIdentity().ExecuteCommand();
string msg = $"[部门数据] 插入{x.InsertList.Count} 错误数据{x.ErrorList.Count} 总共{x.TotalList.Count}"; string msg = $"[部门数据] 插入{x.InsertList.Count} 错误{x.ErrorList.Count} 总共{x.TotalList.Count}";
return (msg, x.ErrorList, x.IgnoreList); return (msg, x.ErrorList, x.IgnoreList);
} }
@ -102,7 +99,7 @@ namespace ZR.Service.System
.ToStorage(); .ToStorage();
var result = x.AsInsertable.ExecuteCommand(); var result = x.AsInsertable.ExecuteCommand();
string msg = $"[岗位数据] 插入{x.InsertList.Count} 错误数据{x.ErrorList.Count} 总共{x.TotalList.Count}"; string msg = $"[岗位数据] 插入{x.InsertList.Count} 错误{x.ErrorList.Count} 总共{x.TotalList.Count}";
return (msg, x.ErrorList, x.IgnoreList); return (msg, x.ErrorList, x.IgnoreList);
} }
@ -115,7 +112,7 @@ namespace ZR.Service.System
.ToStorage(); .ToStorage();
var result = x.AsInsertable.OffIdentity().ExecuteCommand(); var result = x.AsInsertable.OffIdentity().ExecuteCommand();
string msg = $"[角色数据] 插入{x.InsertList.Count} 错误数据{x.ErrorList.Count} 总共{x.TotalList.Count}"; string msg = $"[角色数据] 插入{x.InsertList.Count} 错误{x.ErrorList.Count} 总共{x.TotalList.Count}";
return (msg, x.ErrorList, x.IgnoreList); return (msg, x.ErrorList, x.IgnoreList);
} }
@ -128,7 +125,7 @@ namespace ZR.Service.System
.ToStorage(); .ToStorage();
var result = x.AsInsertable.ExecuteCommand(); var result = x.AsInsertable.ExecuteCommand();
string msg = $"[用户角色] 插入{x.InsertList.Count} 错误数据{x.ErrorList.Count} 总共{x.TotalList.Count}"; string msg = $"[用户角色] 插入{x.InsertList.Count} 错误{x.ErrorList.Count} 总共{x.TotalList.Count}";
return (msg, x.ErrorList, x.IgnoreList); return (msg, x.ErrorList, x.IgnoreList);
} }
@ -146,7 +143,7 @@ namespace ZR.Service.System
.ToStorage(); .ToStorage();
var result = x.AsInsertable.ExecuteCommand(); var result = x.AsInsertable.ExecuteCommand();
string msg = $"[系统配置] 插入{x.InsertList.Count} 错误数据{x.ErrorList.Count} 总共{x.TotalList.Count}"; string msg = $"[系统配置] 插入{x.InsertList.Count} 错误{x.ErrorList.Count} 总共{x.TotalList.Count}";
return (msg, x.ErrorList, x.IgnoreList); return (msg, x.ErrorList, x.IgnoreList);
} }
@ -164,7 +161,7 @@ namespace ZR.Service.System
.ToStorage(); .ToStorage();
var result = x.AsInsertable.ExecuteCommand(); var result = x.AsInsertable.ExecuteCommand();
string msg = $"[字典管理] 插入{x.InsertList.Count} 错误数据{x.ErrorList.Count} 总共{x.TotalList.Count}"; string msg = $"[字典管理] 插入{x.InsertList.Count} 错误{x.ErrorList.Count} 总共{x.TotalList.Count}";
return (msg, x.ErrorList, x.IgnoreList); return (msg, x.ErrorList, x.IgnoreList);
} }
@ -177,12 +174,14 @@ namespace ZR.Service.System
{ {
var db = DbScoped.SugarScope; var db = DbScoped.SugarScope;
var x = db.Storageable(data) var x = db.Storageable(data)
.SplitInsert(it => it.NotAny()) //.SplitInsert(it => it.NotAny())
.WhereColumns(it => new { it.DictType, it.DictValue }) //.SplitUpdate(it => !it.Any())
//.WhereColumns(it => new { it.DictType })
.ToStorage(); .ToStorage();
var result = x.AsInsertable.ExecuteCommand(); x.AsInsertable.ExecuteCommand();
x.AsUpdateable.ExecuteCommand();
string msg = $"[字典数据] 插入{x.InsertList.Count} 错误数据{x.ErrorList.Count} 总共{x.TotalList.Count}"; string msg = $"[字典数据] 插入{x.InsertList.Count} 更新{x.UpdateList.Count} 错误{x.ErrorList.Count} 总共{x.TotalList.Count}";
return (msg, x.ErrorList, x.IgnoreList); return (msg, x.ErrorList, x.IgnoreList);
} }
@ -200,7 +199,7 @@ namespace ZR.Service.System
.ToStorage(); .ToStorage();
var result = x.AsInsertable.OffIdentity().ExecuteCommand(); var result = x.AsInsertable.OffIdentity().ExecuteCommand();
string msg = $"[字典数据] 插入{x.InsertList.Count} 错误数据{x.ErrorList.Count} 总共{x.TotalList.Count}"; string msg = $"[字典数据] 插入{x.InsertList.Count} 错误{x.ErrorList.Count} 总共{x.TotalList.Count}";
return (msg, x.ErrorList, x.IgnoreList); return (msg, x.ErrorList, x.IgnoreList);
} }
@ -218,7 +217,7 @@ namespace ZR.Service.System
.ToStorage(); .ToStorage();
var result = x.AsInsertable.ExecuteCommand(); var result = x.AsInsertable.ExecuteCommand();
string msg = $"[任务数据] 插入{x.InsertList.Count} 错误数据{x.ErrorList.Count} 总共{x.TotalList.Count}"; string msg = $"[任务数据] 插入{x.InsertList.Count} 错误{x.ErrorList.Count} 总共{x.TotalList.Count}";
return (msg, x.ErrorList, x.IgnoreList); return (msg, x.ErrorList, x.IgnoreList);
} }
@ -242,6 +241,8 @@ namespace ZR.Service.System
db.DbMaintenance.TruncateTable<SysUser>(); db.DbMaintenance.TruncateTable<SysUser>();
db.DbMaintenance.TruncateTable<SysDept>(); db.DbMaintenance.TruncateTable<SysDept>();
db.DbMaintenance.TruncateTable<SysPost>(); db.DbMaintenance.TruncateTable<SysPost>();
db.DbMaintenance.TruncateTable<SysDictType>();
db.DbMaintenance.TruncateTable<SysDictData>();
} }
var sysUser = MiniExcel.Query<SysUser>(path, sheetName: "user").ToList(); var sysUser = MiniExcel.Query<SysUser>(path, sheetName: "user").ToList();

3
ZR.ServiceCore/Services/SysDictDataService.cs
View File

@ -103,7 +103,8 @@ namespace ZR.Service.System
DictValue = dict.DictValue, DictValue = dict.DictValue,
Status = dict.Status, Status = dict.Status,
CssClass = dict.CssClass, CssClass = dict.CssClass,
ListClass = dict.ListClass ListClass = dict.ListClass,
LangKey = dict.LangKey
}); });
CacheHelper.Remove($"SelectDictDataByCode_{dict.DictCode}"); CacheHelper.Remove($"SelectDictDataByCode_{dict.DictCode}");