fix layui export bug

dotnetcore · Jul 14, 2024 · f759148 · f759148
1 parent 5bcff97
commit f759148
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 9 deletions.
diff --git a/...ingTec.Mvvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo.Shared/Pages/BasicData/City/Index.razor b/...ingTec.Mvvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo.Shared/Pages/BasicData/City/Index.razor
@@ -32,7 +32,7 @@
         }
         @if (IsAccessable("/api/City/BatchDelete"))
         {
-            <TableToolbarPopconfirmButton TItem="City_View" Color="Color.Primary"
+            <TableToolbarPopConfirmButton TItem="City_View" Color="Color.Primary"
                                           Icon="fa fa-fw fa-trash" Text="@WtmBlazor.Localizer["Sys.BatchDelete"]"
                                           OnConfirm="@OnBatchDeleteClick" Content="@WtmBlazor.Localizer["Sys.BatchDeleteConfirm"]" CloseButtonText="@WtmBlazor.Localizer["Sys.Close"]"
                                           ConfirmButtonText="@WtmBlazor.Localizer["Sys.BatchDelete"]" ConfirmButtonColor="Color.Danger" />

diff --git a/...gTec.Mvvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo.Shared/Pages/_Admin/ActionLog/Index.razor b/...gTec.Mvvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo.Shared/Pages/_Admin/ActionLog/Index.razor
@@ -35,7 +35,7 @@
     <TableToolbarTemplate>
         @if (IsAccessable("/api/_ActionLog/BatchDelete"))
         {
-            <TableToolbarPopconfirmButton TItem="ActionLog" Color="Color.Danger"
+            <TableToolbarPopConfirmButton TItem="ActionLog" Color="Color.Danger"
                                       Icon="fa fa-fw fa-trash" Text="@WtmBlazor.Localizer["Sys.Delete"]"
                                           OnConfirm="@OnBatchDeleteClick" Content="@WtmBlazor.Localizer["Sys.BatchDeleteConfirm"]" CloseButtonText="@WtmBlazor.Localizer["Sys.Close"]"
                                           ConfirmButtonText="@WtmBlazor.Localizer["Sys.BatchDelete"]" ConfirmButtonColor="Color.Danger" />

diff --git a/...Mvvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo.Shared/Pages/_Admin/FrameworkGroup/Index.razor b/...Mvvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo.Shared/Pages/_Admin/FrameworkGroup/Index.razor
@@ -30,7 +30,7 @@
         }
         @if (IsAccessable("/api/_FrameworkGroup/BatchDelete")&& UserInfo.Attributes["IsMainHost"].ToString() == "False")
         {
-            <TableToolbarPopconfirmButton TItem="FrameworkGroup_View" Color="Color.Danger"
+            <TableToolbarPopConfirmButton TItem="FrameworkGroup_View" Color="Color.Danger"
                                       Icon="fa fa-fw fa-trash" Text="@WtmBlazor.Localizer["Sys.Delete"]"
                                           OnConfirm="@OnBatchDeleteClick" Content="@WtmBlazor.Localizer["Sys.BatchDeleteConfirm"]" CloseButtonText="@WtmBlazor.Localizer["Sys.Close"]"
                                           ConfirmButtonText="@WtmBlazor.Localizer["Sys.BatchDelete"]" ConfirmButtonColor="Color.Danger" />

diff --git a/....Mvvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo.Shared/Pages/_Admin/FrameworkMenu/Index.razor b/....Mvvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo.Shared/Pages/_Admin/FrameworkMenu/Index.razor
@@ -27,7 +27,7 @@
         }
         @if (IsAccessable("/api/_frameworkmenu/BatchDelete"))
         {
-            <TableToolbarPopconfirmButton TItem="FrameworkMenu_ListView" Color="Color.Danger"
+            <TableToolbarPopConfirmButton TItem="FrameworkMenu_ListView" Color="Color.Danger"
                                       Icon="fa fa-fw fa-trash" Text="@WtmBlazor.Localizer["Sys.Delete"]"
                                           OnConfirm="@OnBatchDeleteClick" Content="@WtmBlazor.Localizer["Sys.BatchDeleteConfirm"]" CloseButtonText="@WtmBlazor.Localizer["Sys.Close"]"
                                           ConfirmButtonText="@WtmBlazor.Localizer["Sys.BatchDelete"]" ConfirmButtonColor="Color.Danger" />

diff --git a/....Mvvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo.Shared/Pages/_Admin/FrameworkRole/Index.razor b/....Mvvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo.Shared/Pages/_Admin/FrameworkRole/Index.razor
@@ -29,7 +29,7 @@
         }
         @if (IsAccessable("/api/_FrameworkRole/BatchDelete")&& UserInfo.Attributes["IsMainHost"].ToString() == "False")
         {
-            <TableToolbarPopconfirmButton TItem="FrameworkRole" Color="Color.Danger"
+            <TableToolbarPopConfirmButton TItem="FrameworkRole" Color="Color.Danger"
                                       Icon="fa fa-fw fa-trash" Text="@WtmBlazor.Localizer["Sys.Delete"]"
                                           OnConfirm="@OnBatchDeleteClick" Content="@WtmBlazor.Localizer["Sys.BatchDeleteConfirm"]" CloseButtonText="@WtmBlazor.Localizer["Sys.Close"]"
                                           ConfirmButtonText="@WtmBlazor.Localizer["Sys.BatchDelete"]" ConfirmButtonColor="Color.Danger" />

diff --git a/...vvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo.Shared/Pages/_Admin/FrameworkTenant/Index.razor b/...vvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo.Shared/Pages/_Admin/FrameworkTenant/Index.razor
@@ -33,7 +33,7 @@
             }
             @if (IsAccessable("/api/_FrameworkTenant/BatchDelete"))
             {
-                <TableToolbarPopconfirmButton TItem="FrameworkTenant_View" Color="Color.Danger"
+                <TableToolbarPopConfirmButton TItem="FrameworkTenant_View" Color="Color.Danger"
                                       Icon="fa fa-fw fa-trash" Text="@WtmBlazor.Localizer["Sys.Delete"]"
                                       OnConfirm="@OnBatchDeleteClick" Content="@WtmBlazor.Localizer["Sys.BatchDeleteConfirm"]" CloseButtonText="@WtmBlazor.Localizer["Sys.Close"]"
                                       ConfirmButtonText="@WtmBlazor.Localizer["Sys.BatchDelete"]" ConfirmButtonColor="Color.Danger" />

diff --git a/....Mvvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo.Shared/Pages/_Admin/FrameworkUser/Index.razor b/....Mvvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo.Shared/Pages/_Admin/FrameworkUser/Index.razor
@@ -38,7 +38,7 @@
             }
             @if (IsAccessable("/api/_frameworkuser/BatchDelete"))
             {
-                <TableToolbarPopconfirmButton TItem="FrameworkUser_View" Color="Color.Danger"
+                <TableToolbarPopConfirmButton TItem="FrameworkUser_View" Color="Color.Danger"
                                           Icon="fa fa-fw fa-trash" Text="@WtmBlazor.Localizer["Sys.Delete"]"
                                           OnConfirm="@OnBatchDeleteClick" Content="@WtmBlazor.Localizer["Sys.BatchDeleteConfirm"]" CloseButtonText="@WtmBlazor.Localizer["Sys.Close"]"
                                           ConfirmButtonText="@WtmBlazor.Localizer["Sys.BatchDelete"]" ConfirmButtonColor="Color.Danger" />

diff --git a/src/WalkingTec.Mvvm.Mvc/GeneratorFiles/Spa/Blazor/Index.txt b/src/WalkingTec.Mvvm.Mvc/GeneratorFiles/Spa/Blazor/Index.txt
@@ -25,7 +25,7 @@ $columns$
         }
         @if (IsAccessable("/api/$modelname$/BatchDelete"))
         {
-            <TableToolbarPopconfirmButton TItem="$modelname$_View" Color="Color.Primary"
+            <TableToolbarPopConfirmButton TItem="$modelname$_View" Color="Color.Primary"
                                           Icon="fa fa-fw fa-trash" Text="@WtmBlazor.Localizer["Sys.BatchDelete"]"
                                           OnConfirm="@OnBatchDeleteClick" Content="@WtmBlazor.Localizer["Sys.BatchDeleteConfirm"]" CloseButtonText="@WtmBlazor.Localizer["Sys.Close"]"
                                           ConfirmButtonText="@WtmBlazor.Localizer["Sys.BatchDelete"]" ConfirmButtonColor="Color.Danger" />

diff --git a/src/WalkingTec.Mvvm.Mvc/framework_layui.js b/src/WalkingTec.Mvvm.Mvc/framework_layui.js
@@ -967,7 +967,14 @@ window.ff = {
             defaultcondition = {};
         }
         var tempwhere = {};
-        $.extend(tempwhere, defaultcondition);
+        for (let item in defaultcondition) {
+            if (formData["Searcher." + item]) {
+
+            }
+            else {
+                tempwhere[item] = defaultcondition[item]
+            }
+        }
         $.extend(tempwhere, formData);
        for (let item in tempwhere) {
             if (item.startsWith("Searcher.") == false) {