Merge pull request #1198 from layui/main

优化 form 和 laydate 细节

src/modules/form.js

@@ -652,10 +652,15 @@ layui.define(['lay', 'layer', 'util'], function(exports){
         checks.each(function(index, check){
           var othis = $(this);
           var skin = othis.attr('lay-skin') || 'primary';
+          check.title || (check.title = othis.attr('lay-text') || ''); // 向下兼容将以前设置在lay-text的值赋给title
           var title = (check.title.replace(/\s/g, '') || '').split('|');
           var disabled = this.disabled;
 
-          if(skin === 'switch') skin = '_'+ skin;
+          if(skin === 'switch') {
+            skin = '_'+ skin;
+          } else if (skin !== 'tag') {
+            skin = 'primary';
+          }
           var RE_CLASS = CLASS[skin] || CLASS.checkbox;
           
           if(typeof othis.attr('lay-ignore') === 'string') return othis.show();

src/modules/laydate.js

@@ -967,6 +967,11 @@
         minutes: that.endDate.minutes,
         seconds: that.endDate.seconds,
       }
+      // 如果是年月范围，将对应的日期统一成当月的1日进行比较，避免出现同一个月但是开始日期大于结束日期的情况
+      if (options.type === 'month') {
+        options.dateTime.date = 1;
+        that.endDate.date = 1;
+      }
     }
 
     // 初始值不在最大最小范围内