Merge pull request #1120 from layui/2.x

优化 layer/table/colorpicker 组件

examples/layer.html

@@ -28,6 +28,7 @@ body{padding: 100px;}
   <button class="layui-btn" lay-on="test4">Tips</button>
   <button class="layui-btn" lay-on="test7">Prompt</button>
   <button class="layui-btn" lay-on="test8">Tab</button>
+  <button class="layui-btn" lay-on="test9">Photo</button>
   <button class="layui-btn" lay-on="testTime">自动关闭</button>
   <a href="https://layui.gitee.io/v2/demo/layer.html" target="_blank" class="layui-btn">更多例子</a>
 </div>
@@ -40,7 +41,7 @@ body{padding: 100px;}
 
 <div class="layui-list">
   <ul class="layui-row" id="photos">
-    <li class="list"><img src="https://unpkg.com/outeres/demo/1.jpg"></li>
+    <li class="list"><img src="https://unpkg.com/outeres/demo/1.jpg" alt="123"></li>
     <li class="list"><img src="https://unpkg.com/outeres/demo/2.jpg"></li>
   </ul>
 </div>
@@ -129,7 +130,7 @@ layui.use(['layer', 'util'], function(layer, util){
       });
     }
     ,test3: function(){
-      !1 ? layer.msg('一个常用消息框')
+      !0 ? layer.msg('一个常用消息框')
       : layer.msg('一个常用消息框',{closeBtn: 0,time: 0, icon: 16});
     }
     ,test4: function(){
@@ -162,8 +163,8 @@ layui.use(['layer', 'util'], function(layer, util){
       });
     }
     ,testLoading: function(){
-      layer.load(2, {
+      layer.load(0, {
-        //time: 5*1000
+        time: 5*1000
         //content: '123'
       });
     }
@@ -191,6 +192,16 @@ layui.use(['layer', 'util'], function(layer, util){
         }]
       });
     }
