From 87c3740575e4a50c89a4ba2590be2b1581341a94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=B1=E7=9C=A0=E5=84=80=E5=BC=8F?= <854085467@qq.com>
Date: Sun, 8 May 2022 00:42:35 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B:=20=E4=BF=AE=E5=A4=8D=20radio=20?=
 =?UTF-8?q?=E4=B8=8E=20checkbox=20=E7=BB=84=E4=BB=B6=E6=97=A0=20from=20?=
 =?UTF-8?q?=E5=8C=85=E8=A3=B9=E6=97=B6=E9=9A=90=E8=97=8F=E5=8E=9F=E7=94=9F?=
 =?UTF-8?q?=E5=85=83=E7=B4=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/component/checkbox/index.less          |  4 ++++
 .../component/src/component/checkbox/index.vue |  2 +-
 .../component/src/component/radio/index.less   |  4 ++++
 .../component/src/component/radio/index.vue    |  2 +-
 .../component/src/component/select/index.less  |  1 -
 package/component/src/theme/public.less        |  6 ------
 .../src/document/zh-CN/components/checkbox.md  | 12 ------------
 .../src/document/zh-CN/components/input.md     | 18 +++++++++---------
 .../src/document/zh-CN/components/radio.md     |  6 ------
 .../src/document/zh-CN/components/switch.md    |  5 ++---
 .../src/document/zh-CN/guide/changelog.md      |  2 ++
 11 files changed, 23 insertions(+), 39 deletions(-)

