mirrors/dbgate
1
0
Fork 0
mirror of https://github.com/dbgate/dbgate synced 2024-11-07 20:26:23 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

changed perspective checked logic

Browse Source
This commit is contained in:
Jan Prochazka 2022-08-27 11:57:54 +02:00
parent 6cb2616d87
commit 1a16d7c69e
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,7 +57,7 @@ export interface PerspectiveNodeConfig {
expandedColumns: string[];
checkedColumns: string[];
uncheckedColumns: string[];
// uncheckedColumns: string[];
sort: {
columnName: string;
@ -66,6 +66,7 @@ export interface PerspectiveNodeConfig {
filters: { [uniqueName: string]: string };
isAutoGenerated?: true | undefined;
isNodeChecked?: boolean;
position?: {
x: number;
@ -101,7 +102,7 @@ export function createPerspectiveNodeConfig(name: { schemaName?: string; pureNam
expandedColumns: [],
checkedColumns: [],
uncheckedColumns: [],
// uncheckedColumns: [],
sort: [],
filters: {},

28
packages/datalib/src/PerspectiveTreeNode.ts
View File

@ -78,7 +78,7 @@ export abstract class PerspectiveTreeNode {
}
readonly nodeConfig: PerspectiveNodeConfig;
readonly parentNodeConfig: PerspectiveNodeConfig;
defaultChecked: boolean;
// defaultChecked: boolean;
abstract get title();
abstract get codeName();
abstract get isExpandable();
@ -135,8 +135,9 @@ export abstract class PerspectiveTreeNode {
}
get isChecked() {
if (this.parentNodeConfig?.checkedColumns?.includes(this.codeName)) return true;
if (this.parentNodeConfig?.uncheckedColumns?.includes(this.codeName)) return false;
return this.defaultChecked;
// if (this.parentNodeConfig?.uncheckedColumns?.includes(this.codeName)) return false;
// return this.defaultChecked;
return false;
}
get columnTitle() {
return this.title;
@ -183,11 +184,12 @@ export abstract class PerspectiveTreeNode {
}
toggleChecked(value?: boolean) {
if (this.defaultChecked) {
this.includeInNodeSet('uncheckedColumns', value == null ? this.isChecked : value);
} else {
this.includeInNodeSet('checkedColumns', value == null ? !this.isChecked : value);
}
this.includeInNodeSet('checkedColumns', value == null ? !this.isChecked : value);
// if (this.defaultChecked) {
// this.includeInNodeSet('uncheckedColumns', value == null ? this.isChecked : value);
// } else {
// this.includeInNodeSet('checkedColumns', value == null ? !this.isChecked : value);
// }
}
createReferenceConfigColumns(): PerspectiveReferenceConfig['columns'] {
@ -998,11 +1000,11 @@ export function getTableChildPerspectiveNodes(
)
)
);
const circularColumns = columnNodes.filter(x => x.isCircular).map(x => x.columnName);
const defaultColumns = getPerspectiveDefaultColumns(table, db, circularColumns);
for (const node of columnNodes) {
node.defaultChecked = defaultColumns.includes(node.columnName);
}
// const circularColumns = columnNodes.filter(x => x.isCircular).map(x => x.columnName);
// const defaultColumns = getPerspectiveDefaultColumns(table, db, circularColumns);
// for (const node of columnNodes) {
// node.defaultChecked = defaultColumns.includes(node.columnName);
// }
const res = [];
res.push(...columnNodes);