Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-18 15:40:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

🎨 Database grouping by field https://github.com/siyuan-note/siyuan/issues/10964

Browse source
This commit is contained in:
Daniel 2025-07-05 12:33:41 +08:00
parent 6e1f54238a
commit ffb88a72d6
No known key found for this signature in database
GPG key ID: 86211BA83DF03017
2 changed files with 67 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

124
kernel/model/attribute_view.go
View file

@ -48,16 +48,16 @@ func (tx *Transaction) doSetAttrViewGroup(operation *Operation) (ret *TxErr) {
data, err := gulu.JSON.MarshalJSON(operation.Data) data, err := gulu.JSON.MarshalJSON(operation.Data)
if nil != err { if nil != err {
logging.LogErrorf("marshal operation data failed: %s", err) logging.LogErrorf("marshal operation data failed: %s", err)
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
group := &av.ViewGroup{} group := &av.ViewGroup{}
if err = gulu.JSON.UnmarshalJSON(data, &group); nil != err { if err = gulu.JSON.UnmarshalJSON(data, &group); nil != err {
logging.LogErrorf("unmarshal operation data failed: %s", err) logging.LogErrorf("unmarshal operation data failed: %s", err)
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
if err = SetAttributeViewGroup(operation.AvID, operation.BlockID, group); nil != err { if err = SetAttributeViewGroup(operation.AvID, operation.BlockID, group); nil != err {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
return return
} }
@ -110,7 +110,7 @@ func SetAttributeViewGroup(avID, blockID string, group *av.ViewGroup) error {
func (tx *Transaction) doSetAttrViewCardAspectRatio(operation *Operation) (ret *TxErr) { func (tx *Transaction) doSetAttrViewCardAspectRatio(operation *Operation) (ret *TxErr) {
err := setAttrViewCardAspectRatio(operation) err := setAttrViewCardAspectRatio(operation)
if err != nil { if err != nil {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
return return
} }
@ -140,7 +140,7 @@ func setAttrViewCardAspectRatio(operation *Operation) (err error) {
func (tx *Transaction) doSetAttrViewBlockView(operation *Operation) (ret *TxErr) { func (tx *Transaction) doSetAttrViewBlockView(operation *Operation) (ret *TxErr) {
err := SetDatabaseBlockView(operation.BlockID, operation.AvID, operation.ID) err := SetDatabaseBlockView(operation.BlockID, operation.AvID, operation.ID)
if err != nil { if err != nil {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
return return
} }
@ -148,7 +148,7 @@ func (tx *Transaction) doSetAttrViewBlockView(operation *Operation) (ret *TxErr)
func (tx *Transaction) doChangeAttrViewLayout(operation *Operation) (ret *TxErr) { func (tx *Transaction) doChangeAttrViewLayout(operation *Operation) (ret *TxErr) {
err := ChangeAttrViewLayout(operation.BlockID, operation.AvID, operation.Layout) err := ChangeAttrViewLayout(operation.BlockID, operation.AvID, operation.Layout)
if err != nil { if err != nil {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
return return
} }
@ -236,7 +236,7 @@ func ChangeAttrViewLayout(blockID, avID string, layout av.LayoutType) (err error
func (tx *Transaction) doSetAttrViewWrapField(operation *Operation) (ret *TxErr) { func (tx *Transaction) doSetAttrViewWrapField(operation *Operation) (ret *TxErr) {
err := setAttrViewWrapField(operation) err := setAttrViewWrapField(operation)
if err != nil { if err != nil {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
return return
} }
@ -273,7 +273,7 @@ func setAttrViewWrapField(operation *Operation) (err error) {
func (tx *Transaction) doSetAttrViewShowIcon(operation *Operation) (ret *TxErr) { func (tx *Transaction) doSetAttrViewShowIcon(operation *Operation) (ret *TxErr) {
err := setAttrViewShowIcon(operation) err := setAttrViewShowIcon(operation)
if err != nil { if err != nil {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
return return
} }
@ -303,7 +303,7 @@ func setAttrViewShowIcon(operation *Operation) (err error) {
func (tx *Transaction) doSetAttrViewFitImage(operation *Operation) (ret *TxErr) { func (tx *Transaction) doSetAttrViewFitImage(operation *Operation) (ret *TxErr) {
err := setAttrViewFitImage(operation) err := setAttrViewFitImage(operation)
if err != nil { if err != nil {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
return return
} }
@ -333,7 +333,7 @@ func setAttrViewFitImage(operation *Operation) (err error) {
func (tx *Transaction) doSetAttrViewCardSize(operation *Operation) (ret *TxErr) { func (tx *Transaction) doSetAttrViewCardSize(operation *Operation) (ret *TxErr) {
err := setAttrViewCardSize(operation) err := setAttrViewCardSize(operation)
if err != nil { if err != nil {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
return return
} }
@ -363,7 +363,7 @@ func setAttrViewCardSize(operation *Operation) (err error) {
func (tx *Transaction) doSetAttrViewCoverFromAssetKeyID(operation *Operation) (ret *TxErr) { func (tx *Transaction) doSetAttrViewCoverFromAssetKeyID(operation *Operation) (ret *TxErr) {
err := setAttrViewCoverFromAssetKeyID(operation) err := setAttrViewCoverFromAssetKeyID(operation)
if err != nil { if err != nil {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
return return
} }
@ -393,7 +393,7 @@ func setAttrViewCoverFromAssetKeyID(operation *Operation) (err error) {
func (tx *Transaction) doSetAttrViewCoverFrom(operation *Operation) (ret *TxErr) { func (tx *Transaction) doSetAttrViewCoverFrom(operation *Operation) (ret *TxErr) {
err := setAttrViewCoverFrom(operation) err := setAttrViewCoverFrom(operation)
if err != nil { if err != nil {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
return return
} }
@ -1453,7 +1453,7 @@ func GetCurrentAttributeViewImages(avID, viewID, query string) (ret []string, er
func (tx *Transaction) doUnbindAttrViewBlock(operation *Operation) (ret *TxErr) { func (tx *Transaction) doUnbindAttrViewBlock(operation *Operation) (ret *TxErr) {
err := unbindAttributeViewBlock(operation, tx) err := unbindAttributeViewBlock(operation, tx)
if err != nil { if err != nil {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID}
} }
return return
} }
@ -1528,7 +1528,7 @@ func unbindAttributeViewBlock(operation *Operation, tx *Transaction) (err error)
func (tx *Transaction) doSetAttrViewColDate(operation *Operation) (ret *TxErr) { func (tx *Transaction) doSetAttrViewColDate(operation *Operation) (ret *TxErr) {
err := setAttributeViewColDate(operation) err := setAttributeViewColDate(operation)
if err != nil { if err != nil {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
return return
} }
@ -1558,7 +1558,7 @@ func setAttributeViewColDate(operation *Operation) (err error) {
func (tx *Transaction) doHideAttrViewName(operation *Operation) (ret *TxErr) { func (tx *Transaction) doHideAttrViewName(operation *Operation) (ret *TxErr) {
err := hideAttrViewName(operation) err := hideAttrViewName(operation)
if err != nil { if err != nil {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
return return
} }
@ -1584,7 +1584,7 @@ func hideAttrViewName(operation *Operation) (err error) {
func (tx *Transaction) doUpdateAttrViewColRollup(operation *Operation) (ret *TxErr) { func (tx *Transaction) doUpdateAttrViewColRollup(operation *Operation) (ret *TxErr) {
err := updateAttributeViewColRollup(operation) err := updateAttributeViewColRollup(operation)
if err != nil { if err != nil {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
return return
} }
@ -1633,7 +1633,7 @@ func updateAttributeViewColRollup(operation *Operation) (err error) {
func (tx *Transaction) doUpdateAttrViewColRelation(operation *Operation) (ret *TxErr) { func (tx *Transaction) doUpdateAttrViewColRelation(operation *Operation) (ret *TxErr) {
err := updateAttributeViewColRelation(operation) err := updateAttributeViewColRelation(operation)
if err != nil { if err != nil {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
return return
} }
@ -1806,13 +1806,13 @@ func (tx *Transaction) doSortAttrViewView(operation *Operation) (ret *TxErr) {
attrView, err := av.ParseAttributeView(avID) attrView, err := av.ParseAttributeView(avID)
if err != nil { if err != nil {
logging.LogErrorf("parse attribute view [%s] failed: %s", operation.AvID, err) logging.LogErrorf("parse attribute view [%s] failed: %s", operation.AvID, err)
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
view := attrView.GetView(operation.ID) view := attrView.GetView(operation.ID)
if nil == view { if nil == view {
logging.LogErrorf("get view failed: %s", operation.BlockID) logging.LogErrorf("get view failed: %s", operation.BlockID)
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
viewID := view.ID viewID := view.ID
previousViewID := operation.PreviousID previousViewID := operation.PreviousID
@ -1940,19 +1940,19 @@ func (tx *Transaction) doDuplicateAttrViewView(operation *Operation) (ret *TxErr
attrView, err := av.ParseAttributeView(avID) attrView, err := av.ParseAttributeView(avID)
if err != nil { if err != nil {
logging.LogErrorf("parse attribute view [%s] failed: %s", avID, err) logging.LogErrorf("parse attribute view [%s] failed: %s", avID, err)
return &TxErr{code: TxErrWriteAttributeView, id: avID} return &TxErr{code: TxErrHandleAttributeView, id: avID}
} }
masterView := attrView.GetView(operation.PreviousID) masterView := attrView.GetView(operation.PreviousID)
if nil == masterView { if nil == masterView {
logging.LogErrorf("get master view failed: %s", avID) logging.LogErrorf("get master view failed: %s", avID)
return &TxErr{code: TxErrWriteAttributeView, id: avID} return &TxErr{code: TxErrHandleAttributeView, id: avID}
} }
node, tree, _ := getNodeByBlockID(nil, operation.BlockID) node, tree, _ := getNodeByBlockID(nil, operation.BlockID)
if nil == node { if nil == node {
logging.LogErrorf("get node by block ID [%s] failed", operation.BlockID) logging.LogErrorf("get node by block ID [%s] failed", operation.BlockID)
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID}
} }
attrs := parse.IAL2Map(node.KramdownIAL) attrs := parse.IAL2Map(node.KramdownIAL)
@ -2002,7 +2002,7 @@ func (tx *Transaction) doDuplicateAttrViewView(operation *Operation) (ret *TxErr
if nil != masterView.Group { if nil != masterView.Group {
if copyErr := copier.Copy(view.Group, masterView.Group); nil != copyErr { if copyErr := copier.Copy(view.Group, masterView.Group); nil != copyErr {
logging.LogErrorf("copy group failed: %s", copyErr) logging.LogErrorf("copy group failed: %s", copyErr)
return &TxErr{code: TxErrWriteAttributeView, id: avID, msg: copyErr.Error()} return &TxErr{code: TxErrHandleAttributeView, id: avID, msg: copyErr.Error()}
} }
} }
@ -2050,7 +2050,7 @@ func (tx *Transaction) doDuplicateAttrViewView(operation *Operation) (ret *TxErr
if err = av.SaveAttributeView(attrView); err != nil { if err = av.SaveAttributeView(attrView); err != nil {
logging.LogErrorf("save attribute view [%s] failed: %s", avID, err) logging.LogErrorf("save attribute view [%s] failed: %s", avID, err)
return &TxErr{code: TxErrWriteAttributeView, msg: err.Error(), id: avID} return &TxErr{code: TxErrHandleAttributeView, msg: err.Error(), id: avID}
} }
return return
} }
@ -2058,7 +2058,7 @@ func (tx *Transaction) doDuplicateAttrViewView(operation *Operation) (ret *TxErr
func (tx *Transaction) doAddAttrViewView(operation *Operation) (ret *TxErr) { func (tx *Transaction) doAddAttrViewView(operation *Operation) (ret *TxErr) {
err := addAttrViewView(operation.AvID, operation.ID, operation.BlockID, operation.Layout) err := addAttrViewView(operation.AvID, operation.ID, operation.BlockID, operation.Layout)
if nil != err { if nil != err {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
return return
} }
@ -2150,20 +2150,20 @@ func (tx *Transaction) doSetAttrViewViewName(operation *Operation) (ret *TxErr)
attrView, err := av.ParseAttributeView(avID) attrView, err := av.ParseAttributeView(avID)
if err != nil { if err != nil {
logging.LogErrorf("parse attribute view [%s] failed: %s", avID, err) logging.LogErrorf("parse attribute view [%s] failed: %s", avID, err)
return &TxErr{code: TxErrWriteAttributeView, id: avID} return &TxErr{code: TxErrHandleAttributeView, id: avID}
} }
viewID := operation.ID viewID := operation.ID
view := attrView.GetView(viewID) view := attrView.GetView(viewID)
if nil == view { if nil == view {
logging.LogErrorf("get view [%s] failed: %s", viewID, err) logging.LogErrorf("get view [%s] failed: %s", viewID, err)
return &TxErr{code: TxErrWriteAttributeView, id: viewID} return &TxErr{code: TxErrHandleAttributeView, id: viewID}
} }
view.Name = strings.TrimSpace(operation.Data.(string)) view.Name = strings.TrimSpace(operation.Data.(string))
if err = av.SaveAttributeView(attrView); err != nil { if err = av.SaveAttributeView(attrView); err != nil {
logging.LogErrorf("save attribute view [%s] failed: %s", avID, err) logging.LogErrorf("save attribute view [%s] failed: %s", avID, err)
return &TxErr{code: TxErrWriteAttributeView, msg: err.Error(), id: avID} return &TxErr{code: TxErrHandleAttributeView, msg: err.Error(), id: avID}
} }
return return
} }
@ -2174,20 +2174,20 @@ func (tx *Transaction) doSetAttrViewViewIcon(operation *Operation) (ret *TxErr)
attrView, err := av.ParseAttributeView(avID) attrView, err := av.ParseAttributeView(avID)
if err != nil { if err != nil {
logging.LogErrorf("parse attribute view [%s] failed: %s", avID, err) logging.LogErrorf("parse attribute view [%s] failed: %s", avID, err)
return &TxErr{code: TxErrWriteAttributeView, id: avID} return &TxErr{code: TxErrHandleAttributeView, id: avID}
} }
viewID := operation.ID viewID := operation.ID
view := attrView.GetView(viewID) view := attrView.GetView(viewID)
if nil == view { if nil == view {
logging.LogErrorf("get view [%s] failed: %s", viewID, err) logging.LogErrorf("get view [%s] failed: %s", viewID, err)
return &TxErr{code: TxErrWriteAttributeView, id: viewID} return &TxErr{code: TxErrHandleAttributeView, id: viewID}
} }
view.Icon = operation.Data.(string) view.Icon = operation.Data.(string)
if err = av.SaveAttributeView(attrView); err != nil { if err = av.SaveAttributeView(attrView); err != nil {
logging.LogErrorf("save attribute view [%s] failed: %s", avID, err) logging.LogErrorf("save attribute view [%s] failed: %s", avID, err)
return &TxErr{code: TxErrWriteAttributeView, msg: err.Error(), id: avID} return &TxErr{code: TxErrHandleAttributeView, msg: err.Error(), id: avID}
} }
return return
} }
@ -2198,20 +2198,20 @@ func (tx *Transaction) doSetAttrViewViewDesc(operation *Operation) (ret *TxErr)
attrView, err := av.ParseAttributeView(avID) attrView, err := av.ParseAttributeView(avID)
if err != nil { if err != nil {
logging.LogErrorf("parse attribute view [%s] failed: %s", avID, err) logging.LogErrorf("parse attribute view [%s] failed: %s", avID, err)
return &TxErr{code: TxErrWriteAttributeView, id: avID} return &TxErr{code: TxErrHandleAttributeView, id: avID}
} }
viewID := operation.ID viewID := operation.ID
view := attrView.GetView(viewID) view := attrView.GetView(viewID)
if nil == view { if nil == view {
logging.LogErrorf("get view [%s] failed: %s", viewID, err) logging.LogErrorf("get view [%s] failed: %s", viewID, err)
return &TxErr{code: TxErrWriteAttributeView, id: viewID} return &TxErr{code: TxErrHandleAttributeView, id: viewID}
} }
view.Desc = strings.TrimSpace(operation.Data.(string)) view.Desc = strings.TrimSpace(operation.Data.(string))
if err = av.SaveAttributeView(attrView); err != nil { if err = av.SaveAttributeView(attrView); err != nil {
logging.LogErrorf("save attribute view [%s] failed: %s", avID, err) logging.LogErrorf("save attribute view [%s] failed: %s", avID, err)
return &TxErr{code: TxErrWriteAttributeView, msg: err.Error(), id: avID} return &TxErr{code: TxErrHandleAttributeView, msg: err.Error(), id: avID}
} }
return return
} }
@ -2219,7 +2219,7 @@ func (tx *Transaction) doSetAttrViewViewDesc(operation *Operation) (ret *TxErr)
func (tx *Transaction) doSetAttrViewName(operation *Operation) (ret *TxErr) { func (tx *Transaction) doSetAttrViewName(operation *Operation) (ret *TxErr) {
err := tx.setAttributeViewName(operation) err := tx.setAttributeViewName(operation)
if err != nil { if err != nil {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
return return
} }
@ -2308,7 +2308,7 @@ func (tx *Transaction) getAttrViewBoundNodes(attrView *av.AttributeView) (trees
func (tx *Transaction) doSetAttrViewFilters(operation *Operation) (ret *TxErr) { func (tx *Transaction) doSetAttrViewFilters(operation *Operation) (ret *TxErr) {
err := setAttributeViewFilters(operation) err := setAttributeViewFilters(operation)
if err != nil { if err != nil {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
return return
} }
@ -2341,7 +2341,7 @@ func setAttributeViewFilters(operation *Operation) (err error) {
func (tx *Transaction) doSetAttrViewSorts(operation *Operation) (ret *TxErr) { func (tx *Transaction) doSetAttrViewSorts(operation *Operation) (ret *TxErr) {
err := setAttributeViewSorts(operation) err := setAttributeViewSorts(operation)
if err != nil { if err != nil {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
return return
} }
@ -2374,7 +2374,7 @@ func setAttributeViewSorts(operation *Operation) (err error) {
func (tx *Transaction) doSetAttrViewPageSize(operation *Operation) (ret *TxErr) { func (tx *Transaction) doSetAttrViewPageSize(operation *Operation) (ret *TxErr) {
err := setAttributeViewPageSize(operation) err := setAttributeViewPageSize(operation)
if err != nil { if err != nil {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
return return
} }
@ -2399,7 +2399,7 @@ func setAttributeViewPageSize(operation *Operation) (err error) {
func (tx *Transaction) doSetAttrViewColCalc(operation *Operation) (ret *TxErr) { func (tx *Transaction) doSetAttrViewColCalc(operation *Operation) (ret *TxErr) {
err := setAttributeViewColumnCalc(operation) err := setAttributeViewColumnCalc(operation)
if err != nil { if err != nil {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
return return
} }
@ -2445,7 +2445,7 @@ func setAttributeViewColumnCalc(operation *Operation) (err error) {
func (tx *Transaction) doInsertAttrViewBlock(operation *Operation) (ret *TxErr) { func (tx *Transaction) doInsertAttrViewBlock(operation *Operation) (ret *TxErr) {
err := AddAttributeViewBlock(tx, operation.Srcs, operation.AvID, operation.BlockID, operation.PreviousID, operation.IgnoreFillFilterVal) err := AddAttributeViewBlock(tx, operation.Srcs, operation.AvID, operation.BlockID, operation.PreviousID, operation.IgnoreFillFilterVal)
if err != nil { if err != nil {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
return return
} }
@ -2659,7 +2659,7 @@ func addAttributeViewBlock(now int64, avID, blockID, previousBlockID, addingBloc
func (tx *Transaction) doRemoveAttrViewBlock(operation *Operation) (ret *TxErr) { func (tx *Transaction) doRemoveAttrViewBlock(operation *Operation) (ret *TxErr) {
err := removeAttributeViewBlock(operation.SrcIDs, operation.AvID, tx) err := removeAttributeViewBlock(operation.SrcIDs, operation.AvID, tx)
if err != nil { if err != nil {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID}
} }
return return
} }
@ -2792,7 +2792,7 @@ func removeNodeAvID(node *ast.Node, avID string, tx *Transaction, tree *parse.Tr
func (tx *Transaction) doDuplicateAttrViewKey(operation *Operation) (ret *TxErr) { func (tx *Transaction) doDuplicateAttrViewKey(operation *Operation) (ret *TxErr) {
err := duplicateAttributeViewKey(operation) err := duplicateAttributeViewKey(operation)
if err != nil { if err != nil {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
return return
} }
@ -2867,7 +2867,7 @@ func duplicateAttributeViewKey(operation *Operation) (err error) {
func (tx *Transaction) doSetAttrViewColumnWidth(operation *Operation) (ret *TxErr) { func (tx *Transaction) doSetAttrViewColumnWidth(operation *Operation) (ret *TxErr) {
err := setAttributeViewColWidth(operation) err := setAttributeViewColWidth(operation)
if err != nil { if err != nil {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
return return
} }
@ -2902,7 +2902,7 @@ func setAttributeViewColWidth(operation *Operation) (err error) {
func (tx *Transaction) doSetAttrViewColumnWrap(operation *Operation) (ret *TxErr) { func (tx *Transaction) doSetAttrViewColumnWrap(operation *Operation) (ret *TxErr) {
err := setAttributeViewColWrap(operation) err := setAttributeViewColWrap(operation)
if err != nil { if err != nil {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
return return
} }
@ -2946,7 +2946,7 @@ func setAttributeViewColWrap(operation *Operation) (err error) {
func (tx *Transaction) doSetAttrViewColumnHidden(operation *Operation) (ret *TxErr) { func (tx *Transaction) doSetAttrViewColumnHidden(operation *Operation) (ret *TxErr) {
err := setAttributeViewColHidden(operation) err := setAttributeViewColHidden(operation)
if err != nil { if err != nil {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
return return
} }
@ -2986,7 +2986,7 @@ func setAttributeViewColHidden(operation *Operation) (err error) {
func (tx *Transaction) doSetAttrViewColumnPin(operation *Operation) (ret *TxErr) { func (tx *Transaction) doSetAttrViewColumnPin(operation *Operation) (ret *TxErr) {
err := setAttributeViewColPin(operation) err := setAttributeViewColPin(operation)
if err != nil { if err != nil {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
return return
} }
@ -3021,7 +3021,7 @@ func setAttributeViewColPin(operation *Operation) (err error) {
func (tx *Transaction) doSetAttrViewColumnIcon(operation *Operation) (ret *TxErr) { func (tx *Transaction) doSetAttrViewColumnIcon(operation *Operation) (ret *TxErr) {
err := setAttributeViewColIcon(operation) err := setAttributeViewColIcon(operation)
if err != nil { if err != nil {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
return return
} }
@ -3046,7 +3046,7 @@ func setAttributeViewColIcon(operation *Operation) (err error) {
func (tx *Transaction) doSetAttrViewColumnDesc(operation *Operation) (ret *TxErr) { func (tx *Transaction) doSetAttrViewColumnDesc(operation *Operation) (ret *TxErr) {
err := setAttributeViewColDesc(operation) err := setAttributeViewColDesc(operation)
if err != nil { if err != nil {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
return return
} }
@ -3071,7 +3071,7 @@ func setAttributeViewColDesc(operation *Operation) (err error) {
func (tx *Transaction) doSortAttrViewRow(operation *Operation) (ret *TxErr) { func (tx *Transaction) doSortAttrViewRow(operation *Operation) (ret *TxErr) {
err := sortAttributeViewRow(operation) err := sortAttributeViewRow(operation)
if err != nil { if err != nil {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
return return
} }
@ -3123,7 +3123,7 @@ func sortAttributeViewRow(operation *Operation) (err error) {
func (tx *Transaction) doSortAttrViewColumn(operation *Operation) (ret *TxErr) { func (tx *Transaction) doSortAttrViewColumn(operation *Operation) (ret *TxErr) {
err := SortAttributeViewViewKey(operation.AvID, operation.BlockID, operation.ID, operation.PreviousID) err := SortAttributeViewViewKey(operation.AvID, operation.BlockID, operation.ID, operation.PreviousID)
if err != nil { if err != nil {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
return return
} }
@ -3197,7 +3197,7 @@ func SortAttributeViewViewKey(avID, blockID, keyID, previousKeyID string) (err e
func (tx *Transaction) doSortAttrViewKey(operation *Operation) (ret *TxErr) { func (tx *Transaction) doSortAttrViewKey(operation *Operation) (ret *TxErr) {
err := SortAttributeViewKey(operation.AvID, operation.ID, operation.PreviousID) err := SortAttributeViewKey(operation.AvID, operation.ID, operation.PreviousID)
if err != nil { if err != nil {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
return return
} }
@ -3276,7 +3276,7 @@ func (tx *Transaction) doAddAttrViewColumn(operation *Operation) (ret *TxErr) {
err := AddAttributeViewKey(operation.AvID, operation.ID, operation.Name, operation.Typ, icon, operation.PreviousID) err := AddAttributeViewKey(operation.AvID, operation.ID, operation.Name, operation.Typ, icon, operation.PreviousID)
if err != nil { if err != nil {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
return return
} }
@ -3356,7 +3356,7 @@ func AddAttributeViewKey(avID, keyID, keyName, keyType, keyIcon, previousKeyID s
func (tx *Transaction) doUpdateAttrViewColTemplate(operation *Operation) (ret *TxErr) { func (tx *Transaction) doUpdateAttrViewColTemplate(operation *Operation) (ret *TxErr) {
err := updateAttributeViewColTemplate(operation) err := updateAttributeViewColTemplate(operation)
if err != nil { if err != nil {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
return return
} }
@ -3385,7 +3385,7 @@ func updateAttributeViewColTemplate(operation *Operation) (err error) {
func (tx *Transaction) doUpdateAttrViewColNumberFormat(operation *Operation) (ret *TxErr) { func (tx *Transaction) doUpdateAttrViewColNumberFormat(operation *Operation) (ret *TxErr) {
err := updateAttributeViewColNumberFormat(operation) err := updateAttributeViewColNumberFormat(operation)
if err != nil { if err != nil {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
return return
} }
@ -3414,7 +3414,7 @@ func updateAttributeViewColNumberFormat(operation *Operation) (err error) {
func (tx *Transaction) doUpdateAttrViewColumn(operation *Operation) (ret *TxErr) { func (tx *Transaction) doUpdateAttrViewColumn(operation *Operation) (ret *TxErr) {
err := updateAttributeViewColumn(operation) err := updateAttributeViewColumn(operation)
if err != nil { if err != nil {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
return return
} }
@ -3451,7 +3451,7 @@ func updateAttributeViewColumn(operation *Operation) (err error) {
func (tx *Transaction) doRemoveAttrViewColumn(operation *Operation) (ret *TxErr) { func (tx *Transaction) doRemoveAttrViewColumn(operation *Operation) (ret *TxErr) {
err := RemoveAttributeViewKey(operation.AvID, operation.ID, operation.RemoveDest) err := RemoveAttributeViewKey(operation.AvID, operation.ID, operation.RemoveDest)
if err != nil { if err != nil {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
return return
} }
@ -3571,7 +3571,7 @@ func RemoveAttributeViewKey(avID, keyID string, removeRelationDest bool) (err er
func (tx *Transaction) doReplaceAttrViewBlock(operation *Operation) (ret *TxErr) { func (tx *Transaction) doReplaceAttrViewBlock(operation *Operation) (ret *TxErr) {
err := replaceAttributeViewBlock(operation, tx) err := replaceAttributeViewBlock(operation, tx)
if err != nil { if err != nil {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID}
} }
return return
} }
@ -3677,7 +3677,7 @@ func replaceAttributeViewBlock(operation *Operation, tx *Transaction) (err error
func (tx *Transaction) doUpdateAttrViewCell(operation *Operation) (ret *TxErr) { func (tx *Transaction) doUpdateAttrViewCell(operation *Operation) (ret *TxErr) {
err := updateAttributeViewCell(operation, tx) err := updateAttributeViewCell(operation, tx)
if err != nil { if err != nil {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
return return
} }
@ -4061,7 +4061,7 @@ func getNodeByBlockID(tx *Transaction, blockID string) (node *ast.Node, tree *pa
func (tx *Transaction) doUpdateAttrViewColOptions(operation *Operation) (ret *TxErr) { func (tx *Transaction) doUpdateAttrViewColOptions(operation *Operation) (ret *TxErr) {
err := updateAttributeViewColumnOptions(operation) err := updateAttributeViewColumnOptions(operation)
if err != nil { if err != nil {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
return return
} }
@ -4095,7 +4095,7 @@ func updateAttributeViewColumnOptions(operation *Operation) (err error) {
func (tx *Transaction) doRemoveAttrViewColOption(operation *Operation) (ret *TxErr) { func (tx *Transaction) doRemoveAttrViewColOption(operation *Operation) (ret *TxErr) {
err := removeAttributeViewColumnOption(operation) err := removeAttributeViewColumnOption(operation)
if err != nil { if err != nil {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
return return
} }
@ -4147,7 +4147,7 @@ func removeAttributeViewColumnOption(operation *Operation) (err error) {
func (tx *Transaction) doUpdateAttrViewColOption(operation *Operation) (ret *TxErr) { func (tx *Transaction) doUpdateAttrViewColOption(operation *Operation) (ret *TxErr) {
err := updateAttributeViewColumnOption(operation) err := updateAttributeViewColumnOption(operation)
if err != nil { if err != nil {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
return return
} }
@ -4265,7 +4265,7 @@ func updateAttributeViewColumnOption(operation *Operation) (err error) {
func (tx *Transaction) doSetAttrViewColOptionDesc(operation *Operation) (ret *TxErr) { func (tx *Transaction) doSetAttrViewColOptionDesc(operation *Operation) (ret *TxErr) {
err := setAttributeViewColumnOptionDesc(operation) err := setAttributeViewColumnOptionDesc(operation)
if err != nil { if err != nil {
return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} return &TxErr{code: TxErrHandleAttributeView, id: operation.AvID, msg: err.Error()}
} }
return return
} }

10
kernel/model/transaction.go
View file

@ -98,7 +98,7 @@ func flushTx(tx *Transaction) {
return return
case TxErrCodeDataIsSyncing: case TxErrCodeDataIsSyncing:
util.PushMsg(Conf.Language(222), 5000) util.PushMsg(Conf.Language(222), 5000)
case TxErrWriteAttributeView: case TxErrHandleAttributeView:
util.PushMsg(Conf.language(258), 5000) util.PushMsg(Conf.language(258), 5000)
logging.LogErrorf("handle attribute view failed: %s", txErr.msg) logging.LogErrorf("handle attribute view failed: %s", txErr.msg)
default: default:
@ -123,10 +123,10 @@ func PerformTransactions(transactions *[]*Transaction) {
} }
const ( const (
TxErrCodeBlockNotFound = 0 TxErrCodeBlockNotFound = 0
TxErrCodeDataIsSyncing = 1 TxErrCodeDataIsSyncing = 1
TxErrCodeWriteTree = 2 TxErrCodeWriteTree = 2
TxErrWriteAttributeView = 3 TxErrHandleAttributeView = 3
) )
type TxErr struct { type TxErr struct {