pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-25 13:40:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2655 from ONLYOFFICE/feature/Bug_58072

Browse Source 
Feature/bug 58072
This commit is contained in:
JuliaSvinareva
2023-10-16 15:24:57 +03:00
committed by GitHub
parent c3a2e18698 262242c2d6
commit 843e245463
2 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/common/main/lib/view/SearchPanel.js
View File

@ -191,9 +191,9 @@ define([
editable: false,
cls: 'input-group-nr',
data: [
{ value: 0, displayValue: this.textSheet },
{ value: 1, displayValue: this.textWorkbook },
{ value: 2, displayValue: this.textSpecificRange}
{ value: Asc.c_oAscSearchBy.Sheet, displayValue: this.textSheet },
{ value: Asc.c_oAscSearchBy.Workbook, displayValue: this.textWorkbook },
{ value: Asc.c_oAscSearchBy.Range, displayValue: this.textSpecificRange}
],
dataHint: '1',
dataHintDirection: 'bottom',
@ -260,7 +260,7 @@ define([
this.$searchOptionsBlock.addClass('no-expand');
}
this.cmbWithin.setValue(0);
this.cmbWithin.setValue(Asc.c_oAscSearchBy.Sheet);
this.cmbSearch.setValue(0);
this.cmbLookIn.setValue(0);

30
apps/spreadsheeteditor/main/app/controller/Search.js
View File

@ -147,6 +147,13 @@ define([
this.view.inputSelectRange.on('button:click', _.bind(this.onRangeSelect, this));
},
changeWithinSheet: function (value) {
this._state.withinSheet = value;
this.view.inputSelectRange.setDisabled(value !== Asc.c_oAscSearchBy.Range);
this.view.inputSelectRange.$el[value === Asc.c_oAscSearchBy.Range ? 'show' : 'hide']();
this.view.updateResultsContainerHeight();
},
onChangeSearchOption: function (option, value, noSearch) {
var runSearch = true;
switch (option) {
@ -160,13 +167,10 @@ define([
this._state.useRegExp = value;
break;
case 'within':
this._state.withinSheet = value === 0 ? Asc.c_oAscSearchBy.Sheet : (value === 1 ? Asc.c_oAscSearchBy.Workbook : Asc.c_oAscSearchBy.Range);
this.view.inputSelectRange.setDisabled(value !== Asc.c_oAscSearchBy.Range);
this.changeWithinSheet(value);
if (value === Asc.c_oAscSearchBy.Range) {
runSearch = this._state.isValidSelectedRange && !!this._state.selectedRange;
}
this.view.inputSelectRange.$el[value === Asc.c_oAscSearchBy.Range ? 'show' : 'hide']();
this.view.updateResultsContainerHeight();
break;
case 'range':
this._state.selectedRange = value;
@ -520,6 +524,18 @@ define([
viewport.searchBar.hide();
}
var activeRange = this.api.asc_getActiveRangeStr(Asc.referenceType.A, null, null, true),
isRangeChanged = false;
if (activeRange !== null) {
this.changeWithinSheet(Asc.c_oAscSearchBy.Range);
this._state.selectedRange = activeRange;
this.view.cmbWithin.setValue(Asc.c_oAscSearchBy.Range);
this.view.inputSelectRange.setValue(activeRange);
isRangeChanged = true;
}
var selectedText = this.api.asc_GetSelectedText(),
text = typeof findText === 'string' ? findText : (selectedText && selectedText.trim() || this._state.searchText);
if (this.resultItems && this.resultItems.length > 0 || (!text && this._state.isResults)) {
@ -528,8 +544,8 @@ define([
this.onQuerySearch();
return;
}
if (!this._state.matchCase && text && text.toLowerCase() === this.view.inputText.getValue().toLowerCase() ||
this._state.matchCase && text === this.view.inputText.getValue()) { // show old results
if (!isRangeChanged && (!this._state.matchCase && text && text.toLowerCase() === this.view.inputText.getValue().toLowerCase() ||
this._state.matchCase && text === this.view.inputText.getValue())) { // show old results
return;
}
}
@ -543,7 +559,7 @@ define([
}
this.hideResults();
if (this._state.searchText !== undefined && text && text === this._state.searchText && this._state.isResults) { // search was made
if (!isRangeChanged && this._state.searchText !== undefined && text && text === this._state.searchText && this._state.isResults) { // search was made
this.api.asc_StartTextAroundSearch();
} else if (this._state.searchText) { // search wasn't made
this._state.searchText = text;