Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-29 12:58:48 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
Vanessa 2023-07-03 12:25:26 +08:00
commit c2e2f37f87
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
kernel/av/av.go
View file

@ -40,9 +40,9 @@ type AttributeView struct {
Rows []*Row `json:"rows"` // 表格行记录
Type AttributeViewType `json:"type"` // 属性视图类型
Projections []string `json:"projections"` // 显示的列名，SELECT *
Filters []*AttributeViewFilter `json:"filters"` // 过滤规则，WHERE ...
Sorts []*AttributeViewSort `json:"sorts"` // 排序规则，ORDER BY ...
Projections []string `json:"projections"` // 显示的列名
Filters []*AttributeViewFilter `json:"filters"` // 过滤规则
Sorts []*AttributeViewSort `json:"sorts"` // 排序规则
}
// AttributeViewType 描述了属性视图的类型。

2
kernel/sql/database.go
View file

@ -710,7 +710,7 @@ func buildBlockFromNode(n *ast.Node, tree *parse.Tree) (block *Block, attributes
markdown = treenode.ExportNodeStdMd(n, luteEngine)
content = treenode.NodeStaticContent(n, nil, true, indexAssetPath)
fc := treenode.FirstLeafBlock(n)
fcontent = treenode.NodeStaticContent(fc, nil, false, false)
fcontent = treenode.NodeStaticContent(fc, nil, true, false)
parentID = n.Parent.ID
// 将标题块作为父节点
if h := heading(n); nil != h {