Add pagination and remove Vit.Linq.Extensions libarary

src/Test/Vit.Linq.MsTest/Extensions/IQueryable_SortAndPage_Test.cs

@@ -1,7 +1,6 @@
 using Vit.Extensions.Linq_Extensions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Vit.Core.Util.ComponentModel.Data;
-using Vit.Core.Util.ComponentModel.Query;
+using Vit.Linq.ComponentModel;
 
 
 namespace Vit.Linq.MsTest.Extensions

src/Test/Vit.Linq.MsTest/Extensions/Queryable_SortAndPage_Test.cs

@@ -1,8 +1,7 @@
 using Vit.Extensions.Linq_Extensions;
 using System.Linq;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Vit.Core.Util.ComponentModel.Data;
-using Vit.Core.Util.ComponentModel.Query;
+using Vit.Linq.ComponentModel;
 
 namespace Vit.Linq.MsTest.Extensions
 {

src/Test/Vit.Linq.MsTest/Extensions/Queryable_Sort_ByReflection_Test.cs

@@ -1,8 +1,7 @@
 using Vit.Extensions.Linq_Extensions;
 using System.Linq;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Vit.Core.Util.ComponentModel.Data;
-using Vit.Core.Util.ComponentModel.Query;
+using Vit.Linq.ComponentModel;
 
 namespace Vit.Linq.MsTest.Extensions
 {

src/Test/Vit.Linq.MsTest/Filter/Filter_TestBase.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Reflection;
 
 using Vit.Linq.MoreFilter;
-using Vit.Linq.Filter;
+using Vit.Linq.ComponentModel;
 
 namespace Vit.Linq.MsTest.Filter
 {

src/Test/Vit.Linq.MsTest/Filter/IQueryableTest/Filter_Test_FilterRule.cs

@@ -7,6 +7,7 @@ using Vit.Linq.Filter;
 using System;
 using Newtonsoft.Json.Linq;
 using Queryable = System.Linq.IQueryable;
+using Vit.Linq.ComponentModel;
 
 namespace Vit.Linq.MsTest.Filter.IQueryableTest
 {

src/Test/Vit.Linq.MsTest/Filter/IQueryableTest/Filter_Test_FilterRuleWithMethod.cs

@@ -4,6 +4,7 @@ using Vit.Linq.Filter;
 using Vit.Linq.MoreFilter;
 using Newtonsoft.Json.Linq;
 using System;
+using Vit.Linq.ComponentModel;
 
 namespace Vit.Linq.MsTest.Filter.IQueryableTest
 {

src/Test/Vit.Linq.MsTest/Filter/IQueryableTest/Filter_Test_Newtonsoft.cs

@@ -1,6 +1,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using Vit.Core.Module.Serialization;
+using Vit.Linq.ComponentModel;
 using Vit.Linq.Filter;
 using Vit.Linq.NewtonsoftJson;
 

src/Test/Vit.Linq.MsTest/Filter/IQueryableTest/Filter_Test_Newtonsoft2.cs

@@ -1,5 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-
+using Vit.Linq.ComponentModel;
 using Vit.Linq.Filter;
 using Vit.Linq.NewtonsoftJson;
 

src/Test/Vit.Linq.MsTest/Filter/IQueryableTest/Filter_Test_SystemTextJson.cs

@@ -1,7 +1,7 @@
 using System.Text.Json;
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-
+using Vit.Linq.ComponentModel;
 using Vit.Linq.Filter;
 using Vit.Linq.SystemTextJson;
 

src/Test/Vit.Linq.MsTest/Filter/IQueryableTest/Filter_Test_SystemTextJson2.cs

@@ -1,5 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-
+using Vit.Linq.ComponentModel;
 using Vit.Linq.Filter;
 using Vit.Linq.SystemTextJson;
 

src/Test/Vit.Linq.MsTest/Filter/PrimitiveValue_Test.cs

@@ -6,6 +6,7 @@ using Vit.Core.Module.Serialization;
 using Vit.Linq.Filter;
 using Vit.Extensions.Linq_Extensions;
 using Newtonsoft.Json.Linq;
+using Vit.Linq.ComponentModel;
 
 namespace Vit.Linq.MsTest.Filter
 {

src/Test/Vit.Linq.MsTest/Filter/QueryableTest/Filter_Test_FilterRule.cs

@@ -7,6 +7,7 @@ using Vit.Linq.Filter;
 using System;
 using Newtonsoft.Json.Linq;
 using Queryable = System.Linq.IQueryable<Vit.Linq.MsTest.ModelA>;
+using Vit.Linq.ComponentModel;
 
 namespace Vit.Linq.MsTest.Filter.QueryableTest
 {

src/Test/Vit.Linq.MsTest/Filter/QueryableTest/Filter_Test_FilterRuleWithMethod.cs

@@ -4,6 +4,7 @@ using Vit.Linq.Filter;
 using Vit.Linq.MoreFilter;
 using Newtonsoft.Json.Linq;
 using System;
+using Vit.Linq.ComponentModel;
 
 namespace Vit.Linq.MsTest.Filter.QueryableTest
 {

src/Test/Vit.Linq.MsTest/Filter/QueryableTest/Filter_Test_Newtonsoft.cs

@@ -1,6 +1,7 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using Vit.Core.Module.Serialization;
+using Vit.Linq.ComponentModel;
 using Vit.Linq.Filter;
 using Vit.Linq.NewtonsoftJson;
 

src/Test/Vit.Linq.MsTest/Filter/QueryableTest/Filter_Test_Newtonsoft2.cs

@@ -1,5 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-
+using Vit.Linq.ComponentModel;
 using Vit.Linq.Filter;
 using Vit.Linq.NewtonsoftJson;
 

src/Test/Vit.Linq.MsTest/Filter/QueryableTest/Filter_Test_SystemTextJson.cs

@@ -1,7 +1,7 @@
 using System.Text.Json;
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-
+using Vit.Linq.ComponentModel;
 using Vit.Linq.Filter;
 using Vit.Linq.SystemTextJson;
 

src/Test/Vit.Linq.MsTest/Filter/QueryableTest/Filter_Test_SystemTextJson2.cs

@@ -1,5 +1,5 @@
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-
+using Vit.Linq.ComponentModel;
 using Vit.Linq.Filter;
 using Vit.Linq.SystemTextJson;
 

src/Test/Vit.Linq.MsTest/Vit.Linq.MsTest.csproj

@@ -14,10 +14,10 @@
         <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
         <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
         <PackageReference Include="coverlet.collector" Version="3.2.0" />
+        <PackageReference Include="Vit.Core" Version="2.1.19" />
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\Vit.Linq.Extensions\Vit.Linq.Extensions.csproj" />
         <ProjectReference Include="..\..\Vit.Linq.NewtonsoftJson\Vit.Linq.NewtonsoftJson.csproj" />
         <ProjectReference Include="..\..\Vit.Linq.SystemTextJson\Vit.Linq.SystemTextJson.csproj" />
         <ProjectReference Include="..\..\Vit.Linq\Vit.Linq.csproj" />

src/Test/Vit.Linq.MsTest31/Vit.Linq.MsTest31.csproj

@@ -9,10 +9,10 @@
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
         <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
         <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
+        <PackageReference Include="Vit.Core" Version="2.1.19" />
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\Vit.Linq.Extensions\Vit.Linq.Extensions.csproj" />
         <ProjectReference Include="..\..\Vit.Linq.NewtonsoftJson\Vit.Linq.NewtonsoftJson.csproj" />
         <ProjectReference Include="..\..\Vit.Linq.SystemTextJson\Vit.Linq.SystemTextJson.csproj" />
         <ProjectReference Include="..\..\Vit.Linq\Vit.Linq.csproj" />

src/Vit.Linq.Extensions/Properties/PublishProfiles/FolderProfile.pubxml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121. 
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <PublishProtocol>FileSystem</PublishProtocol>
-    <Configuration>Release</Configuration>
-    <Platform>Any CPU</Platform>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <PublishDir>..\..\..\Publish\nuget</PublishDir>
-  </PropertyGroup>
-</Project>

src/Vit.Linq.Extensions/Vit.Linq.Extensions.csproj

@@ -1,30 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <pack>nuget</pack>
-    </PropertyGroup>
-
-    <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
-        <Version>2.2.18-temp</Version>
-    </PropertyGroup>
-
-    <PropertyGroup>
-        <Authors>Lith</Authors>
-        <Description>Linq extensions</Description>
-        <PackageProjectUrl>https://github.com/serset/Vit.Linq</PackageProjectUrl>
-    </PropertyGroup>
-
-    <PropertyGroup>
-        <DocumentationFile>bin\Debug\netstandard2.0\Vit.Linq.QueryBuilder</DocumentationFile>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Vit.Core" Version="2.1.19" />
-    </ItemGroup>
-
-    <ItemGroup>
-      <ProjectReference Include="..\Vit.Linq\Vit.Linq.csproj" />
-    </ItemGroup>
-
-</Project>

src/Vit.Linq.sln

@@ -11,8 +11,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vit.Linq", "Vit.Linq\Vit.Li
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vit.Linq.MsTest31", "Test\Vit.Linq.MsTest31\Vit.Linq.MsTest31.csproj", "{7E513E2C-BF52-4662-AD8F-5910F283178D}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vit.Linq.Extensions", "Vit.Linq.Extensions\Vit.Linq.Extensions.csproj", "{7644C85D-F136-4654-8422-F4C3AEE9A22F}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vit.Linq.NewtonsoftJson", "Vit.Linq.NewtonsoftJson\Vit.Linq.NewtonsoftJson.csproj", "{BC843F69-5ED6-44C2-8A41-0F5826CC1911}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Vit.Linq.SystemTextJson", "Vit.Linq.SystemTextJson\Vit.Linq.SystemTextJson.csproj", "{6C1BC7F7-5C2C-425B-90EC-96D2B94F6C1B}"
@@ -40,10 +38,6 @@ Global
 		{7E513E2C-BF52-4662-AD8F-5910F283178D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7E513E2C-BF52-4662-AD8F-5910F283178D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7E513E2C-BF52-4662-AD8F-5910F283178D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7644C85D-F136-4654-8422-F4C3AEE9A22F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7644C85D-F136-4654-8422-F4C3AEE9A22F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7644C85D-F136-4654-8422-F4C3AEE9A22F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7644C85D-F136-4654-8422-F4C3AEE9A22F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BC843F69-5ED6-44C2-8A41-0F5826CC1911}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BC843F69-5ED6-44C2-8A41-0F5826CC1911}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BC843F69-5ED6-44C2-8A41-0F5826CC1911}.Release|Any CPU.ActiveCfg = Release|Any CPU

src/Vit.Linq/Filter/ECondition.cs → src/Vit.Linq/ComponentModel/ECondition.cs

@@ -1,4 +1,4 @@
-namespace Vit.Linq.Filter
+namespace Vit.Linq.ComponentModel
 {
     public enum ECondition
     {

src/Vit.Linq/Filter/IFilterRule.cs → src/Vit.Linq/ComponentModel/IFilterRule.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq.Expressions;
 
-namespace Vit.Linq.Filter
+namespace Vit.Linq.ComponentModel
 {
     /// <summary>
     /// This interface is used to define a hierarchical filter for a given collection.

src/Vit.Linq/ComponentModel/PageData.cs

@@ -0,0 +1,36 @@
+using System.Collections.Generic;
+
+
+namespace Vit.Linq.ComponentModel
+{
+    public class PageData : PageData<object>
+    {
+        public PageData(PageInfo pageInfo = null):base(pageInfo)
+        {            
+        }
+    }
+
+    public class PageData<T> : PageInfo
+    {
+
+        public PageData(PageInfo pageInfo=null)
+        {
+            if (null != pageInfo)
+            {
+                pageSize = pageInfo.pageSize;
+                pageIndex = pageInfo.pageIndex;
+            }
+        }
+
+        /// <summary>
+        /// rows
+        /// </summary>
+        public List<T> rows;
+
+
+        /// <summary>
+        /// totalCount
+        /// </summary>
+        public int totalCount;
+    }
+}

src/Vit.Linq/ComponentModel/PageInfo.cs

@@ -0,0 +1,18 @@
+
+
+namespace Vit.Linq.ComponentModel
+{
+    public class PageInfo
+    {
+        /// <summary>
+        /// pageSize
+        /// </summary>
+        public int pageSize;
+
+        /// <summary>
+        /// pageIndex, starting from 1
+        /// </summary>
+        public int pageIndex;
+    }
+
+}

src/Vit.Linq/ComponentModel/SortItem.cs

@@ -0,0 +1,16 @@
+
+namespace Vit.Linq.ComponentModel
+{
+    public class SortItem
+    {
+        /// <summary>
+        /// field name(can be cascaded). demo "parent.id"
+        /// </summary>
+        public string field;
+
+        /// <summary>
+        /// whether is order by ascendin
+        /// </summary>
+        public bool asc;
+    }
+}

src/Vit.Linq.Extensions/Extensions/IQueryable_Page_Extensions.cs → src/Vit.Linq/Extensions/IQueryable_Page_Extensions.cs

@@ -1,7 +1,7 @@
 using System.Linq;
 using System.Runtime.CompilerServices;
 
-using Vit.Core.Util.ComponentModel.Data;
+using Vit.Linq.ComponentModel;
 
 namespace Vit.Extensions.Linq_Extensions
 {

src/Vit.Linq.Extensions/Extensions/IQueryable_Sort_Extensions.cs → src/Vit.Linq/Extensions/IQueryable_Sort_Extensions.cs

@@ -4,8 +4,8 @@ using System.Linq;
 using System.Linq.Expressions;
 using System.Runtime.CompilerServices;
 
-using Vit.Core.Util.ComponentModel.Query;
 using Vit.Linq;
+using Vit.Linq.ComponentModel;
 
 namespace Vit.Extensions.Linq_Extensions
 {

src/Vit.Linq.Extensions/Extensions/IQueryable_ToPageData_Extensions.cs → src/Vit.Linq/Extensions/IQueryable_ToPageData_Extensions.cs

@@ -3,8 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.CompilerServices;
 
-using Vit.Core.Util.ComponentModel.Data;
-using Vit.Core.Util.ComponentModel.Query;
+using Vit.Linq.ComponentModel;
 
 namespace Vit.Extensions.Linq_Extensions
 {

src/Vit.Linq.Extensions/Extensions/Queryable_Page_Extensions.cs → src/Vit.Linq/Extensions/Queryable_Page_Extensions.cs

@@ -1,7 +1,7 @@
 using System.Linq;
 using System.Runtime.CompilerServices;
 
-using Vit.Core.Util.ComponentModel.Data;
+using Vit.Linq.ComponentModel;
 
 namespace Vit.Extensions.Linq_Extensions
 {

src/Vit.Linq.Extensions/Extensions/Queryable_Sort_ByReflection_Extensions.cs → src/Vit.Linq/Extensions/Queryable_Sort_ByReflection_Extensions.cs

@@ -2,8 +2,8 @@
 using System.Linq;
 using System.Runtime.CompilerServices;
 
-using Vit.Core.Util.ComponentModel.Query;
 using Vit.Linq;
+using Vit.Linq.ComponentModel;
 
 namespace Vit.Extensions.Linq_Extensions
 {

src/Vit.Linq.Extensions/Extensions/Queryable_Sort_Extensions.cs → src/Vit.Linq/Extensions/Queryable_Sort_Extensions.cs

@@ -4,9 +4,8 @@ using System.Linq.Expressions;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 
-using Vit.Core.Util.ComponentModel.Query;
 using Vit.Linq;
-using Vit.Linq.Filter;
+using Vit.Linq.ComponentModel;
 
 namespace Vit.Extensions.Linq_Extensions
 {

src/Vit.Linq.Extensions/Extensions/Queryable_ToPageData_Extensions.cs → src/Vit.Linq/Extensions/Queryable_ToPageData_Extensions.cs

@@ -3,8 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.CompilerServices;
 
-using Vit.Core.Util.ComponentModel.Data;
-using Vit.Core.Util.ComponentModel.Query;
+using Vit.Linq.ComponentModel;
 
 
 namespace Vit.Extensions.Linq_Extensions

src/Vit.Linq/Filter/Extensions/IQueryable_Where_Extensions.cs

@@ -2,7 +2,7 @@
 using System.Linq;
 using System.Linq.Expressions;
 using System.Runtime.CompilerServices;
-
+using Vit.Linq.ComponentModel;
 using Vit.Linq.Filter;
 
 namespace Vit.Extensions.Linq_Extensions

src/Vit.Linq/Filter/Extensions/Queryable_Where_Extensions.cs

@@ -1,6 +1,6 @@
 using System.Linq;
 using System.Runtime.CompilerServices;
-
+using Vit.Linq.ComponentModel;
 using Vit.Linq.Filter;
 
 namespace Vit.Extensions.Linq_Extensions

src/Vit.Linq/Filter/FilterRuleBase.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Linq.Expressions;
+using Vit.Linq.ComponentModel;
 
 namespace Vit.Linq.Filter
 {

src/Vit.Linq/Filter/FilterService.cs

@@ -3,6 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Linq.Expressions;
+using Vit.Linq.ComponentModel;
 
 
 namespace Vit.Linq.Filter

src/Vit.Linq/MoreFilter/FilterRuleWithMethod.cs

@@ -4,6 +4,7 @@ using System.Diagnostics.CodeAnalysis;
 using System.Linq.Expressions;
 using System.Linq;
 using Vit.Linq.Filter;
+using Vit.Linq.ComponentModel;
 
 namespace Vit.Linq.MoreFilter
 {