From f267138550430001a48ec7d3834b117b8e748f55 Mon Sep 17 00:00:00 2001
From: sunxb <470459819@qq.com>
Date: Mon, 30 Jan 2023 17:58:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A1=A8=E5=8D=95=E5=92=8C?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E9=80=89=E6=8B=A9=E7=9A=84=E4=B8=80=E4=BA=9B?=
 =?UTF-8?q?=E5=B0=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/modules/form.js    | 3 ++-
 src/modules/laydate.js | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/modules/form.js b/src/modules/form.js
index 9fa7e87f..9f97afca 100644
--- a/src/modules/form.js
+++ b/src/modules/form.js
@@ -651,7 +651,8 @@ layui.define(['lay', 'layer', 'util'], function(exports){
         
         checks.each(function(index, check){
           var othis = $(this);
-          var skin = othis.attr('lay-skin') || 'primary';
+          var skin = othis.attr('lay-skin') || '';
+          check.title || (check.title = othis.attr('lay-text') || ''); // 向下兼容将以前设置在lay-text的值赋给title
           var title = (check.title.replace(/\s/g, '') || '').split('|');
           var disabled = this.disabled;
 
diff --git a/src/modules/laydate.js b/src/modules/laydate.js
index 991751e1..4a65cad8 100644
--- a/src/modules/laydate.js
+++ b/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;
+      }
     }
 
     // 初始值不在最大最小范围内