From f64c5817680fd16aa48961b1e2c309d58081acc0 Mon Sep 17 00:00:00 2001
From: Argo-Asicotech <argo@163.com>
Date: Fri, 25 Nov 2022 00:18:43 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20Modal=20?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E5=BC=80=E5=90=AF=E6=8B=96=E5=8A=A8=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E6=97=A0=E6=B3=95=E5=85=B3=E9=97=AD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/modules/base/utility.js           | 19 +++++++++++--------
 src/BootstrapBlazor/wwwroot/modules/modal.js  |  3 +++
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/BootstrapBlazor/wwwroot/modules/base/utility.js b/src/BootstrapBlazor/wwwroot/modules/base/utility.js
index 0abb70c18..a1d9d198d 100644
--- a/src/BootstrapBlazor/wwwroot/modules/base/utility.js
+++ b/src/BootstrapBlazor/wwwroot/modules/base/utility.js
@@ -196,16 +196,19 @@ const setIndeterminate = (object, state) => {
 
 const drag = (element, start, move, end) => {
     const handleDragStart = e => {
-        e.preventDefault()
-        e.stopPropagation()
+        let notDrag = false
+        if (isFunction(start)) {
+            notDrag = start(e) || false
+        }
 
-        document.addEventListener('mousemove', handleDragMove)
-        document.addEventListener('touchmove', handleDragMove)
-        document.addEventListener('mouseup', handleDragEnd)
-        document.addEventListener('touchend', handleDragEnd)
+        if (!notDrag) {
+            e.preventDefault()
+            e.stopPropagation()
 
-        if (isFunction(start)) {
-            start(e)
+            document.addEventListener('mousemove', handleDragMove)
+            document.addEventListener('touchmove', handleDragMove)
+            document.addEventListener('mouseup', handleDragEnd)
+            document.addEventListener('touchend', handleDragEnd)
         }
     }
 
diff --git a/src/BootstrapBlazor/wwwroot/modules/modal.js b/src/BootstrapBlazor/wwwroot/modules/modal.js
index 78ccdd062..ba406e826 100644
--- a/src/BootstrapBlazor/wwwroot/modules/modal.js
+++ b/src/BootstrapBlazor/wwwroot/modules/modal.js
@@ -92,6 +92,9 @@ export class Modal extends BlazorComponent {
             this._header = this._dialog.querySelector('.modal-header')
             drag(this._header,
                 e => {
+                    if (e.srcElement.closest('.modal-header-buttons')) {
+                        return true
+                    }
                     this._originX = e.clientX || e.touches[0].clientX;
                     this._originY = e.clientY || e.touches[0].clientY;
 
-- 
Gitee


From 7de14330717b7a40a0818849d6416d8efa20f6a7 Mon Sep 17 00:00:00 2001
From: Argo-Asicotech <argo@163.com>
Date: Fri, 25 Nov 2022 00:18:57 +0800
Subject: [PATCH 2/3] =?UTF-8?q?test:=20=E4=BF=AE=E5=A4=8D=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test/UnitTest/Components/AutoFillTest.cs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/test/UnitTest/Components/AutoFillTest.cs b/test/UnitTest/Components/AutoFillTest.cs
index 2ce809a4b..037be85e0 100644
--- a/test/UnitTest/Components/AutoFillTest.cs
+++ b/test/UnitTest/Components/AutoFillTest.cs
@@ -269,6 +269,7 @@ public class AutoFillTest : BootstrapBlazorTestBase
     [Fact]
     public void ValidateForm_Ok()
     {
+        var v = "";
         IEnumerable<string> items = new List<string>() { "test1", "test2" };
         var cut = Context.RenderComponent<ValidateForm>(pb =>
         {
@@ -276,14 +277,20 @@ public class AutoFillTest : BootstrapBlazorTestBase
             pb.AddChildContent<AutoFill<string>>(pb =>
             {
                 pb.Add(a => a.Items, items);
+                pb.Add(a => a.OnCustomFilter, key =>
+                {
+                    v = key;
+                    return Task.FromResult(items);
+                });
             });
         });
 
         // Trigger js invoke
         var comp = cut.FindComponent<AutoFill<string>>().Instance;
         comp.TriggerOnChange("v");
-
-        Assert.Equal("v", comp.Value);
+        var input = cut.Find("input");
+        cut.InvokeAsync(() => input.KeyUp("Enter"));
+        Assert.Equal("v", v);
     }
 
     class AutoFillNullStringMock
-- 
Gitee


From 782d2d807919a511dfe9bf7addb0f581552efe55 Mon Sep 17 00:00:00 2001
From: Argo-Asicotech <argo@163.com>
Date: Fri, 25 Nov 2022 00:20:25 +0800
Subject: [PATCH 3/3] chore: bump version 7.0.8-beta01

---
 src/BootstrapBlazor/BootstrapBlazor.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
index 20f51727a..7617f4b00 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>7.0.7</Version>
+    <Version>7.0.8-beta01</Version>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
-- 
Gitee