Skip to content

refact(UniverSheet): compatible net11 #1146

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

Merged
ArgoZhang merged 2 commits into from
Sep 21, 2026
Merged

refact(UniverSheet): compatible net11 #1146

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ada51c
refactor: 重构代码
ArgoZhang Sep 16, 2026
80a589a
Merge remote-tracking branch 'origin/master' into feat-univer
ArgoZhang Sep 21, 2026
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
22 changes: 16 additions & 6 deletions src/components/BootstrapBlazor.UniverSheet/Components/UniverSheet.razor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,29 +141,39 @@ protected override async Task OnAfterRenderAsync(bool firstRender)
UniverSheetStyleUrl
});

#if NET9_0_OR_GREATER
private string UniverBundleStyleUrl
{
get
{
#if NET9_0_OR_GREATER
return Assets[UniverBundleStylePath];
#else
return UniverBundleStylePath;
#endif
}
}

private string UniverSheetStyleUrl
{
get
{
#if NET9_0_OR_GREATER
return Assets[UniverSheetStylePath];
}
}
#else
private static string UniverBundleStyleUrl
{
get
{
return UniverBundleStylePath;
}
}

private static string UniverSheetStyleUrl
{
get
{
return UniverSheetStylePath;
#endif
}
}
#endif

/// <summary>
/// <para lang="zh">推送数据方法</para>
Expand Down
Loading