From 8bf5744e03becba2e5de370b6d26bd239e4e7459 Mon Sep 17 00:00:00 2001
From: pipipi-pikachu <1171051090@qq.com>
Date: Sat, 26 Dec 2020 14:28:09 +0800
Subject: [PATCH] update

---
 src/assets/styles/global.scss                 |  3 +-
 .../Contextmenu/ContextmenuContent.vue        | 16 ++--
 src/components/Contextmenu/index.vue          |  2 +-
 src/store/index.ts                            |  5 +-
 src/types/edit.ts                             |  9 +-
 src/types/toolbar.ts                          | 11 +++
 src/views/Editor/Canvas/Operate/index.vue     |  2 +-
 src/views/Editor/Canvas/index.vue             | 11 +--
 src/views/Editor/EditorHeader/index.vue       |  4 +-
 src/views/Editor/Thumbnails/index.vue         | 20 ++---
 .../Editor/Toolbar/ElementAnimationPanel.vue  |  0
 .../Editor/Toolbar/ElementPositionPanel.vue   |  0
 .../Toolbar/ElementStylePanel/index.vue       |  0
 .../Editor/Toolbar/MultiCommandPanel.vue      |  0
 .../Editor/Toolbar/MultiPositionPanel.vue     |  0
 .../Editor/Toolbar/SlideAnimationPanel.vue    |  0
 src/views/Editor/Toolbar/SlideStylePanel.vue  |  0
 src/views/Editor/Toolbar/index.vue            | 90 ++++++++++++++++++-
 18 files changed, 124 insertions(+), 49 deletions(-)
 create mode 100644 src/types/toolbar.ts
 create mode 100644 src/views/Editor/Toolbar/ElementAnimationPanel.vue
 create mode 100644 src/views/Editor/Toolbar/ElementPositionPanel.vue
 create mode 100644 src/views/Editor/Toolbar/ElementStylePanel/index.vue
 create mode 100644 src/views/Editor/Toolbar/MultiCommandPanel.vue
 create mode 100644 src/views/Editor/Toolbar/MultiPositionPanel.vue
 create mode 100644 src/views/Editor/Toolbar/SlideAnimationPanel.vue
 create mode 100644 src/views/Editor/Toolbar/SlideStylePanel.vue

diff --git a/src/assets/styles/global.scss b/src/assets/styles/global.scss
index a6e70c44..cb54c1a4 100644
--- a/src/assets/styles/global.scss
+++ b/src/assets/styles/global.scss
@@ -58,6 +58,5 @@ a {
   background-color: #fff;
 }
 ::-webkit-scrollbar-thumb {
-  background-color: #e1e1e1;
-  border-radius: 5px;
+  background-color: #c1c1c1;
 }
