From 0bd5587e6577aef4f2c81ddc370cd59a93e97510 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?=
 <1262327911@qq.com>
Date: Tue, 9 Aug 2022 21:08:25 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20=E5=A4=84=E7=90=86=E5=88=86=E7=BB=84?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E7=9A=84=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/ChartItemSetting/SizeSetting.vue    |  6 ++
 .../Pages/ChartItemSetting/StylesSetting.vue  | 37 +++++-----
 .../components/CanvasPage/index.vue           |  2 +-
 .../components/ChartSetting/index.vue         |  4 +-
 .../chart/ContentConfigurations/index.vue     | 68 +++++++------------
 .../components/EditGroup/index.vue            |  5 +-
 src/views/chart/hooks/useContextMenu.hook.ts  | 12 +++-
 7 files changed, 63 insertions(+), 71 deletions(-)

diff --git a/src/components/Pages/ChartItemSetting/SizeSetting.vue b/src/components/Pages/ChartItemSetting/SizeSetting.vue
index 0ce40a13..5aa8c87f 100644
--- a/src/components/Pages/ChartItemSetting/SizeSetting.vue
+++ b/src/components/Pages/ChartItemSetting/SizeSetting.vue
@@ -3,6 +3,7 @@
     <n-input-number
       v-model:value="chartAttr.w"
       :min="50"
+      :disabled="isGroup"
       size="small"
       placeholder="px"
     >
@@ -13,6 +14,7 @@
     <n-input-number
       v-model:value="chartAttr.h"
       :min="50"
+      :disabled="isGroup"
       size="small"
       placeholder="px"
     >
@@ -32,6 +34,10 @@ const props = defineProps({
   chartAttr: {
     type: Object as PropType<Omit<PickCreateComponentType<'attr'>, 'node' | 'conNode'>>,
     required: true
+  },
+  isGroup: {
+    type: Boolean,
+    required: false
   }
 })
 </script>
diff --git a/src/components/Pages/ChartItemSetting/StylesSetting.vue b/src/components/Pages/ChartItemSetting/StylesSetting.vue
index f4e875ec..f14076b8 100644
--- a/src/components/Pages/ChartItemSetting/StylesSetting.vue
+++ b/src/components/Pages/ChartItemSetting/StylesSetting.vue
@@ -1,4 +1,9 @@
 <template>
+  <div v-show="isGroup">
+    <n-divider n-divider style="margin: 10px 0"></n-divider>
+    <n-tag type="warning"> 解散分组「  {{ isCanvas ? '滤镜' : '滤镜 / 变换' }} 」也将消失!</n-tag>
+  </div>
+
   <collapse-item :name="isCanvas ? '滤镜' : '滤镜 / 变换'">
     <setting-item-box name="色相" :alone="true">
       <setting-item :name="`值：${chartStyles.hueRotate}deg`">
@@ -13,9 +18,7 @@
       </setting-item>
     </setting-item-box>
     <setting-item-box name="饱和度" :alone="true">
-      <setting-item
-        :name="`值：${(parseFloat(String(chartStyles.saturate)) * 100).toFixed(0)}%`"
-      >
+      <setting-item :name="`值：${(parseFloat(String(chartStyles.saturate)) * 100).toFixed(0)}%`">
         <!-- 透明度 -->
         <n-slider
           v-model:value="chartStyles.saturate"
@@ -27,9 +30,7 @@
       </setting-item>
     </setting-item-box>
     <setting-item-box name="对比度" :alone="true">
-      <setting-item
-        :name="`值：${(parseFloat(String(chartStyles.contrast)) * 100).toFixed(0)}%`"
-      >
+      <setting-item :name="`值：${(parseFloat(String(chartStyles.contrast)) * 100).toFixed(0)}%`">
         <!-- 透明度 -->
         <n-slider
           v-model:value="chartStyles.contrast"
@@ -41,9 +42,7 @@
       </setting-item>
     </setting-item-box>
     <setting-item-box name="亮度" :alone="true">
-      <setting-item
-        :name="`值：${(parseFloat(String(chartStyles.brightness)) * 100).toFixed(0)}%`"
-      >
+      <setting-item :name="`值：${(parseFloat(String(chartStyles.brightness)) * 100).toFixed(0)}%`">
         <!-- 透明度 -->
         <n-slider
           v-model:value="chartStyles.brightness"
@@ -55,9 +54,7 @@
       </setting-item>
     </setting-item-box>
     <setting-item-box name="透明度" :alone="true">
-      <setting-item
-        :name="`值：${(parseFloat(String(chartStyles.opacity)) * 100).toFixed(0)}%`"
-      >
+      <setting-item :name="`值：${(parseFloat(String(chartStyles.opacity)) * 100).toFixed(0)}%`">
         <!-- 透明度 -->
         <n-slider
           v-model:value="chartStyles.opacity"
@@ -68,7 +65,7 @@
         ></n-slider>
       </setting-item>
     </setting-item-box>
-    
+
     <!-- 变换 -->
     <setting-item-box v-if="!isCanvas" name="旋转°">
       <setting-item name="Z轴(平面) - 旋转">
