feat: support multiple metrics on metric options

src/assets/icons/remove_circle_outline.svg

@@ -0,0 +1,18 @@
+<!-- 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. -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+<title>remove_circle_outline</title>
+<path d="M12 20.016q3.281 0 5.648-2.367t2.367-5.648-2.367-5.648-5.648-2.367-5.648 2.367-2.367 5.648 2.367 5.648 5.648 2.367zM12 2.016q4.125 0 7.055 2.93t2.93 7.055-2.93 7.055-7.055 2.93-7.055-2.93-2.93-7.055 2.93-7.055 7.055-2.93zM6.984 11.016h10.031v1.969h-10.031v-1.969z"></path>
+</svg>

src/components/Selector.vue

@@ -20,6 +20,7 @@ limitations under the License. -->
     @change="changeSelected"
     filterable
     :multiple="multiple"
+    :disabled="disabled"
     :style="{ borderRadius }"
   >
     <el-option
@@ -56,7 +57,9 @@ const props = defineProps({
   placeholder: { type: String, default: "Select a option" },
   borderRadius: { type: Number, default: 3 },
   multiple: { type: Boolean, default: false },
+  disabled: { type: Boolean, default: false },
 });
+
 const selected = ref<string[] | string>(props.value);
 function changeSelected() {
   const options = props.options.filter((d: Option) =>

src/views/dashboard/configuration/MetricOptions.vue

@@ -23,23 +23,40 @@ limitations under the License. -->
       class="selectors"
     />
   </div>
-  <div>
+  <div
+    v-for="(metric, index) in states.metrics"
+    :key="index"
+    class="metric-item"
+  >
     <Selector
-      :value="states.metrics"
+      :value="metric"
       :options="states.metricList"
-      :multiple="true"
       size="mini"
       placeholder="Select a metric"
-      @change="changeMetrics"
+      @change="changeMetrics(index, $event)"
       class="selectors"
     />
     <Selector
-      :value="states.metricTypes"
+      :value="states.metricTypes[index]"
-      :options="states.metricTypeList"
+      :options="states.metricTypeList[index]"
       size="mini"
-      @change="changeMetricType"
+      :disabled="states.graph.type && !states.isTable && index !== 0"
+      @change="changeMetricType(index, $event)"
       class="selectors"
-      :multiple="true"
+    />
+    <Icon
+      class="cp mr-5"
+      v-show="index === states.metrics.length - 1 && index < 6"
+      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)"
     />
   </div>
 </template>
@@ -50,8 +67,9 @@ import { useRoute } from "vue-router";
 import { Option } from "@/types/app";
 import { GraphConfig } from "@/types/dashboard";
 import { useDashboardStore } from "@/store/modules/dashboard";
-import { MetricTypes, MetricQueryTypes, TableChartTypes } from "../data";
+import { MetricTypes, TableChartTypes } from "../data";
 import { ElMessage } from "element-plus";
+import Icon from "@/components/Icon.vue";
 
 const props = defineProps({
   graph: {
@@ -65,25 +83,26 @@ const { selectedGrid } = dashboardStore;
 const states = reactive<{
   metrics: string[];
   metricTypes: string[];
-  metricTypeList: Option[];
+  metricTypeList: Option[][];
-  metricQueryType: string;
   visType: Option[];
   isTable: boolean;
   metricList: (Option & { type: string })[];
   graph: GraphConfig | any;
 }>({
-  metrics: selectedGrid.metrics || [],
+  metrics: selectedGrid.metrics || [""],
-  metricTypes: selectedGrid.metricTypes || [],
+  metricTypes: selectedGrid.metricTypes || [""],
   metricTypeList: [],
-  metricQueryType: "",
   visType: [],
   isTable: false,
   metricList: [],
   graph: props.graph,
 });
-states.isTable = TableChartTypes.includes(states.graph.type || "");
+states.isTable = TableChartTypes.includes(states.graph.type);
+
 const params = useRoute().params;
+
 setMetricType();
+
 async function setMetricType() {
   const json = await dashboardStore.fetchMetricList();
   if (json.errors) {
@@ -94,38 +113,55 @@ async function setMetricType() {
     (d: { catalog: string }) =>
       String(params.entity).toUpperCase() === d.catalog
   );
-  const name = states.metrics[0];
-  if (!name) {
-    return;
-  }
   const metrics: any = states.metricList.filter(
-    (d: { value: string }) => d.value === name
+    (d: { value: string; type: string }) => {
-  )[0];
+      const metric = states.metrics.filter((m: string) => m === d.value)[0];
-  states.metricTypeList = MetricTypes[metrics.type];
+      if (metric) {
-  states.metricTypes = [MetricTypes[metrics.type][0].value];
+        return d;
-  emit("apply", { metricTypes: states.metricTypes });
+      }
+    }
+  );
+  for (const metric of metrics) {
+    states.metricTypeList.push(MetricTypes[metric.type]);
+  }
+
   queryMetrics();
 }
-function changeMetrics(arr: (Option & { type: string })[]) {
+
+function changeMetrics(index: number, arr: (Option & { type: string })[]) {
   if (!arr.length) {
     states.metricTypeList = [];
     states.metricTypes = [];
     emit("apply", { metricTypes: states.metricTypes });
     return;
   }
-  states.metrics = arr.map((d: Option) => d.value);
+  states.metrics[index] = arr[0].value;
-  if (arr[0]) {
+  const typeOfMetrics = arr[0].type;
-    const typeOfMetrics = arr[0].type;
+  states.metricTypeList[index] = MetricTypes[typeOfMetrics];
-    states.metricTypeList = MetricTypes[typeOfMetrics];
+  states.metricTypes[index] = MetricTypes[typeOfMetrics][0].value;
-    states.metricTypes = [MetricTypes[typeOfMetrics][0].value];
+  emit("apply", { metricTypes: states.metricTypes, metrics: states.metrics });
-    emit("apply", { metricTypes: states.metricTypes, metrics: states.metrics });
+  queryMetrics();
-    queryMetrics();
-  }
 }
 
-function changeMetricType(val: Option[]) {
+function changeMetricType(index: number, opt: Option[]) {
-  states.metricTypes = [val[0].value];
+  const metric =
-  states.metricQueryType = (MetricQueryTypes as any)[states.metricTypes[0]];
+    states.metricList.filter(
+      (d: Option) => states.metrics[index] === d.value
+    )[0] || {};
+  if (states.isTable) {
+    states.metricTypes[index] = opt[0].value;
+    states.metricTypeList[index] = (MetricTypes as any)[metric.type];
+  } else {
+    states.metricTypes = states.metricTypes.map((d: string) => {
+      d = opt[0].value;
+      return d;
+    });
+    states.metricTypeList = states.metricTypeList.map((d: Option[]) => {
+      d = (MetricTypes as any)[metric.type];
+
+      return d;
+    });
+  }
   emit("apply", { metricTypes: states.metricTypes });
   queryMetrics();
 }
@@ -153,6 +189,19 @@ async function queryMetrics() {
 function changeDashboard(item: Option[]) {
   states.graph.dashboardName = item[0].value;
 }
+function addMetric() {
+  states.metrics.push("");
+  if (!states.isTable) {
+    states.metricTypes.push(states.metricTypes[0]);
+    states.metricTypeList.push(states.metricTypeList[0]);
+    return;
+  }
+  states.metricTypes.push("");
+}
+function deleteMetric(index: number) {
+  states.metrics.splice(index, 1);
+  states.metricTypes.splice(index, 1);
+}
 </script>
 <style lang="scss" scoped>
 .ds-name {
@@ -163,4 +212,8 @@ function changeDashboard(item: Option[]) {
   width: 500px;
   margin-right: 10px;
 }
+
+.metric-item {
+  margin-bottom: 10px;
+}
 </style>