refactor: joined FreeTableGrid and DataGrid into one component

This commit is contained in:
Jan Prochazka
2021-04-04 08:05:29 +02:00
parent 9e9991c675
commit 0413f4b4d9
4 changed files with 71 additions and 117 deletions

View File

@@ -1,9 +1,11 @@
<script lang="ts">
import { createFreeTableModel } from 'dbgate-datalib';
import { createFreeTableModel, runMacro } from 'dbgate-datalib';
import DataGrid from '../datagrid/DataGrid.svelte';
import ErrorInfo from '../elements/ErrorInfo.svelte';
import LoadingInfo from '../elements/LoadingInfo.svelte';
import FreeTableGrid from '../freetable/FreeTableGrid.svelte';
import FreeTableGridCore from '../freetable/FreeTableGridCore.svelte';
import { showModal } from '../modals/modalTools';
import SaveArchiveModal from '../modals/SaveArchiveModal.svelte';
import useEditorData from '../query/useEditorData';
@@ -52,6 +54,11 @@
props: { archiveFile: file, archiveFolder: folder },
}));
};
function handleRunMacro(macro, params, cells) {
const newModel = runMacro(macro, params, $modelState.value, false, cells);
dispatchModel({ type: 'set', value: newModel });
}
</script>
{#if isLoading}
@@ -59,12 +66,16 @@
{:else if errorMessage}
<ErrorInfo message={errorMessage} />
{:else}
<FreeTableGrid
<DataGrid
config={$config}
setConfig={config.update}
modelState={$modelState}
{dispatchModel}
onSave={handleSave}
focusOnVisible
gridCoreComponent={FreeTableGridCore}
freeTableColumn
showMacros
onRunMacro={handleRunMacro}
/>
{/if}