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

option not to show FK hints

Browse Source
This commit is contained in:
Jan Prochazka
2021-04-18 10:55:18 +02:00
parent cacd6ae849
commit 0848008302
4 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/datalib/src/TableFormViewDisplay.ts
View File

@@ -28,10 +28,20 @@ export class TableFormViewDisplay extends FormViewDisplay {
setConfig: ChangeConfigFunc, setConfig: ChangeConfigFunc,
cache: GridCache, cache: GridCache,
setCache: ChangeCacheFunc, setCache: ChangeCacheFunc,
dbinfo: DatabaseInfo dbinfo: DatabaseInfo,
displayOptions
) { ) {
super(config, setConfig, cache, setCache, driver, dbinfo); super(config, setConfig, cache, setCache, driver, dbinfo);
this.gridDisplay = new TableGridDisplay(tableName, driver, config, setConfig, cache, setCache, dbinfo); this.gridDisplay = new TableGridDisplay(
tableName,
driver,
config,
setConfig,
cache,
setCache,
dbinfo,
displayOptions
);
this.gridDisplay.addAllExpandedColumnsToSelected = true; this.gridDisplay.addAllExpandedColumnsToSelected = true;
this.isLoadedCorrectly = this.gridDisplay.isLoadedCorrectly && !!this.driver; this.isLoadedCorrectly = this.gridDisplay.isLoadedCorrectly && !!this.driver;

5
packages/datalib/src/TableGridDisplay.ts
View File

@@ -17,7 +17,8 @@ export class TableGridDisplay extends GridDisplay {
setConfig: ChangeConfigFunc, setConfig: ChangeConfigFunc,
cache: GridCache, cache: GridCache,
setCache: ChangeCacheFunc, setCache: ChangeCacheFunc,
dbinfo: DatabaseInfo dbinfo: DatabaseInfo,
public displayOptions: any
) { ) {
super(config, setConfig, cache, setCache, driver, dbinfo); super(config, setConfig, cache, setCache, driver, dbinfo);
@@ -168,7 +169,7 @@ export class TableGridDisplay extends GridDisplay {
processReferences(select: Select, displayedColumnInfo: DisplayedColumnInfo, options) { processReferences(select: Select, displayedColumnInfo: DisplayedColumnInfo, options) {
this.addJoinsFromExpandedColumns(select, this.columns, 'basetbl', displayedColumnInfo); this.addJoinsFromExpandedColumns(select, this.columns, 'basetbl', displayedColumnInfo);
if (!options.isExport) { if (!options.isExport && this.displayOptions.showHintColumns) {
this.addHintsToSelect(select); this.addHintsToSelect(select);
} }
} }

7
packages/web/src/datagrid/TableDataGrid.svelte
View File

@@ -20,6 +20,7 @@
import ReferenceHeader from './ReferenceHeader.svelte'; import ReferenceHeader from './ReferenceHeader.svelte';
import SqlDataGridCore from './SqlDataGridCore.svelte'; import SqlDataGridCore from './SqlDataGridCore.svelte';
import SqlFormView from '../formview/SqlFormView.svelte'; import SqlFormView from '../formview/SqlFormView.svelte';
import { getBoolSettingsValue } from '../settings/settingsTools';
export let conid; export let conid;
export let database; export let database;
@@ -52,7 +53,8 @@
setConfig, setConfig,
cache, cache,
setCache, setCache,
$dbinfo $dbinfo,
{ showHintColumns: getBoolSettingsValue('dataGrid.showHintColumns', true) }
) )
: null; : null;
@@ -64,7 +66,8 @@
setConfig, setConfig,
cache, cache,
setCache, setCache,
$dbinfo $dbinfo,
{ showHintColumns: getBoolSettingsValue('dataGrid.showHintColumns', true) }
) )
: null; : null;

3
packages/web/src/settings/SettingsModal.svelte
View File

@@ -26,7 +26,8 @@
<div class="heading">Data grid</div> <div class="heading">Data grid</div>
<FormCheckboxField name="dataGrid.hideLeftColumn" label="Hide left column by default" /> <FormCheckboxField name="dataGrid.hideLeftColumn" label="Hide left column by default" />
<FormTextField name="dataGrid.pageSize" label="Page size" defaultValue="100" /> <FormTextField name="dataGrid.pageSize" label="Page size (number of rows for incremental loading)" defaultValue="100" />
<FormCheckboxField name="dataGrid.showHintColumns" label="Show foreign key hints" defaultValue={true} />
<div slot="footer"> <div slot="footer">
<FormSubmit value="OK" on:click={handleOk} /> <FormSubmit value="OK" on:click={handleOk} />