styling updates from code review
This commit is contained in:
parent
a02a7ae9b9
commit
d444a2447c
|
@ -44,7 +44,7 @@
|
||||||
customLoadingOverlay: TableLoadingOverlay,
|
customLoadingOverlay: TableLoadingOverlay,
|
||||||
},
|
},
|
||||||
loadingOverlayComponent: "customLoadingOverlay",
|
loadingOverlayComponent: "customLoadingOverlay",
|
||||||
animateRows: true
|
animateRows: true,
|
||||||
}
|
}
|
||||||
|
|
||||||
$: {
|
$: {
|
||||||
|
@ -62,22 +62,13 @@
|
||||||
width: 100,
|
width: 100,
|
||||||
cellRenderer: editRowRenderer,
|
cellRenderer: editRowRenderer,
|
||||||
},
|
},
|
||||||
{
|
|
||||||
headerName: "",
|
|
||||||
checkboxSelection: true,
|
|
||||||
sortable: false,
|
|
||||||
resizable: false,
|
|
||||||
suppressMovable: true,
|
|
||||||
suppressMenu: true,
|
|
||||||
minWidth: 50,
|
|
||||||
width: 50,
|
|
||||||
},
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
for (let key in schema) {
|
Object.keys(schema || {}).forEach((key, idx) => {
|
||||||
result.push({
|
result.push({
|
||||||
headerCheckboxSelection: false,
|
headerCheckboxSelection: false,
|
||||||
|
checkboxSelection: idx === 0 && allowEditing,
|
||||||
headerComponent: TableHeader,
|
headerComponent: TableHeader,
|
||||||
headerComponentParams: {
|
headerComponentParams: {
|
||||||
field: schema[key],
|
field: schema[key],
|
||||||
|
@ -94,7 +85,7 @@
|
||||||
resizable: true,
|
resizable: true,
|
||||||
minWidth: 200,
|
minWidth: 200,
|
||||||
})
|
})
|
||||||
}
|
})
|
||||||
|
|
||||||
columnDefs = result
|
columnDefs = result
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<script>
|
<script>
|
||||||
import { onMount } from "svelte"
|
import { onMount, onDestroy } from "svelte"
|
||||||
import { Modal, ModalContent } from "@budibase/bbui"
|
import { Modal, ModalContent } from "@budibase/bbui"
|
||||||
import CreateEditColumn from "../modals/CreateEditColumn.svelte"
|
import CreateEditColumn from "../modals/CreateEditColumn.svelte"
|
||||||
|
|
||||||
|
@ -20,8 +20,7 @@
|
||||||
let sortDirection = ""
|
let sortDirection = ""
|
||||||
let modal
|
let modal
|
||||||
let hovered
|
let hovered
|
||||||
|
let filterActive
|
||||||
$: console.log($$restProps)
|
|
||||||
|
|
||||||
function toggleMenu() {
|
function toggleMenu() {
|
||||||
showColumnMenu(menuButton)
|
showColumnMenu(menuButton)
|
||||||
|
@ -35,10 +34,22 @@
|
||||||
modal.show()
|
modal.show()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function setSort(column) {
|
||||||
|
sortDirection = column.getSort()
|
||||||
|
}
|
||||||
|
|
||||||
|
function setFilterActive(e) {
|
||||||
|
filterActive = e.column.filterActive
|
||||||
|
}
|
||||||
|
|
||||||
onMount(() => {
|
onMount(() => {
|
||||||
column.addEventListener("sortChanged", () => {
|
column.addEventListener("sortChanged", setSort)
|
||||||
sortDirection = column.getSort()
|
column.addEventListener("filterActiveChanged", setFilterActive)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
onDestroy(() => {
|
||||||
|
column.removeEventListener("sortChanged", setSort)
|
||||||
|
column.removeEventListener("filterActiveChanged", setFilterActive)
|
||||||
})
|
})
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
@ -59,14 +70,14 @@
|
||||||
<CreateEditColumn onClosed={modal.hide} {field} />
|
<CreateEditColumn onClosed={modal.hide} {field} />
|
||||||
</ModalContent>
|
</ModalContent>
|
||||||
</Modal>
|
</Modal>
|
||||||
<section class:show={hovered}>
|
<section class:show={hovered || filterActive}>
|
||||||
{#if editable}
|
{#if editable && hovered}
|
||||||
<span on:click|stopPropagation={showModal}>
|
<span on:click|stopPropagation={showModal}>
|
||||||
<i class="ri-pencil-line" />
|
<i class="ri-pencil-line" />
|
||||||
</span>
|
</span>
|
||||||
{/if}
|
{/if}
|
||||||
<span on:click|stopPropagation={toggleMenu} bind:this={menuButton}>
|
<span on:click|stopPropagation={toggleMenu} bind:this={menuButton}>
|
||||||
<i class="ri-filter-line" />
|
<i class="ri-filter-line" class:active={filterActive} />
|
||||||
</span>
|
</span>
|
||||||
</section>
|
</section>
|
||||||
</header>
|
</header>
|
||||||
|
@ -85,7 +96,7 @@
|
||||||
|
|
||||||
section {
|
section {
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
transition: 0.2s all;
|
transition: 0.3s all;
|
||||||
}
|
}
|
||||||
|
|
||||||
section.show {
|
section.show {
|
||||||
|
|
|
@ -16,7 +16,9 @@
|
||||||
<div>
|
<div>
|
||||||
<TextButton small text on:click={modal.show}>
|
<TextButton small text on:click={modal.show}>
|
||||||
<Icon name="delete" />
|
<Icon name="delete" />
|
||||||
Delete {selectedRows.length} row(s)
|
Delete
|
||||||
|
{selectedRows.length}
|
||||||
|
row(s)
|
||||||
</TextButton>
|
</TextButton>
|
||||||
</div>
|
</div>
|
||||||
<Modal bind:this={modal}>
|
<Modal bind:this={modal}>
|
||||||
|
@ -25,6 +27,8 @@
|
||||||
confirmText="Delete"
|
confirmText="Delete"
|
||||||
onConfirm={confirmDeletion}
|
onConfirm={confirmDeletion}
|
||||||
title="Confirm Row Deletion">
|
title="Confirm Row Deletion">
|
||||||
Are you sure you want to delete {selectedRows.length} row{selectedRows.length > 1 ? 's' : ''}?
|
Are you sure you want to delete
|
||||||
|
{selectedRows.length}
|
||||||
|
row{selectedRows.length > 1 ? 's' : ''}?
|
||||||
</ModalContent>
|
</ModalContent>
|
||||||
</Modal>
|
</Modal>
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
<script>
|
<script>
|
||||||
import { Input, Button, Select, Toggle } from "@budibase/bbui"
|
import { Input, Button, TextButton, Select, Toggle } from "@budibase/bbui"
|
||||||
import { cloneDeep } from "lodash/fp"
|
import { cloneDeep } from "lodash/fp"
|
||||||
import { backendUiStore } from "builderStore"
|
import { backendUiStore } from "builderStore"
|
||||||
import { FIELDS } from "constants/backend"
|
import { FIELDS } from "constants/backend"
|
||||||
|
@ -156,11 +156,11 @@
|
||||||
thin
|
thin
|
||||||
bind:value={field.fieldName} />
|
bind:value={field.fieldName} />
|
||||||
{/if}
|
{/if}
|
||||||
<footer>
|
<footer class="create-column-options">
|
||||||
<Button secondary on:click={onClosed}>Cancel</Button>
|
|
||||||
{#if originalName}
|
{#if originalName}
|
||||||
<Button red on:click={confirmDelete}>Delete Column</Button>
|
<TextButton text on:click={confirmDelete}>Delete Column</TextButton>
|
||||||
{/if}
|
{/if}
|
||||||
|
<Button secondary on:click={onClosed}>Cancel</Button>
|
||||||
<Button primary on:click={saveColumn}>Save Column</Button>
|
<Button primary on:click={saveColumn}>Save Column</Button>
|
||||||
</footer>
|
</footer>
|
||||||
</div>
|
</div>
|
||||||
|
@ -185,6 +185,10 @@
|
||||||
gap: var(--spacing-m);
|
gap: var(--spacing-m);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
:global(.create-column-options button:first-child) {
|
||||||
|
margin-right: auto;
|
||||||
|
}
|
||||||
|
|
||||||
.hidden {
|
.hidden {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue