feat: setup js initializers (#130)

ant-design-blazor · Jan 1, 2024 · 6897f94 · 6897f94
1 parent 88b3b1f
commit 6897f94
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 11 deletions.
diff --git a/src/AntDesign.Charts.Docs.Server/AntDesign.Charts.Docs.Server.csproj b/src/AntDesign.Charts.Docs.Server/AntDesign.Charts.Docs.Server.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
  <PropertyGroup>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
  </PropertyGroup>
 
  <ItemGroup>

diff --git a/src/AntDesign.Charts.Docs.Server/Pages/_Host.cshtml b/src/AntDesign.Charts.Docs.Server/Pages/_Host.cshtml
@@ -12,11 +12,11 @@
  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
  <title>Ant Design Charts of Blazor</title>
  <base href="~/" />
- <link href="_content/AntDesign/css/ant-design-blazor.css" rel="stylesheet">
- <script src="_content/AntDesign/js/ant-design-blazor.js"></script>
+@*  <link href="_content/AntDesign/css/ant-design-blazor.css" rel="stylesheet">
+ <script src="_content/AntDesign/js/ant-design-blazor.js"></script> *@
  <link href="css/site.css" rel="stylesheet" />
- <script type="text/javascript" src="https://unpkg.com/@@antv/g2plot@latest/dist/g2plot.min.js"></script>
- <script src="_content/AntDesign.Charts/ant-design-charts-blazor.js"></script>
+ @*  <script type="text/javascript" src="https://unpkg.com/@@antv/g2plot@latest/dist/g2plot.min.js"></script>
+ <script src="_content/AntDesign.Charts/ant-design-charts-blazor.js"></script> *@
 </head>
 <body>
  <app>

diff --git a/src/AntDesign.Charts.Docs.WebAssembly/AntDesign.Charts.Docs.WebAssembly.csproj b/src/AntDesign.Charts.Docs.WebAssembly/AntDesign.Charts.Docs.WebAssembly.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
  <PropertyGroup>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
  <ServiceWorkerAssetsManifest>service-worker-assets.js</ServiceWorkerAssetsManifest>
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.0" />
- <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.0" PrivateAssets="all" />
+ <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.0" />
+ <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.0" PrivateAssets="all" />
  </ItemGroup>
 
  <ItemGroup>

diff --git a/src/AntDesign.Charts.Docs/AntDesign.Charts.Docs.csproj b/src/AntDesign.Charts.Docs/AntDesign.Charts.Docs.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
  <PropertyGroup>
- <TargetFramework>net7.0</TargetFramework>
+ <TargetFramework>net8.0</TargetFramework>
  <RazorLangVersion>3.0</RazorLangVersion>
  </PropertyGroup>
 
  <ItemGroup>
- <PackageReference Include="AntDesign" Version="0.13.2" />
+ <PackageReference Include="AntDesign" Version="0.17.1" />
  <PackageReference Include="System.Net.Http.Json" Version="7.0.0" />
  </ItemGroup>
 

diff --git a/src/AntDesign.Charts/wwwroot/AntDesign.Charts.lib.module.js b/src/AntDesign.Charts/wwwroot/AntDesign.Charts.lib.module.js
@@ -0,0 +1,35 @@
+var beforeStartCalled = false;
+var afterStartedCalled = false;
+
+export function beforeWebStart() {
+ loadScriptAndStyle();
+}
+
+export function beforeStart(options, extensions) {
+ loadScriptAndStyle();
+}
+
+function loadScriptAndStyle() {
+ if (beforeStartCalled) {
+ return;
+ }
+
+ beforeStartCalled = true;
+
+ const interopJS = "_content/AntDesign.Charts/ant-design-charts-blazor.js";
+ const cdnJS = "https://unpkg.com/@antv/[email protected]/dist/g2plot.min.js";
+ const localJS = "_content/AntDesign.Charts/g2plot.min.js";
+ const cdnFlag = document.querySelector('[use-ant-design-charts-cdn]');
+
+ if (!document.querySelector(`[src="${interopJS}"]`)) {
+ var chartJS = cdnFlag ? cdnJS : localJS;
+ var chartScript = document.createElement('script');
+ chartScript.setAttribute('src', chartJS);
+
+ document.body.insertBefore(chartScript, document.body.querySelector("script"));
+
+ var interopScript = document.createElement('script');
+ interopScript.setAttribute('src', interopJS);
+ chartScript.after(interopScript);
+ }
+}
diff --git a/src/AntDesign.Charts/wwwroot/g2plot.min.js b/src/AntDesign.Charts/wwwroot/g2plot.min.js
diff --git a/src/AntDesign.Charts/wwwroot/g2plot.min.js.map b/src/AntDesign.Charts/wwwroot/g2plot.min.js.map