From dda87e3c9db4e622954d7d2f4acf8a40b7134872 Mon Sep 17 00:00:00 2001
From: KeiferJu <jkf19980216@qq.com>
Date: Fri, 8 May 2020 09:59:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=96=87=E6=A1=A3,=E6=A8=A1?=
 =?UTF-8?q?=E6=80=81=E6=A1=86=E6=B7=BB=E5=8A=A0=E5=B1=8F=E8=94=BD=E5=A4=B4?=
 =?UTF-8?q?=E9=83=A8=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/src/routes/components/carousel.svelte | 17 +++-
 docs/src/routes/components/jsdocs.json     | 91 ++++++++++++++++++++++
 src/components/Modal/Modal.svelte          | 20 ++++-
 3 files changed, 123 insertions(+), 5 deletions(-)

diff --git a/docs/src/routes/components/carousel.svelte b/docs/src/routes/components/carousel.svelte
index e3eb09f..9f0cee5 100644
--- a/docs/src/routes/components/carousel.svelte
+++ b/docs/src/routes/components/carousel.svelte
@@ -1,9 +1,22 @@
+<script context="module">
+  export async function preload() {
+    const res = await this.fetch(`components/carousel.json`);
+    const jsdoc = await res.json();
+
+    return {
+      jsdoc
+    };
+  }
+</script>
 <script>
     import {
         Carousel
     } from 'svelma-pro'
     import DocHeader from '../../components/DocHeader.svelte'
     import Example from '../../components/Example.svelte'
+    import JSDoc from '../../components/JSDoc.svelte'
+
+    export let jsdoc
 
     let options = [
         'http://dev.smartmapx.com/assets/source-img/banner/banner.jpg',
@@ -38,4 +51,6 @@
     <div slot="preview" class="preview">
         <Carousel options={options} />
     </div>
-</Example>
\ No newline at end of file
+</Example>
+
+<JSDoc {jsdoc}></JSDoc>
\ No newline at end of file
diff --git a/docs/src/routes/components/jsdocs.json b/docs/src/routes/components/jsdocs.json
index 8b2378f..09e20e2 100644
--- a/docs/src/routes/components/jsdocs.json
+++ b/docs/src/routes/components/jsdocs.json
@@ -72,6 +72,89 @@
       "values": "<code>Any animation that ships with Svelte</code>"
     }
   ],
+  "Carousel":[
+    {
+      "description": "图片列表(url路径数组)",
+      "type": [
+        "Array"
+      ],
+      "defaultvalue": [],
+      "name": "options",
+      "values": ""
+    },
+    {
+      "description": "底部指示器",
+      "type": [
+        "Boolean"
+      ],
+      "defaultvalue": true,
+      "name": "pagination",
+      "values": ""
+    },
+    {
+      "description": "左右导航按钮",
+      "type": [
+        "Boolean"
+      ],
+      "defaultvalue": true,
+      "name": "navigation",
+      "values": ""
+    },
+    {
+      "description": "自动播放",
+      "type": [
+        "Boolean"
+      ],
+      "defaultvalue": false,
+      "name": "autoplay",
+      "values": ""
+    },
+    {
+      "description": "自动播放时长",
+      "type": [
+        "Number"
+      ],
+      "defaultvalue": 3000,
+      "name": "delay",
+      "values": ""
+    },
+    {
+      "description": "方向",
+      "type": [
+        "String"
+      ],
+      "defaultvalue": "horizontal",
+      "name": "direction",
+      "values": "horizontal,vertical"
+    },
+    {
+      "description": "循环",
+      "type": [
+        "Boolean"
+      ],
+      "defaultvalue": true,
+      "name": "loop",
+      "values": ""
+    },
+    {
+      "description": "滑动禁止自动播放",
+      "type": [
+        "Boolean"
+      ],
+      "defaultvalue": true,
+      "name": "disableOnInteraction",
+      "values": ""
+    },
+    {
+      "description": "切换特效",
+      "type": [
+        "String"
+      ],
+      "defaultvalue": "slide",
+      "name": "effect",
+      "values": "slide,fade,cube,coverflow,flip"
+    }
+  ],
   "Datepicker": [
     {
       "description": "当前日期",
@@ -1048,6 +1131,14 @@
       "defaultvalue": "true",
       "name": "backdropClose",
       "values": ""
+    },{
+      "description": "是否显示头部",
+      "type": [
+        "Boolean"
+      ],
+      "defaultvalue": "true",
+      "name": "showHeader",
+      "values": ""
     },
     {
       "isEvent": true,
diff --git a/src/components/Modal/Modal.svelte b/src/components/Modal/Modal.svelte
index 1eb7df6..a7d5011 100644
--- a/src/components/Modal/Modal.svelte
+++ b/src/components/Modal/Modal.svelte
@@ -10,6 +10,7 @@
   export let animProps = { start: 1.2 }
   export let size = ''
   export let showClose = true //显示左上角关闭按钮
+  export let showHeader = true //是否显示头
   export let backdrop = true // 遮罩
   export let backdropClose = true // 点击遮罩是否关闭
   export const subComponent = null
@@ -53,6 +54,11 @@
     padding: 10px 20px;
     text-align: center;
   }
+  .delete {
+    position: absolute;
+    top: 20px;
+    right: 10px;
+  }
 </style>
 
 <svelte:window on:keydown={keydown} />
@@ -67,12 +73,18 @@
         }} />
     {/if}
     <div class="modal-card" transition:_animation|local={animProps} style="width: {width};height: {height}">
-      <header class="modal-card-head">
-        <p class="modal-card-title">{title}</p>
-        {#if showClose}
+      {#if showHeader}
+        <header class="modal-card-head">
+          <p class="modal-card-title">{title}</p>
+        </header>
+      {/if}
+      {#if showClose}
+        {#if showHeader}
           <button class="delete" aria-label="close" on:click={close} />
+        {:else}
+          <button class="delete" aria-label="close" on:click={close} style="top: 2px;right: 2px;" />
         {/if}
-      </header>
+      {/if}
       <section class="modal-card-body">
         <slot />
       </section>