zhaoyushun1999/SunnyUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V3.3.0

Browse Source
This commit is contained in:
Sunny 2022-11-27 23:35:47 +08:00
parent f98829b2b8
commit 969b37e230
10 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
SunnyUI.Demo/Bin/SunnyUI.Common.dll
View File

Binary file not shown.

BIN
SunnyUI.Demo/Bin/SunnyUI.Demo.exe
View File

Binary file not shown.

BIN
SunnyUI.Demo/Bin/SunnyUI.dll
View File

Binary file not shown.

4
SunnyUI.Demo/Properties/AssemblyInfo.cs
View File

@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示: //通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("3.2.9.0")] [assembly: AssemblyVersion("3.3.0.0")]
[assembly: AssemblyFileVersion("3.2.9.0")] [assembly: AssemblyFileVersion("3.3.0.0")]

8
SunnyUI.Demo/SunnyUI.Demo.csproj
View File

@ -41,11 +41,11 @@
<ApplicationManifest>app.manifest</ApplicationManifest> <ApplicationManifest>app.manifest</ApplicationManifest>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="SunnyUI, Version=3.2.9.0, Culture=neutral, PublicKeyToken=27d7d2e821d97aeb, processorArchitecture=MSIL"> <Reference Include="SunnyUI, Version=3.3.0.0, Culture=neutral, PublicKeyToken=27d7d2e821d97aeb, processorArchitecture=MSIL">
<HintPath>..\packages\SunnyUI.3.2.9\lib\net472\SunnyUI.dll</HintPath> <HintPath>..\packages\SunnyUI.3.3.0\lib\net472\SunnyUI.dll</HintPath>
</Reference> </Reference>
<Reference Include="SunnyUI.Common, Version=3.2.9.0, Culture=neutral, PublicKeyToken=5a271fb7ba597231, processorArchitecture=MSIL"> <Reference Include="SunnyUI.Common, Version=3.3.0.0, Culture=neutral, PublicKeyToken=5a271fb7ba597231, processorArchitecture=MSIL">
<HintPath>..\packages\SunnyUI.Common.3.2.9\lib\net472\SunnyUI.Common.dll</HintPath> <HintPath>..\packages\SunnyUI.Common.3.3.0\lib\net472\SunnyUI.Common.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />

4
SunnyUI.Demo/packages.config
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="SunnyUI" version="3.2.9" targetFramework="net472" /> <package id="SunnyUI" version="3.3.0" targetFramework="net472" />
<package id="SunnyUI.Common" version="3.2.9" targetFramework="net472" /> <package id="SunnyUI.Common" version="3.3.0" targetFramework="net472" />
</packages> </packages>

2
SunnyUI/Charts/UIDoughnutChart.cs
View File

@ -148,7 +148,7 @@ namespace Sunny.UI
Angle pieAngle = new Angle(start, angle, text); Angle pieAngle = new Angle(start, angle, text);
GetSeriesRect(pie, ref pieAngle); GetSeriesRect(pie, ref pieAngle);
Angles[pieIndex].TryAddOrUpdate(i, pieAngle); Angles[pieIndex].Upsert(i, pieAngle);
start += angle; start += angle;
} }
} }

2
SunnyUI/Charts/UIPieChart.cs
View File

@ -148,7 +148,7 @@ namespace Sunny.UI
} }
} }
Angles[pieIndex].TryAddOrUpdate(i, new Angle(start, angle, text)); Angles[pieIndex].Upsert(i, new Angle(start, angle, text));
start += angle; start += angle;
} }
} }

8
SunnyUI/Style/UIStyles.cs
View File

@ -165,7 +165,7 @@ namespace Sunny.UI
{ {
if (!Forms.ContainsKey(guid)) if (!Forms.ContainsKey(guid))
{ {
Forms.TryAddOrUpdate(guid, form); Forms.Upsert(guid, form);
return true; return true;
} }
@ -181,7 +181,7 @@ namespace Sunny.UI
{ {
if (!Pages.ContainsKey(guid)) if (!Pages.ContainsKey(guid))
{ {
Pages.TryAddOrUpdate(guid, page); Pages.Upsert(guid, page);
return true; return true;
} }
@ -196,7 +196,7 @@ namespace Sunny.UI
{ {
if (!Forms.ContainsKey(form.Guid)) if (!Forms.ContainsKey(form.Guid))
{ {
Forms.TryAddOrUpdate(form.Guid, form); Forms.Upsert(form.Guid, form);
return true; return true;
} }
@ -211,7 +211,7 @@ namespace Sunny.UI
{ {
if (!Pages.ContainsKey(page.Guid)) if (!Pages.ContainsKey(page.Guid))
{ {
Pages.TryAddOrUpdate(page.Guid, page); Pages.Upsert(page.Guid, page);
return true; return true;
} }

8
SunnyUI/SunnyUI.csproj
View File

@ -9,18 +9,18 @@
<Description>SunnyUI.Net 是基于.Net Framework 4.0~4.8、.Net6、.Net7 框架的 C# WinForm 开源控件库、工具类库、扩展类库、多页面开发框架。</Description> <Description>SunnyUI.Net 是基于.Net Framework 4.0~4.8、.Net6、.Net7 框架的 C# WinForm 开源控件库、工具类库、扩展类库、多页面开发框架。</Description>
<Copyright>CopyRight © SunnyUI.Net 2012-2022</Copyright> <Copyright>CopyRight © SunnyUI.Net 2012-2022</Copyright>
<PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression> <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
<Version>3.2.9</Version> <Version>3.3.0</Version>
<Authors>ShenYonghua</Authors> <Authors>ShenYonghua</Authors>
<Company>SunnyUI.Net</Company> <Company>SunnyUI.Net</Company>
<PackageId>SunnyUI</PackageId> <PackageId>SunnyUI</PackageId>
<PackageProjectUrl>https://gitee.com/yhuse/SunnyUI</PackageProjectUrl> <PackageProjectUrl>https://gitee.com/yhuse/SunnyUI</PackageProjectUrl>
<RepositoryUrl>https://gitee.com/yhuse/SunnyUI</RepositoryUrl> <RepositoryUrl>https://gitee.com/yhuse/SunnyUI</RepositoryUrl>
<PackageRequireLicenseAcceptance>False</PackageRequireLicenseAcceptance> <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
<PackageIcon>SunnyUI.png</PackageIcon> <PackageIcon>SunnyUI.png</PackageIcon>
<SignAssembly>False</SignAssembly> <SignAssembly>False</SignAssembly>
<AssemblyOriginatorKeyFile>D:\Key\SunnyUI.pfx</AssemblyOriginatorKeyFile> <AssemblyOriginatorKeyFile>D:\Key\SunnyUI.pfx</AssemblyOriginatorKeyFile>
<DelaySign>False</DelaySign> <DelaySign>False</DelaySign>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild> <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
<GenerateDocumentationFile>False</GenerateDocumentationFile> <GenerateDocumentationFile>False</GenerateDocumentationFile>
</PropertyGroup> </PropertyGroup>
@ -75,7 +75,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="SunnyUI.Common" Version="3.2.9" /> <PackageReference Include="SunnyUI.Common" Version="3.3.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>