Casual optimize

README.md

@@ -1,5 +1,5 @@
 # sqler说明书-docker
-> 源码地址： https://github.com/VitLibs/Sqler  
+> 源码地址： https://github.com/Vit-Lib/Sqler  
 > 注： 在容器中  sqler = dotnet /root/app/Sqler.dll  
 
 ---------------------------------

Sqler/Module/AutoTemp/Controllers/AutoTempController.cs

@@ -8,7 +8,7 @@ using Vit.Core.Util.ComponentModel.SsError;
 using Vit.Extensions;
 using Vit.Extensions.Serialize_Extensions;
 using Vit.Linq.ComponentModel;
-using Vit.Linq.Filter.ComponentModel;
+using Vit.Linq.FilterRules.ComponentModel;
 
 namespace App.Module.AutoTemp.Controllers
 {
@@ -26,15 +26,15 @@ namespace App.Module.AutoTemp.Controllers
             IDataProvider dataProvider;
 
             dataProvider = new Vit.AutoTemp.Demo.DemoDataProvider { isTree = true, template = "demo_tree" };
-            Vit.AutoTemp.AutoTempHelp.RegistDataProvider(dataProvider);
+            Vit.AutoTemp.AutoTempHelp.RegisterDataProvider(dataProvider);
 
 
             dataProvider = new Vit.AutoTemp.Demo.DemoDataProvider { isTree = false, template = "demo_list" };
-            Vit.AutoTemp.AutoTempHelp.RegistDataProvider(dataProvider);
+            Vit.AutoTemp.AutoTempHelp.RegisterDataProvider(dataProvider);
 
 
             dataProvider = new Vit.AutoTemp.Demo.DemoRepository().ToDataProvider("demo_repository_list");
-            Vit.AutoTemp.AutoTempHelp.RegistDataProvider(dataProvider);
+            Vit.AutoTemp.AutoTempHelp.RegisterDataProvider(dataProvider);
 
             #endregion
 

Sqler/Module/Sqler/Controllers/SqlBackup/MySqlBackupController.cs

@@ -10,12 +10,11 @@ using Vit.Core.Module.Serialization;
 using Vit.Core.Util.ComponentModel.Data;
 using Vit.Core.Util.ComponentModel.SsError;
 using Vit.Db.DbMng;
-using Vit.Extensions.Serialize_Extensions;
 using Vit.Extensions.Newtonsoft_Extensions;
 using Vit.Extensions.Serialize_Extensions;
 using Vit.Linq;
 using Vit.Linq.ComponentModel;
-using Vit.Linq.Filter.ComponentModel;
+using Vit.Linq.FilterRules.ComponentModel;
 
 namespace App.Module.Sqler.Controllers.SqlBackup
 {

Sqler/Module/Sqler/Controllers/SqlBackup/SqlServerBackupController.cs

@@ -8,12 +8,11 @@ using Newtonsoft.Json.Linq;
 using Vit.Core.Util.ComponentModel.Data;
 using Vit.Core.Util.ComponentModel.SsError;
 using Vit.Db.DbMng;
-using Vit.Extensions.Serialize_Extensions;
 using Vit.Extensions.Newtonsoft_Extensions;
 using Vit.Extensions.Serialize_Extensions;
 using Vit.Linq;
 using Vit.Linq.ComponentModel;
-using Vit.Linq.Filter.ComponentModel;
+using Vit.Linq.FilterRules.ComponentModel;
 
 namespace App.Module.Sqler.Controllers.SqlBackup
 {

Sqler/Module/Sqler/Logical/DataEditor/ConfigRepository.cs

@@ -5,10 +5,10 @@ using Newtonsoft.Json.Linq;
 
 using Vit.AutoTemp.Repository;
 using Vit.Core.Util.ComponentModel.Data;
-using Vit.Extensions.Serialize_Extensions;
 using Vit.Extensions.Newtonsoft_Extensions;
+using Vit.Extensions.Serialize_Extensions;
 using Vit.Linq.ComponentModel;
-using Vit.Linq.Filter.ComponentModel;
+using Vit.Linq.FilterRules.ComponentModel;
 
 namespace App.Module.Sqler.Logical.DataEditor
 {

Sqler/Module/Sqler/Logical/DataEditor/DataEditorHelp.cs

@@ -28,7 +28,7 @@ namespace App.Module.Sqler.Logical.DataEditor
             // #1 unregister DataProvider
             if (dataProviders != null)
             {
-                Vit.AutoTemp.AutoTempHelp.UnRegistDataProvider(dataProviders.ToArray());
+                Vit.AutoTemp.AutoTempHelp.UnRegisterDataProvider(dataProviders.ToArray());
                 dataProviders = null;
             }
 
@@ -60,7 +60,7 @@ namespace App.Module.Sqler.Logical.DataEditor
                 {
                     var provideArray = CreateDataProviderFromDb();
                     dataProviders = provideArray;
-                    Vit.AutoTemp.AutoTempHelp.RegistDataProvider(provideArray);
+                    Vit.AutoTemp.AutoTempHelp.RegisterDataProvider(provideArray);
                 }
                 catch (System.Exception ex)
                 {
@@ -72,7 +72,7 @@ namespace App.Module.Sqler.Logical.DataEditor
                 //DbSchemaDataProvider
                 try
                 {
-                    Vit.AutoTemp.AutoTempHelp.RegistDataProvider(new DbSchemaDataProvider());
+                    Vit.AutoTemp.AutoTempHelp.RegisterDataProvider(new DbSchemaDataProvider());
                 }
                 catch (System.Exception ex)
                 {

Sqler/Module/Sqler/Logical/DataEditor/DataProvider/DbSchemaDataProvider.cs

@@ -9,11 +9,11 @@ using Vit.Core.Util.ComponentModel.Data;
 using Vit.Core.Util.ComponentModel.SsError;
 using Vit.Db.Module.Schema;
 using Vit.Extensions;
-using Vit.Extensions.Serialize_Extensions;
 using Vit.Extensions.Newtonsoft_Extensions;
+using Vit.Extensions.Serialize_Extensions;
 using Vit.Linq;
 using Vit.Linq.ComponentModel;
-using Vit.Linq.Filter.ComponentModel;
+using Vit.Linq.FilterRules.ComponentModel;
 
 namespace App.Module.Sqler.Logical.DataEditor.DataProvider
 {

Sqler/Module/Sqler/Logical/SqlBackup/MySqlBackup/ConfigRepository.cs

@@ -5,10 +5,10 @@ using Newtonsoft.Json.Linq;
 
 using Vit.AutoTemp.Repository;
 using Vit.Core.Util.ComponentModel.Data;
-using Vit.Extensions.Serialize_Extensions;
 using Vit.Extensions.Newtonsoft_Extensions;
+using Vit.Extensions.Serialize_Extensions;
 using Vit.Linq.ComponentModel;
-using Vit.Linq.Filter.ComponentModel;
+using Vit.Linq.FilterRules.ComponentModel;
 
 namespace App.Module.Sqler.Logical.SqlBackup.MySqlBackup
 {

Sqler/Module/Sqler/Logical/SqlBackup/SqlServerBackup/ConfigRepository.cs

@@ -5,10 +5,10 @@ using Newtonsoft.Json.Linq;
 
 using Vit.AutoTemp.Repository;
 using Vit.Core.Util.ComponentModel.Data;
-using Vit.Extensions.Serialize_Extensions;
 using Vit.Extensions.Newtonsoft_Extensions;
+using Vit.Extensions.Serialize_Extensions;
 using Vit.Linq.ComponentModel;
-using Vit.Linq.Filter.ComponentModel;
+using Vit.Linq.FilterRules.ComponentModel;
 
 namespace App.Module.Sqler.Logical.SqlBackup.SqlServerBackup
 {

Sqler/Module/Sqler/Logical/SqlRun/ConfigRepository.cs

@@ -5,10 +5,10 @@ using Newtonsoft.Json.Linq;
 
 using Vit.AutoTemp.Repository;
 using Vit.Core.Util.ComponentModel.Data;
-using Vit.Extensions.Serialize_Extensions;
 using Vit.Extensions.Newtonsoft_Extensions;
+using Vit.Extensions.Serialize_Extensions;
 using Vit.Linq.ComponentModel;
-using Vit.Linq.Filter.ComponentModel;
+using Vit.Linq.FilterRules.ComponentModel;
 
 namespace App.Module.Sqler.Logical.SqlRun
 {

Sqler/Module/Sqler/Logical/SqlVersion/ConfigRepository.cs

@@ -5,10 +5,10 @@ using Newtonsoft.Json.Linq;
 
 using Vit.AutoTemp.Repository;
 using Vit.Core.Util.ComponentModel.Data;
-using Vit.Extensions.Serialize_Extensions;
 using Vit.Extensions.Newtonsoft_Extensions;
+using Vit.Extensions.Serialize_Extensions;
 using Vit.Linq.ComponentModel;
-using Vit.Linq.Filter.ComponentModel;
+using Vit.Linq.FilterRules.ComponentModel;
 
 namespace App.Module.Sqler.Logical.SqlVersion
 {

Sqler/Module/Sqler/Logical/SqlVersion/ModuleRepository.cs

@@ -5,7 +5,7 @@ using Vit.Core.Util.ComponentModel.Data;
 using Vit.Core.Util.ConfigurationManager;
 using Vit.Linq;
 using Vit.Linq.ComponentModel;
-using Vit.Linq.Filter.ComponentModel;
+using Vit.Linq.FilterRules.ComponentModel;
 
 namespace App.Module.Sqler.Logical.SqlVersion
 {

Sqler/Module/Sqler/Logical/SqlVersion/SqlCodeRepository.cs

@@ -5,11 +5,11 @@ using Newtonsoft.Json.Linq;
 using Vit.AutoTemp.Repository;
 using Vit.Core.Util.ComponentModel.Data;
 using Vit.Core.Util.ConfigurationManager;
-using Vit.Extensions.Serialize_Extensions;
 using Vit.Extensions.Newtonsoft_Extensions;
+using Vit.Extensions.Serialize_Extensions;
 using Vit.Linq;
 using Vit.Linq.ComponentModel;
-using Vit.Linq.Filter.ComponentModel;
+using Vit.Linq.FilterRules.ComponentModel;
 
 namespace App.Module.Sqler.Logical.SqlVersion
 {

Sqler/Module/Sqler/Logical/SqlVersion/SqlVersionHelp.cs

@@ -74,19 +74,19 @@ namespace App.Module.Sqler.Logical.SqlVersion
             //(x.1)取消注册
             if (dataProviders.Count > 0)
             {
-                Vit.AutoTemp.AutoTempHelp.UnRegistDataProvider(dataProviders.ToArray());
+                Vit.AutoTemp.AutoTempHelp.UnRegisterDataProvider(dataProviders.ToArray());
                 dataProviders.Clear();
             }
 
             //(x.2)注册 SqlVersion Config
-            Vit.AutoTemp.AutoTempHelp.RegistDataProvider(
+            Vit.AutoTemp.AutoTempHelp.RegisterDataProvider(
                 new global::App.Module.Sqler.Logical.SqlVersion.ConfigRepository().ToDataProvider("Sqler_SqlVersion_Config"));
 
             //(x.3)注册 ModuleMng
             SqlVersionModuleModel[] moduleModels = sqlCodeRepositorys.AsQueryable()
                     .Select(rep => new SqlVersionModuleModel(rep) { id = Path.GetFileNameWithoutExtension(rep.fileName) }).ToArray();
 
-            Vit.AutoTemp.AutoTempHelp.RegistDataProvider(
+            Vit.AutoTemp.AutoTempHelp.RegisterDataProvider(
                                 new ModuleRepository(moduleModels).ToDataProvider("Sqler_SqlVersion_Module"));
 
 
@@ -98,7 +98,7 @@ namespace App.Module.Sqler.Logical.SqlVersion
 
                 dataProviders.AddRange(sqlCodeDataProviders);
 
-                Vit.AutoTemp.AutoTempHelp.RegistDataProvider(sqlCodeDataProviders);
+                Vit.AutoTemp.AutoTempHelp.RegisterDataProvider(sqlCodeDataProviders);
             }
             #endregion
 
@@ -109,7 +109,7 @@ namespace App.Module.Sqler.Logical.SqlVersion
                 var template = "Sqler_SqlVersion_VersionInfo";
                 var dataProvider = AutoTempHelp.CreateDataProvider<sqler_version>(template, CreateDbContext);
 
-                Vit.AutoTemp.AutoTempHelp.RegistDataProvider(dataProvider);
+                Vit.AutoTemp.AutoTempHelp.RegisterDataProvider(dataProvider);
             }
             #endregion
 

Sqler/Module/Sqler/Logical/SqlerHelp.cs

@@ -209,7 +209,7 @@ namespace App.Module.Sqler.Logical
 
             #region init SqlRun
             {
-                Vit.AutoTemp.AutoTempHelp.RegistDataProvider(
+                Vit.AutoTemp.AutoTempHelp.RegisterDataProvider(
                     new global::App.Module.Sqler.Logical.SqlRun.ConfigRepository().ToDataProvider("Sqler_SqlRun_Config"));
             }
             #endregion
@@ -223,7 +223,7 @@ namespace App.Module.Sqler.Logical
                     Logger.Info("[Sqler.AutoTemp][DataEditor] init ...");
 
                     //RegistDataProvider
-                    Vit.AutoTemp.AutoTempHelp.RegistDataProvider(
+                    Vit.AutoTemp.AutoTempHelp.RegisterDataProvider(
                         new global::App.Module.Sqler.Logical.DataEditor.ConfigRepository().ToDataProvider("Sqler_DataEditor_Config"));
 
 
@@ -243,10 +243,10 @@ namespace App.Module.Sqler.Logical
             #region init SqlBackup
             {
                 //config
-                Vit.AutoTemp.AutoTempHelp.RegistDataProvider(
+                Vit.AutoTemp.AutoTempHelp.RegisterDataProvider(
                     new global::App.Module.Sqler.Logical.SqlBackup.SqlServerBackup.ConfigRepository().ToDataProvider("Sqler_SqlBackup_SqlServerBackup_Config"));
 
-                Vit.AutoTemp.AutoTempHelp.RegistDataProvider(
+                Vit.AutoTemp.AutoTempHelp.RegisterDataProvider(
                    new global::App.Module.Sqler.Logical.SqlBackup.MySqlBackup.ConfigRepository().ToDataProvider("Sqler_SqlBackup_MySqlBackup_Config"));
 
                 Logger.Info("[Sqler.AutoTemp] inited SqlBackup!");

Sqler/Sqler.csproj

@@ -9,7 +9,7 @@
         <TargetFramework>net6.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Version>4.0.1</Version>
-        <Description>https://github.com/VitLibs/Sqler</Description>
+        <Description>https://github.com/Vit-Lib/Sqler</Description>
     </PropertyGroup>
 
 
@@ -21,16 +21,15 @@
     <ItemGroup>
         <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
         <PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
-        <PackageReference Include="Vit.Excel" Version="2.2.16" />
-
+        <PackageReference Include="Vit.Excel" Version="2.2.18" />
         <PackageReference Include="Vit.WebHost" Version="6.1.0" />
-        <PackageReference Include="Vit.Db.DbMng" Version="3.0.0" />
+        <PackageReference Include="Vit.Db.DbMng" Version="3.0.1" />
         <PackageReference Include="Sers.Core" Version="2.1.27" />
-        <PackageReference Include="Vitorm.Data" Version="2.0.4" />
-        <PackageReference Include="Vitorm.EntityGenerate" Version="2.0.4" />
-        <PackageReference Include="Vitorm.MySql" Version="2.0.4" />
-        <PackageReference Include="Vitorm.Sqlite" Version="2.0.4" />
-        <PackageReference Include="Vitorm.SqlServer" Version="2.0.4" />
+        <PackageReference Include="Vitorm.Data" Version="2.1.1" />
+        <PackageReference Include="Vitorm.EntityGenerate" Version="2.1.1" />
+        <PackageReference Include="Vitorm.MySql" Version="2.1.1" />
+        <PackageReference Include="Vitorm.Sqlite" Version="2.1.1" />
+        <PackageReference Include="Vitorm.SqlServer" Version="2.1.1" />
     </ItemGroup>
 
 

Vit.AutoTemp/AutoTempHelp.cs

@@ -110,7 +110,7 @@ namespace Vit.AutoTemp
             Regex ctrlAttribute = new Regex("\\[[^\\[\\]]+?\\]"); //正则匹配 [editable:true] 
             foreach (var column in tableInfo.columns)
             {
-                // { field: 'name', title: '装修商', list_width: 200 ,visiable:false,editable:false  }
+                // { field: 'name', title: '装修商', list_width: 200 ,visible:false,editable:false  }
                 if (column.primary_key == 1)
                 {
                     idField = column.column_name;
@@ -141,7 +141,7 @@ namespace Vit.AutoTemp
                         SplitStringTo2(comm, ":", out key, out value);
                         value = value?.Replace("\\x5B", "[").Replace("\\x5D", "]");
                         if (string.IsNullOrWhiteSpace(key)) continue;
-                        #endregion                       
+                        #endregion
 
                         //(x.x.2)
                         BuildFieldConfigFromComment(key, value);
@@ -221,13 +221,13 @@ namespace Vit.AutoTemp
                     }
                     #endregion
 
-                    #region (x.3)列表筛选条件     
+                    #region (x.3)列表筛选条件
                     //     [filter:开始时间,>=]   当前列作为筛选条件，筛选条件名称为开始时间，筛选方式为">="
                     // filter:
                     //  { field: 'name', title: '装修商',filterOpt:'=' }
                     if (key == "filter")
                     {
-                        var prorerty = value.Split(',');
+                        var property = value.Split(',');
 
                         var filterField = new JObject()
                         {
@@ -239,16 +239,16 @@ namespace Vit.AutoTemp
                         filterFields.Add(filterField);
 
                         #region (x.x.1)筛选方式
-                        if (prorerty.Length > 1)
+                        if (property.Length > 1)
                         {
-                            filterField["filterOpt"] = prorerty[1];
+                            filterField["filterOpt"] = property[1];
                         }
                         #endregion
 
                         #region (x.x.2)title
-                        if (prorerty.Length > 0)
+                        if (property.Length > 0)
                         {
-                            filterField["title"] = prorerty[0];
+                            filterField["title"] = property[0];
                         }
                         #endregion
                     }
@@ -325,7 +325,7 @@ namespace Vit.AutoTemp
         #region static dataProviderMap
         public readonly static SortedDictionary<string, IDataProvider> dataProviderMap = new SortedDictionary<string, IDataProvider>();
 
-        public static void RegistDataProvider(params IDataProvider[] dataProviders)
+        public static void RegisterDataProvider(params IDataProvider[] dataProviders)
         {
             lock (dataProviderMap)
             {
@@ -337,7 +337,7 @@ namespace Vit.AutoTemp
         }
 
 
-        public static void UnRegistDataProvider(params IDataProvider[] dataProviders)
+        public static void UnRegisterDataProvider(params IDataProvider[] dataProviders)
         {
             lock (dataProviderMap)
                 foreach (var dataProvider in dataProviders)

Vit.AutoTemp/DataProvider/DataProvider_Vitorm.cs

@@ -8,12 +8,12 @@ using Vit.Core.Module.Serialization;
 using Vit.Core.Util.ComponentModel.Data;
 using Vit.Core.Util.ComponentModel.SsError;
 using Vit.Db.Module.Schema;
-using Vit.Extensions.Serialize_Extensions;
 using Vit.Extensions.Newtonsoft_Extensions;
 using Vit.Extensions.Object_Extensions;
+using Vit.Extensions.Serialize_Extensions;
 using Vit.Linq;
 using Vit.Linq.ComponentModel;
-using Vit.Linq.Filter.ComponentModel;
+using Vit.Linq.FilterRules.ComponentModel;
 
 namespace Vit.AutoTemp.DataProvider
 {

Vit.AutoTemp/DataProvider/IDataProvider.cs

@@ -4,7 +4,7 @@ using Newtonsoft.Json.Linq;
 
 using Vit.Core.Util.ComponentModel.Data;
 using Vit.Linq.ComponentModel;
-using Vit.Linq.Filter.ComponentModel;
+using Vit.Linq.FilterRules.ComponentModel;
 
 namespace Vit.AutoTemp.DataProvider
 {

Vit.AutoTemp/Demo/DemoDataProvider.cs

@@ -6,13 +6,12 @@ using Newtonsoft.Json.Linq;
 using Vit.AutoTemp.DataProvider;
 using Vit.Core.Util.Common;
 using Vit.Core.Util.ComponentModel.Data;
-using Vit.Extensions.Serialize_Extensions;
 using Vit.Extensions.Newtonsoft_Extensions;
 using Vit.Extensions.Object_Extensions;
 using Vit.Extensions.Serialize_Extensions;
 using Vit.Linq;
 using Vit.Linq.ComponentModel;
-using Vit.Linq.Filter.ComponentModel;
+using Vit.Linq.FilterRules.ComponentModel;
 
 namespace Vit.AutoTemp.Demo
 {

Vit.AutoTemp/Demo/DemoRepository.cs

@@ -6,11 +6,11 @@ using Vit.AutoTemp.Repository;
 using Vit.Core.Util.Common;
 using Vit.Core.Util.ComponentModel.Data;
 using Vit.Core.Util.ComponentModel.SsError;
-using Vit.Extensions.Serialize_Extensions;
 using Vit.Extensions.Object_Extensions;
+using Vit.Extensions.Serialize_Extensions;
 using Vit.Linq;
 using Vit.Linq.ComponentModel;
-using Vit.Linq.Filter.ComponentModel;
+using Vit.Linq.FilterRules.ComponentModel;
 
 
 namespace Vit.AutoTemp.Demo

Vit.AutoTemp/Repository/IRepository.cs

@@ -2,7 +2,7 @@
 
 using Vit.Core.Util.ComponentModel.Data;
 using Vit.Linq.ComponentModel;
-using Vit.Linq.Filter.ComponentModel;
+using Vit.Linq.FilterRules.ComponentModel;
 
 
 namespace Vit.AutoTemp.Repository

Vit.AutoTemp/Repository/RespositoryDataProvider.cs

@@ -7,7 +7,7 @@ using Vit.AutoTemp.DataProvider;
 using Vit.Core.Util.ComponentModel.Data;
 using Vit.Extensions.Serialize_Extensions;
 using Vit.Linq.ComponentModel;
-using Vit.Linq.Filter.ComponentModel;
+using Vit.Linq.FilterRules.ComponentModel;
 
 
 namespace Vit.AutoTemp.Repository

Vit.AutoTemp/Vit.AutoTemp.csproj

@@ -5,7 +5,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <Description>https://github.com/VitLibs/Sqler</Description>
+        <Description>https://github.com/Vit-Lib/Sqler</Description>
     </PropertyGroup>
 
     <PropertyGroup>
@@ -13,8 +13,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Vit.Db" Version="3.0.0" />
-        <PackageReference Include="Vitorm" Version="2.0.4" />
+        <PackageReference Include="Vit.Db" Version="3.0.1" />
+        <PackageReference Include="Vitorm" Version="2.1.1" />
     </ItemGroup>
 
 </Project>