From f704f4ad709bc561b48f2d4bd603655de171839e Mon Sep 17 00:00:00 2001
From: pipipi-pikachu <pipipi_pikachu@163.com>
Date: Fri, 31 Dec 2021 15:32:09 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20UI=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ElementStylePanel/ImageStylePanel.vue     |  99 +-----------
 .../Editor/Toolbar/common/ElementFilter.vue   | 141 ++++++++++++++++++
 2 files changed, 148 insertions(+), 92 deletions(-)
 create mode 100644 src/views/Editor/Toolbar/common/ElementFilter.vue

diff --git a/src/views/Editor/Toolbar/ElementStylePanel/ImageStylePanel.vue b/src/views/Editor/Toolbar/ElementStylePanel/ImageStylePanel.vue
index 5f7af1b4..b9dffdb6 100644
--- a/src/views/Editor/Toolbar/ElementStylePanel/ImageStylePanel.vue
+++ b/src/views/Editor/Toolbar/ElementStylePanel/ImageStylePanel.vue
@@ -5,6 +5,8 @@
       :style="{ backgroundImage: `url(${handleElement.src})` }"
     ></div>
 
+    <ElementFlip />
+
     <ButtonGroup class="row">
       <Button style="flex: 5;" @click="clipImage()"><IconTailoring class="btn-icon" /> 裁剪图片</Button>
       <Popover trigger="click" v-model:visible="clipPanelVisible">
@@ -39,27 +41,8 @@
       </Popover>
     </ButtonGroup>
 
-    <Popover trigger="click">
-      <template #content>
-        <div class="filter">
-          <div class="filter-item" v-for="filter in filterOptions" :key="filter.key">
-            <div class="name">{{filter.label}}</div>
-            <Slider
-              class="filter-slider"
-              :max="filter.max"
-              :min="filter.min"
-              :step="filter.step"
-              :value="filter.value"
-              @change="value => updateFilter(filter, value)"
-            />
-            <div class="value">{{filter.value}}</div>
-          </div>
-        </div>
-      </template>
-      <Button class="full-width-btn"><IconColorFilter class="btn-icon" /> 设置滤镜</Button>
-    </Popover>
-  
-    <ElementFlip />
+    <Divider />
+    <ElementFilter />
     <Divider />
     <ElementOutline />
     <Divider />
@@ -75,7 +58,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, ref, watch } from 'vue'
+import { defineComponent, ref } from 'vue'
 import { storeToRefs } from 'pinia'
 import { useMainStore, useSlidesStore } from '@/store'
 import { PPTImageElement, SlideBackground } from '@/types/slides'
@@ -86,26 +69,7 @@ import useHistorySnapshot from '@/hooks/useHistorySnapshot'
 import ElementOutline from '../common/ElementOutline.vue'
 import ElementShadow from '../common/ElementShadow.vue'
 import ElementFlip from '../common/ElementFlip.vue'
