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

Merge pull request #448 from ONLYOFFICE/fix/fix-pivot

Browse source 
Fix/fix pivot
This commit is contained in:
Julia Radzhabova 2020-07-31 14:10:39 +03:00 committed by GitHub
parent 540b8fd2d7 b8a429e53d
commit 957b5373bc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
View file

@ -1800,9 +1800,11 @@ define([
item.setChecked(checked, true); item.setChecked(checked, true);
if (checked) isCustomConditions = false; if (checked) isCustomConditions = false;
}); });
else if ((isPivot || !isTextFilter) && (cond1 == Asc.c_oAscCustomAutoFilter.isGreaterThanOrEqualTo && cond2 == Asc.c_oAscCustomAutoFilter.isLessThanOrEqualTo || else if ((isPivot || !isTextFilter) && (cond1 == Asc.c_oAscCustomAutoFilter.isGreaterThanOrEqualTo && cond2 == Asc.c_oAscCustomAutoFilter.isLessThanOrEqualTo)){
cond1 == Asc.c_oAscCustomAutoFilter.isLessThanOrEqualTo && cond2 == Asc.c_oAscCustomAutoFilter.isGreaterThanOrEqualTo)){ items[isPivot && !isValueFilter ? 13 : 6].setChecked(true, true); // between filter
items[6].setChecked(true, true); // between filter isCustomConditions = false;
} else if (isPivot && (cond1 == Asc.c_oAscCustomAutoFilter.isLessThan && cond2 == Asc.c_oAscCustomAutoFilter.isGreaterThan)) {
items[!isValueFilter ? 14 : 7].setChecked(true, true); // not between filter
isCustomConditions = false; isCustomConditions = false;
} }
if (isCustomConditions) if (isCustomConditions)

2
apps/spreadsheeteditor/main/app/view/PivotSettingsAdvanced.js
View file

@ -133,7 +133,7 @@ define([ 'text!spreadsheeteditor/main/app/template/PivotSettingsAdvanced.temp
this.numWrap = new Common.UI.MetricSpinner({ this.numWrap = new Common.UI.MetricSpinner({
el: $('#pivot-adv-spin-wrap'), el: $('#pivot-adv-spin-wrap'),
step: 1, step: 1,
width: 85, width: 60,
allowDecimal: false, allowDecimal: false,
defaultUnit : "", defaultUnit : "",
value: '0', value: '0',