Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-21 17:10:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 fix https://github.com/siyuan-note/siyuan/issues/6856

Browse source
This commit is contained in:
Vanessa 2022-12-12 11:46:40 +08:00
parent 286e87259b
commit 975aab7f87
4 changed files with 30 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/constants.ts
View file

@ -58,6 +58,7 @@ export abstract class Constants {
// localstorage // localstorage
public static readonly LOCAL_SEARCHEDATA = "local-searchedata"; public static readonly LOCAL_SEARCHEDATA = "local-searchedata";
public static readonly LOCAL_SEARCHEKEYS = "local-searchekeys";
public static readonly LOCAL_DOCINFO = "local-docinfo"; // only mobile public static readonly LOCAL_DOCINFO = "local-docinfo"; // only mobile
public static readonly LOCAL_DAILYNOTEID = "local-dailynoteid"; public static readonly LOCAL_DAILYNOTEID = "local-dailynoteid";
public static readonly LOCAL_HISTORYNOTEID = "local-historynoteid"; public static readonly LOCAL_HISTORYNOTEID = "local-historynoteid";

2
app/src/search/spread.ts
View file

@ -104,8 +104,6 @@ export const openSearch = async (hotkey: string, key?: string, notebookId?: stri
method: localData.method || 0, method: localData.method || 0,
hPath, hPath,
idPath, idPath,
list: localData.list || [],
replaceList: localData.replaceList || [],
group: localData.group || 0, group: localData.group || 0,
layout: localData.layout || 0, layout: localData.layout || 0,
sort: localData.sort || 0, sort: localData.sort || 0,

77
app/src/search/util.ts
View file

@ -19,6 +19,18 @@ import {unicode2Emoji} from "../emoji";
import {Dialog} from "../dialog"; import {Dialog} from "../dialog";
import {hasClosestByClassName} from "../protyle/util/hasClosest"; import {hasClosestByClassName} from "../protyle/util/hasClosest";
const saveKeyList = (type: "keys" | "replaceKeys", value: string) => {
const searchKeys = JSON.parse(localStorage.getItem(Constants.LOCAL_SEARCHEKEYS) || "{}");
let list: string[] = searchKeys[type] || []
list.splice(0, 0, value);
list = Array.from(new Set(list));
if (list.length > window.siyuan.config.search.limit) {
list.splice(window.siyuan.config.search.limit, list.length - window.siyuan.config.search.limit);
}
searchKeys[type] = list
localStorage.setItem(Constants.LOCAL_SEARCHEKEYS, JSON.stringify(searchKeys));
};
export const openGlobalSearch = (text: string, replace: boolean) => { export const openGlobalSearch = (text: string, replace: boolean) => {
text = text.trim(); text = text.trim();
let wnd: Wnd; let wnd: Wnd;
@ -65,8 +77,6 @@ export const openGlobalSearch = (text: string, replace: boolean) => {
method: localData.method || 0, method: localData.method || 0,
hPath: "", hPath: "",
idPath: [], idPath: [],
list: [],
replaceList: [],
group: localData.group || 0, group: localData.group || 0,
layout: localData.layout || 0, layout: localData.layout || 0,
sort: localData.sort || 0, sort: localData.sort || 0,
@ -205,7 +215,7 @@ export const genSearch = (config: ISearchOption, element: Element, closeCB?: ()
config.idPath = []; config.idPath = [];
config.hPath = ""; config.hPath = "";
element.querySelector("#searchPathInput").innerHTML = config.hPath; element.querySelector("#searchPathInput").innerHTML = config.hPath;
inputTimeout = inputEvent(element, config, inputTimeout, edit, false); inputTimeout = inputEvent(element, config, inputTimeout, edit);
const includeElement = element.querySelector("#searchInclude"); const includeElement = element.querySelector("#searchInclude");
includeElement.classList.remove("b3-button--cancel"); includeElement.classList.remove("b3-button--cancel");
includeElement.setAttribute("disabled", "disabled"); includeElement.setAttribute("disabled", "disabled");
@ -259,7 +269,7 @@ export const genSearch = (config: ISearchOption, element: Element, closeCB?: ()
} else { } else {
includeElement.setAttribute("disabled", "disabled"); includeElement.setAttribute("disabled", "disabled");
} }
inputTimeout = inputEvent(element, config, inputTimeout, edit, false); inputTimeout = inputEvent(element, config, inputTimeout, edit);
}); });
}, [], undefined, window.siyuan.languages.specifyPath); }, [], undefined, window.siyuan.languages.specifyPath);
event.stopPropagation(); event.stopPropagation();
@ -320,7 +330,7 @@ export const genSearch = (config: ISearchOption, element: Element, closeCB?: ()
event.preventDefault(); event.preventDefault();
break; break;
} else if (target.id === "searchRefresh") { } else if (target.id === "searchRefresh") {
inputTimeout = inputEvent(element, config, inputTimeout, edit, false); inputTimeout = inputEvent(element, config, inputTimeout, edit);
event.stopPropagation(); event.stopPropagation();
event.preventDefault(); event.preventDefault();
break; break;
@ -342,11 +352,12 @@ export const genSearch = (config: ISearchOption, element: Element, closeCB?: ()
event.preventDefault(); event.preventDefault();
break; break;
} else if (target.id === "searchHistoryBtn") { } else if (target.id === "searchHistoryBtn") {
if (!config.list || config.list.length === 0) { const list = JSON.parse(localStorage.getItem(Constants.LOCAL_SEARCHEKEYS)||"{}")
if (!list.keys || list.keys.length === 0) {
return; return;
} }
let html = ""; let html = "";
(config.list || []).forEach((s: string) => { list.keys.forEach((s: string) => {
if (s !== searchInputElement.value) { if (s !== searchInputElement.value) {
html += `<div class="b3-list-item">${escapeHtml(s)}</div>`; html += `<div class="b3-list-item">${escapeHtml(s)}</div>`;
} }
@ -361,11 +372,12 @@ export const genSearch = (config: ISearchOption, element: Element, closeCB?: ()
event.preventDefault(); event.preventDefault();
return; return;
} else if (target.id === "replaceHistoryBtn") { } else if (target.id === "replaceHistoryBtn") {
if (!config.replaceList || config.replaceList.length === 0) { const list = JSON.parse(localStorage.getItem(Constants.LOCAL_SEARCHEKEYS)||"{}")
if (!list.replaceKeys || list.replaceKeys.length === 0) {
return; return;
} }
let html = ""; let html = "";
(config.replaceList || []).forEach((s: string) => { list.replaceKeys .forEach((s: string) => {
if (s !== replaceInputElement.value) { if (s !== replaceInputElement.value) {
html += `<div class="b3-list-item">${escapeHtml(s)}</div>`; html += `<div class="b3-list-item">${escapeHtml(s)}</div>`;
} }
@ -398,7 +410,7 @@ export const genSearch = (config: ISearchOption, element: Element, closeCB?: ()
} else if (target.classList.contains("b3-list-item")) { } else if (target.classList.contains("b3-list-item")) {
if (target.parentElement.id === "searchHistoryList") { if (target.parentElement.id === "searchHistoryList") {
searchInputElement.value = target.textContent; searchInputElement.value = target.textContent;
inputTimeout = inputEvent(element, config, inputTimeout, edit, false); inputTimeout = inputEvent(element, config, inputTimeout, edit);
} else if (target.parentElement.id === "replaceHistoryList") { } else if (target.parentElement.id === "replaceHistoryList") {
replaceInputElement.value = target.textContent; replaceInputElement.value = target.textContent;
replaceHistoryElement.classList.add("fn__none"); replaceHistoryElement.classList.add("fn__none");
@ -459,23 +471,13 @@ export const genSearch = (config: ISearchOption, element: Element, closeCB?: ()
}, false); }, false);
searchInputElement.addEventListener("compositionend", (event: InputEvent) => { searchInputElement.addEventListener("compositionend", (event: InputEvent) => {
inputTimeout = inputEvent(element, config, inputTimeout, edit, false, event); inputTimeout = inputEvent(element, config, inputTimeout, edit, event);
}); });
searchInputElement.addEventListener("input", (event: InputEvent) => { searchInputElement.addEventListener("input", (event: InputEvent) => {
inputTimeout = inputEvent(element, config, inputTimeout, edit, false, event); inputTimeout = inputEvent(element, config, inputTimeout, edit, event);
}); });
searchInputElement.addEventListener("blur", () => { searchInputElement.addEventListener("blur", () => {
let searches: string[] = config.list || []; saveKeyList("keys", searchInputElement.value)
searches.splice(0, 0, searchInputElement.value);
searches = Array.from(new Set(searches));
if (searches.length > window.siyuan.config.search.limit) {
searches.splice(window.siyuan.config.search.limit, searches.length - window.siyuan.config.search.limit);
}
config.list = searches;
config.k = searchInputElement.value;
if (!element.getAttribute("data-id")) {
localStorage.setItem(Constants.LOCAL_SEARCHEDATA, JSON.stringify(config));
}
}); });
searchInputElement.addEventListener("keydown", (event: KeyboardEvent) => { searchInputElement.addEventListener("keydown", (event: KeyboardEvent) => {
let currentList: HTMLElement = searchPanelElement.querySelector(".b3-list-item--focus"); let currentList: HTMLElement = searchPanelElement.querySelector(".b3-list-item--focus");
@ -556,7 +558,7 @@ export const genSearch = (config: ISearchOption, element: Element, closeCB?: ()
replace(element, config, edit, false); replace(element, config, edit, false);
event.preventDefault(); event.preventDefault();
}); });
inputTimeout = inputEvent(element, config, inputTimeout, edit, false); inputTimeout = inputEvent(element, config, inputTimeout, edit);
return edit; return edit;
}; };
@ -661,9 +663,6 @@ const addConfigMoreMenu = async (config: ISearchOption, edit: Protyle, element:
element.querySelector(".search__layout").classList.remove("search__layout--row"); element.querySelector(".search__layout").classList.remove("search__layout--row");
setPadding(edit.protyle); setPadding(edit.protyle);
config.layout = 0; config.layout = 0;
if (!element.getAttribute("data-id")) {
localStorage.setItem(Constants.LOCAL_SEARCHEDATA, JSON.stringify(config));
}
} }
}, { }, {
label: window.siyuan.languages.leftRightLayout, label: window.siyuan.languages.leftRightLayout,
@ -672,9 +671,6 @@ const addConfigMoreMenu = async (config: ISearchOption, edit: Protyle, element:
element.querySelector(".search__layout").classList.add("search__layout--row"); element.querySelector(".search__layout").classList.add("search__layout--row");
setPadding(edit.protyle); setPadding(edit.protyle);
config.layout = 1; config.layout = 1;
if (!element.getAttribute("data-id")) {
localStorage.setItem(Constants.LOCAL_SEARCHEDATA, JSON.stringify(config));
}
} }
}] }]
}).element); }).element);
@ -789,6 +785,7 @@ const addConfigMoreMenu = async (config: ISearchOption, edit: Protyle, element:
(element.querySelector("#replaceInput") as HTMLInputElement).value = item.r; (element.querySelector("#replaceInput") as HTMLInputElement).value = item.r;
Object.assign(config, item); Object.assign(config, item);
inputEvent(element, config, undefined, edit); inputEvent(element, config, undefined, edit);
localStorage.setItem(Constants.LOCAL_SEARCHEDATA, JSON.stringify(config));
window.siyuan.menus.menu.remove(); window.siyuan.menus.menu.remove();
}); });
} }
@ -988,17 +985,7 @@ const replace = (element: Element, config: ISearchOption, edit: Protyle, isAll:
if (!loadElement.classList.contains("fn__none")) { if (!loadElement.classList.contains("fn__none")) {
return; return;
} }
let searches: string[] = config.replaceList || []; saveKeyList("replaceKeys", replaceInputElement.value)
searches.splice(0, 0, replaceInputElement.value);
searches = Array.from(new Set(searches));
if (searches.length > window.siyuan.config.search.limit) {
searches.splice(window.siyuan.config.search.limit, searches.length - window.siyuan.config.search.limit);
}
config.replaceList = searches;
config.r = replaceInputElement.value;
if (!element.getAttribute("data-id")) {
localStorage.setItem(Constants.LOCAL_SEARCHEDATA, JSON.stringify(config));
}
let currentList: HTMLElement = searchPanelElement.querySelector(".b3-list-item--focus"); let currentList: HTMLElement = searchPanelElement.querySelector(".b3-list-item--focus");
if (!currentList) { if (!currentList) {
return; return;
@ -1059,7 +1046,7 @@ const replace = (element: Element, config: ISearchOption, edit: Protyle, isAll:
}); });
}; };
const inputEvent = (element: Element, config: ISearchOption, inputTimeout: number, edit: Protyle, saveConfig = true, event?: InputEvent) => { const inputEvent = (element: Element, config: ISearchOption, inputTimeout: number, edit: Protyle, event?: InputEvent) => {
if (event && event.isComposing) { if (event && event.isComposing) {
return; return;
} }
@ -1090,12 +1077,6 @@ const inputEvent = (element: Element, config: ISearchOption, inputTimeout: numbe
loadingElement.classList.add("fn__none"); loadingElement.classList.add("fn__none");
}); });
} }
if (saveConfig) {
config.k = inputValue;
if (!element.getAttribute("data-id")) {
localStorage.setItem(Constants.LOCAL_SEARCHEDATA, JSON.stringify(config));
}
}
}, Constants.TIMEOUT_SEARCH); }, Constants.TIMEOUT_SEARCH);
return inputTimeout; return inputTimeout;
}; };

2
app/src/types/index.d.ts vendored
View file

@ -62,8 +62,6 @@ interface ISearchOption {
idPath: string[] idPath: string[]
k: string k: string
r: string r: string
replaceList: string[]
list: string[]
types: { types: {
mathBlock: boolean mathBlock: boolean
table: boolean table: boolean