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

[SSE] Pivot settings refactoring

Browse source
This commit is contained in:
Julia Radzhabova 2020-04-13 20:12:50 +03:00
parent 48fa6dbf8f
commit 8a203be2e6
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/main/resources/less/combo-dataview.less
View file

@ -283,7 +283,7 @@
margin-top: -6px; margin-top: -6px;
margin-bottom: -6px; margin-bottom: -6px;
.view .dataview { .view .dataview, .dropdown-menu {
padding: 1px; padding: 1px;
} }
} }

16
apps/spreadsheeteditor/main/app/view/PivotTable.js
View file

@ -87,7 +87,7 @@ define([
'<span class="btn-slot text" id="slot-chk-banded-column"></span>' + '<span class="btn-slot text" id="slot-chk-banded-column"></span>' +
'</div>' + '</div>' +
'</div>' + '</div>' +
'<div class="group" id="slot-field-pivot-styles" style="width: 347px;">' + '<div class="group" id="slot-field-pivot-styles" style="width: 336px;max-width: 336px;min-width: 115px;">' +
'</div>' + '</div>' +
'</section>'; '</section>';
@ -249,7 +249,15 @@ define([
itemWidth : 61, itemWidth : 61,
itemHeight : 49, itemHeight : 49,
menuMaxHeight : 300, menuMaxHeight : 300,
lock : [_set.lostConnect, _set.coAuth, _set.noPivot] lock : [_set.lostConnect, _set.coAuth, _set.noPivot],
beforeOpenHandler: function(e) {
var cmp = this,
menu = cmp.openButton.menu;
if (menu.cmpEl) {
var offset = cmp.cmpEl.width() - cmp.openButton.$el.width() - menu.cmpEl.outerWidth() - 1;
menu.setOffset(Math.min(offset, 0));
}
}
}); });
this.lockedControls.push(this.pivotStyles); this.lockedControls.push(this.pivotStyles);
@ -330,6 +338,10 @@ define([
this.btnPivotSubtotals.render(this.$el.find('#slot-btn-pivot-subtotals')); this.btnPivotSubtotals.render(this.$el.find('#slot-btn-pivot-subtotals'));
this.btnPivotGrandTotals.render(this.$el.find('#slot-btn-pivot-grand-totals')); this.btnPivotGrandTotals.render(this.$el.find('#slot-btn-pivot-grand-totals'));
this.pivotStyles.render(this.$el.find('#slot-field-pivot-styles')); this.pivotStyles.render(this.$el.find('#slot-field-pivot-styles'));
this.pivotStyles.openButton.menu.cmpEl.css({
'min-width': 293,
'max-width': 293
});
return this.$el; return this.$el;
}, },