release v2.3.8

release v2.3.8

Author: alienwow

demo/WalkingTec.Mvvm.Demo/Views/Home/FrontPage.cshtml

@@ -35,6 +35,10 @@
       </li>
       <li class="layui-nav-item" lay-unselect>
         <a href="javascript:;">
+          @if(Model.LoginUserInfo?.PhotoId != null)
+          {
+          <img class="layui-nav-img" src="api/_file/getfile/@Model.LoginUserInfo.PhotoId" />
+          }
           <cite>@Model.LoginUserInfo.Name</cite>
         </a>
         <dl class="layui-nav-child">

demo/WalkingTec.Mvvm.Demo/Views/Home/Layout.cshtml

@@ -93,15 +93,15 @@ protected override List<GridAction> InitGridAction()
       </tr>
       <tr>
         <td>GridActionParameterTypesEnum.MultiIds</td>
-        <td>按钮会获取勾选的多行数据的id调用新方法，比如批量修改，批量删除</td>
+        <td>按钮会获取勾选的多行数据的id调用新方法，比如批量修改，批量删除(注意MultiIds的时候框架会使用标记为[Post]的方法)</td>
       </tr>
       <tr>
         <td>GridActionParameterTypesEnum.SingleIdWithNull</td>
         <td>可以勾选一行，也可以不选</td>
       </tr>
       <tr>
         <td>GridActionParameterTypesEnum.MultiIdWithNull</td>
-        <td>可以勾选多行，也可以不选</td>
+        <td>可以勾选多行，也可以不选(注意MultiIds的时候框架会使用标记为[Post]的方法)</td>
       </tr>
       <tr>
         <td>GridActionParameterTypesEnum.AddRow</td>

doc/WalkingTec.Mvvm.Doc/Views/VM/ListAction.cshtml

@@ -160,7 +160,7 @@ protected virtual TModel GetById(object Id)
             }
 
             //获取数据
-            rv = query.CheckID(Id).SingleOrDefault();
+            rv = query.CheckID(Id).AsNoTracking().SingleOrDefault();
             if (rv == null)
             {
                 throw new Exception("数据不存在");

src/WalkingTec.Mvvm.Core/BaseCRUDVM.cs

@@ -36,12 +36,23 @@ public static List<Assembly> GetAllAssembly()
             var dir = new DirectoryInfo(Path.GetDirectoryName(path));
 
             var dlls = dir.GetFiles("*.dll", SearchOption.AllDirectories);
-            
+            string[] systemdll = new string[]
+            {
+                "Microsoft.",
+                "System.",
+                "Swashbuckle.",
+                "ICSharpCode",
+                "Newtonsoft.",
+                "Oracle.",
+                "Pomelo.",
+                "SQLitePCLRaw."
+            };
+
             foreach (var dll in dlls)
             {
                 try
                 {
-                    if (dll.Name.StartsWith("Microsoft.") == false)
+                    if (systemdll.Any(x => dll.Name.StartsWith(x)) == false)
                     {
                         rv.Add(AssemblyLoadContext.Default.LoadFromAssemblyPath(dll.FullName));
                     }

src/WalkingTec.Mvvm.Core/Utils.cs

@@ -350,6 +350,7 @@ private void SetReInit(ModelStateDictionary msd, BaseVM model)
         #endregion
 
         #region Validate model
+        [NonAction]
         public Dictionary<string, string> RedoValidation(object item)
         {
             Dictionary<string, string> rv = new Dictionary<string, string>();

src/WalkingTec.Mvvm.Mvc/BaseApiController.cs

@@ -535,6 +535,7 @@ private void SetReInit(ModelStateDictionary msd, BaseVM model)
         #endregion
 
         #region Validate model
+        [NonAction]
         public Dictionary<string,string> RedoValidation(object item)
         {
             Dictionary<string, string> rv = new Dictionary<string, string>();
@@ -559,6 +560,7 @@ public Dictionary<string,string> RedoValidation(object item)
         /// <param name="vm">ViewModel</param>
         /// <param name="prefix">prefix</param>
         /// <returns>true if success</returns>
+        [NonAction]
         public bool RedoUpdateModel(object vm, string prefix = null)
         {
             try

src/WalkingTec.Mvvm.Mvc/BaseController.cs

@@ -59,6 +59,7 @@ public static IServiceCollection AddFrameworkService(this IServiceCollection ser
                     var binPath = new FileInfo(binLocation).Directory?.FullName;
                     if (File.Exists(Path.Combine(binPath, "appsettings.json")))
                     {
+                        Directory.SetCurrentDirectory(binPath);
                         configBuilder.SetBasePath(binPath)
                             .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
                             .AddEnvironmentVariables();

src/WalkingTec.Mvvm.Mvc/Helper/FrameworkServiceExtension.cs

@@ -24,7 +24,7 @@ public static List<ComboSelectListItem> IconFontItems
 
         public static void GenerateIconFont()
         {
-            var baseDirs = new string[] { "/wwwroot/font", "/wwwroot/layui" };
+            var baseDirs = new string[] { "wwwroot/font", "wwwroot/layui" };
 
             var iconFontHashSet = new HashSet<string>();
             var IconFontDic = new Dictionary<string, string[]>();