ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-09 09:42:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix normal dialog vertical scrolling issue (#23177)

Browse Source
This commit is contained in:
Alan Ren
2023-05-19 16:51:55 -07:00
committed by GitHub
parent e322641538
commit 5356cd7748
10 changed files with 64 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/sql/workbench/services/connection/browser/media/passwordDialog.css
View File

@@ -3,18 +3,11 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
.change-password-dialog {
padding: 30px;
height: 100%;
overflow: hidden;
padding: 10px;
display: flex;
flex-direction: column;
}
.change-password-dialog .properties-content {
flex: 1 1 auto;
overflow-y: auto;
}
.change-password-dialog .component-label-bold {
font-weight: 600;
padding-bottom: 30px;

2
src/sql/workbench/services/connection/browser/passwordChangeDialog.ts
View File

@@ -57,7 +57,7 @@ export class PasswordChangeDialog extends Modal {
@IContextViewService private readonly contextViewService: IContextViewService,
@ITextResourcePropertiesService textResourcePropertiesService: ITextResourcePropertiesService,
) {
super('', '', telemetryService, layoutService, clipboardService, themeService, logService, textResourcePropertiesService, contextKeyService, { hasSpinner: true, spinnerTitle: passwordChangeLoadText, dialogStyle: 'normal', width: dialogWidth, dialogPosition: 'left' });
super('', '', telemetryService, layoutService, clipboardService, themeService, logService, textResourcePropertiesService, contextKeyService, { hasSpinner: true, spinnerTitle: passwordChangeLoadText, dialogStyle: 'normal', width: dialogWidth, dialogPosition: 'left', height: 350 });
}
public open(profile: IConnectionProfile): Promise<string> {

2
src/sql/workbench/services/errorMessage/browser/errorMessageDialog.ts
View File

@@ -62,7 +62,7 @@ export class ErrorMessageDialog extends Modal {
@IOpenerService private readonly _openerService: IOpenerService,
protected _telemetryView: TelemetryKeys.TelemetryView | string = TelemetryKeys.TelemetryView.ErrorMessageDialog,
) {
super('', TelemetryKeys.ModalDialogName.ErrorMessage, telemetryService, layoutService, clipboardService, themeService, logService, textResourcePropertiesService, contextKeyService, { dialogStyle: 'normal', hasTitleIcon: true });
super('', TelemetryKeys.ModalDialogName.ErrorMessage, telemetryService, layoutService, clipboardService, themeService, logService, textResourcePropertiesService, contextKeyService, { dialogStyle: 'normal', hasTitleIcon: true, height: 340 });
this._okLabel = localize('errorMessageDialog.ok', "OK");
this._closeLabel = localize('errorMessageDialog.close', "Close");
this._readMoreLabel = localize('errorMessageDialog.readMore', "Read More");

5
src/sql/workbench/services/errorMessage/browser/media/errorMessageDialog.css
View File

@@ -4,9 +4,8 @@
*--------------------------------------------------------------------------------------------*/
.error-dialog {
padding: 15px;
overflow: auto;
height: 210px;
padding: 10px;
height: calc(100% - 20px);
}
.error-dialog .codicon.error, .error-dialog .codicon.warning , .error-dialog .codicon.info {

3
src/sql/workbench/services/objectExplorer/browser/media/filterDialog.css
View File

@@ -4,10 +4,11 @@
*--------------------------------------------------------------------------------------------*/
.filter-dialog-body {
height: 400px;
padding: 10px;
display: flex;
flex-direction: column;
height: calc(100% - 20px);
overflow: hidden;
}
.filter-table-container .filter-table {

17
src/sql/workbench/services/profiler/browser/media/profilerFilterDialog.css
View File

@@ -4,8 +4,11 @@
*--------------------------------------------------------------------------------------------*/
.profiler-filter-dialog {
height: 300px;
padding: 10px;
display: flex;
flex-direction: column;
height: calc(100% - 20px);
overflow: flex;
}
.profiler-filter-clause-table {
@@ -13,9 +16,9 @@
margin-bottom: 10px;
}
.clause-table-container{
max-height: 270px;
.clause-table-container {
overflow-y: scroll;
flex: 1 1 auto;
}
.profiler-filter-remove-condition {
@@ -24,10 +27,14 @@
cursor: pointer;
}
.profiler-filter-dialog .actions-container {
display: flex;
flex-direction: row;
}
.profiler-filter-clause-table-action {
cursor: pointer;
margin-right: 10px;
padding: 2px;
text-decoration: underline;
display: inline-block;
}
}

18
src/sql/workbench/services/profiler/browser/profilerFilterDialog.ts
View File

@@ -119,24 +119,27 @@ export class ProfilerFilterDialog extends Modal {
protected renderBody(container: HTMLElement) {
const body = DOM.append(container, DOM.$('.profiler-filter-dialog'));
const clauseTableContainer = DOM.append(body, DOM.$('.clause-table-container'));
const actionsContainer = DOM.append(body, DOM.$('.actions-container'));
this._clauseBuilder = DOM.append(clauseTableContainer, DOM.$('table.profiler-filter-clause-table'));
const headerRow = DOM.append(this._clauseBuilder, DOM.$('tr'));
DOM.append(headerRow, DOM.$('td')).innerText = FieldText;
DOM.append(headerRow, DOM.$('td')).innerText = OperatorText;
DOM.append(headerRow, DOM.$('td')).innerText = ValueText;
DOM.append(headerRow, DOM.$('td')).innerText = '';
DOM.append(headerRow, DOM.$('th')).innerText = FieldText;
DOM.append(headerRow, DOM.$('th')).innerText = OperatorText;
DOM.append(headerRow, DOM.$('th')).innerText = ValueText;
DOM.append(headerRow, DOM.$('th')).innerText = '';
this._input!.filter.clauses.forEach(clause => {
this.addClauseRow(true, clause.field, this.convertToOperatorString(clause.operator), clause.value);
});
this.createClauseTableActionLink(AddClauseText, body, () => {
this.createClauseTableActionLink(AddClauseText, actionsContainer, () => {
this.addClauseRow(false);
// Set keyboard focus to the newly added clause.
this._clauseRows[this._clauseRows.length - 1]?.field?.focus();
aria.status(NewClauseAddedText);
});
this.createClauseTableActionLink(ClearText, body, () => { this.handleClearButtonClick(); });
this.createClauseTableActionLink(ClearText, actionsContainer, () => { this.handleClearButtonClick(); });
}
protected layout(height?: number): void {
@@ -169,7 +172,8 @@ export class ProfilerFilterDialog extends Modal {
private createClauseTableActionLink(text: string, parent: HTMLElement, handler: () => void): void {
const actionLink = DOM.append(parent, DOM.$('.profiler-filter-clause-table-action', {
'tabIndex': '0',
'role': 'button'
'role': 'button',
'aria-label': text
}));
actionLink.innerText = text;
DOM.addDisposableListener(actionLink, DOM.EventType.CLICK, handler);

2
src/sql/workbench/services/tableDesigner/browser/media/tableDesignerPublishDialog.css
View File

@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
.table-designer-publish-dialog {
height: 350px;
height: calc(100% - 20px);
padding: 10px;
display: flex;
flex-direction: column;