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

[SSE] Fix pivot settings

Browse source
This commit is contained in:
Julia Radzhabova 2022-12-14 13:03:38 +03:00
parent 5d0e914d55
commit 10c3f591e4
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/spreadsheeteditor/main/app/view/ValueFieldSettingsDialog.js
View file

@ -213,7 +213,8 @@ define([
_setDefaults: function (props) { _setDefaults: function (props) {
if (props) { if (props) {
var field = this.field; var field = this.field,
me = this;
this.cache_names = props.asc_getCacheFields(); this.cache_names = props.asc_getCacheFields();
this.pivot_names = props.asc_getPivotFields(); this.pivot_names = props.asc_getPivotFields();
@ -236,7 +237,7 @@ define([
data = []; data = [];
var baseitems = this.pivot_names[field.asc_getBaseField()].asc_getBaseItemObject(this.cache_names[field.asc_getBaseField()]); var baseitems = this.pivot_names[field.asc_getBaseField()].asc_getBaseItemObject(this.cache_names[field.asc_getBaseField()]);
baseitems.forEach(function(item, index){ baseitems.forEach(function(item, index){
data.push({value: item["baseItem"], displayValue: item["name"]}); data.push({value: item["baseItem"], displayValue: index===0 ? me.textPrev : (index===1 ? me.textNext : item["name"])});
}); });
this.cmbBaseItem.setData(data); this.cmbBaseItem.setData(data);
this.cmbBaseItem.setDisabled(show_as !== c_oAscShowDataAs.Difference && show_as !== c_oAscShowDataAs.Percent && show_as !== c_oAscShowDataAs.PercentDiff); this.cmbBaseItem.setDisabled(show_as !== c_oAscShowDataAs.Difference && show_as !== c_oAscShowDataAs.Percent && show_as !== c_oAscShowDataAs.PercentDiff);
@ -290,9 +291,10 @@ define([
onBaseFieldSelect: function(combo, record) { onBaseFieldSelect: function(combo, record) {
var field = this.cmbBaseField.getValue(), var field = this.cmbBaseField.getValue(),
baseitems = this.pivot_names[field].asc_getBaseItemObject(this.cache_names[field]), baseitems = this.pivot_names[field].asc_getBaseItemObject(this.cache_names[field]),
data = []; data = [],
me = this;
baseitems.forEach(function(item, index){ baseitems.forEach(function(item, index){
data.push({value: item["baseItem"], displayValue: item["name"]}); data.push({value: item["baseItem"], displayValue: index===0 ? me.textPrev : (index===1 ? me.textNext : item["name"])});
}); });
this.cmbBaseItem.setData(data); this.cmbBaseItem.setData(data);
var show_as = this.cmbShowAs.getValue(); var show_as = this.cmbShowAs.getValue();