2.1.7

bower.json

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

dist/css/modules/code.css

@@ -1,2 +1,2 @@
-/** layui-v2.1.6 MIT License By http://www.layui.com */
+/** layui-v2.1.7 MIT License By http://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/font/iconfont.svg

@@ -357,9 +357,6 @@ t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-
     <glyph glyph-name="shuaxin-copy" unicode="&#58982;" d="M688.146 736l-192 128v-256l192 128.001zM496.146 767.709c-231.174-8.416-416-198.479-416-431.709 0-238.587 193.413-432 432-432 233.23 0 423.293 184.826 431.709 416h-64.050c-8.377-195.817-169.778-352-367.658-352-203.241 0-368 164.759-368 368 0 197.88 156.183 359.282 352 367.658v64.051z"  horiz-adv-x="1024" />
 
     
-    <glyph glyph-name="shuaxin1" unicode="&#58984;" d="M510.561 19.378c-49.47 0-97.478 9.696-142.688 28.818-43.652 18.464-82.85 44.889-116.503 78.542-33.654 33.654-60.080 72.85-78.542 116.503-19.122 45.21-28.818 93.218-28.818 142.688s9.696 97.478 28.818 142.688c18.463 43.652 44.888 82.85 78.542 116.503 33.653 33.654 72.85 60.080 116.503 78.542 45.21 19.122 93.217 28.818 142.688 28.818 16.964 0 30.717-13.753 30.717-30.717s-13.753-30.717-30.717-30.717c-168.243 0-305.118-136.875-305.118-305.118 0-168.242 136.875-305.118 305.118-305.118 168.242 0 305.118 136.876 305.118 305.118 0 16.964 13.753 30.717 30.717 30.717s30.717-13.753 30.717-30.717c0-49.47-9.696-97.478-28.818-142.688-18.464-43.652-44.889-82.849-78.542-116.503-33.654-33.653-72.85-60.079-116.503-78.542-45.21-19.122-93.218-28.818-142.688-28.818zM783.631 385.929l62.765 76.791 63.789-76.791zM910.204 375.69h-126.574c-0.001-0-0.003-0-0.004-0-5.654 0-10.237 4.583-10.237 10.237 0 2.468 0.873 4.731 2.327 6.499l62.751 76.774c1.887 2.296 4.725 3.752 7.903 3.759l0.025-0c3.159-0 5.984-1.431 7.863-3.68l63.447-76.381c1.696-1.817 2.738-4.264 2.738-6.955 0-0.005-0-0.010-0-0.015 0-5.653-4.583-10.237-10.239-10.237zM805.223 396.168h83.146l-41.91 50.452-41.236-50.452z"  horiz-adv-x="1024" />
-
-    
     <glyph glyph-name="jine" unicode="&#58974;" d="M511.998 896c-282.765 0-511.994-229.231-511.994-511.999 0-282.773 229.228-512.001 511.994-512.001 282.769 0 511.995 229.228 511.995 512.001 0.001 282.768-229.226 511.999-511.995 511.999zM511.998-91.597c-262.66 0-475.59 212.931-475.59 475.598 0 262.663 212.93 475.595 475.59 475.595 262.663 0 475.591-212.932 475.591-475.595 0.001-262.666-212.926-475.598-475.591-475.598zM738.743 301.138h-194.31v69.78h194.31c17.835 0 32.249 14.439 32.249 32.221 0 17.784-14.414 32.195-32.249 32.195l-148.996-0 149.621 209.579c8.916 15.398 3.631 35.099-11.82 43.989-15.399 8.892-35.097 3.63-44.018-11.794l-171.341-240.010-171.344 240.010c-8.865 15.423-28.618 20.685-44.016 11.794-15.396-8.889-20.685-28.59-11.82-43.989l149.623-209.579h-149.001c-17.782 0-32.245-14.411-32.245-32.195 0-17.782 14.463-32.221 32.245-32.221h194.31v-69.78l-194.31 0c-17.782 0-32.245-14.413-32.245-32.195s14.463-32.221 32.245-32.221h194.31v-132.435c0-17.781 14.463-32.195 32.248-32.195 17.835 0 32.245 14.414 32.245 32.195l-0 132.434h194.31c17.835 0 32.249 14.439 32.249 32.221s-14.415 32.196-32.251 32.196z"  horiz-adv-x="1024" />
 
     
@@ -417,6 +414,9 @@ t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-
     <glyph glyph-name="nan" unicode="&#58978;" d="M889.6 800h-240s-35.2 0-38.4-41.6c0-19.2 16-38.4 38.4-38.4h140.8l-179.2-179.2C556.8 582.4 489.6 608 416 608 240 608 96 464 96 288s144-320 320-320 320 144 320 320c0 73.6-25.6 140.8-67.2 195.2l179.2 179.2v-140.8c0-22.4 19.2-38.4 38.4-38.4 22.4 0 38.4 19.2 38.4 41.6V764.8h3.2C924.8 800 889.6 800 889.6 800zM416 48c-131.2 0-236.8 105.6-236.8 236.8 0 131.2 105.6 236.8 236.8 236.8s236.8-105.6 236.8-236.8c0-131.2-105.6-236.8-236.8-236.8z"  horiz-adv-x="1024" />
 
     
+    <glyph glyph-name="gaoji" unicode="&#58996;" d="M719.9 249.4L514.7 379.5V485.1C615.6 419 731.5 344 731.5 344s139.2-45.6 139.2 106.5c0 93-172.5 112.1-197.2 11.8l-69.6 47.3s24.2 101.5 162.4 106.5c138.2 4.9 192-94.6 190.9-199.6-1.2-104.7-136-198.3-237.3-167.1zM561 414c-4-19-23-33.7-47.6-33.7l-6.9 4.3-217.3 137.8S171 555.2 160.8 439c-10.2-116.1 147.4-129.5 186.8-23.8l81.7-47.6s-65.1-119.1-198.5-119.1C97.3 248.5 0.6 423.8 114 546.3c113.5 122.4 218.6 64.6 257 35.7 16.4-12.4 85.3-57.9 158.6-105.9l3.1-2.4c28.3-18.2 33.4-35.6 28.3-59.7zM434.1 149.7h212c16.7 0 30.3-13.6 30.3-30.3v-15.1c0-16.7-13.6-30.3-30.3-30.3h-212c-16.7 0-30.3 13.6-30.3 30.3v15.1c0 16.8 13.6 30.3 30.3 30.3z"  horiz-adv-x="1024" />
+
+    
     <glyph glyph-name="fengge" unicode="&#58986;" d="M512 800C229.696 800 0 570.304 0 288c0-90.368 30.304-174.496 85.344-236.896 55.264-62.624 129.152-97.12 208.128-97.12 81.568 0 161.536 36.832 231.264 106.592l2.272 2.496c65.792 81.472 132.896 121.056 205.088 121.056 46.72 0 89.216-15.872 126.688-29.92 30.336-11.328 56.576-21.12 81.216-21.12C1024 133.088 1024 241.664 1024 288c0 282.304-229.696 512-512 512z m428-602.912c-13.088 0-35.296 8.288-58.784 17.088-40.48 15.136-90.848 33.952-149.12 33.952-92.352 0-175.328-46.944-253.76-143.456-57.184-56.704-121.056-86.688-184.832-86.688-60.352 0-117.216 26.784-160.128 75.456C88.64 144.128 64 213.216 64 288 64 535.04 264.96 736 512 736s448-200.96 448-448c0-27.328-1.952-90.912-20-90.912zM800.704 379.936m-64 0a64 64 0 1 1 128 0 64 64 0 1 1-128 0ZM457.024 582.624m-64 0a64 64 0 1 1 128 0 64 64 0 1 1-128 0ZM672.704 555.936m-64 0a64 64 0 1 1 128 0 64 64 0 1 1-128 0ZM291.392 443.936m-64 0a64 64 0 1 1 128 0 64 64 0 1 1-128 0ZM278.4 197.248m-96 0a96 96 0 1 1 192 0 96 96 0 1 1-192 0Z"  horiz-adv-x="1024" />
 
     

dist/lay/modules/carousel.js

@@ -1,2 +1,2 @@
-/** layui-v2.1.6 MIT License By http://www.layui.com */
+/** layui-v2.1.7 MIT License By http://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.indicator(),e.elemItem.length<=1||(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&&(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.1.6 MIT License By http://www.layui.com */
+/** layui-v2.1.7 MIT License By http://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.1.6 MIT License By http://www.layui.com */
+/** layui-v2.1.7 MIT License By http://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.1.6 MIT License By http://www.layui.com */
+/** layui-v2.1.7 MIT License By http://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>"}(),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){t.call(e,a)}):e.addEventListener(a,t,!1),this}};e(i,s)});

dist/lay/modules/laytpl.js

@@ -1,2 +1,2 @@
-/** layui-v2.1.6 MIT License By http://www.layui.com */
+/** layui-v2.1.7 MIT License By http://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/tree.js

@@ -1,2 +1,2 @@
-/** layui-v2.1.6 MIT License By http://www.layui.com */
+/** layui-v2.1.7 MIT License By http://www.layui.com */
  ;layui.define("jquery",function(e){"use strict";var o=layui.$,a=layui.hint(),i="layui-tree-enter",r=function(e){this.options=e},t={arrow:["&#xe623;","&#xe625;"],checkbox:["&#xe626;","&#xe627;"],radio:["&#xe62b;","&#xe62a;"],branch:["&#xe622;","&#xe624;"],leaf:"&#xe621;"};r.prototype.init=function(e){var o=this;e.addClass("layui-box layui-tree"),o.options.skin&&e.addClass("layui-tree-skin-"+o.options.skin),o.tree(e),o.on(e)},r.prototype.tree=function(e,a){var i=this,r=i.options,n=a||r.nodes;layui.each(n,function(a,n){var l=n.children&&n.children.length>0,c=o('<ul class="'+(n.spread?"layui-show":"")+'"></ul>'),s=o(["<li "+(n.spread?'data-spread="'+n.spread+'"':"")+">",function(){return l?'<i class="layui-icon layui-tree-spread">'+(n.spread?t.arrow[1]:t.arrow[0])+"</i>":""}(),function(){return r.check?'<i class="layui-icon layui-tree-check">'+("checkbox"===r.check?t.checkbox[0]:"radio"===r.check?t.radio[0]:"")+"</i>":""}(),function(){return'<a href="'+(n.href||"javascript:;")+'" '+(r.target&&n.href?'target="'+r.target+'"':"")+">"+('<i class="layui-icon layui-tree-'+(l?"branch":"leaf")+'">'+(l?n.spread?t.branch[1]:t.branch[0]:t.leaf)+"</i>")+("<cite>"+(n.name||"未命名")+"</cite></a>")}(),"</li>"].join(""));l&&(s.append(c),i.tree(c,n.children)),e.append(s),"function"==typeof r.click&&i.click(s,n),i.spread(s,n),r.drag&&i.drag(s,n)})},r.prototype.click=function(e,o){var a=this,i=a.options;e.children("a").on("click",function(e){layui.stope(e),i.click(o)})},r.prototype.spread=function(e,o){var a=this,i=(a.options,e.children(".layui-tree-spread")),r=e.children("ul"),n=e.children("a"),l=function(){e.data("spread")?(e.data("spread",null),r.removeClass("layui-show"),i.html(t.arrow[0]),n.find(".layui-icon").html(t.branch[0])):(e.data("spread",!0),r.addClass("layui-show"),i.html(t.arrow[1]),n.find(".layui-icon").html(t.branch[1]))};r[0]&&(i.on("click",l),n.on("dblclick",l))},r.prototype.on=function(e){var a=this,r=a.options,t="layui-tree-drag";e.find("i").on("selectstart",function(e){return!1}),r.drag&&o(document).on("mousemove",function(e){var i=a.move;if(i.from){var r=(i.to,o('<div class="layui-box '+t+'"></div>'));e.preventDefault(),o("."+t)[0]||o("body").append(r);var n=o("."+t)[0]?o("."+t):r;n.addClass("layui-show").html(i.from.elem.children("a").html()),n.css({left:e.pageX+10,top:e.pageY+10})}}).on("mouseup",function(){var e=a.move;e.from&&(e.from.elem.children("a").removeClass(i),e.to&&e.to.elem.children("a").removeClass(i),a.move={},o("."+t).remove())})},r.prototype.move={},r.prototype.drag=function(e,a){var r=this,t=(r.options,e.children("a")),n=function(){var t=o(this),n=r.move;n.from&&(n.to={item:a,elem:e},t.addClass(i))};t.on("mousedown",function(){var o=r.move;o.from={item:a,elem:e}}),t.on("mouseenter",n).on("mousemove",n).on("mouseleave",function(){var e=o(this),a=r.move;a.from&&(delete a.to,e.removeClass(i))})},e("tree",function(e){var i=new r(e=e||{}),t=o(e.elem);return t[0]?void i.init(t):a.error("layui.tree 没有找到"+e.elem+"元素")})});

