deadcxap/inpx-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Поправки багов поиска

Browse Source
This commit is contained in:
Book Pauk
2022-10-23 19:10:13 +07:00
parent 784dda03fd
commit f1267879af
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/components/Search/Search.vue
View File

@@ -1160,7 +1160,7 @@ class Search {
} else if (searchValue[0] == '#') { } else if (searchValue[0] == '#') {
searchValue = searchValue.substring(1); searchValue = searchValue.substring(1);
return !bookValue || (!enru.has(bookValue[0]) && bookValue.indexOf(searchValue) >= 0); return !bookValue || (bookValue !== emptyFieldValue && !enru.has(bookValue[0]) && bookValue.indexOf(searchValue) >= 0);
} else if (searchValue[0] == '?') { } else if (searchValue[0] == '?') {
return bookValue == '' || bookValue.indexOf(searchValue) == 0; return bookValue == '' || bookValue.indexOf(searchValue) == 0;
} else { } else {

3
server/core/DbSearcher.js
View File

@@ -4,6 +4,7 @@ const utils = require('./utils');
const maxMemCacheSize = 100; const maxMemCacheSize = 100;
const emptyFieldValue = '?';
const maxUtf8Char = String.fromCodePoint(0xFFFFF); const maxUtf8Char = String.fromCodePoint(0xFFFFF);
const ruAlphabet = 'абвгдеёжзийклмнопрстуфхцчшщъыьэюя'; const ruAlphabet = 'абвгдеёжзийклмнопрстуфхцчшщъыьэюя';
const enAlphabet = 'abcdefghijklmnopqrstuvwxyz'; const enAlphabet = 'abcdefghijklmnopqrstuvwxyz';
@@ -45,7 +46,7 @@ class DbSearcher {
a = a.substring(1); a = a.substring(1);
where = `@indexIter('value', (v) => { where = `@indexIter('value', (v) => {
const enru = new Set(${db.esc(enruArr)}); const enru = new Set(${db.esc(enruArr)});
return !v || (!enru.has(v[0]) && v.indexOf(${db.esc(a)}) >= 0); return !v || (v !== ${db.esc(emptyFieldValue)} && !enru.has(v[0]) && v.indexOf(${db.esc(a)}) >= 0);
})`; })`;
} else { } else {
where = `@dirtyIndexLR('value', ${db.esc(a)}, ${db.esc(a + maxUtf8Char)})`; where = `@dirtyIndexLR('value', ${db.esc(a)}, ${db.esc(a + maxUtf8Char)})`;