update AntDesign 0.10.3 and AntDesign.Charts 0.2.3

ElderJames · ElderJames · commit 5d9ea3485cbb · 2022-05-11T15:08:11.000+08:00
diff --git a/.template.config/templates/hosted/src/Client/AntDesign.Pro.Template.Client.csproj b/.template.config/templates/hosted/src/Client/AntDesign.Pro.Template.Client.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AntDesign.Charts" Version="0.2.1" />
-    <PackageReference Include="AntDesign.ProLayout" Version="0.1.10" />
+    <PackageReference Include="AntDesign.Charts" Version="0.2.3" />
+    <PackageReference Include="AntDesign.ProLayout" Version="0.10.6" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
diff --git a/.template.config/templates/hosted/src/Client/wwwroot/index.html b/.template.config/templates/hosted/src/Client/wwwroot/index.html
@@ -201,7 +201,7 @@
         </div>
     </div>
 
-    <script src="_content/AntDesign.Charts/g2plot.js"></script>
+     <script type="text/javascript" src="https://unpkg.com/@antv/g2plot@latest/dist/g2plot.min.js"></script>
     <script src="_content/AntDesign/js/ant-design-blazor.js"></script>
     <script src="_content/AntDesign.Charts/ant-design-charts-blazor.js"></script>
     <script src="_framework/blazor.webassembly.js"></script>
diff --git a/.template.config/templates/server/AntDesign.Pro.Template.csproj b/.template.config/templates/server/AntDesign.Pro.Template.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AntDesign.Charts" Version="0.2.1" />
-    <PackageReference Include="AntDesign.ProLayout" Version="0.1.10" />
+    <PackageReference Include="AntDesign.Charts" Version="0.2.3" />
+    <PackageReference Include="AntDesign.ProLayout" Version="0.10.6" />
     <PackageReference Include="System.Net.Http.Json" Version="6.0.0" />
   </ItemGroup>
   
diff --git a/.template.config/templates/server/Pages/_Host.cshtml b/.template.config/templates/server/Pages/_Host.cshtml
@@ -22,7 +22,7 @@
         <component type="typeof(App)" render-mode="Server" />
     </app>
 
-    <script src="_content/AntDesign.Charts/g2plot.js"></script>
+     <script type="text/javascript" src="https://unpkg.com/@antv/g2plot@latest/dist/g2plot.min.js"></script>
     <script src="_content/AntDesign/js/ant-design-blazor.js"></script>
     <script src="_content/AntDesign.Charts/ant-design-charts-blazor.js"></script>
     <script src="_framework/blazor.server.js"></script>
diff --git a/.template.config/templates/wasm/AntDesign.Pro.Template.csproj b/.template.config/templates/wasm/AntDesign.Pro.Template.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AntDesign.Charts" Version="0.2.1" />
-    <PackageReference Include="AntDesign.ProLayout" Version="0.1.10" />
+    <PackageReference Include="AntDesign.Charts" Version="0.2.3" />
+    <PackageReference Include="AntDesign.ProLayout" Version="0.10.6" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
diff --git a/src/AntDesign.Pro/AntDesign.Pro.csproj b/src/AntDesign.Pro/AntDesign.Pro.csproj
@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="AntDesign.Charts" Version="0.2.1" />
-    <PackageReference Include="AntDesign.ProLayout" Version="0.1.10" />
+    <PackageReference Include="AntDesign.Charts" Version="0.2.3" />
+    <PackageReference Include="AntDesign.ProLayout" Version="0.10.6" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" PrivateAssets="all" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="6.0.0" />
diff --git a/src/AntDesign.Pro/Pages/Dashboard/Analysis/Components/Charts/MiniArea/MiniArea.razor b/src/AntDesign.Pro/Pages/Dashboard/Analysis/Components/Charts/MiniArea/MiniArea.razor
@@ -2,7 +2,7 @@
 @namespace AntDesign.Pro.Template.Pages.Dashboard.Analysis
 @inject IChartService ChartService
 
