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

[SSE] Add Calculate into Toolbar

Browse source
This commit is contained in:
Julia Svinareva 2019-08-27 15:24:10 +03:00
parent bb22127a3e
commit 0bc009b7db
3 changed files with 50 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/spreadsheeteditor/main/app/controller/FormulaDialog.js
View file

@ -80,7 +80,8 @@ define([
}
},
'FormulaTab': {
'function:apply': this.applyFunction
'function:apply': this.applyFunction,
'function:calculate': this.onCalculate
},
'Toolbar': {
'function:apply': this.applyFunction,
@ -353,6 +354,13 @@ define([
}
},
onCalculate: function(calc) {
var type = calc.type;
if (type === Asc.c_oAscCalculateType.All || type === Asc.c_oAscCalculateType.ActiveSheet) {
this.api && this.api.asc_calculate(type);
}
},
sCategoryAll: 'All',
sCategoryLast10: '10 last used',
sCategoryLogical: 'Logical',

4
apps/spreadsheeteditor/main/app/template/Toolbar.template
View file

@ -172,6 +172,10 @@
<span class="btn-slot text x-huge" id="slot-btn-math"></span>
<span class="btn-slot text x-huge" id="slot-btn-more"></span>
</div>
<div class="separator long"></div>
<div class="group">
<span class="btn-slot text x-huge" id="slot-btn-calculate"></span>
</div>
</section>
<section class="panel" data-tab="data">
<div class="group">

38
apps/spreadsheeteditor/main/app/view/FormulaTab.js
View file

@ -57,6 +57,12 @@ define([
me.btnFormula.on('click', function(){
me.fireEvent('function:apply', [{name: 'more', origin: 'more'}]);
});
me.btnCalculate.on('click', function () {
me.fireEvent('function:calculate', [{name: 'calculate', type: Asc.c_oAscCalculateType.All}]);
});
me.btnCalculate.menu.on('item:click', function (menu, item, e) {
me.fireEvent('function:calculate', [{name: item.caption, type: item.value}]);
});
}
return {
options: {},
@ -214,6 +220,18 @@ define([
Common.Utils.injectComponent($host.find('#slot-btn-more'), this.btnMore);
this.lockedControls.push(this.btnMore);
this.btnCalculate = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top',
iconCls: 'btn-cell-group',
caption: this.txtCalculate,
split: true,
menu: true,
disabled: true,
lock: [_set.editCell, _set.editText, _set.selChart, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.selRangeEdit, _set.lostConnect, _set.coAuth]
});
Common.Utils.injectComponent($host.find('#slot-btn-calculate'), this.btnCalculate);
this.lockedControls.push(this.btnCalculate);
Common.NotificationCenter.on('app:ready', this.onAppReady.bind(this));
},
@ -226,6 +244,17 @@ define([
(new Promise(function (accept, reject) {
accept();
})).then(function(){
me.btnCalculate.updateHint([me.tipCalculateTheEntireWorkbook, me.tipCalculate]);
var _menu = new Common.UI.Menu({
items: [
{caption: me.textEntireWorkbook, value: Asc.c_oAscCalculateType.All},
{caption: me.textCurrentSheet, value: Asc.c_oAscCalculateType.ActiveSheet},
{caption: '--'},
{caption: me.textAutomatic, value: '', toggleGroup: 'menuCoauthMode', checkable: true, checked: true},
{caption: me.textManual, value: '', toggleGroup: 'menuCoauthMode', checkable: true, checked: false}
]
});
me.btnCalculate.setMenu(_menu);
setEvents.call(me);
});
},
@ -480,7 +509,14 @@ define([
txtAdditional: 'Additional',
txtFormula: 'Function',
txtFormulaTip: 'Insert function',
txtMore: 'More functions'
txtMore: 'More functions',
txtCalculate: 'Calculate',
tipCalculate: 'Calculate',
textEntireWorkbook: 'Entire Workbook',
textCurrentSheet: 'Current Sheet',
textAutomatic: 'Automatic',
textManual: 'Manual',
tipCalculateTheEntireWorkbook: 'Calculate the entire workbook'
}
}()), SSE.Views.FormulaTab || {}));
});