diff --git a/kernel/api/av.go b/kernel/api/av.go index 541b10ac4..1f3cb1b83 100644 --- a/kernel/api/av.go +++ b/kernel/api/av.go @@ -77,7 +77,10 @@ func getAttributeViewAddingBlockDefaultValues(c *gin.Context) { } avID := arg["avID"].(string) - viewID := arg["viewID"].(string) + var viewID string + if viewIDArg := arg["viewID"]; nil != viewIDArg { + viewID = viewIDArg.(string) + } var groupID string if groupIDArg := arg["groupID"]; nil != groupIDArg { groupID = groupIDArg.(string) diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go index a7fba06b1..2795fb0c9 100644 --- a/kernel/model/attribute_view.go +++ b/kernel/model/attribute_view.go @@ -95,7 +95,7 @@ func GetAttrViewAddingBlockDefaultValues(avID, viewID, groupID, previousBlockID, return } - view := attrView.GetView(viewID) + view, _ := attrView.GetCurrentView(viewID) if nil == view { logging.LogErrorf("view [%s] not found in attribute view [%s]", viewID, avID) return diff --git a/kernel/model/export.go b/kernel/model/export.go index d22cebb40..77c7df7cd 100644 --- a/kernel/model/export.go +++ b/kernel/model/export.go @@ -2283,8 +2283,7 @@ func exportTree(tree *parse.Tree, wysiwyg, keepFold, avHiddenCol bool, case 2: // 锚文本块链 blockRefLink := &ast.Node{Type: ast.NodeTextMark, TextMarkTextContent: linkText, TextMarkAHref: "siyuan://blocks/" + defID} blockRefLink.KramdownIAL = n.KramdownIAL - // 除了块引还有其他元素 https://github.com/siyuan-note/siyuan/issues/15698 - blockRefLink.TextMarkType = strings.TrimSpace(strings.ReplaceAll(n.TextMarkType, "block-ref", "a")) + blockRefLink.TextMarkType = "a " + n.TextMarkType blockRefLink.TextMarkInlineMemoContent = n.TextMarkInlineMemoContent n.InsertBefore(blockRefLink) unlinks = append(unlinks, n) @@ -2334,11 +2333,6 @@ func exportTree(tree *parse.Tree, wysiwyg, keepFold, avHiddenCol bool, n.InsertBefore(&ast.Node{Type: ast.NodeFootnotesRef, Tokens: []byte("^" + refFoot.refNum), FootnotesRefId: refFoot.refNum, FootnotesRefLabel: []byte("^" + refFoot.refNum)}) unlinks = append(unlinks, n) } - - if nil != n.Next && ast.NodeKramdownSpanIAL == n.Next.Type { - // 引用加排版标记(比如颜色)重叠时丢弃后面的排版属性节点 - unlinks = append(unlinks, n.Next) - } return ast.WalkSkipChildren }) for _, n := range unlinks {