mirror of https://gitee.com/y_project/RuoYi.git
解锁屏幕打开上次页签
parent
04e7a314f8
commit
67b3a4f7e2
|
@ -501,6 +501,7 @@ $(function() {
|
||||||
|
|
||||||
// 锁定屏幕
|
// 锁定屏幕
|
||||||
$('#lockScreen').on('click', function () {
|
$('#lockScreen').on('click', function () {
|
||||||
|
storage.set('lockPath', $('.page-tabs-content').find('.active').attr('data-id'));
|
||||||
location.href = ctx + "lockscreen";
|
location.href = ctx + "lockscreen";
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -379,6 +379,7 @@ function applyPath(url) {
|
||||||
}
|
}
|
||||||
|
|
||||||
$(function() {
|
$(function() {
|
||||||
|
var lockPath = storage.get('lockPath');
|
||||||
if($.common.equals("history", mode) && window.performance.navigation.type == 1) {
|
if($.common.equals("history", mode) && window.performance.navigation.type == 1) {
|
||||||
var url = storage.get('publicPath');
|
var url = storage.get('publicPath');
|
||||||
if ($.common.isNotEmpty(url)) {
|
if ($.common.isNotEmpty(url)) {
|
||||||
|
@ -386,6 +387,9 @@ $(function() {
|
||||||
} else {
|
} else {
|
||||||
$(".navbar-toolbar li a").eq(0).click();
|
$(".navbar-toolbar li a").eq(0).click();
|
||||||
}
|
}
|
||||||
|
} else if($.common.isNotEmpty(lockPath)) {
|
||||||
|
applyPath(lockPath);
|
||||||
|
storage.remove('lockPath');
|
||||||
} else {
|
} else {
|
||||||
var hash = location.hash;
|
var hash = location.hash;
|
||||||
if ($.common.isNotEmpty(hash)) {
|
if ($.common.isNotEmpty(hash)) {
|
||||||
|
|
|
@ -321,11 +321,15 @@ function applyPath(url) {
|
||||||
}
|
}
|
||||||
|
|
||||||
$(function() {
|
$(function() {
|
||||||
|
var lockPath = storage.get('lockPath');
|
||||||
if($.common.equals("history", mode) && window.performance.navigation.type == 1) {
|
if($.common.equals("history", mode) && window.performance.navigation.type == 1) {
|
||||||
var url = storage.get('publicPath');
|
var url = storage.get('publicPath');
|
||||||
if ($.common.isNotEmpty(url)) {
|
if ($.common.isNotEmpty(url)) {
|
||||||
applyPath(url);
|
applyPath(url);
|
||||||
}
|
}
|
||||||
|
} else if($.common.isNotEmpty(lockPath)) {
|
||||||
|
applyPath(lockPath);
|
||||||
|
storage.remove('lockPath');
|
||||||
} else {
|
} else {
|
||||||
var hash = location.hash;
|
var hash = location.hash;
|
||||||
if ($.common.isNotEmpty(hash)) {
|
if ($.common.isNotEmpty(hash)) {
|
||||||
|
|
|
@ -257,7 +257,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 下划线转驼峰命名
|
* 驼峰转下划线命名
|
||||||
*/
|
*/
|
||||||
public static String toUnderScoreCase(String str)
|
public static String toUnderScoreCase(String str)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue