From 0fc4d44ba23f827cbac78a7df9d46f33a4d07d0f Mon Sep 17 00:00:00 2001
From: MTrun <1262327911@qq.com>
Date: Mon, 24 Jan 2022 16:25:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hooks/{asideHook.ts => useAside.hook.ts}  |  2 +-
 .../{layoutHook.ts => useLayout.hook.ts}      |  0
 .../chart/components/ContentCharts/index.vue  |  2 +-
 .../components/EditBottom/index.vue           |  2 +-
 .../ContentEdit/hooks/useLayout.hook.ts       | 29 +++++++++++++++++++
 .../hooks/{useStore.ts => useStore.hook.ts}   |  0
 .../chart/components/ContentEdit/index.vue    | 28 ++----------------
 7 files changed, 35 insertions(+), 28 deletions(-)
 rename src/views/chart/components/ContentCharts/hooks/{asideHook.ts => useAside.hook.ts} (97%)
 rename src/views/chart/components/ContentCharts/hooks/{layoutHook.ts => useLayout.hook.ts} (100%)
 create mode 100644 src/views/chart/components/ContentEdit/hooks/useLayout.hook.ts
 rename src/views/chart/components/ContentEdit/hooks/{useStore.ts => useStore.hook.ts} (100%)

diff --git a/src/views/chart/components/ContentCharts/hooks/asideHook.ts b/src/views/chart/components/ContentCharts/hooks/useAside.hook.ts
similarity index 97%
rename from src/views/chart/components/ContentCharts/hooks/asideHook.ts
rename to src/views/chart/components/ContentCharts/hooks/useAside.hook.ts
index fa51c5fa..eef2fd6d 100644
--- a/src/views/chart/components/ContentCharts/hooks/asideHook.ts
+++ b/src/views/chart/components/ContentCharts/hooks/useAside.hook.ts
@@ -1,7 +1,7 @@
 import { reactive, ref } from 'vue'
 import { icon } from '@/plugins'
 import { renderLang, renderIcon } from '@/utils'
-import { themeColor, setItem, getCharts } from './layoutHook'
+import { themeColor, setItem, getCharts } from './useLayout.hook'
 import { PackagesCategoryEnum, PackagesCategoryName } from '@/packages/index.d'
 // 图表
 import { usePackagesStore } from '@/store/modules/packagesStore/packagesStore'
diff --git a/src/views/chart/components/ContentCharts/hooks/layoutHook.ts b/src/views/chart/components/ContentCharts/hooks/useLayout.hook.ts
similarity index 100%
rename from src/views/chart/components/ContentCharts/hooks/layoutHook.ts
rename to src/views/chart/components/ContentCharts/hooks/useLayout.hook.ts
diff --git a/src/views/chart/components/ContentCharts/index.vue b/src/views/chart/components/ContentCharts/index.vue
index 30c965bd..117ee7d1 100644
--- a/src/views/chart/components/ContentCharts/index.vue
+++ b/src/views/chart/components/ContentCharts/index.vue
@@ -54,7 +54,7 @@ import {
   selectValue,
   clickItemHandle,
   menuOptions
-} from './hooks/asideHook'
+} from './hooks/useAside.hook'
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/chart/components/ContentEdit/components/EditBottom/index.vue b/src/views/chart/components/ContentEdit/components/EditBottom/index.vue
index 6264a89e..7267d52f 100644
--- a/src/views/chart/components/ContentEdit/components/EditBottom/index.vue
+++ b/src/views/chart/components/ContentEdit/components/EditBottom/index.vue
@@ -59,7 +59,7 @@ import { reactive, ref, toRefs, shallowReactive, watchEffect } from 'vue'
 import { icon } from '@/plugins'
 const { LockClosedOutlineIcon, LockOpenOutlineIcon } = icon.ionicons5
 const { DicomOverlayIcon } = icon.carbon
-import { getChartEditStore, getChartEditStoreEnum } from '../../hooks/useStore'
+import { getChartEditStore, getChartEditStoreEnum } from '../../hooks/useStore.hook'
 import { useDesignStore } from '@/store/modules/designStore/designStore'
 
 // 全局颜色
diff --git a/src/views/chart/components/ContentEdit/hooks/useLayout.hook.ts b/src/views/chart/components/ContentEdit/hooks/useLayout.hook.ts
new file mode 100644
index 00000000..b945d40e
--- /dev/null
+++ b/src/views/chart/components/ContentEdit/hooks/useLayout.hook.ts
@@ -0,0 +1,29 @@
+import { onUnmounted, onMounted } from 'vue'
+import { getChartEditStore } from './useStore.hook'
+import { EditCanvasTypeEnum } from '@/store/modules/chartEditStore/chartEditStore.d'
+
+const chartEditStore = getChartEditStore()
+
+export const useLayout = () => {
+  onMounted(() => {
+    // 设置 Dom 值(ref 不生效先用document)
+    chartEditStore.setEditCanvasItem(
+      EditCanvasTypeEnum.EDITLAYOUTDOM,
+      document.getElementById('go-chart-edit-layout')
+    )
+    chartEditStore.setEditCanvasItem(
+      EditCanvasTypeEnum.EDITCONTENTDON,
+      document.getElementById('go-chart-edit-content')
+    )
+
+    // 大小初始化
+    chartEditStore.setPageSize()
+
+    // 监听初始化
+    const removeScale = chartEditStore.listenerScale()
+
+    onUnmounted(() => {
+      removeScale()
+    })
+  })
+}
diff --git a/src/views/chart/components/ContentEdit/hooks/useStore.ts b/src/views/chart/components/ContentEdit/hooks/useStore.hook.ts
similarity index 100%
rename from src/views/chart/components/ContentEdit/hooks/useStore.ts
rename to src/views/chart/components/ContentEdit/hooks/useStore.hook.ts
diff --git a/src/views/chart/components/ContentEdit/index.vue b/src/views/chart/components/ContentEdit/index.vue
index 6ddacfeb..75c1afa4 100644
--- a/src/views/chart/components/ContentEdit/index.vue
+++ b/src/views/chart/components/ContentEdit/index.vue
@@ -23,32 +23,10 @@ import { onUnmounted, onMounted } from 'vue'
 import { ContentBox } from '../ContentBox/index'
 import { EditRange } from './components/EditRange'
 import { EditBottom } from './components/EditBottom'
-import { getChartEditStore } from './hooks/useStore'
-import { EditCanvasTypeEnum } from '@/store/modules/chartEditStore/chartEditStore.d'
+import { useLayout } from './hooks/useLayout.hook'
 
-const chartEditStore = getChartEditStore()
-
-onMounted(() => {
-  // 设置 Dom 值(ref 不生效先用document)
-  chartEditStore.setEditCanvasItem(
-    EditCanvasTypeEnum.EDITLAYOUTDOM,
-    document.getElementById('go-chart-edit-layout')
-  )
-  chartEditStore.setEditCanvasItem(
-    EditCanvasTypeEnum.EDITCONTENTDON,
-    document.getElementById('go-chart-edit-content')
-  )
-
-  // 大小初始化
-  chartEditStore.setPageSize()
-
-  // 监听初始化
-  const removeScale = chartEditStore.listenerScale()
-
-  onUnmounted(() => {
-    removeScale()
-  })
-})
+// 布局处理
+useLayout()
 
 </script>