From d064cf1c7b114d76e76b21b265398756aac3d4e8 Mon Sep 17 00:00:00 2001 From: Peter Olu Date: Thu, 2 Jun 2022 11:34:34 +0100 Subject: [PATCH] fixed add column function adding two columns when all columns are hidden --- src/store/modules/log.ts | 10 ++++------ src/views/dashboard/related/log/Header.vue | 14 +++++--------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/src/store/modules/log.ts b/src/store/modules/log.ts index 491fcd71..c0a2a590 100644 --- a/src/store/modules/log.ts +++ b/src/store/modules/log.ts @@ -61,18 +61,16 @@ export const logStore = defineStore({ loadLogs: false, }), actions: { - showColumns(columnsLabel: string[]) { - // TODO: add a parameter column type too + showColumns(columnsLabel: string) { this.serviceLogColumn.forEach((col: any) => { - if (columnsLabel.includes(col.value)) { + if (columnsLabel === col.value) { col.isVisible = true } }) }, - hideColumns(columnsLabel: string[]) { - // TODO: add a parameter column type too + hideColumns(columnsLabel: string) { this.serviceLogColumn.forEach((col: any) => { - if (columnsLabel.includes(col.value)) { + if (columnsLabel === col.value) { col.isVisible = false } }) diff --git a/src/views/dashboard/related/log/Header.vue b/src/views/dashboard/related/log/Header.vue index d2f56072..52813ecd 100644 --- a/src/views/dashboard/related/log/Header.vue +++ b/src/views/dashboard/related/log/Header.vue @@ -378,21 +378,17 @@ function toggleColumSelector() { showColumList.value = !showColumList.value; setSearchTerm("column"); } -function hideColumns(column: any) { - selectedColumns.value.push(column.value); - logStore.hideColumns(selectedColumns.value); - selectedColumns.value = []; +function hideColumns(column: string) { + logStore.hideColumns(column.value); +} +function showColumns(column: string) { + logStore.showColumns(column.value); } function hideTags() { let tagsWrap = document.querySelector(".el-select__tags"); if (!tagsWrap) return; tagsWrap.style.display = "none"; } -function showColumns(column: any) { - selectedColumns.value.push(column.value); - logStore.showColumns(selectedColumns.value); - selectedColumns.value = []; -} async function init() { const resp = await logStore.getLogsByKeywords();