diff --git a/js/okadmin.js b/js/okadmin.js
index 064f3fb..9ff5ca9 100644
--- a/js/okadmin.js
+++ b/js/okadmin.js
@@ -46,17 +46,17 @@ layui.use(["element", "layer"], function () {
* @param path 路径
* @param tabId tabId必须唯一
*/
- window.tabAdd = function (title, path, tabId) {
- if (self == top) {
- // console.log("不在iframe中")
- tabAdd1(title, path, tabId)
- } else {
- // console.log("在iframe中")
- tabAdd2(title, path, tabId)
- }
- }
+// window.tabAdd = function (title, path, tabId) {
+// if (self == top) {
+// // console.log("不在iframe中")
+// tabAdd1(title, path, tabId)
+// } else {
+// // console.log("在iframe中")
+// tabAdd2(title, path, tabId)
+// }
+// }
- function tabAdd1(title, path, tabId) {
+ function tabAdd(title, path, tabId) {
// 参数校验
parameterCheck(title, path, tabId);
// 去重复选项卡
@@ -79,29 +79,29 @@ layui.use(["element", "layer"], function () {
element.tabChange("ok-tab", tabId);
}
- function tabAdd2(title, path, tabId) {
- // 参数校验
- parameterCheck(title, path, tabId);
- // 去重复选项卡
- var parentOkFrame = $(".ok-frame", parent.document);
- for (var i = 0; i < parentOkFrame.length; i++) {
- var _tabId = parentOkFrame.eq(i).attr("tab-id");
- if (_tabId == tabId) {
- console.warn("tabId=" + tabId + "有重复元素,请检查!")
- parent.layui.element.tabChange("ok-tab", tabId);
- event.stopPropagation();
- return;
- }
- }
- // 添加选项卡
- parent.layui.element.tabAdd("ok-tab", {
- title: title,
- content: "",
- id: tabId
- });
- // 切换选项卡
- parent.layui.element.tabChange("ok-tab", tabId);
- }
+// function tabAdd2(title, path, tabId) {
+// // 参数校验
+// parameterCheck(title, path, tabId);
+// // 去重复选项卡
+// var parentOkFrame = $(".ok-frame", parent.document);
+// for (var i = 0; i < parentOkFrame.length; i++) {
+// var _tabId = parentOkFrame.eq(i).attr("tab-id");
+// if (_tabId == tabId) {
+// console.warn("tabId=" + tabId + "有重复元素,请检查!")
+// parent.layui.element.tabChange("ok-tab", tabId);
+// event.stopPropagation();
+// return;
+// }
+// }
+// // 添加选项卡
+// parent.layui.element.tabAdd("ok-tab", {
+// title: title,
+// content: "",
+// id: tabId
+// });
+// // 切换选项卡
+// parent.layui.element.tabChange("ok-tab", tabId);
+// }
function parameterCheck(title, path, tabId) {
if (title == undefined || title == "") {
diff --git a/lib/layui_plugins/okTab.js b/lib/layui_plugins/okTab.js
index 75f2df9..0361cac 100644
--- a/lib/layui_plugins/okTab.js
+++ b/lib/layui_plugins/okTab.js
@@ -1,6 +1,6 @@
"use strict";
layui.define(["element", "layer"], function (exports) {
- var element = layui.element;
+ var element = parent.layui.element;
var layer = layui.layer;
var $ = layui.jquery;
diff --git a/pages/use/use-okTab.html b/pages/use/use-okTab.html
index 4304554..0c9a378 100644
--- a/pages/use/use-okTab.html
+++ b/pages/use/use-okTab.html
@@ -65,7 +65,8 @@
okTab.tabAdd("ok-tool", "http://www.xlbweb.cn", "11-1")
-
+
+
@@ -80,9 +81,13 @@ okTab.tabAdd("ok-tool", "http://www.xlbweb.cn", "11-1")
layui.code({about: false});
- $("#addTab").click(function () {
- okTab.add("ok-tool", "http://tool.xlbweb.cn", "11-1");
+ $("#addTab1").click(function () {
+ okTab.add("ok-tool", "pages/use/use-okLayer.html", "11-1");
});
+
+ $("#addTab2").click(function () {
+ okTab.add("ok-tool", "http://tool.xlbweb.cn", "11-2");
+ });
})