update

src/modules/laydate.js

@@ -517,6 +517,7 @@
         elem.remove();
         //delete options.dateTime;
         //delete that.endDate;
+        delete laydate.thisId;
       });
     }
     return that;
@@ -1628,6 +1629,8 @@
       var that = thisModule.getThis(laydate.thisId);
       if(!that) return;
       
+      // 回车触发确认
+      if(that.config.position === 'static') return;
       if(e.keyCode === 13){
         if(lay('#'+ that.elemID)[0] && that.elemID === Class.thisElemDate){
           e.preventDefault();

src/modules/table.js

@@ -1,6 +1,6 @@
 /**
  * layui.table 
- * 数据表格组件
+ * 表格组件
  */
 
 layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
@@ -101,11 +101,11 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
   
   //thead区域模板
   ,TPL_HEADER = function(options){
-    var rowCols = '{{#if(item2.colspan){}} colspan="{{item2.colspan}}"{{#} if(item2.rowspan){}} rowspan="{{item2.rowspan}}"{{#}}}';
+    var rowCols = '{{#if(item2.colspan){}} colspan="{{=item2.colspan}}"{{#} if(item2.rowspan){}} rowspan="{{=item2.rowspan}}"{{#}}}';
     
     options = options || {};
     return ['<table cellspacing="0" cellpadding="0" border="0" class="layui-table" '
-      ,'{{# if(d.data.skin){ }}lay-skin="{{d.data.skin}}"{{# } }} {{# if(d.data.size){ }}lay-size="{{d.data.size}}"{{# } }} {{# if(d.data.even){ }}lay-even{{# } }}>'
+      ,'{{# if(d.data.skin){ }}lay-skin="{{=d.data.skin}}"{{# } }} {{# if(d.data.size){ }}lay-size="{{=d.data.size}}"{{# } }} {{# if(d.data.even){ }}lay-even{{# } }}>'
       ,'<thead>'
       ,'{{# layui.each(d.data.cols, function(i1, item1){ }}'
         ,'<tr>'
@@ -122,21 +122,21 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
             return '';
           }()
           ,'{{# var isSort = !(item2.colGroup) && item2.sort; }}'
-          ,'<th data-field="{{ item2.field||i2 }}" data-key="{{d.index}}-{{i1}}-{{i2}}" {{# if( item2.parentKey){ }}data-parentkey="{{ item2.parentKey }}"{{# } }} {{# if(item2.minWidth){ }}data-minwidth="{{item2.minWidth}}"{{# } }} '+ rowCols +' {{# if(item2.unresize || item2.colGroup){ }}data-unresize="true"{{# } }} class="{{# if(item2.hide){ }}layui-hide{{# } }}{{# if(isSort){ }} layui-unselect{{# } }}{{# if(!item2.field){ }} layui-table-col-special{{# } }}">'
+          ,'<th data-field="{{= item2.field||i2 }}" data-key="{{=d.index}}-{{=i1}}-{{=i2}}" {{# if( item2.parentKey){ }}data-parentkey="{{= item2.parentKey }}"{{# } }} {{# if(item2.minWidth){ }}data-minwidth="{{=item2.minWidth}}"{{# } }} '+ rowCols +' {{# if(item2.unresize || item2.colGroup){ }}data-unresize="true"{{# } }} class="{{# if(item2.hide){ }}layui-hide{{# } }}{{# if(isSort){ }} layui-unselect{{# } }}{{# if(!item2.field){ }} layui-table-col-special{{# } }}">'
             ,'<div class="layui-table-cell laytable-cell-'
               ,'{{# if(item2.colGroup){ }}'
                 ,'group'
               ,'{{# } else { }}'
-                ,'{{d.index}}-{{i1}}-{{i2}}'
+                ,'{{=d.index}}-{{=i1}}-{{=i2}}'
                 ,'{{# if(item2.type !== "normal"){ }}'
-                  ,' laytable-cell-{{ item2.type }}'
+                  ,' laytable-cell-{{= item2.type }}'
                 ,'{{# } }}'
               ,'{{# } }}'
-            ,'" {{#if(item2.align){}}align="{{item2.align}}"{{#}}}>'
+            ,'" {{#if(item2.align){}}align="{{=item2.align}}"{{#}}}>'
               ,'{{# if(item2.type === "checkbox"){ }}' //复选框
                 ,'<input type="checkbox" name="layTableCheckbox" lay-skin="primary" lay-filter="layTableAllChoose" {{# if(item2[d.data.checkName]){ }}checked{{# }; }}>'
               ,'{{# } else { }}'
-                ,'<span>{{item2.title||""}}</span>'
+                ,'<span>{{-item2.title||""}}</span>'
                 ,'{{# if(isSort){ }}'
                   ,'<span class="layui-table-sort layui-inline"><i class="layui-edge layui-table-sort-asc" title="升序"></i><i class="layui-edge layui-table-sort-desc" title="降序"></i></span>'
                 ,'{{# } }}'
@@ -151,14 +151,14 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
     ,'</table>'].join('');
   }
   
-  //tbody区域模板
+  // tbody 区域模板
   ,TPL_BODY = ['<table cellspacing="0" cellpadding="0" border="0" class="layui-table" '
-    ,'{{# if(d.data.skin){ }}lay-skin="{{d.data.skin}}"{{# } }} {{# if(d.data.size){ }}lay-size="{{d.data.size}}"{{# } }} {{# if(d.data.even){ }}lay-even{{# } }}>'
+    ,'{{# if(d.data.skin){ }}lay-skin="{{=d.data.skin}}"{{# } }} {{# if(d.data.size){ }}lay-size="{{=d.data.size}}"{{# } }} {{# if(d.data.even){ }}lay-even{{# } }}>'
     ,'<tbody></tbody>'
   ,'</table>'].join('')
   
   //主模板
-  ,TPL_MAIN = ['<div class="layui-form layui-border-box {{d.VIEW_CLASS}}{{# if(d.data.className){ }} {{ d.data.className }}{{# } }}" lay-filter="LAY-table-{{d.index}}" lay-id="{{ d.data.id }}" style="{{# if(d.data.width){ }}width:{{d.data.width}}px;{{# } }} {{# if(d.data.height){ }}height:{{d.data.height}}px;{{# } }}">'
+  ,TPL_MAIN = ['<div class="layui-form layui-border-box {{=d.VIEW_CLASS}}{{# if(d.data.className){ }} {{= d.data.className }}{{# } }}" lay-filter="LAY-table-{{=d.index}}" lay-id="{{= d.data.id }}" style="{{# if(d.data.width){ }}width:{{=d.data.width}}px;{{# } }} {{# if(d.data.height){ }}height:{{=d.data.height}}px;{{# } }}">'
 
     ,'{{# if(d.data.toolbar){ }}'
     ,'<div class="layui-table-tool">'
@@ -209,7 +209,7 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
     ,'{{# if(d.data.totalRow){ }}'
       ,'<div class="layui-table-total">'
         ,'<table cellspacing="0" cellpadding="0" border="0" class="layui-table" '
-        ,'{{# if(d.data.skin){ }}lay-skin="{{d.data.skin}}"{{# } }} {{# if(d.data.size){ }}lay-size="{{d.data.size}}"{{# } }} {{# if(d.data.even){ }}lay-even{{# } }}>'
+        ,'{{# if(d.data.skin){ }}lay-skin="{{=d.data.skin}}"{{# } }} {{# if(d.data.size){ }}lay-size="{{=d.data.size}}"{{# } }} {{# if(d.data.even){ }}lay-even{{# } }}>'
           ,'<tbody><tr><td><div class="layui-table-cell" style="visibility: hidden;">Total</div></td></tr></tbody>'
       , '</table>'
       ,'</div>'
@@ -217,16 +217,16 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
     
     ,'{{# if(d.data.page){ }}'
     ,'<div class="layui-table-page">'
-      ,'<div id="layui-table-page{{d.index}}"></div>'
+      ,'<div id="layui-table-page{{=d.index}}"></div>'
     ,'</div>'
     ,'{{# } }}'
     
     ,'<style>'
     ,'{{# layui.each(d.data.cols, function(i1, item1){'
       ,'layui.each(item1, function(i2, item2){ }}'
-        ,'.laytable-cell-{{d.index}}-{{i1}}-{{i2}}{ '
+        ,'.laytable-cell-{{=d.index}}-{{=i1}}-{{=i2}}{ '
         ,'{{# if(item2.width){ }}'
-          ,'width: {{item2.width}}px;'
+          ,'width: {{=item2.width}}px;'
         ,'{{# } }}'
         ,' }'
       ,'{{# });'
@@ -1348,7 +1348,7 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
               var lis = [];
               that.eachCols(function(i, item){ 
                 if(item.field && item.type == 'normal'){
-                  lis.push('<li><input type="checkbox" name="'+ item.field +'" data-key="'+ item.key +'" data-parentkey="'+ (item.parentKey||'') +'" lay-skin="primary" '+ (item.hide ? '' : 'checked') +' title="'+ (item.title || item.field) +'" lay-filter="LAY_TABLE_TOOL_COLS"></li>');
+                  lis.push('<li><input type="checkbox" name="'+ item.field +'" data-key="'+ item.key +'" data-parentkey="'+ (item.parentKey||'') +'" lay-skin="primary" '+ (item.hide ? '' : 'checked') +' title="'+ util.escape(item.title || item.field) +'" lay-filter="LAY_TABLE_TOOL_COLS"></li>');
                 }
               });
               return lis.join('');
@@ -1393,8 +1393,8 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
             openPanel({
               list: function(){
                 return [
-                  '<li data-type="csv">导出到 Csv 文件</li>'
-                  ,'<li data-type="xls">导出到 Excel 文件</li>'
+                  '<li data-type="csv">导出 csv 格式文件</li>'
+                  ,'<li data-type="xls">导出 xls 格式文件</li>'
                 ].join('')
               }()
               ,done: function(panel, list){
@@ -1555,6 +1555,7 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
                   ,tplData: data
                 }));
                 td.data('content', value);
+                item3.templet && that.renderForm();
               } else if(item3.templet || item3.toolbar){ //更新所有其他列的模板
                 var thisTd = tr.children('td[data-field="'+ (item3.field || i) +'"]')
                 ,content = data[item3.field];
@@ -1564,6 +1565,7 @@ layui.define(['laytpl', 'laypage', 'layer', 'form', 'util'], function(exports){
                   ,tplData: data
                 }));
                 thisTd.data('content', content);
+                that.renderForm();
               }
             });
           });

