优化tab右键事件

.Net6版本/.dockerignore

@@ -0,0 +1,25 @@
+**/.classpath
+**/.dockerignore
+**/.env
+**/.git
+**/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
+**/.vs
+**/.vscode
+**/*.*proj.user
+**/*.dbmdl
+**/*.jfm
+**/azds.yaml
+**/bin
+**/charts
+**/docker-compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
+**/obj
+**/secrets.dev.yaml
+**/values.dev.yaml
+LICENSE
+README.md

.Net6版本/Dockerfile

@@ -0,0 +1,44 @@
+#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
+#
+#FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
+#RUN apt-get update; apt-get install libfontconfig1 -y
+#
+#WORKDIR /app
+#EXPOSE 9991
+#
+#FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+#WORKDIR /src
+#COPY ["VOL.WebApi/VOL.WebApi.csproj", "VOL.WebApi/"]
+#COPY ["VOL.System/VOL.System.csproj", "VOL.System/"]
+#COPY ["VOL.Core/VOL.Core.csproj", "VOL.Core/"]
+#COPY ["VOL.Entity/VOL.Entity.csproj", "VOL.Entity/"]
+#COPY ["VOL.Order/VOL.Order.csproj", "VOL.Order/"]
+#COPY ["VOL.AppManager/VOL.AppManager.csproj", "VOL.AppManager/"]
+#COPY ["VOL.Builder/VOL.Builder.csproj", "VOL.Builder/"]
+#RUN dotnet restore "VOL.WebApi/VOL.WebApi.csproj"
+#COPY . .
+#WORKDIR "/src/VOL.WebApi"
+#RUN dotnet build "VOL.WebApi.csproj" -c Release -o /app/build
+#
+#FROM build AS publish
+#RUN dotnet publish "VOL.WebApi.csproj" -c Release -o /app/publish
+#
+#FROM base AS final
+#WORKDIR /app
+#COPY --from=publish /app/publish .
+#ENTRYPOINT ["dotnet", "VOL.WebApi.dll"]
+
+#docker run -p 3306:3306 --name volmysql \
+#--restart=always \
+#-v /home/mysql/data:/var/lib/mysql \
+#-e MYSQL_ROOT_PASSWORD=123456 \
+#-d mysql:5.7
+
+#docker build -t volapi:1.0 .
+#docker run -d --name volapi -v /etc/timezone:/etc/timezone:ro -v /etc/localtime:/etc/localtime:ro --restart=always  --log-opt max-size=300m --log-opt max-file=3 --network=host volapi:1.0 
+
+FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+WORKDIR /app
+COPY . .
+RUN apt-get update -y && apt-get install -y libgdiplus && apt-get clean && ln -s /usr/lib/libgdiplus.so /usr/lib/gdiplus.dll
+ENTRYPOINT ["dotnet", "VOL.WebApi.dll"]

.Net6版本/VOL.Builder/Services/Core/Partial/Sys_TableInfoService.cs

@@ -1,4 +1,4 @@
-using VOL.Builder.Utility;
+using VOL.Builder.Utility;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyModel;
 using Newtonsoft.Json;
@@ -36,7 +36,7 @@ private string StratName
             {
                 if (startName == "")
                 {
-                    startName = WebProject.Substring(0, webProject.IndexOf('.'));
+                    startName = WebProject.Substring(0, webProject.LastIndexOf('.'));
                 }
                 return startName;
             }
@@ -482,7 +482,7 @@ public string CreateServices(string tableName, string nameSpace, string folderna
                 }
                 apiPath += $"\\Controllers\\{projectName}\\";
                 //生成Partial Api控制器
