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

Merge pull request #1916 from ONLYOFFICE/fix/fix-bugs

Browse source 
[SSE] Add updating of modified search results
This commit is contained in:
maxkadushkin 2022-08-26 15:51:53 +03:00 committed by GitHub
parent 937f4d3e42 f555773a1e
commit 4b8abce439
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
apps/spreadsheeteditor/main/app/controller/Search.js
View file

@ -125,6 +125,7 @@ define([
this.api.asc_registerCallback('asc_onRemoveTextAroundSearch', _.bind(this.onApiRemoveTextAroundSearch, this));
this.api.asc_registerCallback('asc_onActiveSheetChanged', _.bind(this.onActiveSheetChanged, this));
this.api.asc_registerCallback('asc_onModifiedDocument', _.bind(this.onApiModifiedDocument, this));
this.api.asc_registerCallback('asc_onUpdateSearchElem', _.bind(this.onApiUpdateSearchElem, this));
}
return this;
},
@ -475,8 +476,12 @@ define([
var cells = [item.find('.sheet'), item.find('.name'), item.find('.cell'), item.find('.value'), item.find('.formula')],
tips = [data[1], data[2], data[3], data[4], data[5]];
cells.forEach(function (el, ind) {
if (el.data('bs.tooltip')) {
el.removeData('bs.tooltip');
}
var tip = tips[ind];
if (tip) {
el.off('mouseenter');
el.one('mouseenter', function () {
el.attr('data-toggle', 'tooltip');
el.tooltip({
@ -592,6 +597,33 @@ define([
return this._state.searchText;
},
onApiUpdateSearchElem: function (data) { // [id, sheet, name, cell, value, formula]
if (this.resultItems && this.resultItems.length > 0) {
var me = this;
data.forEach(function (item) {
var resultItem = _.findWhere(me.resultItems, {id: item[0]});
if (resultItem) {
resultItem.data = item;
resultItem.el = '<div class="item" style="width: 100%;">' +
'<div class="sheet">' + (item[1] ? item[1] : '') + '</div>' +
'<div class="name">' + (item[2] ? item[2] : '') + '</div>' +
'<div class="cell">' + (item[3] ? item[3] : '') + '</div>' +
'<div class="value">' + (item[4] ? item[4] : '') + '</div>' +
'<div class="formula">' + (item[5] ? item[5] : '') + '</div>' +
'</div>';
if (me.view.$el.is(':visible')) {
resultItem.$el.find('.sheet').text(item[1] ? item[1] : '');
resultItem.$el.find('.name').text(item[2] ? item[2] : '');
resultItem.$el.find('.cell').text(item[3] ? item[3] : '');
resultItem.$el.find('.value').text(item[4] ? item[4] : '');
resultItem.$el.find('.formula').text(item[5] ? item[5] : '');
me.addTooltips(resultItem.$el, item);
}
}
});
}
},
textNoTextFound: 'The data you have been searching for could not be found. Please adjust your search options.',
textReplaceSuccess: 'Search has been done. {0} occurrences have been replaced',
textReplaceSkipped: 'The replacement has been made. {0} occurrences were skipped.',