dist/lay/modules/util.js

@@ -1,2 +1,2 @@
-/** layui-v2.1.6 MIT License By http://www.layui.com */
+/** layui-v2.1.7 MIT License By http://www.layui.com */
  ;layui.define("jquery",function(e){"use strict";var t=layui.$,o={fixbar:function(e){var o,i,a="layui-fixbar",l="layui-fixbar-top",n=t(document),r=t("body");e=t.extend({showHeight:200},e),e.bar1=e.bar1===!0?"&#xe606;":e.bar1,e.bar2=e.bar2===!0?"&#xe607;":e.bar2,e.bgcolor=e.bgcolor?"background-color:"+e.bgcolor:"";var c=[e.bar1,e.bar2,"&#xe604;"],u=t(['<ul class="'+a+'">',e.bar1?'<li class="layui-icon" lay-type="bar1" style="'+e.bgcolor+'">'+c[0]+"</li>":"",e.bar2?'<li class="layui-icon" lay-type="bar2" style="'+e.bgcolor+'">'+c[1]+"</li>":"",'<li class="layui-icon '+l+'" lay-type="top" style="'+e.bgcolor+'">'+c[2]+"</li>","</ul>"].join("")),s=u.find("."+l),b=function(){var t=n.scrollTop();t>=e.showHeight?o||(s.show(),o=1):o&&(s.hide(),o=0)};t("."+a)[0]||("object"==typeof e.css&&u.css(e.css),r.append(u),b(),u.find("li").on("click",function(){var o=t(this),i=o.attr("lay-type");"top"===i&&t("html,body").animate({scrollTop:0},200),e.click&&e.click.call(this,i)}),n.on("scroll",function(){clearTimeout(i),i=setTimeout(function(){b()},100)}))},countdown:function(e,t,o){var i=this,a="function"==typeof t,l=new Date(e).getTime(),n=new Date(!t||a?(new Date).getTime():t).getTime(),r=l-n,c=[Math.floor(r/864e5),Math.floor(r/36e5)%24,Math.floor(r/6e4)%60,Math.floor(r/1e3)%60];a&&(o=t);var u=setTimeout(function(){i.countdown(e,n+1e3,o)},1e3);return o&&o(r>0?c:[0,0,0,0],t,u),r<=0&&clearTimeout(u),u},timeAgo:function(e,t){var o=[[],[]],i=(new Date).getTime()-new Date(e).getTime();return i>6912e5?(i=new Date(e),o[0][0]=i.getFullYear(),o[0][1]=i.getMonth()+1,o[0][2]=i.getDate(),t||(o[1][0]=i.getHours(),o[1][1]=i.getMinutes(),o[1][2]=i.getSeconds()),o[0].join("-")+" "+o[1].join(":")):i>=864e5?(i/1e3/60/60/24|0)+"天前":i>=36e5?(i/1e3/60/60|0)+"小时前":i>=12e4?(i/1e3/60|0)+"分钟前":i<0?"未来":"刚刚"}};e("util",o)});

