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

add: loading(初步完成)

master
zhizous 2019-11-08 02:27:13 +08:00
parent 25bfb92a54
commit 54f1967a6f
8 changed files with 525 additions and 562 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
css/okadmin.css
View File

@ -1,6 +1,5 @@
@import "../lib/layui/css/layui.css"; @import "../lib/layui/css/layui.css";
@import "../lib/fonts/iconfont.css"; @import "../lib/fonts/iconfont.css";
@import "./jquery.contextMenu.css";
@import "./okadmin.theme.css"; @import "./okadmin.theme.css";
/*边距*/ /*边距*/

6
data/navs.json
View File

@ -7,12 +7,6 @@
"spread": true, "spread": true,
"isCheck": true "isCheck": true
}, },
{
"title": "测试",
"href": "pages/help/test.html",
"fontFamily": "ok-icon",
"icon": ""
},
{ {
"title": "控制台示例", "title": "控制台示例",
"href": "", "href": "",

1
lib/layui/css/layui.css
View File

File diff suppressed because one or more lines are too long

4
lib/layui/css/okmodules/index.css Normal file
View File

@ -0,0 +1,4 @@
@import "okLoading.css";
@import "nprogress.css";
@import "toastr.min.css";
@import "jquery.contextMenu.css";

0
css/jquery.contextMenu.css → lib/layui/css/okmodules/jquery.contextMenu.css
View File

22
lib/layui/lay/okmodules/okLoading.js
View File

@ -1,13 +1,5 @@
"use strict"; "use strict";
layui.define(["jquery"], function (exprots) { 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; var $ = layui.jquery;
@ -58,22 +50,20 @@ layui.define(["jquery"], function (exprots) {
} else if (typeof content == "object") { } else if (typeof content == "object") {
options = content; options = content;
} }
options.time = options.time || 2000; options.time = options.time || 1000;
options.content = options.content || "ok-admin..."; options.content = options.content || "ok-admin...";
return options; return options;
} }
var okLoading = function (content, options) { var okLoading = function (content, options, dom) {
var html = $(template); dom = dom || $("body");
var options = headerInit(content, options); var options = headerInit(content, options);
var template = templateFun(options); var template = templateFun(options);
$(dom).append(template);
$("body").append(template); $(dom).find('#okLoadering').delay(options.time).animate({
$('#okLoadering').delay(options.time).animate({
opacity: 0 opacity: 0
}, 1000, "linear", function () { }, 1000, "linear", function () {
$("#okLoadering").remove(); $(dom).find("#okLoadering").remove();
}); });
/*$('#okLoadering').delay(options.time).hide(1000,"linear",function () { /*$('#okLoadering').delay(options.time).hide(1000,"linear",function () {
console.log("执行完成"); console.log("执行完成");

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

@ -52,11 +52,12 @@ function saveTabMenuPosition(num) {
sessionStorage.setItem('tabMenuLeft', num); sessionStorage.setItem('tabMenuLeft', num);
} }
layui.define(["element", "jquery"], function (exports) { layui.define(["element", "jquery", "okLoading"], function (exports) {
var layui = parent.layui || layui; var layui = parent.layui || layui;
$ = layui.jquery; $ = layui.jquery;
var element = layui.element, var element = layui.element,
layer = layui.layer, layer = layui.layer,
okLoading = layui.okLoading;
okTab = function () { okTab = function () {
this.tabConfig = { this.tabConfig = {
openTabNum: 30, //最大可打开窗口数量默认30 openTabNum: 30, //最大可打开窗口数量默认30
@ -333,9 +334,20 @@ layui.define(["element", "jquery"], function (exports) {
content: contentIframe, content: contentIframe,
id: tabId id: tabId
}); });
// 切换选项卡 // 切换选项卡
element.tabChange(tabFilter, 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"); this.navMove("rightmax");
/**保存展开的tab**/ /**保存展开的tab**/
// saveTabMenuFun($); // saveTabMenuFun($);

39
pages/help/test.html
View File

@ -3,47 +3,10 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>Title</title> <title>Title</title>
<!-- <link rel="stylesheet" href="../../lib/layui/css/okmodules/okLoading.css"/>--> <link rel="stylesheet" href="../../lib/layui/css/layui.css"/>
</head> </head>
<body> <body>
dsafasdf 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> </body>
</html> </html>
<script src="../../lib/layui/layui.js"></script> <script src="../../lib/layui/layui.js"></script>