Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

权限转换由Int32改为UInt32 #82

Merged
merged 4 commits into from
Sep 13, 2023
Merged

权限转换由Int32改为UInt32 #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
de45b9c
权限转换由Int32改为UInt32
Aug 21, 2023
7a07c1b
解决跨区域映射字段时，链接也是不对的问题。
Aug 30, 2023
7cf8718
合并
nnhy Sep 13, 2023
897bca7
Merge branch 'master' into dev
nnhy Sep 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion NewLife.CubeNC/Areas/Admin/Views/Role/SetPermission.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
else
{

@Html.CheckBox("pc_readonly_" + entity.ID, false, new { @class = "pro_detail", @prochildkey = "pro_" + (Int32)PermissionFlags.Detail + "_" + entity.ID })
@Html.CheckBox("pc_readonly_" + entity.ID, false, new { @class = "pro_detail", @prochildkey = "pro_" + (UInt32)PermissionFlags.Detail + "_" + entity.ID })
@Html.Label("pc_readonly_" + entity.ID, "只读")
<text>&nbsp;</text>
@Html.CheckBox("pc_all_" + entity.ID, false, new { @class = "pro_all", @prochildkey = "pro_" + (UInt32)PermissionFlags.All + "_" + entity.ID })
Expand Down
27 changes: 24 additions & 3 deletions NewLife.CubeNC/Views/Shared/_List_Data_Item.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,15 +169,26 @@
}
else
{
var val = value;
var val = value;
if (!item.MapField.IsNullOrEmpty() && val + "" != "")
{
if (item.MapProvider != null)
{
var name = item.MapProvider.EntityType.Name;
var key = item.MapProvider.Key;
val = entity[item.MapField];
<td class="text-center"><a href="@name?@key=@val" tager=@(listField.Target) title="@[email protected]">@value</a></td>
//从菜单查找相关
var menu = Menu.FindForName(@name);
if (menu!=null)
{
//获取控制器名称,拼接全路径
var fullPath = $"{this.Context.Request.Scheme}://{this.Context.Request.Host}/{menu.ParentNodeName}/{@name}?{@key}={@val}";
<td class="text-center"><a href="@fullPath">@value</a></td>
}
else
{
<td class="text-center"><a href="@name?@key=@val">@value</a></td>
}
}
else
{
Expand All @@ -195,7 +206,17 @@
}
else
{
<td>@value</td>
if (!item.ItemType.IsNullOrEmpty() && item.ItemType.EqualIgnoreCase("file-WebUploader"))
{

<td class="text-center">@Html.Partial("_View_ImgView",value)</td>

Check warning on line 212 in NewLife.CubeNC/Views/Shared/_List_Data_Item.cshtml

View workflow job for this annotation

GitHub Actions / build-publish 

Use of IHtmlHelper.Partial may result in application deadlocks. Consider using <partial> Tag Helper or IHtmlHelper.PartialAsync.

Check warning on line 212 in NewLife.CubeNC/Views/Shared/_List_Data_Item.cshtml

View workflow job for this annotation

GitHub Actions / build-publish 

Use of IHtmlHelper.Partial may result in application deadlocks. Consider using <partial> Tag Helper or IHtmlHelper.PartialAsync.

Check warning on line 212 in NewLife.CubeNC/Views/Shared/_List_Data_Item.cshtml

View workflow job for this annotation

GitHub Actions / test 

Use of IHtmlHelper.Partial may result in application deadlocks. Consider using <partial> Tag Helper or IHtmlHelper.PartialAsync.

Check warning on line 212 in NewLife.CubeNC/Views/Shared/_List_Data_Item.cshtml

View workflow job for this annotation

GitHub Actions / test 

Use of IHtmlHelper.Partial may result in application deadlocks. Consider using <partial> Tag Helper or IHtmlHelper.PartialAsync.

Check warning on line 212 in NewLife.CubeNC/Views/Shared/_List_Data_Item.cshtml

View workflow job for this annotation

GitHub Actions / test 

Use of IHtmlHelper.Partial may result in application deadlocks. Consider using <partial> Tag Helper or IHtmlHelper.PartialAsync.

Check warning on line 212 in NewLife.CubeNC/Views/Shared/_List_Data_Item.cshtml

View workflow job for this annotation

GitHub Actions / test 

Use of IHtmlHelper.Partial may result in application deadlocks. Consider using <partial> Tag Helper or IHtmlHelper.PartialAsync.

Check warning on line 212 in NewLife.CubeNC/Views/Shared/_List_Data_Item.cshtml

View workflow job for this annotation

GitHub Actions / test 

Use of IHtmlHelper.Partial may result in application deadlocks. Consider using <partial> Tag Helper or IHtmlHelper.PartialAsync.

Check warning on line 212 in NewLife.CubeNC/Views/Shared/_List_Data_Item.cshtml

View workflow job for this annotation

GitHub Actions / test 

Use of IHtmlHelper.Partial may result in application deadlocks. Consider using <partial> Tag Helper or IHtmlHelper.PartialAsync.

Check warning on line 212 in NewLife.CubeNC/Views/Shared/_List_Data_Item.cshtml

View workflow job for this annotation

GitHub Actions / test 

Use of IHtmlHelper.Partial may result in application deadlocks. Consider using <partial> Tag Helper or IHtmlHelper.PartialAsync.

Check warning on line 212 in NewLife.CubeNC/Views/Shared/_List_Data_Item.cshtml

View workflow job for this annotation

GitHub Actions / test 

Use of IHtmlHelper.Partial may result in application deadlocks. Consider using <partial> Tag Helper or IHtmlHelper.PartialAsync.

Check warning on line 212 in NewLife.CubeNC/Views/Shared/_List_Data_Item.cshtml

View workflow job for this annotation

GitHub Actions / build-publish 

Use of IHtmlHelper.Partial may result in application deadlocks. Consider using <partial> Tag Helper or IHtmlHelper.PartialAsync.

Check warning on line 212 in NewLife.CubeNC/Views/Shared/_List_Data_Item.cshtml

View workflow job for this annotation

GitHub Actions / build-publish 

Use of IHtmlHelper.Partial may result in application deadlocks. Consider using <partial> Tag Helper or IHtmlHelper.PartialAsync.

Check warning on line 212 in NewLife.CubeNC/Views/Shared/_List_Data_Item.cshtml

View workflow job for this annotation

GitHub Actions / test 

Use of IHtmlHelper.Partial may result in application deadlocks. Consider using <partial> Tag Helper or IHtmlHelper.PartialAsync.

Check warning on line 212 in NewLife.CubeNC/Views/Shared/_List_Data_Item.cshtml

View workflow job for this annotation

GitHub Actions / test 

Use of IHtmlHelper.Partial may result in application deadlocks. Consider using <partial> Tag Helper or IHtmlHelper.PartialAsync.

Check warning on line 212 in NewLife.CubeNC/Views/Shared/_List_Data_Item.cshtml

View workflow job for this annotation

GitHub Actions / test 

Use of IHtmlHelper.Partial may result in application deadlocks. Consider using <partial> Tag Helper or IHtmlHelper.PartialAsync.

Check warning on line 212 in NewLife.CubeNC/Views/Shared/_List_Data_Item.cshtml

View workflow job for this annotation

GitHub Actions / test 

Use of IHtmlHelper.Partial may result in application deadlocks. Consider using <partial> Tag Helper or IHtmlHelper.PartialAsync.

}
else
{
<td>@value</td>
}

}
}
break;
Expand Down
Loading