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 #2424 from ONLYOFFICE/feature/sse-show-details

Browse Source 
Feature/sse show details
This commit is contained in:
Julia Radzhabova
2023-06-01 16:02:32 +03:00
committed by GitHub
parent 72a151a0d6 ef042d7e05
commit 25e5d249cc
3 changed files with 37 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
View File

@ -229,6 +229,7 @@ define([
view.mnuSubtotalField.on('click', _.bind(me.onSubtotalField, me));
view.mnuSummarize.menu.on('item:click', _.bind(me.onSummarize, me));
view.mnuShowAs.menu.on('item:click', _.bind(me.onShowAs, me));
view.mnuShowDetails.on('click', _.bind(me.onShowDetails, me));
view.mnuPivotSort.menu.on('item:click', _.bind(me.onPivotSort, me));
view.mnuPivotFilter.menu.on('item:click', _.bind(me.onPivotFilter, me));
view.pmiClear.menu.on('item:click', _.bind(me.onClear, me));
@ -836,6 +837,10 @@ define([
}
},
onShowDetails: function(item, e) {
this.propsPivot.originalProps && this.api && this.api.asc_pivotShowDetails(this.propsPivot.originalProps);
},
fillPivotProps: function() {
var props = this.propsPivot.originalProps;
if (!props) return;
@ -852,6 +857,7 @@ define([
this.propsPivot.filter = info.asc_getFilter();
this.propsPivot.rowFilter = info.asc_getFilterRow();
this.propsPivot.colFilter = info.asc_getFilterCol();
this.propsPivot.showDetails = info.asc_showDetails();
if (colFieldIndex>-1) {
var fprops = props.asc_getColumnFields();
@ -2741,21 +2747,23 @@ define([
needshow && this.fillPivotProps();
documentHolder.mnuRefreshPivot.setVisible(needshow);
documentHolder.mnuPivotRefreshSeparator.setVisible(needshow);
documentHolder.mnuSubtotalField.setVisible(!!this.propsPivot.field && (this.propsPivot.fieldType===0 || this.propsPivot.fieldType===1));
documentHolder.mnuPivotSubtotalSeparator.setVisible(!!this.propsPivot.field && (this.propsPivot.fieldType===0 || this.propsPivot.fieldType===1));
documentHolder.mnuGroupPivot.setVisible(needshow);
documentHolder.mnuUnGroupPivot.setVisible(needshow);
documentHolder.mnuDeleteField.setVisible(!!this.propsPivot.field);
documentHolder.mnuPivotDeleteSeparator.setVisible(!!this.propsPivot.field);
documentHolder.mnuPivotSettingsSeparator.setVisible(needshow);
documentHolder.mnuPivotSettings.setVisible(needshow);
documentHolder.mnuFieldSettings.setVisible(!!this.propsPivot.field);
documentHolder.mnuSummarize.setVisible(!!this.propsPivot.field && (this.propsPivot.fieldType===2));
documentHolder.mnuShowAs.setVisible(!!this.propsPivot.field && (this.propsPivot.fieldType===2) && !this.propsPivot.rowTotal && !this.propsPivot.colTotal);
documentHolder.mnuPivotValueSeparator.setVisible(!!this.propsPivot.field && (this.propsPivot.fieldType===2));
documentHolder.mnuPivotSort.setVisible(this.propsPivot.filter || this.propsPivot.rowFilter || this.propsPivot.colFilter);
documentHolder.mnuPivotFilter.setVisible(!!this.propsPivot.filter);
documentHolder.mnuPivotFilterSeparator.setVisible(this.propsPivot.filter || this.propsPivot.rowFilter || this.propsPivot.colFilter);
documentHolder.mnuSubtotalField.setVisible(!!this.propsPivot.field && (this.propsPivot.fieldType===0 || this.propsPivot.fieldType===1));
documentHolder.mnuPivotSubtotalSeparator.setVisible(!!this.propsPivot.field && (this.propsPivot.fieldType===0 || this.propsPivot.fieldType===1));
documentHolder.mnuGroupPivot.setVisible(!!this.propsPivot.canGroup);
documentHolder.mnuUnGroupPivot.setVisible(!!this.propsPivot.canGroup);
documentHolder.mnuPivotGroupSeparator.setVisible(!!this.propsPivot.canGroup);
documentHolder.mnuDeleteField.setVisible(!!this.propsPivot.field);
documentHolder.mnuPivotDeleteSeparator.setVisible(!!this.propsPivot.field);
documentHolder.mnuSummarize.setVisible(!!this.propsPivot.field && (this.propsPivot.fieldType===2));
documentHolder.mnuShowAs.setVisible(!!this.propsPivot.field && (this.propsPivot.fieldType===2) && !this.propsPivot.rowTotal && !this.propsPivot.colTotal);
documentHolder.mnuPivotValueSeparator.setVisible(!!this.propsPivot.field && (this.propsPivot.fieldType===2));
documentHolder.mnuShowDetails.setVisible(!!this.propsPivot.showDetails);
documentHolder.mnuShowDetailsSeparator.setVisible(!!this.propsPivot.showDetails);
documentHolder.mnuPivotSettings.setVisible(needshow);
documentHolder.mnuFieldSettings.setVisible(!!this.propsPivot.field);
if (this.propsPivot.field) {
documentHolder.mnuDeleteField.setCaption(documentHolder.txtDelField + ' ' + (this.propsPivot.rowTotal || this.propsPivot.colTotal ? documentHolder.txtGrandTotal : '"' + Common.Utils.String.htmlEncode(this.propsPivot.fieldName) + '"'), true);
@ -2877,8 +2885,8 @@ define([
documentHolder.pmiGetRangeList.setDisabled(false);
if (inPivot) {
documentHolder.mnuGroupPivot.setDisabled(isPivotLocked || !this.propsPivot.canGroup || this._state.wsLock);
documentHolder.mnuUnGroupPivot.setDisabled(isPivotLocked || !this.propsPivot.canGroup || this._state.wsLock);
documentHolder.mnuGroupPivot.setDisabled(isPivotLocked || this._state.wsLock);
documentHolder.mnuUnGroupPivot.setDisabled(isPivotLocked || this._state.wsLock);
documentHolder.mnuRefreshPivot.setDisabled(isPivotLocked || this._state.wsLock);
documentHolder.mnuPivotSettings.setDisabled(isPivotLocked || this._state.wsLock);
documentHolder.mnuFieldSettings.setDisabled(isPivotLocked || this._state.wsLock);
@ -2886,6 +2894,7 @@ define([
documentHolder.mnuSubtotalField.setDisabled(isPivotLocked || this._state.wsLock);
documentHolder.mnuSummarize.setDisabled(isPivotLocked || this._state.wsLock);
documentHolder.mnuShowAs.setDisabled(isPivotLocked || this._state.wsLock);
documentHolder.mnuShowDetails.setDisabled(this.api.asc_isWorkbookLocked() || this.api.asc_isProtectedWorkbook());
documentHolder.mnuPivotFilter.setDisabled(isPivotLocked || this._state.wsLock);
}

18
apps/spreadsheeteditor/main/app/view/DocumentHolder.js
View File

@ -556,12 +556,17 @@ define([
})
});
me.mnuShowDetails = new Common.UI.MenuItem({
caption : me.txtShowDetails
});
me.mnuPivotRefreshSeparator = new Common.UI.MenuItem({caption: '--'});
me.mnuPivotSubtotalSeparator = new Common.UI.MenuItem({caption: '--'});
me.mnuPivotSettingsSeparator = new Common.UI.MenuItem({caption: '--'});
me.mnuPivotGroupSeparator = new Common.UI.MenuItem({caption: '--'});
me.mnuPivotDeleteSeparator = new Common.UI.MenuItem({caption: '--'});
me.mnuPivotValueSeparator = new Common.UI.MenuItem({caption: '--'});
me.mnuPivotFilterSeparator = new Common.UI.MenuItem({caption: '--'});
me.mnuShowDetailsSeparator = new Common.UI.MenuItem({caption: '--'});
me.pmiInsFunction = new Common.UI.MenuItem({
iconCls: 'menu__icon btn-function',
@ -813,12 +818,14 @@ define([
me.mnuPivotSubtotalSeparator,
me.mnuGroupPivot,
me.mnuUnGroupPivot,
me.mnuPivotDeleteSeparator,
me.mnuPivotGroupSeparator,
me.mnuDeleteField,
me.mnuPivotValueSeparator,
me.mnuPivotDeleteSeparator,
me.mnuSummarize,
me.mnuShowAs,
me.mnuPivotSettingsSeparator,
me.mnuPivotValueSeparator,
me.mnuShowDetails,
me.mnuShowDetailsSeparator,
me.mnuFieldSettings,
me.mnuPivotSettings,
me.pmiAddCommentSeparator,
@ -1806,7 +1813,8 @@ define([
txtLabelFilter: 'Label filters',
txtTop10: 'Top 10',
txtClearPivotField: 'Clear filter from {0}',
txtSortOption: 'More sort options'
txtSortOption: 'More sort options',
txtShowDetails: 'Show details'
}, SSE.Views.DocumentHolder || {}));
});

1
apps/spreadsheeteditor/main/locale/en.json
View File

@ -2394,6 +2394,7 @@
"SSE.Views.DocumentHolder.txtWidth": "Width",
"SSE.Views.DocumentHolder.unicodeText": "Unicode",
"SSE.Views.DocumentHolder.vertAlignText": "Vertical alignment",
"SSE.Views.DocumentHolder.txtShowDetails": "Show details",
"SSE.Views.ExternalLinksDlg.closeButtonText": "Close",
"SSE.Views.ExternalLinksDlg.textDelete": "Break links",
"SSE.Views.ExternalLinksDlg.textDeleteAll": "Break all links",