diff --git a/app/src/assets/scss/_dialog.scss b/app/src/assets/scss/_dialog.scss index e72517c22..794e3255b 100644 --- a/app/src/assets/scss/_dialog.scss +++ b/app/src/assets/scss/_dialog.scss @@ -126,12 +126,8 @@ } &__cardblock { - .protyle-wysiwyg { - padding: 16px; - - [data-node-id][custom-riff-decks] { - box-shadow: none; - } + .protyle-wysiwyg [data-node-id][custom-riff-decks] { + box-shadow: none; } &--show span[data-type~=mark] { diff --git a/app/src/card/openCard.ts b/app/src/card/openCard.ts index 0af13201d..81462adab 100644 --- a/app/src/card/openCard.ts +++ b/app/src/card/openCard.ts @@ -51,14 +51,17 @@ export const openCard = () => { render: { background: false, title: false, - gutter: true, + gutter: false, breadcrumbDocName: true, - breadcrumbContext: true, }, typewriterMode: false }); if (blocks.length > 0) { - fetchPost("/api/riff/renderRiffCard", {blockID: blocks[index].blockID}, (response) => { + fetchPost("/api/filetree/getDoc", { + id: blocks[index].blockID, + mode: 0, + size: Constants.SIZE_GET_MAX + }, (response) => { onGet(response, editor.protyle, [Constants.CB_GET_ALL, Constants.CB_GET_HTML]); }); } @@ -76,7 +79,11 @@ export const openCard = () => { editor.protyle.element.classList.remove("fn__none"); editor.protyle.element.nextElementSibling.classList.add("fn__none"); actionElement.classList.remove("fn__none"); - fetchPost("/api/riff/renderRiffCard", {blockID: blocks[index].blockID}, (response) => { + fetchPost("/api/filetree/getDoc", { + id: blocks[index].blockID, + mode: 0, + size: Constants.SIZE_GET_MAX + }, (response) => { onGet(response, editor.protyle, [Constants.CB_GET_ALL, Constants.CB_GET_HTML]); }); } else { @@ -132,7 +139,11 @@ export const openCard = () => { return; } countElement.firstElementChild.innerHTML = (index + 1).toString(); - fetchPost("/api/riff/renderRiffCard", {blockID: blocks[index].blockID}, (response) => { + fetchPost("/api/filetree/getDoc", { + id: blocks[index].blockID, + mode: 0, + size: Constants.SIZE_GET_MAX + }, (response) => { onGet(response, editor.protyle, [Constants.CB_GET_ALL, Constants.CB_GET_HTML]); }); }); diff --git a/app/src/mobile/util/touch.ts b/app/src/mobile/util/touch.ts index e371f51da..97fd224e6 100644 --- a/app/src/mobile/util/touch.ts +++ b/app/src/mobile/util/touch.ts @@ -7,7 +7,10 @@ let yDiff: number; export const handleTouchEnd = () => { if (window.siyuan.mobileEditor) { - window.siyuan.mobileEditor.protyle.breadcrumb?.show(); + document.querySelectorAll(".protyle-breadcrumb__bar--hide").forEach(item => { + item.classList.remove("protyle-breadcrumb__bar--hide") + }) + window.siyuan.hideBreadcrumb = false; } if (!clientX || !clientY || navigator.userAgent.indexOf("iPhone") === -1) { diff --git a/app/src/protyle/breadcrumb/index.ts b/app/src/protyle/breadcrumb/index.ts index 6fd8e9ce0..8d7b31805 100644 --- a/app/src/protyle/breadcrumb/index.ts +++ b/app/src/protyle/breadcrumb/index.ts @@ -359,6 +359,7 @@ export class Breadcrumb {