From b101fd511350405baf0637c02fedd36a97811413 Mon Sep 17 00:00:00 2001
From: pipipi-pikachu <1171051090@qq.com>
Date: Sat, 6 Feb 2021 22:38:18 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E6=92=AD=E6=94=BE=E5=99=A8=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/plugins/iconPark.ts              |  2 +
 src/views/Screen/SlideThumbnails.vue | 63 +++++++++++++++++++++-------
 src/views/Screen/index.vue           | 26 +++++++-----
 3 files changed, 65 insertions(+), 26 deletions(-)

diff --git a/src/plugins/iconPark.ts b/src/plugins/iconPark.ts
index c64287a5..d604e74f 100644
--- a/src/plugins/iconPark.ts
+++ b/src/plugins/iconPark.ts
@@ -100,6 +100,7 @@ import {
   Click,
   Theme,
   Symbol,
+  ArrowCircleLeft,
 } from '@icon-park/vue-next'
 
 export default {
@@ -233,5 +234,6 @@ export default {
     app.component('IconTransform', Transform)
     app.component('IconClick', Click)
     app.component('IconTheme', Theme)
+    app.component('IconArrowCircleLeft', ArrowCircleLeft)
   }
 }
\ No newline at end of file
diff --git a/src/views/Screen/SlideThumbnails.vue b/src/views/Screen/SlideThumbnails.vue
index 33362af6..ce1e92b3 100644
--- a/src/views/Screen/SlideThumbnails.vue
+++ b/src/views/Screen/SlideThumbnails.vue
@@ -1,13 +1,18 @@
 <template>
   <div class="slide-thumbnails">
-    <div 
-      class="thumbnail"
-      :class="{ 'active': index === slideIndex }"
-      v-for="(slide, index) in slides" 
-      :key="slide.id"
-      @click="turnSlideToIndex(index)"
-    >
-      <ThumbnailSlide :slide="slide" :size="150" />
+    <div class="return-button">
+      <IconArrowCircleLeft class="icon" @click="close()" />
+    </div>
+    <div class="slide-thumbnails-content">
+      <div 
+        class="thumbnail"
+        :class="{ 'active': index === slideIndex }"
+        v-for="(slide, index) in slides" 
+        :key="slide.id"
+        @click="turnSlideToIndex(index)"
+      >
+        <ThumbnailSlide :slide="slide" :size="150" />
+      </div>
     </div>
   </div>
 </template>
@@ -28,14 +33,17 @@ export default defineComponent({
       type: Function as PropType<(index: number) => void>,
     },
   },
-  setup() {
+  setup(props, { emit }) {
     const store = useStore()
     const slides = computed(() => store.state.slides)
     const slideIndex = computed(() => store.state.slideIndex)
 
+    const close = () => emit('close')
+
     return {
       slides,
       slideIndex,
+      close,
     }
   },
 })
@@ -43,8 +51,31 @@ export default defineComponent({
 
 <style lang="scss" scoped>
 .slide-thumbnails {
-  height: 600px;
-  padding: 5px 10px;
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  top: 0;
+  left: 0;
+  background-color: #1a1a1a;
+  z-index: 99;
+}
+.return-button {
+  height: 60px;
+  padding: 20px 30px 0;
+
+  .icon {
+    color: #fff;
+    font-size: 36px;
+    cursor: pointer;
+
+    &:hover {
+      color: $themeColor;
+    }
+  }
+}
+.slide-thumbnails-content {
+  height: calc(100% - 100px);
+  padding: 20px 30px 30px 30px;
   display: flex;
   flex-wrap: wrap;
   align-content: flex-start;
@@ -52,15 +83,17 @@ export default defineComponent({
 
   .thumbnail {
     width: 150px;
+    outline: 2px solid #aaa;
+    margin-right: 12px;
     margin-bottom: 12px;
-    outline: 1px solid rgba($color: $themeColor, $alpha: .1);
 
-    &.active {
+    &:hover {
       outline-color: $themeColor;
     }
 
-    &:not(:nth-child(6n)) {
-      margin-right: 12px;
+    &.active {
+      outline-width: 3px;
+      outline-color: $themeColor;
     }
   }
 }
diff --git a/src/views/Screen/index.vue b/src/views/Screen/index.vue
index 8f9cd790..fa61c378 100644
--- a/src/views/Screen/index.vue
+++ b/src/views/Screen/index.vue
@@ -35,15 +35,11 @@
       </div>
     </div>
 
-    <Modal
-      v-model:visible="slideThumbnailModelVisible" 
-      :footer="null" 
-      centered
-      :width="1020"
-      :bodyStyle="{ padding: '50px 20px 20px 20px' }"
-    >
-      <SlideThumbnails :turnSlideToIndex="turnSlideToIndex" />
-    </Modal>
+    <SlideThumbnails 
+      v-if="slideThumbnailModelVisible" 
+      :turnSlideToIndex="turnSlideToIndex" 
+      @close="slideThumbnailModelVisible = false"
+    />
 
     <div class="tools">
       <IconLeftC class="tool-btn" @click="execPrev()" />
@@ -207,15 +203,23 @@ export default defineComponent({
     const contextmenus = (): ContextmenuItem[] => {
       return [
         {
-          text: '上一页',
+          text: '上一张',
+          subText: '↑、←',
           disable: slideIndex.value <= 0,
           handler: () => turnPrevSlide(),
         },
         {
-          text: '下一页',
+          text: '下一张',
+          subText: '↓、→',
           disable: slideIndex.value >= slides.value.length - 1,
           handler: () => turnNextSlide(),
         },
+        { divider: true },
+        {
+          text: '查看所有幻灯片',
+          handler: () => slideThumbnailModelVisible.value = true,
+        },
+        { divider: true },
         {
           text: '结束放映',
           subText: 'ESC',