Merge remote-tracking branch 'origin/dev' into dev

app/src/constants.ts

@@ -225,6 +225,7 @@ export abstract class Constants {
     public static readonly DIALOG_SAVEWORKSPACE = "dialog-saveworkspace"; // 保存工作空间
 
     // timeout
+    public static readonly TIMEOUT_OPENDIALOG = 50;
     public static readonly TIMEOUT_DBLCLICK = 190;
     public static readonly TIMEOUT_INPUT = 256;
     public static readonly TIMEOUT_LOAD = 300;

app/src/dialog/index.ts

@@ -78,7 +78,7 @@ left:${left || "auto"};top:${top || "auto"}">
         } else {
             setTimeout(() => {
                 this.element.classList.add("b3-dialog--open");
-            });
+            }, Constants.TIMEOUT_OPENDIALOG);
         }
         /// #if !MOBILE
         moveResize(this.element.querySelector(".b3-dialog__container"), options.resizeCallback);

kernel/model/transaction.go

@@ -1222,6 +1222,12 @@ func (tx *Transaction) doInsert(operation *Operation) (ret *TxErr) {
 			node.InsertAfter(remain)
 		}
 		node.InsertAfter(insertedNode)
+
+		if treenode.IsUnderFoldedHeading(insertedNode) {
+			// 保持在标题下的折叠状态
+			insertedNode.SetIALAttr("fold", "1")
+			insertedNode.SetIALAttr("heading-fold", "1")
+		}
 	} else {
 		node = treenode.GetNodeInTree(tree, operation.ParentID)
 		if nil == node {
@@ -1459,6 +1465,12 @@ func (tx *Transaction) doUpdate(operation *Operation) (ret *TxErr) {
 	oldNode.InsertAfter(updatedNode)
 	oldNode.Unlink()
 
+	if treenode.IsUnderFoldedHeading(updatedNode) {
+		// 保持在标题下的折叠状态
+		updatedNode.SetIALAttr("fold", "1")
+		updatedNode.SetIALAttr("heading-fold", "1")
+	}
+
 	createdUpdated(updatedNode)
 
 	tx.nodes[updatedNode.ID] = updatedNode

kernel/treenode/heading.go

@@ -85,6 +85,20 @@ func GetHeadingFold(nodes []*ast.Node) (ret []*ast.Node) {
 	return
 }
 
+func IsUnderFoldedHeading(node *ast.Node) bool {
+	for n := node.Previous; nil != n; n = n.Previous {
+		if ast.NodeHeading == n.Type && "1" == n.IALAttr("fold") {
+			if ast.NodeHeading != node.Type {
+				return true
+			}
+			if n.HeadingLevel > node.HeadingLevel {
+				return true
+			}
+		}
+	}
+	return false
+}
+
 func HeadingChildren(heading *ast.Node) (ret []*ast.Node) {
 	start := heading.Next
 	if nil == start {