dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-20 10:06:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

multiple sort criteria #235

Browse Source
This commit is contained in:
Jan Prochazka
2022-06-09 13:12:31 +02:00
parent a92bd1c840
commit 94788454a9
4 changed files with 52 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
packages/web/src/datagrid/ColumnHeaderControl.svelte
View File

@@ -14,9 +14,13 @@
export let column;
export let conid = undefined;
export let database = undefined;
export let setSort;
export let setSort = undefined;
export let addToSort = undefined;
export let clearSort = undefined;
export let grouping = undefined;
export let order = undefined;
export let orderIndex = undefined;
export let isSortDefined = false;
export let allowDefineVirtualReferences = false;
export let setGrouping;
@@ -44,6 +48,9 @@
return [
setSort && { onClick: () => setSort('ASC'), text: 'Sort ascending' },
setSort && { onClick: () => setSort('DESC'), text: 'Sort descending' },
isSortDefined && addToSort && !order && { onClick: () => addToSort('ASC'), text: 'Add to sort - ascending' },
isSortDefined && addToSort && !order && { onClick: () => addToSort('DESC'), text: 'Add to sort - descending' },
order && clearSort && { onClick: () => clearSort(), text: 'Clear sort criteria' },
{ onClick: () => copyTextToClipboard(column.columnName), text: 'Copy column name' },
column.foreignKey && [{ divider: true }, { onClick: openReferencedTable, text: column.foreignKey.refTableName }],
@@ -90,11 +97,17 @@
{#if order == 'ASC'}
<span class="icon">
<FontIcon icon="img sort-asc" />
{#if orderIndex >= 0}
<span class="color-icon-green order-index">{orderIndex + 1}</span>
{/if}
</span>
{/if}
{#if order == 'DESC'}
<span class="icon">
<FontIcon icon="img sort-desc" />
{#if orderIndex >= 0}
<span class="color-icon-green order-index">{orderIndex + 1}</span>
{/if}
</span>
{/if}
<DropDownButton menu={getMenu} narrow />
@@ -106,6 +119,13 @@
display: flex;
flex-wrap: nowrap;
}
.order-index {
font-size: 10pt;
margin-left: -3px;
margin-right: 2px;
top: -1px;
position: relative;
}
.label {
flex: 1;
min-width: 10px;

6
packages/web/src/datagrid/DataGridCore.svelte
View File

@@ -1526,7 +1526,11 @@
{conid}
{database}
setSort={display.sortable ? order => display.setSort(col.uniqueName, order) : null}
order={display.getSortOrder(col.uniqueName)}
addToSort={display.sortable ? order => display.addToSort(col.uniqueName, order) : null}
order={display.sortable ? display.getSortOrder(col.uniqueName) : null}
orderIndex={display.sortable ? display.getSortOrderIndex(col.uniqueName) : -1}
isSortDefined={display.sortable ? display.isSortDefined() : false}
clearSort={display.sortable ? () => display.clearSort() : null}
on:resizeSplitter={e => {
// @ts-ignore
display.resizeColumn(col.uniqueName, col.width, e.detail);