0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🚨

Browse source
This commit is contained in:
Vanessa 2023-08-15 15:27:45 +08:00
parent a3ec6b2f53
commit e9a69cc240
4 changed files with 43 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/menus/workspace.ts
View file

@ -78,7 +78,7 @@ export const workspaceMenu = (app: App, rect: DOMRect) => {
submenu: dockMenu
}).element);
if (!window.siyuan.config.readonly) {
let workspaceSubMenu: IMenu[]
let workspaceSubMenu: IMenu[];
/// #if !BROWSER
workspaceSubMenu = [{
label: `${window.siyuan.languages.new} / ${window.siyuan.languages.openBy}`,

4
app/src/protyle/render/mathRender.ts
View file

@ -10,7 +10,7 @@ declare const katex: {
output: string;
macros: IObject;
trust: boolean;
strict: (errorCode:string) => 'ignore' | 'warn';
strict: (errorCode:string) => "ignore" | "warn";
}): string;
};
@ -49,7 +49,7 @@ export const mathRender = (element: Element, cdn = Constants.PROTYLE_CDN, maxWid
output: "html",
macros,
trust: true, // REF: https://katex.org/docs/supported#html
strict: (errorCode) => errorCode === 'unicodeTextInMathMode' ? 'ignore' : 'warn',
strict: (errorCode) => errorCode === "unicodeTextInMathMode" ? "ignore" : "warn",
});
renderElement.classList.remove("ft__error");
const blockElement = hasClosestBlock(mathElement);

68
app/src/search/assets.ts
View file

