diff --git a/packages/web/src/datagrid/DataGridCore.svelte b/packages/web/src/datagrid/DataGridCore.svelte index c143b8587..44032fceb 100644 --- a/packages/web/src/datagrid/DataGridCore.svelte +++ b/packages/web/src/datagrid/DataGridCore.svelte @@ -249,6 +249,7 @@ import GenerateSqlFromDataModal from '../modals/GenerateSqlFromDataModal.svelte'; import { showModal } from '../modals/modalTools'; import { updateStatuBarInfo } from '../widgets/StatusBar.svelte'; + import StatusBarTabItem from '../widgets/StatusBarTabItem.svelte'; export let onLoadNextData = undefined; export let grider = undefined; @@ -1196,15 +1197,15 @@ ]; } - $: { - if (!tabControlHiddenTab) { - if (!multipleGridsOnTab && allRowCount != null) { - updateStatuBarInfo(tabid, [{ text: `Rows: ${allRowCount.toLocaleString()}` }]); - } else { - updateStatuBarInfo(tabid, []); - } - } - } + // $: { + // if (!tabControlHiddenTab) { + // if (!multipleGridsOnTab && allRowCount != null) { + // updateStatuBarInfo(tabid, [{ text: `Rows: ${allRowCount.toLocaleString()}` }]); + // } else { + // updateStatuBarInfo(tabid, []); + // } + // } + // } {#if !display || (!isDynamicStructure && (!columns || columns.length == 0))} @@ -1384,6 +1385,10 @@ {#if isLoading} {/if} + + {#if !tabControlHiddenTab && !multipleGridsOnTab && allRowCount != null} + + {/if} {/if} diff --git a/packages/web/src/utility/useTimerLabel.ts b/packages/web/src/utility/useTimerLabel.ts index f0c43cf74..9eb2d2221 100644 --- a/packages/web/src/utility/useTimerLabel.ts +++ b/packages/web/src/utility/useTimerLabel.ts @@ -1,6 +1,6 @@ import _ from 'lodash'; import { getContext, onDestroy } from 'svelte'; -import { updateStatuBarInfo } from '../widgets/StatusBar.svelte'; +import { updateStatuBarInfoItem } from '../widgets/StatusBar.svelte'; function formatSeconds(duration) { if (duration == null) return ''; @@ -17,11 +17,7 @@ export default function useTimerLabel() { const tabid = getContext('tabid'); const update = () => { - updateStatuBarInfo(tabid, [ - { - text: formatSeconds(duration), - }, - ]); + updateStatuBarInfoItem(tabid, 'durationSeconds', { text: formatSeconds(duration) }); }; const start = () => { diff --git a/packages/web/src/widgets/StatusBar.svelte b/packages/web/src/widgets/StatusBar.svelte index 040cb35c8..3dcad1aa9 100644 --- a/packages/web/src/widgets/StatusBar.svelte +++ b/packages/web/src/widgets/StatusBar.svelte @@ -1,15 +1,34 @@