Browse Source

:art: 标题块标菜单支持 `删除标题及下方块` 和 `剪切标题及下方块` https://github.com/siyuan-note/siyuan/issues/6135

Liang Ding 2 years ago
parent
commit
d0dc9c7d05
3 changed files with 66 additions and 0 deletions
  1. 22 0
      kernel/api/block.go
  2. 1 0
      kernel/api/router.go
  3. 43 0
      kernel/model/block.go

+ 22 - 0
kernel/api/block.go

@@ -66,6 +66,28 @@ func getHeadingChildrenDOM(c *gin.Context) {
 	ret.Data = dom
 }
 
+func getHeadingDeleteTransaction(c *gin.Context) {
+	ret := gulu.Ret.NewResult()
+	defer c.JSON(http.StatusOK, ret)
+
+	arg, ok := util.JsonArg(c, ret)
+	if !ok {
+		return
+	}
+
+	id := arg["id"].(string)
+
+	transaction, err := model.GetHeadingDeleteTransaction(id)
+	if nil != err {
+		ret.Code = -1
+		ret.Msg = err.Error()
+		ret.Data = map[string]interface{}{"closeTimeout": 7000}
+		return
+	}
+
+	ret.Data = transaction
+}
+
 func getHeadingLevelTransaction(c *gin.Context) {
 	ret := gulu.Ret.NewResult()
 	defer c.JSON(http.StatusOK, ret)

+ 1 - 0
kernel/api/router.go

@@ -148,6 +148,7 @@ func ServeAPI(ginServer *gin.Engine) {
 	ginServer.Handle("POST", "/api/block/deleteBlock", model.CheckAuth, deleteBlock)
 	ginServer.Handle("POST", "/api/block/setBlockReminder", model.CheckAuth, setBlockReminder)
 	ginServer.Handle("POST", "/api/block/getHeadingLevelTransaction", model.CheckAuth, getHeadingLevelTransaction)
+	ginServer.Handle("POST", "/api/block/getHeadingDeleteTransaction", model.CheckAuth, getHeadingDeleteTransaction)
 	ginServer.Handle("POST", "/api/block/getHeadingChildrenDOM", model.CheckAuth, getHeadingChildrenDOM)
 	ginServer.Handle("POST", "/api/block/swapBlockRef", model.CheckAuth, swapBlockRef)
 

+ 43 - 0
kernel/model/block.go

@@ -209,6 +209,49 @@ func SwapBlockRef(refID, defID string, includeChildren bool) (err error) {
 	return
 }
 
+func GetHeadingDeleteTransaction(id string) (transaction *Transaction, err error) {
+	tree, err := loadTreeByBlockID(id)
+	if nil != err {
+		return
+	}
+
+	node := treenode.GetNodeInTree(tree, id)
+	if nil == node {
+		err = errors.New(fmt.Sprintf(Conf.Language(15), id))
+		return
+	}
+
+	if ast.NodeHeading != node.Type {
+		return
+	}
+
+	var nodes []*ast.Node
+	nodes = append(nodes, node)
+	nodes = append(nodes, treenode.HeadingChildren(node)...)
+
+	transaction = &Transaction{}
+	luteEngine := NewLute()
+	for _, n := range nodes {
+		op := &Operation{}
+		op.ID = n.ID
+		op.Action = "delete"
+		transaction.DoOperations = append(transaction.DoOperations, op)
+
+		op = &Operation{}
+		op.ID = n.ID
+		if nil != n.Parent {
+			op.ParentID = n.Parent.ID
+		}
+		if nil != n.Parent {
+			op.PreviousID = n.Previous.ID
+		}
+		op.Action = "insert"
+		op.Data = lute.RenderNodeBlockDOM(n, luteEngine.ParseOptions, luteEngine.RenderOptions)
+		transaction.UndoOperations = append(transaction.UndoOperations, op)
+	}
+	return
+}
+
 func GetHeadingChildrenDOM(id string) (ret string) {
 	tree, err := loadTreeByBlockID(id)
 	if nil != err {