@ -19,12 +19,12 @@ export const openSearchAsset = (element: Element, isStick: boolean) => {
(element.querySelector("#searchAssetInput") as HTMLInputElement).select();
return;
}
const localSearch = window.siyuan.storage[Constants.LOCAL_SEARCHASSET] as ISearchAssetOption
const localSearch = window.siyuan.storage[Constants.LOCAL_SEARCHASSET] as ISearchAssetOption;
const loadingElement = element.nextElementSibling;
loadingElement.classList.remove("fn__none");
let enterTip = ""
let enterTip = "";
/// #if !BROWSER
enterTip = `<kbd>Enter/Double Click</kbd> ${window.siyuan.languages.showInFolder}`
enterTip = `<kbd>Enter/Double Click</kbd> ${window.siyuan.languages.showInFolder}`;
/// #endif
element.innerHTML = `<div class="b3-form__icon search__header">
<span class="fn__a" id="assetHistoryBtn">
@ -73,12 +73,12 @@ export const openSearchAsset = (element: Element, isStick: boolean) => {
<kbd>↑/↓</kbd> ${window.siyuan.languages.searchTip1}
${enterTip}
<kbd>Esc</kbd> ${window.siyuan.languages.searchTip5}
</div>`
</div>`;
const searchPanelElement = element.querySelector("#searchAssetList");
if (element.querySelector("#searchAssetList").innerHTML !== "") {
return
return;
}
const searchInputElement = element.querySelector("#searchAssetInput") as HTMLInputElement
const searchInputElement = element.querySelector("#searchAssetInput") as HTMLInputElement;
searchInputElement.select();
searchInputElement.addEventListener("compositionend", (event: InputEvent) => {
if (event.isComposing) {
@ -94,7 +94,7 @@ export const openSearchAsset = (element: Element, isStick: boolean) => {
});
searchInputElement.addEventListener("blur", () => {
if (!searchInputElement.value) {
return
return;
}
let list: string[] = window.siyuan.storage[Constants.LOCAL_SEARCHASSET].keys;
list.splice(0, 0, searchInputElement.value);
@ -106,7 +106,7 @@ export const openSearchAsset = (element: Element, isStick: boolean) => {
window.siyuan.storage[Constants.LOCAL_SEARCHASSET].keys = list;
setStorageVal(Constants.LOCAL_SEARCHASSET, window.siyuan.storage[Constants.LOCAL_SEARCHASSET]);
});
const historyElement = element.querySelector("#searchAssetHistoryList")
const historyElement = element.querySelector("#searchAssetHistoryList");
const lineHeight = 28;
searchInputElement.addEventListener("keydown", (event: KeyboardEvent) => {
if (event.isComposing) {
@ -172,26 +172,26 @@ export const openSearchAsset = (element: Element, isStick: boolean) => {
}
event.preventDefault();
}
renderPreview(element.querySelector('#searchAssetPreview'), currentList.dataset.id, searchInputElement.value, localSearch.method);
renderPreview(element.querySelector("#searchAssetPreview"), currentList.dataset.id, searchInputElement.value, localSearch.method);
});
assetInputEvent(element, localSearch);
}
};
let inputTimeout: number
let inputTimeout: number;
export const assetInputEvent = (element: Element, localSearch?: ISearchAssetOption, page = 1,) => {
element.nextElementSibling.classList.remove("fn__none")
element.nextElementSibling.classList.remove("fn__none");
clearTimeout(inputTimeout);
inputTimeout = window.setTimeout(() => {
if (!localSearch) {
localSearch = window.siyuan.storage[Constants.LOCAL_SEARCHASSET] as ISearchAssetOption
localSearch = window.siyuan.storage[Constants.LOCAL_SEARCHASSET] as ISearchAssetOption;
}
const previousElement = element.querySelector('[data-type="assetPrevious"]')
const previousElement = element.querySelector('[data-type="assetPrevious"]');
if (page > 1) {
previousElement.removeAttribute("disabled");
} else {
previousElement.setAttribute("disabled", "disabled");
}
const searchInputElement = element.querySelector("#searchAssetInput") as HTMLInputElement
const searchInputElement = element.querySelector("#searchAssetInput") as HTMLInputElement;
fetchPost("/api/search/fullTextSearchAssetContent", {
page,
query: searchInputElement.value,
@ -199,9 +199,9 @@ export const assetInputEvent = (element: Element, localSearch?: ISearchAssetOpti
method: localSearch.method,
orderBy: localSearch.sort
}, (response) => {
element.nextElementSibling.classList.add("fn__none")
const nextElement = element.querySelector('[data-type="assetNext"]')
const previewElement = element.querySelector('#searchAssetPreview')
element.nextElementSibling.classList.add("fn__none");
const nextElement = element.querySelector('[data-type="assetNext"]');
const previewElement = element.querySelector("#searchAssetPreview");
if (page < response.data.pageCount) {
nextElement.removeAttribute("disabled");
} else {
@ -236,17 +236,17 @@ export const assetInputEvent = (element: Element, localSearch?: ISearchAssetOpti
<span class="ft__on-surface">${window.siyuan.languages.total} ${response.data.matchedAssetCount}</span>`;
element.querySelector("#searchAssetList").innerHTML = resultHTML || `<div class="search__empty">
${window.siyuan.languages.emptyContent}
</div>`
})
</div>`;
});
}, Constants.TIMEOUT_INPUT);
}
};
export const reIndexAssets = (loadingElement: HTMLElement) => {
loadingElement.classList.remove("fn__none")
loadingElement.classList.remove("fn__none");
fetchPost("/api/asset/fullReindexAssetContent", {}, (response) => {
// assetInputEvent()
})
}
});
};
export const toggleAssetHistory = (historyElement: Element, searchInputElement: HTMLInputElement) => {
if (historyElement.classList.contains("fn__none")) {
@ -271,13 +271,13 @@ export const toggleAssetHistory = (historyElement: Element, searchInputElement:
};
export const renderPreview = (element: Element, id: string, query: string, queryMethod: number) => {
fetchPost('/api/search/getAssetContent', {id, query, queryMethod}, (response) => {
fetchPost("/api/search/getAssetContent", {id, query, queryMethod}, (response) => {
element.innerHTML = response.data.assetContent.content;
})
}
});
};
export const assetMethodMenu = (target: HTMLElement, cb:() => void) => {
const method = window.siyuan.storage[Constants.LOCAL_SEARCHASSET].method
const method = window.siyuan.storage[Constants.LOCAL_SEARCHASSET].method;
if (!window.siyuan.menus.menu.element.classList.contains("fn__none") &&
window.siyuan.menus.menu.element.getAttribute("data-name") === "searchMethod") {
window.siyuan.menus.menu.remove();
@ -290,7 +290,7 @@ export const assetMethodMenu = (target: HTMLElement, cb:() => void) => {
label: window.siyuan.languages.keyword,
current: method === 0,
click() {
window.siyuan.storage[Constants.LOCAL_SEARCHASSET].method = 0
window.siyuan.storage[Constants.LOCAL_SEARCHASSET].method = 0;
cb();
}
}).element);
@ -299,7 +299,7 @@ export const assetMethodMenu = (target: HTMLElement, cb:() => void) => {
label: window.siyuan.languages.querySyntax,
current: method === 1,
click() {
window.siyuan.storage[Constants.LOCAL_SEARCHASSET].method = 1
window.siyuan.storage[Constants.LOCAL_SEARCHASSET].method = 1;
cb();
}
}).element);
@ -308,7 +308,7 @@ export const assetMethodMenu = (target: HTMLElement, cb:() => void) => {
label: "SQL",
current: method === 2,
click() {
window.siyuan.storage[Constants.LOCAL_SEARCHASSET].method = 2
window.siyuan.storage[Constants.LOCAL_SEARCHASSET].method = 2;
cb();
}
}).element);
@ -317,16 +317,16 @@ export const assetMethodMenu = (target: HTMLElement, cb:() => void) => {
label: window.siyuan.languages.regex,
current: method === 3,
click() {
window.siyuan.storage[Constants.LOCAL_SEARCHASSET].method = 3
window.siyuan.storage[Constants.LOCAL_SEARCHASSET].method = 3;
cb();
}
}).element);
const rect = target.getBoundingClientRect();
window.siyuan.menus.menu.popup({x: rect.right, y: rect.bottom}, true);
}
};
export const assetFilterMenu = (assetsElement:Element) => {
const localData = window.siyuan.storage[Constants.LOCAL_SEARCHASSET].types
const localData = window.siyuan.storage[Constants.LOCAL_SEARCHASSET].types;
const filterDialog = new Dialog({
title: window.siyuan.languages.type,
content: `<div class="b3-dialog__content">

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

