From 4ec06f48996f0ed0b713a8cc633d38d76ba10ab0 Mon Sep 17 00:00:00 2001 From: hello Date: Fri, 8 Nov 2019 15:26:54 +0800 Subject: [PATCH] setting: okLoading --- css/oksub.css | 1 + data/navs.json | 6 ++++++ js/console.js | 2 +- js/console1.js | 2 +- lib/layui/css/okmodules/index.css | 3 +-- lib/layui/lay/okmodules/okTab.js | 16 ++-------------- lib/layui/layui.js | 3 +-- .../css/okmodules => loading}/okLoading.css | 2 +- pages/console.html | 1 + pages/console1.html | 1 + pages/forget.html | 4 +++- pages/help/test.html | 11 +++++++---- 12 files changed, 26 insertions(+), 26 deletions(-) rename lib/{layui/css/okmodules => loading}/okLoading.css (99%) diff --git a/css/oksub.css b/css/oksub.css index 1a447a7..322d2f7 100644 --- a/css/oksub.css +++ b/css/oksub.css @@ -1,6 +1,7 @@ @import "../css/common.css"; @import "../lib/layui/css/layui.css"; @import "okadmin.animate.css"; +@import "../lib/loading/okLoading.css"; /**控制台样式*/ .console .map-body{height:360px} diff --git a/data/navs.json b/data/navs.json index 102f9ff..e4f7845 100644 --- a/data/navs.json +++ b/data/navs.json @@ -7,6 +7,12 @@ "spread": true, "isCheck": true }, + { + "title": "测试", + "href": "pages/help/test.html", + "fontFamily": "ok-icon", + "icon": "" + }, { "title": "控制台示例", "href": "", diff --git a/js/console.js b/js/console.js index 859b19a..5500d70 100644 --- a/js/console.js +++ b/js/console.js @@ -5,7 +5,7 @@ layui.use(["okUtils", "table", "okCountUp", "okMock"], function () { var okUtils = layui.okUtils; var okMock = layui.okMock; var $ = layui.jquery; - + okLoading.close($); /** * 收入、商品、博客、用户 */ diff --git a/js/console1.js b/js/console1.js index e7407b4..ac8dffb 100644 --- a/js/console1.js +++ b/js/console1.js @@ -3,7 +3,7 @@ layui.use(["okUtils", "okCountUp"], function () { var countUp = layui.okCountUp; var okUtils = layui.okUtils; var $ = layui.jquery; - + okLoading.close($); /** * 收入、商品、博客、用户 */ diff --git a/lib/layui/css/okmodules/index.css b/lib/layui/css/okmodules/index.css index 914c5aa..700e70f 100644 --- a/lib/layui/css/okmodules/index.css +++ b/lib/layui/css/okmodules/index.css @@ -1,4 +1,3 @@ -@import "okLoading.css"; @import "nprogress.css"; @import "toastr.min.css"; -@import "jquery.contextMenu.css"; \ No newline at end of file +@import "jquery.contextMenu.css"; diff --git a/lib/layui/lay/okmodules/okTab.js b/lib/layui/lay/okmodules/okTab.js index e5f1cf7..d1f2520 100644 --- a/lib/layui/lay/okmodules/okTab.js +++ b/lib/layui/lay/okmodules/okTab.js @@ -52,12 +52,11 @@ function saveTabMenuPosition(num) { sessionStorage.setItem('tabMenuLeft', num); } -layui.define(["element", "jquery", "okLoading"], function (exports) { +layui.define(["element", "jquery"], function (exports) { var layui = parent.layui || layui; $ = layui.jquery; var element = layui.element, - layer = layui.layer, - okLoading = layui.okLoading; + layer = layui.layer; okTab = function () { this.tabConfig = { openTabNum: 30, //最大可打开窗口数量默认30 @@ -337,17 +336,6 @@ layui.define(["element", "jquery", "okLoading"], function (exports) { // 切换选项卡 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 () { - var ibody = $("iframe[lay-id=" + tabId + "]").contents().find("body"); - okLoading("", "", ibody[0]); - },20); - this.navMove("rightmax"); /**保存展开的tab**/ // saveTabMenuFun($); diff --git a/lib/layui/layui.js b/lib/layui/layui.js index d27c9fe..4968e72 100644 --- a/lib/layui/layui.js +++ b/lib/layui/layui.js @@ -41,8 +41,7 @@ if (!Object.assign) { "okToastr": "okmodules/okToastr", "okBarcode": "okmodules/okBarcode", "okNprogress": "okmodules/okNprogress", - "okSweetAlert2": "okmodules/okSweetAlert2", - "okLoading": "okmodules/okLoading", + "okSweetAlert2": "okmodules/okSweetAlert2" }; var modulePath = Object.assign({ layer: "modules/layer", diff --git a/lib/layui/css/okmodules/okLoading.css b/lib/loading/okLoading.css similarity index 99% rename from lib/layui/css/okmodules/okLoading.css rename to lib/loading/okLoading.css index b6d6e37..d7925ed 100644 --- a/lib/layui/css/okmodules/okLoading.css +++ b/lib/loading/okLoading.css @@ -1,4 +1,4 @@ -#okLoadering { +.ok-loading { background: #fbfbfb; color:#333333; font-size:100%; diff --git a/pages/console.html b/pages/console.html index fc698b4..2452fce 100644 --- a/pages/console.html +++ b/pages/console.html @@ -11,6 +11,7 @@ + diff --git a/pages/console1.html b/pages/console1.html index 1322268..705dcf0 100644 --- a/pages/console1.html +++ b/pages/console1.html @@ -11,6 +11,7 @@ + diff --git a/pages/forget.html b/pages/forget.html index 36b5489..9d4165d 100644 --- a/pages/forget.html +++ b/pages/forget.html @@ -8,6 +8,7 @@ +