发版

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "layui",
   "main": "dist/layui.js",
-  "version": "2.5.3",
+  "version": "2.5.4",
   "homepage": "https://github.com/sentsin/layui",
   "authors": [
     "sentsin <xu@sentsin.com>"

dist/css/modules/code.css

@@ -1,2 +1,2 @@
-/** layui-v2.5.3 MIT License By https://www.layui.com */
+/** layui-v2.5.4 MIT License By https://www.layui.com */
  html #layuicss-skincodecss{display:none;position:absolute;width:1989px}.layui-code-h3,.layui-code-view{position:relative;font-size:12px}.layui-code-view{display:block;margin:10px 0;padding:0;border:1px solid #e2e2e2;border-left-width:6px;background-color:#F2F2F2;color:#333;font-family:Courier New}.layui-code-h3{padding:0 10px;height:32px;line-height:32px;border-bottom:1px solid #e2e2e2}.layui-code-h3 a{position:absolute;right:10px;top:0;color:#999}.layui-code-view .layui-code-ol{position:relative;overflow:auto}.layui-code-view .layui-code-ol li{position:relative;margin-left:45px;line-height:20px;padding:0 5px;border-left:1px solid #e2e2e2;list-style-type:decimal-leading-zero;*list-style-type:decimal;background-color:#fff}.layui-code-view pre{margin:0}.layui-code-notepad{border:1px solid #0C0C0C;border-left-color:#3F3F3F;background-color:#0C0C0C;color:#C2BE9E}.layui-code-notepad .layui-code-h3{border-bottom:none}.layui-code-notepad .layui-code-ol li{background-color:#3F3F3F;border-left:none}

dist/lay/modules/carousel.js

@@ -1,2 +1,2 @@
-/** layui-v2.5.3 MIT License By https://www.layui.com */
+/** layui-v2.5.4 MIT License By https://www.layui.com */
  ;layui.define("jquery",function(e){"use strict";var i=layui.$,n=(layui.hint(),layui.device(),{config:{},set:function(e){var n=this;return n.config=i.extend({},n.config,e),n},on:function(e,i){return layui.onevent.call(this,t,e,i)}}),t="carousel",a="layui-this",l=">*[carousel-item]>*",o="layui-carousel-left",r="layui-carousel-right",d="layui-carousel-prev",s="layui-carousel-next",u="layui-carousel-arrow",c="layui-carousel-ind",m=function(e){var t=this;t.config=i.extend({},t.config,n.config,e),t.render()};m.prototype.config={width:"600px",height:"280px",full:!1,arrow:"hover",indicator:"inside",autoplay:!0,interval:3e3,anim:"",trigger:"click",index:0},m.prototype.render=function(){var e=this,n=e.config;n.elem=i(n.elem),n.elem[0]&&(e.elemItem=n.elem.find(l),n.index<0&&(n.index=0),n.index>=e.elemItem.length&&(n.index=e.elemItem.length-1),n.interval<800&&(n.interval=800),n.full?n.elem.css({position:"fixed",width:"100%",height:"100%",zIndex:9999}):n.elem.css({width:n.width,height:n.height}),n.elem.attr("lay-anim",n.anim),e.elemItem.eq(n.index).addClass(a),e.elemItem.length<=1||(e.indicator(),e.arrow(),e.autoplay(),e.events()))},m.prototype.reload=function(e){var n=this;clearInterval(n.timer),n.config=i.extend({},n.config,e),n.render()},m.prototype.prevIndex=function(){var e=this,i=e.config,n=i.index-1;return n<0&&(n=e.elemItem.length-1),n},m.prototype.nextIndex=function(){var e=this,i=e.config,n=i.index+1;return n>=e.elemItem.length&&(n=0),n},m.prototype.addIndex=function(e){var i=this,n=i.config;e=e||1,n.index=n.index+e,n.index>=i.elemItem.length&&(n.index=0)},m.prototype.subIndex=function(e){var i=this,n=i.config;e=e||1,n.index=n.index-e,n.index<0&&(n.index=i.elemItem.length-1)},m.prototype.autoplay=function(){var e=this,i=e.config;i.autoplay&&(clearInterval(e.timer),e.timer=setInterval(function(){e.slide()},i.interval))},m.prototype.arrow=function(){var e=this,n=e.config,t=i(['<button class="layui-icon '+u+'" lay-type="sub">'+("updown"===n.anim?"&#xe619;":"&#xe603;")+"</button>",'<button class="layui-icon '+u+'" lay-type="add">'+("updown"===n.anim?"&#xe61a;":"&#xe602;")+"</button>"].join(""));n.elem.attr("lay-arrow",n.arrow),n.elem.find("."+u)[0]&&n.elem.find("."+u).remove(),n.elem.append(t),t.on("click",function(){var n=i(this),t=n.attr("lay-type");e.slide(t)})},m.prototype.indicator=function(){var e=this,n=e.config,t=e.elemInd=i(['<div class="'+c+'"><ul>',function(){var i=[];return layui.each(e.elemItem,function(e){i.push("<li"+(n.index===e?' class="layui-this"':"")+"></li>")}),i.join("")}(),"</ul></div>"].join(""));n.elem.attr("lay-indicator",n.indicator),n.elem.find("."+c)[0]&&n.elem.find("."+c).remove(),n.elem.append(t),"updown"===n.anim&&t.css("margin-top",-(t.height()/2)),t.find("li").on("hover"===n.trigger?"mouseover":n.trigger,function(){var t=i(this),a=t.index();a>n.index?e.slide("add",a-n.index):a<n.index&&e.slide("sub",n.index-a)})},m.prototype.slide=function(e,i){var n=this,l=n.elemItem,u=n.config,c=u.index,m=u.elem.attr("lay-filter");n.haveSlide||("sub"===e?(n.subIndex(i),l.eq(u.index).addClass(d),setTimeout(function(){l.eq(c).addClass(r),l.eq(u.index).addClass(r)},50)):(n.addIndex(i),l.eq(u.index).addClass(s),setTimeout(function(){l.eq(c).addClass(o),l.eq(u.index).addClass(o)},50)),setTimeout(function(){l.removeClass(a+" "+d+" "+s+" "+o+" "+r),l.eq(u.index).addClass(a),n.haveSlide=!1},300),n.elemInd.find("li").eq(u.index).addClass(a).siblings().removeClass(a),n.haveSlide=!0,layui.event.call(this,t,"change("+m+")",{index:u.index,prevIndex:c,item:l.eq(u.index)}))},m.prototype.events=function(){var e=this,i=e.config;i.elem.data("haveEvents")||(i.elem.on("mouseenter",function(){clearInterval(e.timer)}).on("mouseleave",function(){e.autoplay()}),i.elem.data("haveEvents",!0))},n.render=function(e){var i=new m(e);return i},e(t,n)});

dist/lay/modules/code.js

@@ -1,2 +1,2 @@
-/** layui-v2.5.3 MIT License By https://www.layui.com */
+/** layui-v2.5.4 MIT License By https://www.layui.com */
  ;layui.define("jquery",function(e){"use strict";var a=layui.$,l="http://www.layui.com/doc/modules/code.html";e("code",function(e){var t=[];e=e||{},e.elem=a(e.elem||".layui-code"),e.about=!("about"in e)||e.about,e.elem.each(function(){t.push(this)}),layui.each(t.reverse(),function(t,i){var c=a(i),o=c.html();(c.attr("lay-encode")||e.encode)&&(o=o.replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#39;").replace(/"/g,"&quot;")),c.html('<ol class="layui-code-ol"><li>'+o.replace(/[\r\t\n]+/g,"</li><li>")+"</li></ol>"),c.find(">.layui-code-h3")[0]||c.prepend('<h3 class="layui-code-h3">'+(c.attr("lay-title")||e.title||"code")+(e.about?'<a href="'+l+'" target="_blank">layui.code</a>':"")+"</h3>");var d=c.find(">.layui-code-ol");c.addClass("layui-box layui-code-view"),(c.attr("lay-skin")||e.skin)&&c.addClass("layui-code-"+(c.attr("lay-skin")||e.skin)),(d.find("li").length/100|0)>0&&d.css("margin-left",(d.find("li").length/100|0)+"px"),(c.attr("lay-height")||e.height)&&d.css("max-height",c.attr("lay-height")||e.height)})})}).addcss("modules/code.css","skincodecss");

dist/lay/modules/flow.js

@@ -1,2 +1,2 @@
-/** layui-v2.5.3 MIT License By https://www.layui.com */
+/** layui-v2.5.4 MIT License By https://www.layui.com */
  ;layui.define("jquery",function(e){"use strict";var l=layui.$,o=function(e){},t='<i class="layui-anim layui-anim-rotate layui-anim-loop layui-icon ">&#xe63e;</i>';o.prototype.load=function(e){var o,i,n,r,a=this,c=0;e=e||{};var f=l(e.elem);if(f[0]){var m=l(e.scrollElem||document),u=e.mb||50,s=!("isAuto"in e)||e.isAuto,v=e.end||"没有更多了",y=e.scrollElem&&e.scrollElem!==document,d="<cite>加载更多</cite>",h=l('<div class="layui-flow-more"><a href="javascript:;">'+d+"</a></div>");f.find(".layui-flow-more")[0]||f.append(h);var p=function(e,t){e=l(e),h.before(e),t=0==t||null,t?h.html(v):h.find("a").html(d),i=t,o=null,n&&n()},g=function(){o=!0,h.find("a").html(t),"function"==typeof e.done&&e.done(++c,p)};if(g(),h.find("a").on("click",function(){l(this);i||o||g()}),e.isLazyimg)var n=a.lazyimg({elem:e.elem+" img",scrollElem:e.scrollElem});return s?(m.on("scroll",function(){var e=l(this),t=e.scrollTop();r&&clearTimeout(r),i||(r=setTimeout(function(){var i=y?e.height():l(window).height(),n=y?e.prop("scrollHeight"):document.documentElement.scrollHeight;n-t-i<=u&&(o||g())},100))}),a):a}},o.prototype.lazyimg=function(e){var o,t=this,i=0;e=e||{};var n=l(e.scrollElem||document),r=e.elem||"img",a=e.scrollElem&&e.scrollElem!==document,c=function(e,l){var o=n.scrollTop(),r=o+l,c=a?function(){return e.offset().top-n.offset().top+o}():e.offset().top;if(c>=o&&c<=r&&!e.attr("src")){var m=e.attr("lay-src");layui.img(m,function(){var l=t.lazyimg.elem.eq(i);e.attr("src",m).removeAttr("lay-src"),l[0]&&f(l),i++})}},f=function(e,o){var f=a?(o||n).height():l(window).height(),m=n.scrollTop(),u=m+f;if(t.lazyimg.elem=l(r),e)c(e,f);else for(var s=0;s<t.lazyimg.elem.length;s++){var v=t.lazyimg.elem.eq(s),y=a?function(){return v.offset().top-n.offset().top+m}():v.offset().top;if(c(v,f),i=s,y>u)break}};if(f(),!o){var m;n.on("scroll",function(){var e=l(this);m&&clearTimeout(m),m=setTimeout(function(){f(null,e)},50)}),o=!0}return f},e("flow",new o)});

dist/lay/modules/laypage.js

@@ -1,2 +1,2 @@
-/** layui-v2.5.3 MIT License By https://www.layui.com */
+/** layui-v2.5.4 MIT License By https://www.layui.com */
  ;layui.define(function(e){"use strict";var a=document,t="getElementById",n="getElementsByTagName",i="laypage",r="layui-disabled",u=function(e){var a=this;a.config=e||{},a.config.index=++s.index,a.render(!0)};u.prototype.type=function(){var e=this.config;if("object"==typeof e.elem)return void 0===e.elem.length?2:3},u.prototype.view=function(){var e=this,a=e.config,t=a.groups="groups"in a?0|a.groups:5;a.layout="object"==typeof a.layout?a.layout:["prev","page","next"],a.count=0|a.count,a.curr=0|a.curr||1,a.limits="object"==typeof a.limits?a.limits:[10,20,30,40,50],a.limit=0|a.limit||10,a.pages=Math.ceil(a.count/a.limit)||1,a.curr>a.pages&&(a.curr=a.pages),t<0?t=1:t>a.pages&&(t=a.pages),a.prev="prev"in a?a.prev:"&#x4E0A;&#x4E00;&#x9875;",a.next="next"in a?a.next:"&#x4E0B;&#x4E00;&#x9875;";var n=a.pages>t?Math.ceil((a.curr+(t>1?1:0))/(t>0?t:1)):1,i={prev:function(){return a.prev?'<a href="javascript:;" class="layui-laypage-prev'+(1==a.curr?" "+r:"")+'" data-page="'+(a.curr-1)+'">'+a.prev+"</a>":""}(),page:function(){var e=[];if(a.count<1)return"";n>1&&a.first!==!1&&0!==t&&e.push('<a href="javascript:;" class="layui-laypage-first" data-page="1"  title="&#x9996;&#x9875;">'+(a.first||1)+"</a>");var i=Math.floor((t-1)/2),r=n>1?a.curr-i:1,u=n>1?function(){var e=a.curr+(t-i-1);return e>a.pages?a.pages:e}():t;for(u-r<t-1&&(r=u-t+1),a.first!==!1&&r>2&&e.push('<span class="layui-laypage-spr">&#x2026;</span>');r<=u;r++)r===a.curr?e.push('<span class="layui-laypage-curr"><em class="layui-laypage-em" '+(/^#/.test(a.theme)?'style="background-color:'+a.theme+';"':"")+"></em><em>"+r+"</em></span>"):e.push('<a href="javascript:;" data-page="'+r+'">'+r+"</a>");return a.pages>t&&a.pages>u&&a.last!==!1&&(u+1<a.pages&&e.push('<span class="layui-laypage-spr">&#x2026;</span>'),0!==t&&e.push('<a href="javascript:;" class="layui-laypage-last" title="&#x5C3E;&#x9875;"  data-page="'+a.pages+'">'+(a.last||a.pages)+"</a>")),e.join("")}(),next:function(){return a.next?'<a href="javascript:;" class="layui-laypage-next'+(a.curr==a.pages?" "+r:"")+'" data-page="'+(a.curr+1)+'">'+a.next+"</a>":""}(),count:'<span class="layui-laypage-count">共 '+a.count+" 条</span>",limit:function(){var e=['<span class="layui-laypage-limits"><select lay-ignore>'];return layui.each(a.limits,function(t,n){e.push('<option value="'+n+'"'+(n===a.limit?"selected":"")+">"+n+" 条/页</option>")}),e.join("")+"</select></span>"}(),refresh:['<a href="javascript:;" data-page="'+a.curr+'" class="layui-laypage-refresh">','<i class="layui-icon layui-icon-refresh"></i>',"</a>"].join(""),skip:function(){return['<span class="layui-laypage-skip">&#x5230;&#x7B2C;','<input type="text" min="1" value="'+a.curr+'" class="layui-input">','&#x9875;<button type="button" class="layui-laypage-btn">&#x786e;&#x5b9a;</button>',"</span>"].join("")}()};return['<div class="layui-box layui-laypage layui-laypage-'+(a.theme?/^#/.test(a.theme)?"molv":a.theme:"default")+'" id="layui-laypage-'+a.index+'">',function(){var e=[];return layui.each(a.layout,function(a,t){i[t]&&e.push(i[t])}),e.join("")}(),"</div>"].join("")},u.prototype.jump=function(e,a){if(e){var t=this,i=t.config,r=e.children,u=e[n]("button")[0],l=e[n]("input")[0],p=e[n]("select")[0],c=function(){var e=0|l.value.replace(/\s|\D/g,"");e&&(i.curr=e,t.render())};if(a)return c();for(var o=0,y=r.length;o<y;o++)"a"===r[o].nodeName.toLowerCase()&&s.on(r[o],"click",function(){var e=0|this.getAttribute("data-page");e<1||e>i.pages||(i.curr=e,t.render())});p&&s.on(p,"change",function(){var e=this.value;i.curr*e>i.count&&(i.curr=Math.ceil(i.count/e)),i.limit=e,t.render()}),u&&s.on(u,"click",function(){c()})}},u.prototype.skip=function(e){if(e){var a=this,t=e[n]("input")[0];t&&s.on(t,"keyup",function(t){var n=this.value,i=t.keyCode;/^(37|38|39|40)$/.test(i)||(/\D/.test(n)&&(this.value=n.replace(/\D/,"")),13===i&&a.jump(e,!0))})}},u.prototype.render=function(e){var n=this,i=n.config,r=n.type(),u=n.view();2===r?i.elem&&(i.elem.innerHTML=u):3===r?i.elem.html(u):a[t](i.elem)&&(a[t](i.elem).innerHTML=u),i.jump&&i.jump(i,e);var s=a[t]("layui-laypage-"+i.index);n.jump(s),i.hash&&!e&&(location.hash="!"+i.hash+"="+i.curr),n.skip(s)};var s={render:function(e){var a=new u(e);return a.index},index:layui.laypage?layui.laypage.index+1e4:0,on:function(e,a,t){return e.attachEvent?e.attachEvent("on"+a,function(a){a.target=a.srcElement,t.call(e,a)}):e.addEventListener(a,t,!1),this}};e(i,s)});

dist/lay/modules/laytpl.js

@@ -1,2 +1,2 @@
-/** layui-v2.5.3 MIT License By https://www.layui.com */
+/** layui-v2.5.4 MIT License By https://www.layui.com */
  ;layui.define(function(e){"use strict";var r={open:"{{",close:"}}"},c={exp:function(e){return new RegExp(e,"g")},query:function(e,c,t){var o=["#([\\s\\S])+?","([^{#}])*?"][e||0];return n((c||"")+r.open+o+r.close+(t||""))},escape:function(e){return String(e||"").replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#39;").replace(/"/g,"&quot;")},error:function(e,r){var c="Laytpl Error：";return"object"==typeof console&&console.error(c+e+"\n"+(r||"")),c+e}},n=c.exp,t=function(e){this.tpl=e};t.pt=t.prototype,window.errors=0,t.pt.parse=function(e,t){var o=this,p=e,a=n("^"+r.open+"#",""),l=n(r.close+"$","");e=e.replace(/\s+|\r|\t|\n/g," ").replace(n(r.open+"#"),r.open+"# ").replace(n(r.close+"}"),"} "+r.close).replace(/\\/g,"\\\\").replace(n(r.open+"!(.+?)!"+r.close),function(e){return e=e.replace(n("^"+r.open+"!"),"").replace(n("!"+r.close),"").replace(n(r.open+"|"+r.close),function(e){return e.replace(/(.)/g,"\\$1")})}).replace(/(?="|')/g,"\\").replace(c.query(),function(e){return e=e.replace(a,"").replace(l,""),'";'+e.replace(/\\/g,"")+';view+="'}).replace(c.query(1),function(e){var c='"+(';return e.replace(/\s/g,"")===r.open+r.close?"":(e=e.replace(n(r.open+"|"+r.close),""),/^=/.test(e)&&(e=e.replace(/^=/,""),c='"+_escape_('),c+e.replace(/\\/g,"")+')+"')}),e='"use strict";var view = "'+e+'";return view;';try{return o.cache=e=new Function("d, _escape_",e),e(t,c.escape)}catch(u){return delete o.cache,c.error(u,p)}},t.pt.render=function(e,r){var n,t=this;return e?(n=t.cache?t.cache(e,c.escape):t.parse(t.tpl,e),r?void r(n):n):c.error("no data")};var o=function(e){return"string"!=typeof e?c.error("Template not found"):new t(e)};o.config=function(e){e=e||{};for(var c in e)r[c]=e[c]},o.v="1.2.0",e("laytpl",o)});

dist/lay/modules/rate.js

@@ -1,2 +1,2 @@
-/** layui-v2.5.3 MIT License By https://www.layui.com */
+/** layui-v2.5.4 MIT License By https://www.layui.com */
  ;layui.define("jquery",function(e){"use strict";var a=layui.jquery,i={config:{},index:layui.rate?layui.rate.index+1e4:0,set:function(e){var i=this;return i.config=a.extend({},i.config,e),i},on:function(e,a){return layui.onevent.call(this,n,e,a)}},l=function(){var e=this,a=e.config;return{setvalue:function(a){e.setvalue.call(e,a)},config:a}},n="rate",t="layui-rate",o="layui-icon-rate",s="layui-icon-rate-solid",u="layui-icon-rate-half",r="layui-icon-rate-solid layui-icon-rate-half",c="layui-icon-rate-solid layui-icon-rate",f="layui-icon-rate layui-icon-rate-half",v=function(e){var l=this;l.index=++i.index,l.config=a.extend({},l.config,i.config,e),l.render()};v.prototype.config={length:5,text:!1,readonly:!1,half:!1,value:0,theme:""},v.prototype.render=function(){var e=this,i=e.config,l=i.theme?'style="color: '+i.theme+';"':"";i.elem=a(i.elem),parseInt(i.value)!==i.value&&(i.half||(i.value=Math.ceil(i.value)-i.value<.5?Math.ceil(i.value):Math.floor(i.value)));for(var n='<ul class="layui-rate" '+(i.readonly?"readonly":"")+">",u=1;u<=i.length;u++){var r='<li class="layui-inline"><i class="layui-icon '+(u>Math.floor(i.value)?o:s)+'" '+l+"></i></li>";i.half&&parseInt(i.value)!==i.value&&u==Math.ceil(i.value)?n=n+'<li><i class="layui-icon layui-icon-rate-half" '+l+"></i></li>":n+=r}n+="</ul>"+(i.text?'<span class="layui-inline">'+i.value+"星":"")+"</span>";var c=i.elem,f=c.next("."+t);f[0]&&f.remove(),e.elemTemp=a(n),i.span=e.elemTemp.next("span"),i.setText&&i.setText(i.value),c.html(e.elemTemp),c.addClass("layui-inline"),i.readonly||e.action()},v.prototype.setvalue=function(e){var a=this,i=a.config;i.value=e,a.render()},v.prototype.action=function(){var e=this,i=e.config,l=e.elemTemp,n=l.find("i").width();l.children("li").each(function(e){var t=e+1,v=a(this);v.on("click",function(e){if(i.value=t,i.half){var o=e.pageX-a(this).offset().left;o<=n/2&&(i.value=i.value-.5)}i.text&&l.next("span").text(i.value+"星"),i.choose&&i.choose(i.value),i.setText&&i.setText(i.value)}),v.on("mousemove",function(e){if(l.find("i").each(function(){a(this).addClass(o).removeClass(r)}),l.find("i:lt("+t+")").each(function(){a(this).addClass(s).removeClass(f)}),i.half){var c=e.pageX-a(this).offset().left;c<=n/2&&v.children("i").addClass(u).removeClass(s)}}),v.on("mouseleave",function(){l.find("i").each(function(){a(this).addClass(o).removeClass(r)}),l.find("i:lt("+Math.floor(i.value)+")").each(function(){a(this).addClass(s).removeClass(f)}),i.half&&parseInt(i.value)!==i.value&&l.children("li:eq("+Math.floor(i.value)+")").children("i").addClass(u).removeClass(c)})})},v.prototype.events=function(){var e=this;e.config},i.render=function(e){var a=new v(e);return l.call(a)},e(n,i)});

dist/lay/modules/util.js

@@ -1,2 +1,2 @@
-/** layui-v2.5.3 MIT License By https://www.layui.com */
+/** layui-v2.5.4 MIT License By https://www.layui.com */
  ;layui.define("jquery",function(t){"use strict";var e=layui.$,i={fixbar:function(t){var i,n,a="layui-fixbar",o="layui-fixbar-top",r=e(document),l=e("body");t=e.extend({showHeight:200},t),t.bar1=t.bar1===!0?"&#xe606;":t.bar1,t.bar2=t.bar2===!0?"&#xe607;":t.bar2,t.bgcolor=t.bgcolor?"background-color:"+t.bgcolor:"";var c=[t.bar1,t.bar2,"&#xe604;"],g=e(['<ul class="'+a+'">',t.bar1?'<li class="layui-icon" lay-type="bar1" style="'+t.bgcolor+'">'+c[0]+"</li>":"",t.bar2?'<li class="layui-icon" lay-type="bar2" style="'+t.bgcolor+'">'+c[1]+"</li>":"",'<li class="layui-icon '+o+'" lay-type="top" style="'+t.bgcolor+'">'+c[2]+"</li>","</ul>"].join("")),s=g.find("."+o),u=function(){var e=r.scrollTop();e>=t.showHeight?i||(s.show(),i=1):i&&(s.hide(),i=0)};e("."+a)[0]||("object"==typeof t.css&&g.css(t.css),l.append(g),u(),g.find("li").on("click",function(){var i=e(this),n=i.attr("lay-type");"top"===n&&e("html,body").animate({scrollTop:0},200),t.click&&t.click.call(this,n)}),r.on("scroll",function(){clearTimeout(n),n=setTimeout(function(){u()},100)}))},countdown:function(t,e,i){var n=this,a="function"==typeof e,o=new Date(t).getTime(),r=new Date(!e||a?(new Date).getTime():e).getTime(),l=o-r,c=[Math.floor(l/864e5),Math.floor(l/36e5)%24,Math.floor(l/6e4)%60,Math.floor(l/1e3)%60];a&&(i=e);var g=setTimeout(function(){n.countdown(t,r+1e3,i)},1e3);return i&&i(l>0?c:[0,0,0,0],e,g),l<=0&&clearTimeout(g),g},timeAgo:function(t,e){var i=this,n=[[],[]],a=(new Date).getTime()-new Date(t).getTime();return a>6912e5?(a=new Date(t),n[0][0]=i.digit(a.getFullYear(),4),n[0][1]=i.digit(a.getMonth()+1),n[0][2]=i.digit(a.getDate()),e||(n[1][0]=i.digit(a.getHours()),n[1][1]=i.digit(a.getMinutes()),n[1][2]=i.digit(a.getSeconds())),n[0].join("-")+" "+n[1].join(":")):a>=864e5?(a/1e3/60/60/24|0)+"天前":a>=36e5?(a/1e3/60/60|0)+"小时前":a>=12e4?(a/1e3/60|0)+"分钟前":a<0?"未来":"刚刚"},digit:function(t,e){var i="";t=String(t),e=e||2;for(var n=t.length;n<e;n++)i+="0";return t<Math.pow(10,e)?i+(0|t):t},toDateString:function(t,e){var i=this,n=new Date(t||new Date),a=[i.digit(n.getFullYear(),4),i.digit(n.getMonth()+1),i.digit(n.getDate())],o=[i.digit(n.getHours()),i.digit(n.getMinutes()),i.digit(n.getSeconds())];return e=e||"yyyy-MM-dd HH:mm:ss",e.replace(/yyyy/g,a[0]).replace(/MM/g,a[1]).replace(/dd/g,a[2]).replace(/HH/g,o[0]).replace(/mm/g,o[1]).replace(/ss/g,o[2])},escape:function(t){return String(t||"").replace(/&(?!#?[a-zA-Z0-9]+;)/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/'/g,"&#39;").replace(/"/g,"&quot;")},event:function(t,n,a){n=i.event[t]=e.extend(!0,i.event[t],n)||{},e("body").on(a||"click","*["+t+"]",function(){var i=e(this),a=i.attr(t);n[a]&&n[a].call(this,i)})}};!function(t,e,i){"$:nomunge";function n(){a=e[l](function(){o.each(function(){var e=t(this),i=e.width(),n=e.height(),a=t.data(this,g);(i!==a.w||n!==a.h)&&e.trigger(c,[a.w=i,a.h=n])}),n()},r[s])}var a,o=t([]),r=t.resize=t.extend(t.resize,{}),l="setTimeout",c="resize",g=c+"-special-event",s="delay",u="throttleWindow";r[s]=250,r[u]=!0,t.event.special[c]={setup:function(){if(!r[u]&&this[l])return!1;var e=t(this);o=o.add(e),t.data(this,g,{w:e.width(),h:e.height()}),1===o.length&&n()},teardown:function(){if(!r[u]&&this[l])return!1;var e=t(this);o=o.not(e),e.removeData(g),o.length||clearTimeout(a)},add:function(e){function n(e,n,o){var r=t(this),l=t.data(this,g)||{};l.w=n!==i?n:r.width(),l.h=o!==i?o:r.height(),a.apply(this,arguments)}if(!r[u]&&this[l])return!1;var a;return t.isFunction(e)?(a=e,n):(a=e.handler,void(e.handler=n))}}}(e,window),t("util",i)});

examples/table.html

@@ -177,7 +177,7 @@ body{padding: 20px; /*overflow-y: scroll;*/}
   </table>
 </div>
 
-<script src="../src/layui.js" charset="utf-8"></script>
+<script src="../src/layui.js" src="//layui.hcwl520.com.cn/layui-v2.4.5/layui.js" charset="utf-8"></script>
 <script>
 layui.use('table', function(){
   var table = layui.table;
@@ -187,6 +187,7 @@ layui.use('table', function(){
   window.ins1 = table.render({
     elem: '#test'
     ,height: 400
+    //,width: 600
     ,title: '用户数据表'
     ,url: 'json/table/demo1.json'
     //,size: 'lg'

examples/transfer.html

@@ -8,7 +8,7 @@
   <link rel="stylesheet" href="../src/css/layui.css">
   <style>
     body{padding: 100px;}
-    #text1,#text2{padding-top: 60px;}
+    #text1,#text2{padding-bottom: 60px;}
   </style>
 </head>
 <body>
@@ -17,10 +17,19 @@
   <button type="button" class="layui-btn" lay-demo="getData">获取右侧数据</button>
   <button type="button" class="layui-btn" lay-demo="reload">重载实例</button>
 </div>
-  
+
+
 <div id="text1"></div>
 
-<div id="text2"></div>
+
+<div class="layui-form">
+  <div class="layui-form-item">
+    <label class="layui-form-label">职位</label>
+    <div class="layui-input-block">
+      <div id="text2"></div>
+    </div>
+  </div>
+</div>  
 
 <div id="text3"></div>
 
@@ -43,6 +52,7 @@
         ,{"value": "5", "title": "巴金"}
         ,{"value": "6", "title": "冰心"}
       ]
+      ,id: 'demoId'
       ,value: ["2", "3"]
       ,showSearch: true
     });
@@ -52,10 +62,16 @@
       getData: function(othis){
         alert(JSON.stringify(ins1.getData()))
       }
+      ,reload: function(){
+        transfer.reload('demoId', {
+          value: ["6"]
+        });
+      }
     });
 
     var ins2 = transfer.render({
       elem: '#text2'
+      ,showSearch: true
       ,onchange: function(obj){
         console.log(obj)
       }

examples/tree.html

@@ -14,149 +14,167 @@
   <link rel="stylesheet" href="../src/css/layui.css" media="all">
   
   <style>
-    body{padding: 150px;}
+    body{padding: 100px;}
     #test1,#test2{margin-bottom: 100px; width: 400px;}
   </style>
 </head>
 <body>
 
+<div class="layui-btn-container">
+  <button type="button" class="layui-btn" lay-demo="getChecked">获取选中数据</button>
+  <button type="button" class="layui-btn" lay-demo="setChecked">设置节点勾选</button>
+  <button type="button" class="layui-btn" lay-demo="reload">重载实例</button>
+</div>
+
+<div class="layui-form">
+  <div class="layui-form-item">
+    <label class="layui-form-label">表单内</label>
+    <div class="layui-input-block">
+     
+  </div>
+</div>  
+
 <div id="test1"></div>
 <div id="test2"></div>
 
 <script src="../src/layui.js"></script>
 <script>
-  layui.use(['tree', 'layer'], function(){
+  layui.use(['tree', 'layer', 'util'], function(){
-    var tree = layui.tree
+    var $ = layui.$
-    ,$ = layui.$
+    ,tree = layui.tree
     ,layer = layui.layer
+    ,util = layui.util
     ,index = 100;
     
     //数据源
     var data1 = [{
-      label: '一级1'
+      title: '一级1'
       ,id: 1
       ,children: [{
-        label: '二级1-1'
+        title: '二级1-1'
         ,id: 3
         ,href: 'https://www.layui.com/doc/'
         ,children: [{
-          label: '三级1-1-3'
+          title: '三级1-1-3'
           ,id: 23
           ,children: [{
-            label: '四级1-1-3-1'
+            title: '四级1-1-3-1'
             ,id: 24
             ,children: [{
-              label: '五级1-1-3-1-1'
+              title: '五级1-1-3-1-1'
               ,id: 30
             },{
-              label: '五级1-1-3-1-2'
+              title: '五级1-1-3-1-2'
               ,id: 31
             }]
           }]
         },{
-          label: '三级1-1-1'
+          title: '三级1-1-1'
           ,id: 7
+          ,checked: true
           ,children: [{
-            label: '四级1-1-1-1'
+            title: '四级1-1-1-1'
             ,id: 15
             ,href: 'https://www.layui.com/doc/base/infrastructure.html'
           }]
         },{
-          label: '三级1-1-2'
+          title: '三级1-1-2'
           ,id: 8
           ,children: [{
-            label: '四级1-1-2-1'
+            title: '四级1-1-2-1'
             ,id: 32
           }]
         }]
       },{
-        label: '二级1-2'
+        title: '二级1-2'
         ,id: 4
+        ,spread: true
         ,children: [{
-          label: '三级1-2-1'
+          title: '三级1-2-1'
           ,id: 9
+          ,checked: true
           ,disabled: true
         },{
-          label: '三级1-2-2'
+          title: '三级1-2-2'
           ,id: 10
         }]
       },{
-        label: '二级1-3'
+        title: '二级1-3'
         ,id: 20
         ,children: [{
-          label: '三级1-3-1'
+          title: '三级1-3-1'
           ,id: 21
         },{
-          label: '三级1-3-2'
+          title: '三级1-3-2'
           ,id: 22
         }]
       }]
     },{
-      label: '一级2'
+      title: '一级2'
       ,id: 2
+      ,spread: true
       ,children: [{
-        label: '二级2-1'
+        title: '二级2-1'
         ,id: 5
+        ,spread: true
         ,children: [{
-          label: '三级2-1-1'
+          title: '三级2-1-1'
           ,id: 11
         },{
-          label: '三级2-1-2'
+          title: '三级2-1-2'
           ,id: 12
         }]
       },{
-        label: '二级2-2'
+        title: '二级2-2'
         ,id: 6
+        ,checked: true
         ,children: [{
-          label: '三级2-2-1'
+          title: '三级2-2-1'
           ,id: 13
         },{
-          label: '三级2-2-2'
+          title: '三级2-2-2'
           ,id: 14
           ,disabled: true
         }]
       }]
     },{
-      label: '一级3'
+      title: '一级3'
       ,id: 16
       ,children: [{
-        label: '二级3-1'
+        title: '二级3-1'
         ,id: 17
         ,fixed: true
         ,children: [{
-          label: '三级3-1-1'
+          title: '三级3-1-1'
           ,id: 18
         },{
-          label: '三级3-1-2'
+          title: '三级3-1-2'
           ,id: 19
         }]
       },{
-        label: '二级3-2'
+        title: '二级3-2'
         ,id: 27
         ,children: [{
-          label: '三级3-2-1'
+          title: '三级3-2-1'
           ,id: 28
         },{
-          label: '三级3-2-2'
+          title: '三级3-2-2'
           ,id: 29
         }]
       }]
     }];
 
-    var tree1 = tree.render({
+    tree.render({
       elem: '#test1'
       ,data: data1
+      ,id: 'demoId1'
       ,click: function(obj){
         layer.msg(JSON.stringify(obj.data));
         console.log(obj);
-        
       }
       ,oncheck: function(obj){
         console.log(obj);
       }
-      ,onsearch:function(obj){
-        console.log(obj);
-      }
       ,operate: function(obj){
         var type = obj.type;
         if(type == 'add'){
@@ -168,27 +186,30 @@
           console.log(obj);
         };
       }
-      ,dragend: function(state, obj, target){
-        console.log(state, obj, target);
-      }
       ,showCheckbox: true  //是否显示复选框
-      ,key: 'id'  //自定义唯一标识的字段名
-      ,checked: [6, 7, 9]  //选中节点(依赖于 showCheckbox 以及 key 参数)
-      ,spread: [2, 4, 5]  //展开节点(依赖于 key 参数)
       ,accordion: 0  //是否开启手风琴模式
       
       ,onlyIconControl: true //是否仅允许节点左侧图标控制展开收缩
       ,isJump: 0  //点击文案跳转地址
       ,edit: true  //操作节点图标
-      //,defaultNodeName: 'newNode'
-      //,showSearch: true  //是否打开节点过滤
-      //,drag: true  //是否开启节点拖拽
     });
 
-    console.log(tree1.getChecked()); //返回当前勾选节点
+    //按钮事件
-    //tree1.setChecked([2, 3]); //设置节点勾选
+    util.event('lay-demo', {
-
+      getChecked: function(othis){
-
+        var checkedData = tree.getChecked('demoId1');
+        layer.alert(JSON.stringify(checkedData), {shade:0});
+        console.log(checkedData);
+      }
+      ,setChecked: function(){
+        tree.setChecked('demoId1', [12, 16]);
+      }
+      ,reload: function(){
+        tree.reload('demoId1', {
+          
+        });
+      }
+    });
 
     
     tree.render({

package.json

@@ -1,7 +1,7 @@
 {
   "name": "layui-src",
   "realname": "layui",
-  "version": "2.5.3",
+  "version": "2.5.4",
   "independents": {
     "layim": "3.9.0"
   },

src/css/layui.css

@@ -638,7 +638,7 @@ hr, .layui-timeline-item:before{background-color: #e6e6e6;}
 .layui-form-checkbox[lay-skin="primary"] span{padding-left: 0; padding-right: 15px; line-height: 18px; background: none; color: #666;}
 .layui-form-checkbox[lay-skin="primary"] i{right: auto; left: 0; width: 16px; height: 16px; line-height: 16px; border: 1px solid #d2d2d2; font-size: 12px; border-radius: 2px; background-color: #fff; -webkit-transition: .1s linear; transition: .1s linear;}
 .layui-form-checkbox[lay-skin="primary"]:hover i{border-color: #5FB878; color: #fff;}
-.layui-form-checked[lay-skin="primary"] i{border-color: #5FB878; background-color: #5FB878; color: #fff;}
+.layui-form-checked[lay-skin="primary"] i{border-color: #5FB878 !important; background-color: #5FB878; color: #fff;}
 .layui-checkbox-disbaled[lay-skin="primary"] span{background: none!important; color: #c2c2c2;}
 .layui-checkbox-disbaled[lay-skin="primary"]:hover i{border-color: #d2d2d2;}
 .layui-form-item .layui-form-checkbox[lay-skin="primary"]{margin-top: 10px;}
@@ -865,6 +865,7 @@ hr, .layui-timeline-item:before{background-color: #e6e6e6;}
 .laytable-cell-numbers{padding: 0; text-align: center;}
 
 .layui-table-body{position: relative; overflow: auto; margin-right: -1px; margin-bottom: -1px;}
+.layui-table-body .layui-none{line-height: 26px; padding: 15px; text-align: center; color: #999;}
 .layui-table-fixed{position: absolute; left: 0; top: 0; z-index: 101;}
 .layui-table-fixed .layui-table-body{overflow: hidden;}
 .layui-table-fixed-l{box-shadow: 0 -1px 8px rgba(0,0,0,.08);}
@@ -877,12 +878,6 @@ hr, .layui-timeline-item:before{background-color: #e6e6e6;}
 
 .layui-table-total{margin-bottom: -1px; border-width: 0; border-top-width: 1px; overflow: hidden;}
 
-.layui-table-box .layui-none{display: block; line-height: 26px; text-align: center; color: #999;}
-.layui-table-box tr.layui-none{transition: none; -webkit-transition: none;}
-.layui-table-box .layui-none:hover{background: none!important;}
-.layui-table-box .layui-none td{display: block; padding: 0; border: none;}
-.layui-table-none{padding: 15px;}
-
 
 .layui-table-page{position: relative; width: 100%; padding: 7px 7px 0; border-width: 0; border-top-width: 1px; height: 41px; margin-bottom: -1px; font-size: 12px; white-space: nowrap; overflow: hidden;}
 .layui-table-page>div{height: 26px;}
@@ -940,13 +935,13 @@ body .layui-table-tips .layui-layer-content{background: none; padding: 0; box-sh
 .layui-transfer-box,
 .layui-transfer-header,
 .layui-transfer-search{border-width: 0; border-style: solid; border-color: #e6e6e6}
-.layui-transfer-box{position: relative; border-width: 1px; width: 200px; height: 360px; border-radius: 2px; background-color:#fff;}
+.layui-transfer-box{position: relative; display: inline-block; vertical-align: middle; border-width: 1px; width: 200px; height: 360px; border-radius: 2px; background-color:#fff;}
-.layui-transfer-box .layui-form-checkbox{width: 100%;}
+.layui-transfer-box .layui-form-checkbox{width: 100%; margin: 0 !important;}
 .layui-transfer-header{height: 38px; line-height: 38px; padding: 0 10px; border-bottom-width: 1px;}
 .layui-transfer-search{position:relative; padding: 10px; border-bottom-width: 1px;}
 .layui-transfer-search .layui-input{height: 32px; padding-left: 30px; font-size: 12px;}
 .layui-transfer-search .layui-icon-search{position: absolute; left: 20px; top: 50%; margin-top: -8px; color: #666;}
-.layui-transfer-active{margin: 0 15px;}
+.layui-transfer-active{margin: 0 15px; display: inline-block; vertical-align: middle;}
 .layui-transfer-active .layui-btn{display: block; margin: 0; padding: 0 15px; background-color: #5FB878; border-color: #5FB878; color: #fff;}
 .layui-transfer-active .layui-btn-disabled{background-color: #FBFBFB; border-color: #e6e6e6; color: #C9C9C9;}
 .layui-transfer-active .layui-btn:first-child{margin-bottom: 15px;}
@@ -1246,6 +1241,7 @@ body .layui-util-face  .layui-layer-content{padding:0; background-color:#fff; co
 
 /** 树组件 By star1029 **/
 .layui-tree{line-height: 22px;}
+.layui-tree .layui-form-checkbox{margin: 0 !important;}
 .layui-tree-set{width: 100%; position: relative;}
 .layui-tree-pack{display: none; padding-left: 20px; position: relative;}
 .layui-tree-line .layui-tree-pack{padding-left: 27px;}
@@ -1254,7 +1250,7 @@ body .layui-util-face  .layui-layer-content{padding:0; background-color:#fff; co
 .layui-tree-entry:hover{background-color: #eee;}
 .layui-tree-line .layui-tree-entry:hover{background-color: rgba(0,0,0,0);}
 .layui-tree-line .layui-tree-entry:hover .layui-tree-txt{color: #999; text-decoration: underline; transition: 0.3s;}
-.layui-tree-main{cursor: pointer; padding-right: 10px;}
+.layui-tree-main{display: inline-block; vertical-align: middle; cursor: pointer; padding-right: 10px;}
 .layui-tree-line .layui-tree-set:before{content: ''; position: absolute; top: 0; left: -9px; width: 0; height: 100%; border-left: 1px dotted #c0c4cc;}
 .layui-tree-line .layui-tree-set.layui-tree-setLineShort:before{height: 13px;}
 .layui-tree-line .layui-tree-set.layui-tree-setHide:before{height: 0;}
@@ -1264,7 +1260,6 @@ body .layui-util-face  .layui-layer-content{padding:0; background-color:#fff; co
 .layui-tree-icon .layui-icon{font-size: 12px; color: #666;}
 .layui-tree-iconArrow{padding: 0 5px;}
 .layui-tree-iconArrow:after{content: ''; position: absolute; left: 4px; top: 3px; z-index: 100; width: 0; height: 0; border-width: 5px; border-style: solid; border-color: transparent transparent transparent #c0c4cc; transition: 0.5s;}
-.layui-tree-iconArrow.hide:after{border-color: transparent;}
 .layui-tree-spread>.layui-tree-entry>.layui-tree-iconClick>.layui-tree-iconArrow:after{transform: rotate(90deg) translate(3px, 4px);}
 .layui-tree-txt{display: inline-block; vertical-align: middle; color: #555;}
 .layui-tree-search{margin-bottom: 15px; color: #666;}
@@ -1272,7 +1267,7 @@ body .layui-util-face  .layui-layer-content{padding:0; background-color:#fff; co
 .layui-tree-btnGroup .layui-icon{display: inline-block; vertical-align: middle; padding: 0 2px; cursor: pointer;}
 .layui-tree-btnGroup .layui-icon:hover{color: #999; transition: 0.3s;}
 .layui-tree-entry:hover .layui-tree-btnGroup{visibility: visible;}
-.layui-tree-editInput{position: relative; height: 20px; line-height: 20px; padding: 0 3px; border: none; background-color: rgba(0,0,0,0.05);}
+.layui-tree-editInput{position: relative; display: inline-block; vertical-align: middle; height: 20px; line-height: 20px; padding: 0 3px; border: none; background-color: rgba(0,0,0,0.05);}
 .layui-tree-emptyText{text-align: center; color: #999;}
 
 

src/lay/modules/table.js

@@ -158,7 +158,7 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
     ,'<div class="layui-table-box">'
       ,'{{# if(d.data.loading){ }}'
       ,'<div class="layui-table-init" style="background-color: #fff;">'
-        ,'<i class="layui-icon layui-icon-loading layui-icon"></i>'
+        ,'<i class="layui-icon layui-icon-loading layui-anim layui-anim-rotate layui-anim-loop"></i>'
       ,'</div>'
       ,'{{# } }}'
       
@@ -634,8 +634,6 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
     that.fullSize(); //让表格铺满
     that.setColsWidth(); //自适应列宽
     that.scrollPatch(); //滚动条补丁
-    
-    that.layNone && that.layNone.width(that.elem.width() - 2);
   };
   
   //表格重载
@@ -643,6 +641,7 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
     var that = this;
     
     options = options || {};
+    delete that.haveInit;
     
     if(options.data && options.data.constructor === Array) delete that.config.data;
     that.config = $.extend(true, {}, that.config, options);
@@ -654,19 +653,17 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
   Class.prototype.errorView = function(html){
     var that = this
     ,elemNone = that.layMain.find('.'+ NONE)
-    ,layNone = $(['<tr class="'+ NONE +'" data-off="1">'
+    ,layNone = $('<div class="'+ NONE +'">'+ (html || 'Error') +'</div>');
-      ,'<td data-off="1"><div class="layui-table-none">'+ html +'</div></td>'
-    ,'</tr>'].join(''));
     
     if(elemNone[0]){
       that.layNone.remove();
       elemNone.remove();
     }
     
-    if(!html) return;
+    that.layFixed.addClass(HIDE);
+    that.layMain.find('tbody').html('');
     
-    layNone.width(that.elem.width() - 2);
+    that.layMain.append(that.layNone = layNone);
-    that.layMain.find('tbody').html(that.layNone = layNone);
     
     table.cache[that.key] = []; //格式化缓存数据
   };
@@ -741,7 +738,7 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
       res[response.dataName] = options.data.concat().splice(startLimit, options.limit);
       res[response.countName] = options.data.length;
 
-      that.renderData(res, curr, (options.page && options.page.count) ? options.page.count : options.data.length), sort();
+      that.renderData(res, curr, res[response.countName]), sort();
       that.setColsWidth();
       typeof options.done === 'function' && options.done(res, curr, res[response.countName]);
     }
@@ -855,6 +852,7 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
       });
 
       that.layBody.scrollTop(0);
+      that.layMain.find('.'+ NONE).remove();
       that.layMain.find('tbody').html(trs.join(''));
       that.layFixLeft.find('tbody').html(trs_fixed.join(''));
       that.layFixRight.find('tbody').html(trs_fixed_r.join(''));
@@ -889,6 +887,8 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
     if(data.length === 0){
       that.renderForm();
       return that.errorView(options.text.none);
+    } else {
+      that.layFixed.removeClass(HIDE);
     }
     
     render(); //渲染数据
@@ -1078,7 +1078,7 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
         that.layBox.find(ELEM_INIT).remove();
       } else {
         that.layInit = $(['<div class="layui-table-init">'
-          ,'<i class="layui-icon layui-icon-loading layui-icon"></i>'
+          ,'<i class="layui-icon layui-icon-loading layui-anim layui-anim-rotate layui-anim-loop"></i>'
         ,'</div>'].join(''));
         that.layBox.append(that.layInit);
       }
@@ -1224,7 +1224,7 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
     var mainHeight = that.layMain.height()
     ,fixHeight = mainHeight - scollHeight;
     that.layFixed.find(ELEM_BODY).css('height', layMainTable.height() >= fixHeight ? fixHeight : 'auto');
-    
+
     //表格宽度小于容器宽度时，隐藏固定列
     that.layFixRight[outWidth > 0 ? 'removeClass' : 'addClass'](HIDE); 
     

src/lay/modules/transfer.js

@@ -70,7 +70,7 @@ layui.define(['laytpl', 'form'], function(exports){
   //穿梭框模板
   ,TPL_BOX = function(obj){
     obj = obj || {};
-    return ['<div class="layui-transfer-box layui-inline" data-index="'+ obj.index +'">'
+    return ['<div class="layui-transfer-box" data-index="'+ obj.index +'">'
       ,'<div class="layui-transfer-header">'
         ,'<input type="checkbox" name="'+ obj.checkAllName +'" lay-filter="layTransferCheckbox" lay-type="all" lay-skin="primary" title="{{ d.data.title['+ obj.index +'] || \'list'+ (obj.index + 1) +'\' }}">'
       ,'</div>'
@@ -90,7 +90,7 @@ layui.define(['laytpl', 'form'], function(exports){
       index: 0
       ,checkAllName: 'layTransferLeftCheckAll'
     })
-    ,'<div class="layui-transfer-active layui-inline">'
+    ,'<div class="layui-transfer-active">'
       ,'<button type="button" class="layui-btn layui-btn-sm layui-btn-primary layui-btn-disabled" data-index="0">'
         ,'<i class="layui-icon layui-icon-next"></i>'
       ,'</button>'

src/lay/modules/tree.js

@@ -11,11 +11,14 @@ layui.define('form', function(exports){
   
   var $ = layui.$
   ,form = layui.form
+  
+  //模块名
+  ,MOD_NAME = 'tree'
 
   //外部接口
   ,tree = {
     config: {}
-    ,index: layui.atree ? (layui.atree.index + 10000) : 0
+    ,index: layui[MOD_NAME] ? (layui[MOD_NAME].index + 10000) : 0
 
     //设置全局项
     ,set: function(options){
@@ -31,23 +34,40 @@ layui.define('form', function(exports){
   }
 
   //操作当前实例
-  ,thisTree = function(){
+  ,thisModule = function(){
     var that = this
-    ,options = that.config;
+    ,options = that.config
+    ,id = options.id || that.index;
+    
+    thisModule.that[id] = that; //记录当前实例对象
+    thisModule.config[id] = options; //记录当前实例配置项
     
     return {
-      getChecked: function(){
+      config: options
-        return that.getChecked();
+      //重置实例
+      ,reload: function(options){
+        that.reload.call(that, options);
       }
-      ,setChecked: function(key){//设置值
+      ,getChecked: function(){
-        return that.setChecked(key);
+        return that.getChecked.call(that);
+      }
+      ,setChecked: function(id){//设置值
+        return that.setChecked.call(that, id);
       }
-      ,config: options
     }
   }
+  
+  //获取当前实例配置项
+  ,getThisModuleConfig = function(id){
+    var config = thisModule.config[id];
+    if(!config) hint.error('The ID option was not found in the '+ MOD_NAME +' instance');
+    return config || null;
+  }
 
   //字符常量
-  ,MOD_NAME = 'tree', ELEM_VIEW = 'layui-tree', ELEM_SET = 'layui-tree-set', ICON_CLICK = 'layui-tree-iconClick'
+  ,SHOW = 'layui-show', HIDE = 'layui-hide', NONE = 'layui-none', DISABLED = 'layui-disabled'
+  
+  ,ELEM_VIEW = 'layui-tree', ELEM_SET = 'layui-tree-set', ICON_CLICK = 'layui-tree-iconClick'
   ,ICON_ADD = 'layui-icon-addition', ICON_SUB = 'layui-icon-subtraction', ELEM_ENTRY = 'layui-tree-entry', ELEM_MAIN = 'layui-tree-main', ELEM_TEXT = 'layui-tree-txt', ELEM_PACK = 'layui-tree-pack', ELEM_SPREAD = 'layui-tree-spread'
   ,ELEM_LINE_SHORT = 'layui-tree-setLineShort', ELEM_SHOW = 'layui-tree-showLine', ELEM_EXTEND = 'layui-tree-lineExtend'
  
@@ -62,21 +82,32 @@ layui.define('form', function(exports){
   //默认配置
   Class.prototype.config = {
     data: []  //数据
+    
     ,showCheckbox: false  //是否显示复选框
     ,showLine: true  //是否开启连接线
-    ,key: 'id'  //定义索引名称
-    ,checked: []  //选中节点(依赖于 showCheckbox 以及 key 参数)
-    ,spread: []  //展开节点(依赖于 key 参数)
     ,accordion: false  //是否开启手风琴模式
     ,onlyIconControl: false  //是否仅允许节点左侧图标控制展开收缩
     ,isJump: false  //是否允许点击节点时弹出新窗口跳转
     ,edit: false  //是否开启节点的操作图标
+    //,showSearch: false  //是否打开节点过滤
+    //,drag: false  //是否开启节点拖拽
     
-    ,showSearch: false  //是否打开节点过滤
+    ,text: {
-    ,drag: false  //是否开启节点拖拽
+      defaultNodeName: '未命名' //节点默认名称
+      ,none: '无数据'  //数据为空时的文本提示
+    }
+  };
+  
+  //重载实例
+  Class.prototype.reload = function(options){
+    var that = this;
     
-    ,defaultNodeName: '未命名' //节点默认名称
+    layui.each(options, function(key, item){
-    ,emptyText: '暂无数据'  //数据为空时的文本提示
+      if(item.constructor === Array) delete that.config[key];
+    });
+    
+    that.config = $.extend(true, {}, that.config, options);
+    that.render();
   };
 
   //主体渲染
@@ -87,22 +118,25 @@ layui.define('form', function(exports){
     var temp = $('<div class="layui-tree'+ (options.showCheckbox ? " layui-form" : "") + (options.showLine ? " layui-tree-line" : "") +'" lay-filter="LAY-tree-'+ that.index +'"></div>');
     that.tree(temp);
 
-    var othis = $(options.elem)
+    var othis = options.elem = $(options.elem);
-    ,hasRender = othis.next('.' + ELEM_VIEW);   
+    if(!othis[0]) return;
-    //生成替代元素
-    hasRender[0] && hasRender.remove();
 
     if(options.showSearch){
       temp.prepend('<input type="text" class="layui-input layui-tree-search" placeholder="请输入关键字进行过滤">');
     };
-
+    
+    
+    //索引
+    that.key = options.id || that.index;
+    
+    
+    //插入组件结构
     that.elem = temp;
-    that.emptyText = $('<div class="layui-tree-emptyText">'+ options.emptyText +'</div>');
+    that.elemNone = $('<div class="layui-tree-emptyText">'+ options.text.none +'</div>');
     othis.html(that.elem);
 
     if(that.elem.find('.layui-tree-set').length == 0){
-      that.elem.append(that.emptyText);
+      return that.elem.append(that.elemNone);
-      return;
     };
 
     //拖拽事件
@@ -114,80 +148,68 @@ layui.define('form', function(exports){
     };
 
     that.elem.find('.layui-tree-set').each(function(){
+      var othis = $(this);
       //最外层
-      if(!$(this).parent('.layui-tree-pack')[0]){
+      if(!othis.parent('.layui-tree-pack')[0]){
-        $(this).addClass('layui-tree-setHide');
+        othis.addClass('layui-tree-setHide');
       };
-      //没有下一个节点 上级有延伸线 父级没有连接线
+
-      // if(!$(this).next()[0] && $(this).parents('.layui-tree-lineExtend').length != 0 && !$(this).parent('.layui-tree-pack').hasClass('layui-tree-showLine')){
-      //   $(this).addClass('layui-tree-setLineShort');
-      // };
       //没有下一个节点 上一层父级有延伸线
-      if(!$(this).next()[0] && $(this).parents('.layui-tree-pack').eq(1).hasClass('layui-tree-lineExtend')){
+      if(!othis.next()[0] && othis.parents('.layui-tree-pack').eq(1).hasClass('layui-tree-lineExtend')){
-        $(this).addClass(ELEM_LINE_SHORT);
+        othis.addClass(ELEM_LINE_SHORT);
       };
+      
       //没有下一个节点 外层最后一个
-      if(!$(this).next()[0] && !$(this).parents('.layui-tree-set').eq(0).next()[0]){
+      if(!othis.next()[0] && !othis.parents('.layui-tree-set').eq(0).next()[0]){
-        $(this).addClass(ELEM_LINE_SHORT);
+        othis.addClass(ELEM_LINE_SHORT);
       };
     });
 
     that.events();
   };
+  
+  //渲染表单
+  Class.prototype.renderForm = function(type){
+    form.render(type, 'LAY-tree-'+ this.index);
+  };
 
   //节点解析
   Class.prototype.tree = function(elem, children){
     var that = this
     ,options = that.config
-    ,nodes = children || options.data;
+    ,data = children || options.data;
-
+    
-    layui.each(nodes, function(index, item){
+    //遍历数据
-      //是否初始展开节点
+    layui.each(data, function(index, item){
-      function isOpen(id){
-        if(options.spread.length == 0){
-          return false;
-        }else{
-          return $.inArray(id, options.spread) == -1 ? false : true;
-        };
-      };
-      //初始选中
-      function isCheck(id){
-        if(options.checked.length == 0){
-          return false;
-        }else{
-          return $.inArray(id, options.checked) == -1 ? false : true;
-        };
-      };
-
       var hasChild = item.children && item.children.length > 0
-      ,packDiv = $('<div class="layui-tree-pack" style="'+ (isOpen(item[options.key]) ? "display: block;" : "") +'"></div>')
+      ,packDiv = $('<div class="layui-tree-pack" '+ (item.spread ? 'style="display: block;"' : '') +'"></div>')
-      ,entryDiv = $(['<div '+ (options.key  ? 'data-key="'+ (item[options.key] || '') +'"' : '') +' class="layui-tree-set'+ (isOpen(item[options.key]) ? " layui-tree-spread" : "") + (isCheck(item[options.key]) ? " layui-tree-checkedFirst" : "") +'">'
+      ,entryDiv = $(['<div data-id="'+ item.id +'" class="layui-tree-set'+ (item.spread ? " layui-tree-spread" : "") + (item.checked ? " layui-tree-checkedFirst" : "") +'">'
         ,'<div '+ (options.drag && !item.fixed ? 'draggable="true"' : '') +' class="layui-tree-entry">'
-          ,'<div class="layui-tree-main layui-inline">'
+          ,'<div class="layui-tree-main">'
             //箭头
             ,function(){
               if(options.showLine){
                 if(hasChild){
-                  return '<span class="layui-tree-iconClick layui-tree-icon"><i class="layui-icon '+ (isOpen(item[options.key]) ? "layui-icon-subtraction": "layui-icon-addition") +'"></i></span>';
+                  return '<span class="layui-tree-iconClick layui-tree-icon"><i class="layui-icon '+ (item.spread ? "layui-icon-subtraction" : "layui-icon-addition") +'"></i></span>';
                 }else{
                   return '<span class="layui-tree-iconClick"><i class="layui-icon layui-icon-file"></i></span>';
                 };
               }else{
-                return '<span class="layui-tree-iconClick"><i class="layui-tree-iconArrow '+ (hasChild ? "": "hide") +'"></i></span>';
+                return '<span class="layui-tree-iconClick"><i class="layui-tree-iconArrow '+ (hasChild ? "": HIDE) +'"></i></span>';
               };
             }()
             
             //复选框
             ,function(){
-              return options.showCheckbox ? '<input type="checkbox" name="layuiTreeCheck" lay-skin="primary" '+ (item.disabled ? "disabled" : "") +'>' : '';
+              return options.showCheckbox ? '<input type="checkbox" name="layuiTreeCheck" lay-skin="primary" '+ (item.disabled ? "disabled" : "") +'  value="'+ item.id +'">' : '';
             }()
             
             //节点
             ,function(){
               if(options.isJump && item.href){
-                return '<a href="'+ item.href +'" target="_blank" class="'+ ELEM_TEXT +'">'+ (item.label || options.defaultNodeName) +'</a>';
+                return '<a href="'+ item.href +'" target="_blank" class="'+ ELEM_TEXT +'">'+ (item.title || item.label || options.text.defaultNodeName) +'</a>';
               }else{
-                return '<span class="'+ ELEM_TEXT +'">'+ (item.label || options.defaultNodeName) +'</span>';
+                return '<span class="'+ ELEM_TEXT + (item.disabled ? ' '+ DISABLED : '') +'">'+ (item.title || item.label || options.text.defaultNodeName) +'</span>';
               }
             }()
       ,'</div>'
@@ -222,20 +244,24 @@ layui.define('form', function(exports){
       };
 
       elem.append(entryDiv);
+      
       //若有前置节点，前置节点加连接线
       if(entryDiv.prev('.'+ELEM_SET)[0]){
         entryDiv.prev().children('.layui-tree-pack').addClass('layui-tree-showLine');
       };
+      
       //若无子节点，则父节点加延伸线
       if(!hasChild){
         entryDiv.parent('.layui-tree-pack').addClass('layui-tree-lineExtend');
       };
 
-      //展开节点
+      //展开节点操作
       that.spread(entryDiv, item);
       
       //选择框
-      options.showCheckbox && that.checkClick(entryDiv, item);
+      if(options.showCheckbox){
+        that.checkClick(entryDiv, item);
+      }
       
       //操作节点
       options.edit && that.operate(entryDiv, item);
@@ -285,6 +311,12 @@ layui.define('form', function(exports){
     
     //点击回调
     elemText.on('click', function(){
+      var othis = $(this);
+      
+      //判断是否禁用状态
+      if(othis.hasClass(DISABLED)) return;
+      
+      //判断展开收缩状态
       if(elem.hasClass(ELEM_SPREAD)){
         state = options.onlyIconControl ? 'open' : 'close';
       } else {
@@ -300,11 +332,55 @@ layui.define('form', function(exports){
     });
   };
   
-  //渲染表单
+  //计算复选框选中状态
-  Class.prototype.renderForm = function(type){
+  Class.prototype.setCheckbox = function(elem, item, elemCheckbox){
-    form.render(type, 'LAY-tree-'+ this.index);
+    var that = this
-  };
+    ,options = that.config
+    ,checked = elemCheckbox.prop('checked');
 
+    //同步子节点选中状态
+    if(typeof item.children === 'object' || elem.find('.'+ELEM_PACK)[0]){
+      var childs = elem.find('.'+ ELEM_PACK).find('input[name="layuiTreeCheck"]');
+      childs.each(function(){
+        if(this.disabled) return; //不可点击则跳过
+        this.checked = checked;
+      });
+    };
+
+    //同步父选中状态
+    var setParentsChecked = function(thisNodeElem){
+      //若无父节点，则终止递归
+      if(!thisNodeElem.parents('.'+ ELEM_SET)[0]) return;
+      
+      var state
+      ,parentPack = thisNodeElem.parent('.'+ ELEM_PACK)
+      ,parentNodeElem = parentPack.parent()
+      ,parentCheckbox =  parentPack.prev().find('input[name="layuiTreeCheck"]');
+      
+      
+      //如果子节点有任意一条选中，则父节点为选中状态
+      if(checked){
+        parentCheckbox.prop('checked', checked);
+      } else { //如果当前节点取消选中，则根据计算“兄弟和子孙”节点选中状态，来同步父节点选中状态
+        parentPack.find('input[name="layuiTreeCheck"]').each(function(){
+          if(this.checked){
+            state = true;
+          }
+        });
+        
+        //如果兄弟子孙节点全部未选中，则父节点也应为非选中状态
+        state || parentCheckbox.prop('checked', false);
+      }
+      
+      //向父节点递归
+      setParentsChecked(parentNodeElem);
+    };
+    
+    setParentsChecked(elem);
+    
+    that.renderForm('checkbox');
+  };
+  
   //复选框选择
   Class.prototype.checkClick = function(elem, item){
     var that = this
@@ -320,45 +396,7 @@ layui.define('form', function(exports){
       
       if(elemCheckbox.prop('disabled')) return;
       
-      //同步子节点选中状态
+      that.setCheckbox(elem, item, elemCheckbox);
-      if(typeof item.children === 'object' || elem.find('.'+ELEM_PACK)[0]){
-        var childs = elem.find('.'+ ELEM_PACK).find('input[name="layuiTreeCheck"]');
-        childs.each(function(){
-          if(this.disabled) return; //不可点击则跳过
-          this.checked = checked;
-        });
-      };
-
-      //同步父选中状态
-      var setParentsChecked = function(thisNodeElem){
-        //若无父节点，则终止递归
-        if(!thisNodeElem.parents('.'+ ELEM_SET)[0]) return;
-        
-        var state
-        ,parentPack = thisNodeElem.parent('.'+ ELEM_PACK)
-        ,parentNodeElem = parentPack.parent()
-        ,parentCheckbox =  parentPack.prev().find('input[name="layuiTreeCheck"]');
-        
-        
-        //如果子节点有任意一条选中，则父节点为选中状态
-        if(checked){
-          parentCheckbox.prop('checked', checked);
-        } else { //如果当前节点取消选中，则根据计算“兄弟和子孙”节点选中状态，来同步父节点选中状态
-          parentPack.find('input[name="layuiTreeCheck"]').each(function(){
-            if(this.checked){
-              state = true;
-            }
-          });
-          
-          //如果兄弟子孙节点全部未选中，则父节点也应为非选中状态
-          state || parentCheckbox.prop('checked', false);
-        }
-        
-        //向父节点递归
-        setParentsChecked(parentNodeElem);
-      };
-      
-      setParentsChecked(elem);
       
       //复选框点击产生的回调
       options.oncheck && options.oncheck({
@@ -366,8 +404,6 @@ layui.define('form', function(exports){
         ,checked: checked
         ,data: item
       });
-      
-      that.renderForm('checkbox');
     });
   };
 
@@ -398,7 +434,7 @@ layui.define('form', function(exports){
             elemMain.find('.'+ICON_CLICK).children('.layui-icon').addClass(ICON_ADD).removeClass('layui-icon-file');
           //若未开启连接线，显示箭头
           }else{
-            elemMain.find('.layui-tree-iconArrow').removeClass('hide');
+            elemMain.find('.layui-tree-iconArrow').removeClass(HIDE);
           };
           //节点添加子节点容器
           elem.append('<div class="layui-tree-pack"></div>');
@@ -407,8 +443,8 @@ layui.define('form', function(exports){
         //新增节点
         var key = options.operate && options.operate(returnObj)
         ,obj = {};
-        obj.label = options.defaultNodeName;
+        obj.title = options.text.defaultNodeName;
-        obj[options.key] = key;
+        obj.id = key;
         that.tree(elem.children('.'+ELEM_PACK), [obj]);
         
         //放在新增后面，因为要对元素进行操作
@@ -472,18 +508,18 @@ layui.define('form', function(exports){
         var text = elemMain.children('.'+ ELEM_TEXT).html();
         elemMain.children('.'+ ELEM_TEXT).html('');
         //添加输入框，覆盖在文字上方
-        elemMain.append('<input type="text" class="layui-inline layui-tree-editInput">');
+        elemMain.append('<input type="text" class="layui-tree-editInput">');
         //获取焦点
         elemMain.children('.layui-tree-editInput').val(text).focus();
         //嵌入文字移除输入框
         var getVal = function(input){
           var textNew = input.val().trim();
-          textNew = textNew ? textNew : options.defaultNodeName;
+          textNew = textNew ? textNew : options.text.defaultNodeName;
           input.remove();
           elemMain.children('.'+ ELEM_TEXT).html(textNew);
           
           //同步数据
-          returnObj.data.label = textNew;
+          returnObj.data.title = textNew;
           
           //节点修改的回调
           options.operate && options.operate(returnObj);
@@ -508,7 +544,7 @@ layui.define('form', function(exports){
         //若删除最后一个，显示空数据提示
         if(!elem.prev('.'+ELEM_SET)[0] && !elem.next('.'+ELEM_SET)[0] && !elem.parent('.'+ELEM_PACK)[0]){
           elem.remove();
-          that.elem.append(that.emptyText);
+          that.elem.append(that.elemNone);
           return;
         };
         //若有兄弟节点
@@ -602,7 +638,7 @@ layui.define('form', function(exports){
             });
           }else{
           //父节点隐藏箭头
-            prevDiv.find('.layui-tree-iconArrow').addClass('hide');
+            prevDiv.find('.layui-tree-iconArrow').addClass(HIDE);
           };
           //移除展开属性
           elem.parents('.'+ELEM_SET).eq(0).removeClass(ELEM_SPREAD);
@@ -674,7 +710,7 @@ layui.define('form', function(exports){
               $(this).children('.'+ELEM_SET).last().addClass(ELEM_LINE_SHORT);
             });
           }else{
-            parentSet.find('.layui-tree-iconArrow').addClass('hide');
+            parentSet.find('.layui-tree-iconArrow').addClass(HIDE);
           };
           parentSet.children('.'+ELEM_PACK).remove();
           parentSet.removeClass(ELEM_SPREAD);
@@ -773,7 +809,7 @@ layui.define('form', function(exports){
                 $(this).find('.'+ICON_CLICK).eq(0).addClass('layui-tree-icon');
                 $(this).find('.'+ICON_CLICK).eq(0).children('.layui-icon').addClass(ICON_ADD).removeClass('layui-icon-file');
               }else{
-                $(this).find(".layui-tree-iconArrow").removeClass('hide');
+                $(this).find(".layui-tree-iconArrow").removeClass(HIDE);
               };
               $(this).append('<div class="layui-tree-pack"></div>');
             };
@@ -930,12 +966,12 @@ layui.define('form', function(exports){
     var that = this
     ,options = that.config
     ,checkWarp = that.elem.find('.layui-tree-checkedFirst');
-
+    
-    //初始选中
+     //初始选中
     layui.each(checkWarp, function(i, item){
       $(item).children('.'+ELEM_ENTRY).find('input[name="layuiTreeCheck"]+').trigger('click');
     });
-
+    
     //搜索
     that.elem.find('.layui-tree-search').on('keyup', function(){
       var input = $(this)
@@ -965,11 +1001,11 @@ layui.define('form', function(exports){
       pack.find('.'+ELEM_ENTRY).each(function(){
         var parent = $(this).parent('.'+ELEM_SET);
         if(!parent.hasClass('layui-tree-searchShow')){
-          parent.addClass('layui-hide');
+          parent.addClass(HIDE);
         };
       });
       if(pack.find('.layui-tree-searchShow').length == 0){
-        that.elem.append(that.emptyText);
+        that.elem.append(that.elemNone);
       };
 
       //节点过滤的回调
@@ -982,7 +1018,7 @@ layui.define('form', function(exports){
     that.elem.find('.layui-tree-search').on('keydown', function(){
       $(this).nextAll().find('.'+ELEM_ENTRY).each(function(){
         var parent = $(this).parent('.'+ELEM_SET);
-        parent.removeClass('layui-tree-searchShow layui-hide');
+        parent.removeClass('layui-tree-searchShow '+ HIDE);
       });
       if($('.layui-tree-emptyText')[0]) $('.layui-tree-emptyText').remove();
     });
@@ -992,54 +1028,97 @@ layui.define('form', function(exports){
   Class.prototype.getChecked = function(){
     var that = this
     ,options = that.config
-    ,arr = [];
+    ,checkId = []
-
+    ,checkData = [];
+    
+    //遍历节点找到选中索引
     that.elem.find('.layui-form-checked').each(function(){
-      var elem = $(this).parents('.'+ELEM_SET)[0];
+      checkId.push($(this).prev()[0].value);
-      if(options.key){
-        arr.push([elem, $(elem).data('key')]);
-      }else{
-        arr.push(elem);
-      };
     });
+    
+    //遍历节点
+    var eachNodes = function(data, checkNode){
+      layui.each(data, function(index, item){
+        layui.each(checkId, function(index2, item2){
+          if(item.id == item2){
+            var cloneItem = $.extend({}, item);
+            delete cloneItem.children;
+            
+            checkNode.push(cloneItem);
+            
+            if(item.children){
+              cloneItem.children = [];
+              eachNodes(item.children, cloneItem.children);
+            }
+            return true
+          }
+        });
+      });
+    };
 
-    return arr;
+    eachNodes($.extend({}, options.data), checkData);
+    
+    return checkData;
   };
 
   //设置选中节点
-  Class.prototype.setChecked = function(key){
+  Class.prototype.setChecked = function(checkedId){
     var that = this
     ,options = that.config;
 
     //初始选中
     that.elem.find('.'+ELEM_SET).each(function(i, item){
-      var data = $(this).data('key')
+      var thisId = $(this).data('id')
-      ,input = $(item).children('.'+ELEM_ENTRY).find('input[name="layuiTreeCheck"]+');
+      ,input = $(item).children('.'+ELEM_ENTRY).find('input[name="layuiTreeCheck"]')
+      ,reInput = input.next();
+      
       //若返回数字
-      if(typeof key === 'number'){
+      if(typeof checkedId === 'number'){
-        if(data == key){
+        if(thisId == checkedId){
           if(!input[0].checked){
-            input.click();
+            reInput.click();
           };
           return false;
         };
       }else{
         //若返回数组
-        if($.inArray(data, key) != -1){
+        if($.inArray(thisId, checkedId) != -1){
           if(!input[0].checked){
-            input.click();
+            reInput.click();
           };
         };
       };
     });
   };
 
-
+  //记录所有实例
+  thisModule.that = {}; //记录所有实例对象
+  thisModule.config = {}; //记录所有实例配置项
+  
+  //重载实例
+  tree.reload = function(id, options){
+    var that = thisModule.that[id];
+    that.reload(options);
+    
+    return thisModule.call(that);
+  };
+  
+  //获得选中的节点数据
+  tree.getChecked = function(id){
+    var that = thisModule.that[id];
+    return that.getChecked();
+  };
+  
+  //设置选中节点
+  tree.setChecked = function(id, checkedId){
+    var that = thisModule.that[id];
+    return that.setChecked(checkedId);
+  };
     
   //核心入口
   tree.render = function(options){
     var inst = new Class(options);
-    return thisTree.call(inst);
+    return thisModule.call(inst);
   };
 
   exports(MOD_NAME, tree);

src/layui.js

@@ -19,7 +19,7 @@
   }
 
   ,Layui = function(){
-    this.v = '2.5.3'; //版本号
+    this.v = '2.5.4'; //版本号
   }
 
   //获取layui所在目录