规范命名

lib/okplugins/okTab.js

@@ -1,6 +1,6 @@
 "use strict";
 layui.define(["element", "layer"], function (exports) {
-    var element = parent.layui.element;
+    var element = window.top.layui.element;
     var layer = layui.layer;
     var $ = layui.jquery;
 

pages/article/article-add.html

@@ -75,10 +75,10 @@
 <script src="../../lib/layui/layui.js"></script>
 <script>
     layui.config({
-        base: "../../lib/layui_plugins/"
+        base: "../../lib/okplugins/"
     }).extend({
-        okLayer: "okLayer/okLayer",
+        okLayer: "okLayer",
-        okUtils: "okUtils/okUtils"
+        okUtils: "okUtils"
     }).use(["element", "form", "layedit", "okLayer", "okUtils"], function () {
         var form = layui.form;
         var layedit = layui.layedit;

pages/article/article-edit.html

@@ -75,10 +75,10 @@
 <script src="../../lib/layui/layui.js"></script>
 <script>
     layui.config({
-        base: "../../lib/layui_plugins/"
+        base: "../../lib/okplugins/"
     }).extend({
-        okLayer: "okLayer/okLayer",
+        okLayer: "okLayer",
-        okUtils: "okUtils/okUtils"
+        okUtils: "okUtils"
     }).use(["element", "form", "layedit", "okLayer", "okUtils"], function () {
         var form = layui.form;
         var layedit = layui.layedit;

pages/article/article.html

@@ -37,10 +37,10 @@
 <script src="../../lib/layui/layui.js"></script>
 <script>
     layui.config({
-        base: "../../lib/layui_plugins/"
+        base: "../../lib/okplugins/"
     }).extend({
-        okLayer: "okLayer/okLayer",
+        okLayer: "okLayer",
-        okUtils: "okUtils/okUtils"
+        okUtils: "okUtils"
     }).use(["element", "table", "form", "laydate", "okLayer", "okUtils"], function () {
         var table = layui.table;
         var form = layui.form;

pages/permission/permission.html

@@ -48,11 +48,11 @@
 <script>
     // TODO 权限模块需要大改！！！！！！
     layui.config({
-        base: "../../lib/layui_plugins/"
+        base: "../../lib/okplugins/"
     }).extend({
         treetable: "treetable/treetable",
-		okLayer: "okLayer/okLayer",
+		okLayer: "okLayer",
-		okUtils: "okUtils/okUtils"
+		okUtils: "okUtils"
     }).use(["element", "table", "form", "laydate", "treetable", "okLayer", "okUtils"], function () {
         var form = layui.form;
         var table = layui.table;

pages/role/role-add.html

@@ -56,10 +56,10 @@
 <script src="../../lib/zTree_v3/js/jquery.ztree.all.js"></script>
 <script type="text/javascript">
     layui.config({
-        base: "../../lib/layui_plugins/"
+        base: "../../lib/okplugins/"
     }).extend({
-        okLayer: "okLayer/okLayer",
+        okLayer: "okLayer",
-        okUtils: "okUtils/okUtils"
+        okUtils: "okUtils"
     }).use(["element", "form", "okLayer", "okUtils"], function () {
         var form = layui.form;
         var okLayer = layui.okLayer;

pages/role/role-edit.html

@@ -56,10 +56,10 @@
 <script src="../../lib/zTree_v3/js/jquery.ztree.all.js"></script>
 <script type="text/javascript">
     layui.config({
-        base: "../../lib/layui_plugins/"
+        base: "../../lib/okplugins/"
     }).extend({
-        okLayer: "okLayer/okLayer",
+        okLayer: "okLayer",
-        okUtils: "okUtils/okUtils"
+        okUtils: "okUtils"
     }).use(["element", "form", "okLayer", "okUtils"], function () {
         var form = layui.form;
         var okLayer = layui.okLayer;

pages/role/role.html

@@ -37,10 +37,10 @@
 <script src="../../lib/layui/layui.js"></script>
 <script>
     layui.config({
-        base: "../../lib/layui_plugins/"
+        base: "../../lib/okplugins/"
     }).extend({
-        okLayer: "okLayer/okLayer",
+        okLayer: "okLayer",
-        okUtils: "okUtils/okUtils"
+        okUtils: "okUtils"
     }).use(["element", "table", "form", "laydate", "okLayer", "okUtils"], function () {
         var table = layui.table;
         var form = layui.form;

pages/system/system-log.html

@@ -37,10 +37,10 @@
 <script src="../../lib/layui/layui.js"></script>
 <script>
     layui.config({
-        base: "../../lib/layui_plugins/"
+        base: "../../lib/okplugins/"
     }).extend({
-        okLayer: "okLayer/okLayer",
+        okLayer: "okLayer",
-        okUtils: "okUtils/okUtils"
+        okUtils: "okUtils"
     }).use(["element", "table", "form", "laydate", "okLayer", "okUtils"], function () {
         var table = layui.table;
         var form = layui.form;

pages/system/system-setting.html

@@ -181,10 +181,10 @@
 <script src="../../lib/layui/layui.js"></script>
 <script>
     layui.config({
-        base: "../../lib/layui_plugins/"
+        base: "../../lib/okplugins/"
     }).extend({
-        okLayer: "okLayer/okLayer",
+        okLayer: "okLayer",
-        okUtils: "okUtils/okUtils"
+        okUtils: "okUtils"
     }).use(["element", "form", "okLayer", "okUtils"], function () {
         var $ = layui.jquery;
 		var form = layui.form;

pages/test/okLayer.html

@@ -9,9 +9,9 @@
 <script src="../../lib/layui/layui.js"></script>
 <script type="text/javascript">
     layui.config({
-        base: "../../lib/layui_plugins/"
+        base: "../../lib/okplugins/"
     }).extend({
-        okLayer: "okLayer/okLayer"
+        okLayer: "okLayer"
     }).use("okLayer", function () {
         var okLayer = layui.okLayer;
         // okLayer.tableNotCheckMsg();

pages/test/okProgress.html

@@ -9,7 +9,7 @@
 <script src="../../lib/layui/layui.js"></script>
 <script type="text/javascript">
     layui.config({
-        base: "../../lib/layui_plugins/"
+        base: "../../lib/okplugins/"
     }).extend({
         okProgress: "okProgress/okProgress"
     }).use("okProgress", function () {

pages/use/use-okTab-sub.html

@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <title>子页面</title>
+    <link rel="stylesheet" href="../../css/okadmin.css">
+</head>
+<body>
+<div class="ok-body">
+    <!--面包屑导航区域-->
+    <div class="ok-body-breadcrumb">
+        <span class="layui-breadcrumb">
+            <a><cite>首页</cite></a>
+            <a><cite>框架使用</cite></a>
+            <a><cite>okTab使用</cite></a>
+			<a><cite>子页面</cite></a>
+        </span>
+        <a class="layui-btn layui-btn-sm" href="javascript:location.replace(location.href);" title="刷新">
+            <i class="layui-icon layui-icon-refresh"></i>
+        </a>
+    </div>
+    <br>
+    <!--代码块1-->
+    <blockquote class="layui-elem-quote">
+        使用方法1：用按钮点击打开
+    </blockquote>
+
+<pre class="layui-code" lay-title="JavaScript" lay-encode="true">
+/**
+ * 添加tab
+ * @param title 标题
+ * @param path 路径
+ * @param tabId tabId必须唯一
+ */
+okTab.tabAdd("ok-tool", "http://www.xlbweb.cn", "11-1")
+</pre>
+
+    <button class="layui-btn" id="addTab1">打开一个新的Tab1</button>
+	<button class="layui-btn" id="addTab2">打开一个新的Tab2</button>
+</div>
+<!--js逻辑-->
+<script src="../../lib/layui/layui.js"></script>
+<script>
+    layui.config({
+        base: "../../lib/okplugins/"
+    }).extend({
+        okTab: "okTab",
+		okLayer: "okLayer",
+    }).use(["element", "code", "okTab", "okLayer"], function () {
+        var $ = layui.jquery;
+		var okTab = layui.okTab;
+		var okLayer = layui.okLayer;
+
+        layui.code({about: false});
+
+        $("#addTab1").click(function () {
+            okTab.add("okLayer", "pages/use/use-okLayer.html", "12-1");
+        });
+		
+		$("#addTab2").click(function () {
+		    okTab.add("ok-tool", "http://tool.xlbweb.cn", "12-2");
+		});
+    })
+</script>
+</body>
+</html>

pages/use/use-okTab.html

@@ -67,17 +67,20 @@ okTab.tabAdd("ok-tool", "http://www.xlbweb.cn", "11-1")
 
     <button class="layui-btn" id="addTab1">打开一个新的Tab1</button>
 	<button class="layui-btn" id="addTab2">打开一个新的Tab2</button>
+	<button class="layui-btn" id="addTab3">在子页面打开一个新的Tab3</button>
 </div>
 <!--js逻辑-->
 <script src="../../lib/layui/layui.js"></script>
 <script>
     layui.config({
-        base: "../../lib/layui_plugins/"
+        base: "../../lib/okplugins/"
     }).extend({
         okTab: "okTab",
-    }).use(["element", "code", "okTab"], function () {
+		okLayer: "okLayer",
+    }).use(["element", "code", "okTab", "okLayer"], function () {
         var $ = layui.jquery;
 		var okTab = layui.okTab;
+		var okLayer = layui.okLayer;
 
         layui.code({about: false});
 
@@ -88,6 +91,10 @@ okTab.tabAdd("ok-tool", "http://www.xlbweb.cn", "11-1")
 		$("#addTab2").click(function () {
 		    okTab.add("ok-tool", "http://tool.xlbweb.cn", "11-2");
 		});
+		
+		$("#addTab3").click(function () {
+		    okLayer.open("子页面", "use-okTab-sub.html", "90%", "90%", function() {})
+		});
     })
 </script>
 </body>

pages/user/login.html

@@ -39,10 +39,10 @@
 <script src="../../lib/layui/layui.js"></script>
 <script type="text/javascript">
     layui.config({
-        base: "../../lib/layui_plugins/"
+        base: "../../lib/okplugins/"
     }).extend({
-        okLayer: "okLayer/okLayer",
+        okLayer: "okLayer",
-        okUtils: "okUtils/okUtils",
+        okUtils: "okUtils",
         okProgress: "okProgress/okProgress"
     }).use(["form", "okLayer", "okUtils", "okProgress"], function () {
         var form = layui.form;

pages/user/user-add.html

@@ -106,10 +106,10 @@
 <script src="../../lib/layui/layui.js"></script>
 <script>
     layui.config({
-        base: "../../lib/layui_plugins/"
+        base: "../../lib/okplugins/"
     }).extend({
-        okLayer: "okLayer/okLayer",
+        okLayer: "okLayer",
-        okUtils: "okUtils/okUtils"
+        okUtils: "okUtils"
     }).use(["element", "form", "laydate", "okLayer", "okUtils"], function () {
         var form = layui.form;
         var laydate = layui.laydate;

pages/user/user-edit.html

@@ -106,10 +106,10 @@
 <script src="../../lib/layui/layui.js"></script>
 <script>
     layui.config({
-        base: "../../lib/layui_plugins/"
+        base: "../../lib/okplugins/"
     }).extend({
-        okLayer: "okLayer/okLayer",
+        okLayer: "okLayer",
-        okUtils: "okUtils/okUtils"
+        okUtils: "okUtils"
     }).use(["element", "form", "laydate", "okLayer", "okUtils"], function () {
         var form = layui.form;
         var laydate = layui.laydate;

pages/user/user.html

@@ -37,10 +37,10 @@
 <script src="../../lib/layui/layui.js"></script>
 <script>
     layui.config({
-        base: "../../lib/layui_plugins/"
+        base: "../../lib/okplugins/"
     }).extend({
-        okLayer: "okLayer/okLayer",
+        okLayer: "okLayer",
-        okUtils: "okUtils/okUtils"
+        okUtils: "okUtils"
     }).use(["element", "table", "form", "laydate", "okLayer", "okUtils"], function () {
         var table = layui.table;
         var form = layui.form;

pages/welcome.html

@@ -206,7 +206,7 @@
 <!--js逻辑-->
 <script type="text/javascript">
 
-    layui.use('util', function () {
+    layui.use("util", function () {
         var util = layui.util;
         util.fixbar({});
     });