Merge branch 'master' of https://github.com/sentsin/layui into sentsin-master

src/css/layui.mobile.css

@@ -1,191 +0,0 @@
-/**
- 
- @Name: layui mobile
- @Author: 贤心
- @Site: http://www.layui.com/mobile/
- 
- */
- 
-/* reset */
-body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,input,button,textarea,p,blockquote,th,td,form,legend{margin:0; padding:0; -webkit-tap-highlight-color:rgba(0,0,0,0)}
-html{font:12px 'Helvetica Neue','PingFang SC',STHeitiSC-Light,Helvetica,Arial,sans-serif; -ms-text-size-adjust:100%;-webkit-text-size-adjust:100%;}
-a,button,input{-webkit-tap-highlight-color:rgba(255,0,0,0);}
-a{text-decoration: none; background:transparent}
-a:active,a:hover{outline:0}
-table{border-collapse:collapse;border-spacing:0}
-li{list-style:none;}
-b,strong{font-weight:700;}
-h1, h2, h3, h4, h5, h6{font-weight:500;}
-address,cite,dfn,em,var{font-style:normal;}
-dfn{font-style:italic}
-sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}
-img{border:0; vertical-align: bottom}
-button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0; outline: 0;}
-button,select{text-transform:none}
-select{-webkit-appearance: none; border:none;}
-input{line-height:normal; }
-input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}
-input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}
-input[type=search]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}
-input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}
-label,input{vertical-align: middle;}
-
-
-/** 图标字体 **/
-@font-face {font-family: 'layui-icon';
-  src: url('../font/iconfont.eot?v=1.0.7');
-  src: url('../font/iconfont.eot?v=1.0.7#iefix') format('embedded-opentype'),
-  url('../font/iconfont.woff?v=1.0.7') format('woff'),
-  url('../font/iconfont.ttf?v=1.0.7') format('truetype'),
-  url('../font/iconfont.svg?v=1.0.7#iconfont') format('svg');
-}
-                    
-.layui-icon{
-  font-family:"layui-icon" !important;
-  font-size: 16px;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-
-/** 基础通用 **/
-/* 消除第三方ui可能造成的冲突 */.layui-box, .layui-box *{-webkit-box-sizing: content-box !important; -moz-box-sizing: content-box !important; box-sizing: content-box !important;}
-.layui-border-box, .layui-border-box *{-webkit-box-sizing: border-box !important; -moz-box-sizing: border-box !important; box-sizing: border-box !important;}
-.layui-inline{position: relative; display: inline-block; *display:inline; *zoom:1; vertical-align: middle;}
-/* 三角形 */.layui-edge{position: absolute; width: 0; height: 0; border-style: dashed; border-color: transparent; overflow: hidden;}
-/* 单行溢出省略 */.layui-elip{text-overflow: ellipsis; overflow: hidden; white-space: nowrap;}
-/* 屏蔽选中 */.layui-unselect{-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none;}
-.layui-disabled,.layui-disabled:active{background-color: #d2d2d2 !important; color: #fff !important; cursor: not-allowed !important;}
-/* 纯圆角 */.layui-circle{border-radius: 100%;}
-.layui-show{display: block !important;}
-.layui-hide{display: none !important;}
-
-
-.layui-upload-iframe{position: absolute; width: 0px; height: 0px; border: 0px; visibility: hidden;}
-.layui-upload-enter{border: 1px solid #009E94; background-color: #009E94; color: #fff; -webkit-transform: scale(1.1); transform: scale(1.1);}
-
-
-/* 弹出动画 */
-@-webkit-keyframes layui-m-anim-scale { /* 默认 */
-	0% {opacity: 0; -webkit-transform: scale(.5); transform: scale(.5)}
-	100% {opacity: 1; -webkit-transform: scale(1); transform: scale(1)}
-}
-@keyframes layui-m-anim-scale { /* 由小到大 */
-	0% {opacity: 0; -webkit-transform: scale(.5); transform: scale(.5)}
-	100% {opacity: 1; -webkit-transform: scale(1); transform: scale(1)}
-}
-.layui-m-anim-scale{animation-name:  layui-m-anim-scale; -webkit-animation-name:  layui-m-anim-scale;}
-
-@-webkit-keyframes layui-m-anim-up{ /* 从下往上 */
-  0%{opacity: 0; -webkit-transform: translateY(800px); transform: translateY(800px)}
-  100%{opacity: 1; -webkit-transform: translateY(0); transform: translateY(0)}
-}
-@keyframes layui-m-anim-up{
-  0%{opacity: 0; -webkit-transform: translateY(800px); transform: translateY(800px)}
-  100%{opacity: 1; -webkit-transform: translateY(0); transform: translateY(0)}
-}
-.layui-m-anim-up{-webkit-animation-name: layui-m-anim-up; animation-name: layui-m-anim-up}
-
-@-webkit-keyframes layui-m-anim-left{ /* 从右往左 */
-  0%{-webkit-transform: translateX(100%); transform: translateX(100%)}
-  100%{-webkit-transform: translateX(0); transform: translateX(0)}
-}
-@keyframes layui-m-anim-left{
-  0%{-webkit-transform: translateX(100%); transform: translateX(100%)}
-  100%{-webkit-transform: translateX(0); transform: translateX(0)}
-}
-.layui-m-anim-left{-webkit-animation-name: layui-m-anim-left; animation-name: layui-m-anim-left}
-
-@-webkit-keyframes layui-m-anim-right{ /* 从左往右 */
-  0%{-webkit-transform: translateX(-100%); transform: translateX(-100%)}
-  100%{-webkit-transform: translateX(0); transform: translateX(0)}
-}
-@keyframes layui-m-anim-right{
-  0%{-webkit-transform: translateX(-100%); transform: translateX(-100%)}
-  100%{-webkit-transform: translateX(0); transform: translateX(0)}
-}
-.layui-m-anim-right{-webkit-animation-name: layui-m-anim-right; animation-name: layui-m-anim-right}
-
-@-webkit-keyframes layui-m-anim-lout{ /* 往左收缩 */
-  0%{-webkit-transform: translateX(0); transform: translateX(0)}
-  100%{-webkit-transform: translateX(-100%); transform: translateX(-100%)}
-}
-@keyframes layui-m-anim-lout{
-  0%{-webkit-transform: translateX(0); transform: translateX(0)}
-  100%{-webkit-transform: translateX(-100%); transform: translateX(-100%)}
-}
-.layui-m-anim-lout{-webkit-animation-name: layui-m-anim-lout; animation-name: layui-m-anim-lout}
-
-@-webkit-keyframes layui-m-anim-rout{ /* 往右收缩 */
-  0%{-webkit-transform: translateX(0); transform: translateX(0)}
-  100%{-webkit-transform: translateX(100%); transform: translateX(100%)}
-}
-@keyframes layui-m-anim-rout{
-  0%{-webkit-transform: translateX(0); transform: translateX(0)}
-  100%{-webkit-transform: translateX(100%); transform: translateX(100%)}
-}
-.layui-m-anim-rout{-webkit-animation-name: layui-m-anim-rout; animation-name: layui-m-anim-rout}
-
-
-/** layer mobile */
-.layui-m-layer{position:relative; z-index: 19891014;}
-.layui-m-layer *{-webkit-box-sizing: content-box; -moz-box-sizing: content-box; box-sizing: content-box;}
-.layui-m-layershade,
-.layui-m-layermain{position:fixed; left:0; top:0; width:100%; height:100%;}
-.layui-m-layershade{background-color:rgba(0,0,0, .7); pointer-events:auto;}
-.layui-m-layermain{display:table; font-family: Helvetica, arial, sans-serif; pointer-events: none;}
-.layui-m-layermain .layui-m-layersection{display:table-cell; vertical-align:middle; text-align:center;}
-.layui-m-layerchild{position:relative; display:inline-block; text-align:left; background-color:#fff; font-size:14px; border-radius: 5px; box-shadow: 0 0 8px rgba(0, 0, 0, 0.1);  pointer-events:auto;  -webkit-overflow-scrolling: touch;}
-.layui-m-layerchild{-webkit-animation-fill-mode: both; animation-fill-mode: both; -webkit-animation-duration: .2s; animation-duration: .2s;}
-
-.layui-m-layer0 .layui-m-layerchild{width: 90%; max-width: 640px;}
-.layui-m-layer1 .layui-m-layerchild{border:none; border-radius:0;}
-.layui-m-layer2 .layui-m-layerchild{width:auto; max-width:260px; min-width:40px; border:none; background: none; box-shadow: none; color:#fff;}
-.layui-m-layerchild h3{padding: 0 10px; height: 60px; line-height: 60px; font-size:16px; font-weight: 400;  border-radius: 5px 5px 0 0; text-align: center;}
-.layui-m-layerchild h3,
-.layui-m-layerbtn span{ text-overflow:ellipsis; overflow:hidden; white-space:nowrap;}
-.layui-m-layercont{padding: 50px 30px; line-height: 22px; text-align:center;}
-.layui-m-layer1 .layui-m-layercont{padding:0; text-align:left;}
-.layui-m-layer2 .layui-m-layercont{text-align:center; padding: 0; line-height: 0;}
-.layui-m-layer2 .layui-m-layercont i{width:25px; height:25px; margin-left:8px; display:inline-block; background-color:#fff; border-radius:100%;}
-.layui-m-layer2 .layui-m-layercont p{margin-top: 20px;}
-
-/* loading */
-@-webkit-keyframes layui-m-anim-loading{
-    0%,80%,100%{transform:scale(0); -webkit-transform:scale(0)}
-    40%{transform:scale(1); -webkit-transform:scale(1)}
-}
-@keyframes layui-m-anim-loading{
-    0%,80%,100%{transform:scale(0); -webkit-transform:scale(0)}
-    40%{transform:scale(1); -webkit-transform:scale(1)}
-}
-.layui-m-layer2 .layui-m-layercont i{-webkit-animation: layui-m-anim-loading 1.4s infinite ease-in-out; animation: layui-m-anim-loading 1.4s infinite ease-in-out; -webkit-animation-fill-mode: both; animation-fill-mode: both;}
-
-.layui-m-layer2 .layui-m-layercont i:first-child{margin-left:0; -webkit-animation-delay: -.32s; animation-delay: -.32s;}
-.layui-m-layer2 .layui-m-layercont i.layui-m-layerload{-webkit-animation-delay: -.16s; animation-delay: -.16s;}
-.layui-m-layer2 .layui-m-layercont>div{line-height:22px; padding-top:7px; margin-bottom:20px; font-size: 14px;}
-.layui-m-layerbtn{display: box; display: -moz-box; display: -webkit-box; width: 100%; position:relative; height: 50px; line-height: 50px; font-size: 0; text-align:center;  border-top:1px solid #D0D0D0; background-color: #F2F2F2; border-radius: 0 0 5px 5px;}
-.layui-m-layerbtn span{position:relative; display: block; -moz-box-flex: 1; box-flex: 1; -webkit-box-flex: 1;  text-align:center; font-size:14px; border-radius: 0 0 5px 5px; cursor:pointer;}
-.layui-m-layerbtn span[yes]{color: #40AFFE;}
-.layui-m-layerbtn span[no]{border-right: 1px solid #D0D0D0; border-radius: 0 0 0 5px;}
-.layui-m-layerbtn span:active{background-color: #F6F6F6;}
-.layui-m-layerend{position:absolute; right:7px; top:10px; width:30px; height:30px; border: 0; font-weight:400; background: transparent; cursor: pointer; -webkit-appearance: none; font-size:30px;}
-.layui-m-layerend::before, .layui-m-layerend::after{position:absolute; left:5px; top:15px; content:''; width:18px; height:1px; background-color:#999; transform:rotate(45deg); -webkit-transform:rotate(45deg); border-radius: 3px;}
-.layui-m-layerend::after{transform:rotate(-45deg);  -webkit-transform:rotate(-45deg);}
-
-/* 底部对话框风格 */
-body .layui-m-layer .layui-m-layer-footer{position: fixed; width: 95%; max-width: 100%; margin: 0 auto; left:0; right: 0; bottom: 10px; background: none;}
-.layui-m-layer-footer .layui-m-layercont{padding: 20px; border-radius: 5px 5px 0 0; background-color: rgba(255,255,255,.8);}
-.layui-m-layer-footer .layui-m-layerbtn{display: block; height: auto; background: none; border-top: none;}
-.layui-m-layer-footer .layui-m-layerbtn span{background-color: rgba(255,255,255,.8);}
-.layui-m-layer-footer .layui-m-layerbtn span[no]{color: #FD482C; border-top: 1px solid #c2c2c2; border-radius: 0 0 5px 5px;}
-.layui-m-layer-footer .layui-m-layerbtn span[yes]{margin-top: 10px; border-radius: 5px;}
-
-/* 通用提示 */
-body .layui-m-layer .layui-m-layer-msg{width: auto; max-width: 90%; margin: 0 auto; bottom: -150px; background-color: rgba(0,0,0,.7); color: #fff;}
-.layui-m-layer-msg .layui-m-layercont{padding: 10px 20px;}
-
-
-
-

src/css/modules/code.css

@@ -1,8 +1,8 @@
 /**
  
  @Name: layui.code
- @Author: 贤心
- @Site: http://www.layui.com
+ @Description：Classic modular front-end UI framework
+ @License：MIT
  
  */
 
@@ -10,14 +10,20 @@
 html #layuicss-skincodecss{display:none; position: absolute; width:1989px;}
 
 /* 默认风格 */
-.layui-code-view{display: block; position: relative; margin: 10px 0; padding: 0; border: 1px solid #e2e2e2; border-left-width: 6px; background-color: #F2F2F2; color: #333; font-family: Courier New; font-size: 12px;}
-.layui-code-h3{position: relative; padding: 0 10px; height: 32px; line-height: 32px; border-bottom: 1px solid #e2e2e2; font-size: 12px;}
+.layui-code-view{display: block; position: relative; margin: 10px 0; padding: 0; border: 1px solid #eee; border-left-width: 6px; background-color: #FAFAFA; color: #333; font-family: Courier New; font-size: 12px;}
+.layui-code-h3{position: relative; padding: 0 10px; height: 40px; line-height: 40px; border-bottom: 1px solid #eee; font-size: 12px;}
 .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 .layui-code-ol li{position: relative; margin-left: 45px; line-height: 20px; padding: 0 10px; border-left: 1px solid #e2e2e2; list-style-type: decimal-leading-zero; *list-style-type: decimal; background-color: #fff;}
+.layui-code-view .layui-code-ol li:first-child{padding-top: 10px;}
+.layui-code-view .layui-code-ol li:last-child{padding-bottom: 10px;}
 .layui-code-view pre{margin: 0;}
 
 /* notepadd++风格 */
 .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;}
+.layui-code-notepad .layui-code-ol li{background-color: #3F3F3F; border-left: none;}
+
+/* 代码预览 */
+.layui-code-demo .layui-code{visibility: visible !important; margin: -15px; border-top: none; border-right: none; border-bottom: none;}
+.layui-code-demo .layui-tab-content{padding: 15px; border-top: none}

src/css/modules/laydate/default/laydate.css

@@ -1,7 +1,6 @@
 /**
  
  @Name: laydata
- @Author: 贤心
  
  **/
  
@@ -13,21 +12,19 @@ html #layuicss-laydate{display: none; position: absolute; width: 1989px;}
 
 /* 主体结构 */
 .layui-laydate, .layui-laydate *{box-sizing: border-box;}
-.layui-laydate{position: absolute; z-index: 66666666; margin: 5px 0; border-radius: 2px; font-size: 14px; -webkit-animation-duration: 0.3s; animation-duration: 0.3s; -webkit-animation-fill-mode: both; animation-fill-mode: both;}
+.layui-laydate{position: absolute; z-index: 66666666; margin: 5px 0; border-radius: 2px; font-size: 14px; -webkit-animation-duration: 0.2s; animation-duration: 0.2s; -webkit-animation-fill-mode: both; animation-fill-mode: both;}
 .layui-laydate-main{width: 272px;}
 .layui-laydate-header *,
 .layui-laydate-content td,
 .layui-laydate-list li{transition-duration: .3s; -webkit-transition-duration: .3s;}
 
-@-webkit-keyframes laydate-upbit{ /* 微微往上滑入 */
-  from {-webkit-transform: translate3d(0, 20px, 0); opacity: 0.3;}
-  to {-webkit-transform: translate3d(0, 0, 0);  opacity: 1;}
+/* 微微往下滑入 */
+@keyframes laydate-downbit {
+  0% {opacity: 0.3; transform: translate3d(0, -5px, 0);}
+  100% {opacity: 1; transform: translate3d(0, 0, 0);}
 }
-@keyframes laydate-upbit{
-  from {transform: translate3d(0, 20px, 0);  opacity: 0.3;}
-  to {transform: translate3d(0, 0, 0);  opacity: 1;}
-}
-.layui-laydate{-webkit-animation-name: laydate-upbit; animation-name: laydate-upbit;}
+
+.layui-laydate{animation-name: laydate-downbit;}
 .layui-laydate-static{ position: relative; z-index: 0; display: inline-block; margin: 0; -webkit-animation: none; animation: none;}
 
 /* 展开年月列表时 */
@@ -51,7 +48,7 @@ html #layuicss-laydate{display: none; position: absolute; width: 1989px;}
 .layui-laydate-header i.laydate-next-y{right: 15px;}
 .layui-laydate-header i.laydate-next-m{right: 45px;}
 .laydate-set-ym{width: 100%; text-align: center; box-sizing: border-box; text-overflow: ellipsis; overflow: hidden; white-space: nowrap;}
-.laydate-set-ym span{padding: 0 5px; cursor: pointer;}
+.laydate-set-ym span{padding: 0 10px; cursor: pointer;}
 .laydate-time-text{cursor: default !important;}
 
 /* 主体结构 */
@@ -61,15 +58,18 @@ html #layuicss-laydate{display: none; position: absolute; width: 1989px;}
 .layui-laydate-content td{width: 36px; height: 30px; padding: 5px; text-align: center;}
 .layui-laydate-content th{font-weight: 400;}
 .layui-laydate-content td{position: relative; cursor: pointer;}
-.laydate-day-mark{position: absolute; left: 0; top: 0; width: 100%; height: 100%; line-height: 30px; font-size: 12px; overflow: hidden;}
+.laydate-day-mark{position: absolute; left: 0; top: 0; width: 100%; line-height: 30px; font-size: 12px; overflow: hidden;}
 .laydate-day-mark::after{position: absolute; content:''; right: 2px; top: 2px; width: 5px; height: 5px; border-radius: 50%;}
 
 /* 底部结构 */
-.layui-laydate-footer{position: relative; height: 46px; line-height: 26px; padding: 10px 20px;}
-.layui-laydate-footer span{margin-right: 15px; display: inline-block; cursor: pointer; font-size: 12px;}
+.layui-laydate-footer{position: relative; height: 46px; line-height: 26px; padding: 10px;}
+.layui-laydate-footer span{display: inline-block;  vertical-align: top; height: 26px; line-height: 24px; padding: 0 10px; border: 1px solid #C9C9C9; border-radius: 2px; background-color: #fff; font-size: 12px; cursor: pointer; white-space: nowrap; transition: all .3s;}
 .layui-laydate-footer span:hover{color: #5FB878;}
+.layui-laydate-footer span.layui-laydate-preview{cursor: default; border-color: transparent !important;}
+.layui-laydate-footer span.layui-laydate-preview:hover{color: #666;}
+.layui-laydate-footer span:first-child.layui-laydate-preview{padding-left: 0;}
 .laydate-footer-btns{position: absolute; right: 10px; top: 10px;}
-.laydate-footer-btns span{height: 26px; line-height: 26px; margin: 0 0 0 -1px; padding: 0 10px; border: 1px solid #C9C9C9; background-color: #fff;  white-space: nowrap; vertical-align: top; border-radius: 2px;}
+.laydate-footer-btns span{margin: 0 0 0 -1px;}
 
 /* 年月列表 */
 .layui-laydate-list{position: absolute; left: 0; top: 0; width: 100%; height: 100%; padding: 10px; box-sizing: border-box; background-color: #fff;}
@@ -80,7 +80,7 @@ html #layuicss-laydate{display: none; position: absolute; width: 1989px;}
 .laydate-time-list p{position: relative; top: -4px; line-height: 29px;}
 .laydate-time-list ol{height: 181px; overflow: hidden;}
 .laydate-time-list>li:hover ol{overflow-y: auto;}
-.laydate-time-list ol li{width: 130%; padding-left: 33px; line-height: 30px; text-align: left; cursor: pointer;}
+.laydate-time-list ol li{width: 130%; padding-left: 33px; height: 30px; line-height: 30px; text-align: left; cursor: pointer;}
 
 /* 提示 */
 .layui-laydate-hint{position: absolute; top: 115px; left: 50%; width: 250px; margin-left: -125px; line-height: 20px; padding: 15px; text-align: center; font-size: 12px; color: #FF5722;}
@@ -89,10 +89,7 @@ html #layuicss-laydate{display: none; position: absolute; width: 1989px;}
 /* 双日历 */
 .layui-laydate-range{width: 546px;}
 .layui-laydate-range .layui-laydate-main{display: inline-block; vertical-align: middle;}
-.layui-laydate-range .laydate-main-list-0 .laydate-next-m,
-.layui-laydate-range .laydate-main-list-0 .laydate-next-y,
-.layui-laydate-range .laydate-main-list-1 .laydate-prev-y,
-.layui-laydate-range .laydate-main-list-1 .laydate-prev-m{display: none;}
+.layui-laydate-range .laydate-main-list-1 .layui-laydate-header,
 .layui-laydate-range .laydate-main-list-1 .layui-laydate-content{border-left: 1px solid #e2e2e2;}
 
 
@@ -104,10 +101,10 @@ html #layuicss-laydate{display: none; position: absolute; width: 1989px;}
 .layui-laydate-content{border-top: none 0; border-bottom: none 0;}
 .layui-laydate-content th{color: #333;}
 .layui-laydate-content td{color: #666;}
-.layui-laydate-content td.laydate-selected{background-color: #00F7DE;}
+.layui-laydate-content td.laydate-selected{background-color: #B5FFF8;}
 .laydate-selected:hover{background-color: #00F7DE !important;}
 .layui-laydate-content td:hover,
-.layui-laydate-list li:hover{background-color: #eaeaea; color: #333;}
+.layui-laydate-list li:hover{background-color: #eee; color: #333;}
 .laydate-time-list li ol{margin: 0; padding: 0; border: 1px solid #e2e2e2; border-left-width: 0;}
 .laydate-time-list li:first-child ol{border-left-width: 1px;}
 .laydate-time-list>li:hover{background: none;}

src/css/modules/layer/default/layer.css

@@ -1,7 +1,6 @@
 /**
  
  @Name: layer
- @Author: 贤心
  
  **/
 
@@ -51,8 +50,8 @@ html #layuicss-layer{display: none; position: absolute; width: 1989px;}
 @-webkit-keyframes layer-shake{0%,100%{-webkit-transform:translateX(0);transform:translateX(0)}10%,30%,50%,70%,90%{-webkit-transform:translateX(-10px);transform:translateX(-10px)}20%,40%,60%,80%{-webkit-transform:translateX(10px);transform:translateX(10px)}}@keyframes layer-shake{0%,100%{-webkit-transform:translateX(0);-ms-transform:translateX(0);transform:translateX(0)}10%,30%,50%,70%,90%{-webkit-transform:translateX(-10px);-ms-transform:translateX(-10px);transform:translateX(-10px)}20%,40%,60%,80%{-webkit-transform:translateX(10px);-ms-transform:translateX(10px);transform:translateX(10px)}}.layer-anim-06{-webkit-animation-name:layer-shake;animation-name:layer-shake}@-webkit-keyframes fadeIn{0%{opacity:0}100%{opacity:1}}
 
 /* 标题栏 */
-.layui-layer-title{padding:0 80px 0 20px; height:42px; line-height:42px; border-bottom:1px solid #eee; font-size:14px; color:#333; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; background-color: #F8F8F8; border-radius: 2px 2px 0 0;}
-.layui-layer-setwin{position:absolute; right:15px; *right:0; top:15px; font-size:0; line-height: initial;}
+.layui-layer-title{padding:0 80px 0 20px; height: 50px; line-height: 50px; border-bottom:1px solid #F0F0F0; font-size: 14px; color:#333; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; border-radius: 2px 2px 0 0;}
+.layui-layer-setwin{position:absolute; right: 15px; *right:0; top: 17px; font-size:0; line-height: initial;}
 .layui-layer-setwin a{position:relative; width: 16px; height:16px; margin-left:10px; font-size:12px; _overflow:hidden;}
 .layui-layer-setwin .layui-layer-min cite{position:absolute; width:14px; height:2px; left:0; top:50%; margin-top:-1px; background-color:#2E2D3C; cursor:pointer; _overflow:hidden;}
 .layui-layer-setwin .layui-layer-min:hover cite{background-color:#2D93CA; }
@@ -75,7 +74,7 @@ html #layuicss-layer{display: none; position: absolute; width: 1989px;}
 .layui-layer-btn-c{text-align: center;}
 
 /* 定制化 */
-.layui-layer-dialog{min-width:260px;}
+.layui-layer-dialog{min-width: 300px;}
 .layui-layer-dialog .layui-layer-content{position: relative; padding:20px; line-height:24px; word-break: break-all; overflow:hidden; font-size:14px; overflow-x: hidden; overflow-y:auto;}
 .layui-layer-dialog .layui-layer-content .layui-layer-ico{position:absolute; top:16px; left:15px; _left:-40px; width:30px; height:30px;}
 .layui-layer-ico1{background-position:-30px 0 }
@@ -129,7 +128,7 @@ html #layuicss-layer{display: none; position: absolute; width: 1989px;}
 .layui-layer-iconext{background:url(icon-ext.png) no-repeat;}
 
 /* prompt模式 */
-.layui-layer-prompt .layui-layer-input{display: block; width: 230px; height: 36px; margin: 0 auto; line-height: 30px; padding-left: 10px; border: 1px solid #e6e6e6; color: #333;}
+.layui-layer-prompt .layui-layer-input{display: block; width: 260px; height: 36px; margin: 0 auto; line-height: 30px; padding-left: 10px; border: 1px solid #e6e6e6; color: #333;}
 .layui-layer-prompt textarea.layui-layer-input{width: 300px; height: 100px; line-height: 20px; padding: 6px 10px;}
 .layui-layer-prompt .layui-layer-content{padding: 20px;}
 .layui-layer-prompt .layui-layer-btn{padding-top: 0;}
@@ -137,24 +136,23 @@ html #layuicss-layer{display: none; position: absolute; width: 1989px;}
 /* tab模式 */
 .layui-layer-tab{box-shadow:1px 1px 50px rgba(0,0,0,.4);}
 .layui-layer-tab .layui-layer-title{padding-left:0; overflow: visible;}
-.layui-layer-tab .layui-layer-title span{position:relative; float:left; min-width:80px; max-width:260px; padding:0 20px; text-align:center; cursor:default; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; cursor: pointer;}
-.layui-layer-tab .layui-layer-title span.layui-this{height: 43px; border-left: 1px solid #eee; border-right: 1px solid #eee; background-color: #fff; z-index: 10;}
+.layui-layer-tab .layui-layer-title span{position:relative; float:left; min-width:80px; max-width: 300px; padding:0 20px; text-align:center; cursor:default; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; cursor: pointer;}
+.layui-layer-tab .layui-layer-title span.layui-this{height: 51px; border-left: 1px solid #eee; border-right: 1px solid #eee; background-color: #fff; z-index: 10;}
 .layui-layer-tab .layui-layer-title span:first-child{border-left:none;}
 .layui-layer-tabmain{line-height:24px; clear:both;}
 .layui-layer-tabmain .layui-layer-tabli{display:none;}
 .layui-layer-tabmain .layui-layer-tabli.layui-this{display: block;}
 
 /* photo模式 */
-.layui-layer-photos{-webkit-animation-duration: .8s; animation-duration: .8s;}
+.layui-layer-photos{background: none; box-shadow: none;}
 .layui-layer-photos .layui-layer-content{overflow:hidden; text-align: center;}
 .layui-layer-photos .layui-layer-phimg img{position: relative; width:100%; display: inline-block; *display:inline; *zoom:1; vertical-align:top;}
-.layui-layer-imguide,.layui-layer-imgbar{display:none;}
-.layui-layer-imgprev, .layui-layer-imgnext{position:absolute; top:50%; width:27px; _width:44px; height:44px;  margin-top:-22px; outline:none;blr:expression(this.onFocus=this.blur());}
-.layui-layer-imgprev{left:10px; background-position:-5px -5px; _background-position:-70px -5px;}
+.layui-layer-imgprev, .layui-layer-imgnext{position: fixed; top: 50%; width: 27px; _width: 44px; height: 44px;  margin-top:-22px; outline:none;blr:expression(this.onFocus=this.blur());}
+.layui-layer-imgprev{left: 30px; background-position:-5px -5px; _background-position:-70px -5px;}
 .layui-layer-imgprev:hover{background-position:-33px -5px; _background-position:-120px -5px;}
-.layui-layer-imgnext{right:10px; _right:8px; background-position:-5px -50px; _background-position:-70px -50px;}
-.layui-layer-imgnext:hover{background-position:-33px -50px; _background-position:-120px -50px;}
-.layui-layer-imgbar{position:absolute; left:0; bottom:0; width:100%; height:32px; line-height:32px; background-color:rgba(0,0,0,.8); background-color:#000\9; filter:Alpha(opacity=80); color:#fff; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; font-size:0;}
+.layui-layer-imgnext{right: 30px; _right:8px; background-position:-5px -50px; _background-position:-70px -50px;}
+.layui-layer-imgnext:hover{background-position: -33px -50px; _background-position: -120px -50px;}
+.layui-layer-imgbar{position: fixed; left:0; right: 0; bottom:0; width:100%; height: 40px; line-height: 40px; background-color:#000\9; filter:Alpha(opacity=60); background-color: rgba(2,0,0,.35); color: #fff; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; font-size:0;}
 .layui-layer-imgtit{/*position:absolute; left:20px;*/}
 .layui-layer-imgtit *{display:inline-block; *display:inline; *zoom:1; vertical-align:top; font-size:12px;}
 .layui-layer-imgtit a{max-width:65%;  text-overflow: ellipsis; overflow: hidden; white-space: nowrap; color:#fff;}

src/lay/all-mobile.js

@@ -1,11 +0,0 @@
-/**
-
- @Name：用于打包移动完整版
- @Author：贤心
- @License：LGPL
-    
- */
- 
-layui.define(function(exports){
-  exports('layui.mobile', layui.v);
-});

src/lay/all.js

@@ -1,15 +0,0 @@
-/**
-
- @Name：用于打包PC完整版，即包含layui.js和所有模块的完整合并（该文件不会存在于构建后的目录）
- @Author：贤心
- @License：LGPL
-    
- */
- 
-layui.define(function(exports){
-  var cache = layui.cache;
-  layui.config({
-    dir: cache.dir.replace(/lay\/dest\/$/, '')
-  });
-  exports('layui.all', layui.v);
-});

src/lay/modules/mobile/layer-mobile.js

@@ -1,189 +0,0 @@
-/*!
-
- @Name：layer mobile v2.0.0 弹层组件移动版
- @Author：贤心
- @Site：http://layer.layui.com/mobie/
- @License：MIT
-    
- */
-
-layui.define(function(exports){
-  
-  "use strict";
-
-  var win = window, doc = document, query = 'querySelectorAll', claname = 'getElementsByClassName', S = function(s){
-    return doc[query](s);
-  };
-
-  //默认配置
-  var config = {
-    type: 0
-    ,shade: true
-    ,shadeClose: true
-    ,fixed: true
-    ,anim: 'scale' //默认动画类型
-  };
-
-  var ready = {
-    extend: function(obj){
-      var newobj = JSON.parse(JSON.stringify(config));
-      for(var i in obj){
-        newobj[i] = obj[i];
-      }
-      return newobj;
-    }, 
-    timer: {}, end: {}
-  };
-
-  //点触事件
-  ready.touch = function(elem, fn){
-    elem.addEventListener('click', function(e){
-      fn.call(this, e);
-    }, false);
-  };
-
-  var index = 0, classs = ['layui-m-layer'], Layer = function(options){
-    var that = this;
-    that.config = ready.extend(options);
-    that.view();
-  };
-
-  Layer.prototype.view = function(){
-    var that = this, config = that.config, layerbox = doc.createElement('div');
-
-    that.id = layerbox.id = classs[0] + index;
-    layerbox.setAttribute('class', classs[0] + ' ' + classs[0]+(config.type || 0));
-    layerbox.setAttribute('index', index);
-    
-    //标题区域
-    var title = (function(){
-      var titype = typeof config.title === 'object';
-      return config.title
-      ? '<h3 style="'+ (titype ? config.title[1] : '') +'">'+ (titype ? config.title[0] : config.title)  +'</h3>'
-      : '';
-    }());
-    
-    //按钮区域
-    var button = (function(){
-      typeof config.btn === 'string' && (config.btn = [config.btn]);
-      var btns = (config.btn || []).length, btndom;
-      if(btns === 0 || !config.btn){
-        return '';
-      }
-      btndom = '<span yes type="1">'+ config.btn[0] +'</span>'
-      if(btns === 2){
-        btndom = '<span no type="0">'+ config.btn[1] +'</span>' + btndom;
-      }
-      return '<div class="layui-m-layerbtn">'+ btndom + '</div>';
-    }());
-    
-    if(!config.fixed){
-      config.top = config.hasOwnProperty('top') ?  config.top : 100;
-      config.style = config.style || '';
-      config.style += ' top:'+ ( doc.body.scrollTop + config.top) + 'px';
-    }
-    
-    if(config.type === 2){
-      config.content = '<i></i><i class="layui-m-layerload"></i><i></i><p>'+ (config.content||'') +'</p>';
-    }
-    
-    if(config.skin) config.anim = 'up';
-    if(config.skin === 'msg') config.shade = false;
-    
-    layerbox.innerHTML = (config.shade ? '<div '+ (typeof config.shade === 'string' ? 'style="'+ config.shade +'"' : '') +' class="layui-m-layershade"></div>' : '')
-    +'<div class="layui-m-layermain" '+ (!config.fixed ? 'style="position:static;"' : '') +'>'
-      +'<div class="layui-m-layersection">'
-        +'<div class="layui-m-layerchild '+ (config.skin ? 'layui-m-layer-' + config.skin + ' ' : '') + (config.className ? config.className : '') + ' ' + (config.anim ? 'layui-m-anim-' + config.anim : '') +'" ' + ( config.style ? 'style="'+config.style+'"' : '' ) +'>'
-          + title
-          +'<div class="layui-m-layercont">'+ config.content +'</div>'
-          + button
-        +'</div>'
-      +'</div>'
-    +'</div>';
-    
-    if(!config.type || config.type === 2){
-      var dialogs = doc[claname](classs[0] + config.type), dialen = dialogs.length;
-      if(dialen >= 1){
-        layer.close(dialogs[0].getAttribute('index'))
-      }
-    }
-    
-    document.body.appendChild(layerbox);
-    var elem = that.elem = S('#'+that.id)[0];
-    config.success && config.success(elem);
-    
-    that.index = index++;
-    that.action(config, elem);
-  };
-
-  Layer.prototype.action = function(config, elem){
-    var that = this;
-    
-    //自动关闭
-    if(config.time){
-      ready.timer[that.index] = setTimeout(function(){
-        layer.close(that.index);
-      }, config.time*1000);
-    }
-    
-    //确认取消
-    var btn = function(){
-      var type = this.getAttribute('type');
-      if(type == 0){
-        config.no && config.no();
-        layer.close(that.index);
-      } else {
-        config.yes ? config.yes(that.index) : layer.close(that.index);
-      }
-    };
-    if(config.btn){
-      var btns = elem[claname]('layui-m-layerbtn')[0].children, btnlen = btns.length;
-      for(var ii = 0; ii < btnlen; ii++){
-        ready.touch(btns[ii], btn);
-      }
-    }
-    
-    //点遮罩关闭
-    if(config.shade && config.shadeClose){
-      var shade = elem[claname]('layui-m-layershade')[0];
-      ready.touch(shade, function(){
-        layer.close(that.index, config.end);
-      });
-    }
-
-    config.end && (ready.end[that.index] = config.end);
-  };
-
-  var layer = {
-    v: '2.0 m',
-    index: index,
-    
-    //核心方法
-    open: function(options){
-      var o = new Layer(options || {});
-      return o.index;
-    },
-    
-    close: function(index){
-      var ibox = S('#'+classs[0]+index)[0];
-      if(!ibox) return;
-      ibox.innerHTML = '';
-      doc.body.removeChild(ibox);
-      clearTimeout(ready.timer[index]);
-      delete ready.timer[index];
-      typeof ready.end[index] === 'function' && ready.end[index]();
-      delete ready.end[index];
-    },
-    
-    //关闭所有layer层
-    closeAll: function(){
-      var boxs = doc[claname](classs[0]);
-      for(var i = 0, len = boxs.length; i < len; i++){
-        layer.close((boxs[0].getAttribute('index')|0));
-      }
-    }
-  };
-
-  exports('layer-mobile', layer);
-
-});

src/lay/modules/mobile/layim-mobile-open.js

@@ -1,11 +0,0 @@
-/**
-
- @Name：layim mobile 开源包
- @Author：贤心
- @License：MIT
-    
- */
- 
-layui.define(function(exports){
-  exports('layim-mobile', layui.v);
-});

src/layui.js

@@ -1,17 +1,14 @@
+
 /*!
-
- @Title: layui
- @Description：经典模块化前端 UI 框架
- @Site: www.layui.com
- @Author: 贤心
- @License：MIT
-
+ * Layui
+ * Classic modular Front-End UI library
+ * MIT Licensed
  */
  
 ;!function(win){
   "use strict";
 
-  var doc = document, config = {
+  var doc = win.document, config = {
     modules: {} //记录模块物理路径
     ,status: {} //记录模块加载状态
     ,timeout: 10 //符合规范的模块请求最长等待秒数
@@ -19,10 +16,13 @@
   }
 
   ,Layui = function(){
-    this.v = '2.5.5'; //版本号
+    this.v = '2.6.8'; // layui 版本号
   }
+  
+  //识别预先可能定义的指定全局对象
+  ,GLOBAL = win.LAYUI_GLOBAL || {}
 
-  //获取layui所在目录
+  //获取 layui 所在目录
   ,getPath = function(){
     var jsPath = doc.currentScript ? doc.currentScript.src : function(){
       var js = doc.scripts
@@ -36,41 +36,44 @@
       }
       return src || js[last].src;
     }();
-    return jsPath.substring(0, jsPath.lastIndexOf('/') + 1);
+    
+    return config.dir = GLOBAL.dir || jsPath.substring(0, jsPath.lastIndexOf('/') + 1);
   }()
 
   //异常提示
-  ,error = function(msg){
-    win.console && console.error && console.error('Layui hint: ' + msg);
+  ,error = function(msg, type){
+    type = type || 'log';
+    win.console && console[type] && console[type]('layui error hint: ' + msg);
   }
 
   ,isOpera = typeof opera !== 'undefined' && opera.toString() === '[object Opera]'
 
   //内置模块
-  ,modules = {
-    layer: 'modules/layer' //弹层
-    ,laydate: 'modules/laydate' //日期
-    ,laypage: 'modules/laypage' //分页
-    ,laytpl: 'modules/laytpl' //模板引擎
-    ,layim: 'modules/layim' //web通讯
-    ,layedit: 'modules/layedit' //富文本编辑器
-    ,form: 'modules/form' //表单集
-    ,upload: 'modules/upload' //上传
-    ,transfer: 'modules/transfer' //上传
-    ,tree: 'modules/tree' //树结构
-    ,table: 'modules/table' //表格
-    ,element: 'modules/element' //常用元素操作
-    ,rate: 'modules/rate'  //评分组件
-    ,colorpicker: 'modules/colorpicker' //颜色选择器
-    ,slider: 'modules/slider' //滑块
-    ,carousel: 'modules/carousel' //轮播
-    ,flow: 'modules/flow' //流加载
-    ,util: 'modules/util' //工具块
-    ,code: 'modules/code' //代码修饰器
-    ,jquery: 'modules/jquery' //DOM库（第三方）
+  ,modules = config.builtin = {
+    lay: 'lay' //基础 DOM 操作
+    ,layer: 'layer' //弹层
+    ,laydate: 'laydate' //日期
+    ,laypage: 'laypage' //分页
+    ,laytpl: 'laytpl' //模板引擎
+    ,layedit: 'layedit' //富文本编辑器
+    ,form: 'form' //表单集
+    ,upload: 'upload' //上传
+    ,dropdown: 'dropdown' //下拉菜单
+    ,transfer: 'transfer' //穿梭框
+    ,tree: 'tree' //树结构
+    ,table: 'table' //表格
+    ,element: 'element' //常用元素操作
+    ,rate: 'rate'  //评分组件
+    ,colorpicker: 'colorpicker' //颜色选择器
+    ,slider: 'slider' //滑块
+    ,carousel: 'carousel' //轮播
+    ,flow: 'flow' //流加载
+    ,util: 'util' //工具块
+    ,code: 'code' //代码修饰器
+    ,jquery: 'jquery' //DOM 库（第三方）
     
-    ,mobile: 'modules/mobile' //移动大模块 | 若当前为开发目录，则为移动模块入口，否则为移动模块集合
-    ,'layui.all': '../layui.all' //PC模块合并版
+    ,all: 'all'
+    ,'layui.all': 'layui.all' //聚合标识（功能性的，非真实模块）
   };
 
   //记录基础数据
@@ -99,24 +102,30 @@
       deps = []
     );
     
-    if((!layui['layui.all'] && layui['layui.mobile'])){
-      return callback.call(that);
-    }
-
-    that.use(deps, callback);
+    that.use(deps, callback, null, 'define');
     return that;
   };
 
   //使用特定模块
-  Layui.prototype.use = function(apps, callback, exports){
+  Layui.prototype.use = function(apps, callback, exports, from){
     var that = this
     ,dir = config.dir = config.dir ? config.dir : getPath
     ,head = doc.getElementsByTagName('head')[0];
 
-    apps = typeof apps === 'string' ? [apps] : apps;
+    apps = function(){
+      if(typeof apps === 'string'){
+        return [apps];
+      } 
+      //当第一个参数为 function 时，则自动加载所有内置模块，且执行的回调即为该 function 参数；
+      else if(typeof apps === 'function'){
+        callback = apps;
+        return ['all'];
+      }      
+      return apps;
+    }();
     
-    //如果页面已经存在jQuery1.7+库且所定义的模块依赖jQuery，则不加载内部jquery模块
-    if(window.jQuery && jQuery.fn.on){
+    //如果页面已经存在 jQuery 1.7+ 库且所定义的模块依赖 jQuery，则不加载内部 jquery 模块
+    if(win.jQuery && jQuery.fn.on){
       that.each(apps, function(index, item){
         if(item === 'jquery'){
           apps.splice(index, 1);
@@ -140,42 +149,53 @@
         head.removeChild(node);
         (function poll() {
           if(++timeout > config.timeout * 1000 / 4){
-            return error(item + ' is not a valid module');
+            return error(item + ' is not a valid module', 'error');
           };
           config.status[item] ? onCallback() : setTimeout(poll, 4);
         }());
       }
     }
-    
+  
     //回调
     function onCallback(){
       exports.push(layui[item]);
       apps.length > 1 ?
-        that.use(apps.slice(1), callback, exports)
-      : ( typeof callback === 'function' && callback.apply(layui, exports) );
+        that.use(apps.slice(1), callback, exports, from)
+      : ( typeof callback === 'function' && function(){
+        //保证文档加载完毕再执行回调
+        if(layui.jquery && typeof layui.jquery === 'function' && from !== 'define'){
+          return layui.jquery(function(){
+            callback.apply(layui, exports);
+          });
+        }
+        callback.apply(layui, exports);
+      }() );
     }
     
-    //如果引入了完整库（layui.all.js），内置的模块则不必再加载
-    if(apps.length === 0 
-    || (layui['layui.all'] && modules[item]) 
-    || (!layui['layui.all'] && layui['layui.mobile'] && modules[item])
-    ){
+    //如果引入了聚合板，内置的模块则不必重复加载
+    if( apps.length === 0 || (layui['layui.all'] && modules[item]) ){
       return onCallback(), that;
     }
+    
+    //获取加载的模块 URL
+    //如果是内置模块，则按照 dir 参数拼接模块路径
+    //如果是扩展模块，则判断模块路径值是否为 {/} 开头，
+    //如果路径值是 {/} 开头，则模块路径即为后面紧跟的字符。
+    //否则，则按照 base 参数拼接模块路径
+    
+    var url = ( modules[item] ? (dir + 'modules/') 
+      : (/^\{\/\}/.test(that.modules[item]) ? '' : (config.base || ''))
+    ) + (that.modules[item] || item) + '.js';
+    url = url.replace(/^\{\/\}/, '');
+    
+    //如果扩展模块（即：非内置模块）对象已经存在，则不必再加载
+    if(!config.modules[item] && layui[item]){
+      config.modules[item] = url; //并记录起该扩展模块的 url
+    }
 
     //首次加载模块
     if(!config.modules[item]){
-      var node = doc.createElement('script')
-      
-      //如果是内置模块，则按照 dir 参数拼接模块路径
-      //如果是扩展模块，则判断模块路径值是否为 {/} 开头，
-      //如果路径值是 {/} 开头，则模块路径即为后面紧跟的字符。
-      //否则，则按照 base 参数拼接模块路径
-      ,url = ( modules[item] ? (dir + 'lay/') 
-        : (/^\{\/\}/.test(that.modules[item]) ? '' : (config.base || ''))
-      ) + (that.modules[item] || item) + '.js';
-      
-      url = url.replace(/^\{\/\}/, '');
+      var node = doc.createElement('script');
       
       node.async = true;
       node.charset = 'utf-8';
@@ -202,7 +222,7 @@
     } else { //缓存
       (function poll() {
         if(++timeout > config.timeout * 1000 / 4){
-          return error(item + ' is not a valid module');
+          return error(item + ' is not a valid module', 'error');
         };
         (typeof config.modules[item] === 'string' && config.status[item]) 
         ? onCallback() 
@@ -213,7 +233,7 @@
     return that;
   };
 
-  //获取节点的style属性值
+  //获取节点的 style 属性值
   Layui.prototype.getStyle = function(node, name){
     var style = node.currentStyle ? node.currentStyle : win.getComputedStyle(node, null);
     return style[style.getPropertyValue ? 'getPropertyValue' : 'getAttribute'](name);
@@ -222,13 +242,14 @@
   //css外部加载器
   Layui.prototype.link = function(href, fn, cssname){
     var that = this
-    ,link = doc.createElement('link')
-    ,head = doc.getElementsByTagName('head')[0];
+    ,head = doc.getElementsByTagName('head')[0]
+    ,link = doc.createElement('link');
     
     if(typeof fn === 'string') cssname = fn;
     
     var app = (cssname || href).replace(/\.|\//g, '')
-    ,id = link.id = 'layuicss-'+app
+    ,id = link.id = 'layuicss-'+ app
+    ,STAUTS_NAME = 'creating'
     ,timeout = 0;
     
     link.rel = 'stylesheet';
@@ -238,10 +259,35 @@
     if(!doc.getElementById(id)){
       head.appendChild(link);
     }
-
+    
     if(typeof fn !== 'function') return that;
     
+    //轮询 css 是否加载完毕
+    (function poll(status) {
+      var delay = 100
+      ,getLinkElem = doc.getElementById(id); //获取动态插入的 link 元素
+      
+      //如果轮询超过指定秒数，则视为请求文件失败或 css 文件不符合规范
+      if(++timeout > config.timeout * 1000 / delay){
+        return error(href + ' timeout');
+      };
+      
+      //css 加载就绪
+      if(parseInt(that.getStyle(getLinkElem, 'width')) === 1989){
+        //如果参数来自于初始轮询（即未加载就绪时的），则移除 link 标签状态
+        if(status === STAUTS_NAME) getLinkElem.removeAttribute('lay-status');
+        //如果 link 标签的状态仍为「创建中」，则继续进入轮询，直到状态改变，则执行回调
+        getLinkElem.getAttribute('lay-status') === STAUTS_NAME ? setTimeout(poll, delay) : fn();
+      } else {
+        getLinkElem.setAttribute('lay-status', STAUTS_NAME);
+        setTimeout(function(){
+          poll(STAUTS_NAME);
+        }, delay);
+      }
+    }());
+    
     //轮询css是否加载完毕
+    /*
     (function poll() {
       if(++timeout > config.timeout * 1000 / 100){
         return error(href + ' timeout');
@@ -250,10 +296,16 @@
         fn();
       }() : setTimeout(poll, 100);
     }());
+    */
     
     return that;
   };
   
+  //css 内部加载器
+  Layui.prototype.addcss = function(firename, fn, cssname){
+    return layui.link(config.dir + 'css/' + firename, fn, cssname);
+  };
+  
   //存储模块的回调
   config.callback = {};
   
@@ -266,11 +318,6 @@
     }
   };
 
-  //css内部加载器
-  Layui.prototype.addcss = function(firename, fn, cssname){
-    return layui.link(config.dir + 'css/' + firename, fn, cssname);
-  };
-
   //图片预加载
   Layui.prototype.img = function(url, callback, error) {   
     var img = new Image();
@@ -314,7 +361,7 @@
     options = options || {};
     for(var o in options){
       if(that[o] || that.modules[o]){
-        error('\u6A21\u5757\u540D '+ o +' \u5DF2\u88AB\u5360\u7528');
+        error(o+ ' Module already exists', 'error');
       } else {
         that.modules[o] = options[o];
       }
@@ -323,7 +370,7 @@
     return that;
   };
 
-  //路由解析
+  // location.hash 路由解析
   Layui.prototype.router = function(hash){
     var that = this
     ,hash = hash || location.hash
@@ -338,7 +385,7 @@
     data.href = '/' + hash;
     hash = hash.replace(/([^#])(#.*$)/, '$1').split('/') || [];
     
-    //提取Hash结构
+    //提取 Hash 结构
     that.each(hash, function(index, item){
       /^\w+=/.test(item) ? function(){
         item = item.split('=');
@@ -348,6 +395,64 @@
     
     return data;
   };
+  
+  //URL 解析
+  Layui.prototype.url = function(href){
+    var that = this
+    ,data = {
+      //提取 url 路径
+      pathname: function(){
+        var pathname = href
+          ? function(){
+            var str = (href.match(/\.[^.]+?\/.+/) || [])[0] || '';
+            return str.replace(/^[^\/]+/, '').replace(/\?.+/, '');
+          }()
+        : location.pathname;
+        return pathname.replace(/^\//, '').split('/');
+      }()
+      
+      //提取 url 参数
+      ,search: function(){
+        var obj = {}
+        ,search = (href 
+          ? function(){
+            var str = (href.match(/\?.+/) || [])[0] || '';
+            return str.replace(/\#.+/, '');
+          }()
+          : location.search
+        ).replace(/^\?+/, '').split('&'); //去除 ?，按 & 分割参数
+        
+        //遍历分割后的参数
+        that.each(search, function(index, item){
+          var _index = item.indexOf('=')
+          ,key = function(){ //提取 key
+            if(_index < 0){
+              return item.substr(0, item.length);
+            } else if(_index === 0){
+              return false;
+            } else {
+              return item.substr(0, _index);
+            }
+          }(); 
+          //提取 value
+          if(key){
+            obj[key] = _index > 0 ? item.substr(_index + 1) : null;
+          }
+        });
+        
+        return obj;
+      }()
+      
+      //提取 Hash
+      ,hash: that.router(function(){
+        return href 
+          ? ((href.match(/#.+/) || [])[0] || '/')
+        : location.hash;
+      }())
+    };
+    
+    return data;
+  };
 
   //本地持久性存储
   Layui.prototype.data = function(table, settings, storage){
@@ -423,6 +528,7 @@
     //移动设备
     result.android = /android/.test(agent);
     result.ios = result.os === 'ios';
+    result.mobile = (result.android || result.ios) ? true : false;
     
     return result;
   };
@@ -431,24 +537,63 @@
   Layui.prototype.hint = function(){
     return {
       error: error
-    }
+    };
+  };
+  
+  //typeof 类型细分 -> string/number/boolean/undefined/null、object/array/function/…
+  Layui.prototype._typeof = function(operand){
+    if(operand === null) return String(operand);
+    
+    //细分引用类型
+    return (typeof operand === 'object' || typeof operand === 'function') ? function(){
+      var type = Object.prototype.toString.call(operand).match(/\s(.+)\]$/) || [] //匹配类型字符
+      ,classType = 'Function|Array|Date|RegExp|Object|Error|Symbol'; //常见类型字符
+      
+      type = type[1] || 'Object';
+      
+      //除匹配到的类型外，其他对象均返回 object
+      return new RegExp('\\b('+ classType + ')\\b').test(type) 
+        ? type.toLowerCase() 
+      : 'object';
+    }() : typeof operand;
+  };
+  
+  //对象是否具备数组结构（此处为兼容 jQuery 对象）
+  Layui.prototype._isArray = function(obj){
+    var that = this
+    ,len
+    ,type = that._typeof(obj);
+    
+    if(!obj || (typeof obj !== 'object') || obj === win) return false;
+    
+    len = 'length' in obj && obj.length; //兼容 ie
+    return type === 'array' || len === 0 || (
+      typeof len === 'number' && len > 0 && (len - 1) in obj //兼容 jQuery 对象
+    );
   };
 
   //遍历
   Layui.prototype.each = function(obj, fn){
     var key
-    ,that = this;
+    ,that = this
+    ,callFn = function(key, obj){ //回调
+      return fn.call(obj[key], key, obj[key])
+    };
+    
     if(typeof fn !== 'function') return that;
     obj = obj || [];
-    if(obj.constructor === Object){
-      for(key in obj){
-        if(fn.call(obj[key], key, obj[key])) break;
+    
+    //优先处理数组结构
+    if(that._isArray(obj)){
+      for(key = 0; key < obj.length; key++){
+        if(callFn(key, obj)) break;
       }
     } else {
-      for(key = 0; key < obj.length; key++){
-        if(fn.call(obj[key], key, obj[key])) break;
+      for(key in obj){
+        if(callFn(key, obj)) break;
       }
     }
+    
     return that;
   };
 
@@ -460,15 +605,52 @@
     
     if(!key) return clone;
     
-    //如果是数字，按大小排序，如果是非数字，按字典序排序
+    //如果是数字，按大小排序；如果是非数字，则按字典序排序
     clone.sort(function(o1, o2){
-      var isNum = /^-?\d+$/
-      ,v1 = o1[key]
-      ,v2 = o2[key];
+      var v1 = o1[key]
+      ,v2 = o2[key]
+      ,isNum = [
+        !isNaN(v1)
+        ,!isNaN(v2)
+      ];
+
       
-      if(isNum.test(v1)) v1 = parseFloat(v1);
-      if(isNum.test(v2)) v2 = parseFloat(v2);
+      //若为数字比较
+      if(isNum[0] && isNum[1]){
+        if(v1 && (!v2 && v2 !== 0)){ //数字 vs 空
+          return 1;
+        } else if((!v1 && v1 !== 0) && v2){ //空 vs 数字
+          return -1;
+        } else { //数字 vs 数字
+          return v1 - v2;
+        }
+      };
       
+      /**
+       * 字典序排序
+       */
+       
+      //若为非数字比较
+      if(!isNum[0] && !isNum[1]){
+        //字典序比较
+        if(v1 > v2){
+          return 1;
+        } else if (v1 < v2) {
+          return -1;
+        } else {
+          return 0;
+        }
+      }
+      
+      //若为混合比较
+      if(isNum[0] || !isNum[1]){ //数字 vs 非数字
+        return -1;
+      } else if(!isNum[0] || isNum[1]) { //非数字 vs 数字
+        return 1;
+      }
+      
+      /*
+      //老版本
       if(v1 && !v2){
         return 1;
       } else if(!v1 && v2){
@@ -482,6 +664,8 @@
       } else {
         return 0;
       }
+      */
+      
     });
 
     desc && clone.reverse(); //倒序
@@ -495,6 +679,9 @@
       thisEvent.cancelBubble = true;
     }
   };
+  
+  //字符常理
+  var EV_REMOVE = 'LAYUI-EVENT-REMOVE';
 
   //自定义模块事件
   Layui.prototype.onevent = function(modName, events, callback){
@@ -508,7 +695,7 @@
   Layui.prototype.event = Layui.event = function(modName, events, params, fn){
     var that = this
     ,result = null
-    ,filter = events.match(/\((.*)\)$/)||[] //提取事件过滤器字符结构，如：select(xxx)
+    ,filter = (events || '').match(/\((.*)\)$/)||[] //提取事件过滤器字符结构，如：select(xxx)
     ,eventName = (modName + '.'+ events).replace(filter[0], '') //获取事件名称，如：form.select
     ,filterName = filter[1] || '' //获取过滤器名称,，如：xxx
     ,callback = function(_, item){
@@ -516,11 +703,17 @@
       res === false && result === null && (result = false);
     };
     
+    //如果参数传入特定字符，则执行移除事件
+    if(params === EV_REMOVE){
+      delete (that.cache.event[eventName] || {})[filterName];
+      return that;
+    }
+    
     //添加事件
     if(fn){
       config.event[eventName] = config.event[eventName] || {};
 
-      //这里不再对多次事件监听做支持，避免更多麻烦
+      //这里不再对重复事件做支持
       //config.event[eventName][filterName] ? config.event[eventName][filterName].push(fn) : 
       config.event[eventName][filterName] = [fn];
       return this;
@@ -541,8 +734,21 @@
     
     return result;
   };
-
+  
+  //新增模块事件
+  Layui.prototype.on = function(events, modName, callback){
+    var that = this;
+    return that.onevent.call(that, modName, events, callback);
+  }
+  
+  //移除模块事件
+  Layui.prototype.off = function(events, modName){
+    var that = this;
+    return that.event.call(that, modName, events, EV_REMOVE);
+  };
+  
+  //exports layui
   win.layui = new Layui();
   
-}(window);
+}(window); //gulp build: layui-footer
 

src/modules/all.js

@@ -0,0 +1,32 @@
+
+/*!
+ * 用于加载所有内置模块
+ * MIT Licensed  
+ */
+ 
+layui.define(function(){
+  var mods = [] 
+  ,builtin = layui.cache.builtin;
+  layui.each(builtin, function(modName){
+    (modName === 'all' || modName === 'layui.all') || mods.push(modName);
+  });
+  layui.cache.startTime = new Date().getTime();
+
+  return mods;
+}(), function(exports){
+  "use strict";
+  
+  var MOD_NAME = 'all'
+  
+  //外部接口
+  ,all = {
+    config: {}
+    ,time: function(){
+      var time = new Date().getTime() - layui.cache.startTime;
+      delete layui.cache.startTime;
+      return time;
+    }()
+  };
+
+  exports(MOD_NAME, all);
+});

src/modules/carousel.js

@@ -1,9 +1,7 @@
-/**
 
- @Name：layui.carousel 轮播模块
- @Author：贤心
- @License：MIT
-    
+/*!
+ * carousel 轮播模块
+ * MIT Licensed  
  */
  
 layui.define('jquery', function(exports){
@@ -24,7 +22,7 @@ layui.define('jquery', function(exports){
       return that;
     }
     
-    //事件监听
+    //事件
     ,on: function(events, callback){
       return layui.onevent.call(this, MOD_NAME, events, callback);
     }

src/modules/code.js

@@ -1,22 +1,19 @@
-/**
 
- @Name：layui.code 代码修饰器
- @Author：贤心
- @License：MIT
-    
+/**
+ * code 代码修饰器
+ * MIT Licensed 
  */
  
 layui.define('jquery', function(exports){
   "use strict";
   
   var $ = layui.$;
-  var about = 'http://www.layui.com/doc/modules/code.html'; //关于信息
   
   exports('code', function(options){
     var elems = [];
     options = options || {};
     options.elem = $(options.elem||'.layui-code');
-    options.about = 'about' in options ? options.about : true;
+    options.lang = 'lang' in options ? options.lang : 'code';
     
     options.elem.each(function(){
       elems.push(this);
@@ -34,7 +31,7 @@ layui.define('jquery', function(exports){
       othis.html('<ol class="layui-code-ol"><li>' + html.replace(/[\r\t\n]+/g, '</li><li>') + '</li></ol>')
       
       if(!othis.find('>.layui-code-h3')[0]){
-        othis.prepend('<h3 class="layui-code-h3">'+ (othis.attr('lay-title')||options.title||'code') + (options.about ? '<a href="'+ about +'" target="_blank">layui.code</a>' : '') + '</h3>');
+        othis.prepend('<h3 class="layui-code-h3">'+ (othis.attr('lay-title')||options.title||'&lt;/&gt;') + '<a href="javascript:;">'+ (othis.attr('lay-lang')||options.lang||'') +'</a>' + '</h3>');
       }
       
       var ol = othis.find('>.layui-code-ol');
@@ -58,4 +55,5 @@ layui.define('jquery', function(exports){
     });
     
   });
-}).addcss('modules/code.css', 'skincodecss');
+}).addcss('modules/code.css?v=2', 'skincodecss');
+

src/modules/colorpicker.js

@@ -1,15 +1,16 @@
-/**
-
- @Title: layui.colorpicker 颜色选择器
- @Author: star1029
- @License：MIT
 
+/*!
+ * colorpicker 
+ * 颜色选择组件
  */
 
-layui.define('jquery', function(exports){
+layui.define(['jquery', 'lay'], function(exports){
   "use strict";
   
   var $ = layui.jquery
+  ,lay = layui.lay
+  ,device = layui.device()
+  ,clickOrMousedown = (device.mobile ? 'click' : 'mousedown')
 
   //外部接口
   ,colorpicker = {
@@ -23,7 +24,7 @@ layui.define('jquery', function(exports){
       return that;
     }
     
-    //事件监听
+    //事件
     ,on: function(events, callback){
       return layui.onevent.call(this, 'colorpicker', events, callback);
     }
@@ -218,7 +219,7 @@ layui.define('jquery', function(exports){
     ,elemColorBox = that.elemColorBox[0]
     
     //颜色选择器对象
-    ,elemPicker = that.elemPicker = $(['<div id="layui-colorpicker'+ that.index +'" data-index="'+ that.index +'" class="layui-anim layui-anim-upbit layui-colorpicker-main">'
+    ,elemPicker = that.elemPicker = $(['<div id="layui-colorpicker'+ that.index +'" data-index="'+ that.index +'" class="layui-anim layui-anim-downbit layui-colorpicker-main">'
       //颜色面板
       ,'<div class="layui-colorpicker-main-wrapper">'
         ,'<div class="layui-colorpicker-basis">'
@@ -296,45 +297,12 @@ layui.define('jquery', function(exports){
   //定位算法
   Class.prototype.position = function(){
     var that = this
-    ,options = that.config
-    ,elem = that.bindElem || that.elemColorBox[0]
-    ,elemPicker = that.elemPicker[0]
-    ,rect = elem.getBoundingClientRect() //绑定元素的坐标
-    ,elemWidth = elemPicker.offsetWidth //控件的宽度
-    ,elemHeight = elemPicker.offsetHeight //控件的高度
-    
-    //滚动条高度
-    ,scrollArea = function(type){
-      type = type ? 'scrollLeft' : 'scrollTop';
-      return document.body[type] | document.documentElement[type];
-    }
-    ,winArea = function(type){
-      return document.documentElement[type ? 'clientWidth' : 'clientHeight']
-    }, margin = 5, left = rect.left, top = rect.bottom;
-    
-    left = left - (elemWidth - elem.offsetWidth)/2;
-    top = top + margin
-
-    //如果右侧超出边界
-    if(left + elemWidth + margin > winArea('width')){
-      left = winArea('width') - elemWidth - margin;
-    } else if(left < margin){ //如果左侧超出边界
-      left = margin;
-    }
-    
-    //如果底部超出边界
-    if(top + elemHeight + margin > winArea()){
-      top = rect.top > elemHeight //顶部是否有足够区域显示完全
-        ? rect.top - elemHeight 
-      : winArea() - elemHeight;
-      top = top - margin*2;
-    }
-    
-    if(options.position){
-      elemPicker.style.position = options.position;
-    }
-    elemPicker.style.left = left + (options.position === 'fixed' ? 0 : scrollArea(1)) + 'px';
-    elemPicker.style.top = top + (options.position === 'fixed' ? 0 : scrollArea()) + 'px';
+    ,options = that.config;
+    lay.position(that.bindElem || that.elemColorBox[0], that.elemPicker[0], {
+      position: options.position
+      ,align: 'center'
+    });
+    return that;
   };
 
   //颜色选择器赋值
@@ -436,7 +404,7 @@ layui.define('jquery', function(exports){
     }
 
     //拖拽元素
-    ,elemMove = $(['<div class="layui-auxiliar-moving" id="LAY-colorpicker-moving"></div'].join(''))
+    ,elemMove = $(['<div class="layui-auxiliar-moving" id="LAY-colorpicker-moving"></div>'].join(''))
     ,createMoveElem = function(call){
       $('#LAY-colorpicker-moving')[0] || $('body').append(elemMove);
       elemMove.on('mousemove', call);
@@ -458,11 +426,12 @@ layui.define('jquery', function(exports){
         if(top > maxh)top = maxh;
         var h = top/180*360;
         _h = h;
-        change(h, _s, _b, _a);  
+        change(h, _s, _b, _a);
         e.preventDefault();
       };
       
       createMoveElem(move);
+      //layui.stope(e);
       e.preventDefault();
     });
     
@@ -515,6 +484,7 @@ layui.define('jquery', function(exports){
       _b = b;
       _s = s;
       change(_h, s, b, _a); 
+      layui.stope(e);
       e.preventDefault();
       choose.trigger(e, 'mousedown');
     });
@@ -676,7 +646,7 @@ layui.define('jquery', function(exports){
     if(!options.elem[0] || that.elemColorBox[0].eventHandler) return;
     
     //绑定关闭控件事件
-    $doc.on('click', function(e){
+    $doc.on(clickOrMousedown, function(e){
       //如果点击的元素是颜色框
       if($(e.target).hasClass(ELEM) 
         || $(e.target).parents('.'+ELEM)[0]

src/modules/demo.js

@@ -0,0 +1,135 @@
+
+/*!
+ * MODULE_DEMO_NAME 模块组件通用结构
+ * MIT Licensed
+ */
+
+layui.define([''], function(exports){
+  "use strict";
+  
+  var $ = layui.$
+  
+  //模块名
+  ,MOD_NAME = 'MODULE_DEMO_NAME'
+  ,MOD_INDEX = 'layui_'+ MOD_NAME +'_index' //模块索引名
+
+  //外部接口
+  ,MODULE_DEMO_NAME = {
+    config: {}
+    ,index: layui[MOD_NAME] ? (layui[MOD_NAME].index + 10000) : 0
+
+    //设置全局项
+    ,set: function(options){
+      var that = this;
+      that.config = $.extend({}, that.config, options);
+      return that;
+    }
+    
+    //事件
+    ,on: function(events, callback){
+      return layui.onevent.call(this, MOD_NAME, events, callback);
+    }
+  }
+
+  //操作当前实例
+  ,thisModule = function(){
+    var that = this
+    ,options = that.config
+    ,id = options.id || that.index;
+    
+    thisModule.that[id] = that; //记录当前实例对象
+    
+    return {
+      config: options
+      //重置实例
+      ,reload: function(options){
+        that.reload.call(that, options);
+      }
+    }
+  }
+
+  //字符常量
+  ,STR_ELEM = 'layui-MODULE_DEMO_NAME', STR_HIDE = 'layui-hide', STR_DISABLED = 'layui-disabled', STR_NONE = 'layui-none'
+  
+  //主模板
+  ,TPL_MAIN = [''].join('')
+
+  //构造器
+  ,Class = function(options){
+    var that = this;
+    that.index = ++MODULE_DEMO_NAME.index;
+    that.config = $.extend({}, that.config, MODULE_DEMO_NAME.config, options);
+    that.render();
+  };
+
+  //默认配置
+  Class.prototype.config = {
+    
+  };
+  
+  //重载实例
+  Class.prototype.reload = function(options){
+    var that = this;
+    
+    //防止数组深度合并
+    layui.each(options, function(key, item){
+      if(layui._typeof(item) === 'array') delete that.config[key];
+    });
+    
+    that.config = $.extend(true, {}, that.config, options);
+    that.render();
+  };
+
+  //渲染
+  Class.prototype.render = function(){
+    var that = this
+    ,options = that.config;
+    
+    //解析模板
+    var thisElem = that.elem = $(laytpl(TPL_MAIN).render({
+      data: options
+      ,index: that.index //索引
+    }));
+    
+    var othis = options.elem = $(options.elem);
+    if(!othis[0]) return;
+    
+    
+    
+    that.events(); //事件
+  };
+  
+  //事件
+  Class.prototype.events = function(){
+    var that = this
+    ,options = that.config;
+    
+    
+  };
+  
+  //记录所有实例
+  thisModule.that = {}; //记录所有实例对象
+  
+  //获取当前实例对象
+  thisModule.getThis = function(id){
+    var that = thisModule.that[id];
+    if(!that) hint.error(id ? (MOD_NAME +' instance with ID \''+ id +'\' not found') : 'ID argument required');
+    return that
+  };
+  
+  //重载实例
+  MODULE_DEMO_NAME.reload = function(id, options){
+    var that = thisModule.that[id];
+    that.reload(options);
+    
+    return thisModule.call(that);
+  };
+
+  //核心入口
+  MODULE_DEMO_NAME.render = function(options){
+    var inst = new Class(options);
+    return thisModule.call(inst);
+  };
+
+  exports(MOD_NAME, MODULE_DEMO_NAME);
+});

src/modules/dropdown.js

@@ -0,0 +1,528 @@
+/**
+ 
+ @Name：dropdown 下拉菜单组件
+ @License：MIT
+
+ */
+
+layui.define(['jquery', 'laytpl', 'lay'], function(exports){
+  "use strict";
+  
+  var $ = layui.$
+  ,laytpl = layui.laytpl
+  ,hint = layui.hint()
+  ,device = layui.device()
+  ,clickOrMousedown = (device.mobile ? 'click' : 'mousedown')
+  
+  //模块名
+  ,MOD_NAME = 'dropdown'
+  ,MOD_INDEX = 'layui_'+ MOD_NAME +'_index' //模块索引名
+
+  //外部接口
+  ,dropdown = {
+    config: {}
+    ,index: layui[MOD_NAME] ? (layui[MOD_NAME].index + 10000) : 0
+
+    //设置全局项
+    ,set: function(options){
+      var that = this;
+      that.config = $.extend({}, that.config, options);
+      return that;
+    }
+    
+    //事件
+    ,on: function(events, callback){
+      return layui.onevent.call(this, MOD_NAME, events, callback);
+    }
+  }
+
+  //操作当前实例
+  ,thisModule = function(){
+    var that = this
+    ,options = that.config
+    ,id = options.id;
+
+    thisModule.that[id] = that; //记录当前实例对象
+
+    return {
+      config: options
+      //重置实例
+      ,reload: function(options){
+        that.reload.call(that, options);
+      }
+    }
+  }
+
+  //字符常量
+  ,STR_ELEM = 'layui-dropdown', STR_HIDE = 'layui-hide', STR_DISABLED = 'layui-disabled', STR_NONE = 'layui-none'
+  ,STR_ITEM_UP = 'layui-menu-item-up', STR_ITEM_DOWN = 'layui-menu-item-down', STR_MENU_TITLE = 'layui-menu-body-title', STR_ITEM_GROUP = 'layui-menu-item-group', STR_ITEM_PARENT = 'layui-menu-item-parent', STR_ITEM_DIV = 'layui-menu-item-divider', STR_ITEM_CHECKED = 'layui-menu-item-checked', STR_ITEM_CHECKED2 = 'layui-menu-item-checked2', STR_MENU_PANEL = 'layui-menu-body-panel', STR_MENU_PANEL_L = 'layui-menu-body-panel-left'
+  
+  ,STR_GROUP_TITLE = '.'+ STR_ITEM_GROUP + '>.'+ STR_MENU_TITLE
+
+  //构造器
+  ,Class = function(options){
+    var that = this;
+    that.index = ++dropdown.index;
+    that.config = $.extend({}, that.config, dropdown.config, options);
+    that.init();
+  };
+
+  //默认配置
+  Class.prototype.config = {
+    trigger: 'click' //事件类型
+    ,content: '' //自定义菜单内容
+    ,className: '' //自定义样式类名
+    ,style: '' //设置面板 style 属性
+    ,show: false //是否初始即显示菜单面板
+    ,isAllowSpread: true //是否允许菜单组展开收缩
+    ,isSpreadItem: true //是否初始展开子菜单
+    ,data: [] //菜单数据结构
+    ,delay: 300 //延迟关闭的毫秒数，若 trigger 为 hover 时才生效
+  };
+  
+  //重载实例
+  Class.prototype.reload = function(options){
+    var that = this;
+    that.config = $.extend({}, that.config, options);
+    that.init(true);
+  };
+
+  //初始化准备
+  Class.prototype.init = function(rerender){
+    var that = this
+    ,options = that.config
+    ,elem = options.elem = $(options.elem);
+    
+    //若 elem 非唯一
+    if(elem.length > 1){
+      layui.each(elem, function(){
+        dropdown.render($.extend({}, options, {
+          elem: this
+        }));
+      });
+      return that;
+    }
+
+    //若重复执行 render，则视为 reload 处理
+    if(!rerender && elem[0] && elem.data(MOD_INDEX)){;
+      var newThat = thisModule.getThis(elem.data(MOD_INDEX));
+      if(!newThat) return;
+
+      return newThat.reload(options);
+    };
+    
+    //初始化 id 参数
+    options.id = ('id' in options) ? options.id : that.index;
+    
+    if(options.show) that.render(rerender); //初始即显示
+    that.events(); //事件
+  };
+  
+  //渲染
+  Class.prototype.render = function(rerender){
+    var that = this
+    ,options = that.config
+    ,elemBody = $('body')
+    
+    //默认菜单内容
+    ,getDefaultView = function(){
+      var elemUl = $('<ul class="layui-menu layui-dropdown-menu"></ul>');
+      if(options.data.length > 0 ){
+        eachItemView(elemUl, options.data)
+      } else {
+        elemUl.html('<li class="layui-menu-item-none">no menu</li>');
+      }
+      return elemUl;
+    }
+    
+    //遍历菜单项
+    ,eachItemView = function(views, data){
+      //var views = [];
+      layui.each(data, function(index, item){
+        //是否存在子级
+        var isChild = item.child && item.child.length > 0
+        ,isSpreadItem = ('isSpreadItem' in item) ? item.isSpreadItem : options.isSpreadItem
+        ,title = item.templet 
+          ? laytpl(item.templet).render(item) 
+        : (options.templet ? laytpl(options.templet).render(item) : item.title)
+        
+        //初始类型
+        ,type = function(){
+          if(isChild){
+            item.type = item.type || 'parent';
+          }
+          if(item.type){
+            return ({
+              group: 'group'
+              ,parent: 'parent'
+              ,'-': '-'
+            })[item.type] || 'parent';
+          }
+          return '';
+        }();
+
+        if(type !== '-' && (!item.title && !item.id && !isChild)) return;
+        
+        //列表元素
+        var viewLi = $(['<li'+ function(){
+          var className = {
+            group: 'layui-menu-item-group'+ (
+              options.isAllowSpread ? (
+                isSpreadItem ? ' layui-menu-item-down' : ' layui-menu-item-up'
+              ) : ''
+            )
+            ,parent: STR_ITEM_PARENT
+            ,'-': 'layui-menu-item-divider'
+          };
+          if(isChild || type){
+            return ' class="'+ className[type] +'"';
+          }
+          return '';
+        }() +'>'
+        
+          //标题区
+          ,function(){
+            //是否超文本
+            var viewText = ('href' in item) ? (
+              '<a href="'+ item.href +'" target="'+ (item.target || '_self') +'">'+ title +'</a>'
+            ) : title;
+            
+            //是否存在子级
+            if(isChild){
+              return '<div class="'+ STR_MENU_TITLE +'">'+ viewText + function(){
+                if(type === 'parent'){
+                  return '<i class="layui-icon layui-icon-right"></i>';
+                } else if(type === 'group' && options.isAllowSpread){
+                  return '<i class="layui-icon layui-icon-'+ (isSpreadItem ? 'up' : 'down') +'"></i>';
+                } else {
+                  return '';
+                }
+              }() +'</div>'
+              
+            }
+            return '<div class="'+ STR_MENU_TITLE +'">'+ viewText +'</div>';
+          }()
+        ,'</li>'].join(''));
+        
+        viewLi.data('item', item);
+        
+        //子级区
+        if(isChild){
+          var elemPanel = $('<div class="layui-panel layui-menu-body-panel"></div>')
+          ,elemUl = $('<ul></ul>');
+
+          if(type === 'parent'){
+            elemPanel.append(eachItemView(elemUl, item.child));
+            viewLi.append(elemPanel);
+          } else {
+            viewLi.append(eachItemView(elemUl, item.child));
+          }
+        }
+
+        views.append(viewLi);
+      });
+      return views;
+    }
+    
+    //主模板
+    ,TPL_MAIN = ['<div class="layui-dropdown layui-border-box layui-panel layui-anim layui-anim-downbit">'
+    ,'</div>'].join('');
+    
+    //如果是右键事件，则每次触发事件时，将允许重新渲染
+    if(options.trigger === 'contextmenu' || lay.isTopElem(options.elem[0])) rerender = true;
+    
+    //判断是否已经打开了下拉菜单面板
+    if(!rerender && options.elem.data(MOD_INDEX +'_opened')) return;
+
+    //记录模板对象
+    that.elemView = $(TPL_MAIN);
+    that.elemView.append(options.content || getDefaultView());
+    
+    //初始化某些属性
+    if(options.className) that.elemView.addClass(options.className);
+    if(options.style) that.elemView.attr('style', options.style);
+    
+    
+    //记录当前执行的实例索引
+    dropdown.thisId = options.id;
+    
+    //插入视图
+    that.remove(); //移除非当前绑定元素的面板
+    elemBody.append(that.elemView);
+    options.elem.data(MOD_INDEX +'_opened', true);
+    
+    //坐标定位
+    that.position();
+    thisModule.prevElem = that.elemView; //记录当前打开的元素，以便在下次关闭
+    thisModule.prevElem.data('prevElem', options.elem); //将当前绑定的元素，记录在打开元素的 data 对象中
+    
+    //阻止全局事件
+    that.elemView.find('.layui-menu').on(clickOrMousedown, function(e){
+      layui.stope(e);
+    });
+
+    //触发菜单列表事件
+    that.elemView.find('.layui-menu li').on('click', function(e){
+      var othis = $(this)
+      ,data = othis.data('item') || {}
+      ,isChild = data.child && data.child.length > 0;
+      
+      if(!isChild && data.type !== '-'){
+        that.remove();
+        typeof options.click === 'function' && options.click(data, othis);
+      }
+    });
+    
+    //触发菜单组展开收缩
+    that.elemView.find(STR_GROUP_TITLE).on('click', function(e){
+      var othis = $(this)
+      ,elemGroup = othis.parent()
+      ,data = elemGroup.data('item') || {}
+      
+      if(data.type === 'group' && options.isAllowSpread){
+        thisModule.spread(elemGroup);
+      }
+    });
+    
+    //如果是鼠标移入事件，则鼠标移出时自动关闭
+    if(options.trigger === 'mouseenter'){
+      that.elemView.on('mouseenter', function(){
+        clearTimeout(thisModule.timer);
+      }).on('mouseleave', function(){
+        that.delayRemove();
+      });
+    }
+
+  };
+  
+  //位置定位
+  Class.prototype.position = function(obj){
+    var that = this
+    ,options = that.config;
+    
+    lay.position(options.elem[0], that.elemView[0], {
+      position: options.position
+      ,e: that.e
+      ,clickType: options.trigger === 'contextmenu' ? 'right' : null
+      ,align: options.align || null
+    });
+  };
+  
+  //删除视图
+  Class.prototype.remove = function(){
+    var that = this
+    ,options = that.config
+    ,elemPrev = thisModule.prevElem;
+    
+    //若存在已打开的面板元素，则移除
+    if(elemPrev){
+      elemPrev.data('prevElem') && (
+        elemPrev.data('prevElem').data(MOD_INDEX +'_opened', false)
+      );
+      elemPrev.remove();
+    }
+  };
+  
+  //延迟删除视图
+  Class.prototype.delayRemove = function(){
+    var that = this
+    ,options = that.config;
+    clearTimeout(thisModule.timer);
+
+    thisModule.timer = setTimeout(function(){
+      that.remove();
+    }, options.delay);
+  };
+  
+  //事件
+  Class.prototype.events = function(){
+    var that = this
+    ,options = that.config;
+    
+    //如果传入 hover，则解析为 mouseenter
+    if(options.trigger === 'hover') options.trigger = 'mouseenter';
+
+    //解除上一个事件
+    if(that.prevElem) that.prevElem.off(options.trigger, that.prevElemCallback);
+    
+    //记录被绑定的元素及回调
+    that.prevElem = options.elem;
+    that.prevElemCallback = function(e){
+      clearTimeout(thisModule.timer);
+      that.e = e;
+      that.render();
+      e.preventDefault();
+      
+      //组件打开完毕的时间
+      typeof options.ready === 'function' && options.ready(that.elemView, options.elem, that.e.target);
+    };
+
+    //触发元素事件
+    options.elem.on(options.trigger, that.prevElemCallback);
+    
+    //如果是鼠标移入事件
+    if(options.trigger === 'mouseenter'){
+      //直行鼠标移出事件
+      options.elem.on('mouseleave', function(){
+        that.delayRemove();
+      });
+    }
+  };
+  
+  //记录所有实例
+  thisModule.that = {}; //记录所有实例对象
+  
+  //获取当前实例对象
+  thisModule.getThis = function(id){
+    var that = thisModule.that[id];
+    if(!that) hint.error(id ? (MOD_NAME +' instance with ID \''+ id +'\' not found') : 'ID argument required');
+    return that;
+  };
+  
+  //设置菜单组展开和收缩状态
+  thisModule.spread = function(othis){
+    //菜单组展开和收缩
+    var elemIcon = othis.children('.'+ STR_MENU_TITLE).find('.layui-icon');
+    if(othis.hasClass(STR_ITEM_UP)){
+      othis.removeClass(STR_ITEM_UP).addClass(STR_ITEM_DOWN);
+      elemIcon.removeClass('layui-icon-down').addClass('layui-icon-up');
+    } else {
+      othis.removeClass(STR_ITEM_DOWN).addClass(STR_ITEM_UP);
+      elemIcon.removeClass('layui-icon-up').addClass('layui-icon-down')
+    }
+  };
+  
+  //全局事件
+  ;!function(){
+    var _WIN = $(window)
+    ,_DOC = $(document);
+    
+    //自适应定位
+    _WIN.on('resize', function(){
+      if(!dropdown.thisId) return;
+      var that = thisModule.getThis(dropdown.thisId);
+      if(!that) return;
+      
+      if(!that.elemView[0] || !$('.'+ STR_ELEM)[0]){
+        return false;
+      }
+      
+      var options = that.config;
+      
+      if(options.trigger === 'contextmenu'){
+        that.remove();
+      } else {
+        that.position();
+      }
+    });
+    
+    
+      
+    //点击任意处关闭
+    _DOC.on(clickOrMousedown, function(e){
+      if(!dropdown.thisId) return;
+      var that = thisModule.getThis(dropdown.thisId)
+      if(!that) return;
+      
+      var options = that.config;
+      
+      //如果触发的是绑定的元素，或者属于绑定元素的子元素，则不关闭
+      //满足条件：当前绑定的元素不是 body document，或者不是鼠标右键事件
+      if(!(lay.isTopElem(options.elem[0]) || options.trigger === 'contextmenu')){
+        if(
+          e.target === options.elem[0] || 
+          options.elem.find(e.target)[0] ||
+          e.target === that.elemView[0] ||
+          (that.elemView && that.elemView.find(e.target)[0])
+        ) return;
+      }
+      
+      that.remove();
+    });
+    
+    //基础菜单的静态元素事件
+    var ELEM_LI = '.layui-menu:not(.layui-dropdown-menu) li';
+    _DOC.on('click', ELEM_LI, function(e){
+      var othis = $(this)
+      ,parent = othis.parents('.layui-menu').eq(0)
+      ,isChild = othis.hasClass(STR_ITEM_GROUP) || othis.hasClass(STR_ITEM_PARENT)
+      ,filter = parent.attr('lay-filter') || parent.attr('id')
+      ,options = lay.options(this);
+      
+      //非触发元素
+      if(othis.hasClass(STR_ITEM_DIV)) return;
+
+      //非菜单组
+      if(!isChild){
+        //选中
+        parent.find('.'+ STR_ITEM_CHECKED).removeClass(STR_ITEM_CHECKED); //清除选中样式
+        parent.find('.'+ STR_ITEM_CHECKED2).removeClass(STR_ITEM_CHECKED2); //清除父级菜单选中样式
+        othis.addClass(STR_ITEM_CHECKED); //添加选中样式
+        othis.parents('.'+ STR_ITEM_PARENT).addClass(STR_ITEM_CHECKED2); //添加父级菜单选中样式
+        
+        //触发事件
+        layui.event.call(this, MOD_NAME, 'click('+ filter +')', options);
+      }
+    });
+    
+    //基础菜单的展开收缩事件
+    _DOC.on('click', (ELEM_LI + STR_GROUP_TITLE), function(e){
+      var othis = $(this)
+      ,elemGroup = othis.parents('.'+ STR_ITEM_GROUP +':eq(0)')
+      ,options = lay.options(elemGroup[0]);
+
+      if(('isAllowSpread' in options) ? options.isAllowSpread : true){
+        thisModule.spread(elemGroup);
+      };
+    });
+    
+    //判断子级菜单是否超出屏幕
+    var ELEM_LI_PAR = '.layui-menu .'+ STR_ITEM_PARENT
+    _DOC.on('mouseenter', ELEM_LI_PAR, function(e){
+      var othis = $(this)
+      ,elemPanel = othis.find('.'+ STR_MENU_PANEL);
+
+      if(!elemPanel[0]) return;
+      var rect = elemPanel[0].getBoundingClientRect();
+      
+      //是否超出右侧屏幕
+      if(rect.right > _WIN.width()){
+        elemPanel.addClass(STR_MENU_PANEL_L);
+        //不允许超出左侧屏幕
+        rect = elemPanel[0].getBoundingClientRect();
+        if(rect.left < 0){
+          elemPanel.removeClass(STR_MENU_PANEL_L);
+        }
+      }
+      
+      //是否超出底部屏幕
+      if(rect.bottom > _WIN.height()){
+        elemPanel.eq(0).css('margin-top', -(rect.bottom - _WIN.height()));
+      };
+    }).on('mouseleave', ELEM_LI_PAR, function(e){
+      var othis = $(this)
+      ,elemPanel = othis.children('.'+ STR_MENU_PANEL);
+      
+      elemPanel.removeClass(STR_MENU_PANEL_L);
+      elemPanel.css('margin-top', 0);
+    });
+    
+  }();
+  
+  //重载实例
+  dropdown.reload = function(id, options){
+    var that = thisModule.getThis(id);
+    if(!that) return this;
+
+    that.reload(options);
+    return thisModule.call(that);
+  };
+
+  //核心入口
+  dropdown.render = function(options){
+    var inst = new Class(options);
+    return thisModule.call(inst);
+  };
+
+  exports(MOD_NAME, dropdown);
+});

src/modules/element.js

@@ -1,9 +1,7 @@
-/**
 
- @Name：layui.element 常用元素操作
- @Author：贤心
- @License：MIT
-    
+/*!
+ * element 常用元素操作
+ * MIT Licensed 
  */
  
 layui.define('jquery', function(exports){
@@ -26,7 +24,7 @@ layui.define('jquery', function(exports){
     return that;
   };
   
-  //表单事件监听
+  //表单事件
   Element.prototype.on = function(events, callback){
     return layui.onevent.call(this, MOD_NAME, events, callback);
   };
@@ -38,11 +36,18 @@ layui.define('jquery', function(exports){
     ,titElem = tabElem.children(TITLE)
     ,barElem = titElem.children('.layui-tab-bar')
     ,contElem = tabElem.children('.layui-tab-content')
-    ,li = '<li lay-id="'+ (options.id||'') +'"'
-    +(options.attr ? ' lay-attr="'+ options.attr +'"' : '') +'>'+ (options.title||'unnaming') +'</li>';
+    ,li = '<li'+ function(){
+      var layAttr = [];
+      layui.each(options, function(key, value){
+        if(/^(title|content)$/.test(key)) return;
+        layAttr.push('lay-'+ key +'="'+ value +'"');
+      });
+      if(layAttr.length > 0) layAttr.unshift(''); //向前插，预留空格
+      return layAttr.join(' ');
+    }() +'>'+ (options.title || 'unnaming') +'</li>';
     
     barElem[0] ? barElem.before(li) : titElem.append(li);
-    contElem.append('<div class="layui-tab-item">'+ (options.content||'') +'</div>');
+    contElem.append('<div class="layui-tab-item">'+ (options.content || '') +'</div>');
     call.hideTabMore(true);
     call.tabAuto();
     return this;
@@ -84,18 +89,18 @@ layui.define('jquery', function(exports){
     ,elem = $('.'+ ELEM +'[lay-filter='+ filter +']')
     ,elemBar = elem.find('.'+ ELEM +'-bar')
     ,text = elemBar.find('.'+ ELEM +'-text');
-    elemBar.css('width', percent);
+    elemBar.css('width', percent).attr('lay-percent', percent);
     text.text(percent);
     return this;
   };
   
   var NAV_ELEM = '.layui-nav', NAV_ITEM = 'layui-nav-item', NAV_BAR = 'layui-nav-bar'
-  ,NAV_TREE = 'layui-nav-tree', NAV_CHILD = 'layui-nav-child', NAV_MORE = 'layui-nav-more'
-  ,NAV_ANIM = 'layui-anim layui-anim-upbit'
+  ,NAV_TREE = 'layui-nav-tree', NAV_CHILD = 'layui-nav-child', NAV_CHILD_C = 'layui-nav-child-c'
+  ,NAV_MORE = 'layui-nav-more', NAV_DOWN = 'layui-icon-down', NAV_ANIM = 'layui-anim layui-anim-upbit'
   
   //基础事件体
   ,call = {
-    //Tab点击
+    //Tab 点击
     tabClick: function(e, index, liElem, options){
       options = options || {};
       var othis = liElem || $(this)
@@ -103,9 +108,12 @@ layui.define('jquery', function(exports){
       ,parents = options.headerElem ? othis.parent() : othis.parents('.layui-tab').eq(0)
       ,item = options.bodyElem ? $(options.bodyElem) : parents.children('.layui-tab-content').children('.layui-tab-item')
       ,elemA = othis.find('a')
+      ,isJump = elemA.attr('href') !== 'javascript:;' && elemA.attr('target') === '_blank' //是否存在跳转
+      ,unselect = typeof othis.attr('lay-unselect') === 'string' //是否禁用选中
       ,filter = parents.attr('lay-filter');
       
-      if(!(elemA.attr('href') !== 'javascript:;' && elemA.attr('target') === '_blank')){
+      //执行切换
+      if(!(isJump || unselect)){
         othis.addClass(THIS).siblings().removeClass(THIS);
         item.eq(index).addClass(SHOW).siblings().removeClass(SHOW);
       }
@@ -164,7 +172,7 @@ layui.define('jquery', function(exports){
           title.find('li').each(function(){
             var li = $(this);
             if(!li.find('.'+CLOSE)[0]){
-              var close = $('<i class="layui-icon layui-unselect '+ CLOSE +'">&#x1006;</i>');
+              var close = $('<i class="layui-icon layui-icon-close layui-unselect '+ CLOSE +'"></i>');
               close.on('click', call.tabDelete);
               li.append(close);
             }
@@ -224,7 +232,7 @@ layui.define('jquery', function(exports){
       ,filter = parents.attr('lay-filter')
       ,parent = othis.parent() 
       ,child = othis.siblings('.'+NAV_CHILD)
-      ,unselect = typeof parent.attr('lay-unselect') === 'string';
+      ,unselect = typeof parent.attr('lay-unselect') === 'string'; //是否禁用选中
       
       if(!(othis.attr('href') !== 'javascript:;' && othis.attr('target') === '_blank') && !unselect){
         if(!child[0]){
@@ -299,52 +307,85 @@ layui.define('jquery', function(exports){
       
       //导航菜单
       ,nav: function(){
-        var TIME = 200, timer = {}, timerMore = {}, timeEnd = {}, follow = function(bar, nav, index){
+        var TIME = 200, timer = {}, timerMore = {}, timeEnd = {}, NAV_TITLE = 'layui-nav-title'
+        
+        //滑块跟随
+        ,follow = function(bar, nav, index){
           var othis = $(this), child = othis.find('.'+NAV_CHILD);
-          
           if(nav.hasClass(NAV_TREE)){
-            bar.css({
-              top: othis.position().top
-              ,height: othis.children('a').outerHeight()
-              ,opacity: 1
-            });
+            //无子菜单时跟随
+            if(!child[0]){
+              var thisA = othis.children('.'+ NAV_TITLE);
+              bar.css({
+                top: othis.offset().top - nav.offset().top
+                ,height: (thisA[0] ? thisA : othis).outerHeight()
+                ,opacity: 1
+              });
+            }
           } else {
             child.addClass(NAV_ANIM);
-            bar.css({
-              left: othis.position().left + parseFloat(othis.css('marginLeft'))
-              ,top: othis.position().top + othis.height() - bar.height()
+            
+            //若居中对齐
+            if(child.hasClass(NAV_CHILD_C)) child.css({
+              left: -(child.outerWidth() - othis.width())/2
             });
             
+            //滑块定位
+            if(child[0]){ //若有子菜单，则滑块消失
+              bar.css({
+                left: bar.position().left + bar.width()/2
+                ,width: 0
+                ,opacity: 0
+              });
+            } else { //bar 跟随
+              bar.css({
+                left: othis.position().left + parseFloat(othis.css('marginLeft'))
+                ,top: othis.position().top + othis.height() - bar.height()
+              });
+            }
+            
+            //渐显滑块并适配宽度
             timer[index] = setTimeout(function(){
               bar.css({
-                width: othis.width()
-                ,opacity: 1
+                width: child[0] ? 0 : othis.width()
+                ,opacity: child[0] ? 0 : 1
               });
             }, device.ie && device.ie < 10 ? 0 : TIME);
             
+            //显示子菜单
             clearTimeout(timeEnd[index]);
             if(child.css('display') === 'block'){
               clearTimeout(timerMore[index]);
             }
             timerMore[index] = setTimeout(function(){
-              child.addClass(SHOW)
+              child.addClass(SHOW);
               othis.find('.'+NAV_MORE).addClass(NAV_MORE+'d');
             }, 300);
           }
-        }
+        };
         
+        //遍历导航
         $(NAV_ELEM + elemFilter).each(function(index){
           var othis = $(this)
           ,bar = $('<span class="'+ NAV_BAR +'"></span>')
           ,itemElem = othis.find('.'+NAV_ITEM);
           
-          //Hover滑动效果
+          //hover 滑动效果
           if(!othis.find('.'+NAV_BAR)[0]){
             othis.append(bar);
-            itemElem.on('mouseenter', function(){
+            (othis.hasClass(NAV_TREE) 
+              ? itemElem.find('dd,>.'+ NAV_TITLE) 
+            : itemElem).on('mouseenter', function(){
               follow.call(this, bar, othis, index);
-            }).on('mouseleave', function(){
-              if(!othis.hasClass(NAV_TREE)){
+            }).on('mouseleave', function(){ //鼠标移出
+              //是否为垂直导航
+              if(othis.hasClass(NAV_TREE)){
+                bar.css({
+                  height: 0
+                  ,opacity: 0
+                });
+              } else {
+                //隐藏子菜单
                 clearTimeout(timerMore[index]);
                 timerMore[index] = setTimeout(function(){
                   othis.find('.'+NAV_CHILD).removeClass(SHOW);
@@ -355,13 +396,7 @@ layui.define('jquery', function(exports){
             othis.on('mouseleave', function(){
               clearTimeout(timer[index])
               timeEnd[index] = setTimeout(function(){
-                if(othis.hasClass(NAV_TREE)){
-                  bar.css({
-                    height: 0
-                    ,top: bar.position().top + bar.height()/2
-                    ,opacity: 0
-                  });
-                } else {
+                if(!othis.hasClass(NAV_TREE)){
                   bar.css({
                     width: 0
                     ,left: bar.position().left + bar.width()/2
@@ -380,7 +415,7 @@ layui.define('jquery', function(exports){
             
             //输出小箭头
             if(child[0] && !thisA.children('.'+NAV_MORE)[0]){
-              thisA.append('<span class="'+ NAV_MORE +'"></span>');
+              thisA.append('<i class="layui-icon '+ NAV_DOWN +' '+ NAV_MORE +'"></i>');
             }
             
             thisA.off('click', call.clickThis).on('click', call.clickThis); //点击菜单
@@ -460,7 +495,10 @@ layui.define('jquery', function(exports){
   Element.prototype.render = Element.prototype.init;
 
   var element = new Element(), dom = $(document);
-  element.render();
+  
+  $(function(){
+    element.render();
+  });
   
   var TITLE = '.layui-tab-title li';
   dom.on('click', TITLE, call.tabClick); //Tab切换

src/modules/flow.js

@@ -1,7 +1,6 @@
 /**
 
- @Name：layui.flow 流加载
- @Author：贤心
+ @Name flow 流加载组件
  @License：MIT
     
  */
@@ -77,7 +76,7 @@ layui.define('jquery', function(exports){
       var othis = $(this), top = othis.scrollTop();
       
       if(timer) clearTimeout(timer);
-      if(isOver) return;
+      if(isOver || !elem.width()) return; //如果已经结束，或者元素处于隐藏状态，则不执行滚动加载
       
       timer = setTimeout(function(){
         //计算滚动所在容器的可视高度
@@ -94,6 +93,7 @@ layui.define('jquery', function(exports){
         }
       }, 100);
     });
+    
     return that;
   };
   
@@ -117,7 +117,7 @@ layui.define('jquery', function(exports){
 
       /* 始终只加载在当前屏范围内的图片 */
       if(elemTop >= start && elemTop <= end){
-        if(!item.attr('src')){
+        if(item.attr('lay-src')){
           var src = item.attr('lay-src');
           layui.img(src, function(){
             var next = that.lazyimg.elem.eq(index);
@@ -126,6 +126,9 @@ layui.define('jquery', function(exports){
             /* 当前图片加载就绪后，检测下一个图片是否在当前屏 */
             next[0] && render(next);
             index++;
+          }, function(){
+            var next = that.lazyimg.elem.eq(index);
+            item.removeAttr('lay-src');
           });
         }
       }

src/modules/form.js

@@ -1,9 +1,7 @@
-/**
 
- @Name：layui.form 表单组件
- @Author：贤心
- @License：MIT
-    
+/*!
+ * form 表单组件
+ * MIT Licensed
  */
  
 layui.define('layer', function(exports){
@@ -33,7 +31,7 @@ layui.define('layer', function(exports){
           ,'邮箱格式不正确'
         ]
         ,url: [
-          /(^#)|(^http(s*):\/\/[^\s]+\.[^\s]+)/
+          /^(#|(http(s?)):\/\/|\/\/)[^\s]+\.[^\s]+$/
           ,'链接格式不正确'
         ]
         ,number: function(value){
@@ -48,6 +46,7 @@ layui.define('layer', function(exports){
           ,'请输入正确的身份证号'
         ]
       }
+      ,autocomplete: null //全局 autocomplete 状态。null 表示不干预
     };
   };
   
@@ -65,7 +64,7 @@ layui.define('layer', function(exports){
     return that;
   };
   
-  //表单事件监听
+  //表单事件
   Form.prototype.on = function(events, callback){
     return layui.onevent.call(this, MOD_NAME, events, callback);
   };
@@ -117,20 +116,22 @@ layui.define('layer', function(exports){
     ,field = {}
     ,fieldElem = itemForm.find('input,select,textarea') //获取所有表单域
     
-    layui.each(fieldElem, function(_, item){
-      item.name = (item.name || '').replace(/^\s*|\s*&/, '');
+    layui.each(fieldElem, function(_, item){ 
+      var othis = $(this)
+      ,init_name; //初始 name
       
+      item.name = (item.name || '').replace(/^\s*|\s*&/, '');
       if(!item.name) return;
       
       //用于支持数组 name
       if(/^.*\[\]$/.test(item.name)){
         var key = item.name.match(/^(.*)\[\]$/g)[0];
         nameIndex[key] = nameIndex[key] | 0;
-        item.name = item.name.replace(/^(.*)\[\]$/, '$1['+ (nameIndex[key]++) +']');
+        init_name = item.name.replace(/^(.*)\[\]$/, '$1['+ (nameIndex[key]++) +']');
       }
       
-      if(/^checkbox|radio$/.test(item.type) && !item.checked) return;      
-      field[item.name] = item.value;
+      if(/^checkbox|radio$/.test(item.type) && !item.checked) return;  //复选框和单选框未选中，不记录字段     
+      field[init_name || item.name] = item.value;
     });
     
     return field;
@@ -139,13 +140,21 @@ layui.define('layer', function(exports){
   //表单控件渲染
   Form.prototype.render = function(type, filter){
     var that = this
+    ,options = that.config
     ,elemForm = $(ELEM + function(){
       return filter ? ('[lay-filter="' + filter +'"]') : '';
     }())
     ,items = {
+      //输入框
+      input: function(){
+        var inputs = elemForm.find('input,textarea');
+        
+        //初始化全局的 autocomplete
+        options.autocomplete && inputs.attr('autocomplete', options.autocomplete);
+      }
       
       //下拉选择框
-      select: function(){
+      ,select: function(){
         var TIPS = '请选择', CLASS = 'layui-form-select', TITLE = 'layui-select-title'
         ,NONE = 'layui-select-none', initValue = '', thatInput
         ,selects = elemForm.find('select')
@@ -441,9 +450,9 @@ layui.define('layer', function(exports){
           var reElem = $(['<div class="'+ (isSearch ? '' : 'layui-unselect ') + CLASS 
           ,(disabled ? ' layui-select-disabled' : '') +'">'
             ,'<div class="'+ TITLE +'">'
-              ,('<input type="text" placeholder="'+ placeholder +'" '
-                +('value="'+ (value ? selected.html() : '') +'"') //默认值
-                +(isSearch ? '' : ' readonly') //是否开启搜索
+              ,('<input type="text" placeholder="'+ $.trim(placeholder) +'" '
+                +('value="'+ $.trim(value ? selected.html() : '') +'"') //默认值
+                +((!disabled && isSearch) ? '' : ' readonly') //是否开启搜索
                 +' class="layui-input'
                 +(isSearch ? '' : ' layui-unselect') 
               + (disabled ? (' ' + DISABLED) : '') +'">') //禁用状态
@@ -453,11 +462,11 @@ layui.define('layer', function(exports){
               var arr = [];
               layui.each(options, function(index, item){
                 if(index === 0 && !item.value){
-                  arr.push('<dd lay-value="" class="layui-select-tips">'+ (item.innerHTML || TIPS) +'</dd>');
+                  arr.push('<dd lay-value="" class="layui-select-tips">'+ $.trim(item.innerHTML || TIPS) +'</dd>');
                 } else if(item.tagName.toLowerCase() === 'optgroup'){
                   arr.push('<dt>'+ item.label +'</dt>'); 
                 } else {
-                  arr.push('<dd lay-value="'+ item.value +'" class="'+ (value === item.value ?  THIS : '') + (item.disabled ? (' '+DISABLED) : '') +'">'+ item.innerHTML +'</dd>');
+                  arr.push('<dd lay-value="'+ item.value +'" class="'+ (value === item.value ?  THIS : '') + (item.disabled ? (' '+DISABLED) : '') +'">'+ $.trim(item.innerHTML) +'</dd>');
                 }
               });
               arr.length === 0 && arr.push('<dd lay-value="" class="'+ DISABLED +'">没有选项</dd>');
@@ -517,7 +526,7 @@ layui.define('layer', function(exports){
           var hasRender = othis.next('.' + RE_CLASS[0])
           ,reElem = $(['<div class="layui-unselect '+ RE_CLASS[0]
             ,(check.checked ? (' '+ RE_CLASS[1]) : '') //选中状态
-            ,(disabled ? ' layui-checkbox-disbaled '+ DISABLED : '') //禁用状态
+            ,(disabled ? ' layui-checkbox-disabled '+ DISABLED : '') //禁用状态
             ,'"'
             ,(skin ? ' lay-skin="'+ skin +'"' : '') //风格
           ,'>'
@@ -586,13 +595,13 @@ layui.define('layer', function(exports){
           //替代元素
           var reElem = $(['<div class="layui-unselect '+ CLASS 
             ,(radio.checked ? (' '+CLASS+'ed') : '') //选中状态
-          ,(disabled ? ' layui-radio-disbaled '+DISABLED : '') +'">' //禁用状态
+          ,(disabled ? ' layui-radio-disabled '+DISABLED : '') +'">' //禁用状态
           ,'<i class="layui-anim layui-icon">'+ ICON[radio.checked ? 0 : 1] +'</i>'
           ,'<div>'+ function(){
             var title = radio.title || '';
             if(typeof othis.next().attr('lay-radio') === 'string'){
               title = othis.next().html();
-              othis.next().remove();
+              //othis.next().remove();
             }
             return title
           }() +'</div>'
@@ -604,7 +613,7 @@ layui.define('layer', function(exports){
       }
     };
     type ? (
-      items[type] ? items[type]() : hint.error('不支持的'+ type + '表单渲染')
+      items[type] ? items[type]() : hint.error('不支持的 "'+ type + '" 表单渲染')
     ) : layui.each(items, function(index, item){
       item();
     });
@@ -618,7 +627,7 @@ layui.define('layer', function(exports){
     ,DANGER = 'layui-form-danger' //警示样式
     ,field = {}  //字段集合
     ,button = $(this) //当前触发的按钮
-    ,elem = button.parents(ELEM) //当前所在表单域
+    ,elem = button.parents(ELEM).eq(0) //当前所在表单域
     ,verifyElem = elem.find('*[lay-verify]') //获取需要校验的元素
     ,formElem = button.parents('form')[0] //获取当前所在的 form 元素，如果存在的话
     ,filter = button.attr('lay-filter'); //获取过滤器
@@ -641,7 +650,10 @@ layui.define('layer', function(exports){
         
         //匹配验证规则
         if(verify[thisVer]){
-          var isTrue = isFn ? errorText = verify[thisVer](value, item) : !verify[thisVer][0].test(value);
+          var isTrue = isFn ? errorText = verify[thisVer](value, item) : !verify[thisVer][0].test(value)
+          //是否属于美化替换后的表单元素
+          ,isForm2Elem = item.tagName.toLowerCase() === 'select' || /^checkbox|radio$/.test(item.type);
+          
           errorText = errorText || verify[thisVer][1];
           
           if(thisVer === 'required'){
@@ -654,7 +666,7 @@ layui.define('layer', function(exports){
             if(verType === 'tips'){
               layer.tips(errorText, function(){
                 if(typeof othis.attr('lay-ignore') !== 'string'){
-                  if(item.tagName.toLowerCase() === 'select' || /^checkbox|radio$/.test(item.type)){
+                  if(isForm2Elem){
                     return othis.next();
                   }
                 }
@@ -662,15 +674,25 @@ layui.define('layer', function(exports){
               }(), {tips: 1});
             } else if(verType === 'alert') {
               layer.alert(errorText, {title: '提示', shadeClose: true});
-            } else {
+            } 
+            //如果返回的为字符或数字，则自动弹出默认提示框；否则由 verify 方法中处理提示
+            else if(/\bstring|number\b/.test(typeof errorText)){ 
               layer.msg(errorText, {icon: 5, shift: 6});
             }
             
             //非移动设备自动定位焦点
-            if(!device.android && !device.ios){
+            if(!device.mobile){
               setTimeout(function(){
-                item.focus(); 
+                (isForm2Elem ? othis.next().find('input') : item).focus();
               }, 7);
+            } else { //移动设备定位
+              $dom.scrollTop(function(){
+                try {
+                  return (isForm2Elem ? othis.next() : othis).offset().top - 15
+                } catch(e){
+                  return 0;
+                }
+              }());
             }
             
             othis.addClass(DANGER);
@@ -698,7 +720,9 @@ layui.define('layer', function(exports){
   var form = new Form()
   ,$dom = $(document), $win = $(window);
   
-  form.render();
+  $(function(){
+    form.render();
+  });
   
   //表单reset重置渲染
   $dom.on('reset', ELEM, function(){

src/modules/jquery.js

@@ -1,5 +1,5 @@
 /*!
- * jQuery JavaScript Library v1.12.3
+ * jQuery JavaScript Library v1.12.4
  * http://jquery.com/
  *
  * Includes Sizzle.js
@@ -9,7 +9,7 @@
  * Released under the MIT license
  * http://jquery.org/license
  *
- * Date: 2016-04-05T19:16Z
+ * Date: 2016-05-20T17:17Z
  */
 
 (function( global, factory ) {
@@ -65,7 +65,7 @@ var support = {};
 
 
 var
-	version = "1.12.3",
+	version = "1.12.4",
 
 	// Define a local copy of jQuery
 	jQuery = function( selector, context ) {
@@ -6672,6 +6672,7 @@ var documentElement = document.documentElement;
 		if ( reliableHiddenOffsetsVal ) {
 			div.style.display = "";
 			div.innerHTML = "<table><tr><td></td><td>t</td></tr></table>";
+			div.childNodes[ 0 ].style.borderCollapse = "separate";
 			contents = div.getElementsByTagName( "td" );
 			contents[ 0 ].style.cssText = "margin:0;border:0;padding:0;display:none";
 			reliableHiddenOffsetsVal = contents[ 0 ].offsetHeight === 0;
@@ -6996,19 +6997,6 @@ function getWidthOrHeight( elem, name, extra ) {
 		isBorderBox = support.boxSizing &&
 			jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
 
-	// Support: IE11 only
-	// In IE 11 fullscreen elements inside of an iframe have
-	// 100x too small dimensions (gh-1764).
-	if ( document.msFullscreenElement && window.top !== window ) {
-
-		// Support: IE11 only
-		// Running getBoundingClientRect on a disconnected node
-		// in IE throws an error.
-		if ( elem.getClientRects().length ) {
-			val = Math.round( elem.getBoundingClientRect()[ name ] * 100 );
-		}
-	}
-
 	// some non-html elements return undefined for offsetWidth, so check for null/undefined
 	// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
 	// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
@@ -9999,6 +9987,11 @@ function getDisplay( elem ) {
 }
 
 function filterHidden( elem ) {
+
+	// Disconnected elements are considered hidden
+	if ( !jQuery.contains( elem.ownerDocument || document, elem ) ) {
+		return true;
+	}
 	while ( elem && elem.nodeType === 1 ) {
 		if ( getDisplay( elem ) === "none" || elem.type === "hidden" ) {
 			return true;
@@ -10977,6 +10970,7 @@ jQuery.fn.andSelf = jQuery.fn.addBack;
 // https://github.com/jrburke/requirejs/wiki/Updating-existing-libraries#wiki-anon
 
 
+
 //将jQuery对象局部暴露给layui
 layui.define(function(exports){
   layui.$ = jQuery;

src/modules/lay.js

@@ -0,0 +1,418 @@
+
+/*! lay 基础 DOM 操作 | MIT Licensed */
+
+;!function(window){ //gulp build: lay-header
+  "use strict";
+  
+  var MOD_NAME = 'lay' //模块名
+  ,document = window.document
+  
+  //DOM查找
+  ,lay = function(selector){   
+    return new LAY(selector);
+  }
+  
+  //DOM构造器
+  ,LAY = function(selector){
+    var index = 0
+    ,nativeDOM = typeof selector === 'object' ? [selector] : (
+      this.selector = selector
+      ,document.querySelectorAll(selector || null)
+    );
+    for(; index < nativeDOM.length; index++){
+      this.push(nativeDOM[index]);
+    }
+  };
+  
+  /*
+    lay 对象操作
+  */
+  
+  LAY.prototype = [];
+  LAY.prototype.constructor = LAY;
+  
+  //普通对象深度扩展
+  lay.extend = function(){
+    var ai = 1, args = arguments
+    ,clone = function(target, obj){
+      target = target || (layui._typeof(obj) === 'array' ? [] : {}); //目标对象
+      for(var i in obj){
+        //如果值为普通对象，则进入递归，继续深度合并
+        target[i] = (obj[i] && obj[i].constructor === Object)
+          ? clone(target[i], obj[i])
+        : obj[i];
+      }
+      return target;
+    }
+
+    args[0] = typeof args[0] === 'object' ? args[0] : {};
+
+    for(; ai < args.length; ai++){
+      if(typeof args[ai] === 'object'){
+        clone(args[0], args[ai]);
+      }
+    }
+    return args[0];
+  };
+  
+  //lay 模块版本
+  lay.v = '1.0.8';
+  
+  //ie版本
+  lay.ie = function(){
+    var agent = navigator.userAgent.toLowerCase();
+    return (!!window.ActiveXObject || "ActiveXObject" in window) ? (
+      (agent.match(/msie\s(\d+)/) || [])[1] || '11' //由于 ie11 并没有 msie 的标识
+    ) : false;
+  }();
+  
+  
+  
+  
+  
+  
+  /** 
+   * 获取 layui 常见方法，以便用于组件单独版
+   */
+  
+  lay.layui = layui || {};
+  lay.getPath = layui.cache.dir; //获取当前 JS 所在目录
+  lay.stope = layui.stope; //中止冒泡
+  lay.each = function(){ //遍历
+    layui.each.apply(layui, arguments);
+    return this;
+  };
+  
+  
+  
+  
+  
+  //数字前置补零
+  lay.digit = function(num, length, end){
+    var str = '';
+    num = String(num);
+    length = length || 2;
+    for(var i = num.length; i < length; i++){
+      str += '0';
+    }
+    return num < Math.pow(10, length) ? str + (num|0) : num;
+  };
+  
+  //创建元素
+  lay.elem = function(elemName, attr){
+    var elem = document.createElement(elemName);
+    lay.each(attr || {}, function(key, value){
+      elem.setAttribute(key, value);
+    });
+    return elem;
+  };
+
+  //当前页面是否存在滚动条
+  lay.hasScrollbar = function(){
+    return document.body.scrollHeight > (window.innerHeight || document.documentElement.clientHeight);
+  };
+  
+  //元素定位
+  lay.position = function(elem, elemView, obj){
+    if(!elemView) return;
+    obj = obj || {};
+    
+    //如果绑定的是 document 或 body 元素，则直接获取鼠标坐标
+    if(elem === document || elem === lay('body')[0]){
+      obj.clickType = 'right';
+    }
+
+    //绑定绑定元素的坐标
+    var rect = obj.clickType === 'right' ? function(){
+      var e = obj.e || window.event || {};
+      return {
+        left: e.clientX
+        ,top: e.clientY
+        ,right: e.clientX
+        ,bottom: e.clientY
+      }
+    }() : elem.getBoundingClientRect()
+    ,elemWidth = elemView.offsetWidth //控件的宽度
+    ,elemHeight = elemView.offsetHeight //控件的高度
+    
+    //滚动条高度
+    ,scrollArea = function(type){
+      type = type ? 'scrollLeft' : 'scrollTop';
+      return document.body[type] | document.documentElement[type];
+    }
+    
+    //窗口宽高
+    ,winArea = function(type){
+      return document.documentElement[type ? 'clientWidth' : 'clientHeight']
+    }, margin = 5, left = rect.left, top = rect.bottom;
+    
+    //相对元素居中
+    if(obj.align === 'center'){
+      left = left - (elemWidth - elem.offsetWidth)/2;
+    } else if(obj.align === 'right'){
+      left = left - elemWidth + elem.offsetWidth;
+    }
+
+    //判断右侧是否超出边界
+    if(left + elemWidth + margin > winArea('width')){
+      left = winArea('width') - elemWidth - margin; //如果超出右侧，则将面板向右靠齐
+    }
+    //左侧是否超出边界
+    if(left < margin) left = margin;
+    
+    //判断底部和顶部是否超出边界
+    if(top + elemHeight + margin > winArea()){
+      //优先顶部是否有足够区域显示完全
+      if(rect.top > elemHeight + margin){
+        top = rect.top - elemHeight - margin*2; //顶部有足够的区域显示
+      } else {
+        //如果面板是鼠标右键弹出，且顶部没有足够区域显示，则将面板向底部靠齐
+        if(obj.clickType === 'right'){
+          top = winArea() - elemHeight - margin*2;
+          if(top < 0) top = 0; //不能溢出窗口顶部
+        }
+      }
+    }
+    
+    //定位类型
+    var position = obj.position;
+    if(position) elemView.style.position = position;
+    
+    //设置坐标
+    elemView.style.left = left + (position === 'fixed' ? 0 : scrollArea(1)) + 'px';
+    elemView.style.top = top + (position === 'fixed' ? 0 : scrollArea()) + 'px';
+
+    //防止页面无滚动条时，又因为弹出面板而出现滚动条导致的坐标计算偏差
+    if(!lay.hasScrollbar()){
+      var rect1 = elemView.getBoundingClientRect();
+      //如果弹出面板的溢出窗口底部，则表示将出现滚动条，此时需要重新计算坐标
+      if(!obj.SYSTEM_RELOAD && (rect1.bottom + margin) > winArea()){
+        obj.SYSTEM_RELOAD = true;
+        setTimeout(function(){
+          lay.position(elem, elemView, obj);
+        }, 50);
+      }
+    }
+  };
+  
+  //获取元素上的参数配置上
+  lay.options = function(elem, attr){
+    var othis = lay(elem)
+    ,attrName = attr || 'lay-options';
+    try {
+      return new Function('return '+ (othis.attr(attrName) || '{}'))();
+    } catch(ev) {
+      hint.error('parseerror：'+ ev, 'error');
+      return {};
+    }
+  };
+  
+  //元素是否属于顶级元素（document 或 body）
+  lay.isTopElem = function(elem){
+    var topElems = [document, lay('body')[0]]
+    ,matched = false;
+    lay.each(topElems, function(index, item){
+      if(item === elem){
+        return matched = true
+      }
+    });
+    return matched;
+  };
+  
+  //追加字符
+  LAY.addStr = function(str, new_str){
+    str = str.replace(/\s+/, ' ');
+    new_str = new_str.replace(/\s+/, ' ').split(' ');
+    lay.each(new_str, function(ii, item){
+      if(!new RegExp('\\b'+ item + '\\b').test(str)){
+        str = str + ' ' + item;
+      }
+    });
+    return str.replace(/^\s|\s$/, '');
+  };
+  
+  //移除值
+  LAY.removeStr = function(str, new_str){
+    str = str.replace(/\s+/, ' ');
+    new_str = new_str.replace(/\s+/, ' ').split(' ');
+    lay.each(new_str, function(ii, item){
+      var exp = new RegExp('\\b'+ item + '\\b')
+      if(exp.test(str)){
+        str = str.replace(exp, '');
+      }
+    });
+    return str.replace(/\s+/, ' ').replace(/^\s|\s$/, '');
+  };
+  
+  //查找子元素
+  LAY.prototype.find = function(selector){
+    var that = this;
+    var index = 0, arr = []
+    ,isObject = typeof selector === 'object';
+    
+    this.each(function(i, item){
+      var nativeDOM = isObject ? item.contains(selector) : item.querySelectorAll(selector || null);
+      for(; index < nativeDOM.length; index++){
+        arr.push(nativeDOM[index]);
+      }
+      that.shift();
+    });
+    
+    if(!isObject){
+      that.selector =  (that.selector ? that.selector + ' ' : '') + selector
+    }
+    
+    lay.each(arr, function(i, item){
+      that.push(item);
+    });
+    
+    return that;
+  };
+  
+  //DOM遍历
+  LAY.prototype.each = function(fn){
+    return lay.each.call(this, this, fn);
+  };
+  
+  //添加css类
+  LAY.prototype.addClass = function(className, type){
+    return this.each(function(index, item){
+      item.className = LAY[type ? 'removeStr' : 'addStr'](item.className, className)
+    });
+  };
+  
+  //移除 css 类
+  LAY.prototype.removeClass = function(className){
+    return this.addClass(className, true);
+  };
+  
+  //是否包含 css 类
+  LAY.prototype.hasClass = function(className){
+    var has = false;
+    this.each(function(index, item){
+      if(new RegExp('\\b'+ className +'\\b').test(item.className)){
+        has = true;
+      }
+    });
+    return has;
+  };
+  
+  //添加或获取 css style
+  LAY.prototype.css = function(key, value){
+    var that = this
+    ,parseValue = function(v){
+      return isNaN(v) ? v : (v +'px');
+    };
+    return (typeof key === 'string' && value === undefined) ? function(){
+      if(that.length > 0) return that[0].style[key];
+    }() : that.each(function(index, item){
+      typeof key === 'object' ? lay.each(key, function(thisKey, thisValue){
+        item.style[thisKey] = parseValue(thisValue);
+      }) : item.style[key] = parseValue(value);
+    });   
+  };
+  
+  //添加或获取宽度
+  LAY.prototype.width = function(value){
+    var that = this;
+    return value === undefined ? function(){
+      if(that.length > 0) return that[0].offsetWidth; //此处还需做兼容
+    }() : that.each(function(index, item){
+      that.css('width', value);
+    });   
+  };
+  
+  //添加或获取高度
+  LAY.prototype.height = function(value){
+    var that = this;
+    return value === undefined ? function(){
+      if(that.length > 0) return that[0].offsetHeight; //此处还需做兼容
+    }() : that.each(function(index, item){
+      that.css('height', value);
+    });   
+  };
+  
+  //添加或获取属性
+  LAY.prototype.attr = function(key, value){
+    var that = this;
+    return value === undefined ? function(){
+      if(that.length > 0) return that[0].getAttribute(key);
+    }() : that.each(function(index, item){
+      item.setAttribute(key, value);
+    });   
+  };
+  
+  //移除属性
+  LAY.prototype.removeAttr = function(key){
+    return this.each(function(index, item){
+      item.removeAttribute(key);
+    });
+  };
+  
+  //设置或获取 HTML 内容
+  LAY.prototype.html = function(html){
+    var that = this;
+    return html === undefined ? function(){
+      if(that.length > 0) return that[0].innerHTML;
+    }() : this.each(function(index, item){
+      item.innerHTML = html;
+    });
+  };
+  
+  //设置或获取值
+  LAY.prototype.val = function(value){
+    var that = this;
+    return value === undefined ? function(){
+      if(that.length > 0) return that[0].value;
+    }() : this.each(function(index, item){
+        item.value = value;
+    });
+  };
+  
+  //追加内容
+  LAY.prototype.append = function(elem){
+    return this.each(function(index, item){
+      typeof elem === 'object' 
+        ? item.appendChild(elem)
+      :  item.innerHTML = item.innerHTML + elem;
+    });
+  };
+  
+  //移除内容
+  LAY.prototype.remove = function(elem){
+    return this.each(function(index, item){
+      elem ? item.removeChild(elem) : item.parentNode.removeChild(item);
+    });
+  };
+  
+  //事件绑定
+  LAY.prototype.on = function(eventName, fn){
+    return this.each(function(index, item){
+      item.attachEvent ? item.attachEvent('on' + eventName, function(e){
+        e.target = e.srcElement;
+        fn.call(item, e);
+      }) : item.addEventListener(eventName, fn, false);
+    });
+  };
+  
+  //解除事件
+  LAY.prototype.off = function(eventName, fn){
+    return this.each(function(index, item){
+      item.detachEvent 
+        ? item.detachEvent('on'+ eventName, fn)  
+      : item.removeEventListener(eventName, fn, false);
+    });
+  };
+  
+  //暴露 lay 到全局作用域
+  window.lay = lay;
+  
+  //如果在 layui 体系中
+  if(window.layui && layui.define){
+    layui.define(function(exports){ //layui 加载
+      exports(MOD_NAME, lay);
+    });
+  }
+  
+}(window, window.document);
+