From 63bf7d0c690a36ca75079d5c8230e33fa85a97f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?0o=E5=BC=A0=E4=B8=8D=E6=AD=AAo0?= <zhangzheng7856@126.com>
Date: Thu, 23 Jun 2022 00:39:52 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8(component):=20=E2=9C=A8(component):?=
 =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=E8=BD=AE=E6=92=AD=E5=9B=BE=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E8=BF=87=E6=B8=A1=E5=8A=A8=E7=94=BB=EF=BC=8C=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E4=B8=BA=E6=BB=91=E5=8A=A8,=E4=BF=AE=E5=A4=8Dautoplay?=
 =?UTF-8?q?=E4=B8=BAfalse=E6=97=B6=E4=BB=8D=E8=87=AA=E5=8A=A8=E6=92=AD?=
 =?UTF-8?q?=E6=94=BE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ISSUES CLOSED: #I50UP9
---
 .../src/component/carousel/index.less         |  2 +
 .../src/component/carousel/index.vue          | 11 +++
 .../src/component/carouselItem/index.vue      | 84 ++++++++++++++++++-
 .../src/document/zh-CN/components/carousel.md | 80 ++++++++++++------
 4 files changed, 150 insertions(+), 27 deletions(-)

diff --git a/package/component/src/component/carousel/index.less b/package/component/src/component/carousel/index.less
index 2f801c53..9458492f 100644
--- a/package/component/src/component/carousel/index.less
+++ b/package/component/src/component/carousel/index.less
@@ -38,6 +38,7 @@
   background-color: #f8f8f8;
   transition-duration: 0.3s;
   -webkit-transition-duration: 0.3s;
+  overflow: hidden;
 }
 
 .layui-carousel-updown > * {
@@ -205,6 +206,7 @@
   right: 20px;
   width: auto;
   height: auto;
+  transform: translateY(-50%);
 }
 
 .layui-carousel[lay-anim="updown"] .layui-carousel-ind ul {
diff --git a/package/component/src/component/carousel/index.vue b/package/component/src/component/carousel/index.vue
index d1da846c..8de43e16 100644
--- a/package/component/src/component/carousel/index.vue
+++ b/package/component/src/component/carousel/index.vue
@@ -53,6 +53,15 @@ const active = computed({
   },
 });
 
