From ce356012ce86197343a54d7574f84d4527b83632 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: Thu, 24 Mar 2022 04:23:24 +0800
Subject: [PATCH] feat: add switch onswitch-icon and unswitch-icon slot

---
 example/docs/zh-CN/components/switch.md   | 29 +++++++++++++++++++++++
 example/docs/zh-CN/components/transfer.md |  1 +
 example/docs/zh-CN/guide/changelog.md     |  8 ++++---
 example/src/assets/css/code.css           |  4 ----
 src/component/carousel/index.vue          | 20 +++++-----------
 src/component/carouselItem/index.vue      |  2 +-
 src/component/inputNumber/index.vue       |  2 --
 src/component/switch/index.less           |  4 ++--
 src/component/switch/index.vue            |  7 +++++-
 9 files changed, 50 insertions(+), 27 deletions(-)

diff --git a/example/docs/zh-CN/components/switch.md b/example/docs/zh-CN/components/switch.md
index 7661bf47..dd85ed89 100644
--- a/example/docs/zh-CN/components/switch.md
+++ b/example/docs/zh-CN/components/switch.md
@@ -117,6 +117,35 @@ export default {
 
 :::
 
+::: title 图标插槽
+:::
+
+::: demo
+
+<template>
+  <lay-switch v-model="active5">
+    <template #onswitch-icon>😄</template>
+    <template #unswitch-icon>🤔</template>
+  </lay-switch>
+</template>
+
+<script>
+import { ref } from 'vue'
+
+export default {
+  setup() {
+
+    const active5 = ref(true)
+
+    return {
+        active5
+    }
+  }
+}
+</script>
+
+:::
+
 ::: title Switch 属性
 :::
 
diff --git a/example/docs/zh-CN/components/transfer.md b/example/docs/zh-CN/components/transfer.md
index bf2f41f5..3e07c708 100644
--- a/example/docs/zh-CN/components/transfer.md
+++ b/example/docs/zh-CN/components/transfer.md
@@ -170,6 +170,7 @@ export default {
 | dataSource | 数据来源    | --              |
 | title      | 标题        | --              |
 | id         | 主键        | --              |
+| showSearch | 开启搜索        | --              |
 
 :::
 
diff --git a/example/docs/zh-CN/guide/changelog.md b/example/docs/zh-CN/guide/changelog.md
index 0606b18e..e9a28fe1 100644
--- a/example/docs/zh-CN/guide/changelog.md
+++ b/example/docs/zh-CN/guide/changelog.md
@@ -16,11 +16,13 @@
       <li> 
         <h3>0.4.1 <span class="layui-badge-rim">2022-03-17</span></h3> 
         <ul>
-          <li>[新增] input 组件 prefix 插槽, 提供前缀设置。</li>
-          <li>[新增] input 组件 suffix 插槽, 提供后缀设置。</li>
-          <li>[新增] input 组件 allow-clear 属性, 提供输入清空。</li>
+          <li>[新增] switch 组件 onswitch-icon 插槽。</li>
+          <li>[新增] switch 组件 unswitch-icon 插槽。</li>
           <li>[新增] transition 组件 type 属性, 默认为 collapse 过渡。</li>
           <li>[新增] transition 组件 type 属性 fade 值, 提供淡出淡入效果。</li>
+          <li>[新增] input 组件 allow-clear 属性, 提供输入清空。</li>
+          <li>[新增] input 组件 prefix 插槽, 提供前缀设置。</li>
+          <li>[新增] input 组件 suffix 插槽, 提供后缀设置。</li>
         </ul> 
       </li>
     </ul>
diff --git a/example/src/assets/css/code.css b/example/src/assets/css/code.css
index 35e7987d..be47050c 100644
--- a/example/src/assets/css/code.css
+++ b/example/src/assets/css/code.css
@@ -206,10 +206,6 @@ div[class*='language-'].line-numbers-mode {
   font-weight: bold;
 }
 
-.token.italic {
-  font-style: italic;
-}
-
 .token.entity {
   cursor: help;
 }
diff --git a/src/component/carousel/index.vue b/src/component/carousel/index.vue
index bf0c7694..d0339a7d 100644
--- a/src/component/carousel/index.vue
+++ b/src/component/carousel/index.vue
@@ -140,20 +140,12 @@ const add = function () {
       </ul>
     </div>
     <!-- 操作 -->
-    <button
-      class="layui-icon layui-carousel-arrow"
-      lay-type="sub"
-      @click="sub"
-    >
-      {{ anim === "updown" ? "" : "" }}</button
-    >
-    
-    <button
-      class="layui-icon layui-carousel-arrow"
-      lay-type="add"
-      @click="add"
-    >
+    <button class="layui-icon layui-carousel-arrow" lay-type="sub" @click="sub">
+      {{ anim === "updown" ? "" : "" }}
+    </button>
+
+    <button class="layui-icon layui-carousel-arrow" lay-type="add" @click="add">
       {{ anim === "updown" ? "" : "" }}
     </button>
   </div>
-</template>
\ No newline at end of file
+</template>
diff --git a/src/component/carouselItem/index.vue b/src/component/carouselItem/index.vue
index 709f436b..5f2da685 100644
--- a/src/component/carouselItem/index.vue
+++ b/src/component/carouselItem/index.vue
@@ -17,7 +17,7 @@ slotsChange.value = !slotsChange.value;
 </script>
 
 <template>
-  <li v-if="active === id ">
+  <li v-if="active === id">
     <slot></slot>
   </li>
 </template>
diff --git a/src/component/inputNumber/index.vue b/src/component/inputNumber/index.vue
index 7bdd5213..71a2cb2b 100644
--- a/src/component/inputNumber/index.vue
+++ b/src/component/inputNumber/index.vue
@@ -106,7 +106,6 @@ const isNumber = function (num: any) {
 <template>
   <div class="layui-input-number" :position="position" :size="size">
     <lay-button
-      type="primary"
       size="gl"
       @mousedown="longDown(subtraction)"
       @mouseup="cancelLongDown"
@@ -130,7 +129,6 @@ const isNumber = function (num: any) {
       />
     </div>
     <lay-button
-      type="primary"
       size="gl"
       @mousedown="longDown(addition)"
       @mouseup="cancelLongDown"
diff --git a/src/component/switch/index.less b/src/component/switch/index.less
index f7167981..8605b043 100644
--- a/src/component/switch/index.less
+++ b/src/component/switch/index.less
@@ -14,7 +14,7 @@
   transition: 0.1s linear;
 }
 
-.layui-form-switch i {
+.layui-form-switch span {
   position: absolute;
   left: 5px;
   top: 3px;
@@ -43,7 +43,7 @@
   background-color: @global-checked-color;
 }
 
-.layui-form-onswitch i {
+.layui-form-onswitch span {
   left: 100%;
   margin-left: -21px;
   background-color: #fff;
diff --git a/src/component/switch/index.vue b/src/component/switch/index.vue
index 1827dcf3..ad9b9c39 100644
--- a/src/component/switch/index.vue
+++ b/src/component/switch/index.vue
@@ -51,7 +51,12 @@ const handleClick = function () {
       }"
     >
       <em>{{ isActive == true ? activeText : inactiveText }}</em>
-      <i></i>
+      <span>
+        <div>
+        <slot v-if="isActive" name="onswitch-icon"></slot>
+        <slot v-else name="unswitch-icon"></slot>
+        </div>
+      </span>
     </div>
   </span>
 </template>