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

[SSE] Refactoring toolbar resizing (fix pivot tab)

Browse source
This commit is contained in:
Julia Radzhabova 2021-12-23 19:10:00 +03:00
parent 3f9aacd53f
commit b685c527d6
4 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/common/main/lib/component/Mixtbar.js
View file

@ -237,9 +237,8 @@ define([
if ( $boxTabs.parent().hasClass('short') ) { if ( $boxTabs.parent().hasClass('short') ) {
$boxTabs.parent().removeClass('short'); $boxTabs.parent().removeClass('short');
} }
this.hideMoreBtns();
this.processPanelVisible(); this.processPanelVisible();
// this.resizeToolbar();
}, },
onTabClick: function (e) { onTabClick: function (e) {
@ -514,7 +513,7 @@ define([
btnsMore[tab].on('toggle', function(btn, state, e) { btnsMore[tab].on('toggle', function(btn, state, e) {
(state) ? me.onMoreShow(btn, e) : me.onMoreHide(btn, e); (state) ? me.onMoreShow(btn, e) : me.onMoreHide(btn, e);
}); });
var moreContainer = $('<div class="dropdown-menu more-container"><div style="display: inline;"></div></div>'); var moreContainer = $('<div class="dropdown-menu more-container" data-tab="' + tab + '"><div style="display: inline;"></div></div>');
optsFold.$bar.append(moreContainer); optsFold.$bar.append(moreContainer);
btnsMore[tab].panel = moreContainer.find('div'); btnsMore[tab].panel = moreContainer.find('div');
} }

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

@ -342,9 +342,14 @@
.combo-template(60px); .combo-template(60px);
top: -7px; top: -7px;
padding-right: 24px; padding-right: 12px;
position: absolute; position: absolute;
.more-container & {
padding-right: 0;
position: static;
}
.view .dataview, .dropdown-menu { .view .dataview, .dropdown-menu {
padding: 1px; padding: 1px;
} }

5
apps/common/main/resources/less/toolbar.less
View file

@ -204,7 +204,7 @@
background-color: @background-toolbar-ie; background-color: @background-toolbar-ie;
background-color: @background-toolbar; background-color: @background-toolbar;
min-width:auto; min-width:auto;
padding: 10px 10px 5px 0; padding: 12px 10px 7px 0;
border-radius: 0; border-radius: 0;
z-index:999; z-index:999;
.compactwidth { .compactwidth {
@ -220,6 +220,9 @@
} }
} }
} }
&[data-tab=pivot] {
padding: 5px 10px 0 0;
}
} }
.more-box { .more-box {

2
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 flex small" id="slot-field-pivot-styles" style="width: 336px;max-width: 336px;min-width: 115px;" data-group-width="336px">' + '<div class="group flex small" id="slot-field-pivot-styles" style="width: 324px;max-width: 324px;min-width: 105px;" data-group-width="324px">' +
'</div>' + '</div>' +
'</section>'; '</section>';