@@ -130,21 +127,21 @@
 <script setup lang="ts">
 import { PropType } from 'vue'
 import { PickCreateComponentType } from '@/packages/index.d'
-import {
-  SettingItemBox,
-  SettingItem,
-  CollapseItem,
-} from '@/components/Pages/ChartItemSetting'
+import { SettingItemBox, SettingItem, CollapseItem } from '@/components/Pages/ChartItemSetting'
 
 const props = defineProps({
+  isGroup: {
+    type: Boolean,
+    required: false
+  },
   isCanvas: {
     type: Boolean,
     default: false
   },
   chartStyles: {
     type: Object as PropType<Omit<PickCreateComponentType<'styles'>, 'animations'>>,
-    required: true,
-  },
+    required: true
+  }
 })
 
 // 百分比格式化persen
diff --git a/src/views/chart/ContentConfigurations/components/CanvasPage/index.vue b/src/views/chart/ContentConfigurations/components/CanvasPage/index.vue
index 13287cfc..040823e1 100644
--- a/src/views/chart/ContentConfigurations/components/CanvasPage/index.vue
+++ b/src/views/chart/ContentConfigurations/components/CanvasPage/index.vue
@@ -96,7 +96,7 @@
     </n-space>
 
     <!-- 滤镜 -->
-    <styles-setting :is-canvas="true" :chartStyles="canvasConfig"></styles-setting>
+    <styles-setting :isCanvas="true" :chartStyles="canvasConfig"></styles-setting>
     <n-divider style="margin: 10px 0;"></n-divider>
 
     <!-- 主题选择和全局配置 -->
diff --git a/src/views/chart/ContentConfigurations/components/ChartSetting/index.vue b/src/views/chart/ContentConfigurations/components/ChartSetting/index.vue
index 4e112295..6718e34f 100644
--- a/src/views/chart/ContentConfigurations/components/ChartSetting/index.vue
+++ b/src/views/chart/ContentConfigurations/components/ChartSetting/index.vue
@@ -3,11 +3,11 @@
     <!-- 名称 -->
     <name-setting :chartConfig="targetData.chartConfig"></name-setting>
     <!-- 尺寸 -->
-    <size-setting :chartAttr="targetData.attr"></size-setting>
+    <size-setting :isGroup="targetData.isGroup" :chartAttr="targetData.attr"></size-setting>
     <!-- 位置 -->
     <position-setting :chartAttr="targetData.attr" :canvasConfig="chartEditStore.getEditCanvasConfig"/>
     <!-- 滤镜 -->
-    <styles-setting :chartStyles="targetData.styles"></styles-setting>
+    <styles-setting :isGroup="targetData.isGroup" :chartStyles="targetData.styles"></styles-setting>
     <!-- 自定义配置项 -->
     <component :is="targetData.chartConfig.conKey" :optionData="targetData.option"></component>
   </div>
diff --git a/src/views/chart/ContentConfigurations/index.vue b/src/views/chart/ContentConfigurations/index.vue
index 92ba612d..90947d95 100644
--- a/src/views/chart/ContentConfigurations/index.vue
+++ b/src/views/chart/ContentConfigurations/index.vue
@@ -11,21 +11,12 @@
       :collapsed="collapsed"
       :native-scrollbar="false"
       show-trigger="bar"
-      @collapse="collapsedHindle"
-      @expand="expandHindle"
+      @collapse="collapsedHandle"
+      @expand="expandHandle"
     >
-      <content-box
-        class="go-content-layers go-boderbox"
-        :show-top="false"
-        :depth="2"
-      >
+      <content-box class="go-content-layers go-boderbox" :show-top="false" :depth="2">
         <!-- 页面配置 -->
-        <n-tabs
-          v-show="!selectTarget"
-          class="tabs-box"
-          size="small"
-          type="segment"
-        >
+        <n-tabs v-if="!selectTarget" class="tabs-box" size="small" type="segment">
           <n-tab-pane
             v-for="item in globalTabList"
             :key="item.key"
@@ -46,14 +37,9 @@
         </n-tabs>
 
         <!-- 编辑 -->
-        <n-tabs
-          v-show="selectTarget"
-          class="tabs-box"
-          size="small"
-          type="segment"
-        >
+        <n-tabs v-if="selectTarget" class="tabs-box" size="small" type="segment">
           <n-tab-pane
-            v-for="(item) in canvasTabList"
+            v-for="item in selectTarget.isGroup ? chartsDefaultTabList : chartsTabList"
             :key="item.key"
             :name="item.key"
             size="small"
@@ -88,35 +74,22 @@ const { getDetails } = toRefs(useChartLayoutStore())
 const { setItem } = useChartLayoutStore()
 const chartEditStore = useChartEditStore()
 
-const {
-  ConstructIcon,
-  FlashIcon,
-  DesktopOutlineIcon,
-  LeafIcon
-} = icon.ionicons5
+const { ConstructIcon, FlashIcon, DesktopOutlineIcon, LeafIcon } = icon.ionicons5
 
 const ContentEdit = loadAsyncComponent(() => import('../ContentEdit/index.vue'))
