Skip to content

Commit 12f6602

Browse files
committed
Merge branch 'main' into doc-task
2 parents a68be42 + 60d1be7 commit 12f6602

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

src/BootstrapBlazor.Server/Components/App.razor

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@
4242

4343
<BlazorReconnector @rendermode="new InteractiveServerRenderMode(false)" />
4444

45-
<script src="_content/BootstrapBlazor.SummerNote/js/jquery-3.6.0.min.js"></script>
46-
<script src="_content/BootstrapBlazor/js/bootstrap.blazor.bundle.min.js"></script>
47-
<script src="_framework/blazor.web.js"></script>
45+
<script src="@Assets["_content/BootstrapBlazor.SummerNote/js/jquery-3.6.0.min.js"]"></script>
46+
<script src="@Assets["_content/BootstrapBlazor/js/bootstrap.blazor.bundle.min.js"]"></script>
47+
<script src="@Assets["_framework/blazor.web.js"]"></script>
4848
@if (Env.IsProduction())
4949
{
5050
<script type="text/javascript" src="https://cdn.wwads.cn/js/makemoney.js"></script>

src/BootstrapBlazor.Server/Components/Samples/Table/TablesEdit.razor

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,13 @@
101101
OnQueryAsync="@OnQueryAsync"
102102
OnAddAsync="@OnAddAsync" OnSaveAsync="@OnSaveAsync" OnDeleteAsync="@OnDeleteAsync">
103103
<TableColumns>
104-
<TableColumn @bind-Field="@context.DateTime" Width="180" />
104+
<TableColumn @bind-Field="@context.DateTime" Width="180">
105+
<EditTemplate Context="v">
106+
<div class="col-12 col-sm-6">
107+
<DateTimePicker @bind-Value="v.DateTime" ViewMode="DatePickerViewMode.DateTime" />
108+
</div>
109+
</EditTemplate>
110+
</TableColumn>
105111
<TableColumn @bind-Field="@context.Name">
106112
<EditTemplate Context="v">
107113
<div class="col-12 col-sm-6">

src/BootstrapBlazor/Components/Reconnector/ReconnectorContent.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
@inherits BootstrapModuleComponentBase
33
@attribute [BootstrapModuleAutoLoader("Reconnector/ReconnectorContent.razor.js", AutoInvokeDispose = false)]
44

5-
<div id="components-reconnect-modal">
5+
<div id="components-reconnect-modal" data-nosnippet>
66
<div class="reconnect-state show">
77
@if (ReconnectingTemplate != null)
88
{

0 commit comments

Comments
 (0)