g82tt/ThingsGateway
1
0
Fork 0
mirror of https://gitee.com/ThingsGateway/ThingsGateway.git synced 2025-10-26 21:27:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

更新masa-1.0.0-preview.10

Browse Source
This commit is contained in:
2248356998 qq.com
2023-03-27 14:27:15 +08:00
parent 346c45fe0c
commit 2ff4df56a1
11 changed files with 81 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Plugins/ThingsGateway.Mqtt/MqttClient.cs
View File

@@ -195,6 +195,8 @@ namespace ThingsGateway.Mqtt
async Task<OperResult> Cilent()
{
if (_mqttClient?.IsConnected == true)
return OperResult.CreateSuccessResult();
try
{
lockobj.Lock();

2
src/Plugins/ThingsGateway.OPCDA/ThingsGateway.OPCDA.csproj
View File

@@ -17,7 +17,7 @@
<ItemGroup>
<PackageReference Include="Masa.Blazor" Version="1.0.0-preview.8">
<PackageReference Include="Masa.Blazor" Version="1.0.0-preview.10">
<IncludeAssets>Compile</IncludeAssets>
</PackageReference>
</ItemGroup>

2
src/Plugins/ThingsGateway.OPCUA/ThingsGateway.OPCUA.csproj
View File

@@ -30,7 +30,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Masa.Blazor" Version="1.0.0-preview.8">
<PackageReference Include="Masa.Blazor" Version="1.0.0-preview.10">
<IncludeAssets>Compile</IncludeAssets>
</PackageReference>
</ItemGroup>

2
src/ThingsGateway.Web.Rcl.Core/BaseComponent/CultureComponentBase.cs
View File

@@ -17,7 +17,7 @@ namespace ThingsGateway.Web.Rcl.Core
public string T(string key, params object[] args)
{
return string.Format(LanguageService.T(key, false, true), args);
return string.Format(LanguageService.T(key, false, key), args);
}
}
}

2
src/ThingsGateway.Web.Rcl.Core/BaseComponent/CultureLayoutComponentBase.cs
View File

@@ -22,7 +22,7 @@ namespace ThingsGateway.Web.Rcl.Core
public string T(string key, params object[] args)
{
return LanguageService.T(key, false, true, args);
return LanguageService.T(key, false, key, args);
}
}

33
src/ThingsGateway.Web.Rcl.Core/Components/PageTabs.razor
View File

