♻️ https://github.com/siyuan-note/siyuan/issues/2829

app/src/ai/actions.ts

@@ -5,9 +5,9 @@ import {insertHTML} from "../protyle/util/insertHTML";
 import {Dialog} from "../dialog";
 import {isMobile} from "../util/functions";
 import {getContenteditableElement} from "../protyle/wysiwyg/getBlock";
-import {blockRender} from "../protyle/markdown/blockRender";
+import {blockRender} from "../protyle/render/blockRender";
 import {processRender} from "../protyle/util/processCode";
-import {highlightRender} from "../protyle/markdown/highlightRender";
+import {highlightRender} from "../protyle/render/highlightRender";
 import {Constants} from "../constants";
 import {setStorageVal} from "../protyle/util/compatibility";
 import {hasClosestByClassName} from "../protyle/util/hasClosest";

app/src/block/util.ts

@@ -6,7 +6,7 @@ import {transaction, updateTransaction} from "../protyle/wysiwyg/transaction";
 import {scrollCenter} from "../util/highlightById";
 import {Constants} from "../constants";
 import {hideElements} from "../protyle/ui/hideElements";
-import {blockRender} from "../protyle/markdown/blockRender";
+import {blockRender} from "../protyle/render/blockRender";
 
 export const cancelSB = (protyle: IProtyle, nodeElement: Element) => {
     const doOperations: IOperation[] = [];

app/src/boot/openChangelog.ts

@@ -1,6 +1,6 @@
 import {fetchPost} from "../util/fetch";
 import {Dialog} from "../dialog";
-import {highlightRender} from "../protyle/markdown/highlightRender";
+import {highlightRender} from "../protyle/render/highlightRender";
 import {isMobile} from "../util/functions";
 
 export const openChangelog = () => {

app/src/config/bazaar.ts

@@ -2,7 +2,7 @@ import {appearance} from "./appearance";
 import {showMessage} from "../dialog/message";
 import {fetchPost} from "../util/fetch";
 import {confirmDialog} from "../dialog/confirmDialog";
-import {highlightRender} from "../protyle/markdown/highlightRender";
+import {highlightRender} from "../protyle/render/highlightRender";
 import {exportLayout} from "../layout/util";
 import {Constants} from "../constants";
 /// #if !BROWSER

app/src/menus/protyle.ts

@@ -14,7 +14,7 @@ import {
     moveRowToUp,
     setTableAlign
 } from "../protyle/util/table";
-import {mathRender} from "../protyle/markdown/mathRender";
+import {mathRender} from "../protyle/render/mathRender";
 import {transaction, updateTransaction} from "../protyle/wysiwyg/transaction";
 import {openMenu} from "./commonMenuItem";
 import {fetchPost} from "../util/fetch";
@@ -31,9 +31,9 @@ import {openNewWindowById} from "../window/openNewWindow";
 /// #endif
 import {getSearch, isMobile} from "../util/functions";
 import {removeFoldHeading} from "../protyle/util/heading";
-import {lineNumberRender} from "../protyle/markdown/highlightRender";
+import {lineNumberRender} from "../protyle/render/highlightRender";
 import * as dayjs from "dayjs";
-import {blockRender} from "../protyle/markdown/blockRender";
+import {blockRender} from "../protyle/render/blockRender";
 import {renameAsset} from "../editor/rename";
 import {electronUndo} from "../protyle/undo";
 import {pushBack} from "../mobile/util/MobileBackFoward";

app/src/mobile/util/MobileBackFoward.ts

@@ -4,8 +4,8 @@ import {setEditMode} from "../../protyle/util/setEditMode";
 import {fetchPost} from "../../util/fetch";
 import {zoomOut} from "../../menus/protyle";
 import {processRender} from "../../protyle/util/processCode";
-import {highlightRender} from "../../protyle/markdown/highlightRender";
+import {highlightRender} from "../../protyle/render/highlightRender";
-import {blockRender} from "../../protyle/markdown/blockRender";
+import {blockRender} from "../../protyle/render/blockRender";
 import {disabledForeverProtyle, disabledProtyle, enableProtyle} from "../../protyle/util/onGet";
 import {setStorageVal} from "../../protyle/util/compatibility";
 import {closePanel} from "./closePanel";

app/src/protyle/export/util.ts

@@ -9,7 +9,7 @@ import {Dialog} from "../../dialog";
 import {addScript} from "../util/addScript";
 import {isMobile} from "../../util/functions";
 import {Constants} from "../../constants";
-import {highlightRender} from "../markdown/highlightRender";
+import {highlightRender} from "../render/highlightRender";
 import {processRender} from "../util/processCode";
 import {openByMobile, setStorageVal} from "../util/compatibility";
 

app/src/protyle/gutter/index.ts

@@ -15,8 +15,8 @@ import {removeBlock} from "../wysiwyg/remove";
 import {focusBlock, focusByRange, focusByWbr, getEditorRange} from "../util/selection";
 import {hideElements} from "../ui/hideElements";
 import {processRender} from "../util/processCode";
-import {highlightRender} from "../markdown/highlightRender";
+import {highlightRender} from "../render/highlightRender";
-import {blockRender} from "../markdown/blockRender";
+import {blockRender} from "../render/blockRender";
 import {removeEmbed} from "../wysiwyg/removeEmbed";
 import {getContenteditableElement, getTopAloneElement, isNotEditBlock} from "../wysiwyg/getBlock";
 import * as dayjs from "dayjs";
@@ -28,7 +28,7 @@ import {openFileById} from "../../editor/util";
 /// #endif
 import {Constants} from "../../constants";
 import {openMobileFileById} from "../../mobile/editor";
-import {mathRender} from "../markdown/mathRender";
+import {mathRender} from "../render/mathRender";
 import {duplicateBlock} from "../wysiwyg/commonHotkey";
 import {movePathTo} from "../../util/pathName";
 import {hintMoveBlock} from "../hint/extend";

app/src/protyle/hint/extend.ts

@@ -2,10 +2,10 @@ import {fetchPost} from "../../util/fetch";
 import {insertHTML} from "../util/insertHTML";
 import {getIconByType} from "../../editor/getIcon";
 import {updateHotkeyTip} from "../util/compatibility";
-import {blockRender} from "../markdown/blockRender";
+import {blockRender} from "../render/blockRender";
 import {Constants} from "../../constants";
 import {processRender} from "../util/processCode";
-import {highlightRender} from "../markdown/highlightRender";
+import {highlightRender} from "../render/highlightRender";
 import {focusBlock, focusByRange, getEditorRange} from "../util/selection";
 import {hasClosestBlock, hasClosestByClassName} from "../util/hasClosest";
 import {getContenteditableElement, getTopAloneElement} from "../wysiwyg/getBlock";
@@ -46,11 +46,11 @@ export const hintSlash = (key: string, protyle: IProtyle) => {
         value: Constants.ZWSP + 5,
         html: '<div class="b3-list-item__first"><svg class="b3-list-item__graphic"><use xlink:href="#iconSparkles"></use></svg><span class="b3-list-item__text">AI Chat</span></div>',
     },
-    // {
+    {
-    //     filter: ["属性视图", "shuxingshitu", "sxst", "attribute view"],
+        filter: ["属性视图", "shuxingshitu", "sxst", "attribute view"],
-    //     value: '<div data-type="NodeAttributeView" data-av-type="table"></div>',
+        value: '<div data-type="NodeAttributeView" data-av-type="table"></div>',
-    //     html: `<div class="b3-list-item__first"><svg class="b3-list-item__graphic"><use xlink:href="#iconDatabase"></use></svg><span class="b3-list-item__text">${window.siyuan.languages.attributeView}</span></div>`,
+        html: `<div class="b3-list-item__first"><svg class="b3-list-item__graphic"><use xlink:href="#iconDatabase"></use></svg><span class="b3-list-item__text">${window.siyuan.languages.attributeView}</span></div>`,
-    // },
+    },
     {
         filter: ["文档", "子文档", "wendang", "wd", "ziwendang", "zwd", "xjwd"],
         value: Constants.ZWSP + 4,

app/src/protyle/hint/index.ts

@@ -15,13 +15,13 @@ import {setPosition} from "../../util/setPosition";
 import {getContenteditableElement, hasNextSibling, hasPreviousSibling} from "../wysiwyg/getBlock";
 import {transaction, updateTransaction} from "../wysiwyg/transaction";
 import {insertHTML} from "../util/insertHTML";
-import {highlightRender} from "../markdown/highlightRender";
+import {highlightRender} from "../render/highlightRender";
 import {imgMenu} from "../../menus/protyle";
 import {hideElements} from "../ui/hideElements";
 import {fetchPost} from "../../util/fetch";
 import {getDisplayName, pathPosix} from "../../util/pathName";
 import {addEmoji, filterEmoji, lazyLoadEmoji, lazyLoadEmojiImg, unicode2Emoji} from "../../emoji";
-import {blockRender} from "../markdown/blockRender";
+import {blockRender} from "../render/blockRender";
 import {uploadFiles} from "../upload";
 /// #if !MOBILE
 import {openFileById} from "../../editor/util";

app/src/protyle/index.ts

@@ -1,6 +1,6 @@
 import {Constants} from "../constants";
 import {Hint} from "./hint";
-import {setLute} from "./markdown/setLute";
+import {setLute} from "./render/setLute";
 import {Preview} from "./preview";
 import {addLoading, initUI, removeLoading, setPadding} from "./ui/initUI";
 import {Undo} from "./undo";

app/src/protyle/preview/index.ts

@@ -15,8 +15,8 @@ import {openAsset, openBy} from "../../editor/util";
 /// #endif
 import {fetchPost} from "../../util/fetch";
 import {processRender} from "../util/processCode";
-import {highlightRender} from "../markdown/highlightRender";
+import {highlightRender} from "../render/highlightRender";
-import {speechRender} from "../markdown/speechRender";
+import {speechRender} from "../render/speechRender";
 
 export class Preview {
     public element: HTMLElement;

app/src/protyle/toolbar/index.ts

@@ -17,12 +17,12 @@ import {updateTransaction} from "../wysiwyg/transaction";
 import {Constants} from "../../constants";
 import {getEventName, openByMobile, setStorageVal} from "../util/compatibility";
 import {upDownHint} from "../../util/upDownHint";
-import {highlightRender} from "../markdown/highlightRender";
+import {highlightRender} from "../render/highlightRender";
 import {getContenteditableElement, hasNextSibling, hasPreviousSibling} from "../wysiwyg/getBlock";
 import {processRender} from "../util/processCode";
 import {BlockRef} from "./BlockRef";
 import {hintRenderAssets, hintRenderTemplate, hintRenderWidget} from "../hint/extend";
-import {blockRender} from "../markdown/blockRender";
+import {blockRender} from "../render/blockRender";
 /// #if !BROWSER
 import {openBy} from "../../editor/util";
 /// #endif
@@ -41,7 +41,7 @@ import {previewTemplate} from "./util";
 import {hideMessage, showMessage} from "../../dialog/message";
 import {InlineMath} from "./InlineMath";
 import {InlineMemo} from "./InlineMemo";
-import {mathRender} from "../markdown/mathRender";
+import {mathRender} from "../render/mathRender";
 import {linkMenu} from "../../menus/protyle";
 import {addScript} from "../util/addScript";
 import {confirmDialog} from "../../dialog/confirmDialog";

app/src/protyle/ui/initUI.ts

@@ -1,5 +1,5 @@
 import {setEditMode} from "../util/setEditMode";
-import {lineNumberRender} from "../markdown/highlightRender";
+import {lineNumberRender} from "../render/highlightRender";
 import {scrollEvent} from "../scroll/event";
 import {isMobile} from "../../util/functions";
 import {Constants} from "../../constants";

app/src/protyle/util/editorCommonEvent.ts

@@ -14,7 +14,7 @@ import {Tab} from "../../layout/Tab";
 import {updatePanelByEditor} from "../../editor/util";
 /// #endif
 import {Editor} from "../../editor";
-import {blockRender} from "../markdown/blockRender";
+import {blockRender} from "../render/blockRender";
 import {uploadLocalFiles} from "../upload";
 import {insertHTML} from "./insertHTML";
 import {isBrowser} from "../../util/functions";

app/src/protyle/util/insertHTML.ts

@@ -3,9 +3,9 @@ import * as dayjs from "dayjs";
 import {transaction, updateTransaction} from "../wysiwyg/transaction";
 import {getContenteditableElement} from "../wysiwyg/getBlock";
 import {fixTableRange, focusBlock, focusByWbr, getEditorRange} from "./selection";
-import {mathRender} from "../markdown/mathRender";
+import {mathRender} from "../render/mathRender";
 import {Constants} from "../../constants";
-import {highlightRender} from "../markdown/highlightRender";
+import {highlightRender} from "../render/highlightRender";
 import {scrollCenter} from "../../util/highlightById";
 
 export const insertHTML = (html: string, protyle: IProtyle, isBlock = false,

app/src/protyle/util/onGet.ts

@@ -3,8 +3,8 @@ import {Constants} from "../../constants";
 import {hideElements} from "../ui/hideElements";
 import {fetchPost} from "../../util/fetch";
 import {processRender} from "./processCode";
-import {highlightRender} from "../markdown/highlightRender";
+import {highlightRender} from "../render/highlightRender";
-import {blockRender} from "../markdown/blockRender";
+import {blockRender} from "../render/blockRender";
 import {highlightById} from "../../util/highlightById";
 /// #if !MOBILE
 import {pushBack} from "../../util/backForward";

app/src/protyle/util/paste.ts

@@ -7,8 +7,8 @@ import {clipboard} from "electron";
 /// #endif
 import {hasClosestBlock} from "./hasClosest";
 import {getEditorRange} from "./selection";
-import {blockRender} from "../markdown/blockRender";
+import {blockRender} from "../render/blockRender";
-import {highlightRender} from "../markdown/highlightRender";
+import {highlightRender} from "../render/highlightRender";
 import {fetchPost, fetchSyncPost} from "../../util/fetch";
 import {isDynamicRef, isFileAnnotation} from "../../util/functions";
 import {insertHTML} from "./insertHTML";

app/src/protyle/util/processCode.ts

@@ -1,11 +1,11 @@
-import {abcRender} from "../markdown/abcRender";
+import {abcRender} from "../render/abcRender";
-import {chartRender} from "../markdown/chartRender";
+import {chartRender} from "../render/chartRender";
-import {graphvizRender} from "../markdown/graphvizRender";
+import {graphvizRender} from "../render/graphvizRender";
-import {mathRender} from "../markdown/mathRender";
+import {mathRender} from "../render/mathRender";
-import {mermaidRender} from "../markdown/mermaidRender";
+import {mermaidRender} from "../render/mermaidRender";
-import {mindmapRender} from "../markdown/mindmapRender";
+import {mindmapRender} from "../render/mindmapRender";
-import {flowchartRender} from "../markdown/flowchartRender";
+import {flowchartRender} from "../render/flowchartRender";
-import {plantumlRender} from "../markdown/plantumlRender";
+import {plantumlRender} from "../render/plantumlRender";
 import {Constants} from "../../constants";
 
 export const processPasteCode = (html: string, text: string) => {

app/src/protyle/wysiwyg/enter.ts

@@ -9,7 +9,7 @@ import {
 } from "./getBlock";
 import {transaction, updateTransaction} from "./transaction";
 import {breakList, genListItemElement, listOutdent, updateListOrder} from "./list";
-import {highlightRender} from "../markdown/highlightRender";
+import {highlightRender} from "../render/highlightRender";
 import {Constants} from "../../constants";
 import {scrollCenter} from "../../util/highlightById";
 import {hideElements} from "../ui/hideElements";

app/src/protyle/wysiwyg/index.ts

@@ -43,9 +43,9 @@ import {getEnableHTML, removeEmbed} from "./removeEmbed";
 import {keydown} from "./keydown";
 import {openMobileFileById} from "../../mobile/editor";
 import {removeBlock} from "./remove";
-import {highlightRender} from "../markdown/highlightRender";
+import {highlightRender} from "../render/highlightRender";
 import {openAttr} from "../../menus/commonMenuItem";
-import {blockRender} from "../markdown/blockRender";
+import {blockRender} from "../render/blockRender";
 /// #if !MOBILE
 import {getAllModels} from "../../layout/getAll";
 import {pushBack} from "../../util/backForward";

app/src/protyle/wysiwyg/input.ts

@@ -3,11 +3,11 @@ import {focusBlock, focusByWbr} from "../util/selection";
 import {Constants} from "../../constants";
 import * as dayjs from "dayjs";
 import {transaction, updateTransaction} from "./transaction";
-import {mathRender} from "../markdown/mathRender";
+import {mathRender} from "../render/mathRender";
-import {highlightRender} from "../markdown/highlightRender";
+import {highlightRender} from "../render/highlightRender";
 import {getContenteditableElement, getNextBlock, isNotEditBlock} from "./getBlock";
 import {genEmptyBlock} from "../../block/util";
-import {blockRender} from "../markdown/blockRender";
+import {blockRender} from "../render/blockRender";
 import {hideElements} from "../ui/hideElements";
 import {hasClosestByAttribute} from "../util/hasClosest";
 import {fetchPost, fetchSyncPost} from "../../util/fetch";

app/src/protyle/wysiwyg/keydown.ts

@@ -61,7 +61,7 @@ import {fetchPost} from "../../util/fetch";
 import {scrollCenter} from "../../util/highlightById";
 import {BlockPanel} from "../../block/Panel";
 import * as dayjs from "dayjs";
-import {highlightRender} from "../markdown/highlightRender";
+import {highlightRender} from "../render/highlightRender";
 import {countBlockWord} from "../../layout/status";
 import {moveToDown, moveToUp} from "./move";
 import {pasteAsPlainText} from "../util/paste";

app/src/protyle/wysiwyg/renderBacklink.ts

@@ -3,8 +3,8 @@ import {removeLoading} from "../ui/initUI";
 import {fetchPost} from "../../util/fetch";
 import {Constants} from "../../constants";
 import {processRender} from "../util/processCode";
-import {highlightRender} from "../markdown/highlightRender";
+import {highlightRender} from "../render/highlightRender";
-import {blockRender} from "../markdown/blockRender";
+import {blockRender} from "../render/blockRender";
 import {disabledForeverProtyle, disabledProtyle} from "../util/onGet";
 
 export const renderBacklink = (protyle: IProtyle, backlinkData: {

app/src/protyle/wysiwyg/transaction.ts

@@ -2,9 +2,9 @@ import {fetchPost} from "../../util/fetch";
 import {focusBlock, focusByWbr, focusSideBlock, getEditorRange} from "../util/selection";
 import {getTopAloneElement} from "./getBlock";
 import {Constants} from "../../constants";
-import {blockRender} from "../markdown/blockRender";
+import {blockRender} from "../render/blockRender";
 import {processRender} from "../util/processCode";
-import {highlightRender} from "../markdown/highlightRender";
+import {highlightRender} from "../render/highlightRender";
 import {hasClosestBlock, hasClosestByAttribute} from "../util/hasClosest";
 import {setFold} from "../../menus/protyle";
 import {onGet} from "../util/onGet";

app/src/util/Tree.ts

@@ -1,7 +1,7 @@
 import {getIconByType} from "../editor/getIcon";
 import {hasClosestByMatchTag, hasClosestByTag} from "../protyle/util/hasClosest";
 import {isMobile} from "./functions";
-import {mathRender} from "../protyle/markdown/mathRender";
+import {mathRender} from "../protyle/render/mathRender";
 import {unicode2Emoji} from "../emoji";
 import {Constants} from "../constants";