diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 770f6b109..e603cdaf5 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -1,7 +1,8 @@ { + "docNameAndContent": "Doc Name and Content", "breadcrumb": "Breadcrumb", "embedBlockBreadcrumb": "Embed Block Breadcrumb", - "embedBlockBreadcrumbTip": "After enabling embed block will show breadcrumbs", + "embedBlockBreadcrumbTip": "After enabling embed blocks will display breadcrumbs, embed blocks in super blocks ignore this option and never show breadcrumbs", "appearanceMode": "Appearance Mode", "editMode": "Edit Mode", "editReadonly": "Read-only mode", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 88ba0f44c..a0fc214ed 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1,7 +1,8 @@ { + "docNameAndContent": "Nombre y contenido del documento", "miga de pan": "Miga de pan", "embedBlockBreadcrumb": "Incrustar migas de pan de bloque", - "embedBlockBreadcrumbTip": "Después de habilitar el bloque incrustado, se mostrarán migas de pan", + "embedBlockBreadcrumbTip": "Después de habilitar los bloques incrustados, se mostrarán migas de pan, incrustar bloques en superbloques ignora esta opción y nunca muestra migas de pan", "appearanceMode": "Modo de apariencia", "editMode": "Modo de edición", "editReadonly": "Modo de solo lectura", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 2d149807f..9b8b37579 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -1,7 +1,8 @@ { + "docNameAndContent": "Nom et contenu du document", "fil d'Ariane": "Fil d'Ariane", "embedBlockBreadcrumb": "Intégrer le fil d'Ariane du bloc", - "embedBlockBreadcrumbTip": "Après avoir activé le bloc d'intégration, le fil d'Ariane s'affichera", + "embedBlockBreadcrumbTip": "Après avoir activé l'intégration, les blocs afficheront le fil d'Ariane, intégrer des blocs dans des super blocs ignorent cette option et n'affichent jamais le fil d'Ariane", "appearanceMode": "Mode d'apparence", "editMode": "Mode d'édition", "editReadonly": "Mode lecture seule", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index b777385b5..991f44294 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1,7 +1,8 @@ { + "docNameAndContent": "文檔名和內容", "breadcrumb": "麵包屑", "embedBlockBreadcrumb": "嵌入塊麵包屑", - "embedBlockBreadcrumbTip": "啟用後嵌入塊將顯示麵包屑", + "embedBlockBreadcrumbTip": "啟用後嵌入塊將顯示麵包屑,在超級塊中的嵌入塊忽略該選項,始終不顯示麵包屑", "appearanceMode": "外觀模式", "editMode": "編輯模式", "editReadonly": "只讀模式", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 92fb27ff3..0714507d9 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1,7 +1,8 @@ { + "docNameAndContent": "文档名和内容", "breadcrumb": "面包屑", "embedBlockBreadcrumb": "嵌入块面包屑", - "embedBlockBreadcrumbTip": "启用后嵌入块将显示面包屑", + "embedBlockBreadcrumbTip": "启用后嵌入块将显示面包屑,在超级块中的嵌入块忽略该选项,始终不显示面包屑", "appearanceMode": "外观模式", "editMode": "编辑模式", "editReadonly": "只读模式", diff --git a/app/src/protyle/markdown/blockRender.ts b/app/src/protyle/markdown/blockRender.ts index 23fdce070..e3049e8ce 100644 --- a/app/src/protyle/markdown/blockRender.ts +++ b/app/src/protyle/markdown/blockRender.ts @@ -33,6 +33,7 @@ export const blockRender = (protyle: IProtyle, element: Element) => { breadcrumb = window.siyuan.config.editor.embedBlockBreadcrumb } fetchPost("/api/search/searchEmbedBlock", { + embedBlockID: item.getAttribute("data-node-id"), stmt: content, headingMode: item.getAttribute("custom-heading-mode") === "1" ? 1 : 0, excludeIDs: [item.getAttribute("data-node-id"), protyle.block.rootID], diff --git a/app/src/util/history.ts b/app/src/util/history.ts index 93dcecb06..91796dcec 100644 --- a/app/src/util/history.ts +++ b/app/src/util/history.ts @@ -29,7 +29,7 @@ const renderDoc = (element: HTMLElement, currentPage: number) => { const mdElement = element.querySelector('.history__text[data-type="mdPanel"]') as HTMLTextAreaElement; docElement.classList.add("fn__none"); mdElement.classList.add("fn__none"); - if (typeElement.value === "0") { + if (typeElement.value === "0" || typeElement.value === "1") { opElement.removeAttribute("disabled"); notebookElement.removeAttribute("disabled"); assetElement.classList.add("fn__none"); @@ -65,7 +65,7 @@ const renderDoc = (element: HTMLElement, currentPage: number) => { if (item.items.length > 0) { logsHTML += `