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

search settings

Browse Source
This commit is contained in:
SPRINX0\prochazka
2024-12-16 11:47:53 +01:00
parent dc302f89c7
commit a20b4b3339
8 changed files with 145 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/web/src/appobj/AppObjectCore.svelte
View File

@@ -31,6 +31,7 @@
export let showPinnedInsteadOfUnpin = false;
export let indentLevel = 0;
export let disableBoldScroll = false;
export let filter = null;
$: isChecked =
checkedObjectsStore && $checkedObjectsStore.find(x => module?.extractKey(data) == module?.extractKey(x));

6
packages/web/src/appobj/AppObjectList.svelte
View File

@@ -31,7 +31,7 @@
$: filtered = !groupFunc
? list.filter(data => {
const matcher = module.createMatcher && module.createMatcher(data);
const matcher = module.createMatcher && module.createMatcher(data, passProps?.searchSettings);
if (matcher && !matcher(filter)) return false;
return true;
})
@@ -39,7 +39,7 @@
$: childrenMatched = !groupFunc
? list.filter(data => {
const matcher = module.createChildMatcher && module.createChildMatcher(data);
const matcher = module.createChildMatcher && module.createChildMatcher(data, passProps?.searchSettings);
if (matcher && !matcher(filter)) return false;
return true;
})
@@ -62,7 +62,7 @@
$: listGrouped = groupFunc
? _.compact(
(list || []).map(data => {
const matcher = module.createMatcher && module.createMatcher(data);
const matcher = module.createMatcher && module.createMatcher(data, passProps?.searchSettings);
const isMatched = matcher && !matcher(filter) ? false : true;
const group = groupFunc(data);
return { group, data, isMatched };

1
packages/web/src/appobj/AppObjectListItem.svelte
View File

@@ -57,6 +57,7 @@
{module}
{disableContextMenu}
{passProps}
{filter}
/>
{#if (isExpanded || isExpandedBySearch) && subItemsComponent}

34
packages/web/src/appobj/DatabaseObjectAppObject.svelte
View File

@@ -3,14 +3,30 @@
export const extractKey = ({ schemaName, pureName }) => (schemaName ? `${schemaName}.${pureName}` : pureName);
export const createMatcher =
({ schemaName, pureName, columns }) =>
filter =>
filterName(
filter,
pureName,
schemaName,
...(columns?.map(({ columnName }) => ({ childName: columnName })) || [])
);
(
{ schemaName, pureName, objectComment, tableEngine, columns, objectTypeField, createSql },
cfg = DEFAULT_SEARCH_SETTINGS
) =>
filter => {
const filterArgs = [];
if (cfg.schemaName) filterArgs.push(schemaName);
if (objectTypeField == 'tables') {
if (cfg.tableName) filterArgs.push(pureName);
if (cfg.tableComment) filterArgs.push(objectComment);
if (cfg.tableEngine) filterArgs.push(tableEngine);
for (const column of columns || []) {
if (cfg.columnName) filterArgs.push(column.columnName);
if (cfg.columnComment) filterArgs.push(column.columnComment);
if (cfg.columnDataType) filterArgs.push(column.dataType);
}
} else {
if (cfg.sqlObjectName) filterArgs.push(pureName);
if (cfg.sqlObjectText) filterArgs.push(createSql);
}
return filterName(filter, ...filterArgs);
};
export const createTitle = ({ schemaName, pureName }) => (schemaName ? `${schemaName}.${pureName}` : pureName);
export const databaseObjectIcons = {
@@ -877,9 +893,11 @@
import AppObjectCore from './AppObjectCore.svelte';
import {
currentDatabase,
DEFAULT_SEARCH_SETTINGS,
extensions,
getActiveTab,
getCurrentSettings,
getDatabaseObjectAppObjectSearchSettings,
getExtensions,
getLastUsedDefaultActions,
lastUsedDefaultActions,