diff --git a/package/component/src/component/checkbox/index.less b/package/component/src/component/checkbox/index.less
index fb3ce9c8..f5d3d076 100644
--- a/package/component/src/component/checkbox/index.less
+++ b/package/component/src/component/checkbox/index.less
@@ -1,3 +1,7 @@
+.layui-checkbox input[type="checkbox"] {
+  display: none;
+}
+
 .layui-form-checkbox {
   position: relative;
   height: 30px;
diff --git a/package/component/src/component/checkbox/index.vue b/package/component/src/component/checkbox/index.vue
index 40472e9e..1194c2bd 100644
--- a/package/component/src/component/checkbox/index.vue
+++ b/package/component/src/component/checkbox/index.vue
@@ -94,7 +94,7 @@ const handleClick = function () {
 </script>
 
 <template>
-  <span @click.stop="handleClick">
+  <span @click.stop="handleClick" class="layui-checkbox">
     <input type="checkbox" :name="name" :value="label" />
     <div
       class="layui-unselect layui-form-checkbox"
diff --git a/package/component/src/component/radio/index.less b/package/component/src/component/radio/index.less
index aac72d04..00531704 100644
--- a/package/component/src/component/radio/index.less
+++ b/package/component/src/component/radio/index.less
@@ -1,3 +1,7 @@
+.layui-radio input[type="radio"]{
+  display: none;
+}
+
 .layui-form-radio,
 .layui-form-radio * {
   display: inline-block;
diff --git a/package/component/src/component/radio/index.vue b/package/component/src/component/radio/index.vue
index 1c72959c..11dc4a78 100644
--- a/package/component/src/component/radio/index.vue
+++ b/package/component/src/component/radio/index.vue
@@ -28,7 +28,7 @@ const handleClick = function () {
 </script>
 
 <template>
-  <span>
+  <span class="layui-radio">
     <input type="radio" :value="label" :name="name" />
     <div
       class="layui-unselect layui-form-radio"
diff --git a/package/component/src/component/select/index.less b/package/component/src/component/select/index.less
index 71e2b16d..6d9db4f3 100644
--- a/package/component/src/component/select/index.less
+++ b/package/component/src/component/select/index.less
@@ -60,7 +60,6 @@ dl.layui-anim-upbit > dd .layui-form-checkbox,
   line-height: 1.3;
 }
 
-
 .layui-form-select {
   .layui-input {
     border: 1px solid #eeeeee;
diff --git a/package/component/src/theme/public.less b/package/component/src/theme/public.less
index 265354cd..d67e92a1 100644
--- a/package/component/src/theme/public.less
+++ b/package/component/src/theme/public.less
@@ -178,12 +178,6 @@ a cite {
   border-color: var(--global-neutral-color-3);
 }
 
-.layui-form input[type="checkbox"],
-.layui-form input[type="radio"],
-.layui-form select {
-  display: none;
-}
-
 .layui-form-checkbox,
 .layui-form-checkbox *,
 .layui-form-switch {
diff --git a/package/document/src/document/zh-CN/components/checkbox.md b/package/document/src/document/zh-CN/components/checkbox.md
index 68444592..9b380829 100644
--- a/package/document/src/document/zh-CN/components/checkbox.md
+++ b/package/document/src/document/zh-CN/components/checkbox.md
@@ -13,9 +13,7 @@
 ::: demo 使用 `lay-checkbox` 标签, 创建一个复选框
 
 <template>
-  <lay-form>
     <lay-checkbox name="like" skin="primary"  v-model="checked1" label="1" ></lay-checkbox>
- </lay-form>
 </template>
 
 <script>
@@ -41,9 +39,7 @@ export default {
 ::: demo
 
 <template>
-  <lay-form>
     <lay-checkbox name="like" label="1" v-model="checked2" >普通</lay-checkbox>
- </lay-form>
 </template>
 
 <script>
@@ -69,13 +65,11 @@ export default {
 ::: demo
 
 <template>
-  <lay-form>
     <lay-checkbox-group v-model="checkeds" @change="groupChange">
       <lay-checkbox name="like" skin="primary" label="1">写作</lay-checkbox>
       <lay-checkbox name="like" skin="primary" label="2">画画</lay-checkbox>
       <lay-checkbox name="like" skin="primary" label="3">运动</lay-checkbox>
     </lay-checkbox-group>
-  </lay-form>
 </template>
 
 <script>
@@ -105,11 +99,9 @@ export default {
 ::: demo
 
 <template>
-  <lay-form>
     <lay-checkbox name="like" skin="primary" v-model="checked3" label="1">写作</lay-checkbox>
     <lay-checkbox name="like" skin="primary" v-model="checked4" label="2">画画</lay-checkbox>
     <lay-checkbox name="like" skin="primary" v-model="checked5" label="3">运动</lay-checkbox>
-  </lay-form>
 </template>
 
 <script>
@@ -137,9 +129,7 @@ export default {
 ::: demo
 
 <template>
-  <lay-form>
     <lay-checkbox name="like" skin="primary" label="1" :disabled="disabled" v-model="checked6">禁用</lay-checkbox>
- </lay-form>
 </template>
 
 <script>
@@ -167,9 +157,7 @@ export default {
 ::: demo
 
 <template>
-  <lay-form>
     <lay-checkbox name="like" skin="primary" label="1" @change="change" v-model="checked7">回调</lay-checkbox>
- </lay-form>
 </template>
 
 <script>
diff --git a/package/document/src/document/zh-CN/components/input.md b/package/document/src/document/zh-CN/components/input.md
index a8e82c79..ab1726d0 100644
--- a/package/document/src/document/zh-CN/components/input.md
+++ b/package/document/src/document/zh-CN/components/input.md
@@ -171,15 +171,15 @@ export default {
 
 ::: table
 
-| 属性         | 描述                  | 可选值         |
-| -----------  | -------------------- | -------------- |
-| name         | 原始属性 name         | --             |
-| placeholder  | 提示信息              | --             |
-| disabled     | 禁用                  | `true` `false` |
-| readonly     | 原生属性 readonly     | `true` `false` |
-| v-model      | 值                    | --             |
-| autofocus    | 原生属性 autofocus    | `true` `false` |
-| autocomplete | 原生属性 autocomplete | `true` `false` |
+| 属性                     | 描述                  | 可选值         |
+| -----------------------  | -------------------- | -------------- |
+| name                     | 原始属性 name         | --             |
+| placeholder              | 提示信息              | --             |
+| disabled                 | 禁用                  | `true` `false` |
+| readonly                 | 原生属性 readonly     | `true` `false` |
+| v-model / modelValue     | 值                   | --             |
+| autofocus                | 原生属性 autofocus    | `true` `false` |
+| autocomplete             | 原生属性 autocomplete | `true` `false` |
 
 :::
 
diff --git a/package/document/src/document/zh-CN/components/radio.md b/package/document/src/document/zh-CN/components/radio.md
index 13031594..0a5c3293 100644
--- a/package/document/src/document/zh-CN/components/radio.md
+++ b/package/document/src/document/zh-CN/components/radio.md
@@ -13,11 +13,9 @@
 ::: demo 使用 `lay-radio` 标签, 创建一个单选框
 
 <template>
-  <lay-form>
     <lay-radio v-model="selected1" name="action" label="1">写作</lay-radio>
     <lay-radio v-model="selected1" name="action" label="2">画画</lay-radio>
     <lay-radio v-model="selected1" name="action" label="3">运动</lay-radio>
-  </lay-form>
 </template>
 
 <script>
@@ -43,12 +41,10 @@ export default {
 ::: demo
 
 <template>
-  <lay-form>
     <lay-radio v-model="selected2" name="action" label="1">写作</lay-radio>
     <lay-radio v-model="selected2" name="action" label="2">画画</lay-radio>
     <lay-radio v-model="selected2" name="action" label="3">运动</lay-radio>
     <lay-radio v-model="selected2" name="action" label="4" :disabled="disabled">禁用</lay-radio>
-  </lay-form>
 </template>
 
 <script>
@@ -76,11 +72,9 @@ export default {
 ::: demo
 
 <template>
-  <lay-form>
     <lay-radio v-model="selected3" name="action" label="1" @change="change">写作</lay-radio>
     <lay-radio v-model="selected3" name="action" label="2" @change="change">画画</lay-radio>
     <lay-radio v-model="selected3" name="action" label="3" @change="change">运动</lay-radio>
-  </lay-form>
 </template>
 
 <script>
diff --git a/package/document/src/document/zh-CN/components/switch.md b/package/document/src/document/zh-CN/components/switch.md
index f503564c..e3420ebc 100644
--- a/package/document/src/document/zh-CN/components/switch.md
+++ b/package/document/src/document/zh-CN/components/switch.md
@@ -194,13 +194,12 @@ export default {
 
 ::: table
 
-| 属性   | 描述     | 可选值           |
+| 属性   | 描述     | 参数           |
 | ------ | -------- | ---------------- |
-| change | 切换事件 | current : 当前值 |
+| change | 切换事件 | val : 当前值 |
 
 :::
 
- 
 ::: title Switch 插槽
 :::
 
diff --git a/package/document/src/document/zh-CN/guide/changelog.md b/package/document/src/document/zh-CN/guide/changelog.md
index 67d13e09..17c5818c 100644
--- a/package/document/src/document/zh-CN/guide/changelog.md
+++ b/package/document/src/document/zh-CN/guide/changelog.md
@@ -23,6 +23,8 @@
           <li>[新增] input 组件 autocomplete 原生属性。</li>
           <li>[新增] input 组件 autofocus 原生属性。</li>
           <li>[修复] side 组件 width 属性无效。</li>
+          <li>[修复] checkbox 组件无 from 包裹时隐藏原生 checkbox。</li>
+          <li>[修复] radio 组件无 from 包裹时隐藏原生 radio。</li>
         </ul> 
       </li>
     </ul>