github/siyuan
4
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-05-03 20:12:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

🎨 Support floating window to open related database when filling in the database relation field https://github.com/siyuan-note/siyuan/issues/10915

Browse Source
This commit is contained in:
Daniel 2024-04-07 09:54:55 +08:00
parent 49e62ebff5
commit 62db617f91
No known key found for this signature in database
GPG Key ID: 86211BA83DF03017
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kernel/api/av.go
View File

@ -86,7 +86,7 @@ func getAttributeViewPrimaryKeyValues(c *gin.Context) {
if keywordArg := arg["keyword"]; nil != keywordArg { if keywordArg := arg["keyword"]; nil != keywordArg {
keyword = keywordArg.(string) keyword = keywordArg.(string)
} }
attributeViewName, rows, err := model.GetAttributeViewPrimaryKeyValues(id, keyword, page, pageSize) attributeViewName, databaseBlockIDs, rows, err := model.GetAttributeViewPrimaryKeyValues(id, keyword, page, pageSize)
if nil != err { if nil != err {
ret.Code = -1 ret.Code = -1
ret.Msg = err.Error() ret.Msg = err.Error()
@ -94,8 +94,9 @@ func getAttributeViewPrimaryKeyValues(c *gin.Context) {
} }
ret.Data = map[string]interface{}{ ret.Data = map[string]interface{}{
"name": attributeViewName, "name": attributeViewName,
"rows": rows, "blockIDs": databaseBlockIDs,
"rows": rows,
} }
} }

4
kernel/model/attribute_view.go
View File

@ -55,7 +55,7 @@ func SetDatabaseBlockView(blockID, viewID string) (err error) {
return return
} }
func GetAttributeViewPrimaryKeyValues(avID, keyword string, page, pageSize int) (attributeViewName string, keyValues *av.KeyValues, err error) { func GetAttributeViewPrimaryKeyValues(avID, keyword string, page, pageSize int) (attributeViewName string, databaseBlockIDs []string, keyValues *av.KeyValues, err error) {
waitForSyncingStorages() waitForSyncingStorages()
attrView, err := av.ParseAttributeView(avID) attrView, err := av.ParseAttributeView(avID)
@ -65,6 +65,8 @@ func GetAttributeViewPrimaryKeyValues(avID, keyword string, page, pageSize int)
} }
attributeViewName = attrView.Name attributeViewName = attrView.Name
databaseBlockIDs = treenode.GetMirrorAttrViewBlockIDs(avID)
keyValues = attrView.GetBlockKeyValues() keyValues = attrView.GetBlockKeyValues()
// 过滤掉不在视图中的值 // 过滤掉不在视图中的值
tmp := map[string]*av.Value{} tmp := map[string]*av.Value{}