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

🎨 Improve av image preview https://github.com/siyuan-note/siyuan/pull/14843

Browse source
This commit is contained in:
Daniel 2025-05-18 11:46:33 +08:00
parent 2b03a364af
commit f211932fba
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 7 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

14
kernel/api/av.go
View file

@ -615,17 +615,6 @@ func getCurrentAttrViewImages(c *gin.Context) {
if nil != viewIDArg { if nil != viewIDArg {
viewID = viewIDArg.(string) viewID = viewIDArg.(string)
} }
page := 1
pageArg := arg["page"]
if nil != pageArg {
page = int(pageArg.(float64))
}
pageSize := -1
pageSizeArg := arg["pageSize"]
if nil != pageSizeArg {
pageSize = int(pageSizeArg.(float64))
}
query := "" query := ""
queryArg := arg["query"] queryArg := arg["query"]
@ -633,7 +622,7 @@ func getCurrentAttrViewImages(c *gin.Context) {
query = queryArg.(string) query = queryArg.(string)
} }
images, err := model.GetCurrentAttributeViewImages(id, viewID, query, page, pageSize) images, err := model.GetCurrentAttributeViewImages(id, viewID, query)
if err != nil { if err != nil {
ret.Code = -1 ret.Code = -1
ret.Msg = err.Error() ret.Msg = err.Error()
@ -642,7 +631,6 @@ func getCurrentAttrViewImages(c *gin.Context) {
ret.Data = images ret.Data = images
} }
func getAttributeViewKeys(c *gin.Context) { func getAttributeViewKeys(c *gin.Context) {
ret := gulu.Ret.NewResult() ret := gulu.Ret.NewResult()
defer c.JSON(http.StatusOK, ret) defer c.JSON(http.StatusOK, ret)

18
kernel/model/attribute_view.go
View file

@ -933,8 +933,7 @@ func renderAttributeView(attrView *av.AttributeView, viewID, query string, page,
return return
} }
func GetCurrentAttributeViewImages(avID, viewID, query string, page, pageSize int) (ret []string, err error) { func GetCurrentAttributeViewImages(avID, viewID, query string) (ret []string, err error) {
var attrView *av.AttributeView var attrView *av.AttributeView
attrView, err = av.ParseAttributeView(avID) attrView, err = av.ParseAttributeView(avID)
if err != nil { if err != nil {
@ -942,7 +941,7 @@ func GetCurrentAttributeViewImages(avID, viewID, query string, page, pageSize in
return return
} }
var view *av.View var view *av.View
if "" != viewID { if "" != viewID {
view, _ = attrView.GetCurrentView(viewID) view, _ = attrView.GetCurrentView(viewID)
} else { } else {
@ -955,19 +954,14 @@ func GetCurrentAttributeViewImages(avID, viewID, query string, page, pageSize in
for _, row := range table.Rows { for _, row := range table.Rows {
for _, cell := range row.Cells { for _, cell := range row.Cells {
if nil != cell.Value { if nil != cell.Value && av.KeyTypeMAsset == cell.Value.Type && nil != cell.Value.MAsset {
if av.KeyTypeMAsset == cell.Value.Type { for _, a := range cell.Value.MAsset {
if nil != cell.Value.MAsset { if av.AssetTypeImage == a.Type {
for _, a := range cell.Value.MAsset { ret = append(ret, a.Content)
if av.AssetTypeImage == a.Type {
ret = append(ret, a.Content)
}
}
} }
} }
} }
} }
} }
return return
} }