Browse Source

Source:Order 更名为 FieldOrder,以避免和应用中的订单模型重名。

master
王厅 5 days ago
parent
commit
b2e0d80619
  1. 2
      Apewer.Source/Source/SqlClient.cs
  2. 2
      Apewer/Source/FieldOrder.cs
  3. 4
      Apewer/Source/IndexAttribute.cs
  4. 2
      Apewer/Source/TableIndex.cs

2
Apewer.Source/Source/SqlClient.cs

@ -407,7 +407,7 @@ namespace Apewer.Source
var fields = new List<string>(); var fields = new List<string>();
foreach (var field in index.Fields) foreach (var field in index.Fields)
{ {
if (field.Order == Order.Ascend) fields.Add($"[{field.Column.Field}]"); if (field.Order == FieldOrder.Ascend) fields.Add($"[{field.Column.Field}]");
else fields.Add($"[{field.Column.Field}] desc"); else fields.Add($"[{field.Column.Field}] desc");
} }
if (fields.IsEmpty()) return "无索引字段。"; if (fields.IsEmpty()) return "无索引字段。";

2
Apewer/Source/Order.cs → Apewer/Source/FieldOrder.cs

@ -2,7 +2,7 @@
{ {
/// <summary>排序。</summary> /// <summary>排序。</summary>
public enum Order public enum FieldOrder
{ {
/// <summary>升序排序。</summary> /// <summary>升序排序。</summary>

4
Apewer/Source/IndexAttribute.cs

@ -15,13 +15,13 @@ namespace Apewer.Source
ColumnAttribute _column; ColumnAttribute _column;
string _name = null; string _name = null;
Order _order = Order.Ascend; FieldOrder _order = FieldOrder.Ascend;
/// <summary>索引名称。</summary> /// <summary>索引名称。</summary>
public string Name { get => _name; } public string Name { get => _name; }
/// <summary>排序。</summary> /// <summary>排序。</summary>
public Order Order { get => _order; set => _order = value; } public FieldOrder Order { get => _order; set => _order = value; }
/// <summary>列。</summary> /// <summary>列。</summary>
public ColumnAttribute Column { get => _column; } public ColumnAttribute Column { get => _column; }

2
Apewer/Source/TableIndex.cs

@ -35,7 +35,7 @@ namespace Apewer.Source
var fields = Fields.FindAll(x => x != null && x.Column != null); var fields = Fields.FindAll(x => x != null && x.Column != null);
if (fields.IsEmpty()) return Name; if (fields.IsEmpty()) return Name;
var array = fields.Map(x => x.Order == Order.Ascend ? x.Column.Field : $"{x.Column.Field} DESC"); var array = fields.Map(x => x.Order == FieldOrder.Ascend ? x.Column.Field : $"{x.Column.Field} DESC");
return $"{Name} ({array.Join(", ")})"; return $"{Name} ({array.Join(", ")})";
} }

Loading…
Cancel
Save