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

[SSE] Fix range for formula argument

Browse source
This commit is contained in:
Julia Radzhabova 2020-05-15 17:27:20 +03:00
parent 1d2dd63f42
commit 4c27ca8b92
2 changed files with 33 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
apps/spreadsheeteditor/main/app/view/CellRangeDialog.js
View file

@ -107,6 +107,7 @@ define([
if (settings.type===undefined) if (settings.type===undefined)
settings.type = Asc.c_oAscSelectionDialogType.Chart; settings.type = Asc.c_oAscSelectionDialogType.Chart;
this.type = settings.type;
if (settings.api) { if (settings.api) {
me.api = settings.api; me.api = settings.api;
@ -121,10 +122,24 @@ define([
if (settings.validation) { if (settings.validation) {
return settings.validation.call(me, value); return settings.validation.call(me, value);
} else { } else {
var isvalid = me.api.asc_checkDataRange(settings.type, value, false); var isvalid = (settings.type === Asc.c_oAscSelectionDialogType.Function) || me.api.asc_checkDataRange(settings.type, value, false);
return (isvalid==Asc.c_oAscError.ID.DataRangeError) ? me.txtInvalidRange : true; return (isvalid==Asc.c_oAscError.ID.DataRangeError) ? me.txtInvalidRange : true;
} }
}; };
if (me.type == Asc.c_oAscSelectionDialogType.Function) {
_.delay(function(){
me.inputRange._input.focus();
if (settings.selection) {
me.inputRange._input[0].selectionStart = settings.selection.start;
me.inputRange._input[0].selectionEnd = settings.selection.end;
}
},10);
me.inputRange._input.on('focus', function() {
me._addedTextLength=0;
// call api method to stop selecting cells
});
}
}, },
getSettings: function () { getSettings: function () {
@ -132,7 +147,21 @@ define([
}, },
onApiRangeChanged: function(info) { onApiRangeChanged: function(info) {
this.inputRange.setValue(info.asc_getName()); var name = info.asc_getName();
if (this.type == Asc.c_oAscSelectionDialogType.Function) {
var oldlen = this._addedTextLength || 0,
val = this.inputRange.getValue(),
input = this.inputRange._input[0],
start = input.selectionStart - oldlen,
end = input.selectionEnd,
add = (start>0 && oldlen==0) && !this.api.asc_canEnterWizardRange(val.charAt(start-1)) ? '+' : '';
this._addedTextLength = name.length;
val = val.substring(0, start) + add + name + val.substring(end, val.length);
this.inputRange.setValue(val);
input.selectionStart = input.selectionEnd = start + add.length + this._addedTextLength;
} else
this.inputRange.setValue(name);
if (this.inputRange.cmpEl.hasClass('error')) if (this.inputRange.cmpEl.hasClass('error'))
this.inputRange.cmpEl.removeClass('error'); this.inputRange.cmpEl.removeClass('error');
}, },

3
apps/spreadsheeteditor/main/app/view/FormulaWizard.js
View file

@ -366,7 +366,8 @@ define([
win.setSettings({ win.setSettings({
api : me.api, api : me.api,
range : !_.isEmpty(input.getValue()) ? input.getValue() : '', range : !_.isEmpty(input.getValue()) ? input.getValue() : '',
type : Asc.c_oAscSelectionDialogType.Function type : Asc.c_oAscSelectionDialogType.Function,
selection: {start: input._input[0].selectionStart, end: input._input[0].selectionEnd}
}); });
} }
}, },