@@ -1,33 +1,28 @@
@namespace ThingsGateway.Web.Rcl.Core
@using System.Globalization;
@using Masa.Blazor.Presets;
@inherits CultureComponentBase
<MPageTabs Items="UserResoures.PageTabItems"
ShowArrows=true
NextIcon="mdi-arrow-right-bold-box-outline"
PrevIcon="mdi-arrow-left-bold-box-outline">
<PPageTabs @ref="PPageTabs" TabClass="px-6 rounded-t-xl" Ripple="false" HideSlider>
<TabContent>
<MTab Href="@context.Item.Url"
Class="px-4 rounded-0 m-page_tab"
ActiveClass="primary--text"
IsActive=context.IsActive
Ripple="false" Style=@($"height:{UserResoures.Themes.LayoutPrpo.PageTabsHeight}px;")
@attributes="@context.Attrs">
<MIcon Size=20>@context.Item.Icon</MIcon>
<span class="mx-2 text-capitalize" style="min-width:45px;">@T(context.Item.Name)</span>
@if (context.Item.Closable)
{
<MIcon Size=16 OnClick="context.Close" OnClickStopPropagation OnClickPreventDefault>mdi-close</MIcon>
}
</MTab>
@{
var item = UserResoures.PageTabItems.FirstOrDefault(u => context.IsMatch(u.Href));
}
<MSheet Class="d-flex align-center justify-center" Height=@($"{UserResoures.Themes.LayoutPrpo.PageTabsHeight}px;")>
<MIcon Class=@(context.Selected ? "primary--text" : "") Size="20">@item?.Icon</MIcon>
<span class="mx-2 text-capitalize @(context.Selected ? "primary--text" : "")" style=@($"min-width:46px;")>
@T(item?.Title)
</span>
</MSheet>
</TabContent>
<ChildContent>
@ChildContent
</ChildContent>
</MPageTabs>
</PPageTabs>
@code {
public PPageTabs PPageTabs { get; private set; }
[Inject]
UserResoures UserResoures { get; set; }

2
src/ThingsGateway.Web.Rcl.Core/Core/UserResoures.cs
View File

@@ -1,9 +1,11 @@
using BlazorComponent.I18n;
using Masa.Blazor;
namespace ThingsGateway.Web.Rcl.Core
{
public record PageTabItem(string Title, string Href, string Icon);
/// <summary>
/// 用户菜单等资源管理
/// </summary>

4
src/ThingsGateway.Web.Rcl.Core/Extensions/MenuExtensions.cs
View File

@@ -41,9 +41,9 @@
if ((item.Category == MenuCategoryEnum.MENU || item.Category == MenuCategoryEnum.SPA) && item.TargetType == TargetTypeEnum.SELF)
{
if (item.Icon == null)
pageTabItems.Add(new PageTabItem(item.Title, item.Component, PageTabsMatch.Prefix, PageTabsTarget.Self));
pageTabItems.Add(new PageTabItem(item.Title, item.Component,""));
else
pageTabItems.Add(new PageTabItem(item.Title, item.Component, item.Icon, PageTabsMatch.Prefix, PageTabsTarget.Self));
pageTabItems.Add(new PageTabItem(item.Title, item.Component, item.Icon));
}
}
return pageTabItems;

92
src/ThingsGateway.Web.Rcl.Core/Shared/MainLayout.razor
View File

@@ -1,57 +1,67 @@
@namespace ThingsGateway.Web.Rcl
@using Masa.Blazor.Presets
@inherits CultureLayoutComponentBase
@layout BaseLayout
@if (UserManager.UserId > 0)
{
<SignalR></SignalR>
}
<PPageTabsProvider>
<CascadingValue Value="@this" IsFixed>
<CascadingValue Value="@LanguageService.Culture">
<CascadingValue Value="@this" IsFixed>
<CascadingValue Value="@LanguageService.Culture">
<MNavigationDrawer Color="barcolor" @bind-Value="_drawerOpen" App Width="200">
@if (IsMobile)
{
<MSystemBar Color="barcolor" Height="@(UserResoures.Themes.LayoutPrpo.PageTabsHeight)">
<MButton Icon OnClick=@(()=> _drawerOpen = !_drawerOpen)>
<MIcon>
mdi-close-thick
</MIcon>
</MButton>
<MSpacer />
<AppbarButtons LanguageChange=@LanguageChange />
</MSystemBar>
}
<Logo HeightInt=@(IsMobile?UserResoures.Themes.LayoutPrpo.AppBarHeight:UserResoures.Themes.LayoutPrpo.AppBarHeight+UserResoures.Themes.LayoutPrpo.PageTabsHeight) />
<DefaultList ClassString="overflow-y-auto"
StyleString=@($"height: calc(100vh - {UserResoures.Themes.LayoutPrpo.AppBarHeight+UserResoures.Themes.LayoutPrpo.PageTabsHeight}px);")
Items="Navs" />
</MNavigationDrawer>
<MNavigationDrawer Color="barcolor" @bind-Value="_drawerOpen" App Width="200">
@if (IsMobile)
{
<MSystemBar Color="barcolor" Height="@(UserResoures.Themes.LayoutPrpo.PageTabsHeight)">
<MButton Icon OnClick=@(()=> _drawerOpen = !_drawerOpen)>
<MIcon>
mdi-close-thick
</MIcon>
</MButton>
<MSpacer />
<AppbarButtons LanguageChange=@LanguageChange />
</MSystemBar>
}
<Logo HeightInt=@(IsMobile?UserResoures.Themes.LayoutPrpo.AppBarHeight:UserResoures.Themes.LayoutPrpo.AppBarHeight+UserResoures.Themes.LayoutPrpo.PageTabsHeight) />
<DefaultList ClassString="overflow-y-auto"
StyleString=@($"height: calc(100vh - {UserResoures.Themes.LayoutPrpo.AppBarHeight+UserResoures.Themes.LayoutPrpo.PageTabsHeight}px);")
Items="Navs" />
</MNavigationDrawer>
<MAppBar Style=@($"{(!(IsMobile||!_drawerOpen)? "left:200px;":"")}") Elevation="1" App Flat ClippedRight Dense ElevateOnScroll Color="barcolor"
MaxHeight="@(UserResoures.Themes.LayoutPrpo.AppBarHeight)" Height="@(UserResoures.Themes.LayoutPrpo.AppBarHeight)">
<MButton Class="mr-0" Icon Small=IsMobile OnClick=@(() => _drawerOpen = !_drawerOpen)>
<MIcon>mdi-menu</MIcon>
</MButton>
<AppBarItems LanguageChange=@LanguageChange>
</AppBarItems>
</MAppBar>
<MAppBar Style=@($"{(!(IsMobile||!_drawerOpen)? "left:200px;":"")}") Elevation="1" App Flat ClippedRight Dense ElevateOnScroll Color="barcolor"
MaxHeight="@(UserResoures.Themes.LayoutPrpo.AppBarHeight)" Height="@(UserResoures.Themes.LayoutPrpo.AppBarHeight)">
<MButton Class="mr-0" Icon Small=IsMobile OnClick=@(() => _drawerOpen = !_drawerOpen)>
<MIcon>mdi-menu</MIcon>
</MButton>
<AppBarItems LanguageChange=@LanguageChange>
</AppBarItems>
</MAppBar>
<MMain Style=@($"{(!(IsMobile||!_drawerOpen)? "padding-left:200px;":"")}")>
<div class="full-width">
<PageTabs @ref="_pageTabs" />
</div>
<PPageContainer PageTabs="@_pageTabs?.PPageTabs">
<MDivider Center></MDivider>
<MCard Flat Class="overflow-y-auto overflow-x-hidden ma-auto pa-0 rounded-0" Style=@($"height: calc(100vh - {UserResoures.Themes.LayoutPrpo.AppBarHeight+UserResoures.Themes.LayoutPrpo.PageTabsHeight+UserResoures.Themes.LayoutPrpo.FooterBarHeight}px);")>
@Body
</MCard>
</PPageContainer>
<MSheet Class="d-flex justify-center align-center rounded-0" Style=@($"height: {UserResoures.Themes.LayoutPrpo.FooterBarHeight}px;")>
<Foter></Foter>
</MSheet>
</MMain>
</CascadingValue>
</CascadingValue>
</PPageTabsProvider>
<MMain Style=@($"{(!(IsMobile||!_drawerOpen)? "padding-left:200px;":"")}")>
<PageTabs>
<MDivider Center></MDivider>
<MCard Flat Class="overflow-y-auto overflow-x-hidden ma-auto pa-0 rounded-0" Style=@($"height: calc(100vh - {UserResoures.Themes.LayoutPrpo.AppBarHeight+UserResoures.Themes.LayoutPrpo.PageTabsHeight+UserResoures.Themes.LayoutPrpo.FooterBarHeight}px);")>
@Body
</MCard>
</PageTabs>
<MSheet Class="d-flex justify-center align-center rounded-0" Style=@($"height: {UserResoures.Themes.LayoutPrpo.FooterBarHeight}px;")>
<Foter></Foter>
</MSheet>
</MMain>
</CascadingValue>
</CascadingValue>
@code {
private List<NavItem> Navs { get; set; } = new();
private PageTabs _pageTabs;
[CascadingParameter(Name = "IsMobile")]
public bool IsMobile { get; set; }

2
src/ThingsGateway.Web.Rcl.Core/ThingsGateway.Web.Rcl.Core.csproj
View File

@@ -23,7 +23,7 @@
<ItemGroup>
<PackageReference Include="Masa.Blazor" Version="1.0.0-preview.8" />
<PackageReference Include="Masa.Blazor" Version="1.0.0-preview.10" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.4" />
</ItemGroup>

5
src/ThingsGateway.Web.Rcl.Core/wwwroot/TB.css
View File

@@ -53,6 +53,11 @@
text-align: start !important;
min-width: 130px;
}
.neutral--text {
color: #1B2559 !important;
caret-color: #1B2559 !important;
}
/*下面都是html默认样式修改*/
html {