pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-04-07 14:06:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3140 from ONLYOFFICE/fix/pivot-tab

Browse Source 
Fix/pivot tab
This commit is contained in:
Julia Radzhabova
2024-08-21 11:42:20 +03:00
committed by GitHub
parent b7251c29b2 cbcb7caab6
commit 7a14dacd11
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/spreadsheeteditor/main/app/controller/RightMenu.js
View File

@ -153,6 +153,7 @@ define([
}
}
Common.NotificationCenter.trigger('layout:changed', 'rightmenu');
Common.NotificationCenter.trigger('edit:complete', this.rightmenu);
},
onSelectionChanged: function(info) {
@ -344,7 +345,7 @@ define([
this._settings[Common.Utils.documentSettingsType.Image].needShow = false;
this._settings[Common.Utils.documentSettingsType.Chart].needShow = false;
this._settings[Common.Utils.documentSettingsType.Table].needShow = false;
this._settings[Common.Utils.documentSettingsType.Pivot].needShow = false;
pivotInfo && (this._settings[Common.Utils.documentSettingsType.Pivot].needShow = false);
},
onCoAuthoringDisconnect: function() {
@ -373,7 +374,9 @@ define([
},
onInsertPivot: function() {
// this._settings[Common.Utils.documentSettingsType.Pivot].needShow = true;
this._settings[Common.Utils.documentSettingsType.Pivot].needShow = true;
Common.Utils.InternalSettings.set("sse-rightpanel-active-pivot", 1);
this._openRightMenu = true;
},
UpdateThemeColors: function() {

18
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View File

@ -3187,7 +3187,13 @@ define([
this._state.multiselect = info.asc_getMultiselect();
toolbar.lockToolbar(Common.enumLock.multiselect, this._state.multiselect, { array: [toolbar.btnTableTemplate, toolbar.btnInsertHyperlink, toolbar.btnInsertTable]});
this._state.inpivot = !!info.asc_getPivotTableInfo();
var inpivot = !!info.asc_getPivotTableInfo();
if (this._state.inpivot !== inpivot) {
if ( !inpivot && this.toolbar.isTabActive('pivot') )
this.toolbar.setTab('home');
this.toolbar.setVisible('pivot', !!inpivot);
this._state.inpivot = inpivot;
}
toolbar.lockToolbar(Common.enumLock.editPivot, this._state.inpivot, { array: toolbar.btnsSetAutofilter.concat(toolbar.btnMerge, toolbar.btnInsertHyperlink, toolbar.btnInsertTable, toolbar.btnRemoveDuplicates, toolbar.btnDataValidation)});
toolbar.lockToolbar(Common.enumLock.noSlicerSource, !(this._state.inpivot || formatTableInfo), { array: [toolbar.btnInsertSlicer]});
@ -4495,7 +4501,7 @@ define([
var tab = {action: 'review', caption: me.toolbar.textTabCollaboration, layoutname: 'toolbar-collaboration', dataHintTitle: 'U'};
var $panel = me.getApplication().getController('Common.Controllers.ReviewChanges').createToolbarPanel();
if ($panel) {
me.toolbar.addTab(tab, $panel, 7);
me.toolbar.addTab(tab, $panel, 6);
me.toolbar.setVisible('review', (config.isEdit || config.canViewReview || config.canCoAuthoring && config.canComments) && Common.UI.LayoutManager.isElementVisible('toolbar-collaboration'));
}
}
@ -4547,8 +4553,8 @@ define([
pivottab.setApi(me.api).setConfig({toolbar: me});
$panel = pivottab.createToolbarPanel();
if ($panel) {
me.toolbar.addTab(tab, $panel, 6);
me.toolbar.setVisible('pivot', true);
me.toolbar.addTab(tab, $panel, Common.UI.LayoutManager.lastTabIdx+1);
me._state.inpivot && me.toolbar.setVisible('pivot', true);
Array.prototype.push.apply(me.toolbar.lockControls, pivottab.getView('PivotTable').getButtons());
}
}
@ -4574,7 +4580,7 @@ define([
(config.isSignatureSupport || config.isPasswordSupport) && $panel.append($('<div class="separator long"></div>'));
var wbtab = me.getApplication().getController('WBProtection');
$panel.append(wbtab.createToolbarPanel());
me.toolbar.addTab(tab, $panel, 8);
me.toolbar.addTab(tab, $panel, 7);
me.toolbar.setVisible('protect', Common.UI.LayoutManager.isElementVisible('toolbar-protect'));
Array.prototype.push.apply(me.toolbar.lockControls, wbtab.getView('WBProtection').getButtons());
}
@ -4587,7 +4593,7 @@ define([
viewtab.setApi(me.api).setConfig({toolbar: me, mode: config});
var $panel = viewtab.createToolbarPanel();
if ($panel) {
me.toolbar.addTab(tab, $panel, 9);
me.toolbar.addTab(tab, $panel, 8);
me.toolbar.setVisible('view', Common.UI.LayoutManager.isElementVisible('toolbar-view'));
}
config.isEdit && Array.prototype.push.apply(me.toolbar.lockControls, viewtab.getView('ViewTab').getButtons());