+const anim = computed({
+  get() {
+    return props.anim;
+  },
+  set() {
+    
+  },
+});
+
 const emit = defineEmits(["update:modelValue", "change"]);
 
 const change = function (id: any) {
@@ -85,6 +94,7 @@ watch(
 
 provide("active", active);
 provide("slotsChange", slotsChange);
+provide("anim", anim);
 
 const sub = () => {
   for (var i = 0; i < childrens.value.length; i++) {
@@ -128,6 +138,7 @@ const autoplay = () => {
 watch(
   () => props.autoplay,
   () => {
+    if(props.autoplay)
     setInterval(autoplay, props.interval);
   },
   { immediate: true }
diff --git a/package/component/src/component/carouselItem/index.vue b/package/component/src/component/carouselItem/index.vue
index 5f2da685..5e792ec5 100644
--- a/package/component/src/component/carouselItem/index.vue
+++ b/package/component/src/component/carouselItem/index.vue
@@ -5,7 +5,7 @@ export default {
 </script>
 
 <script setup lang="ts">
-import { inject, Ref } from "vue";
+import { inject, Ref, computed, ref, VNodeChild } from "vue";
 
 const props = defineProps<{
   id: string;
@@ -14,10 +14,90 @@ const props = defineProps<{
 const active = inject("active");
 const slotsChange: Ref<boolean> = inject("slotsChange") as Ref<boolean>;
 slotsChange.value = !slotsChange.value;
+
+const anim = inject("anim");
+const item = ref();
+const getStyle = computed<any>(() => {
+  if (item.value) {
+    let allChild = item.value.parentNode.children;
+    let allChildNum = allChild.length;
+
+    //当前的activeIndex
+    let activeIndex,
+      currentIndex = 0;
+    for (let index = 0; index < allChild.length; index++) {
+      const element = allChild[index];
+      // @ts-ignore
+      if (element.__vnode.props["data-id"] === active.value) {
+        activeIndex = index;
+      }
+      if (element.__vnode.props["data-id"] === props.id) {
+        currentIndex = index;
+      }
+    }
+    // @ts-ignore
+    let prevIndex = activeIndex > 0 ? activeIndex - 1 : allChildNum - 1;
+    // @ts-ignore
+    let nextIndex = activeIndex + 1 < allChildNum ? activeIndex + 1 : 0;
+    // @ts-ignore
+    let animation = anim.value;
+    //状态 上一个 当前 下一个
+    if (activeIndex === currentIndex) {
+      if (animation === "updown") {
+        return {
+          transform: "translateY(0)",
+        };
+      } else if (animation.includes("fade")) {
+        return {
+          opacity: 1,
+        };
+      } else {
+        return {
+          transform: "translateX(0)",
+        };
+      }
+    }
+
+    if (prevIndex === currentIndex) {
+      if (animation === "updown") {
+        return {
+          transform: "translateY(-100%)",
+        };
+      } else if (animation.includes("fade")) {
+        return {
+          opacity: 0,
+        };
+      } else {
+        return {
+          transform: "translateX(-100%)",
+        };
+      }
+    }
+    if (nextIndex === currentIndex) {
+      if (animation === "updown") {
+        return {
+          transform: "translateY(100%)",
+        };
+      } else if (animation.includes("fade")) {
+        return {
+          opacity: 0,
+        };
+      } else {
+        return {
+          transform: "translateX(100%)",
+        };
+      }
+    }
+
+    return {
+      display: "none",
+    };
+  }
+});
 </script>
 
 <template>
-  <li v-if="active === id">
+  <li ref="item" :style="getStyle" :data-id="id">
     <slot></slot>
   </li>
 </template>
diff --git a/package/document/src/document/zh-CN/components/carousel.md b/package/document/src/document/zh-CN/components/carousel.md
index 87521a32..faf4cf71 100644
--- a/package/document/src/document/zh-CN/components/carousel.md
+++ b/package/document/src/document/zh-CN/components/carousel.md
@@ -9,16 +9,16 @@
 <template>
   <lay-carousel v-model="active1">
     <lay-carousel-item id="1">
-      <div style="color: white;text-align: center;width:100%;height:300px;line-height:300px;background-color:#79C48C;">条目一</div>
+      <div style="color: white;text-align: center;width:100%;height:300px;line-height:300px;background-color:#009688;">条目一</div>
     </lay-carousel-item>
     <lay-carousel-item id="2">
-      <div style="color: white;text-align: center;width:100%;height:300px;line-height:300px;background-color:#79C48C;">条目二</div>
+      <div style="color: white;text-align: center;width:100%;height:300px;line-height:300px;background-color:#5FB878;">条目二</div>
     </lay-carousel-item>
     <lay-carousel-item id="3">
-      <div style="color: white;text-align: center;width:100%;height:300px;line-height:300px;background-color:#79C48C;">条目三</div>
+      <div style="color: white;text-align: center;width:100%;height:300px;line-height:300px;background-color:#FFB800;">条目三</div>
     </lay-carousel-item>
     <lay-carousel-item id="4">
-      <div style="color: white;text-align: center;width:100%;height:300px;line-height:300px;background-color:#79C48C;">条目四</div>
+      <div style="color: white;text-align: center;width:100%;height:300px;line-height:300px;background-color:#FF5722;">条目四</div>
     </lay-carousel-item>
   </lay-carousel>
 </template>
@@ -40,26 +40,56 @@ export default {
 
 :::
 
-::: title 不同方向
+::: title 不同方向与不同切换动画
 :::
 
-::: demo
+::: demo 通过 `anim` 属性来控制切换的放向与动画，支持 `default`左右切换(默认)、`updown`上线切换、`fade`渐隐渐显切换
 
 <template>
-  <lay-carousel v-model="active2" anim="updown">
+  <div style="display:flex;justify-content: space-around;flex-wrap:wrap">
+  <lay-carousel v-model="activeAnmi1" anim="updown" style="display:inline-block;width:32%" :autoplay="true">
     <lay-carousel-item id="1">
-      <div style="color: white;text-align: center;width:100%;height:300px;line-height:300px;background-color:#79C48C;">条目一</div>
+      <div style="color: white;text-align: center;width:100%;height:300px;line-height:300px;background-color:#009688;">条目一</div>
     </lay-carousel-item>
     <lay-carousel-item id="2">
-      <div style="color: white;text-align: center;width:100%;height:300px;line-height:300px;background-color:#79C48C;">条目二</div>
+      <div style="color: white;text-align: center;width:100%;height:300px;line-height:300px;background-color:#5FB878;">条目二</div>
     </lay-carousel-item>
     <lay-carousel-item id="3">
-      <div style="color: white;text-align: center;width:100%;height:300px;line-height:300px;background-color:#79C48C;">条目三</div>
+      <div style="color: white;text-align: center;width:100%;height:300px;line-height:300px;background-color:#FFB800;">条目三</div>
     </lay-carousel-item>
     <lay-carousel-item id="4">
-      <div style="color: white;text-align: center;width:100%;height:300px;line-height:300px;background-color:#79C48C;">条目四</div>
+      <div style="color: white;text-align: center;width:100%;height:300px;line-height:300px;background-color:#FF5722;">条目四</div>
     </lay-carousel-item>
   </lay-carousel>
+  <lay-carousel v-model="activeAnmi2" style="width:32%">
+    <lay-carousel-item id="1">
+      <div style="color: white;text-align: center;width:100%;height:300px;line-height:300px;background-color:#009688;">条目一</div>
+    </lay-carousel-item>
+    <lay-carousel-item id="2">
+      <div style="color: white;text-align: center;width:100%;height:300px;line-height:300px;background-color:#5FB878;">条目二</div>
+    </lay-carousel-item>
+    <lay-carousel-item id="3">
+      <div style="color: white;text-align: center;width:100%;height:300px;line-height:300px;background-color:#FFB800;">条目三</div>
+    </lay-carousel-item>
+    <lay-carousel-item id="4">
+      <div style="color: white;text-align: center;width:100%;height:300px;line-height:300px;background-color:#FF5722;">条目四</div>
+    </lay-carousel-item>
+  </lay-carousel>
+  <lay-carousel v-model="activeAnmi3" anim="fade" style="width:32%;">
+    <lay-carousel-item id="1">
+      <div style="color: white;text-align: center;width:100%;height:300px;line-height:300px;background-color:#009688;">条目一</div>
+    </lay-carousel-item>
+    <lay-carousel-item id="2">
+      <div style="color: white;text-align: center;width:100%;height:300px;line-height:300px;background-color:#5FB878;">条目二</div>
+    </lay-carousel-item>
+    <lay-carousel-item id="3">
+      <div style="color: white;text-align: center;width:100%;height:300px;line-height:300px;background-color:#FFB800;">条目三</div>
+    </lay-carousel-item>
+    <lay-carousel-item id="4">
+      <div style="color: white;text-align: center;width:100%;height:300px;line-height:300px;background-color:#FF5722;">条目四</div>
+    </lay-carousel-item>
+  </lay-carousel>
+  </div>
 </template>
 
 <script>
@@ -67,11 +97,11 @@ import { ref } from 'vue'
 
 export default {
   setup() {
-
-    const active2 = ref("1")
-
+    const activeAnmi1 = ref("1")
+    const activeAnmi2 = ref("1")
+    const activeAnmi3 = ref("1")
     return {
-      active2
+      activeAnmi1,activeAnmi2,activeAnmi3,activeAnmi4
     }
   }
 }
@@ -79,7 +109,7 @@ export default {
 
 :::
 
-::: title 控制位置
+::: title 控制器位置
 :::
 
 ::: demo
@@ -87,16 +117,16 @@ export default {
 <template>
   <lay-carousel v-model="active3" indicator="outside">
     <lay-carousel-item id="1">
-      <div style="color: white;text-align: center;width:100%;height:300px;line-height:300px;background-color:#79C48C;">条目一</div>
+      <div style="color: white;text-align: center;width:100%;height:300px;line-height:300px;background-color:#009688;">条目一</div>
     </lay-carousel-item>
     <lay-carousel-item id="2">
-      <div style="color: white;text-align: center;width:100%;height:300px;line-height:300px;background-color:#79C48C;">条目二</div>
+      <div style="color: white;text-align: center;width:100%;height:300px;line-height:300px;background-color:#5FB878;">条目二</div>
     </lay-carousel-item>
     <lay-carousel-item id="3">
-      <div style="color: white;text-align: center;width:100%;height:300px;line-height:300px;background-color:#79C48C;">条目三</div>
+      <div style="color: white;text-align: center;width:100%;height:300px;line-height:300px;background-color:#FFB800;">条目三</div>
     </lay-carousel-item>
     <lay-carousel-item id="4">
-      <div style="color: white;text-align: center;width:100%;height:300px;line-height:300px;background-color:#79C48C;">条目四</div>
+      <div style="color: white;text-align: center;width:100%;height:300px;line-height:300px;background-color:#FF5722;">条目四</div>
     </lay-carousel-item>
   </lay-carousel>
 </template>
@@ -140,10 +170,10 @@ export default {
     const active4 = ref("1")
 
     const arrays = ref([
-      {id: "1", text: ""},
-      {id: "2", text: ""},
-      {id: "3", text: ""},
-      {id: "4", text: ""}
+      {id: "1", text: "1️⃣"},
+      {id: "2", text: "2️⃣"},
+      {id: "3", text: "3️⃣"},
+      {id: "4", text: "4️⃣"}
     ])
 
     return {
@@ -165,7 +195,7 @@ export default {
 | 属性      | 描述         | 类型          |类型             |可选值                    |
 | --------- | ------------ |--------------| --------------- | -------------------------|
 | v-model   | 当前激活项   | `number`      | --             | --                      |
-| anim      | 切换方向     | `string`      | `default`      | `default` `updown`       |
+| anim      | 切换方向     | `string`      | `default`      | `default` `updown` `fade`      |
 | indicator | 控制器位置   | `string`      | `inside`       |`inside` `outside` `none` |
 | arrow     | 切换按钮状态 | `string`      | `hover`        |`hover` `always` `none`   |
 | autoplay  | 自动播放     | `boolean`     | `true`         | `true` `false`           |