页面展示优化。

NerosoftDev · Jan 28, 2024 · 682448b · 682448b
1 parent f523130
commit 682448b
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 42 deletions.
diff --git a/Source/Starfish.Webapp/Layout/MainLayout.razor b/Source/Starfish.Webapp/Layout/MainLayout.razor
@@ -78,7 +78,7 @@
             <span>Nerosoft © @(DateTime.Today.Year). All rights reserved.</span>
         </div>
         <div class="link2">
-            <a href="javascript:void(0);" @onclick="@OnLogoutClicked">@(Resources.IDS_COMMON_LOGOUT)</a>
+            <span>@(Identity?.Username)</span>&emsp;<a href="javascript:void(0);" @onclick="@OnLogoutClicked">@(Resources.IDS_COMMON_LOGOUT)</a>
         </div>
     </FluentFooter>
 

diff --git a/Source/Starfish.Webapp/Pages/Apps/Index.razor b/Source/Starfish.Webapp/Pages/Apps/Index.razor
@@ -16,11 +16,11 @@
         <FluentGridItem lg="12" sm="12" md="12">
             <div class="search-bar">
                 <FluentSearch Placeholder="@(Resources.IDS_COMMON_PLACEHOLDER_KEYWORD)"
-                              @bind-Value="Criteria.Keyword" />
+                              @bind-Value="Criteria.Keyword"/>
                 <FluentButton IconStart="@(new Icons.Regular.Size16.Search())" OnClick="@OnSearchClicked">
                     @(Resources.IDS_COMMON_SEARCH)
                 </FluentButton>
-                <FluentSpacer />
+                <FluentSpacer/>
                 <FluentButton IconStart="@(new Icons.Regular.Size16.Add())" Appearance="Appearance.Accent"
                               OnClick="@(() => OnEditButtonClicked(0))">
                     @(Resources.IDS_APPS_INDEX_BUTTON_ADD)
@@ -29,37 +29,37 @@
         </FluentGridItem>
         <FluentGridItem lg="12" sm="12" md="12">
             <FluentDataGrid ItemsProvider="_provider" Pagination="Pagination" ItemSize="46"
-                            GenerateHeader="GenerateHeaderOption.Sticky" TGridItem="AppInfoItemDto">
-                <PropertyColumn Class="data-grid-column" Title="@(Resources.IDS_COMMON_COLUMN_ID)"
-                                Property="@(c => c.Id)" />
+                            GenerateHeader="GenerateHeaderOption.Sticky"
+                            TGridItem="AppInfoItemDto"
+                            GridTemplateColumns="0.5fr 0.5fr 0.5fr 0.4fr 0.2fr 0.5fr">
                 <TemplateColumn Title="@(Resources.IDS_APPS_INDEX_COLUMN_NAME)" Align="@Align.Start">
                     <FluentButton Appearance="Appearance.Lightweight" OnClick="@(() => OnGotoConfigurationClicked(context.Id))">
                         @(context.Name)
                     </FluentButton>
                 </TemplateColumn>
                 <PropertyColumn Class="data-grid-column" Title="@(Resources.IDS_APPS_INDEX_COLUMN_CODE)"
-                                Property="@(c => c.Code)" />
+                                Property="@(c => c.Code)"/>
                 <PropertyColumn Class="data-grid-column" Title="@(Resources.IDS_APPS_INDEX_COLUMN_TEAM)"
-                                Property="@(c => c.TeamName)" />
+                                Property="@(c => c.TeamName)"/>
                 <PropertyColumn Class="data-grid-column" Title="@(Resources.IDS_COMMON_COLUMN_UPDATE_TIME)"
-                                Property="@(c => c.UpdateTime)" Format="yyyy-MM-dd HH:mm:ss" />
+                                Property="@(c => c.UpdateTime)" Format="yyyy-MM-dd HH:mm:ss"/>
                 <TemplateColumn Title="@(Resources.IDS_APPS_INDEX_COLUMN_STATUS)" Align="@Align.Start">
-                    <FluentSwitch Value="@(context.Status == "Enabled")" ValueChanged="@(value => OnStatusChanged(context, value))" />
+                    <FluentSwitch Value="@(context.Status == "Enabled")" ValueChanged="@(value => OnStatusChanged(context, value))"/>
                 </TemplateColumn>
                 <TemplateColumn Title="@(Resources.IDS_COMMON_COLUMN_ACTIONS)" Align="@Align.Center">
                     <FluentButton IconEnd="@(new Icons.Regular.Size16.PreviewLink())"
