更新依赖pearadminlayui

applications/static/admin/component/pear/module/tab.js

@@ -13,7 +13,7 @@ layui.define(['jquery', 'element'], function(exports) {
 	var tabDataCurrent = 0;
 
 	pearTab.prototype.render = function(opt) {
-		//默认配置值
+
 		var option = {
 			elem: opt.elem,
 			data: opt.data,
@@ -28,9 +28,7 @@ layui.define(['jquery', 'element'], function(exports) {
 			success: opt.success ? opt.success : function(id) {}
 		}
 
-		// 初始化，检索 session 是否开启
 		if (option.session) {
-			// 替换 opt.data 数据
 			if (sessionStorage.getItem(option.elem + "-pear-tab-data") != null) {
 				tabData = JSON.parse(sessionStorage.getItem(option.elem + "-pear-tab-data"));
 				option.data = JSON.parse(sessionStorage.getItem(option.elem + "-pear-tab-data"));
@@ -45,8 +43,7 @@ layui.define(['jquery', 'element'], function(exports) {
 			}
 		}
 
-
-			var lastIndex;
+		var lastIndex;
 		var tab = createTab(option);
 		$("#" + option.elem).html(tab);
 		$(".layui-tab[lay-filter='" + option.elem + "'] .layui-tab-prev").click(function() {
@@ -66,7 +63,7 @@ layui.define(['jquery', 'element'], function(exports) {
 
 		option.success(sessionStorage.getItem(option.elem + "-pear-tab-data-current"));
 
-		$("body .layui-tab[lay-filter='" + option.elem + "']").on("contextmenu", "li", function(e) {
+		$("body .layui-tab[lay-filter='" + option.elem + "'] .layui-tab-title").on("contextmenu", "li", function(e) {
 
 			// 获取当前元素位置
 			var top = e.clientY;
@@ -302,21 +299,22 @@ layui.define(['jquery', 'element'], function(exports) {
 			sessionStorage.setItem(this.option.elem + "-pear-tab-data-current", opt.id);
 		} else {
 			var isData = false;
-			//查询当前选项卡数量
-			if ($(".layui-tab[lay-filter='" + this.option.elem + "'] .layui-tab-title li[lay-id]").length >= this.option.tabMax) {
-				layer.msg("最多打开" + this.option.tabMax + "个标签页", {
-					icon: 2,
-					time: 1000,
-					shift: 6 //抖动效果
-				});
-				return false;
-			}
 			$.each($(".layui-tab[lay-filter='" + this.option.elem + "'] .layui-tab-title li[lay-id]"), function() {
 				if ($(this).attr("lay-id") == opt.id) {
 					isData = true;
 				}
 			})
 			if (isData == false) {
+				
+				if ($(".layui-tab[lay-filter='" + this.option.elem + "'] .layui-tab-title li[lay-id]").length >= this.option.tabMax) {
+					layer.msg("最多打开" + this.option.tabMax + "个标签页", {
+						icon: 2,
+						time: 1000,
+						shift: 6
+					});
+					return false;
+				}
+				
 				if (time != false && time != 0) {
 					var load = '<div id="pear-tab-loading' + index + '" class="pear-tab-loading">' +
 						'<div class="ball-loader">' +