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

#1118

Browse Source
This commit is contained in:
SPRINX0\prochazka
2025-06-11 11:09:07 +02:00
parent 2ef7c63047
commit 34bdb72ffd
4 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -71,7 +71,8 @@ export abstract class GridDisplay {
protected setCache: ChangeCacheFunc,
public driver?: EngineDriver,
public dbinfo: DatabaseInfo = null,
public serverVersion = null
public serverVersion = null,
public currentSettings = null
) {
this.dialect = (driver?.dialectByVersion && driver?.dialectByVersion(serverVersion)) || driver?.dialect;
}
@@ -206,7 +207,7 @@ export abstract class GridDisplay {
get hiddenColumnIndexes() {
// console.log('GridDisplay.hiddenColumn', this.config.hiddenColumns);
const res = (this.config.hiddenColumns || []).map(x => _.findIndex(this.allColumns, y => y.uniqueName == x));
if (this.config.searchInColumns) {
if (this.config.searchInColumns && !this.currentSettings?.['dataGrid.showAllColumnsWhenSearch']) {
for (let i = 0; i < this.allColumns.length; i++) {
if (!filterName(this.config.searchInColumns, this.allColumns[i].columnName)) {
res.push(i);

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

@@ -38,9 +38,10 @@ export class TableGridDisplay extends GridDisplay {
serverVersion,
public getDictionaryDescription: DictionaryDescriptionFunc = null,
isReadOnly = false,
public isRawMode = false
public isRawMode = false,
public currentSettings = null
) {
super(config, setConfig, cache, setCache, driver, dbinfo, serverVersion);
super(config, setConfig, cache, setCache, driver, dbinfo, serverVersion, currentSettings);
this.table = this.findTable(tableName);
if (!this.table) {