From a97493343c4d6c09cb81f8a8aa248096a8803cd2 Mon Sep 17 00:00:00 2001 From: gzy Date: Sat, 2 Apr 2022 16:10:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84table=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- component/pear/module/frame.js | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/component/pear/module/frame.js b/component/pear/module/frame.js index b6f5d2d..7315f18 100644 --- a/component/pear/module/frame.js +++ b/component/pear/module/frame.js @@ -1,10 +1,8 @@ -layui.define(['table', 'jquery', 'element'], function (exports) { +layui.define(['jquery', 'element'], function (exports) { "use strict"; - var MOD_NAME = 'frame', - $ = layui.jquery, - element = layui.element; - + var $ = layui.jquery; + var pearFrame = function (opt) { this.option = opt; }; @@ -22,11 +20,11 @@ layui.define(['table', 'jquery', 'element'], function (exports) { $("#"+option.elem).width(option.width); $("#"+option.elem).height(option.height); return new pearFrame(option); - } - + } + pearFrame.prototype.changePage = function(url,loading){ if(loading){ - var loading = $("#"+this.option.elem).find(".pear-frame-loading"); + var loading = $("#"+this.option.elem).find(".pear-frame-loading"); loading.css({display:'block'}); } $("#"+this.option.elem+" iframe").attr("src",url); @@ -34,13 +32,13 @@ layui.define(['table', 'jquery', 'element'], function (exports) { var loading = $("#"+this.option.elem).find(".pear-frame-loading"); setTimeout(function(){ loading.fadeOut(500); - },800) + },800) } } - + pearFrame.prototype.changePageByElement = function(elem,url,title,loading){ if(loading){ - var loading = $("#"+elem).find(".pear-frame-loading"); + var loading = $("#"+elem).find(".pear-frame-loading"); loading.css({display:'block'}); } $("#"+elem+" iframe").attr("src",url); @@ -49,10 +47,10 @@ layui.define(['table', 'jquery', 'element'], function (exports) { var loading = $("#"+elem).find(".pear-frame-loading"); setTimeout(function(){ loading.css({display:'none'}); - },400) + },400) } } - + pearFrame.prototype.refresh = function (time) { if(time!=false){ var loading = $("#"+this.option.elem).find(".pear-frame-loading"); @@ -65,7 +63,7 @@ layui.define(['table', 'jquery', 'element'], function (exports) { } $("#"+this.option.elem).find("iframe")[0].contentWindow.location.reload(true); } - + function createFrameHTML(option){ var iframe = ""; var loading = '
'+ @@ -73,8 +71,8 @@ layui.define(['table', 'jquery', 'element'], function (exports) { ''+ '
'+ ''; - $("#"+option.elem).html("
"+ iframe + loading +"
"); + $("#"+option.elem).html("
"+ iframe + loading +"
"); } - - exports(MOD_NAME,new pearFrame()); -}) + + exports('frame', new pearFrame()); +}); -- Gitee From efe29f16b73307f60da9c0ac9937322b69227c55 Mon Sep 17 00:00:00 2001 From: gzy Date: Sat, 2 Apr 2022 16:13:02 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E7=BC=A9=E8=BF=9B=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- component/pear/module/frame.js | 46 +++++++++++++++++----------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/component/pear/module/frame.js b/component/pear/module/frame.js index 7315f18..46a50bb 100644 --- a/component/pear/module/frame.js +++ b/component/pear/module/frame.js @@ -1,13 +1,13 @@ layui.define(['jquery', 'element'], function (exports) { - "use strict"; + "use strict"; - var $ = layui.jquery; + var $ = layui.jquery; - var pearFrame = function (opt) { - this.option = opt; - }; + var pearFrame = function (opt) { + this.option = opt; + }; - pearFrame.prototype.render = function (opt) { + pearFrame.prototype.render = function (opt) { var option = { elem:opt.elem, url:opt.url, @@ -16,11 +16,11 @@ layui.define(['jquery', 'element'], function (exports) { height:opt.height, done:opt.done ? opt.done: function(){ console.log("菜单渲染成功");} } - createFrameHTML(option); - $("#"+option.elem).width(option.width); - $("#"+option.elem).height(option.height); + createFrameHTML(option); + $("#"+option.elem).width(option.width); + $("#"+option.elem).height(option.height); return new pearFrame(option); - } + } pearFrame.prototype.changePage = function(url,loading){ if(loading){ @@ -28,12 +28,12 @@ layui.define(['jquery', 'element'], function (exports) { loading.css({display:'block'}); } $("#"+this.option.elem+" iframe").attr("src",url); - if(loading){ - var loading = $("#"+this.option.elem).find(".pear-frame-loading"); + if(loading){ + var loading = $("#"+this.option.elem).find(".pear-frame-loading"); setTimeout(function(){ loading.fadeOut(500); },800) - } + } } pearFrame.prototype.changePageByElement = function(elem,url,title,loading){ @@ -42,13 +42,13 @@ layui.define(['jquery', 'element'], function (exports) { loading.css({display:'block'}); } $("#"+elem+" iframe").attr("src",url); - $("#"+elem+" .title").html(title); - if(loading){ - var loading = $("#"+elem).find(".pear-frame-loading"); + $("#"+elem+" .title").html(title); + if(loading){ + var loading = $("#"+elem).find(".pear-frame-loading"); setTimeout(function(){ loading.css({display:'none'}); },400) - } + } } pearFrame.prototype.refresh = function (time) { @@ -66,12 +66,12 @@ layui.define(['jquery', 'element'], function (exports) { function createFrameHTML(option){ var iframe = ""; - var loading = '
'+ - '
'+ - ''+ - '
'+ - '
'; - $("#"+option.elem).html("
"+ iframe + loading +"
"); + var loading = '
'+ + '
'+ + ''+ + '
'+ + '
'; + $("#"+option.elem).html("
"+ iframe + loading +"
"); } exports('frame', new pearFrame()); -- Gitee From 62a5544ac53eb17079a6f4da69e00caa82948098 Mon Sep 17 00:00:00 2001 From: gzy Date: Sat, 2 Apr 2022 16:14:53 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9Aframe=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E4=BB=A3=E7=A0=81=E6=A0=BC=E5=BC=8F=E5=8C=96=EF=BC=8C?= =?UTF-8?q?=E6=97=A0=E5=AE=9E=E9=99=85=E4=BB=A3=E7=A0=81=E6=94=B9=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- component/pear/module/frame.js | 106 ++++++++++++++++----------------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/component/pear/module/frame.js b/component/pear/module/frame.js index 46a50bb..9e593a9 100644 --- a/component/pear/module/frame.js +++ b/component/pear/module/frame.js @@ -1,77 +1,77 @@ layui.define(['jquery', 'element'], function (exports) { - "use strict"; + "use strict"; - var $ = layui.jquery; + var $ = layui.jquery; - var pearFrame = function (opt) { - this.option = opt; - }; + var pearFrame = function (opt) { + this.option = opt; + }; - pearFrame.prototype.render = function (opt) { + pearFrame.prototype.render = function (opt) { var option = { - elem:opt.elem, - url:opt.url, - title:opt.title, - width:opt.width, - height:opt.height, - done:opt.done ? opt.done: function(){ console.log("菜单渲染成功");} + elem: opt.elem, + url: opt.url, + title: opt.title, + width: opt.width, + height: opt.height, + done: opt.done ? opt.done : function () { console.log("菜单渲染成功"); } } - createFrameHTML(option); - $("#"+option.elem).width(option.width); - $("#"+option.elem).height(option.height); + createFrameHTML(option); + $("#" + option.elem).width(option.width); + $("#" + option.elem).height(option.height); return new pearFrame(option); - } + } - pearFrame.prototype.changePage = function(url,loading){ - if(loading){ - var loading = $("#"+this.option.elem).find(".pear-frame-loading"); - loading.css({display:'block'}); + pearFrame.prototype.changePage = function (url, loading) { + if (loading) { + var loading = $("#" + this.option.elem).find(".pear-frame-loading"); + loading.css({ display: 'block' }); } - $("#"+this.option.elem+" iframe").attr("src",url); - if(loading){ - var loading = $("#"+this.option.elem).find(".pear-frame-loading"); - setTimeout(function(){ + $("#" + this.option.elem + " iframe").attr("src", url); + if (loading) { + var loading = $("#" + this.option.elem).find(".pear-frame-loading"); + setTimeout(function () { loading.fadeOut(500); - },800) - } + }, 800) + } } - pearFrame.prototype.changePageByElement = function(elem,url,title,loading){ - if(loading){ - var loading = $("#"+elem).find(".pear-frame-loading"); - loading.css({display:'block'}); + pearFrame.prototype.changePageByElement = function (elem, url, title, loading) { + if (loading) { + var loading = $("#" + elem).find(".pear-frame-loading"); + loading.css({ display: 'block' }); + } + $("#" + elem + " iframe").attr("src", url); + $("#" + elem + " .title").html(title); + if (loading) { + var loading = $("#" + elem).find(".pear-frame-loading"); + setTimeout(function () { + loading.css({ display: 'none' }); + }, 400) } - $("#"+elem+" iframe").attr("src",url); - $("#"+elem+" .title").html(title); - if(loading){ - var loading = $("#"+elem).find(".pear-frame-loading"); - setTimeout(function(){ - loading.css({display:'none'}); - },400) - } } pearFrame.prototype.refresh = function (time) { - if(time!=false){ - var loading = $("#"+this.option.elem).find(".pear-frame-loading"); - loading.css({display:'block'}); - if(time!=0){ - setTimeout(function(){ + if (time != false) { + var loading = $("#" + this.option.elem).find(".pear-frame-loading"); + loading.css({ display: 'block' }); + if (time != 0) { + setTimeout(function () { loading.fadeOut(500); - },time) + }, time) } } - $("#"+this.option.elem).find("iframe")[0].contentWindow.location.reload(true); + $("#" + this.option.elem).find("iframe")[0].contentWindow.location.reload(true); } - function createFrameHTML(option){ - var iframe = ""; - var loading = '
'+ - '
'+ - ''+ - '
'+ - '
'; - $("#"+option.elem).html("
"+ iframe + loading +"
"); + function createFrameHTML(option) { + var iframe = ""; + var loading = '
' + + '
' + + '' + + '
' + + '
'; + $("#" + option.elem).html("
" + iframe + loading + "
"); } exports('frame', new pearFrame()); -- Gitee