diff --git a/src/hooks/useProcessor.ts b/src/hooks/useProcessor.ts index bd6632c2..98f1f762 100644 --- a/src/hooks/useProcessor.ts +++ b/src/hooks/useProcessor.ts @@ -318,11 +318,11 @@ function aggregation(val: number, standard: any): number | string { data = val - Number(standard.plus); return data; } - if (!isNaN(standard.multiply)) { + if (!isNaN(standard.multiply) && standard.divide !== 0) { data = val * Number(standard.multiply); return data; } - if (!isNaN(standard.divide)) { + if (!isNaN(standard.divide) && standard.divide !== 0) { data = val / Number(standard.divide); return data; } diff --git a/src/views/dashboard/List.vue b/src/views/dashboard/List.vue index 822f9430..91dd6247 100644 --- a/src/views/dashboard/List.vue +++ b/src/views/dashboard/List.vue @@ -214,9 +214,9 @@ function exportTemplates() { }); const name = `dashboards.json`; saveFile(templates, name); - setTimeout(() => { - multipleTableRef.value!.clearSelection(); - }, 2000); + // setTimeout(() => { + // multipleTableRef.value!.clearSelection(); + // }, 2000); } function handleEdit(row: DashboardItem) { dashboardStore.setMode(true); diff --git a/src/views/dashboard/configuration/widget/StandardOptions.vue b/src/views/dashboard/configuration/widget/StandardOptions.vue index 255ad1aa..e1a70ac3 100644 --- a/src/views/dashboard/configuration/widget/StandardOptions.vue +++ b/src/views/dashboard/configuration/widget/StandardOptions.vue @@ -55,61 +55,67 @@ limitations under the License. -->
{{ t("plus") }} -
{{ t("minus") }} -
{{ t("multiply") }} -
{{ t("divide") }} -
{{ t("convertToMilliseconds") }} -
{{ t("convertToSeconds") }} -
diff --git a/src/views/dashboard/graphs/InstanceList.vue b/src/views/dashboard/graphs/InstanceList.vue index 495a79c2..d2280ccf 100644 --- a/src/views/dashboard/graphs/InstanceList.vue +++ b/src/views/dashboard/graphs/InstanceList.vue @@ -44,15 +44,16 @@ limitations under the License. -->