-<Area @ref="_visitChart" TItem="ChartDataItem" Config="_visitChartConfig" />
+<Area @ref="_visitChart" Config="_visitChartConfig" />
 
 @code
 {
diff --git a/src/AntDesign.Pro/Pages/Dashboard/Analysis/Components/Charts/MiniBar/MiniBar.razor b/src/AntDesign.Pro/Pages/Dashboard/Analysis/Components/Charts/MiniBar/MiniBar.razor
@@ -1,7 +1,7 @@
 @using AntDesign.Pro.Template.Services
 @namespace AntDesign.Pro.Template.Pages.Dashboard.Analysis
 @inject IChartService ChartService
-<AntDesign.Charts.Column @ref="_chart" TItem="ChartDataItem" Config="_chartConfig" />
+<AntDesign.Charts.Column @ref="_chart" Config="_chartConfig" />
 
 @code
 {
diff --git a/src/AntDesign.Pro/Pages/Dashboard/Analysis/Components/SalesCard.razor b/src/AntDesign.Pro/Pages/Dashboard/Analysis/Components/SalesCard.razor
@@ -8,7 +8,7 @@
                 <TabPane Key="1" Tab="Sales">
                     <Row>
                         <AntDesign.Col Xl="16" Lg="12" Md="12" Sm="24" Xs="24">
-                            <AntDesign.Charts.Column @ref="_saleChart" TItem="ChartDataItem" Config="_saleChartConfig" />
+                            <AntDesign.Charts.Column @ref="_saleChart" Config="_saleChartConfig" />
                         </AntDesign.Col>
                         <AntDesign.Col Xl="8" Lg="12" Md="12" Sm="24" Xs="24">
                             <div class="salesRank">
@@ -38,7 +38,7 @@
                 <TabPane Key="2" Tab="Visits">
                     <Row>
                         <AntDesign.Col Xl="16" Lg="12" Md="12" Sm="24" Xs="24">
-                            <AntDesign.Charts.Column @ref="_visitChart" TItem="ChartDataItem" Config="_visitChartConfig" />
+                            <AntDesign.Charts.Column @ref="_visitChart" Config="_visitChartConfig" />
                         </AntDesign.Col>
                         <AntDesign.Col Xl="8" Lg="12" Md="12" Sm="24" Xs="24">
                             <div class="salesRank">
diff --git a/src/AntDesign.Pro/Pages/Dashboard/Monitor/Components/Charts/Map/MiniArea.razor b/src/AntDesign.Pro/Pages/Dashboard/Monitor/Components/Charts/Map/MiniArea.razor
@@ -1,7 +1,7 @@
 @using AntDesign.Pro.Template.Models
 @namespace AntDesign.Pro.Template.Pages.Dashboard.Monitor
 
-<Area @ref="_chart" TItem="ChartDataItem" Data="Data" Config="_chartConfig" />
+<Area @ref="_chart" Data="Data" Config="_chartConfig" />
 
 @code
 {
diff --git a/src/AntDesign.Pro/Pages/Dashboard/Workplace/Components/Radar/Radar.razor b/src/AntDesign.Pro/Pages/Dashboard/Workplace/Components/Radar/Radar.razor
@@ -1,6 +1,6 @@
 @namespace AntDesign.Pro.Template.Pages.Dashboard.Workplace
 
-<AntDesign.Charts.Radar @ref="_chart" TItem="RadarDataItem" Config="_chartConfig" />
+<AntDesign.Charts.Radar @ref="_chart" Config="_chartConfig" />
 
 @if (HasLegend)
 {
@@ -30,8 +30,8 @@
     {
         Height = 343,
         ForceFit = true,
-        AngleField = "label",
-        RadiusField = "value",
+        XField="label",
+        YField="value",
         RadiusAxis = new ValueAxis
         {
             Grid = new BaseAxisGrid
diff --git a/src/AntDesign.Pro/wwwroot/index.html b/src/AntDesign.Pro/wwwroot/index.html
@@ -201,7 +201,7 @@
         </div>
     </div>
 
-    <script src="_content/AntDesign.Charts/g2plot.js"></script>
+    <script type="text/javascript" src="https://unpkg.com/@antv/g2plot@latest/dist/g2plot.min.js"></script>
     <script src="_content/AntDesign/js/ant-design-blazor.js"></script>
     <script src="_content/AntDesign.Charts/ant-design-charts-blazor.js"></script>
     <script src="_framework/blazor.webassembly.js"></script>

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`@namespace AntDesign.Pro.Template.Pages.Dashboard.Analysis`
`3`	`3`	`@inject IChartService ChartService`
`4`	`4`
`5`		`-<Area @ref="_visitChart" TItem="ChartDataItem" Config="_visitChartConfig" />`
	`5`	`+<Area @ref="_visitChart" Config="_visitChartConfig" />`
`6`	`6`
`7`	`7`	`@code`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`@using AntDesign.Pro.Template.Services`
`2`	`2`	`@namespace AntDesign.Pro.Template.Pages.Dashboard.Analysis`
`3`	`3`	`@inject IChartService ChartService`
`4`		`-<AntDesign.Charts.Column @ref="_chart" TItem="ChartDataItem" Config="_chartConfig" />`
	`4`	`+<AntDesign.Charts.Column @ref="_chart" Config="_chartConfig" />`
`5`	`5`
`6`	`6`	`@code`
`7`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`@using AntDesign.Pro.Template.Models`
`2`	`2`	`@namespace AntDesign.Pro.Template.Pages.Dashboard.Monitor`
`3`	`3`
`4`		`-<Area @ref="_chart" TItem="ChartDataItem" Data="Data" Config="_chartConfig" />`
	`4`	`+<Area @ref="_chart" Data="Data" Config="_chartConfig" />`
`5`	`5`
`6`	`6`	`@code`
`7`	`7`	`{`