+
diff --git a/app/src/mobile/dock/MobileFiles.ts b/app/src/mobile/dock/MobileFiles.ts
index 82814985cea..efafe512f05 100644
--- a/app/src/mobile/dock/MobileFiles.ts
+++ b/app/src/mobile/dock/MobileFiles.ts
@@ -4,6 +4,7 @@ import {Model} from "../../layout/Model";
import {Constants} from "../../constants";
import {getDisplayName, pathPosix, setNoteBook} from "../../util/pathName";
import {initFileMenu, initNavigationMenu, sortMenu} from "../../menus/navigation";
+import {getPublishAccessOption, getPublishAccessOptionByLevel, openPublishAccessDialog} from "../../dialog/publishAccessDialog";
import {fetchPost, fetchSyncPost} from "../../util/fetch";
import {genUUID} from "../../util/genID";
import {openMobileFileById} from "../editor";
@@ -92,6 +93,7 @@ export class MobileFiles extends Model {
+
@@ -148,6 +150,39 @@ export class MobileFiles extends Model {
});
event.preventDefault();
break;
+ } else if (type === "publish-access") {
+ if (target.classList.contains("b3-list-item__switch")) {
+ // 文档/笔记本前的按钮
+ let targetId = target.parentElement.getAttribute("data-node-id") || target.parentElement.parentElement.getAttribute("data-url");
+ const rect = target.getBoundingClientRect();
+ openPublishAccessDialog(targetId, {
+ x: rect.left,
+ y: rect.bottom,
+ h: rect.height,
+ w: rect.width,
+ }, (access: { id: string, visible: boolean, password: string, disable: boolean, iconHTML: string }) => {
+ target.innerHTML = access.iconHTML;
+ fetchPost("/api/filetree/setPublishAccess", {
+ id: access.id,
+ visible: access.visible,
+ password: access.password,
+ disable: access.disable,
+ });
+ });
+ } else {
+ // 顶部栏中的按钮
+ target.classList.toggle("block__icon--active")
+ const editingPublishAccess = target.classList.contains("block__icon--active");
+ this.element.querySelectorAll(".b3-list-item__icon").forEach(item => {
+ item.classList.toggle("fn__none", editingPublishAccess);
+ });
+ this.element.querySelectorAll('.b3-list-item__switch[data-type="publish-access"]').forEach(item => {
+ item.classList.toggle("fn__none", !editingPublishAccess);
+ });
+ }
+ event.preventDefault();
+ event.stopPropagation();
+ break;
} else if (type === "sort") {
this.genSort();
event.preventDefault();
@@ -298,13 +333,16 @@ export class MobileFiles extends Model {
}
private genNotebook(item: INotebook) {
- const emojiHTML = `
${unicode2Emoji(item.icon || window.siyuan.storage[Constants.LOCAL_IMAGES].note)}`;
+ const editingPublishAccess = this.actionsElement.querySelector('[data-type="publish-access"]').classList.contains("block__icon--active");
+ const emojiHTML = `
${unicode2Emoji(item.icon || window.siyuan.storage[Constants.LOCAL_IMAGES].note)}`;
+ const switchHTML = `
${getPublishAccessOptionByLevel("public").iconHTML}`;
if (item.closed) {
return `
${emojiHTML}
+ ${switchHTML}
${escapeHtml(item.name)}
@@ -317,6 +355,7 @@ export class MobileFiles extends Model {
${emojiHTML}
+ ${switchHTML}
${escapeHtml(item.name)}
@@ -354,6 +393,7 @@ export class MobileFiles extends Model {
this.selectItem(item.notebookId, openPath, undefined, false, false);
});
});
+ this.refreshPublishAccessSwitchs();
if (!init) {
return;
}
@@ -557,6 +597,7 @@ export class MobileFiles extends Model {
}
});
nextElement.innerHTML = tempElement.innerHTML;
+ this.refreshPublishAccessSwitchs();
return;
}
liElement.querySelector(".b3-list-item__arrow").classList.add("b3-list-item__arrow--open");
@@ -571,6 +612,7 @@ export class MobileFiles extends Model {
});
}, 120);
}, 2);
+ this.refreshPublishAccessSwitchs();
}
private async onLsSelect(data: {
@@ -705,6 +747,7 @@ export class MobileFiles extends Model {
});
liElement = await this.onLsSelect(response.data, filePath, setStorage, isSetCurrent);
}
+ this.refreshPublishAccessSwitchs();
return liElement;
}
@@ -748,12 +791,14 @@ export class MobileFiles extends Model {
if (item.count && item.count > 0) {
countHTML = `${item.count}`;
}
+ const editingPublishAccess = this.actionsElement.querySelector('[data-type="publish-access"]').classList.contains("block__icon--active");
return `
- ${unicode2Emoji(item.icon || (item.subFileCount === 0 ? window.siyuan.storage[Constants.LOCAL_IMAGES].file : window.siyuan.storage[Constants.LOCAL_IMAGES].folder))}
+ ${unicode2Emoji(item.icon || (item.subFileCount === 0 ? window.siyuan.storage[Constants.LOCAL_IMAGES].file : window.siyuan.storage[Constants.LOCAL_IMAGES].folder))}
+ ${getPublishAccessOptionByLevel("public").iconHTML}
${getDisplayName(item.name, true, true)}
@@ -764,4 +809,25 @@ class="b3-list-item" data-path="${item.path}">
${countHTML}
`;
};
+
+ private refreshPublishAccessSwitchs() {
+ if (window.siyuan.config.readonly) {
+ return;
+ }
+
+ let ids: string[] = [];
+ this.element.querySelectorAll("[data-url]").forEach((element: HTMLElement) => ids.push(element.getAttribute("data-url")))
+ this.element.querySelectorAll("[data-node-id]").forEach((element: HTMLElement) => ids.push(element.getAttribute("data-node-id")))
+ fetchPost("/api/filetree/getPublishAccess", {
+ ids: ids
+ }, response => {
+ response.data.publishAccess.forEach((item : { id: string, visible: boolean, password: string, disable: boolean }) => {
+ const element = this.element.querySelector(`[data-url="${item.id}"]`) || this.element.querySelector(`[data-node-id="${item.id}"]`)
+ if (element) {
+ const publishAccessElement = element.querySelector(`[data-type="publish-access"]`) as HTMLElement;
+ publishAccessElement.innerHTML = getPublishAccessOption(item.visible, item.password, item.disable).iconHTML;
+ }
+ });
+ })
+ }
}
diff --git a/app/src/mobile/menu/index.ts b/app/src/mobile/menu/index.ts
index 713f016078f..8babc848247 100644
--- a/app/src/mobile/menu/index.ts
+++ b/app/src/mobile/menu/index.ts
@@ -72,7 +72,7 @@ export const initRightMenu = (app: App) => {
-