@ -328,7 +328,7 @@ export const genSearch = (app: App, config: ISearchOption, element: Element, clo
};
});
const assetsElement = element.querySelector("#searchAssets")
const assetsElement = element.querySelector("#searchAssets");
element.addEventListener("click", (event: MouseEvent) => {
let target = event.target as HTMLElement;
const searchPathInputElement = element.querySelector("#searchPathInput");
@ -514,8 +514,8 @@ export const genSearch = (app: App, config: ISearchOption, element: Element, clo
break;
} else if (target.id === "searchAssetClose") {
window.siyuan.menus.menu.remove();
assetsElement.classList.add("fn__none")
assetsElement.previousElementSibling.classList.remove("fn__none")
assetsElement.classList.add("fn__none");
assetsElement.previousElementSibling.classList.remove("fn__none");
searchInputElement.select();
event.stopPropagation();
event.preventDefault();
@ -646,7 +646,7 @@ export const genSearch = (app: App, config: ISearchOption, element: Element, clo
element.querySelector("#assetSyntaxCheck").setAttribute("aria-label", getQueryTip(window.siyuan.storage[Constants.LOCAL_SEARCHASSET].method));
assetInputEvent(assetsElement);
setStorageVal(Constants.LOCAL_SEARCHASSET, window.siyuan.storage[Constants.LOCAL_SEARCHASSET]);
})
});
event.stopPropagation();
event.preventDefault();
break;
@ -698,7 +698,7 @@ export const genSearch = (app: App, config: ISearchOption, element: Element, clo
event.preventDefault();
break;
} else if (target.classList.contains("b3-list-item")) {
const searchAssetInputElement = element.querySelector("#searchAssetInput") as HTMLInputElement
const searchAssetInputElement = element.querySelector("#searchAssetInput") as HTMLInputElement;
if (target.parentElement.id === "searchHistoryList") {
searchInputElement.value = target.textContent;
config.page = 1;
@ -719,7 +719,7 @@ export const genSearch = (app: App, config: ISearchOption, element: Element, clo
if (!target.classList.contains("b3-list-item--focus")) {
assetsElement.querySelector(".b3-list-item--focus").classList.remove("b3-list-item--focus");
target.classList.add("b3-list-item--focus");
renderPreview(element.querySelector('#searchAssetPreview'), target.dataset.id, searchAssetInputElement.value, window.siyuan.storage[Constants.LOCAL_SEARCHASSET].method);
renderPreview(element.querySelector("#searchAssetPreview"), target.dataset.id, searchAssetInputElement.value, window.siyuan.storage[Constants.LOCAL_SEARCHASSET].method);
searchAssetInputElement.focus();
}
} else {