From 8e93df9abcd4a845384f04528f9374a94304543c Mon Sep 17 00:00:00 2001
From: robothink <9901810@qq.com>
Date: Fri, 21 Jul 2023 21:18:31 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5DataField=E7=9A=84=E5=B1=9E=E6=80=A7=E3=80=90?=
=?UTF-8?q?=E6=98=AF=E5=90=A6=E5=8F=AF=E8=A7=81=E3=80=91=E3=80=81=E3=80=90?=
=?UTF-8?q?=E6=98=AF=E5=90=A6=E5=BF=85=E5=A1=AB=E3=80=91=E3=80=81=E3=80=90?=
=?UTF-8?q?=E6=9D=83=E9=99=90=E7=9B=B8=E5=85=B3=E3=80=91=E7=AD=89=E6=89=A9?=
=?UTF-8?q?=E5=B1=95=E5=AD=97=E6=AE=B5=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
NewLife.CubeNC/ViewModels/DataField.cs | 30 ++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/NewLife.CubeNC/ViewModels/DataField.cs b/NewLife.CubeNC/ViewModels/DataField.cs
index d4125bac..2e116f7f 100644
--- a/NewLife.CubeNC/ViewModels/DataField.cs
+++ b/NewLife.CubeNC/ViewModels/DataField.cs
@@ -65,6 +65,36 @@ public class DataField
/// 只读
public Boolean Readonly { get; set; }
+ ///
+ /// 是否可见
+ ///
+ public Boolean Visible { get; set; }
+
+ ///
+ /// 是否必填
+ ///
+ public bool Required { get; set; }
+
+ ///
+ /// 权限相关。用户自由发挥
+ ///
+ public string Authority { get; set; }
+
+ ///
+ /// 扩展字段。用户自由发挥
+ ///
+ public string Extended1 { get; set; }
+
+ ///
+ /// 扩展字段。用户自由发挥
+ ///
+ public string Extended2 { get; set; }
+
+ ///
+ /// 扩展字段。用户自由发挥
+ ///
+ public string Extended3 { get; set; }
+
/// 原始字段
[XmlIgnore, IgnoreDataMember, JsonIgnore]
public FieldItem Field { get; set; }
From 863065de99b0dca6dbb11461252f324e803e0874 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=99=BA=E8=83=BD=E5=A4=A7=E7=9F=B3=E5=A4=B4?=
Date: Fri, 4 Aug 2023 00:14:42 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=9F=BA=E7=A1=80?=
=?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
CubeDemo/CubeDemo.csproj | 4 ++--
CubeDemoNC/CubeDemoNC.csproj | 4 ++--
CubeSSO/CubeSSO.csproj | 4 ++--
NewLife.Cube.Blazor/NewLife.Cube.Blazor.csproj | 2 +-
.../Admin/Views/Role_LayuiAdmin/_Form_SetPermission.cshtml | 4 ++--
.../Admin/Views/Role_Metronic8/_Form_SetPermission.cshtml | 4 ++--
NewLife.Cube/NewLife.Cube.csproj | 6 +++---
NewLife.CubeNC/Areas/Admin/Views/Role/SetPermission.cshtml | 4 ++--
NewLife.CubeNC/NewLife.CubeNC.csproj | 6 +++---
Test/Test.csproj | 2 +-
10 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/CubeDemo/CubeDemo.csproj b/CubeDemo/CubeDemo.csproj
index 3195d3f9..7839fa56 100644
--- a/CubeDemo/CubeDemo.csproj
+++ b/CubeDemo/CubeDemo.csproj
@@ -23,8 +23,8 @@
-
-
+
+
diff --git a/CubeDemoNC/CubeDemoNC.csproj b/CubeDemoNC/CubeDemoNC.csproj
index 6b996027..66afe9a0 100644
--- a/CubeDemoNC/CubeDemoNC.csproj
+++ b/CubeDemoNC/CubeDemoNC.csproj
@@ -41,8 +41,8 @@
-
-
+
+
diff --git a/CubeSSO/CubeSSO.csproj b/CubeSSO/CubeSSO.csproj
index 9edc4145..13a2e1f5 100644
--- a/CubeSSO/CubeSSO.csproj
+++ b/CubeSSO/CubeSSO.csproj
@@ -23,8 +23,8 @@
-
-
+
+
diff --git a/NewLife.Cube.Blazor/NewLife.Cube.Blazor.csproj b/NewLife.Cube.Blazor/NewLife.Cube.Blazor.csproj
index 3d2fe565..02bbd9b2 100644
--- a/NewLife.Cube.Blazor/NewLife.Cube.Blazor.csproj
+++ b/NewLife.Cube.Blazor/NewLife.Cube.Blazor.csproj
@@ -49,7 +49,7 @@
-
+
diff --git a/NewLife.Cube.LayuiAdmin/Areas/Admin/Views/Role_LayuiAdmin/_Form_SetPermission.cshtml b/NewLife.Cube.LayuiAdmin/Areas/Admin/Views/Role_LayuiAdmin/_Form_SetPermission.cshtml
index 2af328ef..65d37bad 100644
--- a/NewLife.Cube.LayuiAdmin/Areas/Admin/Views/Role_LayuiAdmin/_Form_SetPermission.cshtml
+++ b/NewLife.Cube.LayuiAdmin/Areas/Admin/Views/Role_LayuiAdmin/_Form_SetPermission.cshtml
@@ -330,7 +330,7 @@ layui.use(['form'], function() {
foreach (var item in entity.Permissions.OrderBy(e => e.Key))
{
var id = "pf" + entity.ID + "_" + ((Int32)item.Key);
- @Html.CheckBox(id, role.Has(entity.ID, (PermissionFlags)item.Key), new { @parentkey = "auth_child" + entity.ID, @proparentkey = "pro_" + item.Key + "_" + entity.ParentID, @prokey = "pro_" + (Int32)PermissionFlags.All + "_" + entity.ParentID,title=item.Value,lay_filter="pro_child"})
+ @Html.CheckBox(id, role.Has(entity.ID, (PermissionFlags)item.Key), new { @parentkey = "auth_child" + entity.ID, @proparentkey = "pro_" + item.Key + "_" + entity.ParentID, @prokey = "pro_" + (UInt32)PermissionFlags.All + "_" + entity.ParentID,title=item.Value,lay_filter="pro_child"})
@*@Html.Label(id, item.Value)*@
@*var chec = role.Has(entity.ID, (PermissionFlags)item.Key)?"checked":"";*@