commits列表 30 项
提交内容 7/7
Enum的0全部支持全部/无的写法!
framework/Directory.Build.props
diff --git a/framework/Directory.Build.props b/framework/Directory.Build.props
index 28457ae..d682c9d 100644
--- a/framework/Directory.Build.props
+++ b/framework/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
-    <Version>26.9.20</Version>
-    <FileVersion>26.9.20</FileVersion>
-    <AssemblyVersion>26.9.20</AssemblyVersion>
+    <Version>26.9.21</Version>
+    <FileVersion>26.9.21</FileVersion>
+    <AssemblyVersion>26.9.21</AssemblyVersion>
   </PropertyGroup>
 </Project>
\ No newline at end of file
framework/PasteApeart.Application/PasteApeart.Application.xml
diff --git a/framework/PasteApeart.Application/PasteApeart.Application.xml b/framework/PasteApeart.Application/PasteApeart.Application.xml
index 011c71c..04003cb 100644
--- a/framework/PasteApeart.Application/PasteApeart.Application.xml
+++ b/framework/PasteApeart.Application/PasteApeart.Application.xml
@@ -744,11 +744,11 @@
         </member>
         <member name="M:PasteApeart.Application.PasteDefaultAppService.DefaultFilterDataAsync(System.Type,System.Object,System.String)">
             <summary>
-            数据校验,判断权限等 需要在基Class定义AuthDataFilterAsync(Type,Entity)
+            权限判断 就是这个
             </summary>
             <param name="entityType"></param>
-            <param name="obj"></param>
-            <param name="action"></param>
+            <param name="obj">可能为null比如add的时候</param>
+            <param name="action">add/update/remove/state/page/detail</param>
             <returns></returns>
         </member>
         <member name="M:PasteApeart.Application.PasteDefaultAppService.DefaultAfterUpdateStateAsync(System.String,PasteApeart.Application.Contracts.InputQueryUpdateState)">
framework/PasteApeart.Application/PasteDefaultAppService.cs
diff --git a/framework/PasteApeart.Application/PasteDefaultAppService.cs b/framework/PasteApeart.Application/PasteDefaultAppService.cs
index 5dde2d8..aefe0f7 100644
--- a/framework/PasteApeart.Application/PasteDefaultAppService.cs
+++ b/framework/PasteApeart.Application/PasteDefaultAppService.cs
@@ -816,19 +816,15 @@ namespace PasteApeart.Application
         //public Func<(string actionName, Type entityType, object entityObject), Task> FuncFilterData { get; set; } = null;
 
         /// <summary>
-        /// 数据校验,判断权限等 需要在基Class定义AuthDataFilterAsync(Type,Entity)
+        /// 权限判断 就是这个
         /// </summary>
         /// <param name="entityType"></param>
-        /// <param name="obj"></param>
-        /// <param name="action"></param>
+        /// <param name="obj">可能为null比如add的时候</param>
+        /// <param name="action">add/update/remove/state/page/detail</param>
         /// <returns></returns>
         public virtual async Task DefaultFilterDataAsync(Type entityType, object obj, string action)
         {
-            //if (FuncFilterData != null)
-            //{
-            //    await FuncFilterData((action, entityType, obj));
-            //    return;
-            //}
+
         }
 
         ///// <summary>
framework/PasteApeart.Helper/BuilderHelper.cs
diff --git a/framework/PasteApeart.Helper/BuilderHelper.cs b/framework/PasteApeart.Helper/BuilderHelper.cs
index 90f9863..97b5745 100644
--- a/framework/PasteApeart.Helper/BuilderHelper.cs
+++ b/framework/PasteApeart.Helper/BuilderHelper.cs
@@ -343,7 +343,7 @@ namespace PasteApeart.Helper
                 var attributes = _property.GetCustomAttributes<Attribute>();
                 var _attributes = HandlerAttribute2(attributes, _cpro);
 
-                if (_attributes?.Any()==true)
+                if (_attributes?.Any() == true)
                 {
                     _cpro.Attributes = _attributes;
                 }
