0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

🎨 Add kernel api getAttributeViewKeysByAvID

Browse source
This commit is contained in:
Daniel 2024-05-17 16:19:56 +08:00
parent 4624b62e4d
commit 7d87df9932
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
3 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
kernel/api/av.go
View file

@ -27,7 +27,7 @@ import (
"github.com/siyuan-note/siyuan/kernel/util"
)
func getAttributeViewSelectOptions(c *gin.Context) {
func getAttributeViewKeysByAvID(c *gin.Context) {
ret := gulu.Ret.NewResult()
defer c.JSON(http.StatusOK, ret)
@ -36,8 +36,7 @@ func getAttributeViewSelectOptions(c *gin.Context) {
return
}
avID := arg["avID"].(string)
keyID := arg["keyID"].(string)
ret.Data = model.GetAttributeViewSelectOptions(avID, keyID)
ret.Data = model.GetAttributeViewKeysByAvID(avID)
}
func getMirrorDatabaseBlocks(c *gin.Context) {

2
kernel/api/router.go
View file

@ -423,7 +423,7 @@ func ServeAPI(ginServer *gin.Engine) {
ginServer.Handle("POST", "/api/av/getAttributeViewPrimaryKeyValues", model.CheckAuth, model.CheckReadonly, getAttributeViewPrimaryKeyValues)
ginServer.Handle("POST", "/api/av/setDatabaseBlockView", model.CheckAuth, model.CheckReadonly, setDatabaseBlockView)
ginServer.Handle("POST", "/api/av/getMirrorDatabaseBlocks", model.CheckAuth, model.CheckReadonly, getMirrorDatabaseBlocks)
ginServer.Handle("POST", "/api/av/getAttributeViewSelectOptions", model.CheckAuth, model.CheckReadonly, getAttributeViewSelectOptions)
ginServer.Handle("POST", "/api/av/getAttributeViewKeysByAvID", model.CheckAuth, model.CheckReadonly, getAttributeViewKeysByAvID)
ginServer.Handle("POST", "/api/ai/chatGPT", model.CheckAuth, chatGPT)
ginServer.Handle("POST", "/api/ai/chatGPTWithAction", model.CheckAuth, chatGPTWithAction)

18
kernel/model/attribute_view.go
View file

@ -41,8 +41,8 @@ import (
"github.com/xrash/smetrics"
)
func GetAttributeViewSelectOptions(avID string, keyID string) (ret []*av.SelectOption) {
ret = []*av.SelectOption{}
func GetAttributeViewKeysByAvID(avID string) (ret []*av.Key) {
ret = []*av.Key{}
attrView, err := av.ParseAttributeView(avID)
if nil != err {
@ -50,17 +50,9 @@ func GetAttributeViewSelectOptions(avID string, keyID string) (ret []*av.SelectO
return
}
key, _ := attrView.GetKey(keyID)
if nil == key {
return
}
if av.KeyTypeSelect != key.Type && av.KeyTypeMSelect != key.Type {
return
}
if 0 < len(key.Options) {
ret = key.Options
for _, keyValues := range attrView.KeyValues {
key := keyValues.Key
ret = append(ret, key)
}
return ret
}