fix export with default searcher value

dotnetcore · Feb 19, 2023 · f593176 · f593176
1 parent aa89193
commit f593176
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/demo/WalkingTec.Mvvm.Demo/Controllers/StudentController.cs b/demo/WalkingTec.Mvvm.Demo/Controllers/StudentController.cs
@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using System;
 using WalkingTec.Mvvm.Core;
@@ -17,6 +17,7 @@ public partial class StudentController : BaseController
         public ActionResult Index()
         {
             var vm = Wtm.CreateVM<StudentListVM>();
+            vm.Searcher.Sex = GenderEnum.Male;
             return PartialView(vm);
         }
 

diff --git a/demo/WalkingTec.Mvvm.Demo/Views/Student/Index.cshtml b/demo/WalkingTec.Mvvm.Demo/Views/Student/Index.cshtml
@@ -4,8 +4,8 @@
 <wt:searchpanel vm="@Model" reset-btn="true">
 <wt:row items-per-row="ItemsPerRowEnum.Three">
 <wt:textbox field="Searcher.Password" />
-<wt:combobox field="Searcher.Sex" empty-text="@Localizer["Sys.All"]" />
-<wt:textbox field="Searcher.ZipCode" />
+@*<wt:combobox field="Searcher.Sex" empty-text="@Localizer["Sys.All"]" />
+*@<wt:textbox field="Searcher.ZipCode" />
         <wt:datetime field="Searcher.Enroll" type="Year" />
 
 </wt:row>

diff --git a/src/WalkingTec.Mvvm.Mvc/framework_layui.js b/src/WalkingTec.Mvvm.Mvc/framework_layui.js
@@ -912,10 +912,16 @@ window.ff = {
     },
 
     DownloadExcelOrPdf: function (url, formId, defaultcondition, ids) {
+        debugger;
         var formData = ff.GetSearchFormData(formId);
         if (defaultcondition == null) {
             defaultcondition = {};
         }
+        for (let item in defaultcondition) {
+            if (item.startsWith("Searcher.") == false) {
+                defaultcondition["Searcher." + item] = defaultcondition[item];
+            }
+        }
         var tempwhere = {};
         $.extend(tempwhere, defaultcondition);