@@ -426,7 +426,7 @@ namespace PasteApeart.Helper
                                 }
                                 if (_reads != null)
                                 {
-                                    HandlerEnumDatas(_cpro, _reads);
+                                    HandlerEnumDatas(_cpro, _reads, _classType.Name.StartsWith("InputQuery") ? "search" : "form");
 
                                 }
                             }
@@ -568,7 +568,8 @@ namespace PasteApeart.Helper
         /// </summary>
         /// <param name="_cpro"></param>
         /// <param name="_reads"></param>
-        private static void HandlerEnumDatas(VoloModelProperty _cpro, List<VoloEnumProperty> _reads)
+        /// <param name="action"></param>
+        private static void HandlerEnumDatas(VoloModelProperty _cpro, List<VoloEnumProperty> _reads, string action = "search")
         {
             if (_cpro.Attributes == null)
             {
@@ -642,6 +643,38 @@ namespace PasteApeart.Helper
                         }
                     }
                 }
+
+                //(search)全部/(其他)无
+                foreach (var item in _reads)
+                {
+                    if (item.value != null)
+                    {
+                        if (item.value is int iv)
+                        {
+                            if (iv == 0)
+                            {
+                                if (action == "search")
+                                {
+                                    if (!string.IsNullOrEmpty(item.name))
+                                    {
+                                        item.name = item.name.Split("/")[0];
+                                    }
+                                }
+                                else
+                                {
+                                    if (!string.IsNullOrEmpty(item.name))
+                                    {
+                                        if (item.name.Contains("/"))
+                                        {
+                                            item.name = item.name.Split("/")[1];
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+
                 find.Args1 = System.Text.Json.JsonSerializer.Serialize(_reads);
             }
         }
@@ -1017,7 +1050,7 @@ namespace PasteApeart.Helper
                             }
                             if (_reads != null)
                             {
-                                HandlerEnumDatas(proInfo, _reads);
+                                HandlerEnumDatas(proInfo, _reads, _classType.Name.StartsWith("InputQuery") ? "search" : "form");
                             }
                             if (_is_enum_type)
                             {
@@ -1297,7 +1330,7 @@ namespace PasteApeart.Helper
                             }
                             if (_reads != null)
                             {
-                                HandlerEnumDatas(proInfo, _reads);
+                                HandlerEnumDatas(proInfo, _reads, action);
                             }
                             if (_is_enum_type)
                             {
framework/PasteApeart.Helper/readme.md
diff --git a/framework/PasteApeart.Helper/readme.md b/framework/PasteApeart.Helper/readme.md
index 0215a44..fbe76c8 100644
--- a/framework/PasteApeart.Helper/readme.md
+++ b/framework/PasteApeart.Helper/readme.md
@@ -1,6 +1,11 @@
 
 # 贴代码框架PasteApeart简介
 
+## 26.09.21
+	1.Enum的0全部字段,支持不同i形态,比如全部/无 那么在搜索区域显示的是全部,在表单或者表格则是无
+
+
+
 ## 26.09.03
 	1.添加特性排序Order,从小到大
 
manage/page/pasteform/detail.css
diff --git a/manage/page/pasteform/detail.css b/manage/page/pasteform/detail.css
index bd0ff07..c090ea4 100644
--- a/manage/page/pasteform/detail.css
+++ b/manage/page/pasteform/detail.css
@@ -36,7 +36,7 @@
   width: 50%;
 }
 .newform .singlerow {
-  width: 100%;
+  width: 100% !important;
 }
 .newform .itemrow {
   display: flex;
manage/page/pasteform/detail.less
diff --git a/manage/page/pasteform/detail.less b/manage/page/pasteform/detail.less
index 525389d..59defa9 100644
--- a/manage/page/pasteform/detail.less
+++ b/manage/page/pasteform/detail.less
@@ -44,7 +44,7 @@
     }
 
     .singlerow {
-        width: 100%;
+        width: 100% !important;
     }
 
     .itemrow {
​ ​