mirror of
https://github.com/DeNNiiInc/dbgate.git
synced 2026-04-27 05:36:01 +00:00
dataGrid align numbers right #957
This commit is contained in:
@@ -54,6 +54,8 @@
|
|||||||
|
|
||||||
// don't parse JSON for explicit data types
|
// don't parse JSON for explicit data types
|
||||||
$: jsonParsedValue = !editorTypes?.explicitDataType && isJsonLikeLongString(value) ? safeJsonParse(value) : null;
|
$: jsonParsedValue = !editorTypes?.explicitDataType && isJsonLikeLongString(value) ? safeJsonParse(value) : null;
|
||||||
|
|
||||||
|
$: showHint = allowHintField && rowData && _.some(col.hintColumnNames, hintColumnName => rowData[hintColumnName]);
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<td
|
<td
|
||||||
@@ -68,11 +70,12 @@
|
|||||||
class:isDeleted
|
class:isDeleted
|
||||||
class:isAutofillSelected
|
class:isAutofillSelected
|
||||||
class:isFocusedColumn
|
class:isFocusedColumn
|
||||||
|
class:alignRight={_.isNumber(value) && !showHint}
|
||||||
{style}
|
{style}
|
||||||
>
|
>
|
||||||
<CellValue {rowData} {value} {jsonParsedValue} {editorTypes} />
|
<CellValue {rowData} {value} {jsonParsedValue} {editorTypes} />
|
||||||
|
|
||||||
{#if allowHintField && rowData && _.some(col.hintColumnNames, hintColumnName => rowData[hintColumnName])}
|
{#if showHint}
|
||||||
<span class="hint"
|
<span class="hint"
|
||||||
>{col.hintColumnNames.map(hintColumnName => rowData[hintColumnName]).join(col.hintColumnDelimiter || ' ')}</span
|
>{col.hintColumnNames.map(hintColumnName => rowData[hintColumnName]).join(col.hintColumnDelimiter || ' ')}</span
|
||||||
>
|
>
|
||||||
@@ -199,4 +202,9 @@
|
|||||||
overflow: visible;
|
overflow: visible;
|
||||||
cursor: crosshair;
|
cursor: crosshair;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.alignRight {
|
||||||
|
color: var(--theme-icon-green);
|
||||||
|
text-align: var(--data-grid-numbers-align);
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -138,6 +138,8 @@ ORDER BY
|
|||||||
defaultValue="10"
|
defaultValue="10"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
<FormCheckboxField name="dataGrid.alignNumbersRight" label="Align numbers to right" defaultValue={false} />
|
||||||
|
|
||||||
<div class="heading">SQL editor</div>
|
<div class="heading">SQL editor</div>
|
||||||
|
|
||||||
<div class="flex">
|
<div class="flex">
|
||||||
|
|||||||
@@ -218,6 +218,9 @@ export const visibleTitleBar = derived(useSettings(), $settings => {
|
|||||||
// console.log('nativeMenuOnStartup', nativeMenuOnStartup);
|
// console.log('nativeMenuOnStartup', nativeMenuOnStartup);
|
||||||
return !$settings['app.fullscreen'] && !nativeMenuOnStartup;
|
return !$settings['app.fullscreen'] && !nativeMenuOnStartup;
|
||||||
});
|
});
|
||||||
|
export const alignDataGridNumbersToRight = derived(useSettings(), $settings => {
|
||||||
|
return !!$settings?.['dataGrid.alignNumbersRight'];
|
||||||
|
});
|
||||||
|
|
||||||
export const visibleHamburgerMenuWidget = derived(useSettings(), $settings => {
|
export const visibleHamburgerMenuWidget = derived(useSettings(), $settings => {
|
||||||
const electron = getElectron();
|
const electron = getElectron();
|
||||||
@@ -231,6 +234,7 @@ subscribeCssVariable(visibleSelectedWidget, x => (x ? 1 : 0), '--dim-visible-lef
|
|||||||
subscribeCssVariable(leftPanelWidth, x => `${x}px`, '--dim-left-panel-width');
|
subscribeCssVariable(leftPanelWidth, x => `${x}px`, '--dim-left-panel-width');
|
||||||
subscribeCssVariable(visibleTitleBar, x => (x ? 1 : 0), '--dim-visible-titlebar');
|
subscribeCssVariable(visibleTitleBar, x => (x ? 1 : 0), '--dim-visible-titlebar');
|
||||||
subscribeCssVariable(lockedDatabaseMode, x => (x ? 0 : 1), '--dim-visible-tabs-databases');
|
subscribeCssVariable(lockedDatabaseMode, x => (x ? 0 : 1), '--dim-visible-tabs-databases');
|
||||||
|
subscribeCssVariable(alignDataGridNumbersToRight, x => (x ? 'right' : 'left'), '--data-grid-numbers-align');
|
||||||
|
|
||||||
let activeTabIdValue = null;
|
let activeTabIdValue = null;
|
||||||
activeTabId.subscribe(value => {
|
activeTabId.subscribe(value => {
|
||||||
|
|||||||
Reference in New Issue
Block a user