From 01bcdaae2d62bf5198d8296f000c503541fa41aa Mon Sep 17 00:00:00 2001
From: "2248356998 qq.com" <2248356998@qq.com>
Date: Mon, 10 Jul 2023 13:18:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DAppDataTable=E6=B8=85?=
 =?UTF-8?q?=E7=A9=BAMForm=E6=A8=A1=E5=9E=8B=E5=AF=BC=E8=87=B4=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E5=88=97=E6=B8=85=E7=A9=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Components/DataTable/AppDataTable.razor   | 107 ++++++++----------
 1 file changed, 50 insertions(+), 57 deletions(-)

diff --git a/src/ThingsGateway.Web.Rcl.Core/Components/DataTable/AppDataTable.razor b/src/ThingsGateway.Web.Rcl.Core/Components/DataTable/AppDataTable.razor
index 67d963c12..2f19fee77 100644
--- a/src/ThingsGateway.Web.Rcl.Core/Components/DataTable/AppDataTable.razor
+++ b/src/ThingsGateway.Web.Rcl.Core/Components/DataTable/AppDataTable.razor
@@ -96,54 +96,57 @@
     @if (IsShowToolbar)
     {
         <MSheet Class="ma-2">
-            <MForm Model="SearchModel" EnableValidation EnableI18n @ref="SearchForm">
-                <MCard Outlined Elevation="0" @onkeydown=Enter>
-                    <MRow Class="py-2 px-2" NoGutters Align="AlignTypes.Start">
-                        @if (SearchTemplate is not null)
-                        {
-                            @SearchTemplate(SearchModel)
-                        }
-                        @if (IsShowSearchKey)
-                        {
-                            <MTextField Dense Style="max-width:200px;" HideDetails=@("auto") Class="mx-2 my-1" @bind-Value="SearchModel.SearchKey"
-                                        Outlined Label=@SearchModel.Description(x => x.SearchKey) />
-                        }
-                        @if (ShowQueryButton)
-                        {
-                            @if (IsShowClearSearch)
-                            {
-                                <MButton Color="info" Class="mx-2 my-1" OnClick=ClearClick>@T("清空搜索")</MButton>
-                            }
-                            <MButton Color="info" Class="mx-2 my-1" Loading="QueryLoading" OnClick=QueryClickAsync>@T("查询")</MButton>
-                        }
-                        @if (ShowAddButton)
-                        {
-                            <MButton Color="info" Class="mx-2 my-1" OnClick=@(AddClick)>@T("添加")</MButton>
-                        }
-                        @if (ShowEditButton)
-                        {
-                            <MButton Color="info" Class="mx-2 my-1" OnClick=@(()=>EditClick(selectedItem?.ToArray()))>@T("修改")</MButton>
-                        }
-                        @if (ShowDeleteButton)
-                        {
-                            <MButton Color="error" Loading="DeleteLoading" Class="mx-2 my-1" OnClick=@(()=>DeleteClick(selectedItem?.ToArray()))>@T("删除")</MButton>
-                        }
-                        @if (OtherToolbarTemplate != null)
-                        {
-                            @OtherToolbarTemplate(selectedItem)
-                        }
-                        @if (ShowFilter)
-                        {
-                            <div class="ml-auto mr-2 my-1">
-                                <TableFilter FilterHeaderString="FilterHeaderString"
-                                             ValueChanged="FilterChanged">
-                                </TableFilter>
-                            </div>
-                        }
-                    </MRow>
+            <MCard Outlined Elevation="0" @onkeydown=Enter>
 
-                </MCard>
-            </MForm>
+                <MRow Class="py-2 px-2" NoGutters Align="AlignTypes.Start">
+                    <MForm Model="SearchModel" EnableValidation EnableI18n @ref="SearchForm">
+                        <MRow NoGutters Align="AlignTypes.Start">
+                            @if (SearchTemplate is not null)
+                            {
+                                @SearchTemplate(SearchModel)
+                            }
+                        </MRow>
+                    </MForm>
+                    @if (IsShowSearchKey)
+                    {
+                        <MTextField Dense Style="max-width:200px;" HideDetails=@("auto") Class="mx-2 my-1" @bind-Value="SearchModel.SearchKey"
+                                    Outlined Label=@SearchModel.Description(x => x.SearchKey) />
+                    }
+                    @if (ShowQueryButton)
+                    {
+                        @if (IsShowClearSearch)
+                        {
+                            <MButton Color="info" Class="mx-2 my-1" OnClick=ClearClick>@T("清空搜索")</MButton>
+                        }
+                        <MButton Color="info" Class="mx-2 my-1" Loading="QueryLoading" OnClick=QueryClickAsync>@T("查询")</MButton>
+                    }
+                    @if (ShowAddButton)
+                    {
+                        <MButton Color="info" Class="mx-2 my-1" OnClick=@(AddClick)>@T("添加")</MButton>
+                    }
+                    @if (ShowEditButton)
+                    {
+                        <MButton Color="info" Class="mx-2 my-1" OnClick=@(()=>EditClick(selectedItem?.ToArray()))>@T("修改")</MButton>
+                    }
+                    @if (ShowDeleteButton)
+                    {
+                        <MButton Color="error" Loading="DeleteLoading" Class="mx-2 my-1" OnClick=@(()=>DeleteClick(selectedItem?.ToArray()))>@T("删除")</MButton>
+                    }
+                    @if (OtherToolbarTemplate != null)
+                    {
+                        @OtherToolbarTemplate(selectedItem)
+                    }
+                    @if (ShowFilter)
+                    {
+                        <div class="ml-auto mr-2 my-1">
+                            <TableFilter FilterHeaderString="FilterHeaderString"
+                                         ValueChanged="FilterChanged">
+                            </TableFilter>
+                        </div>
+                    }
+                </MRow>
+
+            </MCard>
 
         </MSheet>
 
@@ -305,16 +308,6 @@
                 <MTextField Dense Style="max-width:150px" HideDetails=@("auto") Class="px-1 py-1" @bind-Value="SearchModel.Current"
                                 NumberProps=@(prop=> { prop.Min = 1; prop.Step = 1; }) TValue=int Type="number" Outlined Label=@T("页面跳转") />
 
-                    @*                    <MSelect Class="px-1 py-1" Items=@(ObjectExtensions.GetOrderNum( PageItems.Pages))
-                @bind-Value=@(SearchModel.Current)
-                MenuProps="@(props => { props.Top = true; props.OffsetY = true; })"
-                ItemText=@((u) =>{return T("第 {0} 页",u);})
-                ItemValue=@(u => u)
-                HideDetails="true" Height="30"
-                Dense Style="max-width:150px"
-                Outlined>
-                </MSelect>*@
-
 
                     <MPagination Class="ml-auto mr-1 py-1" Length="PageItems.Pages"
                     @bind-Value="SearchModel.Current"