From 4ad2fb47d52ad8a93860c97cbc2044ba6da0c2c8 Mon Sep 17 00:00:00 2001 From: kevmodrome Date: Tue, 13 Oct 2020 09:13:56 +0200 Subject: [PATCH 1/3] adds height option to grid component --- .../src/components/userInterface/temporaryPanelStructure.js | 6 ++++++ packages/standard-components/components.json | 3 ++- packages/standard-components/src/DataGrid/Component.svelte | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/builder/src/components/userInterface/temporaryPanelStructure.js b/packages/builder/src/components/userInterface/temporaryPanelStructure.js index e7033f1c8..aaac780af 100644 --- a/packages/builder/src/components/userInterface/temporaryPanelStructure.js +++ b/packages/builder/src/components/userInterface/temporaryPanelStructure.js @@ -346,6 +346,12 @@ export default { ], placeholder: "alpine", }, + { + label: "Height", + key: "height", + defaultValue: "500", + control: Input + }, ], }, children: [], diff --git a/packages/standard-components/components.json b/packages/standard-components/components.json index 76675ac63..4650d63e0 100644 --- a/packages/standard-components/components.json +++ b/packages/standard-components/components.json @@ -237,7 +237,8 @@ "balham-dark", "material" ] - } + }, + "height": "number" } }, "dataform": { diff --git a/packages/standard-components/src/DataGrid/Component.svelte b/packages/standard-components/src/DataGrid/Component.svelte index 01ed620a5..727037b43 100644 --- a/packages/standard-components/src/DataGrid/Component.svelte +++ b/packages/standard-components/src/DataGrid/Component.svelte @@ -18,6 +18,7 @@ export let datasource = {} export let editable export let theme = 'alpine' + export let height; let dataLoaded = false let data @@ -110,7 +111,7 @@ href="https://cdn.jsdelivr.net/npm/flatpickr/dist/flatpickr.min.css" /> -
+
{#if dataLoaded} {#if editable}
From 6ac9c59bbb50398d55e3d78ed0d09fd49ef68aa1 Mon Sep 17 00:00:00 2001 From: kevmodrome Date: Tue, 13 Oct 2020 09:51:01 +0200 Subject: [PATCH 2/3] adds pagination option --- .../src/components/userInterface/temporaryPanelStructure.js | 6 ++++++ packages/standard-components/components.json | 3 ++- packages/standard-components/src/DataGrid/Component.svelte | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/components/userInterface/temporaryPanelStructure.js b/packages/builder/src/components/userInterface/temporaryPanelStructure.js index aaac780af..5d6000876 100644 --- a/packages/builder/src/components/userInterface/temporaryPanelStructure.js +++ b/packages/builder/src/components/userInterface/temporaryPanelStructure.js @@ -352,6 +352,12 @@ export default { defaultValue: "500", control: Input }, + { + label: "Pagination", + key: "pagination", + valueKey: "checked", + control: Checkbox, + }, ], }, children: [], diff --git a/packages/standard-components/components.json b/packages/standard-components/components.json index 4650d63e0..846472999 100644 --- a/packages/standard-components/components.json +++ b/packages/standard-components/components.json @@ -238,7 +238,8 @@ "material" ] }, - "height": "number" + "height": "number", + "pagination": "bool" } }, "dataform": { diff --git a/packages/standard-components/src/DataGrid/Component.svelte b/packages/standard-components/src/DataGrid/Component.svelte index 727037b43..d7cc2d2e5 100644 --- a/packages/standard-components/src/DataGrid/Component.svelte +++ b/packages/standard-components/src/DataGrid/Component.svelte @@ -19,6 +19,7 @@ export let editable export let theme = 'alpine' export let height; + export let pagination let dataLoaded = false let data @@ -33,6 +34,8 @@ }, rowSelection: editable ? "multiple" : false, suppressRowClickSelection: !editable, + paginationAutoPageSize: true, + pagination } onMount(async () => { From 9ffde6af35b73234dbfccec32eb7eaa0b320894d Mon Sep 17 00:00:00 2001 From: kevmodrome Date: Tue, 13 Oct 2020 09:54:10 +0200 Subject: [PATCH 3/3] lint fix --- .../src/components/userInterface/temporaryPanelStructure.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/components/userInterface/temporaryPanelStructure.js b/packages/builder/src/components/userInterface/temporaryPanelStructure.js index 5d6000876..50799581f 100644 --- a/packages/builder/src/components/userInterface/temporaryPanelStructure.js +++ b/packages/builder/src/components/userInterface/temporaryPanelStructure.js @@ -350,7 +350,7 @@ export default { label: "Height", key: "height", defaultValue: "500", - control: Input + control: Input, }, { label: "Pagination",