🎨 fix #11843

siyuan-note · Jul 4, 2024 · 904b9fa · 904b9fa
1 parent e99c37a
commit 904b9fa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/app/src/layout/dock/Outline.ts b/app/src/layout/dock/Outline.ts
@@ -375,18 +375,21 @@ export class Outline extends Model {
         }
         let needReload = false;
         const ops = data.data.sources[0];
-        ops.doOperations.forEach((item: IOperation) => {
+        ops.doOperations.find((item: IOperation) => {
             if ((item.action === "update" || item.action === "insert") &&
                 (item.data.indexOf('data-type="NodeHeading"') > -1 || item.data.indexOf(`<div contenteditable="true" spellcheck="${window.siyuan.config.editor.spellcheck}"><wbr></div>`) > -1)) {
                 needReload = true;
+                return true
             } else if (item.action === "delete" || item.action === "move") {
                 needReload = true;
+                return true;
             }
         });
-        if (ops.undoOperations) {
-            ops.undoOperations.forEach((item: IOperation) => {
+        if (!needReload && ops.undoOperations) {
+            ops.undoOperations.find((item: IOperation) => {
                 if (item.action === "update" && item.data.indexOf('data-type="NodeHeading"') > -1) {
                     needReload = true;
+                    return true;
                 }
             });
         }

diff --git a/app/src/util/Tree.ts b/app/src/util/Tree.ts
@@ -84,6 +84,7 @@ export class Tree {
                 style = `padding-left: ${(item.depth - 1) * 18 + 22}px;margin-right: 2px`;
             }
             const showArrow = hasChild || (item.type === "backlink" && !isMobile());
+            // data-id 需要添加 item.id，否则大纲更新时 name 不一致导致 https://github.com/siyuan-note/siyuan/issues/11843
             html += `<li class="b3-list-item${isMobile() ? "" : " b3-list-item--hide-action"}" 
 ${item.id ? 'data-node-id="' + item.id + '"' : ""} 
 ${item.box ? 'data-notebook-id="' + item.box + '"' : ""} 
@@ -93,7 +94,7 @@ data-type="${item.nodeType}"
 data-subtype="${item.subType}" 
 ${item.label ? "data-label='" + item.label + "'" : ""}>
     <span style="${style}" class="b3-list-item__toggle${showArrow ? " b3-list-item__toggle--hl" : ""}${showArrow ? "" : " fn__hidden"}">
-        <svg data-id="${encodeURIComponent(item.name + item.depth)}" class="b3-list-item__arrow${hasChild ? " b3-list-item__arrow--open" : ""}"><use xlink:href="#iconRight"></use></svg>
+        <svg data-id="${item.id || encodeURIComponent(item.name + item.depth)}" class="b3-list-item__arrow${hasChild ? " b3-list-item__arrow--open" : ""}"><use xlink:href="#iconRight"></use></svg>
     </span>
     ${iconHTML}
     <span class="b3-list-item__text ariaLabel" data-position="parentE"${titleTip}>${item.name}</span>