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

[SSE] Fix search

Browse source
This commit is contained in:
JuliaSvinareva 2022-08-24 18:19:04 +03:00
parent 8e5cffa29f
commit d57f114315
4 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/common/main/lib/view/SearchPanel.js
View file

@ -210,6 +210,7 @@ define([
}).on('keyup:after', function(input, e) { }).on('keyup:after', function(input, e) {
me.fireEvent('search:options', ['range', input.getValue(), e.keyCode !== Common.UI.Keys.RETURN]); me.fireEvent('search:options', ['range', input.getValue(), e.keyCode !== Common.UI.Keys.RETURN]);
}); });
this.inputSelectRange.$el.hide();
this.cmbSearch = new Common.UI.ComboBox({ this.cmbSearch = new Common.UI.ComboBox({
el: $('#search-adv-cmb-search'), el: $('#search-adv-cmb-search'),
@ -437,8 +438,8 @@ define([
textValue: 'Value', textValue: 'Value',
textFormula: 'Formula', textFormula: 'Formula',
textSearchHasStopped: 'Search has stopped', textSearchHasStopped: 'Search has stopped',
textContentChanged: 'Document content has changed.', textContentChanged: 'Document changed.',
textSearchAgain: '{0}Search again{1} to make sure the results are current.' textSearchAgain: '{0}Perform new search{1} for accurate results.'
}, Common.Views.SearchPanel || {})); }, Common.Views.SearchPanel || {}));
}); });

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

@ -155,6 +155,8 @@ define([
if (value === Asc.c_oAscSearchBy.Range) { if (value === Asc.c_oAscSearchBy.Range) {
runSearch = this._state.isValidSelectedRange && !!this._state.selectedRange; runSearch = this._state.isValidSelectedRange && !!this._state.selectedRange;
} }
this.view.inputSelectRange.$el[value === Asc.c_oAscSearchBy.Range ? 'show' : 'hide']();
this.view.updateResultsContainerHeight();
break; break;
case 'range': case 'range':
this._state.selectedRange = value; this._state.selectedRange = value;

4
apps/spreadsheeteditor/main/locale/en.json
View file

@ -423,8 +423,8 @@
"Common.Views.SearchPanel.textWorkbook": "Workbook", "Common.Views.SearchPanel.textWorkbook": "Workbook",
"Common.Views.SearchPanel.tipNextResult": "Next result", "Common.Views.SearchPanel.tipNextResult": "Next result",
"Common.Views.SearchPanel.tipPreviousResult": "Previous result", "Common.Views.SearchPanel.tipPreviousResult": "Previous result",
"Common.Views.SearchPanel.textContentChanged": "Document content has changed.", "Common.Views.SearchPanel.textContentChanged": "Document changed.",
"Common.Views.SearchPanel.textSearchAgain": "{0}Search again{1} to make sure the results are current.", "Common.Views.SearchPanel.textSearchAgain": "{0}Perform new search{1} for accurate results.",
"Common.Views.SelectFileDlg.textLoading": "Loading", "Common.Views.SelectFileDlg.textLoading": "Loading",
"Common.Views.SelectFileDlg.textTitle": "Select Data Source", "Common.Views.SelectFileDlg.textTitle": "Select Data Source",
"Common.Views.SignDialog.textBold": "Bold", "Common.Views.SignDialog.textBold": "Bold",

2
apps/spreadsheeteditor/main/resources/less/leftmenu.less
View file

@ -772,7 +772,7 @@
} }
} }
.search-items { .search-items {
height: calc(100% - 24px); height: calc(100% - 28px);
position: absolute; position: absolute;
top: 28px; top: 28px;
width: 100%; width: 100%;