add: loading(初步完成)
zhizous
parent
25bfb92a54
commit
54f1967a6f
|
|
@ -1,6 +1,5 @@
|
|||
@import "../lib/layui/css/layui.css";
|
||||
@import "../lib/fonts/iconfont.css";
|
||||
@import "./jquery.contextMenu.css";
|
||||
@import "./okadmin.theme.css";
|
||||
|
||||
/*边距*/
|
||||
|
|
|
|||
|
|
@ -7,12 +7,6 @@
|
|||
"spread": true,
|
||||
"isCheck": true
|
||||
},
|
||||
{
|
||||
"title": "测试",
|
||||
"href": "pages/help/test.html",
|
||||
"fontFamily": "ok-icon",
|
||||
"icon": ""
|
||||
},
|
||||
{
|
||||
"title": "控制台示例",
|
||||
"href": "",
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -0,0 +1,4 @@
|
|||
@import "okLoading.css";
|
||||
@import "nprogress.css";
|
||||
@import "toastr.min.css";
|
||||
@import "jquery.contextMenu.css";
|
||||
|
|
@ -1,13 +1,5 @@
|
|||
"use strict";
|
||||
layui.define(["jquery"], function (exprots) {
|
||||
function loadCsstFile(filePath) {
|
||||
var link = document.createElement("link");
|
||||
link.type = "text/css";
|
||||
link.rel = "stylesheet";
|
||||
link.href = filePath || "/lib/layui/css/okmodules/okLoading.css";
|
||||
document.head.appendChild(link);
|
||||
}
|
||||
loadCsstFile();
|
||||
|
||||
var $ = layui.jquery;
|
||||
|
||||
|
|
@ -58,22 +50,20 @@ layui.define(["jquery"], function (exprots) {
|
|||
} else if (typeof content == "object") {
|
||||
options = content;
|
||||
}
|
||||
options.time = options.time || 2000;
|
||||
options.time = options.time || 1000;
|
||||
options.content = options.content || "ok-admin...";
|
||||
return options;
|
||||
}
|
||||
|
||||
var okLoading = function (content, options) {
|
||||
var html = $(template);
|
||||
var okLoading = function (content, options, dom) {
|
||||
dom = dom || $("body");
|
||||
var options = headerInit(content, options);
|
||||
var template = templateFun(options);
|
||||
|
||||
$("body").append(template);
|
||||
|
||||
$('#okLoadering').delay(options.time).animate({
|
||||
$(dom).append(template);
|
||||
$(dom).find('#okLoadering').delay(options.time).animate({
|
||||
opacity: 0
|
||||
}, 1000, "linear", function () {
|
||||
$("#okLoadering").remove();
|
||||
$(dom).find("#okLoadering").remove();
|
||||
});
|
||||
/*$('#okLoadering').delay(options.time).hide(1000,"linear",function () {
|
||||
console.log("执行完成");
|
||||
|
|
|
|||
|
|
@ -52,11 +52,12 @@ function saveTabMenuPosition(num) {
|
|||
sessionStorage.setItem('tabMenuLeft', num);
|
||||
}
|
||||
|
||||
layui.define(["element", "jquery"], function (exports) {
|
||||
layui.define(["element", "jquery", "okLoading"], function (exports) {
|
||||
var layui = parent.layui || layui;
|
||||
$ = layui.jquery;
|
||||
var element = layui.element,
|
||||
layer = layui.layer,
|
||||
okLoading = layui.okLoading;
|
||||
okTab = function () {
|
||||
this.tabConfig = {
|
||||
openTabNum: 30, //最大可打开窗口数量默认30
|
||||
|
|
@ -333,9 +334,20 @@ layui.define(["element", "jquery"], function (exports) {
|
|||
content: contentIframe,
|
||||
id: tabId
|
||||
});
|
||||
|
||||
// 切换选项卡
|
||||
element.tabChange(tabFilter, tabId);
|
||||
|
||||
/**页面加载动画*/
|
||||
var iframeObj = $("iframe[lay-id=" + tabId + "]");
|
||||
iframeObj[0].onload = function() {
|
||||
var ibody = $("iframe[lay-id=" + tabId + "]").contents().find("body");
|
||||
okLoading("", "", ibody[0]);
|
||||
};
|
||||
// setTimeout(function () {
|
||||
//
|
||||
//
|
||||
// },30);
|
||||
|
||||
this.navMove("rightmax");
|
||||
/**保存展开的tab**/
|
||||
// saveTabMenuFun($);
|
||||
|
|
@ -535,9 +547,9 @@ layui.define(["element", "jquery"], function (exports) {
|
|||
};
|
||||
|
||||
exports("okTab", function (option) {
|
||||
if(parent.objOkTab){
|
||||
if (parent.objOkTab) {
|
||||
return parent.objOkTab;
|
||||
}else{
|
||||
} else {
|
||||
return new okTab().init(option);
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -3,47 +3,10 @@
|
|||
<head>
|
||||
<meta charset="UTF-8">
|
||||
<title>Title</title>
|
||||
<!-- <link rel="stylesheet" href="../../lib/layui/css/okmodules/okLoading.css"/>-->
|
||||
<link rel="stylesheet" href="../../lib/layui/css/layui.css"/>
|
||||
</head>
|
||||
<body>
|
||||
dsafasdf
|
||||
<!--<div id="okLoadering">
|
||||
<div class="loader">
|
||||
<div class="text">ok-admin...</div>
|
||||
<div class="horizontal">
|
||||
<div class="circlesup">
|
||||
<div class="circle"></div>
|
||||
<div class="circle"></div>
|
||||
<div class="circle"></div>
|
||||
<div class="circle"></div>
|
||||
<div class="circle"></div>
|
||||
</div>
|
||||
<div class="circlesdwn">
|
||||
<div class="circle"></div>
|
||||
<div class="circle"></div>
|
||||
<div class="circle"></div>
|
||||
<div class="circle"></div>
|
||||
<div class="circle"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="vertical">
|
||||
<div class="circlesup">
|
||||
<div class="circle"></div>
|
||||
<div class="circle"></div>
|
||||
<div class="circle"></div>
|
||||
<div class="circle"></div>
|
||||
<div class="circle"></div>
|
||||
</div>
|
||||
<div class="circlesdwn">
|
||||
<div class="circle"></div>
|
||||
<div class="circle"></div>
|
||||
<div class="circle"></div>
|
||||
<div class="circle"></div>
|
||||
<div class="circle"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>-->
|
||||
</body>
|
||||
</html>
|
||||
<script src="../../lib/layui/layui.js"></script>
|
||||
|
|
|
|||
Loading…
Reference in New Issue