Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-16 14:40:12 +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 2025-11-10 18:14:06 +08:00
commit 6c6f7d8ce2
8 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/stage/protyle/js/lute/lute.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
kernel/av/layout.go
View file

@ -159,6 +159,8 @@ type BaseInstanceField struct {
Relation *Relation `json:"relation,omitempty"` // 关联字段
Rollup *Rollup `json:"rollup,omitempty"` // 汇总字段
Date *Date `json:"date,omitempty"` // 日期设置
Created *Created `json:"created,omitempty"` // 创建时间设置
Updated *Updated `json:"updated,omitempty"` // 更新时间设置
}
func (baseInstanceField *BaseInstanceField) GetID() string {

2
kernel/go.mod
View file

@ -8,7 +8,7 @@ require (
github.com/88250/epub v0.0.0-20230830085737-c19055cd1f48
github.com/88250/go-humanize v0.0.0-20240424102817-4f78fac47ea7
github.com/88250/gulu v1.2.3-0.20251107023402-569f52804e3b
github.com/88250/lute v1.7.7-0.20251109064501-546ce0f563a3
github.com/88250/lute v1.7.7-0.20251110032011-68db15126858
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1
github.com/ClarkThan/ahocorasick v0.0.0-20231011042242-30d1ef1347f4
github.com/ConradIrwin/font v0.2.1

2
kernel/go.sum
View file

@ -16,6 +16,8 @@ github.com/88250/gulu v1.2.3-0.20251107023402-569f52804e3b h1:b6Rp0KiGIkEs5O5skK
github.com/88250/gulu v1.2.3-0.20251107023402-569f52804e3b/go.mod h1:Wz/JGuHPqxmvGSBtXrXNWklMxNdCADIrL5+VjSgCZyo=
github.com/88250/lute v1.7.7-0.20251109064501-546ce0f563a3 h1:BnefWHy/uIfI6m/WY4gofo2PdXRxp3eg/a5EsgIP9Oc=
github.com/88250/lute v1.7.7-0.20251109064501-546ce0f563a3/go.mod h1:WYyUw//5yVw9BJnoVjx7rI/3szsISxNZCYGOqTIrV0o=
github.com/88250/lute v1.7.7-0.20251110032011-68db15126858 h1:6NqDNDMDJQcLz0zQW7yaHrT26lQ1o56qeYHHy7P21R4=
github.com/88250/lute v1.7.7-0.20251110032011-68db15126858/go.mod h1:WYyUw//5yVw9BJnoVjx7rI/3szsISxNZCYGOqTIrV0o=
github.com/88250/pdfcpu v0.3.14-0.20250424122812-f10e8d9d8d46 h1:Bq1JsDfVbHKUxNL/B2JXd8cC/1h6aFjrlXpGycnh0Hk=
github.com/88250/pdfcpu v0.3.14-0.20250424122812-f10e8d9d8d46/go.mod h1:fVfOloBzs2+W2VJCCbq60XIxc3yJHAZ0Gahv1oO0gyI=
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1 h1:48T899JQDwyyRu9yXHePYlPdHtpJfrJEUGBMH3SMBWY=

3
kernel/model/export.go
View file

@ -2232,6 +2232,9 @@ func exportMarkdownContent0(id string, tree *parse.Tree, cloudAssetsBase string,
}
sameDir := path.Dir(href) == currentDocDir
if strings.HasPrefix(href, "#") {
sameDir = true
}
href = util.FilterFilePath(href)
if !sameDir {
var relErr error

2
kernel/sql/av_gallery.go
View file

@ -62,6 +62,8 @@ func RenderAttributeViewGallery(attrView *av.AttributeView, view *av.View, query
Relation: key.Relation,
Rollup: key.Rollup,
Date: key.Date,
Created: key.Created,
Updated: key.Updated,
},
})
}

2
kernel/sql/av_kanban.go
View file

@ -57,6 +57,8 @@ func RenderAttributeViewKanban(attrView *av.AttributeView, view *av.View, query
Relation: key.Relation,
Rollup: key.Rollup,
Date: key.Date,
Created: key.Created,
Updated: key.Updated,
},
})
}

2
kernel/sql/av_table.go
View file

@ -60,6 +60,8 @@ func RenderAttributeViewTable(attrView *av.AttributeView, view *av.View, query s
Relation: key.Relation,
Rollup: key.Rollup,
Date: key.Date,
Created: key.Created,
Updated: key.Updated,
},
Width: col.Width,
Pin: col.Pin,