-const CanvasPage = loadAsyncComponent(() =>
-  import('./components/CanvasPage/index.vue')
-)
-const ChartSetting = loadAsyncComponent(() =>
-  import('./components/ChartSetting/index.vue')
-)
-const ChartData = loadAsyncComponent(() =>
-  import('./components/ChartData/index.vue')
-)
-const ChartAnimation = loadAsyncComponent(() =>
-  import('./components/ChartAnimation/index.vue')
-)
+const CanvasPage = loadAsyncComponent(() => import('./components/CanvasPage/index.vue'))
+const ChartSetting = loadAsyncComponent(() => import('./components/ChartSetting/index.vue'))
+const ChartData = loadAsyncComponent(() => import('./components/ChartData/index.vue'))
+const ChartAnimation = loadAsyncComponent(() => import('./components/ChartAnimation/index.vue'))
 
 const collapsed = ref<boolean>(getDetails.value)
 
-const collapsedHindle = () => {
+const collapsedHandle = () => {
   collapsed.value = true
   setItem(ChartLayoutStoreEnum.DETAILS, true)
 }
 
-const expandHindle = () => {
+const expandHandle = () => {
   collapsed.value = false
   setItem(ChartLayoutStoreEnum.DETAILS, false)
 }
@@ -125,14 +98,15 @@ const selectTarget = computed(() => {
   const selectId = chartEditStore.getTargetChart.selectId
   // 排除多个
   if (selectId.length !== 1) return undefined
-  return chartEditStore.componentList[chartEditStore.fetchTargetIndex()]
+  const target = chartEditStore.componentList[chartEditStore.fetchTargetIndex()]
+  return target
 })
 
 watch(getDetails, newData => {
   if (newData) {
-    collapsedHindle()
+    collapsedHandle()
   } else {
-    expandHindle()
+    expandHandle()
   }
 })
 
@@ -146,7 +120,7 @@ const globalTabList = [
   }
 ]
 
-const canvasTabList = [
+const chartsDefaultTabList = [
   {
     key: 'ChartSetting',
     title: '定制',
@@ -158,7 +132,11 @@ const canvasTabList = [
     title: '动画',
     icon: LeafIcon,
     render: ChartAnimation
-  },
+  }
+]
+
+const chartsTabList = [
+  ...chartsDefaultTabList,
   {
     key: 'ChartData',
     title: '数据',
diff --git a/src/views/chart/ContentEdit/components/EditGroup/index.vue b/src/views/chart/ContentEdit/components/EditGroup/index.vue
index c7f97fd6..2cc7aed3 100644
--- a/src/views/chart/ContentEdit/components/EditGroup/index.vue
+++ b/src/views/chart/ContentEdit/components/EditGroup/index.vue
@@ -16,7 +16,7 @@
       @mousedown="mousedownHandle($event, groupData)"
       @mouseenter="mouseenterHandle($event, groupData)"
       @mouseleave="mouseleaveHandle($event, groupData)"
-      @contextmenu="handleContextMenu($event, groupData, undefined, undefined)"
+      @contextmenu="handleContextMenu($event, groupData, undefined, hideOptionsList)"
     >
       <!-- 组合组件 -->
       <edit-shape-box
@@ -74,6 +74,9 @@ const props = defineProps({
 const chartEditStore = useChartEditStore()
 const { handleContextMenu } = useContextMenu()
 
+// 去除创建分组按钮
+const hideOptionsList = [MenuEnum.GROUP]
+
 // 点击事件
 const { mouseenterHandle, mouseleaveHandle, mousedownHandle, mouseClickHandle } = useMouseHandle()
 
diff --git a/src/views/chart/hooks/useContextMenu.hook.ts b/src/views/chart/hooks/useContextMenu.hook.ts
index 78bc1cd0..42f55043 100644
--- a/src/views/chart/hooks/useContextMenu.hook.ts
+++ b/src/views/chart/hooks/useContextMenu.hook.ts
@@ -12,6 +12,14 @@ const { UpToTopIcon, DownToBottomIcon, PaintBrushIcon, Carbon3DSoftwareIcon, Car
 
 const chartEditStore = useChartEditStore()
 
+// * 分割线
+const divider = [
+  {
+    type: 'divider',
+    key: 'd3'
+  }
+]
+
 // * 默认单组件选项
 export const defaultOptions: MenuOptionsItemType[] = [
   {
@@ -163,10 +171,10 @@ const handleContextMenu = (
     menuOptions.value = pickOption(toRaw(menuOptions.value), defaultNoItemKeys)
   }
   if (hideOptionsList) {
-    menuOptions.value = hideOption([...defaultMultiSelectOptions, ...defaultOptions], hideOptionsList)
+    menuOptions.value = hideOption([...defaultMultiSelectOptions, ...divider, ...defaultOptions], hideOptionsList)
   }
   if (pickOptionsList) {
-    menuOptions.value = pickOption([...defaultMultiSelectOptions, ...defaultOptions], pickOptionsList)
+    menuOptions.value = pickOption([...defaultMultiSelectOptions, ...divider, ...defaultOptions], pickOptionsList)
   }
   if (optionsHandle) {
     // 自定义函数能够拿到当前选项和所有选项