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

🎨 属性视图增减列 https://github.com/siyuan-note/siyuan/issues/7521

Browse source
This commit is contained in:
Liang Ding 2023-03-15 20:31:41 +08:00
parent f0d4d7ed4b
commit 6eb5830d75
No known key found for this signature in database
GPG key ID: 136F30F901A2231D
2 changed files with 26 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
kernel/model/attribute_view.go
View file

@ -73,7 +73,23 @@ func (tx *Transaction) doRemoveAttrViewBlock(operation *Operation) (ret *TxErr)
return
}
func AddAttributeViewColumn(name string, typ string, columnIndex int, avID string) (err error) {
func (tx *Transaction) doAddAttrViewColumn(operation *Operation) (ret *TxErr) {
err := addAttributeViewColumn(operation.Name, operation.Typ, 1024, operation.ParentID)
if nil != err {
return &TxErr{code: TxErrWriteAttributeView, id: operation.ParentID, msg: err.Error()}
}
return
}
func (tx *Transaction) doRemoveAttrViewColumn(operation *Operation) (ret *TxErr) {
err := removeAttributeViewColumn(operation.ID, operation.ParentID)
if nil != err {
return &TxErr{code: TxErrWriteAttributeView, id: operation.ParentID, msg: err.Error()}
}
return
}
func addAttributeViewColumn(name string, typ string, columnIndex int, avID string) (err error) {
attrView, err := av.ParseAttributeView(avID)
if nil != err {
return
@ -93,7 +109,7 @@ func AddAttributeViewColumn(name string, typ string, columnIndex int, avID strin
return
}
func RemoveAttributeViewColumn(columnID string, avID string) (err error) {
func removeAttributeViewColumn(columnID string, avID string) (err error) {
attrView, err := av.ParseAttributeView(avID)
if nil != err {
return

9
kernel/model/transaction.go
View file

@ -218,6 +218,10 @@ func performTx(tx *Transaction) (ret *TxErr) {
ret = tx.doInsertAttrViewBlock(op)
case "removeAttrViewBlock":
ret = tx.doRemoveAttrViewBlock(op)
case "addAttrViewCol":
ret = tx.doAddAttrViewColumn(op)
case "removeAttrViewCol":
ret = tx.doRemoveAttrViewColumn(op)
}
if nil != ret {
@ -1026,9 +1030,12 @@ type Operation struct {
ParentID string `json:"parentID"`
PreviousID string `json:"previousID"`
NextID string `json:"nextID"`
SrcIDs []string `json:"srcIDs"` // 用于将块拖拽到属性视图中
RetData interface{} `json:"retData"`
SrcIDs []string `json:"srcIDs"` // 用于将块拖拽到属性视图中
Name string `json:"name"` // 用于属性视图列名
Typ string `json:"type"` // 用于属性视图列类型
discard bool // 用于标识是否在事务合并中丢弃
}