gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-03-01 14:22:32 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

mermaid layout improvements

Browse Source
This commit is contained in:
zadam 2021-09-30 10:18:03 +02:00
parent f4dde84f06
commit af3fd61974
7 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/public/app/entities/note_short.js
View File

@ -16,7 +16,7 @@ const NOTE_TYPE_ICONS = {
"relation-map": "bx bx-map-alt", "relation-map": "bx bx-map-alt",
"book": "bx bx-book", "book": "bx bx-book",
"note-map": "bx bx-map-alt", "note-map": "bx bx-map-alt",
"mermaid": "bx bx-water" "mermaid": "bx bx-selection"
}; };
/** /**

11
src/public/app/services/note_content_renderer.js
View File

@ -86,14 +86,15 @@ async function getRenderedContent(note, options = {}) {
await libraryLoader.requireLibrary(libraryLoader.MERMAID); await libraryLoader.requireLibrary(libraryLoader.MERMAID);
const noteComplement = await froca.getNoteComplement(note.noteId); const noteComplement = await froca.getNoteComplement(note.noteId);
const graph = noteComplement.content || ""; const content = noteComplement.content || "";
const updateWithContent = (content) => { $renderedContent
$renderedContent.append($(content)) .css("display", "flex")
} .css("justify-content", "space-around");
try { try {
mermaid.mermaidAPI.render('graphDiv', graph, updateWithContent); mermaid.mermaidAPI.render("mermaid-graph", content,
content => $renderedContent.append($(content)));
} catch (e) { } catch (e) {
const $error = $("<p>The diagram could not displayed.</p>"); const $error = $("<p>The diagram could not displayed.</p>");

10
src/public/app/services/note_create.js
View File

@ -32,6 +32,16 @@ async function createNote(parentNotePath, options = {}) {
const parentNoteId = treeService.getNoteIdFromNotePath(parentNotePath); const parentNoteId = treeService.getNoteIdFromNotePath(parentNotePath);
console.log(options);
if (options.type === 'mermaid' && !options.content) {
options.content = `graph TD;
A-->B;
A-->C;
B-->D;
C-->D;`
}
const {note, branch} = await server.post(`notes/${parentNoteId}/children?target=${options.target}&targetBranchId=${options.targetBranchId}`, { const {note, branch} = await server.post(`notes/${parentNoteId}/children?target=${options.target}&targetBranchId=${options.targetBranchId}`, {
title: newNoteName, title: newNoteName,
content: options.content || "", content: options.content || "",

2
src/public/app/services/tree_context_menu.js
View File

@ -33,7 +33,7 @@ class TreeContextMenu {
{ title: "Note Map", command: command, type: "note-map", uiIcon: "map-alt" }, { title: "Note Map", command: command, type: "note-map", uiIcon: "map-alt" },
{ title: "Render HTML note", command: command, type: "render", uiIcon: "extension" }, { title: "Render HTML note", command: command, type: "render", uiIcon: "extension" },
{ title: "Book", command: command, type: "book", uiIcon: "book" }, { title: "Book", command: command, type: "book", uiIcon: "book" },
{ title: "Mermaid diagram", command: command, type: "mermaid", uiIcon: "water" } { title: "Mermaid diagram", command: command, type: "mermaid", uiIcon: "selection" }
]; ];
} }

2
src/public/app/widgets/mermaid.js
View File

@ -63,7 +63,7 @@ export default class MermaidWidget extends NoteContextAwareWidget {
this.$errorContainer.hide(); this.$errorContainer.hide();
} catch (e) { } catch (e) {
this.$errorMessage.text(e.message); this.$errorMessage.text(e.message).append(`<br/><br/><p>See <a href="https://mermaid-js.github.io/mermaid/#/flowchart?id=graph">help and examples</a>.</p>`);
this.$errorContainer.show(); this.$errorContainer.show();
} }
} }

4
src/services/notes.js
View File

@ -50,7 +50,7 @@ function deriveMime(type, mime) {
if (type === 'text') { if (type === 'text') {
mime = 'text/html'; mime = 'text/html';
} else if (type === 'code') { } else if (type === 'code' || type === 'mermaid') {
mime = 'text/plain'; mime = 'text/plain';
} else if (['relation-map', 'search'].includes(type)) { } else if (['relation-map', 'search'].includes(type)) {
mime = 'application/json'; mime = 'application/json';
@ -115,6 +115,8 @@ function createNewNote(params) {
mime: deriveMime(params.type, params.mime) mime: deriveMime(params.type, params.mime)
}).save(); }).save();
console.log(params);
note.setContent(params.content); note.setContent(params.content);
const branch = new Branch({ const branch = new Branch({

2
src/services/utils.js
View File

@ -168,7 +168,7 @@ const STRING_MIME_TYPES = [
function isStringNote(type, mime) { function isStringNote(type, mime) {
// render and book are string note in the sense that they are expected to contain empty string // render and book are string note in the sense that they are expected to contain empty string
return ["text", "code", "relation-map", "search", "render", "book"].includes(type) return ["text", "code", "relation-map", "search", "render", "book", "mermaid"].includes(type)
|| mime.startsWith('text/') || mime.startsWith('text/')
|| STRING_MIME_TYPES.includes(mime); || STRING_MIME_TYPES.includes(mime);
} }