-                                  OnClick="@(() => OnDetailButtonClicked(context.Id))" />
+                                  OnClick="@(() => OnDetailButtonClicked(context.Id))"/>
                     <FluentButton IconEnd="@(new Icons.Regular.Size16.Edit())"
-                                  OnClick="@(() => OnEditButtonClicked(context.Id))" />
+                                  OnClick="@(() => OnEditButtonClicked(context.Id))"/>
                     <FluentButton IconEnd="@(new Icons.Regular.Size16.LockClosedKey())"
-                                  OnClick="@(() => OnResetSecretClicked(context.Id))" />
+                                  OnClick="@(() => OnResetSecretClicked(context.Id))"/>
                     <FluentButton IconEnd="@(new Icons.Regular.Size16.Delete())"
-                                  OnClick="@(() => OnDeleteButtonClicked(context.Id, context.Name))" />
+                                  OnClick="@(() => OnDeleteButtonClicked(context.Id, context.Name))"/>
                 </TemplateColumn>
             </FluentDataGrid>
         </FluentGridItem>
         <FluentGridItem lg="12" sm="12" md="12">
-            <FluentDataGridPaginator State="@Pagination" />
+            <FluentDataGridPaginator State="@Pagination"/>
         </FluentGridItem>
     </FluentGrid>
 </FluentCard>
@@ -89,10 +89,10 @@
         {
             List<AppInfoItemDto> items = null;
             var tasks = new List<Task>
-                {
+            {
                 Api.QueryAsync(Criteria, request.StartIndex, Pagination.ItemsPerPage, request.CancellationToken)
-                   .EnsureSuccess(result=> items = result,request.CancellationToken)
-                };
+                   .EnsureSuccess(result => items = result, request.CancellationToken)
+            };
 
             if (request.StartIndex == 0)
             {
@@ -162,4 +162,5 @@
             exception.Send();
         }
     }
+
 }
diff --git a/Source/Starfish.Webapp/Pages/Config/Index.razor b/Source/Starfish.Webapp/Pages/Config/Index.razor
@@ -32,7 +32,10 @@
                     </div>
                 </FluentGridItem>
                 <FluentGridItem lg="12" sm="12" md="12">
-                    <FluentDataGrid ItemsProvider="_provider" Pagination="Pagination" ItemSize="46" GenerateHeader="GenerateHeaderOption.Sticky" TGridItem="ConfigurationItemDto">
+                    <FluentDataGrid ItemsProvider="_provider" Pagination="Pagination" ItemSize="46"
+                                    GenerateHeader="GenerateHeaderOption.Sticky"
+                                    TGridItem="ConfigurationItemDto"
+                                    GridTemplateColumns="1fr 1fr 0.2fr">
                         <PropertyColumn Class="data-grid-column" Title="@(Resources.IDS_CONFIG_INDEX_COLUMN_KEY)" Property="@(c => c.Key)"/>
                         <PropertyColumn Class="data-grid-column" Title="@(Resources.IDS_CONFIG_INDEX_COLUMN_VALUE)" Property="@(c => c.Value)"/>
                         <TemplateColumn Title="@(Resources.IDS_COMMON_COLUMN_ACTIONS)" Align="@Align.Center">
@@ -124,14 +127,14 @@
             var tasks = new List<Task>
             {
                 ConfigurationApi.GetItemListAsync(Id, Environment, request.StartIndex, Pagination.ItemsPerPage, request.CancellationToken)
-                          .EnsureSuccess(result => items = result, request.CancellationToken)
+                                .EnsureSuccess(result => items = result, request.CancellationToken)
             };
 
             if (request.StartIndex == 0)
             {
                 tasks.Add(
                     ConfigurationApi.GetItemCountAsync(Id, Environment, request.CancellationToken)
-                              .EnsureSuccess(result => Total = result, request.CancellationToken)
+                                    .EnsureSuccess(result => Total = result, request.CancellationToken)
                 );
             }
 
@@ -155,8 +158,8 @@
     private Task LoadConfigurationDetailAsync(CancellationToken cancellationToken = default)
     {
         return ConfigurationApi.GetAsync(Id, Environment, cancellationToken)
-                         .EnsureSuccess(result => ConfigurationDetail = result, cancellationToken)
-                         .Guard();
+                               .EnsureSuccess(result => ConfigurationDetail = result, cancellationToken)
+                               .Guard();
     }
 
     private Task LoadAppDetailAsync()
