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

[SSE] Fix category settings

Browse source
This commit is contained in:
Julia Radzhabova 2020-07-07 16:19:30 +03:00
parent 2ae33bdfb2
commit 3bfd4182fc
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/spreadsheeteditor/main/app/view/ChartDataDialog.js
View file

@ -278,6 +278,7 @@ define([
(len>0) && this.categoryList.selectByIndex(0); (len>0) && this.categoryList.selectByIndex(0);
} }
this.updateButtons(); this.updateButtons();
this.updateCatButtons();
}, },
getSettings: function () { getSettings: function () {
@ -412,6 +413,7 @@ define([
}, },
onSelectSeries: function(lisvView, itemView, record) { onSelectSeries: function(lisvView, itemView, record) {
this.updateCatButtons(record.get('series').asc_IsScatter());
this.updateMoveButtons(); this.updateMoveButtons();
}, },
@ -422,8 +424,12 @@ define([
this.updateMoveButtons(); this.updateMoveButtons();
}, },
updateCatButtons: function() { updateCatButtons: function(isScatter) {
this.btnEditCategory.setDisabled(this.categoryList.store.length<1); if (isScatter===undefined) {
var rec = this.seriesList.getSelectedRec();
rec && (isScatter = rec.get('series').asc_IsScatter());
}
this.btnEditCategory.setDisabled(this.categoryList.store.length<1 || !!isScatter);
}, },
updateMoveButtons: function() { updateMoveButtons: function() {
@ -483,7 +489,7 @@ define([
var changedValue = dlg.getSettings(); var changedValue = dlg.getSettings();
} }
}; };
this.changeDataRange(0, false, handlerDlg); this.changeDataRange(0, {category: '', values: this.chartSettings.getCatValues()}, false, handlerDlg);
}, },
changeDataRange: function(type, props, add, handlerDlg) { changeDataRange: function(type, props, add, handlerDlg) {

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

@ -193,6 +193,10 @@ define([
this.inputRange2.setValue(series.asc_getValues()); this.inputRange2.setValue(series.asc_getValues());
(this.inputRange2.getValue()!=='') && this.lblRange2.html('= ' + series.asc_getValuesArr().join('; ')); (this.inputRange2.getValue()!=='') && this.lblRange2.html('= ' + series.asc_getValuesArr().join('; '));
} }
} else {
this.inputRange1.setValue(this.props.category || '');
// if (this.inputRange1.getValue()!=='')
this.props.values && this.lblRange1.html('= ' + this.props.values.join('; '));
} }
}, },
@ -244,7 +248,9 @@ define([
if (state == 'ok') { if (state == 'ok') {
if (this.inputRange1.checkValidate() !== true) if (this.inputRange1.checkValidate() !== true)
return; return;
if (type==1 && this.inputRange2.checkValidate() !== true) if (this.type==1 && this.inputRange2.checkValidate() !== true)
return;
if (this.type==1 && this.isScatter && this.inputRange3.checkValidate() !== true)
return; return;
} }
if (this.options.handler.call(this, this, state)) if (this.options.handler.call(this, this, state))