Merge pull request #1 from layui/main

拉取 layui

src/css/layui.css

@@ -753,8 +753,8 @@ a cite{font-style: normal; *cursor:pointer;}
 .layui-input-affix-event{pointer-events: auto;}
 
 /* 输入框组 */
-.layui-input-group{position: relative; display: inline-table; cursor: pointer}
+.layui-input-group{position: relative; display: inline-table;}
-.layui-input-group>*{display: table-cell; vertical-align: middle; position: relative;  cursor: pointer;}
+.layui-input-group>*{display: table-cell; vertical-align: middle; position: relative;}
 .layui-input-group .layui-input{padding-right: 15px;}
 .layui-input-group .layui-input-prefix{width: auto; border-right: 0;}
 .layui-input-group .layui-input-suffix{width: auto; border-left: 0;}
@@ -897,7 +897,7 @@ a cite{font-style: normal; *cursor:pointer;}
 .layui-laypage button{margin-left: 10px; padding: 0 10px; cursor: pointer;}
 
 /** 流加载 **/
-.layui-flow-more{margin: 10px 0; text-align: center; color: #999; font-size: 14px;}
+.layui-flow-more{margin: 10px 0; text-align: center; color: #999; font-size: 14px; clear: both;}
 .layui-flow-more a{ height: 32px; line-height: 32px;  }
 .layui-flow-more a *{display: inline-block; vertical-align: top;}
 .layui-flow-more a cite{padding: 0 20px; border-radius: 3px; background-color: #eee; color: #333; font-style: normal;}

src/modules/laydate.js

@@ -1415,7 +1415,7 @@
 
           setTimeStatus();
           scroll();
-          (that.endDate || options.type === 'time') && that.done(null, 'change');
+          (that.endDate || options.type === 'time' || (options.type === 'datetime' && options.fullPanel)) && that.done(null, 'change');
           
           //同步按钮可点状态
           that.setBtnStatus();

src/modules/layer.js

@@ -902,8 +902,8 @@ Class.pt.openLayer = function(){
 //记录宽高坐标，用于还原
 ready.record = function(layero){
   var area = [
-    layero.width(),
+    layero[0].style.width || layero.width(),
-    layero.height(),
+    layero[0].style.height || layero.height(),
     layero.position().top, 
     layero.position().left + parseFloat(layero.css('margin-left'))
   ];
@@ -981,11 +981,11 @@ layer.style = function(index, options, limit){
   
   if(type === ready.type[2]){
     layero.find('iframe').css({
-      height: parseFloat(options.height) - titHeight - btnHeight
+      height: (typeof options.height === 'number' ? options.height : layero.height()) - titHeight - btnHeight
     });
   } else {
     contElem.css({
-      height: parseFloat(options.height) - titHeight - btnHeight
+      height: (typeof options.height === 'number' ? options.height : layero.height()) - titHeight - btnHeight
       - parseFloat(contElem.css('padding-top'))
       - parseFloat(contElem.css('padding-bottom'))
     })
@@ -1058,8 +1058,8 @@ layer.restore = function(index){
   
   //恢复原来尺寸
   layer.style(index, {
-    width: parseFloat(area[0]), 
+    width: area[0], // 数值或百分比
-    height: parseFloat(area[1]), 
+    height: area[1],
     top: parseFloat(area[2]),
     left: parseFloat(area[3]),
     position: layero.attr('position'),

src/modules/table.js

@@ -1363,7 +1363,8 @@ layui.define(['lay', 'laytpl', 'laypage', 'form', 'util'], function(exports){
       tds.push(td);
     });
 
-    that.layTotal.find('tbody').html('<tr>' + tds.join('') + '</tr>');
+    var patchElem = that.layTotal.find('.layui-table-patch'); // 可能存在滚动条补丁
+    that.layTotal.find('tbody').html('<tr>' + tds.join('') + (patchElem.length ? patchElem.get(0).outerHTML : '') + '</tr>');
   };
   
   //找到对应的列元素

src/modules/upload.js

@@ -194,14 +194,15 @@ layui.define('layer' , function(exports){
       layui.each(items, function(index, file){
         var formData = new FormData();
         
-        formData.append(options.field, file);
-        
         //追加额外的参数
         layui.each(options.data, function(key, value){
           value = typeof value === 'function' ? value() : value;
           formData.append(key, value);
         });
         
+        //最后添加 file 到表单域
+        formData.append(options.field, file);
+        
         //提交文件
         var opts = {
           url: options.url