From bcbf15df13d9575f635beeb25c81af65cd9c761a Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Tue, 19 Jul 2022 10:28:30 +0300 Subject: [PATCH] bottom tabs fix --- client/src/views/record/panels-container.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/client/src/views/record/panels-container.js b/client/src/views/record/panels-container.js index 72545f789d..fde47ad444 100644 --- a/client/src/views/record/panels-container.js +++ b/client/src/views/record/panels-container.js @@ -457,7 +457,6 @@ define('views/record/panels-container', ['view'], function (Dep) { let tabBreakIndexList = []; - let tabDataList = []; for (let name in layoutData) { @@ -519,22 +518,23 @@ define('views/record/panels-container', ['view'], function (Dep) { item.tabNumber = -1; } - if (item.tabNumber > this.currentTab) { - item.tabHidden = true; - } - newList.push(item); }); - newList.sort((v1, v2) => { - return v1.index - v2.index; - }); + newList.sort((v1, v2) => v1.index - v2.index); - let firstTabIndex = newList.findIndex(item => item.tabNumber === 0); + let firstTabIndex = newList.findIndex(item => item.tabNumber !== -1); if (firstTabIndex !== -1) { newList[firstTabIndex].isTabsBeginning = true; this.hasTabs = true; + this.currentTab = newList[firstTabIndex].tabNumber; + + this.panelList + .filter(item => item.tabNumber !== -1 && item.tabNumber !== this.currentTab) + .forEach(item => { + item.tabHidden = true; + }) } this.panelList = newList;