From 33641b85d852f9310a86b9df9b011162f4cbc126 Mon Sep 17 00:00:00 2001
From: Argo Zhang <Argo@163.com>
Date: Fri, 20 Mar 2020 12:10:50 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20Blazor=20=E5=A4=9A=20Tabs=20=E6=8C=82?=
 =?UTF-8?q?=E6=9E=B6=E8=84=9A=E6=9C=AC=E5=8A=9F=E8=83=BD=E5=A2=9E=E5=BC=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/Bootstrap.Admin/Pages/Shared/Header.razor    | 4 ++--
 src/admin/Bootstrap.Admin/Views/Shared/Header.cshtml   | 2 +-
 src/admin/Bootstrap.Admin/wwwroot/js/ba.blazor.js      | 6 ++++++
 src/admin/Bootstrap.Admin/wwwroot/js/common-scripts.js | 8 ++++++++
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/admin/Bootstrap.Admin/Pages/Shared/Header.razor b/src/admin/Bootstrap.Admin/Pages/Shared/Header.razor
index 2049c3ea..2e4e29e0 100644
--- a/src/admin/Bootstrap.Admin/Pages/Shared/Header.razor
+++ b/src/admin/Bootstrap.Admin/Pages/Shared/Header.razor
@@ -92,8 +92,8 @@
                 </div>
             }
             <div class="@(EnableBlazor ? "dropdown" : "dropdown d-none")">
-                <a class="shadow-success dropdown-mvc" href="Admin/Index" )" data-toggle="tooltip" title="NETCore MVC 模式">
-                    <img src="images/netcore2.png" )" />
+                <a class="shadow-success dropdown-mvc" href="#" data-method="blazor" data-toggle="tooltip" title="NETCore MVC 模式">
+                    <img src="images/netcore2.png" />
                 </a>
             </div>
         </div>
diff --git a/src/admin/Bootstrap.Admin/Views/Shared/Header.cshtml b/src/admin/Bootstrap.Admin/Views/Shared/Header.cshtml
index 7b352376..62d15916 100644
--- a/src/admin/Bootstrap.Admin/Views/Shared/Header.cshtml
+++ b/src/admin/Bootstrap.Admin/Views/Shared/Header.cshtml
@@ -91,7 +91,7 @@
                 </div>
             }
             <div class="@(Model.EnableBlazor ? "dropdown" : "dropdown d-none")">
-                <a class="shadow-success dropdown-blazor" href="~/Pages" data-toggle="tooltip" title="Blazor 多 Tabs 模式">
+                <a class="shadow-success dropdown-blazor" data-method="blazor" href="#" data-toggle="tooltip" title="Blazor 多 Tabs 模式">
                     <img src="~/images/blazor.svg" />
                 </a>
             </div>
diff --git a/src/admin/Bootstrap.Admin/wwwroot/js/ba.blazor.js b/src/admin/Bootstrap.Admin/wwwroot/js/ba.blazor.js
index 744d1389..48396ba6 100644
--- a/src/admin/Bootstrap.Admin/wwwroot/js/ba.blazor.js
+++ b/src/admin/Bootstrap.Admin/wwwroot/js/ba.blazor.js
@@ -263,6 +263,12 @@
             })
             .on('inserted.bs.tooltip', '.is-invalid', function () {
                 $('#' + $(this).attr('aria-describedby')).addClass('is-invalid');
+            })
+            .on('click', '[data-method="blazor"]', function (e) {
+                e.preventDefault();
+                var path = window.location.pathname.replace('/Pages', '');
+                var search = window.location.search;
+                window.location = path + search;
             });
     });
 })(jQuery);
diff --git a/src/admin/Bootstrap.Admin/wwwroot/js/common-scripts.js b/src/admin/Bootstrap.Admin/wwwroot/js/common-scripts.js
index c797f52a..3ebc9e69 100644
--- a/src/admin/Bootstrap.Admin/wwwroot/js/common-scripts.js
+++ b/src/admin/Bootstrap.Admin/wwwroot/js/common-scripts.js
@@ -165,6 +165,14 @@ $(function () {
     // enable animoation effect
     $('body').removeClass('trans-mute');
 
+    // blazor widget 切换功能
+    $('[data-method="blazor"]').on('click', function (e) { 
+        e.preventDefault();
+        var path = window.location.pathname;
+        var search = window.location.search;
+        window.location = $.formatUrl("Pages" + path + search);
+    });
+
     // 自动锁屏功能
     var mousePosition = { screenX: 0, screenY: 0 };
     var count = 1;