From b63bd969924f04ec31512010fcaf136f113fbfbc Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Wed, 8 Nov 2023 11:53:37 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E9=98=B2=E6=AD=A2=E9=81=AE=E6=8C=A1?=
 =?UTF-8?q?=E5=8F=AF=E5=B7=A6=E5=8F=B3=E6=BB=9A=E5=8A=A8=E7=9A=84=20cell?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/assets/scss/business/_av.scss |  2 +-
 app/src/protyle/gutter/index.ts       | 13 ++++++++++---
 app/src/protyle/render/av/render.ts   |  2 +-
 app/src/protyle/scroll/event.ts       |  2 +-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/app/src/assets/scss/business/_av.scss b/app/src/assets/scss/business/_av.scss
index 9f80ce089..ae78b0269 100644
--- a/app/src/assets/scss/business/_av.scss
+++ b/app/src/assets/scss/business/_av.scss
@@ -80,7 +80,7 @@
   }
 
   &__scroll {
-    // overflow: auto hidden; 不能使用，否则 https://ld246.com/article/1699077234816
+    overflow: auto hidden;
     cursor: pointer;
   }
 
diff --git a/app/src/protyle/gutter/index.ts b/app/src/protyle/gutter/index.ts
index c74bccd4e..c57fa7296 100644
--- a/app/src/protyle/gutter/index.ts
+++ b/app/src/protyle/gutter/index.ts
@@ -1916,11 +1916,18 @@ data-type="fold"><svg style="width:10px${fold && fold === "1" ? "" : ";transform
         }
         if (nodeElement.getAttribute("data-type") === "NodeAttributeView") {
             const iconElement = nodeElement.querySelector(".item__graphic");
+            let top = rect.top + 8
             if (iconElement) {
-                this.element.style.top = `${Math.max(iconElement.getBoundingClientRect().top - (window.siyuan.config.editor.fontSize * 1.625 - 14) / 2, wysiwyg.parentElement.getBoundingClientRect().top)}px`;
-            } else {
-                this.element.style.top = `${Math.max(rect.top, wysiwyg.parentElement.getBoundingClientRect().top) + 8}px`;
+                top = iconElement.getBoundingClientRect().top - (window.siyuan.config.editor.fontSize * 1.625 - 14) / 2;
             }
+            // 防止遮挡可左右滚动的 cell
+            const maxTop = wysiwyg.parentElement.getBoundingClientRect().top
+            if (top < maxTop - 43) {
+                top = -1000
+            } else if (top > maxTop - 43 && top <= maxTop) {
+                top = maxTop
+            }
+            this.element.style.top = `${top}px`;
         } else {
             this.element.style.top = `${Math.max(rect.top, wysiwyg.parentElement.getBoundingClientRect().top) + marginHeight}px`;
         }
diff --git a/app/src/protyle/render/av/render.ts b/app/src/protyle/render/av/render.ts
index c9c2e26e0..42ed89242 100644
--- a/app/src/protyle/render/av/render.ts
+++ b/app/src/protyle/render/av/render.ts
@@ -151,7 +151,7 @@ style="width: ${column.width || "200px"}">${getCalcValue(column) || '<svg><use x
                         }
                         if (["text", "template", "url", "email", "phone", "number", "date", "created", "updated"].includes(cell.valueType)) {
                             if (cell.value && cell.value[cell.valueType as "url"].content) {
-                                text += `<span data-type="copy" class="b3-tooltips b3-tooltips__n block__icon" aria-label="${window.siyuan.languages.copy}"><svg><use xlink:href="#iconCopy"></use></svg></span>`;
+                                text += `<span ${cell.valueType !== "number" ? "" : 'style="right:auto;left:5px"'} data-type="copy" class="b3-tooltips b3-tooltips__n block__icon" aria-label="${window.siyuan.languages.copy}"><svg><use xlink:href="#iconCopy"></use></svg></span>`;
                             }
                         }
                         tableHTML += `<div class="av__cell" data-id="${cell.id}" data-col-id="${data.columns[index].id}"
diff --git a/app/src/protyle/scroll/event.ts b/app/src/protyle/scroll/event.ts
index 71bca5e9f..99fb14f50 100644
--- a/app/src/protyle/scroll/event.ts
+++ b/app/src/protyle/scroll/event.ts
@@ -26,7 +26,7 @@ export const scrollEvent = (protyle: IProtyle, element: HTMLElement) => {
 
         protyle.wysiwyg.element.querySelectorAll(".av").forEach((item: HTMLElement) => {
             if (item.parentElement.classList.contains("protyle-wysiwyg")) {
-                const headerTop = item.offsetTop + 48;
+                const headerTop = item.offsetTop + 43;
                 const headerElement = item.querySelector(".av__row--header") as HTMLElement;
                 if (headerElement) {
                     if (headerTop < element.scrollTop && headerTop + headerElement.parentElement.clientHeight > element.scrollTop) {