Merge branch 'dotnetcore:main' into main

Author: dotnetstd

.github/workflows/pack.yml

@@ -10,6 +10,9 @@ on:
 jobs:
   pack:
     runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: read
 
     steps:
     - uses: actions/checkout@v4
@@ -19,9 +22,15 @@ jobs:
       with:
         dotnet-version: 9.0.x
 
+    - name: NuGet login
+      uses: NuGet/login@v1
+      id: login
+      with:
+        user: ${{ secrets.NUGET_USER }}
+
     - name: Publish to Nuget
       env:
-        NUGET_API_KEY: ${{secrets.NUGET_API_KEY}}
+        NUGET_API_KEY: ${{steps.login.outputs.NUGET_API_KEY}}
         Bundle: True
 
       run: |

.gitignore

@@ -373,14 +373,6 @@ src/**/wwwroot/**/uploader
 # npm
 **/package-lock.json
 
-# sass
-**/BootstrapBlazor/wwwroot/css/animate.min.css
-**/BootstrapBlazor/wwwroot/css/bootstrapblazor.min.css
-**/BootstrapBlazor/wwwroot/css/bootstrap.min.css
-**/BootstrapBlazor/wwwroot/css/bootstrap.rtl.min.css
-**/BootstrapBlazor/wwwroot/css/sweetalert2.css
-**/BootstrapBlazor/wwwroot/css/motronic.min.css
-**/BootstrapBlazor/wwwroot/css/nano.min.css
-
 # Bootstrap
 **/BootstrapBlazor/wwwroot/js/bootstrap.blazor.bundle.min.js
+**/BootstrapBlazor/wwwroot/css/bootstrapblazor.min.css

BootstrapBlazor.slnx

@@ -1,4 +1,11 @@
 <Solution>
+  <Folder Name="/actions/">
+    <File Path=".github/workflows/auto-pull-request-checks.yml" />
+    <File Path=".github/workflows/build.yml" />
+    <File Path=".github/workflows/docker.yml" />
+    <File Path=".github/workflows/pack.yml" />
+    <File Path=".github/workflows/publish.yml" />
+  </Folder>
   <Folder Name="/configuration/">
     <File Path=".editorconfig" />
     <File Path=".gitignore" />

src/BootstrapBlazor.Server/Components/Components/FooterCounter.razor.js

@@ -33,7 +33,6 @@ export function updateFooterCounter(id, totalSeconds) {
     const counter = Data.get(id);
     if (counter) {
         counter.totalSeconds = totalSeconds;
-        console.log(`FooterCounter updated: ${id}, totalSeconds: ${totalSeconds}`);
     }
 }
 

src/BootstrapBlazor.Server/Components/Samples/Logouts.razor.cs

@@ -21,6 +21,14 @@ private static AttributeItem[] GetAttributes() =>
             DefaultValue = " — "
         },
         new()
+        {
+            Name = nameof(Logout.AvatarRadius),
+            Description = "登出组件当前用户头像圆角半径",
+            Type = "string",
+            ValueList = " — ",
+            DefaultValue = " — "
+        },
+        new()
         {
             Name = nameof(Logout.DisplayName),
             Description = "登出组件当前用户显示文字",

src/BootstrapBlazor.Server/Components/Samples/MindMaps.razor.js

@@ -5,7 +5,7 @@
 window.BootstrapBlazor.MindMap = {
     callbacks: {
         clickCustom: function (args) {
-            console.log(this, args);
+
         }
     }
 }

src/BootstrapBlazor/BootstrapBlazor.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>9.10.2</Version>
+    <Version>9.11.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
@@ -10,16 +10,18 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Remove="sasscompiler.json" />
-    <Content Remove="wwwroot\core\**\*.*" />
-    <Content Remove="wwwroot\lib\**\*.css" />
-    <Content Remove="wwwroot\scss\**\*.*" />
-    <Content Remove="wwwroot\src\**\*.*" />
-    <None Include="sasscompiler.json" />
-    <None Include="wwwroot\core\**\*.*" />
-    <None Include="wwwroot\lib\**\*.css" />
-    <None Include="wwwroot\scss\**\*.*" />
-    <None Include="wwwroot\src\**\*.*" />
+    <Content Remove="wwwroot\core\bootstrap\css\bootstrap.css" />
+    <Content Remove="wwwroot\core\bootstrap\css\bootstrap.rtl.css" />
+    <Content Remove="wwwroot\core\bootstrap\js\bootstrap.bundle.js" />
+    <Content Remove="wwwroot\core\bootstrap\js\bootstrap.bundle.min.js" />
+    <Content Remove="wwwroot\lib\swal\sweetalert2.css" />
+    <Content Remove="wwwroot\scss\*" />
+    <None Include="wwwroot\core\bootstrap\css\bootstrap.css" />
+    <None Include="wwwroot\core\bootstrap\css\bootstrap.rtl.css" />
+    <None Include="wwwroot\core\bootstrap\js\bootstrap.bundle.js" />
+    <None Include="wwwroot\core\bootstrap\js\bootstrap.bundle.min.js" />
+    <None Include="wwwroot\lib\swal\sweetalert2.css" />
+    <None Include="wwwroot\scss\*" />
   </ItemGroup>
 
   <ItemGroup>

src/BootstrapBlazor/Components/Affix/Affix.razor.cs

@@ -3,6 +3,8 @@
 // See the LICENSE file in the project root for more information.
 // Maintainer: Argo Zhang([email protected]) Website: https://www.blazor.zone
 
+using System.Globalization;
+
 namespace BootstrapBlazor.Components;
 
 /// <summary>
@@ -40,8 +42,8 @@ public partial class Affix
         .Build();
 
     private string? StyleString => CssBuilder.Default("position: sticky;")
-        .AddStyle("z-index", $"{ZIndex}", ZIndex.HasValue)
-        .AddStyle(Position.ToDescriptionString(), $"{Offset}px")
+        .AddClass($"z-index: {ZIndex};", ZIndex.HasValue)
+        .AddClass($"{Position.ToDescriptionString()}: {Offset.ToString(CultureInfo.InvariantCulture)}px;")
         .AddStyleFromAttributes(AdditionalAttributes)
         .Build();
 }

