mirror of
https://github.com/siyuan-note/siyuan.git
synced 2025-05-17 01:21:14 +08:00
This commit is contained in:
parent
7eeac4b1a4
commit
15532c9b4e
@ -66,11 +66,12 @@ export const openSearch = async (options: {
|
|||||||
idPath[0] = pathPosix().join(idPath[0], options.searchPath);
|
idPath[0] = pathPosix().join(idPath[0], options.searchPath);
|
||||||
}
|
}
|
||||||
} else if (window.siyuan.config.keymap.general.globalSearch.custom === options.hotkey) {
|
} else if (window.siyuan.config.keymap.general.globalSearch.custom === options.hotkey) {
|
||||||
hPath = localData.hPath;
|
if (localData.removed) {
|
||||||
idPath = localData.idPath;
|
hPath = "";
|
||||||
// 历史原因,2.5.2 之前为 string https://github.com/siyuan-note/siyuan/issues/6902
|
idPath = [];
|
||||||
if (typeof idPath === "string") {
|
} else {
|
||||||
idPath = [idPath];
|
hPath = localData.hPath;
|
||||||
|
idPath = localData.idPath;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -92,7 +93,7 @@ export const openSearch = async (options: {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
dialog.element.setAttribute("data-key", options.hotkey);
|
dialog.element.setAttribute("data-key", options.hotkey);
|
||||||
const edit = genSearch( options.app, {
|
const edit = genSearch(options.app, {
|
||||||
removed: localData.removed,
|
removed: localData.removed,
|
||||||
k: options.key || localData.k,
|
k: options.key || localData.k,
|
||||||
r: localData.r,
|
r: localData.r,
|
||||||
@ -103,7 +104,7 @@ export const openSearch = async (options: {
|
|||||||
group: localData.group,
|
group: localData.group,
|
||||||
sort: localData.sort,
|
sort: localData.sort,
|
||||||
types: Object.assign({}, localData.types),
|
types: Object.assign({}, localData.types),
|
||||||
page: options.key ? 1 : localData.page
|
page: options.key ? 1 : localData.page
|
||||||
}, dialog.element.querySelector(".b3-dialog__body"), () => {
|
}, dialog.element.querySelector(".b3-dialog__body"), () => {
|
||||||
dialog.destroy({focus: "false"});
|
dialog.destroy({focus: "false"});
|
||||||
});
|
});
|
||||||
|
Loading…
Reference in New Issue
Block a user