diff --git a/packages/datalib/src/JslGridDisplay.ts b/packages/datalib/src/JslGridDisplay.ts index 698520b93..34b77f37d 100644 --- a/packages/datalib/src/JslGridDisplay.ts +++ b/packages/datalib/src/JslGridDisplay.ts @@ -48,5 +48,7 @@ export class JslGridDisplay extends GridDisplay { } if (!this.columns) this.columns = []; + + this.formColumns = this.columns; } } diff --git a/packages/web/src/datagrid/JslDataGrid.svelte b/packages/web/src/datagrid/JslDataGrid.svelte index b06c60970..690e0619f 100644 --- a/packages/web/src/datagrid/JslDataGrid.svelte +++ b/packages/web/src/datagrid/JslDataGrid.svelte @@ -56,6 +56,8 @@ {...$$restProps} {display} {jslid} + config={$config} + setConfig={config.update} gridCoreComponent={JslDataGridCore} formViewComponent={JslFormView} bind:loadedRows diff --git a/packages/web/src/formview/FormView.svelte b/packages/web/src/formview/FormView.svelte index d1ec392e6..4397d1671 100644 --- a/packages/web/src/formview/FormView.svelte +++ b/packages/web/src/formview/FormView.svelte @@ -198,6 +198,7 @@ export let isLoading; export let grider; export let display; + export let rowCountNotAvailable; // export let formDisplay; export let onNavigate; @@ -222,9 +223,12 @@ $: columnChunks = _.chunk(display?.formColumns || [], rowCount) as any[][]; - $: rowCountInfo = getRowCountInfo(allRowCount); + $: rowCountInfo = getRowCountInfo(allRowCount, display); function getRowCountInfo(allRowCount) { + if (rowCountNotAvailable) { + return `Row: ${((display.config.formViewRecordNumber || 0) + 1).toLocaleString()} / ???`; + } if (rowData == null) { if (allRowCount != null) { return `Out of bounds: ${( diff --git a/packages/web/src/formview/JslFormView.svelte b/packages/web/src/formview/JslFormView.svelte index 12b04f441..19a1aac5e 100644 --- a/packages/web/src/formview/JslFormView.svelte +++ b/packages/web/src/formview/JslFormView.svelte @@ -11,7 +11,7 @@ }); if (response.errorMessage) return response; - return response.rows[0]; + return response[0]; } @@ -31,4 +31,4 @@ } - +