fix some UI bugs

This commit is contained in:
2020-06-05 15:34:13 +02:00
parent 736761abd8
commit 002bf56fcd
12 changed files with 93 additions and 21 deletions
+3
View File
@@ -2,6 +2,7 @@
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
namespace zero.Core.Entities
@@ -24,6 +25,8 @@ namespace zero.Core.Entities
public bool OrderIsDescending { get; set; } = true;
public Func<IQueryable<T>, IQueryable<T>> OrderQuery = null;
public int Page { get; set; } = 1;
public int PageSize { get; set; } = 30;
+15
View File
@@ -0,0 +1,15 @@
namespace zero.Core.Entities
{
public class PreviewModel
{
public string Id { get; set; }
public string Icon { get; set; }
public string Text { get; set; }
public string Name { get; set; }
public bool HasError { get; set; }
}
}
+9
View File
@@ -0,0 +1,9 @@
namespace zero.Core.Entities
{
public class SelectModel
{
public string Id { get; set; }
public string Name { get; set; }
}
}
@@ -80,7 +80,11 @@ namespace zero.Core.Extensions
}
}
if (!query.OrderBy.IsNullOrEmpty())
if (query.OrderQuery != null)
{
rawQuery = query.OrderQuery(rawQuery);
}
else if (!query.OrderBy.IsNullOrEmpty())
{
rawQuery = rawQuery.OrderBy(query.OrderBy, query.OrderIsDescending, query.OrderType == ListQueryOrderType.String ? OrderingType.String : OrderingType.Double);
}