From cea367ce54b74b4bc2b18f4e182f1d1f47562808 Mon Sep 17 00:00:00 2001
From: Fine <fanxue0830@gmail.com>
Date: Wed, 12 Oct 2022 16:44:24 +0800
Subject: [PATCH] refactor

---
 src/components/Graph.vue           | 57 +++++----------------------
 src/hooks/useAssociateProcessor.ts | 63 ++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+), 48 deletions(-)
 create mode 100644 src/hooks/useAssociateProcessor.ts

diff --git a/src/components/Graph.vue b/src/components/Graph.vue
index add9083b..dbde4827 100644
--- a/src/components/Graph.vue
+++ b/src/components/Graph.vue
@@ -54,6 +54,7 @@ import { addResizeListener, removeResizeListener } from "@/utils/event";
 import Trace from "@/views/dashboard/controls/Trace.vue";
 import dateFormatStep from "@/utils/dateFormat";
 import getLocalTime from "@/utils/localtime";
+import associateProcessor from "@/hooks/useAssociateProcessor";
 
 /*global Nullable, defineProps, defineEmits*/
 const emits = defineEmits(["select"]);
@@ -65,6 +66,7 @@ const visMenus = ref<boolean>(false);
 const { setOptions, resize, getInstance } = useECharts(
   chartRef as Ref<HTMLDivElement>
 );
+const { eventAssociate } = associateProcessor();
 const currentParams = ref<Nullable<EventParams>>(null);
 const showTrace = ref<boolean>(false);
 const traceOptions = ref<{ type: string; filters?: unknown }>({
@@ -99,6 +101,10 @@ const available = computed(
 onMounted(async () => {
   await setOptions(props.option);
   chartRef.value && addResizeListener(unref(chartRef), resize);
+  instanceEvent();
+});
+
+function instanceEvent() {
   setTimeout(() => {
     const instance = getInstance();
 
@@ -132,7 +138,7 @@ onMounted(async () => {
       true
     );
   }, 1000);
-});
+}
 
 function associateMetrics() {
   emits("select", currentParams.value);
@@ -148,7 +154,7 @@ function updateOptions() {
     return;
   }
   if (props.filters.isRange) {
-    const options = eventAssociate();
+    const options = eventAssociate(props);
     setOptions(options || props.option);
   } else {
     instance.dispatchAction({
@@ -188,51 +194,6 @@ function viewTrace() {
   showTrace.value = true;
 }
 
-function eventAssociate() {
-  if (!props.filters) {
-    return;
-  }
-  if (!props.filters.duration) {
-    return props.option;
-  }
-  if (!props.option.series[0]) {
-    return;
-  }
-  const list = props.option.series[0].data.map(
-    (d: (number | string)[]) => d[0]
-  );
-  if (!list.includes(props.filters.duration.endTime)) {
-    return;
-  }
-  const markArea = {
-    silent: true,
-    itemStyle: {
-      opacity: 0.3,
-    },
-    data: [
-      [
-        {
-          xAxis: props.filters.duration.startTime,
-        },
-        {
-          xAxis: props.filters.duration.endTime,
-        },
-      ],
-    ],
-  };
-  const series = (window as any).structuredClone(props.option.series);
-  for (const [key, temp] of series.entries()) {
-    if (key === 0) {
-      temp.markArea = markArea;
-    }
-  }
-  const options = {
-    ...props.option,
-    series,
-  };
-  return options;
-}
-
 watch(
   () => props.option,
   (newVal, oldVal) => {
@@ -244,7 +205,7 @@ watch(
     }
     let options;
     if (props.filters && props.filters.isRange) {
-      options = eventAssociate();
+      options = eventAssociate(props);
     }
     setOptions(options || props.option);
   }
diff --git a/src/hooks/useAssociateProcessor.ts b/src/hooks/useAssociateProcessor.ts
new file mode 100644
index 00000000..5e6fba1b
--- /dev/null
+++ b/src/hooks/useAssociateProcessor.ts
@@ -0,0 +1,63 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export default function associateProcessor() {
+  function eventAssociate(props: any) {
+    if (!props.filters) {
+      return;
+    }
+    if (!props.filters.duration) {
+      return props.option;
+    }
+    if (!props.option.series[0]) {
+      return;
+    }
+    const list = props.option.series[0].data.map(
+      (d: (number | string)[]) => d[0]
+    );
+    if (!list.includes(props.filters.duration.endTime)) {
+      return;
+    }
+    const markArea = {
+      silent: true,
+      itemStyle: {
+        opacity: 0.3,
+      },
+      data: [
+        [
+          {
+            xAxis: props.filters.duration.startTime,
+          },
+          {
+            xAxis: props.filters.duration.endTime,
+          },
+        ],
+      ],
+    };
+    const series = (window as any).structuredClone(props.option.series);
+    for (const [key, temp] of series.entries()) {
+      if (key === 0) {
+        temp.markArea = markArea;
+      }
+    }
+    const options = {
+      ...props.option,
+      series,
+    };
+    return options;
+  }
+  return { eventAssociate };
+}