@@ -14,6 +14,7 @@ import (
1414 "github.com/88250/lute/lex"
1515 "github.com/88250/lute/render"
1616 luteUtil "github.com/88250/lute/util"
17+ "github.com/PuerkitoBio/goquery"
1718 "github.com/siyuan-note/oceanpress/src/conf"
1819 structAll "github.com/siyuan-note/oceanpress/src/struct"
1920 "github.com/siyuan-note/oceanpress/src/util"
@@ -65,11 +66,36 @@ func (r *OceanPressRender) Render() (html string, xml string) {
6566
6667 return html , xml
6768}
68- func (r * OceanPressRender ) renderIFrame (node * ast.Node , entering bool ) ast.WalkStatus {
69+
70+ func (r * OceanPressRender ) renderWidget (node * ast.Node , entering bool ) ast.WalkStatus {
6971 if entering {
7072 attr := [][]string {{"class" , "iframe" }}
7173 // 添加自定义属性
7274 attr = append (attr , node .KramdownIAL ... )
75+ htmlStr := node .TokensStr ()
76+ dom , err := goquery .NewDocumentFromReader (strings .NewReader (htmlStr ))
77+ if err == nil {
78+ iframe := dom .Find ("iframe" )
79+ src , exists := iframe .Attr ("src" )
80+ if exists {
81+ localPrefix := "http://127.0.0.1:6806/"
82+ if strings .HasPrefix (src , localPrefix ) {
83+ src = src [len (localPrefix ):]
84+ if strings .HasSuffix (src , "/" ) {
85+ src += "index.html"
86+ } else if ! strings .HasSuffix (src , ".html" ) {
87+ src += "/index.html"
88+ }
89+ iframe .SetAttr ("src" , r .context .BaseEntity .RootPath ()+ "assets/" + src )
90+ }
91+ html , err := goquery .OuterHtml (iframe )
92+ if err == nil {
93+ node .Tokens = []byte (html )
94+ }
95+ }
96+ } else {
97+ util .Warn ("renderWidget" , err )
98+ }
7399 r .Tag ("div" , attr , false )
74100 tokens := node .Tokens
75101 if r .Options .Sanitize {
@@ -205,7 +231,7 @@ func (r *OceanPressRender) renderNodeToHTML(node *ast.Node, headerIncludes bool)
205231 }
206232 }
207233
208- renderer := NewOceanPressRenderer (r .Tree , (* Options )(r .context . LuteEngine . RenderOptions ), r .context )
234+ renderer := NewOceanPressRenderer (r .Tree , (* Options )(r .Options ), r .context )
209235 // renderer2 := render.NewFormatRenderer(tree, luteEngine.RenderOptions)
210236 renderer .Writer = & bytes.Buffer {}
211237 // renderer.NodeWriterStack = append(renderer.NodeWriterStack, renderer.Writer) // 因为有可能不是从 root 开始渲染，所以需要初始化
@@ -475,7 +501,6 @@ func (r *OceanPressRender) Tag(name string, attrs [][]string, selfclosing bool)
475501 }
476502 id , idIndex , _ := FindAttr (attrs , "id" )
477503 nId , nIdIndex , _ := FindAttr (attrs , "data-n-id" )
478-
479504 var attrsTemp [][]string
480505 if idIndex != nIdIndex && id == nId && id != "" {
481506 for i , v := range attrs {
@@ -648,13 +673,6 @@ func headingChildren(heading *ast.Node) (ret []*ast.Node) {
648673 ret = append (ret , blocks ... )
649674 return
650675}
651- func getRootByNode (node * ast.Node ) * ast.Node {
652- if node .Parent == nil {
653- return node
654- } else {
655- return getRootByNode (node .Parent )
656- }
657- }
658676
659677// getAllNextByNode 获取一个节点的 所有后续节点
660678func getAllNextByNode (node * ast.Node ) []* ast.Node {
0 commit comments