diff --git a/packages/web/src/datagrid/DataGridCore.svelte b/packages/web/src/datagrid/DataGridCore.svelte index 66eb34fd2..2892e81d4 100644 --- a/packages/web/src/datagrid/DataGridCore.svelte +++ b/packages/web/src/datagrid/DataGridCore.svelte @@ -425,12 +425,11 @@ import { createGeoJsonFromSelection, selectionCouldBeShownOnMap } from '../elements/SelectionMapView.svelte'; import ErrorMessageModal from '../modals/ErrorMessageModal.svelte'; import EditCellDataModal from '../modals/EditCellDataModal.svelte'; - import { getDatabaseInfo, useDatabaseStatus } from '../utility/metadataLoaders'; + import { getDatabaseInfo, useDatabaseStatus, useSettings } from '../utility/metadataLoaders'; import { showSnackbarSuccess } from '../utility/snackbar'; import { openJsonLinesData } from '../utility/openJsonLinesData'; import contextMenuActivator from '../utility/contextMenuActivator'; import InputTextModal from '../modals/InputTextModal.svelte'; - import hasPermission from '../utility/hasPermission'; export let onLoadNextData = undefined; export let grider = undefined; @@ -517,6 +516,10 @@ } } + const settingsValue = useSettings(); + + $: gridColoringMode = $settingsValue?.['dataGrid.coloringMode']; + export function refresh() { if (onCustomGridRefresh) onCustomGridRefresh(); else display.reload(); @@ -2018,6 +2021,7 @@ {frameSelection} onSetFormView={formViewAvailable && display?.baseTable?.primaryKey ? handleSetFormView : null} {dataEditorTypesBehaviourOverride} + {gridColoringMode} /> {/each} diff --git a/packages/web/src/datagrid/DataGridRow.svelte b/packages/web/src/datagrid/DataGridRow.svelte index 4f23811ce..66f33fa2b 100644 --- a/packages/web/src/datagrid/DataGridRow.svelte +++ b/packages/web/src/datagrid/DataGridRow.svelte @@ -26,6 +26,7 @@ export let conid; export let database; export let driver; + export let gridColoringMode = '36'; export let dataEditorTypesBehaviourOverride = null; @@ -52,7 +53,7 @@ } - + onSetFormView(rowData, null) : null} /> {#each visibleRealColumns as col (col.uniqueName)} {#if inplaceEditorState.cell && rowIndex == inplaceEditorState.cell[0] && col.colIndex == inplaceEditorState.cell[1]} @@ -66,7 +67,7 @@ onSetValue={value => grider.setCellValue(rowIndex, col.uniqueName, value)} {driver} {dataEditorTypesBehaviourOverride} - /> + /> {:else} diff --git a/packages/web/src/formview/FormView.svelte b/packages/web/src/formview/FormView.svelte index 6c451113f..e14730288 100644 --- a/packages/web/src/formview/FormView.svelte +++ b/packages/web/src/formview/FormView.svelte @@ -196,6 +196,7 @@ import keycodes from '../utility/keycodes'; import resizeObserver from '../utility/resizeObserver'; import openReferenceForm from './openReferenceForm'; + import { useSettings } from '../utility/metadataLoaders'; export let conid; export let database; @@ -236,6 +237,9 @@ $: rowCountInfo = getRowCountInfo(allRowCount, display); + const settingsValue = useSettings(); + $: gridColoringMode = $settingsValue?.['dataGrid.coloringMode']; + function getRowCountInfo(allRowCount) { if (rowCountNotAvailable) { return `Row: ${((display.config.formViewRecordNumber || 0) + 1).toLocaleString()} / ???`; @@ -620,7 +624,7 @@ {#each columnChunks as chunk, chunkIndex} {#each chunk as col, rowIndex} - +
+ +
SQL editor