Merge remote-tracking branch 'origin/dev' into dev

kernel/filesys/json_parser.go

@@ -232,6 +232,9 @@ func fixLegacyData(tip, node *ast.Node, idMap *map[string]bool, needFix, needMig
 		// 建立索引时无法解析 `v2.2.0-` 版本的块引用 https://github.com/siyuan-note/siyuan/issues/6889
 		// 早先的迁移程序有缺陷，漏迁移了块引用节点，这里检测到块引用节点后标识需要迁移
 		*needMigrate2Spec1 = true
+	case ast.NodeInlineHTML:
+		*needFix = true
+		node.Type = ast.NodeHTMLBlock
 	}
 
 	for _, kv := range node.KramdownIAL {

kernel/model/asset_content.go

@@ -28,6 +28,7 @@ import (
 	"code.sajari.com/docconv"
 	"github.com/88250/gulu"
 	"github.com/88250/lute/ast"
+	"github.com/dustin/go-humanize"
 	"github.com/siyuan-note/eventbus"
 	"github.com/siyuan-note/filelock"
 	"github.com/siyuan-note/logging"
@@ -43,6 +44,7 @@ type AssetContent struct {
 	Ext     string `json:"ext"`
 	Path    string `json:"path"`
 	Size    int64  `json:"size"`
+	HSize   string `json:"hSize"`
 	Updated int64  `json:"updated"`
 	Content string `json:"content"`
 }
@@ -219,6 +221,7 @@ func fromSQLAssetContent(assetContent *sql.AssetContent, beforeLen int) *AssetCo
 		Ext:     assetContent.Ext,
 		Path:    assetContent.Path,
 		Size:    assetContent.Size,
+		HSize:   humanize.Bytes(uint64(assetContent.Size)),
 		Updated: assetContent.Updated,
 		Content: assetContent.Content,
 	}

kernel/sql/database.go

@@ -689,6 +689,16 @@ func buildSpanFromNode(n *ast.Node, tree *parse.Tree, rootID, boxID, p string) (
 			attributes = append(attributes, attrs...)
 		}
 
+		if ast.NodeInlineHTML == n.Type {
+			// 没有行级 HTML，只有块级 HTML，这里转换为块
+			b, attrs := buildBlockFromNode(n, tree)
+			b.Type = ast.NodeHTMLBlock.String()
+			blocks = append(blocks, b)
+			attributes = append(attributes, attrs...)
+			walkStatus = ast.WalkContinue
+			return
+		}
+
 		if 1 > len(nodes) {
 			walkStatus = ast.WalkContinue
 			return