Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-19 05:28:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 Update av

Browse source
This commit is contained in:
Daniel 2023-07-03 19:39:00 +08:00
parent 9f17d9bd7d
commit c83d138c60
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 38 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

28
kernel/av/av.go
View file

@ -126,6 +126,34 @@ func ParseAttributeView(avID string) (ret *AttributeView, err error) {
return
}
func ParseAttributeViewMap(avID string) (ret map[string]interface{}, err error) {
ret = map[string]interface{}{}
avJSONPath := getAttributeViewDataPath(avID)
if !gulu.File.IsExist(avJSONPath) {
av := NewAttributeView(avID)
var data []byte
data, err = gulu.JSON.MarshalJSON(av)
if nil == err {
return
}
err = gulu.JSON.UnmarshalJSON(data, &ret)
return
}
data, err := filelock.ReadFile(avJSONPath)
if nil != err {
logging.LogErrorf("read attribute view [%s] failed: %s", avID, err)
return
}
if err = gulu.JSON.UnmarshalJSON(data, &ret); nil != err {
logging.LogErrorf("unmarshal attribute view [%s] failed: %s", avID, err)
return
}
return
}
func SaveAttributeView(av *AttributeView) (err error) {
data, err := gulu.JSON.MarshalIndentJSON(av, "", "\t")
if nil != err {

19
kernel/model/attribute_view.go
View file

@ -19,13 +19,13 @@ package model
import (
"errors"
"fmt"
"github.com/jinzhu/copier"
"sort"
"strings"
"github.com/88250/gulu"
"github.com/88250/lute/ast"
"github.com/88250/lute/parse"
"github.com/jinzhu/copier"
"github.com/siyuan-note/logging"
"github.com/siyuan-note/siyuan/kernel/av"
"github.com/siyuan-note/siyuan/kernel/sql"
@ -504,22 +504,23 @@ func setAttributeViewColWidth(width, columnID, avID string) (err error) {
func setAttributeView(operation *Operation) (err error) {
avID := operation.ID
attrView, err := av.ParseAttributeView(avID)
attrViewMap, err := av.ParseAttributeViewMap(avID)
if nil != err {
return
}
data, err := gulu.JSON.MarshalJSON(operation.Data)
operationData := operation.Data.(map[string]interface{})
if err = copier.Copy(&attrViewMap, operationData); nil != err {
return
}
data, err := gulu.JSON.MarshalJSON(attrViewMap)
if nil != err {
return
}
newAttrView := &av.AttributeView{}
if err = gulu.JSON.UnmarshalJSON(data, newAttrView); nil != err {
return
}
if err = copier.Copy(attrView, newAttrView); nil != err {
attrView := &av.AttributeView{}
if err = gulu.JSON.UnmarshalJSON(data, attrView); nil != err {
return
}