Browse Source

:art: https://github.com/siyuan-note/siyuan/pull/13206

Vanessa 8 months ago
parent
commit
e6578a39bf
2 changed files with 13 additions and 14 deletions
  1. 12 13
      app/src/protyle/render/av/action.ts
  2. 1 1
      app/src/protyle/render/av/row.ts

+ 12 - 13
app/src/protyle/render/av/action.ts

@@ -43,20 +43,9 @@ export const avClick = (protyle: IProtyle, event: MouseEvent & { target: HTMLEle
     if (!blockElement) {
         return false;
     }
-    const setPageSizeElement = hasClosestByAttribute(event.target, "data-type", "set-page-size");
-    if (setPageSizeElement) {
-        setPageSize({
-            target: event.target,
-            protyle,
-            avID: blockElement.getAttribute("data-av-id"),
-            nodeElement: blockElement
-        });
-        event.preventDefault();
-        event.stopPropagation();
-        return true;
-    }
+
     const loadMoreElement = hasClosestByAttribute(event.target, "data-type", "av-load-more");
-    if (loadMoreElement) {
+    if (loadMoreElement && !hasClosestByAttribute(event.target, "data-type", "set-page-size")) {
         (blockElement.querySelector(".av__row--footer") as HTMLElement).style.transform = "";
         blockElement.removeAttribute("data-render");
         blockElement.dataset.pageSize = (parseInt(blockElement.dataset.pageSize) + parseInt(blockElement.querySelector('[data-type="set-page-size"]').getAttribute("data-size"))).toString();
@@ -193,6 +182,16 @@ export const avClick = (protyle: IProtyle, event: MouseEvent & { target: HTMLEle
             event.preventDefault();
             event.stopPropagation();
             return true;
+        } else if (type === "set-page-size") {
+            setPageSize({
+                target,
+                protyle,
+                avID: blockElement.getAttribute("data-av-id"),
+                nodeElement: blockElement
+            });
+            event.preventDefault();
+            event.stopPropagation();
+            return true;
         } else if (type === "av-add-bottom") {
             insertRows(blockElement, protyle, 1, blockElement.querySelector(".av__row--util").previousElementSibling.getAttribute("data-id") || "");
             event.preventDefault();

+ 1 - 1
app/src/protyle/render/av/row.ts

@@ -149,7 +149,7 @@ ${getTypeByCellElement(item) === "block" ? ' data-detached="true"' : ""}><span c
     if (avId) {
         const currentRow = previousElement.nextElementSibling;
         if (blockElement.querySelector('.av__views [data-type="av-sort"]').classList.contains("block__icon--active") &&
-            !blockElement.querySelector('[data-type="av-load-more"]').parentElement.classList.contains("fn__none")) {
+            !blockElement.querySelector('[data-type="av-load-more"]').classList.contains("fn__none")) {
             currentRow.setAttribute("data-need-update", "true");
         }
         const sideRow = previousElement.classList.contains("av__row--header") ? currentRow.nextElementSibling : previousElement;