gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'main' (#107) from 616036448/Admin.NET.Pro:main into main

Browse Source 
Reviewed-on: http://101.43.53.74:3000/Admin.NET/Admin.NET.Pro/pulls/107
This commit is contained in:
zuohuaijun 2024-08-28 20:57:28 +08:00
commit 0c605777ae
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Admin.NET/Admin.NET.Web.Entry/wwwroot/template/service_InputDto.cs.vm
View File

@ -178,14 +178,14 @@ if (@column.WhetherAddUpdate == "Y"){
@:public class Exists@(RemoteField)Input @:public class Exists@(RemoteField)Input
@:{ @:{
@:/// <summary> @:/// <summary>
@:/// 字段名称 @:/// 字段值
@:/// </summary> @:/// </summary>
@:public string FieldName { get; set; } @:public string FieldValue { get; set; }
@: @:
@:/// <summary> @:/// <summary>
@:/// 旧字段名 @:/// 旧字段值
@:/// </summary> @:/// </summary>
@:public string OldFieldName { get; set; } @:public string OldFieldValue { get; set; }
@:} @:}
} }
@{ @{

10
Admin.NET/Admin.NET.Web.Entry/wwwroot/template/service_Service.cs.vm
View File

@ -175,7 +175,7 @@ if (@column.ColumnKey == "True"){
var entity = input.Adapt<@(@Model.ClassName)>(); var entity = input.Adapt<@(@Model.ClassName)>();
@if(Model.RemoteVerify){ @if(Model.RemoteVerify){
@://验证重复值 @://验证重复值
@:if (await _advertsRep.IsAnyAsync(t => t.@(RemoteField) == entity.@(RemoteField) && t.@(@PKName) != entity.@(@PKName))) @:if (await _@(@Model.LowerClassName)Rep.IsAnyAsync(t => t.@(RemoteField) == entity.@(RemoteField) && t.@(@PKName) != entity.@(@PKName)))
@:{ @:{
@://已存在 @://已存在
@:throw Oops.Oh(ErrorCodeEnum.D1006); @:throw Oops.Oh(ErrorCodeEnum.D1006);
@ -272,20 +272,20 @@ if(@column.EffectType == "ApiTreeSelect" && !definedObjects.ContainsKey("@(@colu
@:[DisplayName("检查@(RemoteField)字段是否可用")] @:[DisplayName("检查@(RemoteField)字段是否可用")]
@:public async Task<bool> Exists@(RemoteField)Async(Exists@(RemoteField)Input param) @:public async Task<bool> Exists@(RemoteField)Async(Exists@(RemoteField)Input param)
@:{ @:{
@:if (string.IsNullOrWhiteSpace(param.FieldName)) @:if (string.IsNullOrWhiteSpace(param.FieldValue))
@:{ @:{
@:return false; @:return false;
@:} @:}
@:if (!string.IsNullOrWhiteSpace(param.OldFieldName)) @:if (!string.IsNullOrWhiteSpace(param.OldFieldValue))
@:{ @:{
@:if (param.FieldName.Trim() == param.OldFieldName.Trim()) @:if (param.FieldValue.Trim() == param.OldFieldValue.Trim())
@:{ @:{
@://编辑状态下触发的 @://编辑状态下触发的
@:return true; @:return true;
@:} @:}
@:} @:}
@:return !(await _@(@Model.LowerClassName)Rep.IsAnyAsync(t => t.@(RemoteField).Equals(param.FieldName.Trim()))); @:return !(await _@(@Model.LowerClassName)Rep.IsAnyAsync(t => t.@(RemoteField).Equals(param.FieldValue.Trim())));
@:} @:}
} }

4
Admin.NET/Admin.NET.Web.Entry/wwwroot/template/web_views_editDialog.vue.vm
View File

@ -264,8 +264,8 @@ const rules = ref<FormRules>({
@:callback(new Error("请输入@(@column.ColumnComment)")); @:callback(new Error("请输入@(@column.ColumnComment)"));
@:} @:}
@:let param = { @:let param = {
@:fieldName: value, @:fieldValue: value,
@:oldFieldName: state.ruleForm.old@(RemoteField) @:oldFieldValue: state.ruleForm.old@(RemoteField)
@:}; @:};
@:exists@(RemoteField)(param).then((res) => { @:exists@(RemoteField)(param).then((res) => {
@:if (res.data.result) { @:if (res.data.result) {