prepare for 3.8.1

dotnetcore · Feb 27, 2021 · 648c36b · 648c36b
1 parent 24e4127
commit 648c36b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/WalkingTec.Mvvm.TagHelpers.LayUI/Form/SearchPanelTagHelper.cs b/src/WalkingTec.Mvvm.TagHelpers.LayUI/Form/SearchPanelTagHelper.cs
@@ -127,6 +127,11 @@ public override Task ProcessAsync(TagHelperContext context, TagHelperOutput outp
             {
                 show = GlobalServices.GetRequiredService<Configs>().UiOptions.SearchPanel.DefaultExpand;
             }
+            string showpage = "";
+            if (ListVM?.NeedPage == true)
+            {
+                showpage = ",page:{curr:1}";
+            }
             var layuiShow = show ? " layui-show" : string.Empty;
             output.PreContent.AppendHtml($@"
 <div class=""layui-collapse"" style=""margin-bottom:5px;"" lay-filter=""{tempSearchTitleId}x"">
@@ -163,7 +168,7 @@ public override Task ProcessAsync(TagHelperContext context, TagHelperOutput outp
     var tempwhere = {{}};
     $.extend(tempwhere,{GridId}defaultfilter.where);
       {GridId}filterback.where = tempwhere;
-  table.reload('{GridId}',{{url:{GridId}url,where: $.extend(tempwhere,ff.GetSearchFormData('{Id}','{Vm.Name}')),page:{{curr:1}}
+  table.reload('{GridId}',{{url:{GridId}url,where: $.extend(tempwhere,ff.GetSearchFormData('{Id}','{Vm.Name}')){showpage}
     //done: function(res,curr,count){{
     //  if(this.height == undefined){{
     //    var tab = $('#{GridId} + .layui-table-view');tab.css('overflow','hidden').addClass('donotuse_fill donotuse_pdiv');tab.children('.layui-table-box').addClass('donotuse_fill donotuse_pdiv').css('height','100px');tab.find('.layui-table-main').addClass('donotuse_fill');tab.find('.layui-table-header').css('min-height','40px');

diff --git a/version.props b/version.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>3.8.0</VersionPrefix>
+    <VersionPrefix>3.8.1</VersionPrefix>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">