root
/
ok-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'v2.0' of gitee.com:bobi1234/ok-admin into v2.0

master
bobi 2019-08-26 17:57:47 +08:00
parent 4459222364 a3457e14bf
commit 2906dfafe0
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/layui/lay/okmodules/okTab.js
View File

@ -534,7 +534,11 @@ layui.define(["element", "jquery"], function (exports) {
}; };
exports("okTab", function (option) { exports("okTab", function (option) {
if(parent.objOkTab){
return parent.objOkTab;
}else{
return new okTab().init(option); return new okTab().init(option);
}
}); });

7
pages/help/navOperate.html
View File

@ -24,7 +24,7 @@
</blockquote> </blockquote>
<pre lay-title="JavaScript"> <pre lay-title="JavaScript">
layui.use(function(){ layui.use(function(){
var okTab = parent.objOkTab;//获取父级的okTab var okTab = parent.objOkTab;//获取父级的okTab;layui.okTab()不推荐这样获取
var page = '&lt;div lay-id="add-1" data-url="/pages/user/user.html"&gt;个人中心&lt;/div&gt;'; var page = '&lt;div lay-id="add-1" data-url="/pages/user/user.html"&gt;个人中心&lt;/div&gt;';
okTab.tabAdd(page); okTab.tabAdd(page);
}) })
@ -70,12 +70,11 @@
} }
</script> </script>
<script type="text/javascript"> <script type="text/javascript">
layui.use(['element', 'table', 'form', 'jquery', 'okUtils', 'laydate', 'code'], function () { layui.use(['element', 'table', 'form', 'jquery', 'okTab', 'laydate', 'code'], function () {
var $ = layui.jquery, var $ = layui.jquery,
okUtils = layui.okUtils,
p_layer = parent.layer || layer; p_layer = parent.layer || layer;
var okTab = okUtils.getOkTab();//获取父级的oktab var okTab = layui.okTab();//获取父级的oktab
var code = layui.code; var code = layui.code;
code({ code({
elem: 'pre' elem: 'pre'