@@ -252,7 +255,7 @@
             try
             {
                 await ConfigurationApi.DeleteAsync(Id, Environment)
-                                .EnsureSuccess();
+                                      .EnsureSuccess();
                 await Pagination.SetCurrentPageIndexAsync(0);
                 StateHasChanged();
             }

diff --git a/Source/Starfish.Webapp/Pages/Logging/Detail.razor b/Source/Starfish.Webapp/Pages/Logging/Detail.razor
@@ -11,12 +11,6 @@
 
 <FluentDialogBody>
     <FluentStack Orientation="Orientation.Vertical">
-        <FluentTextField Style="width: 100%"
-                         Label="@(Resources.IDS_LOGS_DETAIL_LABEL_MODULE)"
-                         Value="@Content.Module" ReadOnly="true"/>
-        <FluentTextField Style="width: 100%"
-                         Label="@(Resources.IDS_LOGS_DETAIL_LABEL_TYPE)"
-                         Value="@Content.Type" ReadOnly="true"/>
         <FluentTextField Style="width: 100%"
                          Label="@(Resources.IDS_LOGS_DETAIL_LABEL_USER_NAME)"
                          Value="@(Content.UserName ?? "--")" ReadOnly="true"/>

diff --git a/Source/Starfish.Webapp/Pages/Logging/Index.razor b/Source/Starfish.Webapp/Pages/Logging/Index.razor
@@ -26,8 +26,7 @@
                             ItemSize="46"
                             GenerateHeader="GenerateHeaderOption.Sticky"
                             TGridItem="OperateLogDto"
-                            GridTemplateColumns="0.2fr 1fr 0.8fr 0.2fr 0.4fr 0.2fr">
-                <PropertyColumn Class="data-grid-column" Title="@(Resources.IDS_LOGS_INDEX_COLUMN_TYPE)" Property="@(c => c.Type)" />
+                            GridTemplateColumns="1fr 0.8fr 0.2fr 0.4fr 0.2fr">
                 <PropertyColumn Class="data-grid-column" Title="@(Resources.IDS_LOGS_INDEX_COLUMN_DESCRIPTION)" Property="@(c => c.Description)" Tooltip="true" />
                 <PropertyColumn Class="data-grid-column" Title="@(Resources.IDS_LOGS_INDEX_COLUMN_ERROR)" Property="@(c => c.Error)" Tooltip="true" />
                 <PropertyColumn Class="data-grid-column" Title="@(Resources.IDS_LOGS_INDEX_COLUMN_USER_NAME)" Property="@(c => c.UserName)" />

diff --git a/Source/Starfish.Webapp/Pages/Team/Index.razor b/Source/Starfish.Webapp/Pages/Team/Index.razor
@@ -22,17 +22,21 @@
             </div>
         </FluentGridItem>
         <FluentGridItem lg="12" sm="12" md="12">
-            <FluentDataGrid ItemsProvider="_provider" Pagination="Pagination" ItemSize="46" GenerateHeader="GenerateHeaderOption.Sticky" TGridItem="TeamItemDto">
-                <PropertyColumn Class="data-grid-column" Title="@(Resources.IDS_COMMON_COLUMN_ID)" Property="@(c => c.Id)"/>
+            <FluentDataGrid ItemsProvider="_provider" 
+                            Pagination="Pagination" 
+                            ItemSize="46" 
+                            GenerateHeader="GenerateHeaderOption.Sticky" 
+                            TGridItem="TeamItemDto"
+                            GridTemplateColumns="0.5fr 0.5fr 1fr 0.5fr 0.2fr 0.2fr">
                 <TemplateColumn Title="@(Resources.IDS_TEAM_INDEX_COLUMN_NAME)" Align="@Align.Start">
                     <FluentButton Appearance="Appearance.Lightweight" OnClick="@(() => HandleDetailClicked(context.Id))">@(context.Name)</FluentButton>
                 </TemplateColumn>