examples/element.html

@@ -94,7 +94,7 @@ body{padding:20px;}
 <br><br>
 
 <div class="layui-progress" lay-showPercent="true">
-  <div class="layui-progress-bar" lay-percent="0%"></div>
+  <div class="layui-progress-bar" lay-percent="1/3"></div>
 </div>
 
 <br>
@@ -123,6 +123,11 @@ body{padding:20px;}
 <div class="layui-progress layui-progress-big" lay-filter="demo" lay-showPercent="true">
   <div class="layui-progress-bar" lay-percent="100%"></div>
 </div>
+<br>
+
+<div class="layui-progress layui-progress-big" lay-filter="demo" lay-showPercent="true">
+  <div class="layui-progress-bar" lay-percent="1700 / 2000"></div>
+</div>
 
 <br><br>
 

examples/upload.html

@@ -129,6 +129,9 @@ layui.use('upload', function(){
     ,done: function(res){
       //上传完毕
     }
+    ,allDone: function(obj){
+      console.log(obj)
+    }
   });
   
   //演示多文件列表

package.json

@@ -1,9 +1,9 @@
 {
   "name": "layui-src",
   "realname": "layui",
-  "version": "2.1.6",
+  "version": "2.1.7",
   "independents": {
-    "layim": "3.7.2"
+    "layim": "3.7.3"
   },
   "description": "经典模块化前端框架",
   "main": "layui.js",

src/css/layui.css

@@ -19,24 +19,6 @@ button,input,select,textarea{font-size: 100%; }
 input,button,textarea,select,optgroup,option{font-family: inherit; font-size: inherit; font-style: inherit; font-weight: inherit; outline: 0;}
 pre{white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;}
 
-
-/** 图标字体 **/
-@font-face {font-family: 'layui-icon';
-  src: url('../font/iconfont.eot?v=220');
-  src: url('../font/iconfont.eot?v=220#iefix') format('embedded-opentype'),
-  url('../font/iconfont.svg?v=220#iconfont') format('svg'),
-  url('../font/iconfont.woff?v=220') format('woff'),
-  url('../font/iconfont.ttf?v=220') format('truetype');
-}
-                    
-.layui-icon{
-  font-family:"layui-icon" !important;
-  font-size: 16px;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
 /** 初始化全局标签 **/
 body{line-height: 24px; font: 14px Helvetica Neue,Helvetica,PingFang SC,\5FAE\8F6F\96C5\9ED1,Tahoma,Arial,sans-serif;}
 hr{height: 1px; margin: 10px 0; border: 0; background-color: #e2e2e2; clear: both;}
@@ -58,6 +40,160 @@ a cite{font-style: normal; *cursor:pointer;}
 .layui-show{display: block !important;}
 .layui-hide{display: none !important;}
 
+/** 图标字体 **/
+@font-face {font-family: 'layui-icon';
+  src: url('../font/iconfont.eot?v=220');
+  src: url('../font/iconfont.eot?v=220#iefix') format('embedded-opentype'),
+  url('../font/iconfont.svg?v=220#iconfont') format('svg'),
+  url('../font/iconfont.woff?v=220') format('woff'),
+  url('../font/iconfont.ttf?v=220') format('truetype');
+}
+                    
+.layui-icon{
+  font-family:"layui-icon" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.layui-icon-duihua:before{content:"\e611"}
+.layui-icon-shezhi:before{content:"\e614"}
+.layui-icon-yinshenim:before{content:"\e60f"}
+.layui-icon-search:before{content:"\e615"}
+.layui-icon-fenxiang1:before{content:"\e641"}
+.layui-icon-shezhi1:before{content:"\e620"}
+.layui-icon-yinqing:before{content:"\e628"}
+.layui-icon-yuejuancuohao:before{content:"\1006"}
+.layui-icon-cuo:before{content:"\1007"}
+.layui-icon-baobiao:before{content:"\e629"}
+.layui-icon-star:before{content:"\e600"}
+.layui-icon-yuandian:before{content:"\e617"}
+.layui-icon-kefu:before{content:"\e606"}
+.layui-icon-logo:before{content:"\e609"}
+.layui-icon-list:before{content:"\e60a"}
+.layui-icon-tubiao:before{content:"\e62c"}
+.layui-icon-right:before{content:"\1005"}
+.layui-icon-huanfu2:before{content:"\e61b"}
+.layui-icon-On-line:before{content:"\e610"}
+.layui-icon-biaoge:before{content:"\e62d"}
+.layui-icon-youyou:before{content:"\e602"}
+.layui-icon-zuozuo:before{content:"\e603"}
+.layui-icon-cart:before{content:"\e698"}
+.layui-icon-cry:before{content:"\e69c"}
+.layui-icon-smile:before{content:"\e6af"}
+.layui-icon-survey:before{content:"\e6b2"}
+.layui-icon-icon5:before{content:"\e62e"}
+.layui-icon-iconfont17:before{content:"\e62f"}
+.layui-icon-tianjia:before{content:"\e61f"}
+.layui-icon-xiazai:before{content:"\e601"}
+.layui-icon-xuanzemoban48:before{content:"\e630"}
+.layui-icon-gongju:before{content:"\e631"}
+.layui-icon-tishilian:before{content:"\e664"}
+.layui-icon-bianji:before{content:"\e642"}
+.layui-icon-xiaoxi:before{content:"\e645"}
+.layui-icon-xiangxia:before{content:"\e61a"}
+.layui-icon-wenjian:before{content:"\e621"}
+.layui-icon-layouts:before{content:"\e632"}
+.layui-icon-duigou:before{content:"\e618"}
+.layui-icon-tianjia1:before{content:"\e608"}
+.layui-icon-yaoyaozhibofanye:before{content:"\e633"}
+.layui-icon-office:before{content:"\e705"}
+.layui-icon-404:before{content:"\e61c"}
+.layui-icon-lunbozutu:before{content:"\e634"}
+.layui-icon-help:before{content:"\e607"}
+.layui-icon-daima1:before{content:"\e635"}
+.layui-icon-jinshui:before{content:"\e636"}
+.layui-icon-faxian:before{content:"\e670"}
+.layui-icon-guanyu:before{content:"\e60b"}
+.layui-icon-map:before{content:"\e715"}
+.layui-icon-xiangshang:before{content:"\e619"}
+.layui-icon-bofang:before{content:"\e651"}
+.layui-icon-riqi:before{content:"\e637"}
+.layui-icon-uploadfile:before{content:"\e61d"}
+.layui-icon-delete:before{content:"\e640"}
+.layui-icon-bofangzanting02:before{content:"\e652"}
+.layui-icon-top:before{content:"\e604"}
+.layui-icon-haoyouqingqiu:before{content:"\e612"}
+.layui-icon-weibiaoti1:before{content:"\e605"}
+.layui-icon-chuangkou:before{content:"\e638"}
+.layui-icon-comiisbiaoqing:before{content:"\e60c"}
+.layui-icon-zhengque:before{content:"\e616"}
+.layui-icon-money:before{content:"\e659"}
+.layui-icon-iconfontwodehaoyou:before{content:"\e613"}
+.layui-icon-wenjianxiazai:before{content:"\e61e"}
+.layui-icon-tupian:before{content:"\e60d"}
+.layui-icon-lianjie:before{content:"\e64c"}
+.layui-icon-creditlevel:before{content:"\e735"}
+.layui-icon-jilu:before{content:"\e60e"}
+.layui-icon-liucheng:before{content:"\e622"}
+.layui-icon-fontstrikethrough:before{content:"\e64f"}
+.layui-icon-unlink:before{content:"\e64d"}
+.layui-icon-bianjiwenzi:before{content:"\e639"}
+.layui-icon-sanjiao:before{content:"\e623"}
+.layui-icon-danxuankuanghouxuan:before{content:"\e63f"}
+.layui-icon-danxuankuangxuanzhong:before{content:"\e643"}
+.layui-icon-juzhongduiqi:before{content:"\e647"}
+.layui-icon-youduiqi:before{content:"\e648"}
+.layui-icon-zuoduiqi:before{content:"\e649"}
+.layui-icon-gongsisvgtubiaozongji22:before{content:"\e626"}
+.layui-icon-gongsisvgtubiaozongji23:before{content:"\e627"}
+.layui-icon-shuaxin:before{content:"\1002"}
+.layui-icon-loading2:before{content:"\e63e"}
+.layui-icon-flow:before{content:"\e65c"}
+.layui-icon-jiacu:before{content:"\e62b"}
+.layui-icon-uploading:before{content:"\e67c"}
+.layui-icon-liaotianduihuaimgoutong:before{content:"\e63a"}
+.layui-icon-shipin1:before{content:"\e6ed"}
+.layui-icon-yinpin:before{content:"\e6fc"}
+.layui-icon-wenjianjiafan:before{content:"\e624"}
+.layui-icon-shouji:before{content:"\e63b"}
+.layui-icon-tianjia2:before{content:"\e654"}
+.layui-icon-wenjianjia:before{content:"\e7a0"}
+.layui-icon-biaoqing:before{content:"\e650"}
+.layui-icon-html:before{content:"\e64b"}
+.layui-icon-biaodan:before{content:"\e63c"}
+.layui-icon-goumai:before{content:"\e657"}
+.layui-icon-xiangjicopy2x:before{content:"\e65d"}
+.layui-icon-25:before{content:"\e62a"}
+.layui-icon-emwdaima:before{content:"\e64e"}
+.layui-icon-hot:before{content:"\e756"}
+.layui-icon-shezhi11:before{content:"\e716"}
+.layui-icon-zitixiahuaxian:before{content:"\e646"}
+.layui-icon-sanjiao1:before{content:"\e625"}
+.layui-icon-tupian-copy-copy:before{content:"\e64a"}
+.layui-icon-caidan:before{content:"\e671"}
+.layui-icon-zhuti2:before{content:"\e66c"}
+.layui-icon-loading1:before{content:"\e63d"}
+.layui-icon-xieti:before{content:"\e644"}
+.layui-icon-shuaxin-copy:before{content:"\e666"}
+.layui-icon-jine:before{content:"\e65e"}
+.layui-icon-zhuye:before{content:"\e68e"}
+.layui-icon-yonghu:before{content:"\e770"}
+.layui-icon-xiaoxi2:before{content:"\e667"}
+.layui-icon-yuyin:before{content:"\e688"}
+.layui-icon-download:before{content:"\e681"}
+.layui-icon-yemian1:before{content:"\e655"}
+.layui-icon-moban:before{content:"\e663"}
+.layui-icon-yibiaopan:before{content:"\e665"}
+.layui-icon-pindao:before{content:"\e653"}
+.layui-icon-xiayiye:before{content:"\e65a"}
+.layui-icon-huaban:before{content:"\e7ae"}
+.layui-icon-xiayiye1:before{content:"\e65b"}
+.layui-icon-yingyong:before{content:"\e857"}
+.layui-icon-more:before{content:"\e65f"}
+.layui-icon-xiangji:before{content:"\e660"}
+.layui-icon-refresh:before{content:"\e669"}
+.layui-icon-nv:before{content:"\e661"}
+.layui-icon-nan:before{content:"\e662"}
+.layui-icon-gaoji:before{content:"\e674"}
+.layui-icon-fengge:before{content:"\e66a"}
+.layui-icon-cai:before{content:"\e6c5"}
+.layui-icon-zan:before{content:"\e6c6"}
+.layui-icon-shoucang:before{content:"\e658"}
+.layui-icon-shuaxin2:before{content:"\e66b"}
+.layui-icon-moban1:before{content:"\e656"}
+.layui-icon-shuaxin3:before{content:"\e66d"}
 
 /* 基本布局 */
 .layui-main{position: relative; width: 1140px; margin: 0 auto;}
@@ -278,6 +414,7 @@ a cite{font-style: normal; *cursor:pointer;}
 .layui-card{margin-bottom: 15px; border-radius: 2px; background-color: #fff; box-shadow: 0 1px 2px 0 rgba(0,0,0,.05);}
 .layui-card-header{position: relative; height: 42px; line-height: 42px; padding: 0 15px; border-bottom: 1px dotted #E9E9E9; color: #333; border-radius: 2px 2px 0 0; font-size: 14px;}
 .layui-card-body{padding: 10px 15px; line-height: 24px;}
+.layui-card-body .layui-table{margin: 5px 0;}
 
 /* 折叠面板 */
 .layui-collapse{border: 1px solid #e2e2e2; border-radius: 2px;}
@@ -306,8 +443,8 @@ a cite{font-style: normal; *cursor:pointer;}
 .layui-text h1{font-size: 30px;}
 .layui-text h2{font-size: 24px;}
 .layui-text h3{font-size: 18px;}
-.layui-text a{color: #01AAED;}
-.layui-text a:hover{text-decoration: underline;}
+.layui-text a:not(.layui-btn){color: #01AAED;}
+.layui-text a:not(.layui-btn):hover{text-decoration: underline;}
 .layui-text ul{padding: 5px 0 5px 15px;}
 .layui-text ul li{margin-top: 5px; list-style-type: disc;}
 .layui-text em,
@@ -788,14 +925,14 @@ body .layui-table-tips .layui-layer-content{background: none; padding: 0; box-sh
 .layui-badge,
 .layui-badge-dot,
 .layui-badge-rim{position:relative; display: inline-block; font-size: 12px; background-color: #FF5722; color: #fff;}
-.layui-badge{min-width: 8px; height: 18px; line-height: 18px; padding: 0 5px; text-align: center; border-radius: 9px;}
+.layui-badge{min-width: 8px; height: 18px; line-height: 18px; padding: 0 5px; text-align: center; border-radius: 2px;}
 .layui-badge-dot{width: 8px; height: 8px; border-radius: 50%;}
 .layui-badge-rim{height: 18px; line-height: 18px; padding: 0 5px; border: 1px solid #e2e2e2; border-radius: 3px; background-color: #fff; color: #666;}
 
 .layui-btn .layui-badge,
 .layui-btn .layui-badge-dot{margin-left: 5px;}
 .layui-nav .layui-badge,
-.layui-nav .layui-badge-dot{position: absolute; top: 50%; margin: -10px 6px 0;}
+.layui-nav .layui-badge-dot{position: absolute; top: 50%; margin: -8px 6px 0;}
 .layui-tab-title .layui-badge,
 .layui-tab-title .layui-badge-dot{left: 5px; top: -2px;}
 
@@ -962,5 +1099,3 @@ body .layui-util-face  .layui-layer-content{padding:0; background-color:#fff; co
 }
 .layui-anim-fadeout{-webkit-animation-name: layui-fadeout; animation-name: layui-fadeout}
 
-
-

src/font/iconfont.svg

@@ -357,9 +357,6 @@ t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-
     <glyph glyph-name="shuaxin-copy" unicode="&#58982;" d="M688.146 736l-192 128v-256l192 128.001zM496.146 767.709c-231.174-8.416-416-198.479-416-431.709 0-238.587 193.413-432 432-432 233.23 0 423.293 184.826 431.709 416h-64.050c-8.377-195.817-169.778-352-367.658-352-203.241 0-368 164.759-368 368 0 197.88 156.183 359.282 352 367.658v64.051z"  horiz-adv-x="1024" />
 
     
-    <glyph glyph-name="shuaxin1" unicode="&#58984;" d="M510.561 19.378c-49.47 0-97.478 9.696-142.688 28.818-43.652 18.464-82.85 44.889-116.503 78.542-33.654 33.654-60.080 72.85-78.542 116.503-19.122 45.21-28.818 93.218-28.818 142.688s9.696 97.478 28.818 142.688c18.463 43.652 44.888 82.85 78.542 116.503 33.653 33.654 72.85 60.080 116.503 78.542 45.21 19.122 93.217 28.818 142.688 28.818 16.964 0 30.717-13.753 30.717-30.717s-13.753-30.717-30.717-30.717c-168.243 0-305.118-136.875-305.118-305.118 0-168.242 136.875-305.118 305.118-305.118 168.242 0 305.118 136.876 305.118 305.118 0 16.964 13.753 30.717 30.717 30.717s30.717-13.753 30.717-30.717c0-49.47-9.696-97.478-28.818-142.688-18.464-43.652-44.889-82.849-78.542-116.503-33.654-33.653-72.85-60.079-116.503-78.542-45.21-19.122-93.218-28.818-142.688-28.818zM783.631 385.929l62.765 76.791 63.789-76.791zM910.204 375.69h-126.574c-0.001-0-0.003-0-0.004-0-5.654 0-10.237 4.583-10.237 10.237 0 2.468 0.873 4.731 2.327 6.499l62.751 76.774c1.887 2.296 4.725 3.752 7.903 3.759l0.025-0c3.159-0 5.984-1.431 7.863-3.68l63.447-76.381c1.696-1.817 2.738-4.264 2.738-6.955 0-0.005-0-0.010-0-0.015 0-5.653-4.583-10.237-10.239-10.237zM805.223 396.168h83.146l-41.91 50.452-41.236-50.452z"  horiz-adv-x="1024" />
-
-    
     <glyph glyph-name="jine" unicode="&#58974;" d="M511.998 896c-282.765 0-511.994-229.231-511.994-511.999 0-282.773 229.228-512.001 511.994-512.001 282.769 0 511.995 229.228 511.995 512.001 0.001 282.768-229.226 511.999-511.995 511.999zM511.998-91.597c-262.66 0-475.59 212.931-475.59 475.598 0 262.663 212.93 475.595 475.59 475.595 262.663 0 475.591-212.932 475.591-475.595 0.001-262.666-212.926-475.598-475.591-475.598zM738.743 301.138h-194.31v69.78h194.31c17.835 0 32.249 14.439 32.249 32.221 0 17.784-14.414 32.195-32.249 32.195l-148.996-0 149.621 209.579c8.916 15.398 3.631 35.099-11.82 43.989-15.399 8.892-35.097 3.63-44.018-11.794l-171.341-240.010-171.344 240.010c-8.865 15.423-28.618 20.685-44.016 11.794-15.396-8.889-20.685-28.59-11.82-43.989l149.623-209.579h-149.001c-17.782 0-32.245-14.411-32.245-32.195 0-17.782 14.463-32.221 32.245-32.221h194.31v-69.78l-194.31 0c-17.782 0-32.245-14.413-32.245-32.195s14.463-32.221 32.245-32.221h194.31v-132.435c0-17.781 14.463-32.195 32.248-32.195 17.835 0 32.245 14.414 32.245 32.195l-0 132.434h194.31c17.835 0 32.249 14.439 32.249 32.221s-14.415 32.196-32.251 32.196z"  horiz-adv-x="1024" />
 
     
@@ -417,6 +414,9 @@ t9.5 -10.5t21.5 -4h37h67h81h80h64h36q23 0 34 12t2 38q-5 13 -9.5 30.5t-9.5 34.5q-
     <glyph glyph-name="nan" unicode="&#58978;" d="M889.6 800h-240s-35.2 0-38.4-41.6c0-19.2 16-38.4 38.4-38.4h140.8l-179.2-179.2C556.8 582.4 489.6 608 416 608 240 608 96 464 96 288s144-320 320-320 320 144 320 320c0 73.6-25.6 140.8-67.2 195.2l179.2 179.2v-140.8c0-22.4 19.2-38.4 38.4-38.4 22.4 0 38.4 19.2 38.4 41.6V764.8h3.2C924.8 800 889.6 800 889.6 800zM416 48c-131.2 0-236.8 105.6-236.8 236.8 0 131.2 105.6 236.8 236.8 236.8s236.8-105.6 236.8-236.8c0-131.2-105.6-236.8-236.8-236.8z"  horiz-adv-x="1024" />
 
     
+    <glyph glyph-name="gaoji" unicode="&#58996;" d="M719.9 249.4L514.7 379.5V485.1C615.6 419 731.5 344 731.5 344s139.2-45.6 139.2 106.5c0 93-172.5 112.1-197.2 11.8l-69.6 47.3s24.2 101.5 162.4 106.5c138.2 4.9 192-94.6 190.9-199.6-1.2-104.7-136-198.3-237.3-167.1zM561 414c-4-19-23-33.7-47.6-33.7l-6.9 4.3-217.3 137.8S171 555.2 160.8 439c-10.2-116.1 147.4-129.5 186.8-23.8l81.7-47.6s-65.1-119.1-198.5-119.1C97.3 248.5 0.6 423.8 114 546.3c113.5 122.4 218.6 64.6 257 35.7 16.4-12.4 85.3-57.9 158.6-105.9l3.1-2.4c28.3-18.2 33.4-35.6 28.3-59.7zM434.1 149.7h212c16.7 0 30.3-13.6 30.3-30.3v-15.1c0-16.7-13.6-30.3-30.3-30.3h-212c-16.7 0-30.3 13.6-30.3 30.3v15.1c0 16.8 13.6 30.3 30.3 30.3z"  horiz-adv-x="1024" />
+
+    
     <glyph glyph-name="fengge" unicode="&#58986;" d="M512 800C229.696 800 0 570.304 0 288c0-90.368 30.304-174.496 85.344-236.896 55.264-62.624 129.152-97.12 208.128-97.12 81.568 0 161.536 36.832 231.264 106.592l2.272 2.496c65.792 81.472 132.896 121.056 205.088 121.056 46.72 0 89.216-15.872 126.688-29.92 30.336-11.328 56.576-21.12 81.216-21.12C1024 133.088 1024 241.664 1024 288c0 282.304-229.696 512-512 512z m428-602.912c-13.088 0-35.296 8.288-58.784 17.088-40.48 15.136-90.848 33.952-149.12 33.952-92.352 0-175.328-46.944-253.76-143.456-57.184-56.704-121.056-86.688-184.832-86.688-60.352 0-117.216 26.784-160.128 75.456C88.64 144.128 64 213.216 64 288 64 535.04 264.96 736 512 736s448-200.96 448-448c0-27.328-1.952-90.912-20-90.912zM800.704 379.936m-64 0a64 64 0 1 1 128 0 64 64 0 1 1-128 0ZM457.024 582.624m-64 0a64 64 0 1 1 128 0 64 64 0 1 1-128 0ZM672.704 555.936m-64 0a64 64 0 1 1 128 0 64 64 0 1 1-128 0ZM291.392 443.936m-64 0a64 64 0 1 1 128 0 64 64 0 1 1-128 0ZM278.4 197.248m-96 0a96 96 0 1 1 192 0 96 96 0 1 1-192 0Z"  horiz-adv-x="1024" />
 
     

src/lay/modules/element.js

@@ -277,7 +277,7 @@ layui.define('jquery', function(exports){
             child.addClass(NAV_ANIM);
             bar.css({
               left: othis.position().left + parseFloat(othis.css('marginLeft'))
-              ,top: othis.position().top + othis.height() - 5
+              ,top: othis.position().top + othis.height() - bar.height()
             });
             
             timer[index] = setTimeout(function(){
@@ -373,17 +373,20 @@ layui.define('jquery', function(exports){
       //进度条
       ,progress: function(){
         var ELEM = 'layui-progress';
-        
         $('.' + ELEM + elemFilter).each(function(){
           var othis = $(this)
           ,elemBar = othis.find('.layui-progress-bar')
-          ,width = elemBar.attr('lay-percent');
-          elemBar.css('width', width);
+          ,percent = elemBar.attr('lay-percent');
+
+          elemBar.css('width', function(){
+            return /^.+\/.+$/.test(percent) 
+              ? (new Function('return '+ percent)() * 100) + '%'
+           : percent;
+          }());
+          
           if(othis.attr('lay-showPercent')){
             setTimeout(function(){
-              var percent = Math.round(elemBar.width()/othis.width()*100);
-              if(percent > 100) percent = 100;
-              elemBar.html('<span class="'+ ELEM +'-text">'+ percent +'%</span>');
+              elemBar.html('<span class="'+ ELEM +'-text">'+ percent +'</span>');
             },350);
           }
         });

src/lay/modules/laydate.js

@@ -1,6 +1,6 @@
 /**
  
- @Name : layDate 5.0.7 日期时间控件
+ @Name : layDate 5.0.8 日期时间控件
  @Author: 贤心
  @Site：http://www.layui.com/laydate/
  @License：MIT
@@ -55,7 +55,7 @@
   }
 
   ,laydate = {
-    v: '5.0.7'
+    v: '5.0.8'
     ,config: {} //全局配置项
     ,index: (window.laydate && window.laydate.v) ? 100000 : 0
     ,path: ready.getPath
@@ -705,7 +705,7 @@
     }
     
     //移除上一个控件
-    that.remove(Class.thisElem); 
+    that.remove(Class.thisElemDate); 
     
     //如果是静态定位，则插入到指定的容器中，否则，插入到body
     isStatic ? options.elem.append(elem) : (
@@ -716,7 +716,7 @@
     that.checkDate().calendar(); //初始校验
     that.changeEvent(); //日期切换
     
-    Class.thisElem = that.elemID;
+    Class.thisElemDate = that.elemID;
 
     typeof options.ready === 'function' && options.ready(lay.extend({}, options.dateTime, {
       month: options.dateTime.month + 1
@@ -728,7 +728,7 @@
     var that = this
     ,options = that.config
     ,elem = lay('#'+ (prev || that.elemID));
-    if(elem[0] && !elem.hasClass(ELEM_STATIC)){
+    if(!elem.hasClass(ELEM_STATIC)){
       that.checkDate(function(){
         elem.remove();
       });
@@ -1007,7 +1007,7 @@
     thisDate.setFullYear(dateTime.year, dateTime.month, 1);
     startWeek = thisDate.getDay();
     
-    prevMaxDate = laydate.getEndDate(dateTime.month, dateTime.year); //计算上个月的最后一天
+    prevMaxDate = laydate.getEndDate(dateTime.month || 12, dateTime.year); //计算上个月的最后一天
     thisMaxDate = laydate.getEndDate(dateTime.month + 1, dateTime.year); //计算当前月的最后一天
     
     //赋值日

src/lay/modules/upload.js

@@ -177,7 +177,18 @@ layui.define('layer' , function(exports){
     
     //高级浏览器处理方式，支持跨域
     ,ajaxSend = function(){
-      layui.each(files || that.files || that.chooseFiles || elemFile.files, function(index, file){
+      var successful = 0, aborted = 0
+      ,items = files || that.files || that.chooseFiles || elemFile.files
+      ,allDone = function(){ //多文件全部上传完毕的回调
+        if(options.multiple && successful + aborted === that.fileLength){
+          typeof options.allDone === 'function' && options.allDone({
+            total: that.fileLength
+            ,successful: successful
+            ,aborted: aborted
+          });
+        }
+      };
+      layui.each(items, function(index, file){
         var formData = new FormData();
         
         formData.append(options.field, file);
@@ -187,6 +198,7 @@ layui.define('layer' , function(exports){
           formData.append(key, value);
         });
         
+        //提交文件
         $.ajax({
           url: options.url
           ,type: options.method
@@ -195,11 +207,15 @@ layui.define('layer' , function(exports){
           ,processData: false
           ,dataType: 'json'
           ,success: function(res){
+            successful++;
             done(index, res);
+            allDone();
           }
           ,error: function(){
+            aborted++;
             that.msg('请求上传接口出现异常');
             error(index);
+            allDone();
           }
         });
       });
@@ -431,6 +447,7 @@ layui.define('layer' , function(exports){
     //文件选择
     that.elemFile.off('upload.change').on('upload.change', function(){
       var files = this.files || [];
+      that.fileLength = files.length;
       setChooseFile(files);
       options.auto ? that.upload() : setChooseText(files); //是否自动触发上传
     });

src/layui.js

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