+    ,test9: function(){
+      layer.photos({
+        photos: {
+          "data": [{
+            "src": "https://unpkg.com/outeres/demo/layer.png"
+          }]
+        },
+        hideFooter: true  // 是否隐藏图片底部栏（v2.8.0 新增）
+      });
+    }
     ,testTime: function(){
       layer.alert('你好么，体验者。<br>在标题栏显示自动关闭倒计秒数', {
         time: 5*1000
@@ -209,18 +220,11 @@ layui.use(['layer', 'util'], function(layer, util){
     }
   });
   
-  //相册层
+  // 相册层
   layer.photos({
     photos: '#photos' //$('#photos')
   });
   
-  $('#photos li-').each(function(i, e){
-    layer.photos({
-      photos: $(e)
-    });
-  });
-  
-  
   //动态追加
   $('#photos').append('<li class="list"><img src="https://unpkg.com/outeres/demo/3.jpg"></li>');
  

src/css/layui.css

@@ -1307,11 +1307,11 @@ body .layui-util-face  .layui-layer-content{padding:0; background-color:#fff; co
 .layui-rate[readonly] li i:hover{cursor: default; transform: scale(1);}
 
 /** 颜色选择器 **/
-.layui-colorpicker{width: 26px; height: 26px; border: 1px solid #eee; padding: 5px; border-radius: 2px; line-height: 24px; display: inline-block; cursor: pointer; transition: all .3s; -webkit-transition: all .3s;}
+.layui-colorpicker{width: 38px; height: 38px; border: 1px solid #eee; padding: 5px; border-radius: 2px; line-height: 24px; display: inline-block; cursor: pointer; transition: all .3s; -webkit-transition: all .3s; box-sizing: border-box;}
 .layui-colorpicker:hover{border-color: #d2d2d2;}
-.layui-colorpicker.layui-colorpicker-lg{width: 34px; height: 34px; line-height: 32px;}
+.layui-colorpicker.layui-colorpicker-lg{width: 44px; height: 44px; line-height: 30px;}
-.layui-colorpicker.layui-colorpicker-sm{width: 24px; height: 24px; line-height: 22px;}
+.layui-colorpicker.layui-colorpicker-sm{width: 30px; height: 30px; line-height: 20px; padding: 3px;}
-.layui-colorpicker.layui-colorpicker-xs{width: 22px; height: 22px; line-height: 20px;}
+.layui-colorpicker.layui-colorpicker-xs{width: 22px; height: 22px; line-height: 16px; padding: 1px;}
 
 .layui-colorpicker-trigger-bgcolor{display: block; background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAIAAADZF8uwAAAAGUlEQVQYV2M4gwH+YwCGIasIUwhT25BVBADtzYNYrHvv4gAAAABJRU5ErkJggg==);  border-radius: 2px;}
 .layui-colorpicker-trigger-span{display: block; height: 100%; box-sizing: border-box; border: 1px solid rgba(0,0,0,.15); border-radius: 2px; text-align: center;}

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

@@ -1,16 +0,0 @@
-/** 图标字体 **/
-@font-face {font-family: 'laydate-icon';
-  src: url('./font/iconfont.eot');
-  src: url('./font/iconfont.eot#iefix') format('embedded-opentype'),
-  url('./font/iconfont.svg#iconfont') format('svg'),
-  url('./font/iconfont.woff') format('woff'),
-  url('./font/iconfont.ttf') format('truetype');
-}
-                    
-.laydate-icon{
-  font-family:"laydate-icon" !important;
-  font-size: 16px;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}

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

@@ -1,156 +0,0 @@
-/**
- 
- @Name: laydata
- 
- **/
- 
-
-html #layuicss-laydate{display: none; position: absolute; width: 1989px;}
-
-/* 初始化 */
-.layui-laydate *{margin: 0; padding: 0;}
-
-/* 主体结构 */
-.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.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;}
-
-/* 微微往下滑入 */
-@keyframes laydate-downbit {
-  0% {opacity: 0.3; transform: translate3d(0, -5px, 0);}
-  100% {opacity: 1; transform: translate3d(0, 0, 0);}
-}
-
-.layui-laydate{animation-name: laydate-downbit;}
-.layui-laydate-static{ position: relative; z-index: 0; display: inline-block; margin: 0; -webkit-animation: none; animation: none;}
-
-/* 展开年月列表时 */
-.laydate-ym-show .laydate-prev-m,
-.laydate-ym-show .laydate-next-m{display: none !important;}
-.laydate-ym-show .laydate-prev-y,
-.laydate-ym-show .laydate-next-y{display: inline-block !important;}
-.laydate-ym-show .laydate-set-ym span[lay-type="month"]{display: none !important;}
-
-/* 展开时间列表时 */
-.laydate-time-show .layui-laydate-header .layui-icon,
-.laydate-time-show .laydate-set-ym span[lay-type="year"],
-.laydate-time-show .laydate-set-ym span[lay-type="month"]{display: none !important;}
-
-/* 头部结构 */
-.layui-laydate-header{position: relative; line-height:30px; padding: 10px 70px 5px;}
-.layui-laydate-header *{display: inline-block; vertical-align: bottom;}
-.layui-laydate-header i{position: absolute; top: 10px; padding: 0 5px; color: #999; font-size: 18px; cursor: pointer;}
-.layui-laydate-header i.laydate-prev-y{left: 15px;}
-.layui-laydate-header i.laydate-prev-m{left: 45px;}
-.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 10px; cursor: pointer;}
-.laydate-time-text{cursor: default !important;}
-
-/* 主体结构 */
-.layui-laydate-content{position: relative; padding: 10px; -moz-user-select: none; -webkit-user-select: none; -ms-user-select: none;}
-.layui-laydate-content table{border-collapse: collapse; border-spacing: 0;}
-.layui-laydate-content th,
-.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%; 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%;}
-.laydate-day-holidays:before{position: absolute; left: 0; top: 0; font-size: 12px; transform: scale(.7);}
-.laydate-day-holidays:before{content:'\4F11'; color: #FF5722;}
-.laydate-day-holidays[type="work"]:before{content:'\73ED'; color: inherit;}
-.layui-laydate .layui-this .laydate-day-holidays:before{color: #fff;}
-
-/* 底部结构 */
-.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{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;}
-.layui-laydate-list>li{position: relative; display: inline-block; width: 33.3%; height: 36px; line-height: 36px; margin: 3px 0; vertical-align: middle; text-align: center; cursor: pointer;}
-.laydate-month-list>li{width: 25%; margin: 17px 0;}
-.laydate-time-list{}
-.laydate-time-list>li{height: 100%; margin: 0; line-height: normal; cursor: default;}
-.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; 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;}
-
-
-/* 双日历 */
-.layui-laydate-range{width: 546px;}
-.layui-laydate-range .layui-laydate-main{display: inline-block; vertical-align: middle;}
-.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;}
-
-
-/* 默认简约主题 */
-.layui-laydate, .layui-laydate-hint{border: 1px solid #d2d2d2; box-shadow: 0 2px 4px rgba(0,0,0,.12); background-color: #fff; color: #666;}
-.layui-laydate-header{border-bottom: 1px solid #e2e2e2;}
-.layui-laydate-header i:hover,
-.layui-laydate-header span:hover{color: #5FB878;}
-.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: #B5FFF8;}
-.laydate-selected:hover{background-color: #00F7DE !important;}
-.layui-laydate-content td:hover,
-.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;}
-.layui-laydate-content .laydate-day-prev,
-.layui-laydate-content .laydate-day-next{color: #d2d2d2;}
-.laydate-selected.laydate-day-prev,
-.laydate-selected.laydate-day-next{background-color: #f8f8f8 !important;}
-.layui-laydate-footer{border-top: 1px solid #e2e2e2;}
-.layui-laydate-hint{color: #FF5722;}
-.laydate-day-mark::after{background-color: #5FB878;}
-.layui-laydate-content td.layui-this .laydate-day-mark::after{display: none;}
-.layui-laydate-footer span[lay-type="date"]{color: #5FB878;}
-.layui-laydate .layui-this{background-color: #009688 !important; color: #fff !important;}
-.layui-laydate .laydate-disabled,
-.layui-laydate .laydate-disabled:hover{background:none !important; color: #d2d2d2 !important; cursor: not-allowed !important; -moz-user-select: none; -webkit-user-select: none; -ms-user-select: none;}
-
-/* 墨绿/自定义背景色主题 */
-.laydate-theme-molv{border: none;}
-.laydate-theme-molv.layui-laydate-range{width: 548px}
-.laydate-theme-molv .layui-laydate-main{width: 274px;}
-.laydate-theme-molv .layui-laydate-header{border: none; background-color: #009688;}
-.laydate-theme-molv .layui-laydate-header i,
-.laydate-theme-molv .layui-laydate-header span{color: #f6f6f6;}
-.laydate-theme-molv .layui-laydate-header i:hover,
-.laydate-theme-molv .layui-laydate-header span:hover{color: #fff;}
-.laydate-theme-molv .layui-laydate-content{border: 1px solid #e2e2e2; border-top: none; border-bottom: none;}
-.laydate-theme-molv .laydate-main-list-1 .layui-laydate-content{border-left: none;}
-.laydate-theme-molv .layui-laydate-footer{border: 1px solid #e2e2e2;}
-
-/* 格子主题 */
-.laydate-theme-grid .layui-laydate-content td,
-.laydate-theme-grid .layui-laydate-content thead,
-.laydate-theme-grid .laydate-year-list>li,
-.laydate-theme-grid .laydate-month-list>li{border: 1px solid #e2e2e2;}
-.laydate-theme-grid .laydate-selected,
-.laydate-theme-grid .laydate-selected:hover{background-color: #f2f2f2 !important; color: #009688 !important;}
-.laydate-theme-grid .laydate-selected.laydate-day-prev,
-.laydate-theme-grid .laydate-selected.laydate-day-next{color: #d2d2d2 !important;}
-.laydate-theme-grid .laydate-year-list,
-.laydate-theme-grid .laydate-month-list{margin: 1px 0 0 1px;}
-.laydate-theme-grid .laydate-year-list>li,
-.laydate-theme-grid .laydate-month-list>li{margin: 0 -1px -1px 0;}
-.laydate-theme-grid .laydate-year-list>li{height: 43px; line-height: 43px;}
-.laydate-theme-grid .laydate-month-list>li{height: 71px; line-height: 71px;}
-

src/css/modules/layer.css

@@ -99,7 +99,7 @@ html #layuicss-layer{display: none; position: absolute; width: 1989px;}
 .layui-layer-loading-2{position: relative; height: 38px;}
 .layui-layer-loading-2:before,
 .layui-layer-loading-2:after{content: ''; position: absolute; left: 50%; top: 50%; width: 38px; height: 38px; margin: -19px 0 0 -19px; border-radius: 50%; border: 3px solid #d2d2d2; box-sizing: border-box;}
-.layui-layer-loading-2:after{border-color: transparent; border-left-color: #1E9FFF; border-right-color: #1E9FFF;}
+.layui-layer-loading-2:after{border-color: transparent; border-left-color: #1E9FFF;}
 
 
 .layui-layer-tips{background: none; box-shadow:none; border:none;}
@@ -157,10 +157,10 @@ html #layuicss-layer{display: none; position: absolute; width: 1989px;}
 .layui-layer-imgnext:hover{color: #959595;}
 .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 *{display:inline-block; *display:inline; *zoom:1; vertical-align:top; padding: 0 5px; font-size:12px; color: #fff;}
-.layui-layer-imgtit a{max-width:65%;  text-overflow: ellipsis; overflow: hidden; white-space: nowrap; color:#fff;}
+.layui-layer-imgtit h3{max-width:65%; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; font-weight: 300;}
-.layui-layer-imgtit a:hover{color:#fff; text-decoration:underline;}
+.layui-layer-imgtit a:hover{color: #fff; text-decoration: underline;}
-.layui-layer-imgtit em{padding-left:10px; font-style: normal;}
+.layui-layer-imgtit em{font-style: normal;}
 
 /* 关闭动画 */
 @-webkit-keyframes layer-bounceOut {

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

@@ -1,180 +0,0 @@
-/**
- 
- @Name: layer
- 
- **/
-
-/* *html{background-image: url(about:blank); background-attachment: fixed;} */
-html #layuicss-layer{display: none; position: absolute; width: 1989px;}
-
-/* common */
-.layui-layer-shade, .layui-layer{position:fixed; _position:absolute; pointer-events: auto;}
-.layui-layer-shade{top:0; left:0; width:100%; height:100%; _height:expression(document.body.offsetHeight+"px");}
-.layui-layer{-webkit-overflow-scrolling: touch;}
-.layui-layer{top:150px; left: 0; margin:0; padding:0; background-color:#fff; -webkit-background-clip: content; border-radius: 2px; box-shadow: 1px 1px 50px rgba(0,0,0,.3);}
-.layui-layer-close{position:absolute;}
-.layui-layer-content{position:relative;}
-.layui-layer-border{border: 1px solid #B2B2B2; border: 1px solid rgba(0,0,0,.1); box-shadow: 1px 1px 5px rgba(0,0,0,.2);}
-.layui-layer-load{background:url(loading-1.gif) #eee center center no-repeat;}
-.layui-layer-ico{ background:url(icon.png) no-repeat;}
-.layui-layer-dialog .layui-layer-ico,
-.layui-layer-setwin a,
-.layui-layer-btn a{display:inline-block; *display:inline; *zoom:1; vertical-align:top;}
-
-.layui-layer-move{display: none; position: fixed; *position: absolute; left: 0px; top: 0px; width: 100%; height: 100%; cursor: move; opacity: 0; filter:alpha(opacity=0); background-color: #fff; z-index: 2147483647;}
-.layui-layer-resize{position: absolute; width: 15px; height: 15px; right: 0; bottom: 0; cursor: se-resize;}
-
-/* 动画 */
-.layer-anim{-webkit-animation-fill-mode: both; animation-fill-mode: both; -webkit-animation-duration:.3s; animation-duration:.3s;}
-
-@-webkit-keyframes layer-bounceIn { /* 默认 */
-	0% {opacity: 0; -webkit-transform: scale(.5); transform: scale(.5)}
-	100% {opacity: 1; -webkit-transform: scale(1); transform: scale(1)}
-}
-@keyframes layer-bounceIn {
-	0% {opacity: 0; -webkit-transform: scale(.5); -ms-transform: scale(.5); transform: scale(.5)}
-	100% {opacity: 1; -webkit-transform: scale(1); -ms-transform: scale(1); transform: scale(1)}
-}
-.layer-anim-00{-webkit-animation-name: layer-bounceIn;animation-name: layer-bounceIn}
-
-@-webkit-keyframes layer-zoomInDown{0%{opacity:0;-webkit-transform:scale(.1) translateY(-2000px);transform:scale(.1) translateY(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateY(60px);transform:scale(.475) translateY(60px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}@keyframes layer-zoomInDown{0%{opacity:0;-webkit-transform:scale(.1) translateY(-2000px);-ms-transform:scale(.1) translateY(-2000px);transform:scale(.1) translateY(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateY(60px);-ms-transform:scale(.475) translateY(60px);transform:scale(.475) translateY(60px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}.layer-anim-01{-webkit-animation-name:layer-zoomInDown;animation-name:layer-zoomInDown}
-
-@-webkit-keyframes layer-fadeInUpBig{0%{opacity:0;-webkit-transform:translateY(2000px);transform:translateY(2000px)}100%{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}}@keyframes layer-fadeInUpBig{0%{opacity:0;-webkit-transform:translateY(2000px);-ms-transform:translateY(2000px);transform:translateY(2000px)}100%{opacity:1;-webkit-transform:translateY(0);-ms-transform:translateY(0);transform:translateY(0)}}.layer-anim-02{-webkit-animation-name:layer-fadeInUpBig;animation-name:layer-fadeInUpBig}
-
-@-webkit-keyframes layer-zoomInLeft{0%{opacity:0;-webkit-transform:scale(.1) translateX(-2000px);transform:scale(.1) translateX(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateX(48px);transform:scale(.475) translateX(48px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}@keyframes layer-zoomInLeft{0%{opacity:0;-webkit-transform:scale(.1) translateX(-2000px);-ms-transform:scale(.1) translateX(-2000px);transform:scale(.1) translateX(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateX(48px);-ms-transform:scale(.475) translateX(48px);transform:scale(.475) translateX(48px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}.layer-anim-03{-webkit-animation-name:layer-zoomInLeft;animation-name:layer-zoomInLeft}
-
-@-webkit-keyframes layer-rollIn{0%{opacity:0;-webkit-transform:translateX(-100%) rotate(-120deg);transform:translateX(-100%) rotate(-120deg)}100%{opacity:1;-webkit-transform:translateX(0px) rotate(0deg);transform:translateX(0px) rotate(0deg)}}@keyframes layer-rollIn{0%{opacity:0;-webkit-transform:translateX(-100%) rotate(-120deg);-ms-transform:translateX(-100%) rotate(-120deg);transform:translateX(-100%) rotate(-120deg)}100%{opacity:1;-webkit-transform:translateX(0px) rotate(0deg);-ms-transform:translateX(0px) rotate(0deg);transform:translateX(0px) rotate(0deg)}}.layer-anim-04{-webkit-animation-name:layer-rollIn;animation-name:layer-rollIn}
-
-@keyframes layer-fadeIn{0%{opacity:0}100%{opacity:1}}.layer-anim-05{-webkit-animation-name:layer-fadeIn;animation-name:layer-fadeIn}
-
-@-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: 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; }
-.layui-layer-setwin .layui-layer-max{background-position:-32px -40px;}
-.layui-layer-setwin .layui-layer-max:hover{background-position:-16px -40px;}
-.layui-layer-setwin .layui-layer-maxmin{background-position:-65px -40px;}
-.layui-layer-setwin .layui-layer-maxmin:hover{background-position:-49px -40px;}
-.layui-layer-setwin .layui-layer-close1{background-position: 1px -40px; cursor: pointer;}
-.layui-layer-setwin .layui-layer-close1:hover{opacity:0.7;}
-.layui-layer-setwin .layui-layer-close2{position:absolute; right:-28px; top:-28px; width:30px; height:30px;  margin-left:0; background-position:-149px -31px; *right:-18px; _display:none;}
-.layui-layer-setwin .layui-layer-close2:hover{ background-position:-180px -31px;}
-
-/* 按钮栏 */
-.layui-layer-btn{text-align: right; padding: 0 15px 12px; pointer-events: auto; user-select: none; -webkit-user-select: none;}
-.layui-layer-btn a{height: 28px; line-height: 28px; margin: 5px 5px 0; padding: 0 15px; border: 1px solid #dedede; background-color:#fff; color: #333; border-radius: 2px; font-weight:400; cursor:pointer; text-decoration: none;}
-.layui-layer-btn a:hover{opacity: 0.9; text-decoration: none;}
-.layui-layer-btn a:active{opacity: 0.8;}
-.layui-layer-btn .layui-layer-btn0{border-color: #1E9FFF; background-color: #1E9FFF; color:#fff;}
-.layui-layer-btn-l{text-align: left;}
-.layui-layer-btn-c{text-align: center;}
-
-/* 定制化 */
-.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 }
-.layui-layer-ico2{background-position:-60px 0;}
-.layui-layer-ico3{background-position:-90px 0;}
-.layui-layer-ico4{background-position:-120px 0;}
-.layui-layer-ico5{background-position:-150px 0;}
-.layui-layer-ico6{background-position:-180px 0;}
-.layui-layer-rim{border:6px solid #8D8D8D; border:6px solid rgba(0,0,0,.3); border-radius:5px; box-shadow: none;}
-.layui-layer-msg{min-width:180px; border:1px solid #D3D4D3; box-shadow: none;}
-.layui-layer-hui{min-width:100px;  background-color: #000; filter:alpha(opacity=60); background-color: rgba(0,0,0,0.6); color: #fff; border:none;}
-.layui-layer-hui .layui-layer-content{padding:12px 25px; text-align:center;}
-.layui-layer-dialog .layui-layer-padding{padding: 20px 20px 20px 55px; text-align: left;}
-.layui-layer-page .layui-layer-content{position:relative; overflow:auto;}
-.layui-layer-page .layui-layer-btn,.layui-layer-iframe .layui-layer-btn{padding-top:10px;}
-.layui-layer-nobg{background:none;}
-.layui-layer-iframe iframe{display: block; width: 100%;}
-
-.layui-layer-loading{border-radius:100%; background:none;  box-shadow:none;  border:none;}
-.layui-layer-loading .layui-layer-content{width:60px; height:24px; background:url(loading-0.gif) no-repeat;}
-.layui-layer-loading .layui-layer-loading1{width:37px; height:37px; background:url(loading-1.gif) no-repeat;}
-.layui-layer-loading .layui-layer-loading2, .layui-layer-ico16{width:32px; height:32px; background:url(loading-2.gif) no-repeat;}
-.layui-layer-tips{background: none; box-shadow:none; border:none;}
-.layui-layer-tips .layui-layer-content{position: relative; line-height: 22px; min-width: 12px; padding: 8px 15px; font-size: 12px; _float:left; border-radius: 2px; box-shadow: 1px 1px 3px rgba(0,0,0,.2); background-color: #000; color: #fff;}
-.layui-layer-tips .layui-layer-close{right:-2px; top:-1px;}
-.layui-layer-tips i.layui-layer-TipsG{ position:absolute;  width:0; height:0; border-width:8px; border-color:transparent; border-style:dashed; *overflow:hidden;}
-.layui-layer-tips i.layui-layer-TipsT, .layui-layer-tips i.layui-layer-TipsB{left:5px; border-right-style:solid; border-right-color: #000;}
-.layui-layer-tips i.layui-layer-TipsT{bottom:-8px;}
-.layui-layer-tips i.layui-layer-TipsB{top:-8px;}
-.layui-layer-tips i.layui-layer-TipsR, .layui-layer-tips i.layui-layer-TipsL{top: 5px; border-bottom-style:solid; border-bottom-color: #000;}
-.layui-layer-tips i.layui-layer-TipsR{left:-8px;}
-.layui-layer-tips i.layui-layer-TipsL{right:-8px;}
-
-/* skin */
-.layui-layer-lan[type="dialog"]{min-width:280px;}
-.layui-layer-lan .layui-layer-title{background:#4476A7; color:#fff; border: none;}
-.layui-layer-lan .layui-layer-btn{padding: 5px 10px 10px; text-align: right; border-top:1px solid #E9E7E7}
-.layui-layer-lan .layui-layer-btn a{background: #fff; border-color: #E9E7E7; color: #333;}
-.layui-layer-lan .layui-layer-btn .layui-layer-btn1{background:#C9C5C5;}
-.layui-layer-molv .layui-layer-title{background: #009f95; color:#fff; border: none;}
-.layui-layer-molv .layui-layer-btn a{background: #009f95; border-color: #009f95;}
-.layui-layer-molv .layui-layer-btn .layui-layer-btn1{background:#92B8B1;}
-
-
-/**
- 
- @Name: layer拓展样式
- 
- */
-
-.layui-layer-iconext{background:url(icon-ext.png) no-repeat;}
-
-/* prompt模式 */
-.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;}
-
-/* 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: 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{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-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: 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;}
-.layui-layer-imgtit a:hover{color:#fff; text-decoration:underline;}
-.layui-layer-imgtit em{padding:0 10px; font-style: normal;}
-.layui-layer-imgtit>span+a{margin-left: 10px;}
-
-/* 关闭动画 */
-@-webkit-keyframes layer-bounceOut {
-  100% {opacity: 0; -webkit-transform: scale(.7); transform: scale(.7)}
-  30% {-webkit-transform: scale(1.05); transform: scale(1.05)}
-  0% {-webkit-transform: scale(1); transform: scale(1);}
-}
-@keyframes layer-bounceOut {
-  100% {opacity: 0; -webkit-transform: scale(.7); -ms-transform: scale(.7); transform: scale(.7);}
-  30% {-webkit-transform: scale(1.05); -ms-transform: scale(1.05); transform: scale(1.05);}
-  0% {-webkit-transform: scale(1); -ms-transform: scale(1);transform: scale(1);}
-}
-.layer-anim-close{-webkit-animation-name: layer-bounceOut; animation-name: layer-bounceOut; -webkit-animation-fill-mode: both; animation-fill-mode: both; -webkit-animation-duration:.2s; animation-duration:.2s;}
-
-@media screen and (max-width: 1100px) {
-  .layui-layer-iframe{overflow-y: auto; -webkit-overflow-scrolling: touch;}
-}
-
-

src/modules/layer.js

@@ -481,7 +481,7 @@ Class.pt.resize = function(){
   var config = that.config;
   
   that.offset();
-  (/^\d+%$/.test(config.area[0]) || /^\d+%$/.test(config.area[1])) && that.auto(times);
+  (/^\d+%$/.test(config.area[0]) || /^\d+%$/.test(config.area[1])) && that.auto(that.index);
   config.type == 4 && that.tips();
 };
 
@@ -1412,7 +1412,7 @@ layer.photos = function(options, loop, key){
   loadImage(data[start].src, function(img){
     layer.close(dict.loadi);
     
-    var alt = data[start].alt||'';
+    var alt = data[start].alt || '';
 
     //切换图片时不出现动画
     if(key) options.anim = -1;
@@ -1451,36 +1451,31 @@ layer.photos = function(options, loop, key){
       isOutAnim: false,
       skin: 'layui-layer-photos' + skin('photos'),
       content: '<div class="layui-layer-phimg">'
-        +'<img src="'+ data[start].src +'" alt="'+ alt +'" layer-pid="'+ data[start].pid +'">'
+        + '<img src="'+ data[start].src +'" alt="'+ alt +'" layer-pid="'+ data[start].pid +'">'
-        +function(){
+        + function(){
-          var tip = '<div class="layui-layer-imgsee">';
+          var arr = ['<div class="layui-layer-imgsee">'];
 
+          // 左右箭头翻页
           if(data.length > 1){
-            tip += '<span class="layui-layer-imguide"><a href="javascript:;" class="layui-layer-iconext layui-layer-imgprev"></a><a href="javascript:;" class="layui-layer-iconext layui-layer-imgnext"></a></span>';
+            arr.push(['<div class="layui-layer-imguide">'
-
+              ,'<span class="layui-icon layui-icon-left layui-layer-iconext layui-layer-imgprev"></span>'
-            if(alt===''){
+              ,'<span class="layui-icon layui-icon-right layui-layer-iconext layui-layer-imgnext"></span>'
-              tip += '<div class="layui-layer-imgbar" style="display:'+ (key ? 'block' : '') +'"><span class="layui-layer-imgtit"><em>'+ dict.imgIndex +' / '+ data.length +'</em><a href="'+data[start].src+'" target="_blank">查看原图</a></span></div>';
+            ,'</div>'].join(''));
-            }
-            else{
-              tip += '<div class="layui-layer-imgbar" style="display:'+ (key ? 'block' : '') +'"><span class="layui-layer-imgtit"><span>'+ alt +'</span><em>'+ dict.imgIndex +' / '+ data.length +'</em><a href="'+data[start].src+'" target="_blank">查看原图</a></span></div>';
-            }
-
-            tip += '</div>';
           }
-          else if(data.length === 1){
+
-            if(alt===''){
+          // 底部栏
-              tip = '<div class="layui-layer-imgbar" style="display:'+ (key ? 'block' : '') +'"><span class="layui-layer-imgtit"><a href="'+data[start].src+'" target="_blank">查看原图</a></span></div>';
+          if(!options.hideFooter){
-            }
+             arr.push(['<div class="layui-layer-imgbar">'
-            else{
+              ,'<div class="layui-layer-imgtit">'
-              tip += '<div class="layui-layer-imgbar" style="display:'+ (key ? 'block' : '') +'"><span class="layui-layer-imgtit"><span>'+ alt +'</span><a href="'+data[start].src+'" target="_blank">查看原图</a></span></div>';
+                ,'<h3>'+ alt +'</h3>'
-              tip += '</div>';
+                ,'<em>'+ dict.imgIndex +' / '+ data.length +'</em>'
-            }
+                ,'<a href="'+ data[start].src +'" target="_blank">查看原图</a>'
-          }
+              ,'</div>'
-          else{
+            ,'</div>'].join(''));
-            tip = '';
           }
-          
+
-          return tip;
+          arr.push('</div>');
+          return arr.join('');
         }()
       +'</div>',
       success: function(layero, index){

src/modules/table.js

@@ -799,7 +799,7 @@ layui.define(['laytpl', 'laypage', 'form', 'util'], function(exports){
     // 如果表格内容为空（无数据 或 请求异常）
     if (that.layMain.find('tbody').is(":empty")) {
       // 将表格宽度设置为跟表头一样的宽度，使之可以出现底部滚动条，以便滚动查看所有字段
-      const headerWidth = that.layHeader.first().children('table').width()
+      var headerWidth = that.layHeader.first().children('table').width()
       that.layMain.find('table').width(headerWidth);
     }
     
@@ -1025,9 +1025,9 @@ layui.define(['laytpl', 'laypage', 'form', 'util'], function(exports){
         
         //遍历表头
         that.eachCols(function(i3, item3){
-          var field = item3.field || i3
+          var field = item3.field || i3;
-          ,key = options.index + '-' + item3.key
+          var key = options.index + '-' + item3.key;
-          ,content = item1[field];
+          var content = item1[field];
           
           if(content === undefined || content === null) content = '';
           if(item3.colGroup) return;
@@ -1035,6 +1035,7 @@ layui.define(['laytpl', 'laypage', 'form', 'util'], function(exports){
           // td 内容
           var td = ['<td data-field="'+ field +'" data-key="'+ key +'" '+ function(){ //追加各种属性
             var attr = [];
+            if(item3.edit) attr.push('data-edit="true"'); // 允许单元格编辑
             if(item3.templet) attr.push('data-content="'+ util.escape(content) +'"'); //自定义模板
             if(item3.toolbar) attr.push('data-off="true"'); //行工具列关闭单元格事件
             if(item3.event) attr.push('lay-event="'+ item3.event +'"'); //自定义事件
@@ -1775,17 +1776,23 @@ layui.define(['laytpl', 'laypage', 'form', 'util'], function(exports){
           
           if(dict.rule){
             var setWidth = dict.ruleWidth + e.clientX - dict.offset[0];
+            var id = thisTable.eventMoveElem.closest('.' + ELEM_VIEW).attr('lay-id');
+            var thatTable = thisTable.that[id];
+
             if(setWidth < dict.minWidth) setWidth = dict.minWidth;
             dict.rule.style.width = setWidth + 'px';
-            thisTable.that[thisTable.eventMoveElem.closest('.' + ELEM_VIEW).attr('lay-id')].setGroupWidth(thisTable.eventMoveElem);
+            thatTable.setGroupWidth(thisTable.eventMoveElem);
             layer.close(that.tipsIndex);
           }
         }
       }).on('mouseup', function(e){
         if(thisTable.eventMoveElem){
+          var id = thisTable.eventMoveElem.closest('.' + ELEM_VIEW).attr('lay-id');
+          var thatTable = thisTable.that[id];
+
           dict = {};
           _BODY.css('cursor', '');
-          thisTable.that[thisTable.eventMoveElem.closest('.' + ELEM_VIEW).attr('lay-id')].scrollPatch();
+          thatTable.scrollPatch();
 
           // 清除当前拖拽信息
           thisTable.eventMoveElem.removeData(DATA_MOVE_NAME);
@@ -2016,7 +2023,7 @@ layui.define(['laytpl', 'laypage', 'form', 'util'], function(exports){
       var elemCell = othis.children(ELEM_CELL);
 
       // 是否开启编辑
-      // 若 edit 传入函数，则根据函数的发挥结果判断是否开启编辑
+      // 若 edit 传入函数，则根据函数的返回结果判断是否开启编辑
       var editType = typeof col.edit === 'function' 
         ? col.edit(data) 
       : col.edit;