mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-17 02:51:36 -05:00
Feature/model view list (#1551)
* fixed the issue with drop down styling * added list box to model view library
This commit is contained in:
@@ -171,12 +171,28 @@ export default class MainController implements vscode.Disposable {
|
|||||||
inputBox.value = radioButton.value;
|
inputBox.value = radioButton.value;
|
||||||
groupModel1.enabled = false;
|
groupModel1.enabled = false;
|
||||||
});
|
});
|
||||||
|
let table = view.modelBuilder.table().withProperties({
|
||||||
|
data: [
|
||||||
|
['1', '2', '2'],
|
||||||
|
['4', '5', '6'],
|
||||||
|
['7', '8', '9']
|
||||||
|
], columns: ['c1', 'c2', 'c3'],
|
||||||
|
height: 250,
|
||||||
|
selectedRows: [0]
|
||||||
|
}).component();
|
||||||
|
table.onRowSelected(e => {
|
||||||
|
// TODO:
|
||||||
|
});
|
||||||
|
let listBox = view.modelBuilder.listBox().withProperties({
|
||||||
|
values: ['1', '2', '3'],
|
||||||
|
selectedRow: 2
|
||||||
|
}).component();
|
||||||
|
|
||||||
let flexRadioButtonsModel = view.modelBuilder.flexContainer()
|
let flexRadioButtonsModel = view.modelBuilder.flexContainer()
|
||||||
.withLayout({
|
.withLayout({
|
||||||
flexFlow: 'column',
|
flexFlow: 'column',
|
||||||
alignItems: 'left',
|
alignItems: 'left',
|
||||||
height: 50
|
height: 150
|
||||||
}).withItems([
|
}).withItems([
|
||||||
radioButton, groupModel1, radioButton2]
|
radioButton, groupModel1, radioButton2]
|
||||||
, { flex: '1 1 50%' }).component();
|
, { flex: '1 1 50%' }).component();
|
||||||
@@ -200,6 +216,12 @@ export default class MainController implements vscode.Disposable {
|
|||||||
}, {
|
}, {
|
||||||
component: flexRadioButtonsModel,
|
component: flexRadioButtonsModel,
|
||||||
title: 'Options'
|
title: 'Options'
|
||||||
|
}, {
|
||||||
|
component: table,
|
||||||
|
title: 'Table'
|
||||||
|
}, {
|
||||||
|
component: listBox,
|
||||||
|
title: 'List Box'
|
||||||
}], {
|
}], {
|
||||||
horizontal: false,
|
horizontal: false,
|
||||||
componentWidth: 400
|
componentWidth: 400
|
||||||
@@ -322,7 +344,7 @@ export default class MainController implements vscode.Disposable {
|
|||||||
height: '100%'
|
height: '100%'
|
||||||
});
|
});
|
||||||
|
|
||||||
let templateValues = {url: 'http://whoisactive.com/docs/'};
|
let templateValues = { url: 'http://whoisactive.com/docs/' };
|
||||||
Utils.renderTemplateHtml(path.join(__dirname, '..'), 'templateTab.html', templateValues)
|
Utils.renderTemplateHtml(path.join(__dirname, '..'), 'templateTab.html', templateValues)
|
||||||
.then(html => {
|
.then(html => {
|
||||||
webview.html = html;
|
webview.html = html;
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import GroupContainer from './groupContainer.component';
|
|||||||
import CardComponent from './card.component';
|
import CardComponent from './card.component';
|
||||||
import InputBoxComponent from './inputbox.component';
|
import InputBoxComponent from './inputbox.component';
|
||||||
import DropDownComponent from './dropdown.component';
|
import DropDownComponent from './dropdown.component';
|
||||||
|
import ListBoxComponent from './listbox.component';
|
||||||
import ButtonComponent from './button.component';
|
import ButtonComponent from './button.component';
|
||||||
import CheckBoxComponent from './checkbox.component';
|
import CheckBoxComponent from './checkbox.component';
|
||||||
import RadioButtonComponent from './radioButton.component';
|
import RadioButtonComponent from './radioButton.component';
|
||||||
@@ -41,6 +42,9 @@ registerComponentType(INPUTBOX_COMPONENT, ModelComponentTypes.InputBox, InputBox
|
|||||||
export const DROPDOWN_COMPONENT = 'dropdown-component';
|
export const DROPDOWN_COMPONENT = 'dropdown-component';
|
||||||
registerComponentType(DROPDOWN_COMPONENT, ModelComponentTypes.DropDown, DropDownComponent);
|
registerComponentType(DROPDOWN_COMPONENT, ModelComponentTypes.DropDown, DropDownComponent);
|
||||||
|
|
||||||
|
export const LISTBOX_COMPONENT = 'lisbox-component';
|
||||||
|
registerComponentType(LISTBOX_COMPONENT, ModelComponentTypes.ListBox, ListBoxComponent);
|
||||||
|
|
||||||
export const BUTTON_COMPONENT = 'button-component';
|
export const BUTTON_COMPONENT = 'button-component';
|
||||||
registerComponentType(BUTTON_COMPONENT, ModelComponentTypes.Button, ButtonComponent);
|
registerComponentType(BUTTON_COMPONENT, ModelComponentTypes.Button, ButtonComponent);
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,8 @@ import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } fro
|
|||||||
import { Dropdown, IDropdownOptions } from 'sql/base/browser/ui/editableDropdown/dropdown';
|
import { Dropdown, IDropdownOptions } from 'sql/base/browser/ui/editableDropdown/dropdown';
|
||||||
import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox';
|
import { SelectBox } from 'sql/base/browser/ui/selectBox/selectBox';
|
||||||
import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service';
|
import { CommonServiceInterface } from 'sql/services/common/commonServiceInterface.service';
|
||||||
import { attachEditableDropdownStyler , attachSelectBoxStyler} from 'sql/common/theme/styler';
|
import { attachEditableDropdownStyler } from 'sql/common/theme/styler';
|
||||||
|
import { attachSelectBoxStyler } from 'vs/platform/theme/common/styler';
|
||||||
|
|
||||||
import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
|
import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
|
||||||
import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
|
import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
|
||||||
|
|||||||
128
src/sql/parts/modelComponents/listbox.component.ts
Normal file
128
src/sql/parts/modelComponents/listbox.component.ts
Normal file
@@ -0,0 +1,128 @@
|
|||||||
|
/*---------------------------------------------------------------------------------------------
|
||||||
|
* Copyright (c) Microsoft Corporation. All rights reserved.
|
||||||
|
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
||||||
|
*--------------------------------------------------------------------------------------------*/
|
||||||
|
|
||||||
|
import {
|
||||||
|
Component, Input, Inject, ChangeDetectorRef, forwardRef, ComponentFactoryResolver,
|
||||||
|
ViewChild, ViewChildren, ElementRef, Injector, OnDestroy, QueryList, AfterViewInit
|
||||||
|
} from '@angular/core';
|
||||||
|
|
||||||
|
import * as sqlops from 'sqlops';
|
||||||
|
|
||||||
|
import { ComponentBase } from 'sql/parts/modelComponents/componentBase';
|
||||||
|
import { IComponent, IComponentDescriptor, IModelStore, ComponentEventType } from 'sql/parts/modelComponents/interfaces';
|
||||||
|
|
||||||
|
import { ListBox } from 'sql/base/browser/ui/listBox/listBox';
|
||||||
|
import { attachListBoxStyler } from 'sql/common/theme/styler';
|
||||||
|
import { IWorkbenchThemeService } from 'vs/workbench/services/themes/common/workbenchThemeService';
|
||||||
|
import { IContextViewService } from 'vs/platform/contextview/browser/contextView';
|
||||||
|
import Event, { Emitter } from 'vs/base/common/event';
|
||||||
|
import * as nls from 'vs/nls';
|
||||||
|
import { IClipboardService } from 'vs/platform/clipboard/common/clipboardService';
|
||||||
|
|
||||||
|
@Component({
|
||||||
|
selector: 'modelview-listBox',
|
||||||
|
template: `
|
||||||
|
<div #input style="width: 100%"></div>
|
||||||
|
`
|
||||||
|
})
|
||||||
|
export default class ListBoxComponent extends ComponentBase implements IComponent, OnDestroy, AfterViewInit {
|
||||||
|
@Input() descriptor: IComponentDescriptor;
|
||||||
|
@Input() modelStore: IModelStore;
|
||||||
|
private _input: ListBox;
|
||||||
|
|
||||||
|
@ViewChild('input', { read: ElementRef }) private _inputContainer: ElementRef;
|
||||||
|
constructor(
|
||||||
|
@Inject(forwardRef(() => ChangeDetectorRef)) changeRef: ChangeDetectorRef,
|
||||||
|
@Inject(IWorkbenchThemeService) private themeService: IWorkbenchThemeService,
|
||||||
|
@Inject(IContextViewService) private contextViewService: IContextViewService,
|
||||||
|
@Inject(IClipboardService) private clipboardService: IClipboardService
|
||||||
|
) {
|
||||||
|
super(changeRef);
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnInit(): void {
|
||||||
|
this.baseInit();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
ngAfterViewInit(): void {
|
||||||
|
if (this._inputContainer) {
|
||||||
|
this._input = new ListBox([], undefined, this.contextViewService, this.clipboardService);
|
||||||
|
this._input.render(this._inputContainer.nativeElement);
|
||||||
|
|
||||||
|
this._register(this._input);
|
||||||
|
this._register(attachListBoxStyler(this._input, this.themeService));
|
||||||
|
this._register(this._input.onDidSelect(e => {
|
||||||
|
this.selectedRow = e.index;
|
||||||
|
this._onEventEmitter.fire({
|
||||||
|
eventType: ComponentEventType.onSelectedRowChanged,
|
||||||
|
args: e
|
||||||
|
});
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public validate(): Thenable<boolean> {
|
||||||
|
return super.validate().then(valid => {
|
||||||
|
return valid;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnDestroy(): void {
|
||||||
|
this.baseDestroy();
|
||||||
|
}
|
||||||
|
|
||||||
|
/// IComponent implementation
|
||||||
|
|
||||||
|
public layout(): void {
|
||||||
|
this._changeRef.detectChanges();
|
||||||
|
}
|
||||||
|
|
||||||
|
public setLayout(layout: any): void {
|
||||||
|
// TODO allow configuring the look and feel
|
||||||
|
this.layout();
|
||||||
|
}
|
||||||
|
|
||||||
|
public setProperties(properties: { [key: string]: any; }): void {
|
||||||
|
super.setProperties(properties);
|
||||||
|
this._input.setOptions(this.values, this.selectedRow);
|
||||||
|
|
||||||
|
this.validate();
|
||||||
|
}
|
||||||
|
|
||||||
|
// CSS-bound properties
|
||||||
|
|
||||||
|
private get values(): string[] {
|
||||||
|
return this.getPropertyOrDefault<sqlops.ListBoxProperties, string[]>((props) => props.values, undefined);
|
||||||
|
}
|
||||||
|
|
||||||
|
private set values(newValue: string[]) {
|
||||||
|
this.setPropertyFromUI<sqlops.ListBoxProperties, string[]>((props, value) => props.values = value, newValue);
|
||||||
|
}
|
||||||
|
|
||||||
|
private get selectedRow(): number {
|
||||||
|
return this.getPropertyOrDefault<sqlops.ListBoxProperties, number>((props) => props.selectedRow, undefined);
|
||||||
|
}
|
||||||
|
|
||||||
|
private set selectedRow(newValue: number) {
|
||||||
|
this.setPropertyFromUI<sqlops.ListBoxProperties, number>((props, value) => props.selectedRow = value, newValue);
|
||||||
|
}
|
||||||
|
|
||||||
|
public get height(): number {
|
||||||
|
return this.getPropertyOrDefault<sqlops.InputBoxProperties, number>((props) => props.height, undefined);
|
||||||
|
}
|
||||||
|
|
||||||
|
public set height(newValue: number) {
|
||||||
|
this.setPropertyFromUI<sqlops.InputBoxProperties, number>((props, value) => props.height = value, newValue);
|
||||||
|
}
|
||||||
|
|
||||||
|
public get width(): number {
|
||||||
|
return this.getPropertyOrDefault<sqlops.InputBoxProperties, number>((props) => props.width, undefined);
|
||||||
|
}
|
||||||
|
|
||||||
|
public set width(newValue: number) {
|
||||||
|
this.setPropertyFromUI<sqlops.InputBoxProperties, number>((props, value) => props.width = value, newValue);
|
||||||
|
}
|
||||||
|
}
|
||||||
12
src/sql/sqlops.proposed.d.ts
vendored
12
src/sql/sqlops.proposed.d.ts
vendored
@@ -26,6 +26,7 @@ declare module 'sqlops' {
|
|||||||
text(): ComponentBuilder<TextComponent>;
|
text(): ComponentBuilder<TextComponent>;
|
||||||
button(): ComponentBuilder<ButtonComponent>;
|
button(): ComponentBuilder<ButtonComponent>;
|
||||||
dropDown(): ComponentBuilder<DropDownComponent>;
|
dropDown(): ComponentBuilder<DropDownComponent>;
|
||||||
|
listBox(): ComponentBuilder<ListBoxComponent>;
|
||||||
table(): ComponentBuilder<TableComponent>;
|
table(): ComponentBuilder<TableComponent>;
|
||||||
dashboardWidget(widgetId: string): ComponentBuilder<DashboardWidgetComponent>;
|
dashboardWidget(widgetId: string): ComponentBuilder<DashboardWidgetComponent>;
|
||||||
dashboardWebview(webviewId: string): ComponentBuilder<DashboardWebviewComponent>;
|
dashboardWebview(webviewId: string): ComponentBuilder<DashboardWebviewComponent>;
|
||||||
@@ -334,6 +335,11 @@ declare module 'sqlops' {
|
|||||||
editable?: boolean;
|
editable?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface ListBoxProperties {
|
||||||
|
selectedRow?: number;
|
||||||
|
values?: string[];
|
||||||
|
}
|
||||||
|
|
||||||
export interface WebViewProperties {
|
export interface WebViewProperties {
|
||||||
message?: any;
|
message?: any;
|
||||||
html?: string;
|
html?: string;
|
||||||
@@ -379,6 +385,12 @@ declare module 'sqlops' {
|
|||||||
onValueChanged: vscode.Event<any>;
|
onValueChanged: vscode.Event<any>;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface ListBoxComponent extends Component, ListBoxProperties {
|
||||||
|
selectedRow?: number;
|
||||||
|
values: string[];
|
||||||
|
onRowSelected: vscode.Event<any>;
|
||||||
|
}
|
||||||
|
|
||||||
export interface TableComponent extends Component, TableComponentProperties {
|
export interface TableComponent extends Component, TableComponentProperties {
|
||||||
onRowSelected: vscode.Event<any>;
|
onRowSelected: vscode.Event<any>;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -69,6 +69,7 @@ export enum ModelComponentTypes {
|
|||||||
Card,
|
Card,
|
||||||
InputBox,
|
InputBox,
|
||||||
DropDown,
|
DropDown,
|
||||||
|
ListBox,
|
||||||
Button,
|
Button,
|
||||||
CheckBox,
|
CheckBox,
|
||||||
RadioButton,
|
RadioButton,
|
||||||
|
|||||||
@@ -116,6 +116,13 @@ class ModelBuilderImpl implements sqlops.ModelBuilder {
|
|||||||
return builder;
|
return builder;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
listBox(): sqlops.ComponentBuilder<sqlops.ListBoxComponent> {
|
||||||
|
let id = this.getNextComponentId();
|
||||||
|
let builder: ComponentBuilderImpl<sqlops.ListBoxComponent> = this.getComponentBuilder(new ListBoxWrapper(this._proxy, this._handle, id), id);
|
||||||
|
this._componentBuilders.set(id, builder);
|
||||||
|
return builder;
|
||||||
|
}
|
||||||
|
|
||||||
table(): sqlops.ComponentBuilder<sqlops.TableComponent> {
|
table(): sqlops.ComponentBuilder<sqlops.TableComponent> {
|
||||||
let id = this.getNextComponentId();
|
let id = this.getNextComponentId();
|
||||||
let builder: ComponentBuilderImpl<sqlops.TableComponent> = this.getComponentBuilder(new TableComponentWrapper(this._proxy, this._handle, id), id);
|
let builder: ComponentBuilderImpl<sqlops.TableComponent> = this.getComponentBuilder(new TableComponentWrapper(this._proxy, this._handle, id), id);
|
||||||
@@ -748,6 +755,34 @@ class DropDownWrapper extends ComponentWrapper implements sqlops.DropDownCompone
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class ListBoxWrapper extends ComponentWrapper implements sqlops.ListBoxComponent {
|
||||||
|
|
||||||
|
constructor(proxy: MainThreadModelViewShape, handle: number, id: string) {
|
||||||
|
super(proxy, handle, ModelComponentTypes.ListBox, id);
|
||||||
|
this.properties = {};
|
||||||
|
this._emitterMap.set(ComponentEventType.onSelectedRowChanged, new Emitter<any>());
|
||||||
|
}
|
||||||
|
|
||||||
|
public get selectedRow(): number {
|
||||||
|
return this.properties['selectedRow'];
|
||||||
|
}
|
||||||
|
public set selectedRow(v: number) {
|
||||||
|
this.setProperty('selectedRow', v);
|
||||||
|
}
|
||||||
|
|
||||||
|
public get values(): string[] {
|
||||||
|
return this.properties['values'];
|
||||||
|
}
|
||||||
|
public set values(v: string[]) {
|
||||||
|
this.setProperty('values', v);
|
||||||
|
}
|
||||||
|
|
||||||
|
public get onRowSelected(): vscode.Event<any> {
|
||||||
|
let emitter = this._emitterMap.get(ComponentEventType.onSelectedRowChanged);
|
||||||
|
return emitter && emitter.event;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
class ButtonWrapper extends ComponentWrapper implements sqlops.ButtonComponent {
|
class ButtonWrapper extends ComponentWrapper implements sqlops.ButtonComponent {
|
||||||
|
|
||||||
constructor(proxy: MainThreadModelViewShape, handle: number, id: string) {
|
constructor(proxy: MainThreadModelViewShape, handle: number, id: string) {
|
||||||
|
|||||||
Reference in New Issue
Block a user