diff --git a/js/okadmin.js b/js/okadmin.js
index a98d6d1..b8a6910 100644
--- a/js/okadmin.js
+++ b/js/okadmin.js
@@ -2,344 +2,348 @@
var objOkTab = "";
layui.use(["element", "layer", "okUtils", "okTab", "okLayer", "okContextMenu", "okHoliday"], function () {
- var okUtils = layui.okUtils;
- var $ = layui.jquery;
- var layer = layui.layer;
- var okLayer = layui.okLayer;
- var okHoliday = layui.okHoliday;
+ var okUtils = layui.okUtils;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var okLayer = layui.okLayer;
+ var okHoliday = layui.okHoliday;
- var okTab = layui.okTab({
- // 菜单请求路径
- url: "data/navs.json",
- // 允许同时选项卡的个数
- openTabNum: 30,
- // 如果返回的结果和navs.json中的数据结构一致可省略这个方法
- parseData: function (data) {
- return data;
- }
- });
- objOkTab = okTab;
+ var okTab = layui.okTab({
+ // 菜单请求路径
+ url: "data/navs.json",
+ // 允许同时选项卡的个数
+ openTabNum: 30,
+ // 如果返回的结果和navs.json中的数据结构一致可省略这个方法
+ parseData: function (data) {
+ return data;
+ }
+ });
+ objOkTab = okTab;
okLoading.close();/**关闭加载动画*/
- /**
- * 左侧导航渲染完成之后的操作
- */
- okTab.render(function () {
- /**tab栏的鼠标右键事件**/
- $("body .ok-tab").okContextMenu({
- width: 'auto',
- itemHeight: 30,
- menu: [
- {
- text: "定位所在页",
- icon: "ok-icon ok-icon-location",
- callback: function () {
- okTab.positionTab();
- }
- },
- {
- text: "关闭当前页",
- icon: "ok-icon ok-icon-roundclose",
- callback: function () {
- okTab.tabClose(1);
- }
- },
- {
- text: "关闭其他页",
- icon: "ok-icon ok-icon-roundclose",
- callback: function () {
- okTab.tabClose(2);
- }
- },
- {
- text: "关闭所有页",
- icon: "ok-icon ok-icon-roundclose",
- callback: function () {
+ /**
+ * 左侧导航渲染完成之后的操作
+ */
+ okTab.render(function () {
+ /**tab栏的鼠标右键事件**/
+ $("body .ok-tab").okContextMenu({
+ width: 'auto',
+ itemHeight: 30,
+ menu: [
+ {
+ text: "定位所在页",
+ icon: "ok-icon ok-icon-location",
+ callback: function () {
+ okTab.positionTab();
+ }
+ },
+ {
+ text: "关闭当前页",
+ icon: "ok-icon ok-icon-roundclose",
+ callback: function () {
+ okTab.tabClose(1);
+ }
+ },
+ {
+ text: "关闭其他页",
+ icon: "ok-icon ok-icon-roundclose",
+ callback: function () {
+ okTab.tabClose(2);
+ }
+ },
+ {
+ text: "关闭所有页",
+ icon: "ok-icon ok-icon-roundclose",
+ callback: function () {
- okTab.tabClose(3);
- }
- }
- ]
- });
- });
+ okTab.tabClose(3);
+ }
+ }
+ ]
+ });
+ });
- /**
- * 添加新窗口
- */
- $("body").on("click", "#navBar .layui-nav-item a, #userInfo a", function () {
- // 如果不存在子级
- if ($(this).siblings().length == 0) {
- okTab.tabAdd($(this));
- }
- // 关闭其他展开的二级标签
- $(this).parent("li").siblings().removeClass("layui-nav-itemed");
- if (!$(this).attr("lay-id")) {
- var topLevelEle = $(this).parents("li.layui-nav-item");
- var childs = $("#navBar > li > dl.layui-nav-child").not(topLevelEle.children("dl.layui-nav-child"));
- childs.removeAttr("style");
- }
- });
+ /**
+ * 添加新窗口
+ */
+ $("body").on("click", "#navBar .layui-nav-item a, #userInfo a", function () {
+ // 如果不存在子级
+ if ($(this).siblings().length == 0) {
+ okTab.tabAdd($(this));
+ }
+ // 关闭其他展开的二级标签
+ $(this).parent("li").siblings().removeClass("layui-nav-itemed");
+ if (!$(this).attr("lay-id")) {
+ var topLevelEle = $(this).parents("li.layui-nav-item");
+ var childs = $("#navBar > li > dl.layui-nav-child").not(topLevelEle.children("dl.layui-nav-child"));
+ childs.removeAttr("style");
+ }
+ });
- /**
- * 左侧菜单展开动画
- */
- $("#navBar").on("click", ".layui-nav-item a", function () {
- if (!$(this).attr("lay-id")) {
- var superEle = $(this).parent();
- var ele = $(this).next('.layui-nav-child');
- var height = ele.height();
- ele.css({"display": "block"});
- // 是否是展开状态
- if (superEle.is(".layui-nav-itemed")) {
- ele.height(0);
- ele.animate({height: height + "px"}, function () {
- ele.css({height: "auto"});
- });
- } else {
- ele.animate({height: 0}, function () {
- ele.removeAttr("style");
- });
- }
- }
- });
+ /**
+ * 左侧菜单展开动画
+ */
+ $("#navBar").on("click", ".layui-nav-item a", function () {
+ if (!$(this).attr("lay-id")) {
+ var superEle = $(this).parent();
+ var ele = $(this).next('.layui-nav-child');
+ var height = ele.height();
+ ele.css({"display": "block"});
+ // 是否是展开状态
+ if (superEle.is(".layui-nav-itemed")) {
+ ele.height(0);
+ ele.animate({height: height + "px"}, function () {
+ ele.css({height: "auto"});
+ });
+ } else {
+ ele.animate({height: 0}, function () {
+ ele.removeAttr("style");
+ });
+ }
+ }
+ });
- /**
- * 左边菜单显隐功能
- */
- $(".ok-menu").click(function () {
- $(".layui-layout-admin").toggleClass("ok-left-hide");
- $(this).find("i").toggleClass("ok-menu-hide");
- localStorage.setItem("isResize", false);
- setTimeout(function () {
- localStorage.setItem("isResize", true);
- }, 1200);
- });
+ /**
+ * 左边菜单显隐功能
+ */
+ $(".ok-menu").click(function () {
+ $(".layui-layout-admin").toggleClass("ok-left-hide");
+ $(this).find("i").toggleClass("ok-menu-hide");
+ localStorage.setItem("isResize", false);
+ setTimeout(function () {
+ localStorage.setItem("isResize", true);
+ }, 1200);
+ });
- /**
- * 移动端的处理事件
- */
- $("body").on("click", ".layui-layout-admin .ok-left a[data-url], .ok-make", function () {
- if ($(".layui-layout-admin").hasClass("ok-left-hide")) {
- $(".layui-layout-admin").removeClass("ok-left-hide");
- $(".ok-menu").find('i').removeClass("ok-menu-hide");
- }
- });
+ /**
+ * 移动端的处理事件
+ */
+ $("body").on("click", ".layui-layout-admin .ok-left a[data-url], .ok-make", function () {
+ if ($(".layui-layout-admin").hasClass("ok-left-hide")) {
+ $(".layui-layout-admin").removeClass("ok-left-hide");
+ $(".ok-menu").find('i').removeClass("ok-menu-hide");
+ }
+ });
- /**
- * tab左右移动
- */
- $("body").on("click", ".okNavMove", function () {
- var moveId = $(this).attr("data-id");
- var that = this;
- okTab.navMove(moveId, that);
- });
+ /**
+ * tab左右移动
+ */
+ $("body").on("click", ".okNavMove", function () {
+ var moveId = $(this).attr("data-id");
+ var that = this;
+ okTab.navMove(moveId, that);
+ });
- /**
- * 刷新当前tab页
- */
- $("body").on("click", ".ok-refresh", function () {
- okTab.refresh(this);
- });
+ /**
+ * 刷新当前tab页
+ */
+ $("body").on("click", ".ok-refresh", function () {
+ okTab.refresh(this, function (okTab) {
+ //刷新之后所处理的事件
+ });
+ });
- /**
- * 关闭tab页
- */
- $("body").on("click", "#tabAction a", function () {
- var num = $(this).attr("data-num");
- okTab.tabClose(num);
- });
+ /**
+ * 关闭tab页
+ */
+ $("body").on("click", "#tabAction a", function () {
+ var num = $(this).attr("data-num");
+ okTab.tabClose(num);
+ });
- /**
- * 键盘的事件监听
- */
- $("body").on("keydown", function (event) {
- event = event || window.event || arguments.callee.caller.arguments[0];
+ /**
+ * 键盘的事件监听
+ */
+ $("body").on("keydown", function (event) {
+ event = event || window.event || arguments.callee.caller.arguments[0];
- // 按 Esc
- if (event && event.keyCode === 27) {
- console.log("Esc");
- $("#fullScreen").children("i").eq(0).removeClass("layui-icon-screen-restore");
- }
- // 按 F11
- if (event && event.keyCode == 122) {
- console.log("F11");
- $("#fullScreen").children("i").eq(0).addClass("layui-icon-screen-restore");
- }
- });
+ // 按 Esc
+ if (event && event.keyCode === 27) {
+ console.log("Esc");
+ $("#fullScreen").children("i").eq(0).removeClass("layui-icon-screen-restore");
+ }
+ // 按 F11
+ if (event && event.keyCode == 122) {
+ console.log("F11");
+ $("#fullScreen").children("i").eq(0).addClass("layui-icon-screen-restore");
+ }
+ });
/**
* 全屏/退出全屏
*/
- $("body").on("click", "#fullScreen", function () {
- if ($(this).children("i").hasClass("layui-icon-screen-restore")) {
- screenFun(2).then(function () {
- $("#fullScreen").children("i").eq(0).removeClass("layui-icon-screen-restore");
- });
- } else {
- screenFun(1).then(function () {
- $("#fullScreen").children("i").eq(0).addClass("layui-icon-screen-restore");
- });
- }
- });
+ $("body").on("click", "#fullScreen", function () {
+ if ($(this).children("i").hasClass("layui-icon-screen-restore")) {
+ screenFun(2).then(function () {
+ $("#fullScreen").children("i").eq(0).removeClass("layui-icon-screen-restore");
+ });
+ } else {
+ screenFun(1).then(function () {
+ $("#fullScreen").children("i").eq(0).addClass("layui-icon-screen-restore");
+ });
+ }
+ });
- /**
- * 全屏和退出全屏的方法
- * @param num 1代表全屏 2代表退出全屏
- * @returns {Promise}
- */
- function screenFun(num) {
- num = num || 1;
- num = num * 1;
- var docElm = document.documentElement;
+ /**
+ * 全屏和退出全屏的方法
+ * @param num 1代表全屏 2代表退出全屏
+ * @returns {Promise}
+ */
+ function screenFun(num) {
+ num = num || 1;
+ num = num * 1;
+ var docElm = document.documentElement;
- switch (num) {
- case 1:
- if (docElm.requestFullscreen) {
- docElm.requestFullscreen();
- } else if (docElm.mozRequestFullScreen) {
- docElm.mozRequestFullScreen();
- } else if (docElm.webkitRequestFullScreen) {
- docElm.webkitRequestFullScreen();
- } else if (docElm.msRequestFullscreen) {
- docElm.msRequestFullscreen();
- }
- break;
- case 2:
- if (document.exitFullscreen) {
- document.exitFullscreen();
- } else if (document.mozCancelFullScreen) {
- document.mozCancelFullScreen();
- } else if (document.webkitCancelFullScreen) {
- document.webkitCancelFullScreen();
- } else if (document.msExitFullscreen) {
- document.msExitFullscreen();
- }
- break;
- }
+ switch (num) {
+ case 1:
+ if (docElm.requestFullscreen) {
+ docElm.requestFullscreen();
+ } else if (docElm.mozRequestFullScreen) {
+ docElm.mozRequestFullScreen();
+ } else if (docElm.webkitRequestFullScreen) {
+ docElm.webkitRequestFullScreen();
+ } else if (docElm.msRequestFullscreen) {
+ docElm.msRequestFullscreen();
+ }
+ break;
+ case 2:
+ if (document.exitFullscreen) {
+ document.exitFullscreen();
+ } else if (document.mozCancelFullScreen) {
+ document.mozCancelFullScreen();
+ } else if (document.webkitCancelFullScreen) {
+ document.webkitCancelFullScreen();
+ } else if (document.msExitFullscreen) {
+ document.msExitFullscreen();
+ }
+ break;
+ }
- return new Promise(function (res, rej) {
- res("返回值");
- });
- }
+ return new Promise(function (res, rej) {
+ res("返回值");
+ });
+ }
- /**
- * 系统公告
- */
- $(document).on("click", "#notice", noticeFun);
- !function () {
- var notice = sessionStorage.getItem("notice");
- if (notice != "true") {
- noticeFun();
- }
- }();
+ /**
+ * 系统公告
+ */
+ $(document).on("click", "#notice", noticeFun);
+ !function () {
+ var notice = sessionStorage.getItem("notice");
+ if (notice != "true") {
+ noticeFun();
+ }
+ }();
- function noticeFun() {
- var srcWidth = okUtils.getBodyWidth();
- layer.open({
- type: 0, title: "系统公告", btn: "我知道啦", btnAlign: 'c', content: okHoliday.getContent(),
- yes: function (index) {
- if (srcWidth > 800) {
- layer.tips('公告跑到这里去啦', '#notice', {
- tips: [1, '#000'],
- time: 2000
- });
- }
- sessionStorage.setItem("notice", "true");
- layer.close(index);
- },
- cancel: function (index) {
- if (srcWidth > 800) {
- layer.tips('公告跑到这里去啦', '#notice', {
- tips: [1, '#000'],
- time: 2000
- });
- }
- }
- });
- }
+ function noticeFun() {
+ var srcWidth = okUtils.getBodyWidth();
+ layer.open({
+ type: 0, title: "系统公告", btn: "我知道啦", btnAlign: 'c', content: okHoliday.getContent(),
+ yes: function (index) {
+ if (srcWidth > 800) {
+ layer.tips('公告跑到这里去啦', '#notice', {
+ tips: [1, '#000'],
+ time: 2000
+ });
+ }
+ sessionStorage.setItem("notice", "true");
+ layer.close(index);
+ },
+ cancel: function (index) {
+ if (srcWidth > 800) {
+ layer.tips('公告跑到这里去啦', '#notice', {
+ tips: [1, '#000'],
+ time: 2000
+ });
+ }
+ }
+ });
+ }
- /**
- * 捐赠作者
- */
- $(".layui-footer button.donate").click(function () {
- layer.tab({
- area: ["330px", "350px"],
- tab: [{
- title: "支付宝",
- content: "
"
- }, {
- title: "微信",
- content: "
"
- }]
- });
- });
+ /**
+ * 捐赠作者
+ */
+ $(".layui-footer button.donate").click(function () {
+ layer.tab({
+ area: ["330px", "350px"],
+ tab: [{
+ title: "支付宝",
+ content: "
"
+ }, {
+ title: "微信",
+ content: "
"
+ }]
+ });
+ });
- /**
- * QQ群交流
- */
- $("body").on("click", ".layui-footer button.communication, #noticeQQ", function () {
- layer.tab({
- area: ["auto", "370px"],
- tab: [{
- title: "QQ群2",
- content: "
"
- }, {
- title: "QQ群1(已满)",
- content: "
"
- }]
- });
- });
+ /**
+ * QQ群交流
+ */
+ $("body").on("click", ".layui-footer button.communication, #noticeQQ", function () {
+ layer.tab({
+ area: ["auto", "370px"],
+ tab: [{
+ title: "QQ群2",
+ content: "
"
+ }, {
+ title: "QQ群1(已满)",
+ content: "
"
+ }]
+ });
+ });
- /**
- * 弹窗皮肤
- */
- $("#alertSkin").click(function () {
- okLayer.open("皮肤动画", "pages/system/alertSkin.html", "50%", "45%", function (layero) {
- }, function () {
- });
- });
+ /**
+ * 弹窗皮肤
+ */
+ $("#alertSkin").click(function () {
+ okLayer.open("皮肤动画", "pages/system/alertSkin.html", "50%", "45%", function (layero) {
+ }, function () {
+ });
+ });
- /**
- * 退出操作
- */
- $("#logout").click(function () {
- okLayer.confirm("确定要退出吗?", function (index) {
- window.location = "pages/login.html";
- });
- });
+ /**
+ * 退出操作
+ */
+ $("#logout").click(function () {
+ okLayer.confirm("确定要退出吗?", function (index) {
+ okTab.removeTabStorage(function (res) {
+ window.location = "pages/login.html";
+ });
+ });
+ });
- /**
- * 锁定账户
- */
- $("#lock").click(function () {
- okLayer.confirm("确定要锁定账户吗?", function (index) {
- layer.close(index);
- $(".yy").show();
- layer.prompt({
- btn: ['确定'],
- title: '输入密码解锁(123456)',
- closeBtn: 0,
- formType: 1
- }, function (value, index, elem) {
- if (value == "123456") {
- layer.close(index);
- $(".yy").hide();
- } else {
- layer.msg('密码错误', {anim: 6, time: 1000});
- }
- });
- });
- });
+ /**
+ * 锁定账户
+ */
+ $("#lock").click(function () {
+ okLayer.confirm("确定要锁定账户吗?", function (index) {
+ layer.close(index);
+ $(".yy").show();
+ layer.prompt({
+ btn: ['确定'],
+ title: '输入密码解锁(123456)',
+ closeBtn: 0,
+ formType: 1
+ }, function (value, index, elem) {
+ if (value == "123456") {
+ layer.close(index);
+ $(".yy").hide();
+ } else {
+ layer.msg('密码错误', {anim: 6, time: 1000});
+ }
+ });
+ });
+ });
- console.log(" __ .___ .__ \n" +
- " ____ | | __ _____ __| _/_____ |__| ____ \n" +
- " / _ \\| |/ / ______ \\__ \\ / __ |/ \\| |/ \\ \n" +
- "( <_> ) < /_____/ / __ \\_/ /_/ | Y Y \\ | | \\\n" +
- " \\____/|__|_ \\ (____ /\\____ |__|_| /__|___| /\n" +
- " \\/ \\/ \\/ \\/ \\/\n" +
- "" +
- "版本:v2.0\n" +
- "作者:bobi\n" +
- "邮箱:bobi1234@foxmail.com\n" +
- "企鹅:833539807\n" +
- "描述:一个很赞的,扁平化风格的,响应式布局的后台管理模版,旨为后端程序员减压!");
+ console.log(" __ .___ .__ \n" +
+ " ____ | | __ _____ __| _/_____ |__| ____ \n" +
+ " / _ \\| |/ / ______ \\__ \\ / __ |/ \\| |/ \\ \n" +
+ "( <_> ) < /_____/ / __ \\_/ /_/ | Y Y \\ | | \\\n" +
+ " \\____/|__|_ \\ (____ /\\____ |__|_| /__|___| /\n" +
+ " \\/ \\/ \\/ \\/ \\/\n" +
+ "" +
+ "版本:v2.0\n" +
+ "作者:bobi\n" +
+ "邮箱:bobi1234@foxmail.com\n" +
+ "企鹅:833539807\n" +
+ "描述:一个很赞的,扁平化风格的,响应式布局的后台管理模版,旨为后端程序员减压!");
});
diff --git a/lib/layui/lay/okmodules/okTab.js b/lib/layui/lay/okmodules/okTab.js
index 451be1e..f0b1962 100644
--- a/lib/layui/lay/okmodules/okTab.js
+++ b/lib/layui/lay/okmodules/okTab.js
@@ -31,6 +31,16 @@ let OpenTabMenuFun = function ($, callback) {
}
};
+/**删除缓存中的tabMenu**/
+let removeTabMenu = function (okTab, callback) {
+ sessionStorage.removeItem("tabMenu");
+ sessionStorage.removeItem("notice");
+ sessionStorage.removeItem("lay-id");
+ if (typeof callback == "function") {
+ callback(okTab);
+ }
+};
+
/**存储打开的tabMenu**/
function saveTabMenuFun($) {
let tabTitle = $("