-                if (!File.Exists($"{apiPath}Partial\\{tableName}Controller.cs"))
+                if (!FileHelper.FileExists($"{apiPath}Partial\\{tableName}Controller.cs"))
                 {
                     string partialController = FileHelper.ReadFile(@"Template\\Controller\\ControllerApiPartial.html")
                        .Replace("{Namespace}", nameSpace).Replace("{TableName}", tableName).Replace("{StartName}", StratName);
@@ -511,7 +511,7 @@ public string CreateServices(string tableName, string nameSpace, string folderna
             string fileName = "I" + tableName + "Service.cs";
 
             //生成Partial  IService类
-            if (!File.Exists(path + "Partial\\" + fileName))
+            if (!FileHelper.FileExists(path + "Partial\\" + fileName))
             {
                 domainContent = FileHelper.ReadFile("Template\\IServices\\IServiceBasePartial.html").Replace("{Namespace}", nameSpace).Replace("{TableName}", tableName).Replace("{StartName}", StratName);
                 FileHelper.WriteFile(path + "Partial\\", fileName, domainContent);
@@ -526,7 +526,7 @@ public string CreateServices(string tableName, string nameSpace, string folderna
             fileName = tableName + "Service.cs";
             //生成Partial Service类
             domainContent = FileHelper.ReadFile("Template\\Services\\ServiceBasePartial.html").Replace("{Namespace}", nameSpace).Replace("{TableName}", tableName).Replace("{StartName}", StratName);
-            if (!File.Exists(path + "Partial\\" + fileName))
+            if (!FileHelper.FileExists(path + "Partial\\" + fileName))
             {
                 domainContent = FileHelper.ReadFile("Template\\Services\\ServiceBasePartial.html").Replace("{Namespace}", nameSpace).Replace("{TableName}", tableName).Replace("{StartName}", StratName);
                 FileHelper.WriteFile(path + "Partial\\", fileName, domainContent);
@@ -544,7 +544,7 @@ public string CreateServices(string tableName, string nameSpace, string folderna
                 path = $"{frameworkFolder}\\{nameSpace}\\Controllers\\{ foldername}\\";
                 fileName = tableName + "Controller.cs";
                 //生成Partial web控制器
-                if (!File.Exists(path + "Partial\\" + fileName))
+                if (!FileHelper.FileExists(path + "Partial\\" + fileName))
                 {
                     domainContent = FileHelper.ReadFile("Template\\Controller\\ControllerPartial.html").Replace("{Namespace}", nameSpace).Replace("{TableName}", tableName).Replace("{BaseOptions}", baseOptions).Replace("{StartName}", StratName);
                     FileHelper.WriteFile(path + "Partial\\", tableName + "Controller.cs", domainContent);
@@ -976,11 +976,13 @@ 0 ELSE 1
 	            CASE
                         WHEN COLUMN_KEY <> '' THEN
                         1 ELSE 0
-                    END AS IsReadDataset
+                    END AS IsReadDataset,
+                ordinal_position
                 FROM
                     information_schema.COLUMNS
                 WHERE
-                    table_name = ?tableName {GetMysqlTableSchema()}";
+                    table_name = ?tableName {GetMysqlTableSchema()}
+               order by ordinal_position";
         }
 
         /// <summary>
@@ -1210,17 +1212,17 @@ private void SetMaxLength(List<Sys_TableColumn> columns)
         {
             columns.ForEach(x =>
             {
-                if (x.ColumnName == "DateTime")
+                if (x.ColumnType.ToLower() == "datetime")
                 {
                     x.ColumnWidth = 150;
                 }
-                else if (x.ColumnName == "Modifier" || x.ColumnName == "Creator")
+                else if (x.ColumnName.ToLower() == "modifier" || x.ColumnName.ToLower() == "creator")
                 {
-                    x.ColumnWidth = 130;
+                    x.ColumnWidth = 100;
                 }
-                else if (x.ColumnName == "CreateID" || x.ColumnName == "ModifyID")
+                else if (x.ColumnName.ToLower() == "modifyid" || x.ColumnName.ToLower() == "createid")
                 {
-                    x.ColumnWidth = 80;
+                    x.ColumnWidth = 100;
                 }
                 else if (x.Maxlength > 200)
                 {
@@ -1280,10 +1282,15 @@ private int InitTable(int parentId, string tableName, string columnCNName, strin
             {
                 columns[i].OrderNo = orderNo;
                 orderNo = orderNo - 50;
+                columns[i].EditRowNo = 0;
             }
 
             SetMaxLength(columns);
-            base.Add<Sys_TableColumn>(tableInfo, columns, false);
+            var result= base.Add<Sys_TableColumn>(tableInfo, columns, false);
+            if (!result.Status)
+            {
+                throw new Exception($"加载表结构写入异常：{result.Message}");
+            }
             return tableInfo.Table_Id;
         }
 
@@ -1763,7 +1770,7 @@ private string CreateEntityModel(List<Sys_TableColumn> sysColumn, Sys_TableInfo
             //  "\\" + modelNameSpace + "\\DomainModels\\{0}\\", folderName
             //  )
             string modelPath = $"{mapPath}\\{modelNameSpace}\\DomainModels\\{folderName}\\";
-            FileHelper.WriteFile(  modelPath  , tableName + ".cs",  domainContent);
+            FileHelper.WriteFile(modelPath, tableName + ".cs", domainContent);
             //partialContent
             modelPath += "partial\\";
             if (!FileHelper.FileExists(modelPath + tableName + ".cs"))

.Net6版本/VOL.Core/BaseProvider/IRepository.cs

@@ -1,7 +1,7 @@
-using Microsoft.EntityFrameworkCore.Query;
+using Microsoft.Data.SqlClient;
+using Microsoft.EntityFrameworkCore.Query;
 using System;
 using System.Collections.Generic;
-using System.Data.SqlClient;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Threading.Tasks;

.Net6版本/VOL.Core/BaseProvider/IService.cs

@@ -2,6 +2,7 @@
 using Microsoft.AspNetCore.Http;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Linq.Expressions;
 using VOL.Core.CacheManager;
 using VOL.Core.Utilities;
@@ -15,6 +16,14 @@ public interface IService<T> where T : BaseEntity
 
         ICacheService CacheContext { get; }
         Microsoft.AspNetCore.Http.HttpContext Context { get; }
+
+        /// <summary>
+        /// 前端查询条件转换为EF查询Queryable(2023.04.02)
+        /// </summary>
+        /// <param name="options">前端查询参数</param>
+        /// <param name="useTenancy">是否使用数据隔离</param>
+        /// <returns></returns>
+        IQueryable<T> GetPageDataQueryFilter(PageDataOptions options, bool useTenancy = true);
         /// <summary>
         /// 查询
         /// </summary>

.Net6版本/VOL.Core/BaseProvider/RepositoryBase.cs

@@ -1,10 +1,9 @@
-using Microsoft.EntityFrameworkCore;
+using Microsoft.Data.SqlClient;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.EntityFrameworkCore.Storage;
 using System;
 using System.Collections.Generic;
-using System.Data.Common;
-using System.Data.SqlClient;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Linq.Expressions;
@@ -414,8 +413,9 @@ public virtual WebResponseContent UpdateRange<Detail>(TEntity entity,
             string message = "";
             if (updateDetail)
             {
+                string detailTypeName = typeof(List<Detail>).FullName;
                 PropertyInfo[] properties = typeof(TEntity).GetProperties();
-                PropertyInfo detail = properties.Where(x => x.PropertyType.Name == "List`1").ToList().FirstOrDefault();
+                PropertyInfo detail = properties.Where(x => x.PropertyType.FullName == detailTypeName).ToList().FirstOrDefault();
                 if (detail != null)
                 {
                     PropertyInfo key = properties.GetKeyProperty();