From dd94ffd7c3ff5547240714690d0fb110945390ba Mon Sep 17 00:00:00 2001
From: Argo-Asicotech <argo@163.com>
Date: Wed, 19 Oct 2022 19:10:19 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20SelectTree=20?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=97=A0=E6=B3=95=E6=94=B6=E8=B5=B7=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/modules/select-tree.js            | 26 ++++++++++++++++---
 src/BootstrapBlazor/wwwroot/modules/select.js |  8 +++---
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/BootstrapBlazor/wwwroot/modules/select-tree.js b/src/BootstrapBlazor/wwwroot/modules/select-tree.js
index 904c6b612..05d4ef985 100644
--- a/src/BootstrapBlazor/wwwroot/modules/select-tree.js
+++ b/src/BootstrapBlazor/wwwroot/modules/select-tree.js
@@ -1,15 +1,35 @@
-import DropdownBase from "./base/base-dropdown.js";
-import { isDisabled } from "./base/index.js";
+import DropdownBase from "./base/base-dropdown.js"
+import EventHandler from "./base/event-handler.js"
+import { isDisabled } from "./base/index.js"
 
 export class SelectTree extends DropdownBase {
     _init() {
-        // el, obj, method
         this._input = this._element.querySelector('.form-select')
 
         super._init()
     }
 
+    _setListeners() {
+        EventHandler.on(this._toggleMenu, 'click', '.tree-node', e => {
+            if (this._isPopover) {
+                this._popover.hide()
+            } else {
+                const dropdown = bootstrap.Dropdown.getInstance(this._toggle)
+                if (dropdown) {
+                    dropdown.hide()
+                }
+            }
+        })
+
+        super._setListeners()
+    }
+
     _isDisabled() {
         return isDisabled(this._input)
     }
+
+    _dispose() {
+        EventHandler.off(this._toggleMenu, 'click', '.tree-node')
+        super._dispose();
+    }
 }
diff --git a/src/BootstrapBlazor/wwwroot/modules/select.js b/src/BootstrapBlazor/wwwroot/modules/select.js
index f4b3a19e6..93a98a492 100644
--- a/src/BootstrapBlazor/wwwroot/modules/select.js
+++ b/src/BootstrapBlazor/wwwroot/modules/select.js
@@ -1,8 +1,8 @@
-import EventHandler from "./base/event-handler.js";
-import { getHeight, getInnerHeight } from "./base/utility.js";
-import { SelectTree } from "./select-tree.js"
+import DropdownBase from "./base/base-dropdown.js"
+import EventHandler from "./base/event-handler.js"
+import { getHeight, getInnerHeight } from "./base/utility.js"
 
-export class Select extends SelectTree {
+export class Select extends DropdownBase {
     _init() {
         // el, obj, method
         this._search = this._element.querySelector('input.search-text')
-- 
Gitee


From 087f676f5e947564acb33765c90fee6765afe06e Mon Sep 17 00:00:00 2001
From: Argo-Asicotech <argo@163.com>
Date: Wed, 19 Oct 2022 19:10:46 +0800
Subject: [PATCH 2/2] chore: bump version 6.11.18

---
 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 65da67ab2..698950c6e 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
-    <Version>6.11.17</Version>
+    <Version>6.11.18</Version>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
-- 
Gitee