ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

fixed the bug with collapsibleState (#2189)

Browse Source
This commit is contained in:
Leila Lali
2018-08-08 12:27:55 -07:00
committed by GitHub
parent 39bfd69dc9
commit 48d5cc554c
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
samples/sqlservices/src/controllers/treeDataProvider.ts
View File

@@ -75,6 +75,14 @@ export class TreeNode implements sqlops.TreeComponentItem {
this.data.label = value; this.data.label = value;
} }
public get collapsibleState(): vscode.TreeItemCollapsibleState {
if (!this._isAlwaysLeaf) {
return vscode.TreeItemCollapsibleState.Collapsed;
} else {
vscode.TreeItemCollapsibleState.None;
}
}
public get label(): string { public get label(): string {
return this.data.label; return this.data.label;
} }
@@ -265,6 +273,7 @@ export class TreeDataProvider implements sqlops.TreeComponentDataProvider<TreeNo
let item: sqlops.TreeComponentItem = {}; let item: sqlops.TreeComponentItem = {};
item.label = element.label; item.label = element.label;
item.checked = element.checked; item.checked = element.checked;
item.collapsibleState = element.collapsibleState;
item.iconPath = vscode.Uri.file(path.join(__dirname, '..', 'media', 'monitor.svg')); item.iconPath = vscode.Uri.file(path.join(__dirname, '..', 'media', 'monitor.svg'));
return item; return item;
} }

2
src/sql/parts/modelComponents/tree/tree.component.ts
View File

@@ -31,7 +31,7 @@ class Root implements ITreeComponentItem {
label = 'root'; label = 'root';
handle = '0'; handle = '0';
parentHandle = null; parentHandle = null;
collapsibleState = 0; collapsibleState = 2;
children = void 0; children = void 0;
options = undefined; options = undefined;
} }

3
src/sql/parts/modelComponents/tree/treeDataSource.ts
View File

@@ -8,6 +8,7 @@
import { ITree, IDataSource } from 'vs/base/parts/tree/browser/tree'; import { ITree, IDataSource } from 'vs/base/parts/tree/browser/tree';
import { TPromise } from 'vs/base/common/winjs.base'; import { TPromise } from 'vs/base/common/winjs.base';
import { IModelViewTreeViewDataProvider, ITreeComponentItem } from 'sql/workbench/common/views'; import { IModelViewTreeViewDataProvider, ITreeComponentItem } from 'sql/workbench/common/views';
import { TreeItemCollapsibleState } from 'vs/workbench/common/views';
/** /**
* Implements the DataSource(that returns a parent/children of an element) for the recent connection tree * Implements the DataSource(that returns a parent/children of an element) for the recent connection tree
@@ -34,7 +35,7 @@ export class TreeComponentDataSource implements IDataSource {
* Returns a boolean value indicating whether the element has children. * Returns a boolean value indicating whether the element has children.
*/ */
public hasChildren(tree: ITree, node: ITreeComponentItem): boolean { public hasChildren(tree: ITree, node: ITreeComponentItem): boolean {
return this._dataProvider !== undefined; return this._dataProvider !== undefined && node.collapsibleState !== TreeItemCollapsibleState.None;
} }
/** /**