From 31765e5df31081687015e4367aff987bc082c0bb Mon Sep 17 00:00:00 2001
From: Qiuxia Fan <fine0830@outlook.com>
Date: Sat, 22 Jan 2022 14:35:52 +0800
Subject: [PATCH] fix: update selectors

---
 src/components/Selector.vue                   |  8 ++++-
 .../dashboard/configuration/MetricOptions.vue | 34 +++++++++++--------
 src/views/dashboard/data.ts                   | 20 -----------
 3 files changed, 27 insertions(+), 35 deletions(-)

diff --git a/src/components/Selector.vue b/src/components/Selector.vue
index a693c62d..0aa35528 100644
--- a/src/components/Selector.vue
+++ b/src/components/Selector.vue
@@ -33,7 +33,7 @@ limitations under the License. -->
   </el-select>
 </template>
 <script lang="ts" setup>
-import { ref } from "vue";
+import { ref, watch } from "vue";
 import type { PropType } from "vue";
 import { ElSelect, ElOption } from "element-plus";
 
@@ -70,6 +70,12 @@ function changeSelected() {
   );
   emit("change", options);
 }
+watch(
+  () => props.value,
+  (data) => {
+    selected.value = data;
+  }
+);
 </script>
 <style lang="scss" scope>
 .icon {
diff --git a/src/views/dashboard/configuration/MetricOptions.vue b/src/views/dashboard/configuration/MetricOptions.vue
index 3c7cecac..03d3d631 100644
--- a/src/views/dashboard/configuration/MetricOptions.vue
+++ b/src/views/dashboard/configuration/MetricOptions.vue
@@ -44,20 +44,26 @@ limitations under the License. -->
       @change="changeMetricType(index, $event)"
       class="selectors"
     />
-    <Icon
-      class="cp mr-5"
-      v-show="index === states.metrics.length - 1 && states.metrics.length < 5"
-      iconName="add_circle_outlinecontrol_point"
-      size="middle"
-      @click="addMetric"
-    />
-    <Icon
-      class="cp"
-      v-show="states.metrics.length > 1"
-      iconName="remove_circle_outline"
-      size="middle"
-      @click="deleteMetric(index)"
-    />
+    <span
+      v-show="states.isTable || states.metricTypes[0] === 'readMetricsValues'"
+    >
+      <Icon
+        class="cp mr-5"
+        v-show="
+          index === states.metrics.length - 1 && states.metrics.length < 5
+        "
+        iconName="add_circle_outlinecontrol_point"
+        size="middle"
+        @click="addMetric"
+      />
+      <Icon
+        class="cp"
+        v-show="states.metrics.length > 1"
+        iconName="remove_circle_outline"
+        size="middle"
+        @click="deleteMetric(index)"
+      />
+    </span>
   </div>
 </template>
 <script lang="ts" setup>
diff --git a/src/views/dashboard/data.ts b/src/views/dashboard/data.ts
index d8730f17..2fd64d75 100644
--- a/src/views/dashboard/data.ts
+++ b/src/views/dashboard/data.ts
@@ -117,18 +117,6 @@ export const MetricChartType: { [key: string]: string } = {
   readHeatMap: "ChartHeatmap",
   readSampledRecords: "ChartSlow",
 };
-export const CalculationType = [
-  { label: "Plus", value: "+" },
-  { label: "Minus", value: "-" },
-  { label: "Multiplication", value: "*" },
-  { label: "Division", value: "/" },
-  { label: "Convert Unix Timestamp(milliseconds)", value: "milliseconds" },
-  { label: "Convert Unix Timestamp(seconds)", value: "seconds" },
-];
-export const ReadValueChartType = [
-  { value: "ChartNum", label: "Digital Card" },
-  { value: "ChartSlow", label: "Slow Chart" },
-];
 
 export enum MetricCatalog {
   SERVICE = "Service",
@@ -139,14 +127,6 @@ export enum MetricCatalog {
   SERVICE_INSTANCE_RELATION = "ServiceInstanceRelation",
   ENDPOINT_RELATION = "EndpointRelation",
 }
-
-export enum MetricsName {
-  SERVICE_RESP_TIME = "service_resp_time",
-  SERVICE_SLA = "service_sla",
-  SERVICE_CPM = "service_cpm",
-  SERVICE_PERCENTILE = "service_percentile",
-  SERVICE_APDEX = "service_apdex",
-}
 export const EntityType = [
   { value: "Service", label: "Service", key: 1 },
   { value: "All", label: "All", key: 10 },