From 55f450ee594e08213a8b227de4a862da3b17c2dc Mon Sep 17 00:00:00 2001
From: Argo-Asicotech <argo@163.com>
Date: Fri, 9 Dec 2022 02:43:30 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20anchor=20=E7=BB=84=E4=BB=B6=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC=E6=9B=B4=E6=96=B0=E6=94=AF=E6=8C=81=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BD=9C=E4=B8=BA=E5=AE=B9=E5=99=A8=E5=AE=9A=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/BootstrapBlazor/wwwroot/modules/anchor.js       | 7 +++++--
 src/BootstrapBlazor/wwwroot/modules/base/utility.js | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/BootstrapBlazor/wwwroot/modules/anchor.js b/src/BootstrapBlazor/wwwroot/modules/anchor.js
index ccbc31838..c24c0c1e6 100644
--- a/src/BootstrapBlazor/wwwroot/modules/anchor.js
+++ b/src/BootstrapBlazor/wwwroot/modules/anchor.js
@@ -31,8 +31,11 @@ export class Anchor extends BlazorComponent {
                 if (offset) {
                     margin = margin - parseInt(offset)
                 }
-                const winScroll = getWindowScroll(container);
-                container.scrollTo(0, margin + winScroll.scrollTop);
+                let winScroll = container;
+                if (winScroll.scrollTop === undefined) {
+                    winScroll = getWindowScroll(container)
+                }
+                container.scrollTo(0, margin + winScroll.scrollTop)
             }
         });
     }
diff --git a/src/BootstrapBlazor/wwwroot/modules/base/utility.js b/src/BootstrapBlazor/wwwroot/modules/base/utility.js
index a1d9d198d..a985a922a 100644
--- a/src/BootstrapBlazor/wwwroot/modules/base/utility.js
+++ b/src/BootstrapBlazor/wwwroot/modules/base/utility.js
@@ -32,9 +32,12 @@ const copy = (text = '') => {
 
 const getDescribedElement = (element, selector = 'aria-describedby') => {
     if (isElement(element)) {
-        const id = element.getAttribute(selector)
+        let id = element.getAttribute(selector)
         if (id) {
-            return document.querySelector(`#${id}`)
+            if (id.indexOf('.') === -1) {
+                id = `#${id}`
+            }
+            return document.querySelector(id)
         }
     }
     return null
-- 
Gitee