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

This commit is contained in:
Vanessa 2025-01-13 12:47:42 +08:00
commit 8002110610
2 changed files with 24 additions and 4 deletions

View file

@ -72,7 +72,15 @@ func getMirrorDatabaseBlocks(c *gin.Context) {
}
avID := arg["avID"].(string)
ret.Data = treenode.GetMirrorAttrViewBlockIDs(avID)
blockIDs := treenode.GetMirrorAttrViewBlockIDs(avID)
var retRefDefs []model.RefDefs
for _, blockID := range blockIDs {
retRefDefs = append(retRefDefs, model.RefDefs{RefID: blockID, DefIDs: []string{}})
}
ret.Data = map[string]any{
"refDefs": retRefDefs,
}
}
func setDatabaseBlockView(c *gin.Context) {

View file

@ -456,8 +456,13 @@ func getRefIDsByFileAnnotationID(c *gin.Context) {
id := arg["id"].(string)
refIDs := model.GetBlockRefIDsByFileAnnotationID(id)
ret.Data = map[string][]string{
"refIDs": refIDs,
var retRefDefs []model.RefDefs
for _, blockID := range refIDs {
retRefDefs = append(retRefDefs, model.RefDefs{RefID: blockID, DefIDs: []string{}})
}
ret.Data = map[string]any{
"refDefs": retRefDefs,
}
}
@ -478,7 +483,14 @@ func getBlockDefIDsByRefText(c *gin.Context) {
}
excludeIDs = nil // 不限制虚拟引用搜索自己 https://ld246.com/article/1633243424177
ids := model.GetBlockDefIDsByRefText(anchor, excludeIDs)
ret.Data = ids
var retRefDefs []model.RefDefs
for _, id := range ids {
retRefDefs = append(retRefDefs, model.RefDefs{RefID: id, DefIDs: []string{}})
}
ret.Data = map[string]any{
"refDefs": retRefDefs,
}
}
func getBlockBreadcrumb(c *gin.Context) {