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

🐛 The selection options are inconsistent after pasting data into the database https://github.com/siyuan-note/siyuan/issues/11409

Browse source
This commit is contained in:
Daniel 2024-05-17 09:49:10 +08:00
parent cbea8c6023
commit f7d23b41fd
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
3 changed files with 38 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
kernel/api/av.go
View file

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

1
kernel/api/router.go
View file

@ -423,6 +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/ai/chatGPT", model.CheckAuth, chatGPT)
ginServer.Handle("POST", "/api/ai/chatGPTWithAction", model.CheckAuth, chatGPTWithAction)

24
kernel/model/attribute_view.go
View file

@ -41,6 +41,30 @@ import (
"github.com/xrash/smetrics"
)
func GetAttributeViewSelectOptions(avID string, keyID string) (ret []*av.SelectOption) {
ret = []*av.SelectOption{}
attrView, err := av.ParseAttributeView(avID)
if nil != err {
logging.LogErrorf("parse attribute view [%s] failed: %s", avID, err)
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
}
return ret
}
func SetDatabaseBlockView(blockID, viewID string) (err error) {
node, tree, err := getNodeByBlockID(nil, blockID)
if nil != err {