src/BootstrapBlazor/Components/AutoComplete/AutoComplete.razor.cs

@@ -85,6 +85,8 @@ public partial class AutoComplete
     [NotNull]
     private RenderTemplate? _dropdown = null;
 
+    private string? _clientValue;
+
     private string? ClassString => CssBuilder.Default("auto-complete")
         .AddClass("is-clearable", IsClearable)
         .Build();
@@ -130,13 +132,36 @@ protected override void OnParametersSet()
         PlaceHolder ??= Localizer[nameof(PlaceHolder)];
         Icon ??= IconTheme.GetIconByKey(ComponentIcons.AutoCompleteIcon);
         LoadingIcon ??= IconTheme.GetIconByKey(ComponentIcons.LoadingIcon);
+
+        _clientValue = Value;
     }
 
     /// <summary>
     /// <inheritdoc/>
     /// </summary>
+    /// <param name="firstRender"></param>
     /// <returns></returns>
-    protected override Task InvokeInitAsync() => InvokeVoidAsync("init", Id, Interop, Value);
+    protected override async Task OnAfterRenderAsync(bool firstRender)
+    {
+        await base.OnAfterRenderAsync(firstRender);
+
+        if (!firstRender)
+        {
+            if (Value != _clientValue)
+            {
+                _clientValue = Value;
+                await InvokeVoidAsync("setValue", Id, _clientValue);
+            }
+        }
+    }
+
+    /// <summary>
+    /// <inheritdoc/>
+    /// </summary>
+    /// <returns></returns>
+    protected override Task InvokeInitAsync() => InvokeVoidAsync("init", Id, Interop, Value, GetChangedEventCallbackName());
+
+    private string? GetChangedEventCallbackName() => (OnValueChanged != null || ValueChanged.HasDelegate) ? nameof(TriggerChange) : null;
 
     /// <summary>
     /// Gets whether show the clear button.
@@ -199,6 +224,20 @@ public async Task TriggerFilter(string val)
         _dropdown.Render();
     }
 
+    /// <summary>
+    /// 支持双向绑定 由客户端 JavaScript 触发
+    /// </summary>
+    /// <param name="v"></param>
+    /// <returns></returns>
+    [JSInvokable]
+    public Task TriggerChange(string v)
+    {
+        _clientValue = v;
+        CurrentValueAsString = v;
+
+        return Task.CompletedTask;
+    }
+
     private List<string> GetFilterItemsByValue(string val)
     {
         var comparison = IgnoreCase ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal;

src/BootstrapBlazor/Components/AutoComplete/AutoComplete.razor.js

@@ -5,13 +5,15 @@ import EventHandler from "../../modules/event-handler.js"
 import Input from "../../modules/input.js"
 import Popover from "../../modules/base-popover.js"
 
-export function init(id, invoke) {
+export function init(id, invoke, value, changedEventCallback) {
     const el = document.getElementById(id)
     const menu = el.querySelector('.dropdown-menu')
     const input = document.getElementById(`${id}_input`)
     const ac = { el, invoke, menu, input }
     Data.set(id, ac)
 
+    input.value = value;
+
     const isPopover = input.getAttribute('data-bs-toggle') === 'bb.dropdown';
     if (isPopover) {
         ac.popover = Popover.init(el, { toggleClass: '[data-bs-toggle="bb.dropdown"]' });
@@ -62,6 +64,12 @@ export function init(id, invoke) {
         }
     });
 
+    if (changedEventCallback) {
+        EventHandler.on(input, 'change', e => {
+            invoke.invokeMethodAsync(changedEventCallback, e.target.value);
+        });
+    }
+
     let filterDuration = duration;
     if (filterDuration === 0) {
         filterDuration = 200;