src/modules/upload.js

@@ -1,6 +1,6 @@
 /**
  * upload
- * 文件上传组件
+ * 上传组件
  */
  
 layui.define('layer' , function(exports){
@@ -180,14 +180,14 @@ layui.define('layer' , function(exports){
     
     //高级浏览器处理方式，支持跨域
     ,ajaxSend = function(){
-      var successful = 0, aborted = 0
+      var successful = 0, failed = 0
       ,items = files || that.files || that.chooseFiles || elemFile.files
       ,allDone = function(){ //多文件全部上传完毕的回调
-        if(options.multiple && successful + aborted === that.fileLength){
+        if(options.multiple && successful + failed === that.fileLength){
           typeof options.allDone === 'function' && options.allDone({
             total: that.fileLength
             ,successful: successful
-            ,aborted: aborted
+            ,failed: failed
           });
         }
       };
@@ -219,7 +219,7 @@ layui.define('layer' , function(exports){
           }
           //异常回调
           ,error: function(e){
-            aborted++;
+            failed++;
             that.msg('Request URL is abnormal: '+ (e.statusText || 'error'));
             error(index);
             allDone();
@@ -243,7 +243,7 @@ layui.define('layer' , function(exports){
       });
     }
     
-    //低版本IE处理方式，不支持跨域
+    //低版本 IE 处理方式，不支持跨域
     ,iframeSend = function(){
       var iframe = $('#'+ ELEM_IFRAME);
     
@@ -338,14 +338,6 @@ layui.define('layer' , function(exports){
     
     //提交上传
     ,send = function(){      
-      //选择文件的回调      
-      if(type === 'choose' || options.auto){
-        options.choose && options.choose(args);
-        if(type === 'choose'){
-          return;
-        }
-      }
-      
       //上传前的回调 - 如果回调函数明确返回false，则停止上传(#pulls55)
       if(options.before && (options.before(args) === false)) return;
 
@@ -409,6 +401,14 @@ layui.define('layer' , function(exports){
       that.msg('选择的'+ typeName +'中包含不支持的格式');
       return elemFile.value = '';
     }
+
+    //选择文件的回调      
+    if(type === 'choose' || options.auto){
+      options.choose && options.choose(args);
+      if(type === 'choose'){
+        return;
+      }
+    }
     
     //检验文件数量
     that.fileLength = function(){
@@ -421,7 +421,10 @@ layui.define('layer' , function(exports){
     }();
     
     if(options.number && that.fileLength > options.number){
-      return that.msg('同时最多只能选择 '+ options.number + ' 个文件');
+      return that.msg(
+        '同时最多只能上传: '+ options.number + ' 个文件'
+        +'<br>您当前已经选择了: '+ that.fileLength +' 个文件'
+      );
     }
     
     //检验文件大小
@@ -438,6 +441,7 @@ layui.define('layer' , function(exports){
       });
       if(limitSize) return that.msg('文件大小不能超过 '+ limitSize);
     }
+
     send();
   };
   
@@ -521,6 +525,7 @@ layui.define('layer' , function(exports){
         
         othis.removeAttr('lay-over');
         setChooseFile(files);
+
         options.auto ? that.upload() : setChooseText(files); //是否自动触发上传
       });
     }

src/modules/util.js

@@ -189,7 +189,7 @@ layui.define('jquery', function(exports){
 
       return html.replace(/\&/g, '&')
       .replace(/\&lt;/g, '<').replace(/\&gt;/g, '>')
-      .replace(/\&#39;/, '\'').replace(/\&quot;/, '"');
+      .replace(/\&#39;/g, '\'').replace(/\&quot;/g, '"');
     }
     
     //让指定的元素保持在可视区域