From 87e6cb7e84e5afd189f16ebff2f0c9fe2376915c Mon Sep 17 00:00:00 2001
From: Qiuxia Fan <fine0830@outlook.com>
Date: Sat, 26 Mar 2022 12:29:29 +0800
Subject: [PATCH] update cofig

---
 src/hooks/useProcessor.ts                              |  1 -
 src/views/dashboard/configuration/Widget.vue           |  2 +-
 .../widget/metric/{Options.vue => Index.vue}           | 10 ++++++++--
 src/views/dashboard/data.ts                            |  9 ++++++---
 4 files changed, 15 insertions(+), 7 deletions(-)
 rename src/views/dashboard/configuration/widget/metric/{Options.vue => Index.vue} (97%)

diff --git a/src/hooks/useProcessor.ts b/src/hooks/useProcessor.ts
index b03f6524..f5ecdfb0 100644
--- a/src/hooks/useProcessor.ts
+++ b/src/hooks/useProcessor.ts
@@ -335,6 +335,5 @@ function aggregation(val: number, config: any): number | string {
       break;
   }
 
-  console.log(data);
   return data;
 }
diff --git a/src/views/dashboard/configuration/Widget.vue b/src/views/dashboard/configuration/Widget.vue
index 84fc4177..67f6949e 100644
--- a/src/views/dashboard/configuration/Widget.vue
+++ b/src/views/dashboard/configuration/Widget.vue
@@ -85,7 +85,7 @@ import { Option } from "@/types/app";
 import graphs from "../graphs";
 import configs from "./widget/graph-styles";
 import WidgetOptions from "./widget/WidgetOptions.vue";
-import MetricOptions from "./widget/metric/Options.vue";
+import MetricOptions from "./widget/metric/Index.vue";
 
 export default defineComponent({
   name: "WidgetEdit",
diff --git a/src/views/dashboard/configuration/widget/metric/Options.vue b/src/views/dashboard/configuration/widget/metric/Index.vue
similarity index 97%
rename from src/views/dashboard/configuration/widget/metric/Options.vue
rename to src/views/dashboard/configuration/widget/metric/Index.vue
index 74170a6d..8d6a9f42 100644
--- a/src/views/dashboard/configuration/widget/metric/Options.vue
+++ b/src/views/dashboard/configuration/widget/metric/Index.vue
@@ -49,13 +49,18 @@ limitations under the License. -->
       @change="changeMetricType(index, $event)"
       class="selectors"
     />
-    <el-popover placement="top" :width="400" :visible="showConfig">
+    <el-popover placement="top" :width="400" trigger="click">
       <template #reference>
         <span @click="setMetricConfig(index)">
           <Icon class="cp mr-5" iconName="mode_edit" size="middle" />
         </span>
       </template>
-      <Standard @update="queryMetrics" @close="showConfig = false" />
+      <Standard
+        @update="queryMetrics"
+        @close="showConfig = false"
+        :currentMetricConfig="currentMetricConfig"
+        :index="index"
+      />
     </el-popover>
     <span
       v-show="states.isList || states.metricTypes[0] === 'readMetricsValues'"
@@ -402,6 +407,7 @@ function deleteMetric(index: number) {
     ...{ metricTypes: states.metricTypes, metrics: states.metrics },
     metricConfig,
   });
+  console.log(dashboardStore.selectedGrid);
 }
 function setMetricTypeList(type: string) {
   if (type !== MetricsType.REGULAR_VALUE) {
diff --git a/src/views/dashboard/data.ts b/src/views/dashboard/data.ts
index d1e3baaf..c9b061a4 100644
--- a/src/views/dashboard/data.ts
+++ b/src/views/dashboard/data.ts
@@ -267,8 +267,11 @@ export const TextColors: { [key: string]: string } = {
 
 export const CalculationOpts = [
   { label: "Percentage", value: "percentage" },
-  { label: "ByteToKB", value: "byteToKB" },
-  { label: "ConvertMilliseconds", value: "convertMilliseconds" },
-  { label: "ConvertSeconds", value: "convertSeconds" },
+  { label: "Byte to KB", value: "byteToKB" },
   { label: "Apdex", value: "apdex" },
+  {
+    label: "Convert milliseconds to YYYY-MM-DD HH:mm:ss",
+    value: "convertMilliseconds",
+  },
+  { label: "Convert seconds to YYYY-MM-DD HH:mm:ss", value: "convertSeconds" },
 ];