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

[SSE] Fix formula arguments

Browse source
This commit is contained in:
Julia Radzhabova 2020-05-18 20:01:28 +03:00
parent 709cf9fb79
commit 3799f6ecdb
1 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -259,25 +259,12 @@ define([
validateOnChange: true, validateOnChange: true,
validateOnBlur: false validateOnBlur: false
}).on('changed:after', function(input, newValue, oldValue, e) { }).on('changed:after', function(input, newValue, oldValue, e) {
if (newValue == oldValue) return;
}).on('changing', function(input, newValue, oldValue, e) { }).on('changing', function(input, newValue, oldValue, e) {
if (newValue == oldValue) return; if (newValue == oldValue) return;
var index = input.options.index, me.onInputChanging(input, newValue, oldValue);
arg = me.args[index]; }).on('button:click', _.bind(this.onSelectData, this));
var res = me.api.asc_insertArgumentsInFormula(me.getArgumentsValue(), index, arg.argType),
argres = res ? res.asc_getArgumentsResult() : undefined;
argres = argres ? argres[index] : undefined;
arg.lblValue.html('= '+ (argres!==null && argres !==undefined ? argres : '<span style="opacity: 0.5; font-weight: bold;">' + arg.argTypeName + '</span>' ));
var result = res ? res.asc_getFunctionResult() : undefined;
me.lblFunctionResult.html('= ' + ((result!==undefined && result!==null)? result : ''));
result = res ? res.asc_getFormulaResult() : undefined;
me.lblFormulaResult.html('<b>' + me.textValue + ': </b>' + ((result!==undefined && result!==null)? result : ''));
});
txt.setValue((argval!==undefined && argval!==null) ? argval : ''); txt.setValue((argval!==undefined && argval!==null) ? argval : '');
txt._input.on('focus', _.bind(this.onSelectArgument, this, txt)); txt._input.on('focus', _.bind(this.onSelectArgument, this, txt));
txt.on('button:click', _.bind(this.onSelectData, this));
me.args.push({ me.args.push({
index: argcount, index: argcount,
@ -296,6 +283,21 @@ define([
me.args[argcount].lblValue.html('= '+ ( argres!==null && argres!==undefined ? argres : '<span style="opacity: 0.6; font-weight: bold;">' + me.args[argcount].argTypeName + '</span>')); me.args[argcount].lblValue.html('= '+ ( argres!==null && argres!==undefined ? argres : '<span style="opacity: 0.6; font-weight: bold;">' + me.args[argcount].argTypeName + '</span>'));
}, },
onInputChanging: function(input, newValue, oldValue, e) {
var me = this,
index = input.options.index,
arg = me.args[index];
var res = me.api.asc_insertArgumentsInFormula(me.getArgumentsValue(), index, arg.argType),
argres = res ? res.asc_getArgumentsResult() : undefined;
argres = argres ? argres[index] : undefined;
arg.lblValue.html('= '+ (argres!==null && argres !==undefined ? argres : '<span style="opacity: 0.5; font-weight: bold;">' + arg.argTypeName + '</span>' ));
var result = res ? res.asc_getFunctionResult() : undefined;
me.lblFunctionResult.html('= ' + ((result!==undefined && result!==null)? result : ''));
result = res ? res.asc_getFormulaResult() : undefined;
me.lblFormulaResult.html('<b>' + me.textValue + ': </b>' + ((result!==undefined && result!==null)? result : ''));
},
getArgumentsValue: function() { getArgumentsValue: function() {
var res = [], var res = [],
len = this.args.length, len = this.args.length,
@ -346,15 +348,18 @@ define([
var me = this; var me = this;
if (me.api) { if (me.api) {
var changedValue = input.getValue();
var handlerDlg = function(dlg, result) { var handlerDlg = function(dlg, result) {
if (result == 'ok') { if (result == 'ok') {
input.setValue(dlg.getSettings()); changedValue = dlg.getSettings();
} }
}; };
var win = new SSE.Views.CellRangeDialog({ var win = new SSE.Views.CellRangeDialog({
handler: handlerDlg handler: handlerDlg
}).on('close', function() { }).on('close', function() {
input.setValue(changedValue);
me.onInputChanging(input);
me.show(); me.show();
}); });