-                <PropertyColumn Class="data-grid-column" Title="@(Resources.IDS_TEAM_INDEX_COLUMN_ALIAS)" Property="@(c => c.Alias)" />
-                <PropertyColumn Class="data-grid-column" Title="@(Resources.IDS_TEAM_INDEX_COLUMN_DESCRIPTION)" Property="@(c => c.Description)" />
-                <PropertyColumn Class="data-grid-column" Title="@(Resources.IDS_TEAM_INDEX_COLUMN_OWNER)" Property="@(c => c.OwnerId)" />
-                <PropertyColumn Class="data-grid-column" Title="@(Resources.IDS_TEAM_INDEX_COLUMN_MEMBERS)" Property="@(c => c.MemberCount)" />
+                <PropertyColumn Class="data-grid-column" Title="@(Resources.IDS_TEAM_INDEX_COLUMN_ALIAS)" Property="@(c => c.Alias)"/>
+                <PropertyColumn Class="data-grid-column" Title="@(Resources.IDS_TEAM_INDEX_COLUMN_DESCRIPTION)" Property="@(c => c.Description)"/>
+                <PropertyColumn Class="data-grid-column" Title="@(Resources.IDS_TEAM_INDEX_COLUMN_OWNER)" Property="@(c => c.OwnerId)"/>
+                <PropertyColumn Class="data-grid-column" Title="@(Resources.IDS_TEAM_INDEX_COLUMN_MEMBERS)" Property="@(c => c.MemberCount)"/>
                 <TemplateColumn Title="@(Resources.IDS_COMMON_COLUMN_ACTIONS)" Align="@Align.Center">
-                    <FluentButton IconEnd="@(new Icons.Regular.Size16.Edit())" Disabled="@(User?.GetUserIdOfInt64() != context.OwnerId)" OnClick="@(() => OnEditClicked(context.Id))" />
+                    <FluentButton IconEnd="@(new Icons.Regular.Size16.Edit())" Disabled="@(User?.GetUserIdOfInt64() != context.OwnerId)" OnClick="@(() => OnEditClicked(context.Id))"/>
                 </TemplateColumn>
             </FluentDataGrid>
         </FluentGridItem>

diff --git a/Source/Starfish.Webapp/Pages/User/Index.razor b/Source/Starfish.Webapp/Pages/User/Index.razor
@@ -22,15 +22,15 @@
             </div>
         </FluentGridItem>
         <FluentGridItem lg="12" sm="12" md="12">
-            <FluentDataGrid ItemsProvider="_provider" Pagination="Pagination" ItemSize="46" GenerateHeader="GenerateHeaderOption.Sticky" TGridItem="UserItemDto">
-                <PropertyColumn Class="data-grid-column" Title="@(Resources.IDS_COMMON_COLUMN_ID)" Property="@(c => c.Id)"/>
+            <FluentDataGrid ItemsProvider="_provider" Pagination="Pagination" ItemSize="46" 
+                GenerateHeader="GenerateHeaderOption.Sticky" TGridItem="UserItemDto"
+                            GridTemplateColumns="0.5fr 0.5fr 1fr 1fr 0.2fr">
                 <TemplateColumn Title="@(Resources.IDS_USER_INDEX_COLUMN_USER_NAME)" Align="@Align.Start">
                     <FluentButton Appearance="Appearance.Lightweight" OnClick="@(() => OnDetailClicked(context.Id))">@(context.UserName)</FluentButton>
                 </TemplateColumn>
                 <PropertyColumn Class="data-grid-column" Title="@(Resources.IDS_USER_INDEX_COLUMN_NICK_NAME)" Property="@(c => c.NickName)"/>
                 <PropertyColumn Class="data-grid-column" Title="@(Resources.IDS_USER_INDEX_COLUMN_EMAIL)" Property="@(c => c.Email)"/>
                 <PropertyColumn Class="data-grid-column" Title="@(Resources.IDS_USER_INDEX_COLUMN_PHONE)" Property="@(c => c.Phone)"/>
-                <PropertyColumn Class="data-grid-column" Title="@(Resources.IDS_USER_INDEX_COLUMN_ROLES)" Property="@(c => c.Roles.JoinAsString(", "))"></PropertyColumn>
                 <TemplateColumn Title="@(Resources.IDS_COMMON_COLUMN_ACTIONS)" Align="@Align.Center">
                     <FluentButton IconEnd="@(new Icons.Regular.Size16.Edit())" OnClick="@(() => OnEditClicked(context.Id))"/>
                     <FluentButton IconEnd="@(new Icons.Regular.Size16.LockClosedKey())" OnClick="@(() => OnResetPasswordClicked(context.Id))"/>