\ No newline at end of file
diff --git a/src/components/Contextmenu/ContextmenuContent.vue b/src/components/Contextmenu/ContextmenuContent.vue
index cf179310..61fe4d70 100644
--- a/src/components/Contextmenu/ContextmenuContent.vue
+++ b/src/components/Contextmenu/ContextmenuContent.vue
@@ -52,7 +52,7 @@ export default defineComponent({
 
 <style lang="scss" scoped>
 $menuWidth: 160px;
-$menuHeight: 32px;
+$menuHeight: 30px;
 $subMenuWidth: 120px;
 
 .contextmenu-content {
@@ -107,22 +107,22 @@ $subMenuWidth: 120px;
   &.has-sub-menu::before {
     content: '';
     display: inline-block;
-    width: 0;
-    height: 0;
-    border-top: 4px solid transparent;
-    border-left: 6px solid rgba($color: $themeColor, $alpha: .8);
-    border-bottom: 4px solid transparent;
+    width: 8px;
+    height: 8px;
+    border-width: 1px;
+    border-style: solid;
+    border-color: #666 #666 transparent transparent;
     position: absolute;
     right: 0;
     top: 50%;
-    transform: translateY(-50%);
+    transform: translateY(-50%) rotate(45deg);
   }
   .sub-text {
     opacity: 0.6;
   }
   .sub-menu {
     position: absolute;
-    top: -5px;
+    top: -6px;
     display: none;
     width: $subMenuWidth;
   }
diff --git a/src/components/Contextmenu/index.vue b/src/components/Contextmenu/index.vue
index d04e47d7..400de756 100644
--- a/src/components/Contextmenu/index.vue
+++ b/src/components/Contextmenu/index.vue
@@ -28,7 +28,7 @@ import { ContextmenuItem, Axis } from './types'
 import ContextmenuContent from './ContextmenuContent.vue'
 
 const MENU_WIDTH = 160
-const MENU_HEIGHT = 32
+const MENU_HEIGHT = 30
 const DIVIDER_HEIGHT = 11
 const SUB_MENU_WIDTH = 120
 
diff --git a/src/store/index.ts b/src/store/index.ts
index ebcb3a46..b3b7a3bb 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -5,6 +5,7 @@ import { mutations } from './mutations'
 import { MutationTypes, ActionTypes } from './constants'
 
 import { Slide } from '@/types/slides'
+import { ToolbarState } from '@/types/toolbar'
 import { slides } from '@/mocks/index'
 import { FontName } from '@/configs/fontName'
 
@@ -20,7 +21,7 @@ export interface State {
   disableHotkeys: boolean;
   showGridLines: boolean;
   availableFonts: FontName[];
-  toolbarState: string;
+  toolbarState: ToolbarState;
   slides: Slide[];
   slideIndex: number;
   snapshotCursor: number;
@@ -40,7 +41,7 @@ const state: State = {
   disableHotkeys: false,
   showGridLines: false,
   availableFonts: [],
-  toolbarState: '',
+  toolbarState: 'slideStyle',
   slides: slides,
   slideIndex: 0,
   snapshotCursor: -1,
diff --git a/src/types/edit.ts b/src/types/edit.ts
index d41c54ff..46f09068 100644
--- a/src/types/edit.ts
+++ b/src/types/edit.ts
@@ -27,14 +27,7 @@ export enum OperateBorderLines {
   R = 'right',
 }
 
-export type OperateResizeHandler = 'left-top' |
-                                       'top' |
-                                       'right-top' |
-                                       'left' |
-                                       'right' |
-                                       'left-bottom' |
-                                       'bottom' |
-                                       'right-bottom'
+export type OperateResizeHandler = 'left-top' | 'top' | 'right-top' | 'left' | 'right' | 'left-bottom' | 'bottom' | 'right-bottom'
 
 export enum OperateResizeHandlers {
   LEFT_TOP = 'left-top',
diff --git a/src/types/toolbar.ts b/src/types/toolbar.ts
new file mode 100644
index 00000000..5831ed1b
--- /dev/null
+++ b/src/types/toolbar.ts
@@ -0,0 +1,11 @@
+export type ToolbarState = 'elAnimation' | 'elStyle' | 'elPosition' | 'slideStyle' | 'slideAnimation' | 'multiPosition' | 'multiCommand'
+
+export const ToolbarStates = {
+  EL_ANIMATION: 'elAnimation',
+  EL_STYLE: 'elStyle',
+  EL_POSITION: 'elPosition',
+  SLIDE_STYLE: 'slideStyle',
+  SLIDE_ANIMATION: 'slideAnimation',
+  MULTI_POSITION: 'multiPosition',
+  MULTI_COMMAND: 'multiCommand',
+}
\ No newline at end of file
diff --git a/src/views/Editor/Canvas/Operate/index.vue b/src/views/Editor/Canvas/Operate/index.vue
index edac871e..5a13db37 100644
--- a/src/views/Editor/Canvas/Operate/index.vue
+++ b/src/views/Editor/Canvas/Operate/index.vue
@@ -22,7 +22,7 @@
 
     <div 
       class="animation-index"
-      v-if="toolbarState === 'animation' && elementIndexInAnimation !== -1"
+      v-if="toolbarState === 'elAnimation' && elementIndexInAnimation !== -1"
     >
       {{elementIndexInAnimation + 1}}
     </div>
diff --git a/src/views/Editor/Canvas/index.vue b/src/views/Editor/Canvas/index.vue
index 7d75d454..67eedfb0 100644
--- a/src/views/Editor/Canvas/index.vue
+++ b/src/views/Editor/Canvas/index.vue
@@ -10,8 +10,8 @@
     <div 
       class="viewport-wrapper"
       :style="{
-        width: viewportStyles.width + 'px',
-        height: viewportStyles.height + 'px',
+        width: viewportStyles.width * canvasScale + 'px',
+        height: viewportStyles.height * canvasScale + 'px',
         left: viewportStyles.left + 'px',
         top: viewportStyles.top + 'px',
       }"
@@ -40,12 +40,7 @@
           :rotateElement="rotateElement"
           :scaleElement="scaleElement"
         />
-        <SlideBackground
-          :style="{
-            width: viewportStyles.width * canvasScale + 'px',
-            height: viewportStyles.height * canvasScale + 'px',
-          }"
-        />
+        <SlideBackground />
       </div>
 
       <div 
diff --git a/src/views/Editor/EditorHeader/index.vue b/src/views/Editor/EditorHeader/index.vue
index 7a24fecf..0aec337b 100644
--- a/src/views/Editor/EditorHeader/index.vue
+++ b/src/views/Editor/EditorHeader/index.vue
@@ -10,9 +10,6 @@
     </div>
 
     <div class="right">
-      <div class="menu-item">
-        <IconFont class="icon" type="icon-play-circle" />
-      </div>
       <div class="menu-item icon">
         <IconFont class="icon" type="icon-github-fill" />
       </div>
@@ -50,6 +47,7 @@ export default defineComponent({
 
   .icon {
     font-size: 20px;
+    color: #666;
   }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/Editor/Thumbnails/index.vue b/src/views/Editor/Thumbnails/index.vue
index da3efd9f..0ae3e882 100644
--- a/src/views/Editor/Thumbnails/index.vue
+++ b/src/views/Editor/Thumbnails/index.vue
@@ -4,9 +4,7 @@
     @mousedown="() => setThumbnailsFocus(true)"
     v-click-outside="() => setThumbnailsFocus(false)"
   >
-    <div class="add-slide">
-      <span @click="createSlide()">+ 添加幻灯片</span>
-    </div>
+    <div class="add-slide" @click="createSlide()">+ 添加幻灯片</div>
     <draggable 
       class="thumbnail-list"
       :modelValue="slides"
@@ -145,7 +143,6 @@ export default defineComponent({
   background-color: #fff;
   display: flex;
   flex-direction: column;
-  overflow: auto;
   user-select: none;
 }
 .add-slide {
@@ -154,17 +151,14 @@ export default defineComponent({
   display: flex;
   justify-content: center;
   align-items: center;
-
-  span {
-    cursor: pointer;
-    padding: 5px;
-    &:hover {
-      border: 1px solid #eee;
-    }
-  }
+  flex-shrink: 0;
+  border-bottom: 1px solid #eee;
+  cursor: pointer;
 }
 .thumbnail-list {
   padding: 5px 0;
+  flex: 1;
+  overflow: auto;
 }
 .thumbnail-wrapper {
   display: flex;
@@ -173,7 +167,7 @@ export default defineComponent({
   padding: 5px 0;
 
   .thumbnail {
-    outline: 2px solid rgba($color: $themeColor, $alpha: .1);
+    outline: 1px solid rgba($color: $themeColor, $alpha: .1);
   }
 
   &.active {
diff --git a/src/views/Editor/Toolbar/ElementAnimationPanel.vue b/src/views/Editor/Toolbar/ElementAnimationPanel.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/src/views/Editor/Toolbar/ElementPositionPanel.vue b/src/views/Editor/Toolbar/ElementPositionPanel.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/src/views/Editor/Toolbar/ElementStylePanel/index.vue b/src/views/Editor/Toolbar/ElementStylePanel/index.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/src/views/Editor/Toolbar/MultiCommandPanel.vue b/src/views/Editor/Toolbar/MultiCommandPanel.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/src/views/Editor/Toolbar/MultiPositionPanel.vue b/src/views/Editor/Toolbar/MultiPositionPanel.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/src/views/Editor/Toolbar/SlideAnimationPanel.vue b/src/views/Editor/Toolbar/SlideAnimationPanel.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/src/views/Editor/Toolbar/SlideStylePanel.vue b/src/views/Editor/Toolbar/SlideStylePanel.vue
new file mode 100644
index 00000000..e69de29b
diff --git a/src/views/Editor/Toolbar/index.vue b/src/views/Editor/Toolbar/index.vue
index c257c05f..3e21d71c 100644
--- a/src/views/Editor/Toolbar/index.vue
+++ b/src/views/Editor/Toolbar/index.vue
@@ -1,14 +1,70 @@
 <template>
   <div class="toolbar">
-    
+    <div class="tabs">
+      <div 
+        class="tab" 
+        :class="{ 'active': tab.value === toolbarState }"
+        v-for="tab in currentTabs" 
+        :key="tab.value"
+        @click="setToolbarState(tab.value)"
+      >{{tab.label}}</div>
+    </div>
+    <div class="content">
+
+    </div>
   </div>
 </template>
 
 <script lang="ts">
-import { defineComponent } from 'vue'
+import { computed, defineComponent, watch } from 'vue'
+import { useStore } from 'vuex'
+import { MutationTypes, State } from '@/store'
+import { ToolbarState, ToolbarStates } from '@/types/toolbar'
 
 export default defineComponent({
   name: 'toolbar',
+  setup() {
+    const store = useStore<State>()
+    const toolbarState = computed(() => store.state.toolbarState)
+
+    const elementTabs = [
+      { label: '样式', value: ToolbarStates.EL_STYLE },
+      { label: '位置', value: ToolbarStates.EL_POSITION },
+      { label: '动画', value: ToolbarStates.EL_ANIMATION },
+    ]
+    const slideTabs = [
+      { label: '页面样式', value: ToolbarStates.SLIDE_STYLE },
+      { label: '翻页动画', value: ToolbarStates.SLIDE_ANIMATION },
+    ]
+    const multiSelectTabs = [
+      { label: '位置', value: ToolbarStates.MULTI_POSITION },
+      { label: '操作', value: ToolbarStates.MULTI_COMMAND },
+    ]
+
+    const setToolbarState = (value: ToolbarState) => {
+      store.commit(MutationTypes.SET_TOOLBAR_STATE, value)
+    }
+
+    const activeElementIdList = computed(() => store.state.activeElementIdList)
+    const currentTabs = computed(() => {
+      if(!activeElementIdList.value.length) return slideTabs
+      else if(activeElementIdList.value.length > 1) return multiSelectTabs
+      return elementTabs
+    })
+
+    watch(currentTabs, () => {
+      const currentTabsValue = currentTabs.value.map(tab => tab.value)
+      if(!currentTabsValue.includes(toolbarState.value)) {
+        store.commit(MutationTypes.SET_TOOLBAR_STATE, currentTabsValue[0])
+      }
+    })
+
+    return {
+      toolbarState,
+      currentTabs,
+      setToolbarState,
+    }
+  },
 })
 </script>
 
@@ -16,7 +72,35 @@ export default defineComponent({
 .toolbar {
   border-left: solid 1px #eee;
   background-color: #fff;
+  display: flex;
+  flex-direction: column;
+}
+.tabs {
+  height: 40px;
+  font-size: 12px;
+  flex-shrink: 0;
+  display: flex;
+}
+.tab {
+  flex: 1;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background-color: #f9f9f9;
+  border-bottom: 1px solid #eee;
+  cursor: pointer;
+
+  &.active {
+    background-color: #fff;
+    border-bottom-color: #fff;
+  }
+
+  & + .tab {
+    border-left: 1px solid #eee;
+  }
+}
+.content {
+  padding: 5px;
   overflow: auto;
-  padding: 5px 0;
 }
 </style>
\ No newline at end of file