1,修复控制台报错(echarts.js问题,已删除)2,多处Dispose修正

This commit is contained in:
2248356998 qq.com
2023-04-07 08:48:34 +08:00
parent 9fefbf4c27
commit f34559daaf
7 changed files with 17 additions and 62 deletions

View File

@@ -8,11 +8,11 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.7.31" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.7.31" />
<PackageReference Include="Furion.Pure" Version="4.8.7.31" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.7.36" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.7.36" />
<PackageReference Include="Furion.Pure" Version="4.8.7.36" />
<PackageReference Include="Magicodes.IE.Excel" Version="2.7.4.3" />
<PackageReference Include="SqlSugarCore" Version="5.1.4.63" />
<PackageReference Include="SqlSugarCore" Version="5.1.4.66" />
<PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
<PackageReference Include="NewLife.Core" Version="10.2.2023.401" />
<PackageReference Include="UAParser" Version="3.1.47" />

View File

@@ -11,7 +11,6 @@
@inject MasaBlazor MasaBlazor
@attribute [RolePermission]
@inherits CultureComponentBase
@implements IDisposable
@inject UserResoures UserResoures
@layout MainLayout
<AppDataTable @ref="_datatable" TItem="AlarmHis" SearchItem="VariablePageInput"
@@ -81,9 +80,10 @@
if (IsAutoQuery)
await InvokeAsync(async ()=>await datatableQuery());
}
public void Dispose()
protected override async Task Dispose(bool disposing)
{
DelayTimer.Dispose();
await base.Dispose(disposing);
DelayTimer?.Dispose();
}
private async Task datatableQuery()
{

View File

@@ -12,7 +12,6 @@
@inject MasaBlazor MasaBlazor
@attribute [RolePermission]
@inherits CultureComponentBase
@implements IDisposable
@inject UserResoures UserResoures
@layout MainLayout
@@ -118,9 +117,10 @@
{
await InvokeAsync(StateHasChanged);
}
public void Dispose()
protected override async Task Dispose(bool disposing)
{
DelayTimer.Dispose();
await base.Dispose(disposing);
DelayTimer?.Dispose();
}
private async Task datatableQuery()
{

View File

@@ -15,7 +15,6 @@
@inherits CultureComponentBase
@inject UserResoures UserResoures
@inject NavigationManager NavigationManager
@implements IDisposable
@inject IDriverPluginService DriverPluginService
@layout MainLayout
<MSheet>
@@ -634,9 +633,10 @@
}
public void Dispose()
protected override async Task Dispose(bool disposing)
{
DelayTimer.Dispose();
await base.Dispose(disposing);
DelayTimer?.Dispose();
}
async void timer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)

View File

@@ -14,7 +14,6 @@
@inject UserResoures UserResoures
@inject NavigationManager NavigationManager
@inject IDriverPluginService DriverPluginService
@implements IDisposable
@layout MainLayout
<MRow NoGutters>
@@ -270,8 +269,9 @@
{
await InvokeAsync(StateHasChanged);
}
public void Dispose()
protected override async Task Dispose(bool disposing)
{
DelayTimer.Dispose();
await base.Dispose(disposing);
DelayTimer?.Dispose();
}
}

View File

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

File diff suppressed because one or more lines are too long