Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(JSModule): update javascript path #4767

Merged
merged 8 commits into from
Nov 30, 2024
Merged

chore(JSModule): update javascript path #4767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ba40379
wip: 更新路径问题
ArgoZhang Nov 30, 2024
b195704
refactor: 更新脚本路径
ArgoZhang Nov 30, 2024
b255954
chore: 更正图标样式
ArgoZhang Nov 30, 2024
3ca8b40
style: 更新图标路径
ArgoZhang Nov 30, 2024
d2128b7
chore: 更新 JS 路径
ArgoZhang Nov 30, 2024
29ecda2
chore: 更新加载文件路径
ArgoZhang Nov 30, 2024
7a24d93
refactor: 更新路径为相对路径
ArgoZhang Nov 30, 2024
180aa73
chore: 更新路径
ArgoZhang Nov 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/BootstrapBlazor.Server/Components/App.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,12 @@
}
else
{
<link rel="stylesheet" href="_content/BootstrapBlazor.AntDesignIcon/BootstrapBlazor.AntDesignIcon.bundle.scp.css" />
<link rel="stylesheet" href="_content/BootstrapBlazor.BootstrapIcon/css/bootstrap.min.css" />
<link rel="stylesheet" href="_content/BootstrapBlazor.ElementIcon/BootstrapBlazor.ElementIcon.bundle.scp.css" />
<link rel="stylesheet" href="_content/BootstrapBlazor.FontAwesome/css/font-awesome.min.css" />
<link rel="stylesheet" href="_content/BootstrapBlazor.MaterialDesign/css/md.min.css" />
<link rel="stylesheet" href="_content/BootstrapBlazor.BootstrapIcon/css/bootstrap.min.css" />
<link rel="stylesheet" href="_content/BootstrapBlazor.IconPark/BootstrapBlazor.IconPark.bundle.scp.css" />
<link rel="stylesheet" href="_content/BootstrapBlazor/css/bootstrap.blazor.bundle.min.css" />
<link rel="stylesheet" href="_content/BootstrapBlazor/css/motronic.min.css" />
<link rel="stylesheet" href="_content/BootstrapBlazor.Shared/BootstrapBlazor.Shared.bundle.scp.css" />
Expand All @@ -50,7 +53,7 @@
@if (Env.IsProduction())
{
<script type="text/javascript" src="https://cdn.wwads.cn/js/makemoney.js"></script>
<script type="text/javascript" src="lib/wwads/wwads.js"></script>
<script type="text/javascript" src="./_content/BootstrapBlazor.Shared/lib/wwads/wwads.js"></script>
<script>
var _hmt = _hmt || [];
(function () {
Expand Down
5 changes: 4 additions & 1 deletion src/BootstrapBlazor.Server/Extensions/StaticFileResponseContextExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,12 @@ public static RenderFragment RenderAssets(this ComponentBase component) => build
var v = pi.GetValue(component);
if (v is ResourceAssetCollection assets)
{
builder.RenderCss($"{assets["_content/BootstrapBlazor.AntDesignIcon/BootstrapBlazor.AntDesignIcon.bundle.scp.css"]}");
builder.RenderCss($"{assets["_content/BootstrapBlazor.BootstrapIcon/css/bootstrap.min.css"]}");
builder.RenderCss($"{assets["_content/BootstrapBlazor.ElementIcon/BootstrapBlazor.ElementIcon.bundle.scp.css"]}");
builder.RenderCss($"{assets["_content/BootstrapBlazor.FontAwesome/css/font-awesome.min.css"]}");
builder.RenderCss($"{assets["_content/BootstrapBlazor.MaterialDesign/css/md.min.css"]}");
builder.RenderCss($"{assets["_content/BootstrapBlazor.BootstrapIcon/css/bootstrap.min.css"]}");
builder.RenderCss($"{assets["_content/BootstrapBlazor.IconPark/BootstrapBlazor.IconPark.bundle.scp.css"]}");
builder.RenderCss($"{assets["_content/BootstrapBlazor/css/bootstrap.blazor.bundle.min.css"]}");
builder.RenderCss($"{assets["_content/BootstrapBlazor/css/motronic.min.css"]}");
builder.RenderCss($"{assets["_content/BootstrapBlazor.Shared/BootstrapBlazor.Shared.bundle.scp.css"]}");
Expand Down
6 changes: 3 additions & 3 deletions src/BootstrapBlazor.Shared/BootstrapBlazor.Shared.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
<Project Sdk="Microsoft.NET.Sdk.Razor">

<ItemGroup>
<Content Remove="docs.json" />
Expand Down Expand Up @@ -47,7 +47,7 @@
<PackageReference Include="BootstrapBlazor.MaterialDesign" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.MaterialDesign.Extensions" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.MeiliSearch" Version="9.0.4" />
<PackageReference Include="BootstrapBlazor.Mermaid" Version="9.0.1-beta01" />
<PackageReference Include="BootstrapBlazor.Mermaid" Version="9.0.1" />
<PackageReference Include="BootstrapBlazor.MindMap" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.MouseFollower" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.OnScreenKeyboard" Version="9.0.0" />
Expand All @@ -61,7 +61,7 @@
<PackageReference Include="BootstrapBlazor.TableExport" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.TagHelper" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.Topology" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.VideoPlayer" Version="9.0.0" />
<PackageReference Include="BootstrapBlazor.VideoPlayer" Version="9.0.1" />
<PackageReference Include="BootstrapBlazor.WinBox" Version="9.0.5" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/BootstrapBlazor.Shared/Components/Layout/DockLayout.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
{
if (firstRender)
{
Module = await JSRuntime.LoadModule("./Components/Layout/DockLayout.razor.js");
Module = await JSRuntime.LoadModule("./_content/BootstrapBlazor.Shared/Components/Layout/DockLayout.razor.js");
await Module.InvokeVoidAsync("init");
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/BootstrapBlazor.Shared/Components/Samples/Charts/Line.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace BootstrapBlazor.Shared.Components.Samples.Charts;
/// <summary>
/// Line 图表示例
/// </summary>
[JSModuleAutoLoader("Samples/Charts/Line.razor.js", JSObjectReference = true)]
[JSModuleAutoLoader("../_content/BootstrapBlazor.Shared/Components/Samples/Charts/Line.razor.js", JSObjectReference = true)]
public partial class Line : IDisposable
{
private readonly Random _randomer = new();
Expand Down
4 changes: 2 additions & 2 deletions src/BootstrapBlazor.Shared/Components/Samples/Charts/Line.razor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//通过相对路径导入BootstrapBlazor.Chart的Chart.JS模块
import '../../../_content/BootstrapBlazor.Chart/js/chart.umd.js'
import Data from '../../../_content/BootstrapBlazor/modules/data.js'
import '../../../../BootstrapBlazor.Chart/js/chart.umd.js'
import Data from '../../../../BootstrapBlazor/modules/data.js'

export function init(id, chartData) {
const ctx = document.getElementById(id);
Expand Down
2 changes: 1 addition & 1 deletion src/BootstrapBlazor.Shared/Components/Samples/Icons/AntDesignIconList.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace BootstrapBlazor.Shared.Components.Samples.Icons;
/// <summary>
/// AntDesignIconList 组件
/// </summary>
[JSModuleAutoLoader("Samples/Icons/AntDesignIconList.razor.js")]
[JSModuleAutoLoader("../_content/BootstrapBlazor.Shared/Components/Samples/Icons/AntDesignIconList.razor.js")]
public partial class AntDesignIconList
{
private string? ClassString => CssBuilder.Default("icon-list")
Expand Down
6 changes: 3 additions & 3 deletions src/BootstrapBlazor.Shared/Components/Samples/Icons/AntDesignIconList.razor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { copy } from "../../../_content/BootstrapBlazor/modules/utility.js"
import Data from "../../../_content/BootstrapBlazor/modules/data.js"
import EventHandler from "../../../_content/BootstrapBlazor/modules/event-handler.js"
import { copy } from "../../../../BootstrapBlazor/modules/utility.js"
import Data from "../../../../BootstrapBlazor/modules/data.js"
import EventHandler from "../../../../BootstrapBlazor/modules/event-handler.js"

export function init(id) {
const el = document.getElementById(id);
Expand Down
2 changes: 1 addition & 1 deletion src/BootstrapBlazor.Shared/Components/Samples/Icons/ElementIconList.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace BootstrapBlazor.Shared.Components.Samples.Icons;
/// <summary>
/// ElementIconList 组件
/// </summary>
[JSModuleAutoLoader("Samples/Icons/ElementIconList.razor.js")]
[JSModuleAutoLoader("../_content/BootstrapBlazor.Shared/Components/Samples/Icons/ElementIconList.razor.js")]
public partial class ElementIconList
{
private string? ClassString => CssBuilder.Default("icon-list")
Expand Down
6 changes: 3 additions & 3 deletions src/BootstrapBlazor.Shared/Components/Samples/Icons/ElementIconList.razor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { copy } from "../../../_content/BootstrapBlazor/modules/utility.js"
import Data from "../../../_content/BootstrapBlazor/modules/data.js"
import EventHandler from "../../../_content/BootstrapBlazor/modules/event-handler.js"
import { copy } from "../../../../BootstrapBlazor/modules/utility.js"
import Data from "../../../../BootstrapBlazor/modules/data.js"
import EventHandler from "../../../../BootstrapBlazor/modules/event-handler.js"

export function init(id) {
const el = document.getElementById(id);
Expand Down
2 changes: 1 addition & 1 deletion src/BootstrapBlazor.Shared/Components/Samples/Icons/FAIconList.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ namespace BootstrapBlazor.Shared.Components.Samples.Icons;
/// <summary>
/// FAIconList 组件
/// </summary>
[JSModuleAutoLoader("Samples/Icons/FAIconList.razor.js", JSObjectReference = true)]
[JSModuleAutoLoader("../_content/BootstrapBlazor.Shared/Components/Samples/Icons/FAIconList.razor.js", JSObjectReference = true)]
public partial class FAIconList
{
private string? ClassString => CssBuilder.Default("icon-list")
Expand Down
6 changes: 3 additions & 3 deletions src/BootstrapBlazor.Shared/Components/Samples/Icons/FAIconList.razor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { copy } from "../../../_content/BootstrapBlazor/modules/utility.js"
import Data from "../../../_content/BootstrapBlazor/modules/data.js"
import EventHandler from "../../../_content/BootstrapBlazor/modules/event-handler.js"
import { copy } from "../../../../BootstrapBlazor/modules/utility.js"
import Data from "../../../../BootstrapBlazor/modules/data.js"
import EventHandler from "../../../../BootstrapBlazor/modules/event-handler.js"

export function init(id, invoke, updateMethod, showDialogMethod) {
const el = document.getElementById(id);
Expand Down
2 changes: 1 addition & 1 deletion src/BootstrapBlazor.Shared/Components/Samples/Icons/IconParkList.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace BootstrapBlazor.Shared.Components.Samples.Icons;
/// <summary>
/// ByteDanceIconList 组件
/// </summary>
[JSModuleAutoLoader("Samples/Icons/IconParkList.razor.js")]
[JSModuleAutoLoader("../_content/BootstrapBlazor.Shared/Components/Samples/Icons/IconParkList.razor.js")]
public partial class IconParkList : IAsyncDisposable
{
private string? ClassString => CssBuilder.Default("icon-list")
Expand Down
6 changes: 3 additions & 3 deletions src/BootstrapBlazor.Shared/Components/Samples/Icons/IconParkList.razor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { copy } from "../../../_content/BootstrapBlazor/modules/utility.js"
import Data from "../../../_content/BootstrapBlazor/modules/data.js"
import EventHandler from "../../../_content/BootstrapBlazor/modules/event-handler.js"
import { copy } from "../../../../BootstrapBlazor/modules/utility.js"
import Data from "../../../../BootstrapBlazor/modules/data.js"
import EventHandler from "../../../../BootstrapBlazor/modules/event-handler.js"

export function init(id) {
const el = document.getElementById(id);
Expand Down
2 changes: 1 addition & 1 deletion src/BootstrapBlazor.Shared/Components/Samples/Table/TablesSelection.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace BootstrapBlazor.Shared.Components.Samples.Table;
/// <summary>
/// 选择行示例代码
/// </summary>
[JSModuleAutoLoader("Samples/Table/TablesSelection.razor.js", AutoInvokeInit = false, AutoInvokeDispose = false)]
[JSModuleAutoLoader("../_content/BootstrapBlazor.Shared/Components/Samples/Table/TablesSelection.razor.js", AutoInvokeInit = false, AutoInvokeDispose = false)]
public partial class TablesSelection
{
/// <summary>
Expand Down