pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-25 10:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

[SSE] Refactoring pivot settings

Browse Source
This commit is contained in:
Julia Radzhabova
2023-01-31 22:03:37 +03:00
parent 30789f83df
commit d8b0db2a18
3 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/spreadsheeteditor/main/app/view/FieldSettingsDialog.js
View File

@ -73,7 +73,6 @@ define([ 'text!spreadsheeteditor/main/app/template/FieldSettingsDialog.templa
this.handler = options.handler;
this.props = options.props;
this.fieldIndex = options.fieldIndex || 0;
this.names = options.names || [];
this.type = options.type || 0; // 0 - columns, 1 - rows, 3 - filters
Common.Views.AdvancedSettingsWindow.prototype.initialize.call(this, this.options);

2
apps/spreadsheeteditor/main/app/view/PivotSettings.js
View File

@ -787,7 +787,6 @@ define([
{
props: me._originalProps,
field: field,
names: me._state.names,
api: me.api,
handler: function(result, value) {
if (result == 'ok' && me.api && value) {
@ -805,7 +804,6 @@ define([
{
props: me._originalProps,
fieldIndex: pivotIndex,
names: me._state.names,
api: me.api,
type: me._state.field.type,
handler: function(result, value) {

6
apps/spreadsheeteditor/main/app/view/ValueFieldSettingsDialog.js
View File

@ -107,7 +107,6 @@ define([
this.handler = options.handler;
this.props = options.props;
this.field = options.field || 0;
this.names = options.names || [];
Common.Views.AdvancedSettingsWindow.prototype.initialize.call(this, this.options);
},
@ -227,9 +226,10 @@ define([
this.cmbShowAs.setValue(show_as);
var data = [];
this.names.forEach(function(item, index){
data.push({value: index, displayValue: item});
this.pivot_names.forEach(function (item, index) {
data.push({value: index, displayValue: item.asc_getName() || me.cache_names[index].asc_getName()});
});
this.cmbBaseField.setData(data);
this.cmbBaseField.setValue(field.asc_getBaseField(), '');
this.cmbBaseField.setDisabled(show_as === Asc.c_oAscShowDataAs.Normal || show_as === Asc.c_oAscShowDataAs.PercentOfTotal || show_as === Asc.c_oAscShowDataAs.PercentOfRow ||