From f759148e9f5788100f6fd70e0c04a0cd32167912 Mon Sep 17 00:00:00 2001
From: liuliang <liuliang79@live.com>
Date: Sun, 14 Jul 2024 23:59:48 +0800
Subject: [PATCH] fix layui export bug

---
 .../Pages/BasicData/City/Index.razor                     | 2 +-
 .../Pages/_Admin/ActionLog/Index.razor                   | 2 +-
 .../Pages/_Admin/FrameworkGroup/Index.razor              | 2 +-
 .../Pages/_Admin/FrameworkMenu/Index.razor               | 2 +-
 .../Pages/_Admin/FrameworkRole/Index.razor               | 2 +-
 .../Pages/_Admin/FrameworkTenant/Index.razor             | 2 +-
 .../Pages/_Admin/FrameworkUser/Index.razor               | 2 +-
 .../GeneratorFiles/Spa/Blazor/Index.txt                  | 2 +-
 src/WalkingTec.Mvvm.Mvc/framework_layui.js               | 9 ++++++++-
 9 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/demo/WalkingTec.Mvvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo.Shared/Pages/BasicData/City/Index.razor b/demo/WalkingTec.Mvvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo.Shared/Pages/BasicData/City/Index.razor
index 2fe7b491c..f6219633b 100644
--- a/demo/WalkingTec.Mvvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo.Shared/Pages/BasicData/City/Index.razor
+++ b/demo/WalkingTec.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/demo/WalkingTec.Mvvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo.Shared/Pages/_Admin/ActionLog/Index.razor b/demo/WalkingTec.Mvvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo.Shared/Pages/_Admin/ActionLog/Index.razor
index 688d0c896..2f53cf3a1 100644
--- a/demo/WalkingTec.Mvvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo.Shared/Pages/_Admin/ActionLog/Index.razor
+++ b/demo/WalkingTec.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/demo/WalkingTec.Mvvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo.Shared/Pages/_Admin/FrameworkGroup/Index.razor b/demo/WalkingTec.Mvvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo.Shared/Pages/_Admin/FrameworkGroup/Index.razor
index b0d702491..6d5d5b664 100644
--- a/demo/WalkingTec.Mvvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo.Shared/Pages/_Admin/FrameworkGroup/Index.razor
+++ b/demo/WalkingTec.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/demo/WalkingTec.Mvvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo.Shared/Pages/_Admin/FrameworkMenu/Index.razor b/demo/WalkingTec.Mvvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo.Shared/Pages/_Admin/FrameworkMenu/Index.razor
index a97f05862..c3e590372 100644
--- a/demo/WalkingTec.Mvvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo.Shared/Pages/_Admin/FrameworkMenu/Index.razor
+++ b/demo/WalkingTec.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/demo/WalkingTec.Mvvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo.Shared/Pages/_Admin/FrameworkRole/Index.razor b/demo/WalkingTec.Mvvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo.Shared/Pages/_Admin/FrameworkRole/Index.razor
index 75aa0ca04..df590665c 100644
--- a/demo/WalkingTec.Mvvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo.Shared/Pages/_Admin/FrameworkRole/Index.razor
+++ b/demo/WalkingTec.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/demo/WalkingTec.Mvvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo.Shared/Pages/_Admin/FrameworkTenant/Index.razor b/demo/WalkingTec.Mvvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo.Shared/Pages/_Admin/FrameworkTenant/Index.razor
index 3ab74595a..be58910bc 100644
--- a/demo/WalkingTec.Mvvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo.Shared/Pages/_Admin/FrameworkTenant/Index.razor
+++ b/demo/WalkingTec.Mvvm.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/demo/WalkingTec.Mvvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo.Shared/Pages/_Admin/FrameworkUser/Index.razor b/demo/WalkingTec.Mvvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo.Shared/Pages/_Admin/FrameworkUser/Index.razor
index fac6ae6eb..e53f966bb 100644
--- a/demo/WalkingTec.Mvvm.BlazorDemo/WalkingTec.Mvvm.BlazorDemo.Shared/Pages/_Admin/FrameworkUser/Index.razor
+++ b/demo/WalkingTec.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
index 295d0e3f3..31c98a24c 100644
--- 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
index 277a8b2be..df26745f7 100644
--- 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) {