diff --git a/packages/web/src/datagrid/DataGridCell.svelte b/packages/web/src/datagrid/DataGridCell.svelte index 1fe558e6e..6779dc6c9 100644 --- a/packages/web/src/datagrid/DataGridCell.svelte +++ b/packages/web/src/datagrid/DataGridCell.svelte @@ -44,6 +44,7 @@ class:isModifiedCell class:isInserted class:isDeleted + style={`width:${col.width}px; min-width:${col.width}px; max-width:${col.width}px`} > {#if value == null} (NULL) diff --git a/packages/web/src/datagrid/DataGridCore.svelte b/packages/web/src/datagrid/DataGridCore.svelte index a668cf582..503d5fc67 100644 --- a/packages/web/src/datagrid/DataGridCore.svelte +++ b/packages/web/src/datagrid/DataGridCore.svelte @@ -42,9 +42,9 @@ ); // $: console.log('visibleRealColumns', visibleRealColumns); - $: console.log('visibleRowCountUpperBound', visibleRowCountUpperBound); - $: console.log('rowHeight', rowHeight); - $: console.log('containerHeight', containerHeight); + // $: console.log('visibleRowCountUpperBound', visibleRowCountUpperBound); + // $: console.log('rowHeight', rowHeight); + // $: console.log('containerHeight', containerHeight); $: realColumnUniqueNames = _.range(columnSizes.realCount).map( realIndex => (columns[columnSizes.realToModel(realIndex)] || {}).uniqueName @@ -64,13 +64,19 @@ - diff --git a/packages/web/src/datagrid/LoadingDataGridCore.svelte b/packages/web/src/datagrid/LoadingDataGridCore.svelte index a51e919a3..74170ca69 100644 --- a/packages/web/src/datagrid/LoadingDataGridCore.svelte +++ b/packages/web/src/datagrid/LoadingDataGridCore.svelte @@ -22,6 +22,7 @@ const loadStart = new Date().getTime(); // loadedTimeRef.current = loadStart; + // console.log('LOAD NEXT ROWS', loadedRows); const nextRows = await loadDataPage($$props, loadedRows.length, 100); // if (loadedTimeRef.current !== loadStart) { @@ -35,7 +36,7 @@ errorMessage = nextRows.errorMessage; } else { // if (allRowCount == null) handleLoadRowCount(); - loadedRows = [loadedRows, ...nextRows]; + loadedRows = [...loadedRows, ...nextRows]; isLoadedAll = nextRows.length === 0; // const loadedInfo = { // loadedRows: [...loadedRows, ...nextRows], @@ -49,19 +50,21 @@ // ...loadedInfo, // })); } + + // console.log('LOADED', nextRows, loadedRows); } // $: griderProps = { ...$$props, sourceRows: loadProps.loadedRows }; // $: grider = griderFactory(griderProps); - const handleLoadNextData = () => { + function handleLoadNextData() { if (!isLoadedAll && !errorMessage && !grider.disableLoadNextPage) { if (dataPageAvailable($$props)) { // If not, callbacks to load missing metadata are dispatched loadNextData(); } } - }; + } diff --git a/packages/web/src/datagrid/SqlDataGridCore.svelte b/packages/web/src/datagrid/SqlDataGridCore.svelte index f1a62cb5e..8ba4942a0 100644 --- a/packages/web/src/datagrid/SqlDataGridCore.svelte +++ b/packages/web/src/datagrid/SqlDataGridCore.svelte @@ -57,7 +57,9 @@ export let config; let loadedRows = []; + // $: console.log('loadedRows BIND', loadedRows); $: grider = new ChangeSetGrider(loadedRows, null, null, display); + // $: console.log('GRIDER', grider); diff --git a/packages/web/src/datagrid/gridutil.ts b/packages/web/src/datagrid/gridutil.ts index bf64c2a94..d1bce1f50 100644 --- a/packages/web/src/datagrid/gridutil.ts +++ b/packages/web/src/datagrid/gridutil.ts @@ -89,7 +89,7 @@ export function countVisibleRealColumns(columnSizes, firstVisibleColumnScrollInd const visibleRealColumnIndexes = []; const modelIndexes = {}; - /** @type {(import('dbgate-datalib').DisplayColumn & {widthPx: string; colIndex: number})[]} */ + /** @type {(import('dbgate-datalib').DisplayColumn & {width: number; colIndex: number})[]} */ const realColumns = []; // frozen columns @@ -112,12 +112,11 @@ export function countVisibleRealColumns(columnSizes, firstVisibleColumnScrollInd let col = columns[modelColumnIndex]; if (!col) continue; - const widthNumber = columnSizes.getSizeByRealIndex(colIndex); + const width = columnSizes.getSizeByRealIndex(colIndex); realColumns.push({ ...col, colIndex, - widthNumber, - widthPx: `${widthNumber}px`, + width, }); } return realColumns;
+ {#each visibleRealColumns as col (col.uniqueName)}