diff --git a/src/hooks/useExpressionsProcessor.ts b/src/hooks/useExpressionsProcessor.ts index 90f40e00..408dd724 100644 --- a/src/hooks/useExpressionsProcessor.ts +++ b/src/hooks/useExpressionsProcessor.ts @@ -117,16 +117,11 @@ export async function useExpressionsQueryProcessor(config: Indexable) { const label = results[0].metric && results[0].metric.labels[0] && results[0].metric.labels[0].value; source[c.label || label || name] = results[0].values.map((d: { value: unknown }) => d.value) || []; } else { - const labels = (c.label || "").split(",").map((item: string) => item.replace(/^\s*|\s*$/g, "")); for (const item of results) { const values = item.values.map((d: { value: unknown }) => d.value) || []; - const index = item.metric.labels[0].value; - const indexNum = labels.findIndex((_, i: number) => i === Number(index)); - if (labels[indexNum] && indexNum > -1) { - source[labels[indexNum]] = values; - } else { - source[index] = values; - } + const label = item.metric.labels.map((d: any) => `${d.key}=${d.value}`).join(","); + + source[label] = values; } } } diff --git a/src/locales/lang/en.ts b/src/locales/lang/en.ts index cf7778e7..9c9e065f 100644 --- a/src/locales/lang/en.ts +++ b/src/locales/lang/en.ts @@ -100,8 +100,7 @@ const msg = { import: "Import Dashboard Templates", yes: "Yes", no: "No", - tableHeaderCol1: "Name of the first column of the table", - tableHeaderCol2: "Name of the second column of the table", + tableHeaderCol2: "Name of the last column of the table", showXAxis: "Show X Axis", showYAxis: "Show Y Axis", nameError: "The dashboard name cannot be duplicate", diff --git a/src/locales/lang/es.ts b/src/locales/lang/es.ts index 4c033a2d..dd08fad3 100644 --- a/src/locales/lang/es.ts +++ b/src/locales/lang/es.ts @@ -101,8 +101,7 @@ const msg = { import: "Importar Plantilla Panel", yes: "Sí", no: "No", - tableHeaderCol1: "Nombre de la primera columna de la tabla", - tableHeaderCol2: "Nombre de la segunda columna de la tabla", + tableHeaderCol2: "Nombre de la Último columna de la tabla", showXAxis: "Mostrar Eje X", showYAxis: "Mostrar Eje Y", nameError: "El nombre del panel no puede ser duplicado", diff --git a/src/locales/lang/menus/es.ts b/src/locales/lang/menus/es.ts index 12f46849..88d9451d 100644 --- a/src/locales/lang/menus/es.ts +++ b/src/locales/lang/menus/es.ts @@ -34,7 +34,8 @@ const titles = { workflow_scheduler: "Flujo de trabajo", workflow_scheduler_desc: "Proporcionar monitoreo para sistemas de programación de flujos de trabajo.", workflow_scheduler_airflow: "Airflow", - workflow_scheduler_airflow_desc: "Observando tareas a través de los datos de telemetría recopilados desde Apache Airflow.", + workflow_scheduler_airflow_desc: + "Observando tareas a través de los datos de telemetría recopilados desde Apache Airflow.", // Service Mesh service_mesh: "Malla de Servicios", service_mesh_desc: diff --git a/src/locales/lang/zh.ts b/src/locales/lang/zh.ts index 81aaff5c..7549cc07 100644 --- a/src/locales/lang/zh.ts +++ b/src/locales/lang/zh.ts @@ -99,8 +99,7 @@ const msg = { import: "导入仪表板模板", yes: "是", no: "否", - tableHeaderCol1: "表格的第一列的名称", - tableHeaderCol2: "表格的第二列的名称", + tableHeaderCol2: "表格的最后一列的名称", showXAxis: "显示X轴", showYAxis: "显示Y轴", nameError: "仪表板名称不能重复", diff --git a/src/types/dashboard.d.ts b/src/types/dashboard.d.ts index 42fd4b75..be0bca58 100644 --- a/src/types/dashboard.d.ts +++ b/src/types/dashboard.d.ts @@ -140,7 +140,6 @@ export interface TextConfig { export interface TableConfig { type?: string; showTableValues: boolean; - tableHeaderCol1: string; tableHeaderCol2: string; } diff --git a/src/views/dashboard/configuration/widget/graph-styles/Table.vue b/src/views/dashboard/configuration/widget/graph-styles/Table.vue index ca6dfe80..65ca8d70 100644 --- a/src/views/dashboard/configuration/widget/graph-styles/Table.vue +++ b/src/views/dashboard/configuration/widget/graph-styles/Table.vue @@ -22,16 +22,6 @@ limitations under the License. --> @change="updateConfig({ showTableValues })" /> -