Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-03 15:28:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 https://github.com/siyuan-note/siyuan/issues/6731

Browse source
This commit is contained in:
Vanessa 2022-11-28 11:26:26 +08:00
parent 7beee6c57c
commit 389fd86925
9 changed files with 88 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/appearance/icons/index.html
View file

@ -422,7 +422,7 @@
<svg>
<use xlink:href="#iconRegex"></use>
</svg>
<del>iconRegex</del>
iconRegex
</div>
<div>
<svg>

2
app/appearance/langs/en_US.json
View file

@ -1,4 +1,6 @@
{
"searchMethod": "Search Method",
"regex": "Regex",
"groupBy": "Group By",
"keywordsLimit": "Keywords Limit",
"exportAsImage": "Export as image",

2
app/appearance/langs/es_ES.json
View file

@ -1,4 +1,6 @@
{
"searchMethod": "método de búsqueda",
"regex": "regex",
"groupBy": "Agrupar por",
"keywordsLimit": "Límite de palabras clave",
"exportAsImage": "Exportar como imagen",

2
app/appearance/langs/fr_FR.json
View file

@ -1,4 +1,6 @@
{
"searchMethod": "méthode de recherche",
"regex": "Regex",
"groupBy": "Regrouper par",
"keywordsLimit": "Limite de mots clés",
"exportAsImage": "Exporter en tant qu'image",

2
app/appearance/langs/zh_CHT.json
View file

@ -1,4 +1,6 @@
{
"searchMethod":"搜索方式",
"regex":"正則表達式",
"groupBy": "分組",
"keywordsLimit": "關鍵字數量限制",
"exportAsImage": "導出為圖片",

2
app/appearance/langs/zh_CN.json
View file

@ -1,4 +1,6 @@
{
"searchMethod":"搜索方式",
"regex":"正则表达式",
"groupBy": "分组",
"keywordsLimit": "关键字数量限制",
"exportAsImage": "导出为图片",

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

@ -97,7 +97,7 @@ export const openSearch = async (hotkey: string, key?: string, notebookId?: stri
k: key || localData.k,
r: localData.r || "",
hasReplace: hotkey === window.siyuan.config.keymap.general.replace.custom,
querySyntax: localData.querySyntax || false,
method: localData.method || 0,
hPath: localData.hPath || "",
idPath: localData.idPath || "",
list: localData.list || [],

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

@ -60,7 +60,7 @@ export const openGlobalSearch = (text: string, replace: boolean) => {
k: text,
r: "",
hasReplace: false,
querySyntax: localData.querySyntax || false,
method: localData.method || 0,
hPath: "",
idPath: "",
list: [],
@ -90,8 +90,8 @@ export const genSearch = (config: ISearchOption, element: Element, closeCB?: ()
<svg><use xlink:href="#iconEdit"></use></svg>
</span>
<span class="fn__space"></span>
<span id="searchPath" aria-label="${window.siyuan.languages.specifyPath}" class="block__icon b3-tooltips b3-tooltips__w">
<svg><use xlink:href="#iconFolder"></use></svg>
<span id="searchSyntaxCheck" aria-label="${window.siyuan.languages.searchMethod}" class="block__icon b3-tooltips b3-tooltips__w">
<svg><use xlink:href="#iconRegex"></use></svg>
</span>
<span class="fn__space"></span>
<span id="searchFilter" aria-label="${window.siyuan.languages.type}" class="block__icon b3-tooltips b3-tooltips__w">
@ -132,9 +132,11 @@ export const genSearch = (config: ISearchOption, element: Element, closeCB?: ()
<svg class="search__rmpath${config.hPath ? "" : " fn__none"}"><use xlink:href="#iconClose"></use></svg>
</span>
<span class="fn__space"></span>
<button id="includeChildCheck" class="b3-button b3-button--small${(config.idPath && config.idPath.endsWith(".sy")) ? " b3-button--cancel" : ""}">${window.siyuan.languages.includeChildDoc}</button>
<span class="fn__space"></span>
<button id="searchSyntaxCheck" class="b3-button b3-button--small${config.querySyntax ? "" : " b3-button--cancel"}">${window.siyuan.languages.querySyntax}</button>
<div class="block__icons">
<span id="searchPath" aria-label="${window.siyuan.languages.specifyPath}" class="block__icon b3-tooltips b3-tooltips__w">
<svg><use xlink:href="#iconFolder"></use></svg>
</span>
</div>
</div>
<div id="searchList" class="search__list b3-list b3-list--background search__list"></div>
<div id="searchPreview" class="fn__flex-1 search__preview"></div>
@ -239,6 +241,34 @@ export const genSearch = (config: ISearchOption, element: Element, closeCB?: ()
break;
} else if (target.id === "searchFilter") {
window.siyuan.menus.menu.remove();
window.siyuan.menus.menu.append(new MenuItem({
label: `<div class="fn__flex" style="margin-bottom: 4px"><span>${window.siyuan.languages.includeChildDoc}</span><span class="fn__space fn__flex-1"></span>
<input type="checkbox" class="b3-switch fn__flex-center"${(config.idPath && config.idPath.endsWith(".sy")) ? " checked" : ""}></div>`,
bind(menuItemElement) {
menuItemElement.addEventListener("click", (event: MouseEvent & { target: HTMLElement }) => {
const inputElement = menuItemElement.querySelector("input");
if (event.target.tagName !== "INPUT") {
inputElement.checked = !inputElement.checked;
}
let reload = false;
if (!inputElement.checked) {
if (!config.idPath.endsWith(".sy") && config.idPath.split("/").length > 1) {
config.idPath = config.idPath + ".sy";
reload = true;
}
} else {
if (config.idPath.endsWith(".sy")) {
config.idPath = config.idPath.replace(".sy", "");
reload = true;
}
}
if (reload) {
inputTimeout = inputEvent(element, config, inputTimeout, edit);
}
window.siyuan.menus.menu.remove();
});
}
}).element);
addConfigMenu(config, window.siyuan.languages.math, "mathBlock", edit, element);
addConfigMenu(config, window.siyuan.languages.table, "table", edit, element);
addConfigMenu(config, window.siyuan.languages.quote, "blockquote", edit, element);
@ -254,30 +284,10 @@ export const genSearch = (config: ISearchOption, element: Element, closeCB?: ()
event.stopPropagation();
event.preventDefault();
break;
} else if (target.id === "includeChildCheck") {
target.classList.toggle("b3-button--cancel");
let reload = false;
if (target.classList.contains("b3-button--cancel")) {
if (!config.idPath.endsWith(".sy") && config.idPath.split("/").length > 1) {
config.idPath = config.idPath + ".sy";
reload = true;
}
} else {
if (config.idPath.endsWith(".sy")) {
config.idPath = config.idPath.replace(".sy", "");
reload = true;
}
}
if (reload) {
inputTimeout = inputEvent(element, config, inputTimeout, edit);
}
event.stopPropagation();
event.preventDefault();
break;
} else if (target.id === "searchSyntaxCheck") {
target.classList.toggle("b3-button--cancel");
config.querySyntax = !target.classList.contains("b3-button--cancel");
inputTimeout = inputEvent(element, config, inputTimeout, edit);
window.siyuan.menus.menu.remove();
addQueryMenu(config, edit, element);
window.siyuan.menus.menu.popup({x: event.clientX - 16, y: event.clientY - 16}, true);
event.stopPropagation();
event.preventDefault();
break;
@ -507,6 +517,41 @@ const addConfigMenu = (config: ISearchOption, lang: string, key: "mathBlock" | "
}).element);
};
const addQueryMenu = (config: ISearchOption, edit: Protyle, element: Element) => {
window.siyuan.menus.menu.append(new MenuItem({
label: window.siyuan.languages.text,
current: config.method === 0,
click() {
config.method = 0;
inputEvent(element, config, undefined, edit);
}
}).element);
window.siyuan.menus.menu.append(new MenuItem({
label: window.siyuan.languages.querySyntax,
current: config.method === 1,
click() {
config.method = 1;
inputEvent(element, config, undefined, edit);
}
}).element);
window.siyuan.menus.menu.append(new MenuItem({
label: "SQL",
current: config.method === 2,
click() {
config.method = 2;
inputEvent(element, config, undefined, edit);
}
}).element);
window.siyuan.menus.menu.append(new MenuItem({
label: window.siyuan.languages.regex,
current: config.method === 3,
click() {
config.method = 3;
inputEvent(element, config, undefined, edit);
}
}).element);
};
const getKey = (element: HTMLElement) => {
const keys: string[] = [];
element.querySelectorAll("mark").forEach(item => {
@ -636,7 +681,7 @@ const inputEvent = (element: Element, config: ISearchOption, inputTimeout: numbe
} else {
fetchPost("/api/search/fullTextSearchBlock", {
query: inputValue,
querySyntax: config.querySyntax,
method: config.method,
types: config.types,
path: config.idPath || "",
groupBy: config.group, // 0：不分组，1：按文档分组

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

@ -51,7 +51,7 @@ interface Window {
interface ISearchOption {
group: number,
hasReplace: boolean,
querySyntax: boolean,
method: number // 0：文本，1：查询语法，2：SQL，3：正则表达式
hPath: string
idPath: string
k: string