Merge branch 'master' of http://git.newlifex.com/NewLife/NewLife.XCode

Author: nnhy

XCode/Code/EntityBuilder.cs

@@ -403,7 +403,7 @@ protected virtual void AddNameSpace()
     protected virtual void AddExtendNameSpace()
     {
         var us = Option.Usings;
-        if(!Option.ExtendNameSpace.IsNullOrEmpty())
+        if (!Option.ExtendNameSpace.IsNullOrEmpty())
             Option.ExtendNameSpace.Trim().Split(',').ToList().ForEach(space => us.Add(space));
     }
 
@@ -1685,6 +1685,7 @@ protected virtual Boolean BuildExtendFind(IDataColumn[] columns, Int32 index)
 
         var builder = new SearchBuilder(Table) { Nullable = Option.Nullable };
         var ps = builder.GetParameters(columns);
+        var pdic = ps.ToDictionary(e => e.Name);
 
         // 如果方法名已存在，则不生成
         var key = $"{methodName}({ps.Join(",", e => e.TypeName.TrimEnd('?'))})";
@@ -1693,32 +1694,34 @@ protected virtual Boolean BuildExtendFind(IDataColumn[] columns, Int32 index)
 
         if (index > 0) WriteLine();
         WriteLine("/// <summary>根据{0}查找</summary>", columns.Select(e => e.DisplayName).Join("、"));
-        foreach (var dc in columns)
+        foreach (var pi in ps)
         {
-            WriteLine("/// <param name=\"{0}\">{1}</param>", dc.CamelName(), dc.DisplayName);
+            WriteLine("/// <param name=\"{0}\">{1}</param>", pi.ParameterName, pi.DisplayName);
         }
 
         var nullable = EntityOption.Nullable;
 
