Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[SSE] Refactoring autofilter dialog

Browse source
This commit is contained in:
Julia Radzhabova 2022-07-22 00:38:39 +03:00
parent 5a8dac6e71
commit 71c45112b1
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
View file

@ -979,7 +979,7 @@ define([
this.template = options.template || [ this.template = options.template || [
'<div class="box" style="height: 100%; display: flex; justify-content: space-between;">', '<div class="box" style="height: 100%; display: flex; justify-content: space-between;">',
'<div class="content-panel" style="width: 100%; border-right: 1px solid #cbcbcb; display: flex; flex-direction: column; justify-content: space-between;">', '<div class="content-panel" style="width: 100%; border-right: 1px solid #cbcbcb; display: flex; flex-direction: column; justify-content: space-between;">',
'<div class="" style="display: flex; flex-direction: column; justify-content: flex-start; height: calc(100% - 40px);">', '<div class="" style="display: flex; flex-direction: column; justify-content: flex-start; height: calc(100% - 37px);">',
'<div id="id-sd-cell-search" style="height:22px; margin-bottom:10px;"></div>', '<div id="id-sd-cell-search" style="height:22px; margin-bottom:10px;"></div>',
'<div class="border-values" style="overflow: hidden; flex-grow: 1;">', '<div class="border-values" style="overflow: hidden; flex-grow: 1;">',
'<div id="id-dlg-filter-values" class="combo-values" style=""></div>', '<div id="id-dlg-filter-values" class="combo-values" style=""></div>',
@ -1355,7 +1355,6 @@ define([
}, 100, this); }, 100, this);
if(Common.Utils.InternalSettings.get('sse-settings-size-filter-window')) { if(Common.Utils.InternalSettings.get('sse-settings-size-filter-window')) {
this.$window.find('.combo-values').css({'height': Common.Utils.InternalSettings.get('sse-settings-size-filter-window')[1] - 103 + 'px'});
this.cellsList.scroller.update({minScrollbarLength : this.cellsList.minScrollbarLength, alwaysVisibleY: true, suppressScrollX: true}); this.cellsList.scroller.update({minScrollbarLength : this.cellsList.minScrollbarLength, alwaysVisibleY: true, suppressScrollX: true});
} }
}, },
@ -2026,7 +2025,6 @@ define([
this.curSize = {resize: false, height: this.getSize()[1]}; this.curSize = {resize: false, height: this.getSize()[1]};
else if (this.curSize.resize) { else if (this.curSize.resize) {
var size = this.getSize(); var size = this.getSize();
this.$window.find('.combo-values').css({'height': size[1] - 100 + 'px'});
this.cellsList.scroller.update({minScrollbarLength : this.cellsList.minScrollbarLength, alwaysVisibleY: true, suppressScrollX: true}); this.cellsList.scroller.update({minScrollbarLength : this.cellsList.minScrollbarLength, alwaysVisibleY: true, suppressScrollX: true});
} }
}, },
@ -2040,7 +2038,6 @@ define([
this.curSize.resize = true; this.curSize.resize = true;
this.cellsList.scroller.update({minScrollbarLength : this.cellsList.minScrollbarLength, alwaysVisibleY: false, suppressScrollX: true}); this.cellsList.scroller.update({minScrollbarLength : this.cellsList.minScrollbarLength, alwaysVisibleY: false, suppressScrollX: true});
} }
this.$window.find('.combo-values').css({'height': size[1] - 100 + 'px'});
this.curSize.height = size[1]; this.curSize.height = size[1];
} }
size[0] -= this.menuPanelWidth; size[0] -= this.menuPanelWidth;

2
apps/spreadsheeteditor/main/resources/less/filterdialog.less
View file

@ -2,7 +2,7 @@
.combo-values { .combo-values {
width: 100%; width: 100%;
height: 162px; height: 100%;
overflow: hidden; overflow: hidden;
.list-item { .list-item {