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

[SSE] Fix Bug 49805

Browse source
This commit is contained in:
Julia Radzhabova 2021-04-21 23:27:37 +03:00
parent 0cff183c31
commit 6f853a7c1f
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/PivotGroupDialog.js
View file

@ -242,9 +242,11 @@ define([
if (rangePr) { if (rangePr) {
this.chStart.setValue(rangePr.asc_getAutoStart(), true); this.chStart.setValue(rangePr.asc_getAutoStart(), true);
this.chEnd.setValue(rangePr.asc_getAutoEnd(), true); this.chEnd.setValue(rangePr.asc_getAutoEnd(), true);
this.inputStart.setValue((dateTypes ? rangePr.asc_getStartDateText() : rangePr.asc_getStartNum()) || ''); var value = dateTypes ? rangePr.asc_getStartDateText() : rangePr.asc_getStartNum();
this.inputEnd.setValue((dateTypes ? rangePr.asc_getEndDateText() : rangePr.asc_getEndNum()) || ''); this.inputStart.setValue(value!==null && value!==undefined ? value : '');
!dateTypes && this.inputBy.setValue(rangePr.asc_getGroupInterval() || ''); value = dateTypes ? rangePr.asc_getEndDateText() : rangePr.asc_getEndNum();
this.inputEnd.setValue(value!==null && value!==undefined ? value : '');
!dateTypes && this.inputBy.setValue(rangePr.asc_getGroupInterval());
this.rangePr = rangePr; this.rangePr = rangePr;
if (defRangePr) { if (defRangePr) {
this.defRangePr = {start: dateTypes ? defRangePr.asc_getStartDateText() : defRangePr.asc_getStartNum(), end: dateTypes ? defRangePr.asc_getEndDateText() : defRangePr.asc_getEndNum()}; this.defRangePr = {start: dateTypes ? defRangePr.asc_getStartDateText() : defRangePr.asc_getStartNum(), end: dateTypes ? defRangePr.asc_getEndDateText() : defRangePr.asc_getEndNum()};
@ -259,7 +261,7 @@ define([
if (item == Asc.c_oAscGroupBy.Days) if (item == Asc.c_oAscGroupBy.Days)
isDays = true; isDays = true;
}); });
this.spnDays.setValue(rangePr.asc_getGroupInterval() || ''); this.spnDays.setValue(rangePr.asc_getGroupInterval());
this.spnDays.setDisabled(!isDays || dateTypes.length>1); this.spnDays.setDisabled(!isDays || dateTypes.length>1);
this.btnOk.setDisabled(dateTypes.length<1); this.btnOk.setDisabled(dateTypes.length<1);
this.dateTypes = dateTypes; this.dateTypes = dateTypes;