From 3039601c42e795ac7f31f191811253fa9802a942 Mon Sep 17 00:00:00 2001
From: Ricky <11748854@qq.com>
Date: Fri, 11 Sep 2020 10:42:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=82=B9=E5=87=BB=E5=B7=A6?=
 =?UTF-8?q?=E4=B8=8A=E8=A7=92=E8=BF=94=E5=9B=9E=E9=A6=96=E9=A1=B5=EF=BC=8C?=
 =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8=E5=88=B7=E6=96=B0=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E4=B9=8B=E5=89=8D=E7=9A=84=E8=8F=9C=E5=8D=95=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E5=BC=B9=E5=87=BA;=E8=B6=85=E5=87=BA=E5=AD=97=E7=AC=A6?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=A2=9E=E5=8A=A0=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-admin/src/main/resources/static/css/style.css        | 2 ++
 ruoyi-admin/src/main/resources/templates/index-topnav.html | 3 +++
 ruoyi-admin/src/main/resources/templates/index.html        | 7 +++++++
 3 files changed, 12 insertions(+)

diff --git a/ruoyi-admin/src/main/resources/static/css/style.css b/ruoyi-admin/src/main/resources/static/css/style.css
index f53e8105e..5f79f3220 100644
--- a/ruoyi-admin/src/main/resources/static/css/style.css
+++ b/ruoyi-admin/src/main/resources/static/css/style.css
@@ -1175,6 +1175,8 @@ button.dim:active:before {
 /* TOOLTIPS */
 .tooltip-inner {
     background-color: #2F4050;
+   	word-break: break-all;
+    overflow-wrap: break-word;
 }
 
 .tooltip.top .tooltip-arrow {
diff --git a/ruoyi-admin/src/main/resources/templates/index-topnav.html b/ruoyi-admin/src/main/resources/templates/index-topnav.html
index b93f6376a..7f6d526a2 100644
--- a/ruoyi-admin/src/main/resources/templates/index-topnav.html
+++ b/ruoyi-admin/src/main/resources/templates/index-topnav.html
@@ -383,6 +383,9 @@ $(function() {
 	        var url = hash.substring(1, hash.length);
 	        applyPath(url);
 	    } else {
+	    	if($.common.equals("history", mode)) {
+	    		storage.set('publicPath', "");
+	    	}
 	    	$(".navbar-toolbar li a").eq(0).click();
 	    }
 	}
diff --git a/ruoyi-admin/src/main/resources/templates/index.html b/ruoyi-admin/src/main/resources/templates/index.html
index 95e2819fb..5b13d9e9b 100644
--- a/ruoyi-admin/src/main/resources/templates/index.html
+++ b/ruoyi-admin/src/main/resources/templates/index.html
@@ -323,6 +323,13 @@ $(function() {
 	    if ($.common.isNotEmpty(hash)) {
 	        var url = hash.substring(1, hash.length);
 	        applyPath(url);
+	    } else {
+	    	if($.common.equals("history", mode)) {
+	    		storage.set('publicPath', "");
+	    	} else {
+	    		var nowUrl = window.location.href;
+	    		window.location.href = nowUrl.substring(0, nowUrl.indexOf("#"))
+	    	}
 	    }
 	}
 });