From 11feb97194eb1ffe27d0cda177eff15e42314553 Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Fri, 1 Mar 2024 23:02:04 +0800
Subject: [PATCH] :art: fix https://github.com/siyuan-note/siyuan/issues/10478

---
 app/src/assets/scss/business/_av.scss      | 7 +++++++
 app/src/protyle/render/av/filter.ts        | 4 ++--
 app/src/protyle/render/av/openMenuPanel.ts | 3 ++-
 app/src/protyle/render/av/render.ts        | 6 ++++--
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/app/src/assets/scss/business/_av.scss b/app/src/assets/scss/business/_av.scss
index bef13c8e4..4d7dfba03 100644
--- a/app/src/assets/scss/business/_av.scss
+++ b/app/src/assets/scss/business/_av.scss
@@ -57,6 +57,13 @@
       color: var(--b3-theme-on-surface);
       content: attr(data-tip);
     }
+
+    &--hide {
+      width: 0.1px;
+      overflow: hidden;
+      height: 0;
+      min-height: 0.1px !important;
+    }
   }
 
   &__counter {
diff --git a/app/src/protyle/render/av/filter.ts b/app/src/protyle/render/av/filter.ts
index 0be22b62b..4e2154449 100644
--- a/app/src/protyle/render/av/filter.ts
+++ b/app/src/protyle/render/av/filter.ts
@@ -348,7 +348,7 @@ export const setFilter = async (options: {
     <div class="fn__size200">
         <select class="b3-select fn__block" data-type="dataType">
             <option value="time"${!options.filter.relativeDate ? " selected" : ""}>${window.siyuan.languages.includeTime}</option>
-            <option value="custom"${options.filter.relativeDate ? " selected" : ""}>${window.siyuan.languages.custom}</option>
+            <option value="custom"${options.filter.relativeDate ? " selected" : ""}>${window.siyuan.languages.relativeToToday}</option>
         </select>
     </div>
     <div class="fn__hr"></div>
@@ -378,7 +378,7 @@ export const setFilter = async (options: {
     <div class="fn__size200">
         <select class="b3-select fn__block" data-type="dataType">
             <option value="time"${!options.filter.relativeDate2 ? " selected" : ""}>${window.siyuan.languages.includeTime}</option>
-            <option value="custom"${options.filter.relativeDate2 ? " selected" : ""}>${window.siyuan.languages.custom}</option>
+            <option value="custom"${options.filter.relativeDate2 ? " selected" : ""}>${window.siyuan.languages.relativeToToday}</option>
         </select>
     </div>
     <div class="fn__hr"></div>
diff --git a/app/src/protyle/render/av/openMenuPanel.ts b/app/src/protyle/render/av/openMenuPanel.ts
index d702de417..4aaa3479c 100644
--- a/app/src/protyle/render/av/openMenuPanel.ts
+++ b/app/src/protyle/render/av/openMenuPanel.ts
@@ -663,6 +663,7 @@ export const openMenuPanel = (options: {
                             id: data.viewID,
                             data: false
                         }]);
+                        options.blockElement.querySelector(".av__title").classList.add("av__title--hide");
                     } else {
                         transaction(options.protyle, [{
                             action: "hideAttrViewName",
@@ -675,8 +676,8 @@ export const openMenuPanel = (options: {
                             id: data.viewID,
                             data: true
                         }]);
+                        options.blockElement.querySelector(".av__title").classList.remove("av__title--hide");
                     }
-                    options.blockElement.querySelector(".av__title").classList.add("fn__none");
                     avPanelElement.remove();
                     event.preventDefault();
                     event.stopPropagation();
diff --git a/app/src/protyle/render/av/render.ts b/app/src/protyle/render/av/render.ts
index 76aa28426..fc40941eb 100644
--- a/app/src/protyle/render/av/render.ts
+++ b/app/src/protyle/render/av/render.ts
@@ -155,7 +155,9 @@ ${cell.color ? `color:${cell.color};` : ""}">${renderCell(cell.value)}</div>`;
     ${item.icon ? unicode2Emoji(item.icon, "item__graphic", true) : '<svg class="item__graphic"><use xlink:href="#iconTable"></use></svg>'}
     <span class="item__text">${item.name}</span>
 </div>`;
-                    viewData = item;
+                    if (item.id === response.data.viewID) {
+                        viewData = item;
+                    }
                 });
                 e.firstElementChild.outerHTML = `<div class="av__container" style="--av-background:${e.style.backgroundColor || "var(--b3-theme-background)"}">
     <div class="av__header">
@@ -194,7 +196,7 @@ ${cell.color ? `color:${cell.color};` : ""}">${renderCell(cell.value)}</div>`;
             ${response.data.isMirror ? ` <span class="block__icon block__icon--show ariaLabel" aria-label="${window.siyuan.languages.mirrorTip}">
     <svg><use xlink:href="#iconSplitLR"></use></svg></span><div class="fn__space"></div>` : ""}
         </div>
-        <div contenteditable="${protyle.disabled ? "false" : "true"}" spellcheck="${window.siyuan.config.editor.spellcheck.toString()}" class="av__title${viewData.hideAttrViewName ? " fn__none" : ""}" data-title="${response.data.name || ""}" data-tip="${window.siyuan.languages.title}">${response.data.name || ""}</div>
+        <div contenteditable="${protyle.disabled ? "false" : "true"}" spellcheck="${window.siyuan.config.editor.spellcheck.toString()}" class="av__title${viewData.hideAttrViewName ? " av__title--hide" : ""}" data-title="${response.data.name || ""}" data-tip="${window.siyuan.languages.title}">${response.data.name || ""}</div>
         <div class="av__counter fn__none"></div>
     </div>
     <div class="av__scroll">