Merge pull request #15 from cq-panda/master

sync

Author: kevin100702

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

@@ -1063,7 +1063,7 @@ 0 ELSE 1
                     120 AS ColumnWidth,
                     0 AS OrderNo,
                 CASE
-                        WHEN IS_NULLABLE = 'N' THEN
+                        WHEN IS_NULLABLE = 'N' or IS_NULLABLE = 'NO' THEN
                         0 ELSE 1
                     END AS IsNull,
 	            CASE

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

@@ -317,19 +317,17 @@ public virtual PageGridData<T> GetPageData(PageDataOptions options)
             }
             else
             {
+                //查询界面统计求等字段
+                if (SummaryExpress != null)
+                {
+                    pageGridData.summary = SummaryExpress.Invoke(queryable);
+                }
                 pageGridData.rows = repository.IQueryablePage(queryable,
                                     options.Page,
                                     options.Rows,
                                     out int rowCount,
                                     orderbyDic).ToList();
                 pageGridData.total = rowCount;
-                //查询界面统计求等字段
-                if (SummaryExpress != null)
-                {
-                    pageGridData.summary = SummaryExpress.Invoke(queryable);
-                    //Func<T, T> groupExpress = x =>x;
-                    //pageGridData.summary = queryable.GroupBy(groupExpress).Select(SummaryExpress).FirstOrDefault();
-                }
             }
             GetPageDataOnExecuted?.Invoke(pageGridData);
             return pageGridData;

.Net6版本/VOL.Core/Utilities/EPPlusHelper.cs

@@ -2,6 +2,7 @@
 using OfficeOpenXml.Style;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.Data;
 using System.Drawing;
 using System.IO;
@@ -443,6 +444,7 @@ public static string Export<T>(List<T> list, IEnumerable<string> exportColumns,
                     }
                     else
                     {
+                        columnName = propertyInfo[i].GetTypeCustomValue<DisplayAttribute>(x => x.Name) ?? columnName;
                         worksheet.Column(i + 1).Width = 15;
                         worksheet.Cells[1, i + 1].Value = columnName;
                     }

.Net6版本/VOL.WebApi/Template/Page/VueExtension.html

@@ -16,6 +16,7 @@
     //新建、编辑弹出框扩展组件
     modelHeader: '',
     modelBody: '',
+	modelRight: '',
     modelFooter: ''
   },
   tableAction: '', //指定某张表的权限(这里填写表名,默认不用填写)

01.框架文件结构说明(必看).txt

@@ -1,5 +1,5 @@
 
-前端【Vol.Vue3版本】文件夹才有示例页面(Vol.Vue3.Vite里没有示例页面，打开页面会出现404)，  开发请使用Vol.Vue3.Vite前端项目
+前端【Vol.Vue3版本】文件夹下才有演示页面代码(Vol.Vue3.Vite里没有示例页面，打开页面会出现404)，  开发请使用Vol.Vue3.Vite前端项目，示例代码用Vol.Vue3版本或者看文档上
 
 1、.Net6版本                       后台api项目，使用的.Net6+EFCore6+Dapper
 

Net6.SqlSugar/VOL.Core/Extensions/LambdaExtensions.cs

@@ -389,7 +389,7 @@ public static Expression<Func<T, bool>> And<T>(List<ExpressionParameters> listEx
         /// <returns></returns>
         public static Expression<Func<T, bool>> Or<T>(this List<ExpressionParameters> listExpress)
         {
-            return listExpress.Compose<T>(Expression.Or);
+            return listExpress.Compose<T>(Expression.OrElse);
         }
         private static Expression<Func<T, bool>> Compose<T>(this List<ExpressionParameters> listExpress, Func<Expression, Expression, Expression> merge)
         {
@@ -423,7 +423,7 @@ public static Expression<Func<T, bool>> And<T>(this Expression<Func<T, bool>> fi
         }
         public static Expression<Func<T, bool>> Or<T>(this Expression<Func<T, bool>> first, Expression<Func<T, bool>> second)
         {
-            return first.Compose(second, Expression.Or);
+            return first.Compose(second, Expression.OrElse);
         }
         public static Expression<T> Compose<T>(this Expression<T> first, Expression<T> second, Func<Expression, Expression, Expression> merge)
         {

Net6.SqlSugar/VOL.Core/Utilities/EPPlusHelper.cs

@@ -2,6 +2,7 @@
 using OfficeOpenXml.Style;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.Data;
 using System.Drawing;
 using System.IO;
@@ -434,6 +435,7 @@ public static string Export<T>(List<T> list, IEnumerable<string> exportColumns,
                     }
                     else
                     {
+                        columnName = propertyInfo[i].GetTypeCustomValue<DisplayAttribute>(x => x.Name) ?? columnName;
                         worksheet.Column(i + 1).Width = 15;
                         worksheet.Cells[1, i + 1].Value = columnName;
                     }

Net6.SqlSugar/VOL.Core/WorkFlow/WorkFlowManager.cs

@@ -508,6 +508,7 @@ public static WebResponseContent Audit<T>(T entity, AuditStatus status, string r
                     //query.Update(entity);
                     //修改状态
                     dbContext.Update(workFlow);
+                   
                     dbContext.UpdateRange(workFlow.Sys_WorkFlowTableStep);
                     dbContext.SaveChanges();
                     //发送邮件(appsettings.json配置文件里添加邮件信息)
@@ -562,6 +563,7 @@ public static WebResponseContent Audit<T>(T entity, AuditStatus status, string r
 
                 autditProperty.SetValue(entity, (int)status);
                 dbContext.Update(workFlow);
+                dbContext.Update(currentStep);
                 dbContext.Update(entity);
                 dbContext.Add(log);
                 dbContext.SaveChanges();

Net6.SqlSugar/VOL.WebApi/Template/Page/VueExtension.html

@@ -16,6 +16,7 @@
     //新建、编辑弹出框扩展组件
     modelHeader: '',
     modelBody: '',
+	modelRight: '',
     modelFooter: ''
   },
   tableAction: '', //指定某张表的权限(这里填写表名,默认不用填写)

README.md

@@ -34,7 +34,7 @@
 #### 框架文档
 vue3版本: [http://v2.volcore.xyz/document/guide](http://v2.volcore.xyz/document/guide) <br> 
 vue3版本: [http://www.volcore.xyz](http://www.volcore.xyz) <br> 
-演示地址2: [http://120.48.115.252:9990/](http://120.48.115.252:9990/) <br> 
+演示地址2: [http://demo.volcore.xy/](http://demo.volcore.xy/) <br> 
 App、H5、微信小程序: [http://v2.volcore.xyz/app/guide](http://v2.volcore.xyz/app/guide) <br> 
 
 #### 2023.10增加sqlsugar适配