-        var args = ps.Join(", ", e => $"{e.TypeFullName} {e.Name}");
+        var args = ps.Join(", ", e => $"{e.TypeFullName} {e.ParameterName}");
         WriteLine("/// <returns>实体对象</returns>");
         WriteLine("public static {2} {0}({1})", methodName, args, ClassName + (nullable ? "?" : ""));
         WriteLine("{");
         {
             var header = false;
             foreach (var dc in columns)
             {
+                if (!pdic.TryGetValue(dc.Name, out var pi)) continue;
+
                 if (dc.DataType != null && dc.DataType.IsInt())
-                    WriteLine("if ({0} < 0) return null;", dc.CamelName());
+                    WriteLine("if ({0} < 0) return null;", pi.ParameterName);
                 else if (dc.DataType == typeof(String))
                 {
                     if (nullable && dc.Nullable)
-                        WriteLine("if ({0} == null) return null;", dc.CamelName());
+                        WriteLine("if ({0} == null) return null;", pi.ParameterName);
                     else
-                        WriteLine("if ({0}.IsNullOrEmpty()) return null;", dc.CamelName());
+                        WriteLine("if ({0}.IsNullOrEmpty()) return null;", pi.ParameterName);
                 }
                 else if (dc.DataType == typeof(DateTime) && IsDataTime(dc))
-                    WriteLine("if ({0}.Year < 1000) return null;", dc.CamelName());
+                    WriteLine("if ({0}.Year < 1000) return null;", pi.ParameterName);
 
                 header |= CanSearch(dc);
             }
@@ -1727,14 +1730,16 @@ protected virtual Boolean BuildExtendFind(IDataColumn[] columns, Int32 index)
             var wh = new StringBuilder();
             foreach (var dc in columns)
             {
+                if (!pdic.TryGetValue(dc.Name, out var pi)) continue;
+
                 if (exp.Length > 0) exp.Append(" & ");
-                exp.AppendFormat("_.{0} == {1}", dc.Name, dc.CamelName());
+                exp.AppendFormat("_.{0} == {1}", dc.Name, pi.ParameterName);
 
                 if (wh.Length > 0) wh.Append(" && ");
                 if (dc.DataType == typeof(String))
-                    wh.AppendFormat("e.{0}.EqualIgnoreCase({1})", dc.Name, dc.CamelName());
+                    wh.AppendFormat("e.{0}.EqualIgnoreCase({1})", dc.Name, pi.ParameterName);
                 else
-                    wh.AppendFormat("e.{0} == {1}", dc.Name, dc.CamelName());
+                    wh.AppendFormat("e.{0} == {1}", dc.Name, pi.ParameterName);
             }
 
             var singleCache = false;
@@ -1748,19 +1753,20 @@ protected virtual Boolean BuildExtendFind(IDataColumn[] columns, Int32 index)
                 if (columns.Length == 1)
                 {
                     var pk = columns[0];
+                    var pi = pdic[pk.Name];
                     if (pk.PrimaryKey)
                     {
                         WriteLine();
                         WriteLine("// 单对象缓存");
-                        WriteLine("return Meta.SingleCache[{0}];", pk.CamelName());
+                        WriteLine("return Meta.SingleCache[{0}];", pi.ParameterName);
 
                         singleCache = true;
                     }
                     else if (pk.Master)
                     {
                         WriteLine();
                         WriteLine("// 单对象缓存");
-                        WriteLine("return Meta.SingleCache.GetItemWithSlaveKey({0}) as {1};", pk.CamelName(), ClassName);
+                        WriteLine("return Meta.SingleCache.GetItemWithSlaveKey({0}) as {1};", pi.ParameterName, ClassName);
 
                         singleCache = true;
                     }
@@ -1789,6 +1795,7 @@ protected virtual Boolean BuildExtendFindAll(IDataColumn[] columns, Int32 index)
 
         var builder = new SearchBuilder(Table) { Nullable = Option.Nullable };
         var ps = builder.GetParameters(columns);
+        var pdic = ps.ToDictionary(e => e.Name);
 
         // 如果方法名已存在，则不生成
         var key = $"{methodName}({ps.Join(",", e => e.TypeName.TrimEnd('?'))})";
@@ -1797,30 +1804,32 @@ protected virtual Boolean BuildExtendFindAll(IDataColumn[] columns, Int32 index)
 
         if (index > 0) WriteLine();
         WriteLine("/// <summary>根据{0}查找</summary>", columns.Select(e => e.DisplayName).Join("、"));
-        foreach (var dc in columns)
+        foreach (var pi in ps)
         {
-            WriteLine("/// <param name=\"{0}\">{1}</param>", dc.CamelName(), dc.DisplayName);
+            WriteLine("/// <param name=\"{0}\">{1}</param>", pi.ParameterName, pi.DisplayName);
         }
 
-        var args = ps.Join(", ", e => $"{e.TypeFullName} {e.Name}");
+        var args = ps.Join(", ", e => $"{e.TypeFullName} {e.ParameterName}");
         WriteLine("/// <returns>实体列表</returns>");
         WriteLine("public static IList<{2}> {0}({1})", methodName, args, ClassName);
         WriteLine("{");
         {
             var header = false;
             foreach (var dc in columns)
             {
+                if (!pdic.TryGetValue(dc.Name, out var pi)) continue;
+
                 if (dc.DataType != null && dc.DataType.IsInt())
-                    WriteLine("if ({0} < 0) return [];", dc.CamelName(), ClassName);
+                    WriteLine("if ({0} < 0) return [];", pi.ParameterName, ClassName);
                 else if (dc.DataType == typeof(String))
                 {
                     if (Option.Nullable && dc.Nullable)
-                        WriteLine("if ({0} == null) return [];", dc.CamelName());
+                        WriteLine("if ({0} == null) return [];", pi.ParameterName);
                     else
-                        WriteLine("if ({0}.IsNullOrEmpty()) return [];", dc.CamelName(), ClassName);
+                        WriteLine("if ({0}.IsNullOrEmpty()) return [];", pi.ParameterName, ClassName);
                 }
                 else if (dc.DataType == typeof(DateTime) && IsDataTime(dc))
-                    WriteLine("if ({0}.Year < 1000) return [];", dc.CamelName());
+                    WriteLine("if ({0}.Year < 1000) return [];", pi.ParameterName);
 
                 header |= CanSearch(dc);
             }
@@ -1829,14 +1838,16 @@ protected virtual Boolean BuildExtendFindAll(IDataColumn[] columns, Int32 index)
             var wh = new StringBuilder();
             foreach (var dc in columns)
             {
+                if (!pdic.TryGetValue(dc.Name, out var pi)) continue;
+
                 if (exp.Length > 0) exp.Append(" & ");
-                exp.AppendFormat("_.{0} == {1}", dc.Name, dc.CamelName());
+                exp.AppendFormat("_.{0} == {1}", dc.Name, pi.ParameterName);
 
                 if (wh.Length > 0) wh.Append(" && ");
                 if (dc.DataType == typeof(String))
-                    wh.AppendFormat("e.{0}.EqualIgnoreCase({1})", dc.Name, dc.CamelName());
+                    wh.AppendFormat("e.{0}.EqualIgnoreCase({1})", dc.Name, pi.ParameterName);
                 else
-                    wh.AppendFormat("e.{0} == {1}", dc.Name, dc.CamelName());
+                    wh.AppendFormat("e.{0} == {1}", dc.Name, pi.ParameterName);
             }
 
             if (UsingCache)
@@ -1966,6 +1977,7 @@ protected virtual IList<IDataColumn> BuildAdvanceSearch(SearchBuilder builder)
         var returnName = ClassName;
 
         var ps = builder.GetParameters(cs, true);
+        var pdic = ps.ToDictionary(e => e.Name);
 
         // 如果方法名已存在，则不生成
         var key = $"Search({ps.Join(",", e => e.TypeName.TrimEnd('?'))})";
@@ -1974,9 +1986,10 @@ protected virtual IList<IDataColumn> BuildAdvanceSearch(SearchBuilder builder)
 
         // 注释部分
         WriteLine("/// <summary>高级查询</summary>");
-        foreach (var dc in cs)
+        foreach (var pi in ps)
         {
-            WriteLine("/// <param name=\"{0}\">{1}</param>", dc.CamelName(), dc.Description);
+            if (!pi.Extend)
+                WriteLine("/// <param name=\"{0}\">{1}</param>", pi.ParameterName, pi.Description);
         }
 
         var dcTime = builder.DataTime;
@@ -1990,7 +2003,7 @@ protected virtual IList<IDataColumn> BuildAdvanceSearch(SearchBuilder builder)
         WriteLine("/// <returns>实体列表</returns>");
 
         // 参数部分
-        var pis = ps.Join(", ", e => $"{e.TypeFullName} {e.Name}");
+        var pis = ps.Join(", ", e => $"{e.TypeFullName} {e.ParameterName}");
         WriteLine("public static IList<{0}> Search({1})", returnName, pis);
         WriteLine("{");
         {
@@ -2000,14 +2013,16 @@ protected virtual IList<IDataColumn> BuildAdvanceSearch(SearchBuilder builder)
             WriteLine();
             foreach (var dc in cs)
             {
+                if (!pdic.TryGetValue(dc.Name, out var pi)) continue;
+
                 if (dc.DataType.IsInt() && (dc.DataType.IsEnum || !dc.Properties["Type"].IsNullOrEmpty()))
-                    WriteLine("if ({0} >= 0) exp &= _.{1} == {0};", dc.CamelName(), dc.Name);
+                    WriteLine("if ({0} >= 0) exp &= _.{1} == {0};", pi.ParameterName, dc.Name);
                 else if (dc.DataType.IsInt())
-                    WriteLine("if ({0} >= 0) exp &= _.{1} == {0};", dc.CamelName(), dc.Name);
+                    WriteLine("if ({0} >= 0) exp &= _.{1} == {0};", pi.ParameterName, dc.Name);
                 else if (dc.DataType == typeof(Boolean))
-                    WriteLine("if ({0} != null) exp &= _.{1} == {0};", dc.CamelName(), dc.Name);
+                    WriteLine("if ({0} != null) exp &= _.{1} == {0};", pi.ParameterName, dc.Name);
                 else if (dc.DataType == typeof(String))
-                    WriteLine("if (!{0}.IsNullOrEmpty()) exp &= _.{1} == {0};", dc.CamelName(), dc.Name);
+                    WriteLine("if (!{0}.IsNullOrEmpty()) exp &= _.{1} == {0};", pi.ParameterName, dc.Name);
             }
 
             if (dcTime != null)

XCode/Code/ParameterModel.cs

@@ -3,12 +3,24 @@
 /// <summary>参数模型</summary>
 public class ParameterModel
 {
-    /// <summary>参数名</summary>
+    /// <summary>名称</summary>
     public String Name { get; set; } = null!;
 
+    /// <summary>参数名</summary>
+    public String ParameterName { get; set; } = null!;
+
     /// <summary>类型名。简称</summary>
     public String TypeName { get; set; } = null!;
 
     /// <summary>类型全名。含命名空间</summary>
     public String TypeFullName { get; set; } = null!;
+
+    /// <summary>显示名</summary>
+    public String? DisplayName { get; set; }
+
+    /// <summary>描述</summary>
+    public String? Description { get; set; }
+
+    /// <summary>是否扩展参数</summary>
+    public Boolean Extend { get; set; }
 }

XCode/Code/SearchBuilder.cs

@@ -158,6 +158,25 @@ public IList<IDataColumn> GetColumns()
     //    return ps;
     //}
 
+    private static readonly HashSet<String> _reservedNames = new(StringComparer.Ordinal)
+    {
+        // 关键字
+        "abstract", "as", "base", "bool", "break", "byte", "case", "catch", "char", "checked",
+        "class", "const", "continue", "decimal", "default", "delegate", "do", "double", "else",
+        "enum", "event", "explicit", "extern", "false", "finally", "fixed", "float", "for",
+        "foreach", "goto", "if", "implicit", "in", "int", "interface", "internal", "is", "lock",
+        "long", "namespace", "new", "null", "object", "operator", "out", "override", "params",
+        "private", "protected", "public", "readonly", "ref", "return", "sbyte", "sealed", "short",
+        "sizeof", "stackalloc", "static", "string", "struct", "switch", "this", "throw", "true",
+        "try", "typeof", "uint", "ulong", "unchecked", "unsafe", "ushort", "using", "virtual",
+        "void", "volatile", "while",
+        // 上下文关键字
+        "add", "alias", "and", "ascending", "async", "await", "by", "descending", "dynamic",
+        "equals", "file", "from", "get", "global", "group", "init", "into", "join", "let",
+        "nameof", "nint", "not", "notnull", "nuint", "on", "or", "orderby", "partial", "record",
+        "remove", "required", "scoped", "select", "set", "unmanaged", "value", "var", "when",
+        "where", "with", "yield"
+    };
     /// <summary>获取参数列表。名称+类型(全名+简名)</summary>
     /// <param name="columns"></param>
     /// <param name="extend"></param>
@@ -175,7 +194,18 @@ public IList<ParameterModel> GetParameters(IList<IDataColumn> columns, Boolean e
             else if (dc.DataType == typeof(String) && Nullable && dc.Nullable)
                 type += "?";
 
-            var model = new ParameterModel { Name = dc.CamelName(), TypeName = type, TypeFullName = type };
+            var model = new ParameterModel
+            {
+                Name = dc.Name,
+                ParameterName = dc.CamelName(),
+                TypeName = type,
+                TypeFullName = type,
+                DisplayName = dc.DisplayName,
+                Description = dc.Description,
+            };
+
+            // 处理保留字
+            if (_reservedNames.Contains(model.ParameterName)) model.ParameterName = "@" + model.ParameterName;
 
             var p = type.LastIndexOf('.');
             if (p > 0) model.TypeName = type[(p + 1)..];
@@ -187,11 +217,11 @@ public IList<ParameterModel> GetParameters(IList<IDataColumn> columns, Boolean e
         {
             if (DataTime != null)
             {
-                ps.Add(new ParameterModel { Name = "start", TypeName = "DateTime", TypeFullName = "DateTime" });
-                ps.Add(new ParameterModel { Name = "end", TypeName = "DateTime", TypeFullName = "DateTime" });
+                ps.Add(new ParameterModel { Name = "start", ParameterName = "start", TypeName = "DateTime", TypeFullName = "DateTime", Extend = true });
+                ps.Add(new ParameterModel { Name = "end", ParameterName = "end", TypeName = "DateTime", TypeFullName = "DateTime", Extend = true });
             }
-            ps.Add(new ParameterModel { Name = "key", TypeName = "String", TypeFullName = "String" });
-            ps.Add(new ParameterModel { Name = "page", TypeName = "PageParameter", TypeFullName = "PageParameter" });
+            ps.Add(new ParameterModel { Name = "key", ParameterName = "key", TypeName = "String", TypeFullName = "String", Extend = true });
+            ps.Add(new ParameterModel { Name = "page", ParameterName = "page", TypeName = "PageParameter", TypeFullName = "PageParameter", Extend = true });
         }
 
         return ps;

XCodeTool/CubeBuilder.cs

@@ -339,12 +339,17 @@ private String BuildSearch()
         var cs = builder.GetColumns();
         if (cs.Count <= 0) return null;
 
+        var ps = builder.GetParameters(cs);
+        var pdic = ps.ToDictionary(e => e.Name);
+
         var sb = Pool.StringBuilder.Get();
 
         var pis = new List<String>();
         foreach (var dc in cs)
         {
-            var name = dc.CamelName();
+            //var name = dc.CamelName();
+            if (!pdic.TryGetValue(dc.Name, out var pi)) continue;
+            var name = pi.ParameterName;
 
             if (dc.DataType.IsInt())
             {

XUnitTest.XCode/Code/Entity/字典参数.Biz.cs

@@ -93,6 +93,7 @@ public override Boolean Valid(DataMethod method)
     //    entity.Category = "abc";
     //    entity.Name = "abc";
     //    entity.Value = "abc";
+    //    entity.Readonly = true;
     //    entity.LongValue = "abc";
     //    entity.Kind = 0;
     //    entity.Enable = true;