-
-interface FilterOption {
-  label: string;
-  key: string;
-  default: number;
-  value: number;
-  unit: string;
-  max: number;
-  step: number;
-}
-
-const defaultFilters: FilterOption[] = [
-  { label: '模糊', key: 'blur', default: 0, value: 0, unit: 'px', max: 10, step: 1 },
-  { label: '亮度', key: 'brightness', default: 100, value: 100, unit: '%', max: 200, step: 5 },
-  { label: '对比度', key: 'contrast', default: 100, value: 100, unit: '%', max: 200, step: 5 },
-  { label: '灰度', key: 'grayscale', default: 0, value: 0, unit: '%', max: 100, step: 5 },
-  { label: '饱和度', key: 'saturate', default: 100, value: 100, unit: '%', max: 200, step: 5 },
-  { label: '色相', key: 'hue-rotate', default: 0, value: 0, unit: 'deg', max: 360, step: 10 },
-  { label: '不透明度', key: 'opacity', default: 100, value: 100, unit: '%', max: 100, step: 5 },
-]
+import ElementFilter from '../common/ElementFilter.vue'
 
 const shapeClipPathOptions = CLIPPATHS
 const ratioClipOptions = [
@@ -147,6 +111,7 @@ export default defineComponent({
     ElementOutline,
     ElementShadow,
     ElementFlip,
+    ElementFilter,
   },
   setup() {
     const mainStore = useMainStore()
@@ -156,33 +121,8 @@ export default defineComponent({
 
     const clipPanelVisible = ref(false)
 
-    const filterOptions = ref<FilterOption[]>(JSON.parse(JSON.stringify(defaultFilters)))
-
-    watch(handleElement, () => {
-      if (!handleElement.value || handleElement.value.type !== 'image') return
-      
-      const filters = handleElement.value.filters
-      if (filters) {
-        filterOptions.value = defaultFilters.map(item => {
-          if (filters[item.key] !== undefined) return { ...item, value: parseInt(filters[item.key]) }
-          return item
-        })
-      }
-      else filterOptions.value = JSON.parse(JSON.stringify(defaultFilters))
-    }, { deep: true, immediate: true })
-
     const { addHistorySnapshot } = useHistorySnapshot()
 
-    // 设置滤镜
-    const updateFilter = (filter: FilterOption, value: number) => {
-      const _handleElement = handleElement.value as PPTImageElement
-      
-      const originFilters = _handleElement.filters || {}
-      const filters = { ...originFilters, [filter.key]: `${value}${filter.unit}` }
-      slidesStore.updateElement({ id: handleElementId.value, props: { filters } })
-      addHistorySnapshot()
-    }
-
     // 打开自由裁剪
     const clipImage = () => {
       mainStore.setClipingImageElementId(handleElementId.value)
@@ -325,9 +265,7 @@ export default defineComponent({
       clipPanelVisible,
       shapeClipPathOptions,
       ratioClipOptions,
-      filterOptions,
       handleElement,
-      updateFilter,
       clipImage,
       presetImageClip,
       replaceImage,
@@ -364,29 +302,6 @@ export default defineComponent({
   margin-right: 3px;
 }
 
-.filter {
-  width: 280px;
-  font-size: 12px;
-}
-.filter-item {
-  padding: 8px 5px;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-
-  .name {
-    width: 60px;
-  }
-  .filter-slider {
-    flex: 1;
-    margin: 0 6px;
-  }
-  .value {
-    width: 40px;
-    text-align: right;
-  }
-}
-
 .clip {
   width: 260px;
   font-size: 12px;
diff --git a/src/views/Editor/Toolbar/common/ElementFilter.vue b/src/views/Editor/Toolbar/common/ElementFilter.vue
new file mode 100644
index 00000000..f2f3cf6e
--- /dev/null
+++ b/src/views/Editor/Toolbar/common/ElementFilter.vue
@@ -0,0 +1,141 @@
+<template>
+  <div class="element-filter">
+    <div class="row">
+      <div style="flex: 2;">启用滤镜：</div>
+      <div class="switch-wrapper" style="flex: 3;">
+        <Switch 
+          :checked="hasFilters" 
+          @change="checked => toggleFilters(checked)" 
+        />
+      </div>
+    </div>
+    <div class="filter" v-if="hasFilters">
+      <div class="filter-item" v-for="filter in filterOptions" :key="filter.key">
+        <div class="name">{{filter.label}}</div>
+        <Slider
+          class="filter-slider"
+          :max="filter.max"
+          :min="filter.min"
+          :step="filter.step"
+          :value="filter.value"
+          @change="value => updateFilter(filter, value)"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { defineComponent, ref, watch } from 'vue'
+import { storeToRefs } from 'pinia'
+import { useMainStore, useSlidesStore } from '@/store'
+import { PPTImageElement } from '@/types/slides'
+import useHistorySnapshot from '@/hooks/useHistorySnapshot'
+
+interface FilterOption {
+  label: string;
+  key: string;
+  default: number;
+  value: number;
+  unit: string;
+  max: number;
+  step: number;
+}
+
+const defaultFilters: FilterOption[] = [
+  { label: '模糊', key: 'blur', default: 0, value: 0, unit: 'px', max: 10, step: 1 },
+  { label: '亮度', key: 'brightness', default: 100, value: 100, unit: '%', max: 200, step: 5 },
+  { label: '对比度', key: 'contrast', default: 100, value: 100, unit: '%', max: 200, step: 5 },
+  { label: '灰度', key: 'grayscale', default: 0, value: 0, unit: '%', max: 100, step: 5 },
+  { label: '饱和度', key: 'saturate', default: 100, value: 100, unit: '%', max: 200, step: 5 },
+  { label: '色相', key: 'hue-rotate', default: 0, value: 0, unit: 'deg', max: 360, step: 10 },
+  { label: '不透明度', key: 'opacity', default: 100, value: 100, unit: '%', max: 100, step: 5 },
+]
+
+export default defineComponent({
+  name: 'element-filter',
+  setup() {
+    const slidesStore = useSlidesStore()
+    const { handleElement, handleElementId } = storeToRefs(useMainStore())
+
+    const filterOptions = ref<FilterOption[]>(JSON.parse(JSON.stringify(defaultFilters)))
+    const hasFilters = ref(false)
+
+    const { addHistorySnapshot } = useHistorySnapshot()
+
+    watch(handleElement, () => {
+      if (!handleElement.value || handleElement.value.type !== 'image') return
+      
+      const filters = handleElement.value.filters
+      if (filters) {
+        filterOptions.value = defaultFilters.map(item => {
+          if (filters[item.key] !== undefined) return { ...item, value: parseInt(filters[item.key]) }
+          return item
+        })
+        hasFilters.value = true
+      }
+      else {
+        filterOptions.value = JSON.parse(JSON.stringify(defaultFilters))
+        hasFilters.value = false
+      }
+    }, { deep: true, immediate: true })
+
+    // 设置滤镜
+    const updateFilter = (filter: FilterOption, value: number) => {
+      const _handleElement = handleElement.value as PPTImageElement
+      
+      const originFilters = _handleElement.filters || {}
+      const filters = { ...originFilters, [filter.key]: `${value}${filter.unit}` }
+      slidesStore.updateElement({ id: handleElementId.value, props: { filters } })
+      addHistorySnapshot()
+    }
+
+    const toggleFilters = (checked: boolean) => {
+      if (!handleElement.value) return
+      if (checked) {
+        slidesStore.updateElement({ id: handleElement.value.id, props: { filters: {} } })
+      }
+      else {
+        slidesStore.removeElementProps({ id: handleElement.value.id, propName: 'filters' })
+      }
+      addHistorySnapshot()
+    }
+
+    return {
+      filterOptions,
+      hasFilters,
+      toggleFilters,
+      updateFilter,
+    }
+  },
+})
+</script>
+
+<style lang="scss" scoped>
+.row {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  margin-bottom: 10px;
+}
+.switch-wrapper {
+  text-align: right;
+}
+.filter {
+  font-size: 12px;
+}
+.filter-item {
+  padding: 8px 0;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  .name {
+    width: 60px;
+  }
+  .filter-slider {
+    flex: 1;
+    margin: 0 6px;
+  }
+}
+</style>
\ No newline at end of file