From cb726e0118f62c00423dd53ad8a068d13c4148b1 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Mon, 4 Mar 2024 15:57:35 +0800 Subject: [PATCH] :art: Database block support specified view https://github.com/siyuan-note/siyuan/issues/10443 --- kernel/api/av.go | 12 +++++-- kernel/api/export.go | 3 +- kernel/av/av.go | 16 +++++++-- kernel/model/attribute_view.go | 63 ++++++++++++++++------------------ kernel/model/export.go | 7 ++-- kernel/model/template.go | 3 +- kernel/model/transaction.go | 1 + 7 files changed, 62 insertions(+), 43 deletions(-) diff --git a/kernel/api/av.go b/kernel/api/av.go index 3a037b0a0..0e8bdb078 100644 --- a/kernel/api/av.go +++ b/kernel/api/av.go @@ -91,6 +91,10 @@ func addAttributeViewValues(c *gin.Context) { } avID := arg["avID"].(string) + viewID := "" + if viewIDArg := arg["viewID"]; nil != viewIDArg { + viewID = viewIDArg.(string) + } var srcIDs []string for _, v := range arg["srcIDs"].([]interface{}) { srcIDs = append(srcIDs, v.(string)) @@ -101,7 +105,7 @@ func addAttributeViewValues(c *gin.Context) { } isDetached := arg["isDetached"].(bool) - err := model.AddAttributeViewBlock(nil, srcIDs, avID, previousID, isDetached) + err := model.AddAttributeViewBlock(nil, srcIDs, avID, viewID, previousID, isDetached) if nil != err { ret.Code = -1 ret.Msg = err.Error() @@ -194,10 +198,14 @@ func sortAttributeViewCol(c *gin.Context) { } avID := arg["avID"].(string) + viewID := "" + if viewIDArg := arg["viewID"]; nil != viewIDArg { + viewID = viewIDArg.(string) + } keyID := arg["keyID"].(string) previousKeyID := arg["previousKeyID"].(string) - err := model.SortAttributeViewKey(avID, keyID, previousKeyID) + err := model.SortAttributeViewKey(avID, viewID, keyID, previousKeyID) if nil != err { ret.Code = -1 ret.Msg = err.Error() diff --git a/kernel/api/export.go b/kernel/api/export.go index 539c257fa..71ea908b5 100644 --- a/kernel/api/export.go +++ b/kernel/api/export.go @@ -43,7 +43,8 @@ func exportAttributeView(c *gin.Context) { } avID := arg["id"].(string) - zipPath, err := model.ExportAv2CSV(avID) + viewID := arg["viewID"].(string) + zipPath, err := model.ExportAv2CSV(avID, viewID) if nil != err { ret.Code = 1 ret.Msg = err.Error() diff --git a/kernel/av/av.go b/kernel/av/av.go index aa381aac7..85c661df9 100644 --- a/kernel/av/av.go +++ b/kernel/av/av.go @@ -376,14 +376,26 @@ func (av *AttributeView) GetView(viewID string) (ret *View) { return } -func (av *AttributeView) GetCurrentView() (ret *View, err error) { +func (av *AttributeView) GetCurrentView(viewID string) (ret *View, err error) { + if "" != viewID { + ret = av.GetView(viewID) + if nil != ret { + return + } + } + for _, v := range av.Views { if v.ID == av.ViewID { ret = v return } } - err = ErrViewNotFound + + if 1 > len(av.Views) { + err = ErrViewNotFound + return + } + ret = av.Views[0] return } diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go index 942ad365b..491c9bfa5 100644 --- a/kernel/model/attribute_view.go +++ b/kernel/model/attribute_view.go @@ -400,7 +400,8 @@ func GetBlockAttributeViewKeys(blockID string) (ret []*BlockAttributeViewKeys) { } // Attribute Panel - Database sort attributes by view column order https://github.com/siyuan-note/siyuan/issues/9319 - view, _ := attrView.GetCurrentView() + viewID := attrs[av.NodeAttrView] + view, _ := attrView.GetCurrentView(viewID) if nil != view { sorts := map[string]int{} for i, col := range view.Table.Columns { @@ -580,11 +581,7 @@ func renderAttributeView(attrView *av.AttributeView, viewID string, page, pageSi var view *av.View if "" != viewID { - view = attrView.GetView(viewID) - if nil == view { - view, _ = attrView.GetCurrentView() - } - + view, _ = attrView.GetCurrentView(viewID) if nil != view && view.ID != attrView.ViewID { attrView.ViewID = view.ID if err = av.SaveAttributeView(attrView); nil != err { @@ -593,9 +590,7 @@ func renderAttributeView(attrView *av.AttributeView, viewID string, page, pageSi } } } else { - if "" != attrView.ViewID { - view, _ = attrView.GetCurrentView() - } + view = attrView.GetView(attrView.ViewID) } if nil == view { @@ -1073,7 +1068,7 @@ func hideAttrViewName(operation *Operation) (err error) { return } - viewID := operation.ID + viewID := operation.ViewID view := attrView.GetView(viewID) if nil == view { logging.LogErrorf("get view [%s] failed: %s", viewID, err) @@ -1279,7 +1274,7 @@ func (tx *Transaction) doSortAttrViewView(operation *Operation) (ret *TxErr) { return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} } - viewID := operation.ID + viewID := operation.ViewID previewViewID := operation.PreviousID if viewID == previewViewID { @@ -1325,11 +1320,11 @@ func (tx *Transaction) doRemoveAttrViewView(operation *Operation) (ret *TxErr) { } if 1 >= len(attrView.Views) { - logging.LogWarnf("can't remove last view [%s] of attribute view [%s]", operation.ID, avID) + logging.LogWarnf("can't remove last view [%s] of attribute view [%s]", operation.ViewID, avID) return } - viewID := operation.ID + viewID := operation.ViewID var index int for i, view := range attrView.Views { if viewID == view.ID { @@ -1419,7 +1414,7 @@ func (tx *Transaction) doDuplicateAttrViewView(operation *Operation) (ret *TxErr } view := av.NewTableView() - view.ID = operation.ID + view.ID = operation.ViewID attrView.Views = append(attrView.Views, view) attrView.ViewID = view.ID @@ -1482,7 +1477,7 @@ func (tx *Transaction) doAddAttrViewView(operation *Operation) (ret *TxErr) { } view := av.NewTableView() - view.ID = operation.ID + view.ID = operation.ViewID attrView.Views = append(attrView.Views, view) attrView.ViewID = view.ID @@ -1508,7 +1503,7 @@ func (tx *Transaction) doSetAttrViewViewName(operation *Operation) (ret *TxErr) return &TxErr{code: TxErrWriteAttributeView, id: avID} } - viewID := operation.ID + viewID := operation.ViewID view := attrView.GetView(viewID) if nil == view { logging.LogErrorf("get view [%s] failed: %s", viewID, err) @@ -1532,7 +1527,7 @@ func (tx *Transaction) doSetAttrViewViewIcon(operation *Operation) (ret *TxErr) return &TxErr{code: TxErrWriteAttributeView, id: avID} } - viewID := operation.ID + viewID := operation.ViewID view := attrView.GetView(viewID) if nil == view { logging.LogErrorf("get view [%s] failed: %s", viewID, err) @@ -1580,7 +1575,7 @@ func setAttributeViewFilters(operation *Operation) (err error) { return } - view, err := attrView.GetCurrentView() + view, err := attrView.GetCurrentView(operation.ViewID) if nil != err { return } @@ -1628,7 +1623,7 @@ func setAttributeViewSorts(operation *Operation) (err error) { return } - view, err := attrView.GetCurrentView() + view, err := attrView.GetCurrentView(operation.ID) if nil != err { return } @@ -1664,7 +1659,7 @@ func setAttributeViewPageSize(operation *Operation) (err error) { return } - view, err := attrView.GetCurrentView() + view, err := attrView.GetCurrentView(operation.ID) if nil != err { return } @@ -1692,7 +1687,7 @@ func setAttributeViewColumnCalc(operation *Operation) (err error) { return } - view, err := attrView.GetCurrentView() + view, err := attrView.GetCurrentView(operation.ViewID) if nil != err { return } @@ -1723,14 +1718,14 @@ func setAttributeViewColumnCalc(operation *Operation) (err error) { } func (tx *Transaction) doInsertAttrViewBlock(operation *Operation) (ret *TxErr) { - err := AddAttributeViewBlock(tx, operation.SrcIDs, operation.AvID, operation.PreviousID, operation.IsDetached) + err := AddAttributeViewBlock(tx, operation.SrcIDs, operation.AvID, operation.ViewID, operation.PreviousID, operation.IsDetached) if nil != err { return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} } return } -func AddAttributeViewBlock(tx *Transaction, srcIDs []string, avID, previousBlockID string, isDetached bool) (err error) { +func AddAttributeViewBlock(tx *Transaction, srcIDs []string, avID, viewID, previousBlockID string, isDetached bool) (err error) { for _, id := range srcIDs { var tree *parse.Tree if !isDetached { @@ -1746,14 +1741,14 @@ func AddAttributeViewBlock(tx *Transaction, srcIDs []string, avID, previousBlock } } - if avErr := addAttributeViewBlock(avID, previousBlockID, id, isDetached, tree, tx); nil != avErr { + if avErr := addAttributeViewBlock(avID, viewID, previousBlockID, id, isDetached, tree, tx); nil != avErr { return avErr } } return } -func addAttributeViewBlock(avID, previousBlockID, blockID string, isDetached bool, tree *parse.Tree, tx *Transaction) (err error) { +func addAttributeViewBlock(avID, viewID, previousBlockID, blockID string, isDetached bool, tree *parse.Tree, tx *Transaction) (err error) { var node *ast.Node if !isDetached { node = treenode.GetNodeInTree(tree, blockID) @@ -1803,7 +1798,7 @@ func addAttributeViewBlock(avID, previousBlockID, blockID string, isDetached boo blockValues.Values = append(blockValues.Values, blockValue) // 如果存在过滤条件，则将过滤条件应用到新添加的块上 - view, _ := attrView.GetCurrentView() + view, _ := attrView.GetCurrentView(viewID) if nil != view && (0 < len(view.Table.Filters) || 0 < len(view.Table.Sorts)) { viewable, _ := renderAttributeViewTable(attrView, view) viewable.FilterRows(attrView) @@ -1998,7 +1993,7 @@ func setAttributeViewColWidth(operation *Operation) (err error) { return } - view, err := attrView.GetCurrentView() + view, err := attrView.GetCurrentView(operation.ViewID) if nil != err { return } @@ -2031,7 +2026,7 @@ func setAttributeViewColWrap(operation *Operation) (err error) { return } - view, err := attrView.GetCurrentView() + view, err := attrView.GetCurrentView(operation.ViewID) if nil != err { return } @@ -2064,7 +2059,7 @@ func setAttributeViewColHidden(operation *Operation) (err error) { return } - view, err := attrView.GetCurrentView() + view, err := attrView.GetCurrentView(operation.ViewID) if nil != err { return } @@ -2097,7 +2092,7 @@ func setAttributeViewColPin(operation *Operation) (err error) { return } - view, err := attrView.GetCurrentView() + view, err := attrView.GetCurrentView(operation.ViewID) if nil != err { return } @@ -2155,7 +2150,7 @@ func sortAttributeViewRow(operation *Operation) (err error) { return } - view, err := attrView.GetCurrentView() + view, err := attrView.GetCurrentView(operation.ViewID) if nil != err { return } @@ -2192,20 +2187,20 @@ func sortAttributeViewRow(operation *Operation) (err error) { } func (tx *Transaction) doSortAttrViewColumn(operation *Operation) (ret *TxErr) { - err := SortAttributeViewKey(operation.AvID, operation.ID, operation.PreviousID) + err := SortAttributeViewKey(operation.AvID, operation.ViewID, operation.ID, operation.PreviousID) if nil != err { return &TxErr{code: TxErrWriteAttributeView, id: operation.AvID, msg: err.Error()} } return } -func SortAttributeViewKey(avID, keyID, previousKeyID string) (err error) { +func SortAttributeViewKey(avID, viewID, keyID, previousKeyID string) (err error) { attrView, err := av.ParseAttributeView(avID) if nil != err { return } - view, err := attrView.GetCurrentView() + view, err := attrView.GetCurrentView(viewID) if nil != err { return } diff --git a/kernel/model/export.go b/kernel/model/export.go index 481d40e18..6a7ae3d98 100644 --- a/kernel/model/export.go +++ b/kernel/model/export.go @@ -56,7 +56,7 @@ import ( "github.com/siyuan-note/siyuan/kernel/util" ) -func ExportAv2CSV(avID string) (zipPath string, err error) { +func ExportAv2CSV(avID, viewID string) (zipPath string, err error) { // Database block supports export as CSV https://github.com/siyuan-note/siyuan/issues/10072 attrView, err := av.ParseAttributeView(avID) @@ -64,7 +64,7 @@ func ExportAv2CSV(avID string) (zipPath string, err error) { return } - view, err := attrView.GetCurrentView() + view, err := attrView.GetCurrentView(viewID) if nil != err { return } @@ -2243,7 +2243,8 @@ func exportTree(tree *parse.Tree, wysiwyg, expandKaTexMacros, keepFold bool, return ast.WalkContinue } - view, err := attrView.GetCurrentView() + viewID := n.IALAttr(av.NodeAttrView) + view, err := attrView.GetCurrentView(viewID) if nil != err { logging.LogErrorf("get attribute view [%s] failed: %s", avID, err) return ast.WalkContinue diff --git a/kernel/model/template.go b/kernel/model/template.go index 3b6bbceff..a60ff0d88 100644 --- a/kernel/model/template.go +++ b/kernel/model/template.go @@ -299,7 +299,8 @@ func renderTemplate(p, id string, preview bool) (string, error) { } } else { // 预览时使用简单表格渲染 - view, getErr := attrView.GetCurrentView() + viewID := n.IALAttr(av.NodeAttrView) + view, getErr := attrView.GetCurrentView(viewID) if nil != getErr { logging.LogErrorf("get attribute view [%s] failed: %s", n.AttributeViewID, getErr) return ast.WalkContinue diff --git a/kernel/model/transaction.go b/kernel/model/transaction.go index 66715aa4f..75219fe90 100644 --- a/kernel/model/transaction.go +++ b/kernel/model/transaction.go @@ -1231,6 +1231,7 @@ type Operation struct { DeckID string `json:"deckID"` // 用于添加/删除闪卡 AvID string `json:"avID"` // 属性视图 ID + ViewID string `json:"viewID"` // 属性视图视图 ID SrcIDs []string `json:"srcIDs"` // 用于将块拖拽到属性视图中 IsDetached bool `json:"isDetached"` // 用于标识是否是脱离块，仅存在于属性视图中 Name string `json:"name"` // 属性视图列名