fix: Expression window resize (#3587)

* fix: Expression window resize

* fix: Expression window resize

* fix: Expression window resize

hard-coded value removed

* fix: Expression window resize

- adding column dialog fixed
- default width is preserved

Co-authored-by: Antonin Delpeuch <antonin@delpeuch.eu>
This commit is contained in:
Mo-hamdy2000 2021-02-20 12:36:06 +02:00 committed by GitHub
parent 62c5270a6d
commit 6c47c81e59
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 23 additions and 22 deletions

View File

@ -36,8 +36,7 @@ function ExpressionPreviewDialog(title, cellIndex, rowIndices, values, expressio
var self = this; var self = this;
var frame = DialogSystem.createDialog(); var frame = DialogSystem.createDialog();
frame.width("700px"); frame.css("min-width", "700px")
var header = $('<div></div>').addClass("dialog-header").text(title).appendTo(frame); var header = $('<div></div>').addClass("dialog-header").text(title).appendTo(frame);
var body = $('<div></div>').addClass("dialog-body").appendTo(frame); var body = $('<div></div>').addClass("dialog-body").appendTo(frame);
var footer = $('<div></div>').addClass("dialog-footer").appendTo(frame); var footer = $('<div></div>').addClass("dialog-footer").appendTo(frame);
@ -134,8 +133,6 @@ ExpressionPreviewDialog.Widget = function(
.select() .select()
.focus(); .focus();
this._tabContentWidth = this._elmts.expressionPreviewPreviewContainer.width() + "px";
this._elmts.or_dialog_expr.html($.i18n('core-dialogs/expression')); this._elmts.or_dialog_expr.html($.i18n('core-dialogs/expression'));
this._elmts.or_dialog_lang.html($.i18n('core-dialogs/language')); this._elmts.or_dialog_lang.html($.i18n('core-dialogs/language'));
this._elmts.or_dialog_preview.html($.i18n('core-dialogs/preview')); this._elmts.or_dialog_preview.html($.i18n('core-dialogs/preview'));
@ -186,8 +183,7 @@ ExpressionPreviewDialog.Widget.prototype._renderHelpTab = function() {
}; };
ExpressionPreviewDialog.Widget.prototype._renderHelp = function(data) { ExpressionPreviewDialog.Widget.prototype._renderHelp = function(data) {
var elmt = this._elmts.expressionPreviewHelpTabBody.empty().width(this._tabContentWidth); var elmt = this._elmts.expressionPreviewHelpTabBody.empty();
$('<h3></h3>').text("Variables").appendTo(elmt); $('<h3></h3>').text("Variables").appendTo(elmt);
var varTable = $('<table cellspacing="5"></table>').appendTo(elmt)[0]; var varTable = $('<table cellspacing="5"></table>').appendTo(elmt)[0];
var vars = [ var vars = [
@ -269,7 +265,7 @@ ExpressionPreviewDialog.Widget.prototype._renderExpressionHistoryTab = function(
ExpressionPreviewDialog.Widget.prototype._renderExpressionHistory = function(data) { ExpressionPreviewDialog.Widget.prototype._renderExpressionHistory = function(data) {
var self = this; var self = this;
var elmt = this._elmts.expressionPreviewHistoryContainer.empty().width(this._tabContentWidth); var elmt = this._elmts.expressionPreviewHistoryContainer.empty();
var table = $( var table = $(
'<table>' + '<table>' +
@ -337,7 +333,7 @@ ExpressionPreviewDialog.Widget.prototype._renderStarredExpressionsTab = function
ExpressionPreviewDialog.Widget.prototype._renderStarredExpressions = function(data) { ExpressionPreviewDialog.Widget.prototype._renderStarredExpressions = function(data) {
var self = this; var self = this;
var elmt = this._elmts.expressionPreviewStarredContainer.empty().width(this._tabContentWidth); var elmt = this._elmts.expressionPreviewStarredContainer.empty();
var table = $( var table = $(
'<table>' + '<table>' +
@ -436,7 +432,7 @@ ExpressionPreviewDialog.Widget.prototype._prepareUpdate = function(params) {
}; };
ExpressionPreviewDialog.Widget.prototype._renderPreview = function(expression, data) { ExpressionPreviewDialog.Widget.prototype._renderPreview = function(expression, data) {
var container = this._elmts.expressionPreviewPreviewContainer.empty().width(this._tabContentWidth); var container = this._elmts.expressionPreviewPreviewContainer.empty();
var table = $('<table></table>').appendTo( var table = $('<table></table>').appendTo(
$('<div>').addClass("expression-preview-table-wrapper").appendTo(container))[0]; $('<div>').addClass("expression-preview-table-wrapper").appendTo(container))[0];

View File

@ -323,7 +323,6 @@ ExtendReconciledDataPreviewDialog.prototype._constrainProperty = function(id) {
var property = this._findProperty(id); var property = this._findProperty(id);
var frame = DialogSystem.createDialog(); var frame = DialogSystem.createDialog();
frame.width("500px");
var header = $('<div></div>').addClass("dialog-header").text("Settings for " + id).appendTo(frame); var header = $('<div></div>').addClass("dialog-header").text("Settings for " + id).appendTo(frame);
var body = $('<div></div>').addClass("dialog-body").appendTo(frame); var body = $('<div></div>').addClass("dialog-body").appendTo(frame);

View File

@ -1,4 +1,4 @@
<div class="dialog-frame" style="width: 800px;"> <div class="dialog-frame" style="min-width: 800px;">
<div class="dialog-header" bind="dialogHeader"></div> <div class="dialog-header" bind="dialogHeader"></div>
<div class="dialog-body" bind="dialogBody"> <div class="dialog-body" bind="dialogBody">
<div id="sql-exporter-tabs" class="refine-tabs"> <div id="sql-exporter-tabs" class="refine-tabs">

View File

@ -1,4 +1,4 @@
<div class="dialog-frame" style="width: 900px;"> <div class="dialog-frame" style="min-width: 900px;">
<div class="dialog-header" bind="dialogHeader"></div> <div class="dialog-header" bind="dialogHeader"></div>
<div class="dialog-body" bind="dialogBody"> <div class="dialog-body" bind="dialogBody">
<div class="grid-layout layout-normal layout-full"><table> <div class="grid-layout layout-normal layout-full"><table>

View File

@ -1,8 +1,8 @@
<div class="dialog-frame" style="width: 700px;"> <div class="dialog-frame" style="min-width: 700px;">
<div class="dialog-border"> <div class="dialog-border">
<div class="dialog-header" bind="dialogHeader"></div> <div class="dialog-header" bind="dialogHeader"></div>
<div class="dialog-body" bind="dialogBody"> <div class="dialog-body" bind="dialogBody">
<div class="grid-layout layout-normal layout-full"><table cols="2"> <div class="grid-layout layout-normal layout-full"><table cols="2" style="width: 700px;">
<tr> <tr>
<td width="1%" style="white-space: pre;" bind="or_views_newCol"></td> <td width="1%" style="white-space: pre;" bind="or_views_newCol"></td>
<td><input bind="columnNameInput" size="40" /></td> <td><input bind="columnNameInput" size="40" /></td>

View File

@ -1,8 +1,8 @@
<div class="dialog-frame" style="width: 700px;"> <div class="dialog-frame" style="min-width: 700px;">
<div class="dialog-border"> <div class="dialog-border">
<div class="dialog-header" bind="dialogHeader"></div> <div class="dialog-header" bind="dialogHeader"></div>
<div class="dialog-body" bind="dialogBody"> <div class="dialog-body" bind="dialogBody">
<div class="grid-layout layout-normal layout-full"><table cols="2"> <div class="grid-layout layout-normal layout-full"><table cols="2" style="width: 700px">
<tr> <tr>
<td width="1%" style="white-space: pre;" bind="or_views_newCol"></td> <td width="1%" style="white-space: pre;" bind="or_views_newCol"></td>
<td><input bind="columnNameInput" size="40" /></td> <td><input bind="columnNameInput" size="40" /></td>

View File

@ -1,4 +1,4 @@
<div class="dialog-frame" style="width: 600px;"> <div class="dialog-frame" style="min-width: 600px;">
<div class="dialog-border"> <div class="dialog-border">
<div class="dialog-header" bind="dialogHeader"></div> <div class="dialog-header" bind="dialogHeader"></div>
<div class="dialog-body" bind="dialogBody"> <div class="dialog-body" bind="dialogBody">

View File

@ -1,4 +1,4 @@
<div class="dialog-frame" style="width: 600px;"> <div class="dialog-frame" style="min-width: 600px;">
<div class="dialog-border"> <div class="dialog-border">
<div class="dialog-header" bind="dialogHeader"></div> <div class="dialog-header" bind="dialogHeader"></div>
<div class="dialog-body" bind="dialogBody"> <div class="dialog-body" bind="dialogBody">

View File

@ -1,4 +1,4 @@
<div class="dialog-frame" style="width: 80%;" > <div class="dialog-frame" style="min-width: 600px;">
<div class="dialog-border"> <div class="dialog-border">
<div class="dialog-header" bind="dialogHeader"></div> <div class="dialog-header" bind="dialogHeader"></div>
<div class="dialog-body" bind="dialogBody"> <div class="dialog-body" bind="dialogBody">

View File

@ -1,4 +1,4 @@
<div class="dialog-frame" style="width: 700px;"> <div class="dialog-frame" style="min-width: 700px;">
<div class="dialog-border"> <div class="dialog-border">
<div class="dialog-header" bind="dialogHeader"></div> <div class="dialog-header" bind="dialogHeader"></div>
<div class="dialog-body" bind="dialogBody"> <div class="dialog-body" bind="dialogBody">

View File

@ -389,7 +389,7 @@ div.input-container {
} }
div.input-container > input, div.input-container > textarea { div.input-container > input, div.input-container > textarea {
display: block; display: inline-block;
width: 100%; width: 100%;
padding: 2px; padding: 2px;
border: 1px inset; border: 1px inset;

View File

@ -75,6 +75,7 @@ textarea.expression-preview-code {
.expression-preview-table-wrapper { .expression-preview-table-wrapper {
padding: @padding_normal; padding: @padding_normal;
width: 100%;
} }
.expression-preview-container td { .expression-preview-container td {
@ -116,5 +117,9 @@ td.expression-preview-value {
} }
.expression-preview-doc-item-desc { .expression-preview-doc-item-desc {
max-width: 250px;
white-space: pre-wrap;
overflow-x: hidden;
color: #666; color: #666;
} }

View File

@ -55,6 +55,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
text-align: left; text-align: left;
background: white; background: white;
border: 1px solid @dialog_frame; border: 1px solid @dialog_frame;
display: inline-block;
} }
.dialog-border { .dialog-border {