Merge branch 'feature/sse-function-wizard' into develop
This commit is contained in:
Julia Radzhabova
commit
5552d9f845
|
|
@ -258,7 +258,7 @@ define([
|
|||
click: function(e) {
|
||||
if (me.api) {
|
||||
me.api.isTextAreaBlur = false;
|
||||
if (e.target.localName == 'canvas' && !me.isEditFormula) {
|
||||
if (e.target.localName == 'canvas' && (!me.isEditFormula || me.rangeSelectionMode)) {
|
||||
if (me._preventClick)
|
||||
me._preventClick = false;
|
||||
else
|
||||
|
|
@ -1987,7 +1987,7 @@ define([
|
|||
value : addarr ? addarr[index] : menuItem,
|
||||
style: (typeof menuItem == 'string' && _.isEmpty(menuItem.trim())) ? 'min-height: 25px;' : ''
|
||||
}).on('click', function(item, e) {
|
||||
me.api.asc_insertFormula(item.value, Asc.c_oAscPopUpSelectorType.None, false );
|
||||
me.api.asc_insertInCell(item.value, Asc.c_oAscPopUpSelectorType.None, false );
|
||||
});
|
||||
menu.addItem(mnu);
|
||||
});
|
||||
|
|
@ -2032,7 +2032,7 @@ define([
|
|||
},
|
||||
|
||||
onFormulaCompleteMenu: function(funcarr) {
|
||||
if (!this.documentHolder.funcMenu) return;
|
||||
if (!this.documentHolder.funcMenu || Common.Utils.ModalWindow.isVisible() || this.rangeSelectionMode) return;
|
||||
|
||||
if (funcarr) {
|
||||
var me = this,
|
||||
|
|
@ -2064,7 +2064,7 @@ define([
|
|||
caption: name,
|
||||
hint : (funcdesc && funcdesc[origname]) ? funcdesc[origname].d : ''
|
||||
}).on('click', function(item, e) {
|
||||
setTimeout(function(){ me.api.asc_insertFormula(item.caption, type, false ); }, 10);
|
||||
setTimeout(function(){ me.api.asc_insertInCell(item.caption, type, false ); }, 10);
|
||||
});
|
||||
menu.addItem(mnu);
|
||||
});
|
||||
|
|
|
|||
|
|
@ -44,7 +44,8 @@ define([
|
|||
'core',
|
||||
'spreadsheeteditor/main/app/collection/FormulaGroups',
|
||||
'spreadsheeteditor/main/app/view/FormulaDialog',
|
||||
'spreadsheeteditor/main/app/view/FormulaTab'
|
||||
'spreadsheeteditor/main/app/view/FormulaTab',
|
||||
'spreadsheeteditor/main/app/view/FormulaWizard'
|
||||
], function () {
|
||||
'use strict';
|
||||
|
||||
|
|
@ -95,7 +96,10 @@ define([
|
|||
if (func.origin === 'more') {
|
||||
this.showDialog(group);
|
||||
} else {
|
||||
this.api.asc_insertFormula(func.name, Asc.c_oAscPopUpSelectorType.Func, !!autocomplete);
|
||||
if (autocomplete)
|
||||
this.api.asc_insertInCell(func.name, Asc.c_oAscPopUpSelectorType.Func, !!autocomplete);
|
||||
else
|
||||
this.api.asc_startWizard(func.name);
|
||||
!autocomplete && this.updateLast10Formulas(func.origin);
|
||||
}
|
||||
}
|
||||
|
|
@ -112,6 +116,7 @@ define([
|
|||
|
||||
setApi: function (api) {
|
||||
this.api = api;
|
||||
this.api.asc_registerCallback('asc_onSendFunctionWizardInfo', _.bind(this.onSendFunctionWizardInfo, this));
|
||||
|
||||
if (this.formulasGroups && this.api) {
|
||||
Common.Utils.InternalSettings.set("sse-settings-func-last", Common.localStorage.getItem("sse-settings-func-last"));
|
||||
|
|
@ -216,9 +221,39 @@ define([
|
|||
this.formulas.fillFormulasGroups();
|
||||
}
|
||||
}
|
||||
this.formulas.show(group);
|
||||
this._formulagroup = group;
|
||||
this.api.asc_startWizard();
|
||||
}
|
||||
},
|
||||
|
||||
onSendFunctionWizardInfo: function(props) {
|
||||
if (props) {
|
||||
// show formula settings
|
||||
var me = this;
|
||||
var name = props.asc_getName(),
|
||||
descrarr = this.getDescription(Common.Utils.InternalSettings.get("sse-settings-func-locale")),
|
||||
funcprops = {
|
||||
name: this.api.asc_getFormulaLocaleName(name),
|
||||
origin: name,
|
||||
args: ((descrarr && descrarr[name]) ? descrarr[name].a : '').replace(/[,;]/g, this.api.asc_getFunctionArgumentSeparator()),
|
||||
desc: (descrarr && descrarr[name]) ? descrarr[name].d : ''
|
||||
};
|
||||
|
||||
(new SSE.Views.FormulaWizard({
|
||||
api : this.api,
|
||||
lang : this.appOptions.lang,
|
||||
funcprops: funcprops,
|
||||
props : props,
|
||||
handler : function(dlg, result, settings) {
|
||||
if (result == 'ok') {
|
||||
}
|
||||
}
|
||||
})).show();
|
||||
} else
|
||||
this.formulas.show(this._formulagroup);
|
||||
this._formulagroup = undefined;
|
||||
},
|
||||
|
||||
hideDialog: function () {
|
||||
if (this.formulas && this.formulas.isVisible()) {
|
||||
this.formulas.hide();
|
||||
|
|
|
|||
|
|
@ -1237,7 +1237,7 @@ define([
|
|||
(new SSE.Views.NamedRangePasteDlg({
|
||||
handler: function(result, settings) {
|
||||
if (result == 'ok' && settings) {
|
||||
me.api.asc_insertFormula(settings.asc_getName(true), settings.asc_getIsTable() ? Asc.c_oAscPopUpSelectorType.Table : Asc.c_oAscPopUpSelectorType.Range, false);
|
||||
me.api.asc_insertInCell(settings.asc_getName(true), settings.asc_getIsTable() ? Asc.c_oAscPopUpSelectorType.Table : Asc.c_oAscPopUpSelectorType.Range, false);
|
||||
Common.component.Analytics.trackEvent('ToolBar', 'Paste Named Range');
|
||||
}
|
||||
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
|
||||
|
|
|
|||
|
|
@ -81,7 +81,7 @@ define([
|
|||
el : $('#id-dlg-cell-range'),
|
||||
name : 'range',
|
||||
style : 'width: 100%;',
|
||||
allowBlank : false,
|
||||
allowBlank : this.options.allowBlank || false,
|
||||
blankError : this.txtEmpty,
|
||||
validateOnChange: true
|
||||
});
|
||||
|
|
@ -103,6 +103,7 @@ define([
|
|||
setSettings: function(settings) {
|
||||
var me = this;
|
||||
|
||||
this.settings = settings;
|
||||
this.inputRange.setValue(settings.range ? settings.range : '');
|
||||
|
||||
if (settings.type===undefined)
|
||||
|
|
@ -121,18 +122,52 @@ define([
|
|||
if (settings.validation) {
|
||||
return settings.validation.call(me, value);
|
||||
} else {
|
||||
var isvalid = me.api.asc_checkDataRange(settings.type, value, false);
|
||||
if (settings.type === Asc.c_oAscSelectionDialogType.Function) {
|
||||
settings.argvalues[settings.argindex] = value;
|
||||
me.api.asc_insertArgumentsInFormula(settings.argvalues);
|
||||
}
|
||||
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;
|
||||
}
|
||||
};
|
||||
|
||||
if (settings.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;
|
||||
me.api.asc_cleanSelectRange();
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
getSettings: function () {
|
||||
return this.inputRange.getValue();
|
||||
},
|
||||
|
||||
onApiRangeChanged: function(info) {
|
||||
this.inputRange.setValue(info.asc_getName());
|
||||
onApiRangeChanged: function(name) {
|
||||
if (this.settings.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;
|
||||
|
||||
this.settings.argvalues[this.settings.argindex] = val;
|
||||
this.api.asc_insertArgumentsInFormula(this.settings.argvalues);
|
||||
} else
|
||||
this.inputRange.setValue(name);
|
||||
if (this.inputRange.cmpEl.hasClass('error'))
|
||||
this.inputRange.cmpEl.removeClass('error');
|
||||
},
|
||||
|
|
|
|||
|
|
@ -153,6 +153,7 @@ define([
|
|||
me.inputSearch.$el.find('input').focus();
|
||||
}, 100, this);
|
||||
}
|
||||
this._preventCloseCellEditor = false;
|
||||
},
|
||||
|
||||
hide: function () {
|
||||
|
|
@ -166,6 +167,8 @@ define([
|
|||
this.recommended = this.filter = undefined;
|
||||
|
||||
Common.UI.Window.prototype.hide.call(this);
|
||||
|
||||
!this._preventCloseCellEditor && this.api.asc_closeCellEditor(true);
|
||||
},
|
||||
|
||||
onBtnClick: function (event) {
|
||||
|
|
@ -198,6 +201,7 @@ define([
|
|||
if (this.handler && state == 'ok') {
|
||||
if (this.btnOk.isDisabled())
|
||||
return;
|
||||
this._preventCloseCellEditor = true;
|
||||
this.handler.call(this, this.applyFunction);
|
||||
}
|
||||
|
||||
|
|
|
|||
435
apps/spreadsheeteditor/main/app/view/FormulaWizard.js
Normal file
435
apps/spreadsheeteditor/main/app/view/FormulaWizard.js
Normal file
|
|
@ -0,0 +1,435 @@
|
|||
/*
|
||||
*
|
||||
* (c) Copyright Ascensio System SIA 2010-2020
|
||||
*
|
||||
* This program is a free software product. You can redistribute it and/or
|
||||
* modify it under the terms of the GNU Affero General Public License (AGPL)
|
||||
* version 3 as published by the Free Software Foundation. In accordance with
|
||||
* Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
|
||||
* that Ascensio System SIA expressly excludes the warranty of non-infringement
|
||||
* of any third-party rights.
|
||||
*
|
||||
* This program is distributed WITHOUT ANY WARRANTY; without even the implied
|
||||
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
|
||||
* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
|
||||
*
|
||||
* You can contact Ascensio System SIA at 20A-12 Ernesta Birznieka-Upisha
|
||||
* street, Riga, Latvia, EU, LV-1050.
|
||||
*
|
||||
* The interactive user interfaces in modified source and object code versions
|
||||
* of the Program must display Appropriate Legal Notices, as required under
|
||||
* Section 5 of the GNU AGPL version 3.
|
||||
*
|
||||
* Pursuant to Section 7(b) of the License you must retain the original Product
|
||||
* logo when distributing the program. Pursuant to Section 7(e) we decline to
|
||||
* grant you any rights under trademark law for use of our trademarks.
|
||||
*
|
||||
* All the Product's GUI elements, including illustrations and icon sets, as
|
||||
* well as technical writing content are licensed under the terms of the
|
||||
* Creative Commons Attribution-ShareAlike 4.0 International. See the License
|
||||
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
|
||||
*
|
||||
*/
|
||||
/**
|
||||
* FormulaWizard.js
|
||||
*
|
||||
* Created by Julia Radzhabova on 17.04.20
|
||||
* Copyright (c) 2020 Ascensio System SIA. All rights reserved.
|
||||
*
|
||||
*/
|
||||
|
||||
define([
|
||||
'common/main/lib/view/AdvancedSettingsWindow',
|
||||
'common/main/lib/component/MetricSpinner'
|
||||
], function () { 'use strict';
|
||||
|
||||
SSE.Views.FormulaWizard = Common.Views.AdvancedSettingsWindow.extend(_.extend({
|
||||
options: {
|
||||
contentWidth: 580,
|
||||
height: 397
|
||||
},
|
||||
|
||||
initialize : function(options) {
|
||||
var me = this;
|
||||
_.extend(this.options, {
|
||||
title: this.textTitle,
|
||||
template: [
|
||||
'<div class="box" style="height:' + (this.options.height - 85) + 'px;">',
|
||||
'<div class="content-panel" style="padding: 0;"><div class="inner-content">',
|
||||
'<div class="settings-panel active">',
|
||||
'<table style="height:' + (this.options.height - 85 - 7) + 'px;">',
|
||||
'<tr><td>',
|
||||
'<label id="formula-wizard-name" style="display: block;margin-bottom: 8px;"></label>',
|
||||
'<div id="formula-wizard-panel-args" style="">',
|
||||
'<div style="overflow: hidden;position: relative;">',
|
||||
'<table cols="3" id="formula-wizard-tbl-args" style="width: 100%;">',
|
||||
'</table>',
|
||||
'</div>',
|
||||
'<div style="margin-top: 4px;">',
|
||||
'<label id="formula-wizard-lbl-func-res">' + this.textFunctionRes + '</label>',
|
||||
'<div id="formula-wizard-lbl-val-func" class="input-label" style="float: right; width: 200px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;"></div>',
|
||||
'</div>',
|
||||
'</div>',
|
||||
'</td></tr>',
|
||||
'<tr><td style="height:100%;padding-bottom: 12px;"></td></tr>',
|
||||
'<tr><td>',
|
||||
'<div id="formula-wizard-panel-desc" style="word-break: break-word;">',
|
||||
// '<label id="formula-wizard-arg-desc" style="display: block;margin-bottom: 8px;"><b>Argument 1:</b></label>',
|
||||
'<label id="formula-wizard-args" style="display: block;margin-bottom: 0px;"></label>',
|
||||
'<label id="formula-wizard-desc" style="display: block;margin-bottom: 8px;"></label>',
|
||||
'<label id="formula-wizard-value" style="display: block;margin-bottom: 8px;"><b>Formula result:</b></label>',
|
||||
'<label style="display: block; margin-bottom: 8px;"><a id="formula-wizard-help" style="cursor: pointer;">'+ this.textHelp +'</a></label>',
|
||||
'</div>',
|
||||
'</td></tr>',
|
||||
'</table>',
|
||||
'</div></div>',
|
||||
'</div>',
|
||||
'</div>',
|
||||
'<div class="separator horizontal"/>'
|
||||
].join('')
|
||||
}, options);
|
||||
|
||||
this.props = this.options.props;
|
||||
this.funcprops = this.options.funcprops;
|
||||
this.api = this.options.api;
|
||||
this.lang = this.options.lang;
|
||||
|
||||
this._noApply = false;
|
||||
this.args = [];
|
||||
this.repeatedArg = undefined;
|
||||
this.helpUrl = undefined;
|
||||
this.minArgCount = 1;
|
||||
this.maxArgCount = 1;
|
||||
this.minArgWidth = 50;
|
||||
|
||||
Common.Views.AdvancedSettingsWindow.prototype.initialize.call(this, this.options);
|
||||
},
|
||||
|
||||
render: function() {
|
||||
Common.Views.AdvancedSettingsWindow.prototype.render.call(this);
|
||||
|
||||
var $window = this.getChild();
|
||||
$window.find('input').on('keypress', _.bind(this.onKeyPress, this));
|
||||
|
||||
this.contentPanel = $window.find('.content-panel');
|
||||
this.innerPanel = $window.find('.inner-content');
|
||||
|
||||
this.panelArgs = $window.find('#formula-wizard-panel-args');
|
||||
this.tableArgs = $window.find('#formula-wizard-tbl-args');
|
||||
this.panelDesc = $window.find('#formula-wizard-panel-desc');
|
||||
this.lblArgDesc = $window.find('#formula-wizard-arg-desc');
|
||||
this.lblFormulaResult = $window.find('#formula-wizard-value');
|
||||
this.lblFunctionResult = $window.find('#formula-wizard-lbl-val-func');
|
||||
|
||||
this._preventCloseCellEditor = false;
|
||||
|
||||
this.afterRender();
|
||||
},
|
||||
|
||||
afterRender: function() {
|
||||
this._setDefaults();
|
||||
},
|
||||
|
||||
_handleInput: function(state) {
|
||||
if (this.options.handler)
|
||||
this.options.handler.call(this, state, (state == 'ok') ? this.getSettings() : undefined);
|
||||
this._preventCloseCellEditor = (state == 'ok');
|
||||
this.close();
|
||||
},
|
||||
|
||||
onDlgBtnClick: function(event) {
|
||||
this._handleInput(event.currentTarget.attributes['result'].value);
|
||||
},
|
||||
|
||||
onKeyPress: function(event) {
|
||||
if (event.keyCode == Common.UI.Keys.RETURN) {
|
||||
this._handleInput('ok');
|
||||
}
|
||||
},
|
||||
|
||||
onPrimary: function() {
|
||||
this._handleInput('ok');
|
||||
return false;
|
||||
},
|
||||
|
||||
_setDefaults: function () {
|
||||
var me = this;
|
||||
if (this.funcprops) {
|
||||
var props = this.funcprops;
|
||||
props.args ? $('#formula-wizard-args').html('<b>' + props.name + '</b>' + props.args) : $('#formula-wizard-args').addClass('hidden');
|
||||
props.desc ? $('#formula-wizard-desc').text(props.desc) : $('#formula-wizard-desc').addClass('hidden');
|
||||
props.name ? $('#formula-wizard-name').html(this.textFunction + ': ' + props.name) : $('#formula-wizard-name').addClass('hidden');
|
||||
|
||||
this.$window.find('#formula-wizard-help').on('click', function (e) {
|
||||
me.showHelp();
|
||||
})
|
||||
}
|
||||
this.recalcArgTableSize();
|
||||
this.minArgWidth = this.$window.find('#formula-wizard-lbl-func-res').width();
|
||||
|
||||
if (this.props) {
|
||||
// fill arguments
|
||||
var props = this.props;
|
||||
this.minArgCount = props.asc_getArgumentMin();
|
||||
this.maxArgCount = props.asc_getArgumentMax();
|
||||
|
||||
var result = props.asc_getFunctionResult();
|
||||
this.lblFunctionResult.html('= ' + ((result!==undefined && result!==null) ? result : ''));
|
||||
result = props.asc_getFormulaResult();
|
||||
this.lblFormulaResult.html('<b>' + this.textValue + ': </b>' + ((result!==undefined && result!==null)? result : ''));
|
||||
|
||||
var argres = props.asc_getArgumentsResult(),
|
||||
argtype = props.asc_getArgumentsType(),
|
||||
argval = props.asc_getArgumentsValue();
|
||||
|
||||
if (argtype) {
|
||||
for (var i=0; i<argtype.length; i++) {
|
||||
var type = argtype[i],
|
||||
types = [];
|
||||
|
||||
if (typeof type == 'object') {
|
||||
this.repeatedArg = type;
|
||||
types = type;
|
||||
} else
|
||||
types.push(type);
|
||||
this.fillArgs(types, argval, argres);
|
||||
}
|
||||
if (argval && this.args.length<argval.length && this.repeatedArg) { // add repeated
|
||||
while (this.args.length<argval.length) {
|
||||
this.fillArgs(this.repeatedArg, argval, argres);
|
||||
}
|
||||
}
|
||||
this.scrollerY.update();
|
||||
this.scrollerY.scrollTop(0);
|
||||
}
|
||||
}
|
||||
if (this.args.length<1) {
|
||||
this.panelArgs.text('This function has no arguments');
|
||||
this.lblArgDesc.addClass('hidden');
|
||||
} else {
|
||||
if (this.args.length==1 && this.repeatedArg && this.repeatedArg.length<this.maxArgCount) {// add new repeated arguments
|
||||
this.fillArgs(this.repeatedArg);
|
||||
this.scrollerY.update();
|
||||
}
|
||||
|
||||
_.delay(function(){
|
||||
me._noApply = true;
|
||||
me.args[0].argInput.cmpEl.find('input').focus();
|
||||
me._noApply = false;
|
||||
},100);
|
||||
}
|
||||
},
|
||||
|
||||
recalcArgTableSize: function() {
|
||||
var height = this.panelDesc.outerHeight();
|
||||
height = this.$window.find('.box').height() - 7 - height - 54;
|
||||
height = parseInt(height/30) * 30;
|
||||
this.tableArgs.parent().css('max-height', height);
|
||||
if (!this.scrollerY)
|
||||
this.scrollerY = new Common.UI.Scroller({
|
||||
el: this.tableArgs.parent(),
|
||||
minScrollbarLength : 20,
|
||||
alwaysVisibleY: true
|
||||
});
|
||||
else
|
||||
this.scrollerY.update();
|
||||
},
|
||||
|
||||
checkDescriptionSize: function() {
|
||||
(this.contentPanel.height() < this.innerPanel.height()) && this.recalcArgTableSize();
|
||||
},
|
||||
|
||||
fillArgs: function (types, argval, argres) {
|
||||
var argcount = this.args.length;
|
||||
for (var j=0; j<types.length; j++)
|
||||
this.setControls(argcount, types[j], argval ? argval[argcount] : undefined, argres ? argres[argcount] : undefined);
|
||||
},
|
||||
|
||||
setControls: function(argcount, argtype, argval, argres) {
|
||||
var me = this,
|
||||
argtpl = '<tr><td style="padding-right: 10px;padding-bottom: 8px;vertical-align: middle;"><div id="formula-wizard-lbl-name-arg{0}" style="min-width:' + this.minArgWidth + 'px;white-space: nowrap;margin-top: 1px;"></div></td>' +
|
||||
'<td style="padding-right: 5px;padding-bottom: 8px;width: 100%;vertical-align: middle;"><div id="formula-wizard-txt-arg{0}"></div></td>' +
|
||||
'<td style="padding-bottom: 8px;vertical-align: middle;"><div id="formula-wizard-lbl-val-arg{0}" class="input-label" style="margin-top: 1px;width: 200px;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;"></div></td></tr>',
|
||||
div = $(Common.Utils.String.format(argtpl, argcount));
|
||||
this.tableArgs.append(div);
|
||||
|
||||
var txt = new Common.UI.InputFieldBtn({
|
||||
el: div.find('#formula-wizard-txt-arg'+argcount),
|
||||
index: argcount,
|
||||
validateOnChange: true,
|
||||
validateOnBlur: false
|
||||
}).on('changed:after', function(input, newValue, oldValue, e) {
|
||||
}).on('changing', function(input, newValue, oldValue, e) {
|
||||
if (newValue == oldValue) return;
|
||||
me.onInputChanging(input, newValue, oldValue);
|
||||
}).on('button:click', _.bind(this.onSelectData, this));
|
||||
txt.setValue((argval!==undefined && argval!==null) ? argval : '');
|
||||
txt._input.on('focus', _.bind(this.onSelectArgument, this, txt));
|
||||
|
||||
me.args.push({
|
||||
index: argcount,
|
||||
lblName: div.find('#formula-wizard-lbl-name-arg'+argcount),
|
||||
lblValue: div.find('#formula-wizard-lbl-val-arg'+argcount),
|
||||
argInput: txt,
|
||||
argName: 'Argument ' + (argcount+1),
|
||||
// argDesc: 'some argument description',
|
||||
argType: argtype,
|
||||
argTypeName: me.getArgType(argtype)
|
||||
});
|
||||
if (argcount<me.minArgCount)
|
||||
me.args[argcount].lblName.html('<b>' + me.args[argcount].argName + '</b>');
|
||||
else
|
||||
me.args[argcount].lblName.html(me.args[argcount].argName);
|
||||
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() {
|
||||
var res = [],
|
||||
len = this.args.length,
|
||||
empty = true;
|
||||
for (var i=len-1; i>=0; i--) {
|
||||
var val = this.args[i].argInput.getValue();
|
||||
empty && (empty = !val);
|
||||
(!empty) && (res[i] = val);
|
||||
}
|
||||
return res;
|
||||
},
|
||||
|
||||
getArgType: function(type) {
|
||||
var str = '';
|
||||
switch (type) {
|
||||
case Asc.c_oAscFormulaArgumentType.number:
|
||||
str = 'number';
|
||||
break;
|
||||
case Asc.c_oAscFormulaArgumentType.text:
|
||||
str = 'text';
|
||||
break;
|
||||
case Asc.c_oAscFormulaArgumentType.reference:
|
||||
str = 'reference';
|
||||
break;
|
||||
case Asc.c_oAscFormulaArgumentType.any:
|
||||
str = 'any';
|
||||
break;
|
||||
case Asc.c_oAscFormulaArgumentType.logical:
|
||||
str = 'logical';
|
||||
break;
|
||||
}
|
||||
return str;
|
||||
},
|
||||
|
||||
onSelectArgument: function(input) {
|
||||
var index = input.options.index,
|
||||
arg = this.args[index];
|
||||
arg.argDesc ? this.lblArgDesc.html('<b>' + arg.argName + ': </b>' + arg.argDesc) : this.lblArgDesc.addClass('hidden');
|
||||
if (!this._noApply && index==this.args.length-1 && this.repeatedArg && index+this.repeatedArg.length<this.maxArgCount) {// add new repeated arguments
|
||||
this.fillArgs(this.repeatedArg);
|
||||
this.scrollerY.update();
|
||||
}
|
||||
this.checkDescriptionSize();
|
||||
},
|
||||
|
||||
onSelectData: function(input) {
|
||||
this.onSelectArgument(input);
|
||||
|
||||
var me = this;
|
||||
if (me.api) {
|
||||
var changedValue = input.getValue();
|
||||
var handlerDlg = function(dlg, result) {
|
||||
if (result == 'ok') {
|
||||
changedValue = dlg.getSettings();
|
||||
}
|
||||
};
|
||||
|
||||
var win = new SSE.Views.CellRangeDialog({
|
||||
allowBlank: true,
|
||||
handler: handlerDlg
|
||||
}).on('close', function() {
|
||||
input.setValue(changedValue);
|
||||
me.onInputChanging(input);
|
||||
me.show();
|
||||
});
|
||||
|
||||
var xy = me.$window.offset();
|
||||
me.hide();
|
||||
win.show(xy.left + 65, xy.top + 77);
|
||||
win.setSettings({
|
||||
api : me.api,
|
||||
range : !_.isEmpty(input.getValue()) ? input.getValue() : '',
|
||||
type : Asc.c_oAscSelectionDialogType.Function,
|
||||
selection: {start: input._input[0].selectionStart, end: input._input[0].selectionEnd},
|
||||
argvalues : me.getArgumentsValue(),
|
||||
argindex : input.options.index
|
||||
});
|
||||
}
|
||||
},
|
||||
|
||||
showHelp: function() {
|
||||
if (this.helpUrl==undefined) {
|
||||
if (!this.funcprops || !this.funcprops.origin) {
|
||||
this.helpUrl = null;
|
||||
return;
|
||||
}
|
||||
var lang = Common.Utils.InternalSettings.get("sse-settings-func-help");
|
||||
if (!lang)
|
||||
lang = (this.lang) ? this.lang.split(/[\-\_]/)[0] : 'en';
|
||||
|
||||
var me = this,
|
||||
name = '/Functions/' + this.funcprops.origin.toLocaleLowerCase().replace(/\./g, '-') + '.htm',
|
||||
url = 'resources/help/' + lang + name;
|
||||
|
||||
fetch(url).then(function(response){
|
||||
if ( response.ok ) {
|
||||
Common.Utils.InternalSettings.set("sse-settings-func-help", lang);
|
||||
me.helpUrl = url;
|
||||
me.showHelp();
|
||||
} else {
|
||||
lang = 'en';
|
||||
url = 'resources/help/' + lang + name;
|
||||
fetch(url).then(function(response){
|
||||
if ( response.ok ) {
|
||||
Common.Utils.InternalSettings.set("sse-settings-func-help", lang);
|
||||
me.helpUrl = url;
|
||||
me.showHelp();
|
||||
} else {
|
||||
me.helpUrl = null;
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
} else if (this.helpUrl) {
|
||||
window.open(this.helpUrl);
|
||||
}
|
||||
},
|
||||
|
||||
getSettings: function() {
|
||||
return {};
|
||||
},
|
||||
|
||||
close: function () {
|
||||
Common.Views.AdvancedSettingsWindow.prototype.close.call(this);
|
||||
this.api.asc_closeCellEditor(!this._preventCloseCellEditor);
|
||||
},
|
||||
|
||||
textTitle: 'Function Argumens',
|
||||
textValue: 'Formula result',
|
||||
textFunctionRes: 'Function result',
|
||||
textFunction: 'Function',
|
||||
textHelp: 'Help on this function'
|
||||
|
||||
}, SSE.Views.FormulaWizard || {}))
|
||||
});
|
||||
|
|
@ -770,9 +770,7 @@ define([
|
|||
}
|
||||
|
||||
if (event) {
|
||||
var parent = $(event.currentTarget).parent(),
|
||||
offset = parent.offset();
|
||||
this.HFObject.click(id, event.pageX*Common.Utils.zoom() - offset.left, event.pageY*Common.Utils.zoom() - offset.top + parent.scrollTop());
|
||||
this.HFObject.click(id, event.pageX, event.pageY);
|
||||
} else
|
||||
this.HFObject.click(id);
|
||||
|
||||
|
|
|
|||
|
|
@ -149,11 +149,10 @@ define([
|
|||
return { selectionType: this.selectionType, range: this.inputRange.getValue()};
|
||||
},
|
||||
|
||||
onApiRangeChanged: function(info) {
|
||||
this.inputRange.setValue(info.asc_getName());
|
||||
onApiRangeChanged: function(name) {
|
||||
this.inputRange.setValue(name);
|
||||
if (this.inputRange.cmpEl.hasClass('error'))
|
||||
this.inputRange.cmpEl.removeClass('error');
|
||||
this.selectionType = info.asc_getType();
|
||||
},
|
||||
|
||||
isRangeValid: function() {
|
||||
|
|
@ -174,6 +173,9 @@ define([
|
|||
case Asc.c_oAscError.ID.MultiCellsInTablesFormulaArray:
|
||||
Common.UI.warning({msg: this.errorMultiCellFormula});
|
||||
break;
|
||||
case Asc.c_oAscError.ID.LargeRangeWarning:
|
||||
this.selectionType = Asc.c_oAscSelectionType.RangeMax;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
|
|
|
|||
|
|
@ -1753,6 +1753,11 @@
|
|||
"SSE.Views.FormulaTab.txtFormulaTip": "Insert function",
|
||||
"SSE.Views.FormulaTab.txtMore": "More functions",
|
||||
"SSE.Views.FormulaTab.txtRecent": "Recently used",
|
||||
"SSE.Views.FormulaWizard.textTitle": "Function Argumens",
|
||||
"SSE.Views.FormulaWizard.textValue": "Formula result",
|
||||
"SSE.Views.FormulaWizard.textFunctionRes": "Function result",
|
||||
"SSE.Views.FormulaWizard.textFunction": "Function",
|
||||
"SSE.Views.FormulaWizard.textHelp": "Help on this function",
|
||||
"SSE.Views.GroupDialog.textColumns": "Columns",
|
||||
"SSE.Views.GroupDialog.textRows": "Rows",
|
||||
"SSE.Views.HeaderFooterDialog.textAlign": "Align with page margins",
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ define([
|
|||
'function:click': this.onInsertFunction.bind(this),
|
||||
'function:hint': function (name, type) {
|
||||
setTimeout(function(){
|
||||
me.api.asc_insertFormula(name, type, false);
|
||||
me.api.asc_insertInCell(name, type, false);
|
||||
}, 0);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue