Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-11 09:44:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2024-04-26 10:22:12 +08:00
commit 53f5b08038
13 changed files with 212 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/dialog/processSystem.ts
View file

@ -284,6 +284,7 @@ export const progressStatus = (data: IWebSocketData) => {
if (!statusElement) {
return;
}
if (isMobile()) {
if (!document.querySelector("#keyboardToolbar").classList.contains("fn__none")) {
return;
@ -293,7 +294,7 @@ export const progressStatus = (data: IWebSocketData) => {
statusElement.style.bottom = "0";
statusTimeout = window.setTimeout(() => {
statusElement.style.bottom = "";
}, 5000);
}, 7000);
} else {
const msgElement = statusElement.querySelector(".status__msg");
if (msgElement) {
@ -301,7 +302,7 @@ export const progressStatus = (data: IWebSocketData) => {
msgElement.innerHTML = data.msg;
statusTimeout = window.setTimeout(() => {
msgElement.innerHTML = "";
}, 5000);
}, 7000);
}
}
};

8
app/src/menus/onGetnotebookconf.ts
View file

@ -20,14 +20,14 @@ declare interface INotebookConf {
}
}
export const genNotebookOption = (id: string) => {
export const genNotebookOption = (id: string, notebookId?: string) => {
let html = `<option value="">${window.siyuan.languages.currentNotebook}</option>`;
const helpIds: string[] = [];
Object.keys(Constants.HELP_PATH).forEach((key: "zh_CN") => {
helpIds.push(Constants.HELP_PATH[key]);
});
window.siyuan.notebooks.forEach((item) => {
if (helpIds.includes(item.id)) {
if (helpIds.includes(item.id) || item.id === notebookId) {
return;
}
html += `<option value="${item.id}" ${id === item.id ? "selected" : ""}>${item.name}</option>`;
@ -45,7 +45,7 @@ export const onGetnotebookconf = (data: INotebookConf) => {
<div class="b3-label__text">${window.siyuan.languages.fileTree13}</div>
<span class="fn__hr"></span>
<div class="fn__flex">
<select style="min-width: 200px" class="b3-select" id="docCreateSaveBox">${genNotebookOption(data.conf.docCreateSaveBox)}</select>
<select style="min-width: 200px" class="b3-select" id="docCreateSaveBox">${genNotebookOption(data.conf.docCreateSaveBox, data.box)}</select>
<div class="fn__space"></div>
<input class="b3-text-field fn__flex-1" id="docCreateSavePath" value="">
</div>
@ -55,7 +55,7 @@ export const onGetnotebookconf = (data: INotebookConf) => {
<div class="b3-label__text">${window.siyuan.languages.fileTree6}</div>
<span class="fn__hr"></span>
<div class="fn__flex">
<select style="min-width: 200px" class="b3-select" id="refCreateSaveBox">${genNotebookOption(data.conf.refCreateSaveBox)}</select>
<select style="min-width: 200px" class="b3-select" id="refCreateSaveBox">${genNotebookOption(data.conf.refCreateSaveBox, data.box)}</select>
<div class="fn__space"></div>
<input class="b3-text-field fn__flex-1" id="refCreateSavePath" value="">
</div>

24
app/src/util/newFile.ts
View file

@ -92,6 +92,9 @@ export const newFile = (optios: {
optios.currentPath = resultData.currentPath;
}
fetchPost("/api/filetree/getDocCreateSavePath", {notebook: optios.notebookId}, (data) => {
if (!optios.useSavePath) {
data.data.box = optios.notebookId;
}
if ((data.data.path.indexOf("/") > -1 && optios.useSavePath) || optios.name) {
if (data.data.path.startsWith("/") || optios.currentPath === "/") {
fetchPost("/api/filetree/createDocWithMd", {
@ -138,8 +141,27 @@ export const newFile = (optios: {
if (!validateName(title)) {
return;
}
if (optios.notebookId !== data.data.box) {
fetchPost("/api/filetree/createDocWithMd", {
notebook: data.data.box,
path: pathPosix().join(data.data.path || "/", optios.name || (data.data.path.endsWith("/") ? window.siyuan.languages.untitled : "")),
markdown: ""
}, response => {
/// #if !MOBILE
openFileById({
app: optios.app,
id: response.data,
action: [Constants.CB_GET_HL, Constants.CB_GET_CONTEXT]
});
/// #else
openMobileFileById(optios.app, response.data, [Constants.CB_GET_HL, Constants.CB_GET_CONTEXT]);
/// #endif
});
return;
}
const id = Lute.NewNodeID();
const newPath = optios.notebookId === data.data.box ? (pathPosix().join(getDisplayName(optios.currentPath, false, true), id + ".sy")) : (data.data.path || "/");
const newPath = (pathPosix().join(getDisplayName(optios.currentPath, false, true), id + ".sy"));
if (optios.paths) {
optios.paths[optios.paths.indexOf(undefined)] = newPath;
}