From 677d940f083fd89292c4be77eb4c7364e665ec2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B4=A4=E5=BF=83?=
<3277200+sentsim@users.noreply.github.com>
Date: Thu, 25 May 2023 00:31:26 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20checkbox=20=E5=BC=80?=
=?UTF-8?q?=E5=85=B3=E6=A0=87=E9=A2=98=E5=92=8C=E5=8D=8A=E9=80=89=E5=9B=BE?=
=?UTF-8?q?=E6=A0=87=E6=9C=AA=E5=9E=82=E7=9B=B4=E5=B1=85=E4=B8=AD=E7=9A=84?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/css/layui.css | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/css/layui.css b/src/css/layui.css
index 64cf0b43..c14ae851 100644
--- a/src/css/layui.css
+++ b/src/css/layui.css
@@ -838,7 +838,7 @@ a cite{font-style: normal; *cursor:pointer;}
/* 复选框-默认风格 */
.layui-form-checkbox[lay-skin="primary"]{height: auto!important; line-height: normal!important; min-width: 18px; min-height: 18px; border: none!important; margin-right: 0; padding-left: 24px; padding-right: 0; background: none;}
.layui-form-checkbox[lay-skin="primary"] > div{margin-top: -1px; padding-left: 0; padding-right: 15px; line-height: 18px; background: none; color: #5F5F5F;}
-.layui-form-checkbox[lay-skin="primary"] > i{right: auto; left: 0; width: 16px; height: 16px; line-height: 16px; border: 1px solid #d2d2d2; font-size: 12px; border-radius: 2px; background-color: #fff; -webkit-transition: .1s linear; transition: .1s linear;}
+.layui-form-checkbox[lay-skin="primary"] > i{right: auto; left: 0; width: 18px; height: 18px; line-height: 16px; border: 1px solid #d2d2d2; font-size: 12px; border-radius: 2px; background-color: #fff; -webkit-transition: .1s linear; transition: .1s linear;}
.layui-form-checkbox[lay-skin="primary"]:hover > i{border-color: #16b777; color: #fff;}
.layui-form-checked[lay-skin="primary"] > i{border-color: #16b777 !important; background-color: #16b777; color: #fff;}
.layui-checkbox-disabled[lay-skin="primary"] > div{background: none!important;}
@@ -849,7 +849,7 @@ a cite{font-style: normal; *cursor:pointer;}
.layui-form-checkbox[lay-skin="primary"] > .layui-icon-indeterminate:before{content: ''; display: inline-block; vertical-align: middle; position: relative; width: 50%; height: 1px; margin: -1px auto 0; background-color: #16b777;}
/* 复选框-开关风格 */
-.layui-form-switch{position: relative; display: inline-block; vertical-align: middle; height: 22px; line-height: 22px; min-width: 35px; padding: 0 5px; margin-top: 8px; border: 1px solid #d2d2d2; border-radius: 20px; cursor: pointer; background-color: #fff; -webkit-transition: .1s linear; transition: .1s linear;}
+.layui-form-switch{position: relative; display: inline-block; vertical-align: middle; height: 24px; line-height: 22px; min-width: 44px; padding: 0 5px; margin-top: 8px; border: 1px solid #d2d2d2; border-radius: 20px; cursor: pointer; box-sizing: border-box; background-color: #fff; -webkit-transition: .1s linear; transition: .1s linear;}
.layui-form-switch > i{position: absolute; left: 5px; top: 3px; width: 16px; height: 16px; border-radius: 20px; background-color: #d2d2d2; -webkit-transition: .1s linear; transition: .1s linear;}
.layui-form-switch > div{position: relative; top: 0; margin-left: 21px; padding: 0!important; text-align: center!important; color: #999!important; font-style: normal!important; font-size: 12px;}
.layui-form-onswitch{border-color: #16b777; background-color: #16b777;}
From 6172e1d8cb907178c130d0c361c0899cfd26205e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B4=A4=E5=BF=83?=
<3277200+sentsim@users.noreply.github.com>
Date: Thu, 25 May 2023 00:31:59 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20checkbox=20=E7=A4=BA?=
=?UTF-8?q?=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
examples/form.html | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/examples/form.html b/examples/form.html
index 69d4f899..b2610a19 100644
--- a/examples/form.html
+++ b/examples/form.html
@@ -293,6 +293,7 @@
+
@@ -458,6 +459,10 @@
return false;
});
+ // 设置半选
+ $('#ID-indeterminate').prop('indeterminate', true);
+ form.render('checkbox');
+
// 普通事件
util.on('lay-on', {
"get-vercode": function(othis){
From fcc30e1b247c0636e27f58ac729164ecad915528 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B4=A4=E5=BF=83?=
<3277200+sentsim@users.noreply.github.com>
Date: Thu, 25 May 2023 00:33:06 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20checkbox=20=E5=9C=A8?=
=?UTF-8?q?=E5=88=9D=E5=A7=8B=E8=AE=BE=E7=BD=AE=E5=8D=8A=E9=80=89=E6=97=B6?=
=?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=9B=BE=E6=A0=87=E6=9C=AA=E6=81=A2=E5=A4=8D?=
=?UTF-8?q?=E6=88=90=E9=80=89=E4=B8=AD=E7=8A=B6=E6=80=81=E7=9A=84=E9=97=AE?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/modules/form.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/modules/form.js b/src/modules/form.js
index 1c6ca300..d11ee935 100644
--- a/src/modules/form.js
+++ b/src/modules/form.js
@@ -658,7 +658,7 @@ layui.define(['lay', 'layer', 'util'], function(exports){
// 半选
if (check[0].indeterminate) {
check[0].indeterminate = false;
- reElem.find(CLASS.SUBTRA).removeClass(CLASS.SUBTRA).addClass('layui-icon-ok')
+ reElem.find('.'+ CLASS.SUBTRA).removeClass(CLASS.SUBTRA).addClass('layui-icon-ok');
}
// 开关
From e2ca4a965fa71f909adc0f56a02a5487b655eaaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B4=A4=E5=BF=83?=
<3277200+sentsim@users.noreply.github.com>
Date: Thu, 25 May 2023 00:39:01 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=20checkbox=20=E5=A4=8D?=
=?UTF-8?q?=E9=80=89=E6=A1=86=E4=BA=8B=E4=BB=B6=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
docs/form/checkbox.md | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/docs/form/checkbox.md b/docs/form/checkbox.md
index 36cde462..7946487c 100644
--- a/docs/form/checkbox.md
+++ b/docs/form/checkbox.md
@@ -109,9 +109,12 @@ toc: true
复选框事件
-`form.on('checkbox(filter)', callback);`
+| 风格 | 事件 |
+| --- | --- |
+| 默认风格 / 标签风格 | `form.on('checkbox(filter)', callback);` |
+| 开关风格 | `form.on('switch(filter)', callback);` |
-- `checkbox` 为复选框事件固定名称
+- `checkbox` 和 `switch` 为复选框事件固定名称
- `filter` 为复选框元素对应的 `lay-filter` 属性值
该事件在复选框选中或取消选中时触发。