From b7780e8becf4d1fc3dea4d5037e3be5e4006ad61 Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Mon, 18 Nov 2024 16:42:04 +0800
Subject: [PATCH] :art: https://github.com/siyuan-note/siyuan/issues/11053

---
 app/src/dialog/tooltip.ts           | 4 ++--
 app/src/protyle/render/av/select.ts | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/dialog/tooltip.ts b/app/src/dialog/tooltip.ts
index 2e89e4094..ffd126145 100644
--- a/app/src/dialog/tooltip.ts
+++ b/app/src/dialog/tooltip.ts
@@ -42,9 +42,9 @@ export const showTooltip = (message: string, target: Element, tooltipClass?: str
         // file tree and outline、backlink
         top = parentRect.top;
         left = parentRect.right + 8;
-    } else if (position === "parentW") {
+    } else if (position?.endsWith("parentW")) {
         // 数据库属性视图
-        top = parentRect.top + 8;
+        top = parentRect.top + parseInt(position) || 8;
         left = parentRect.left - messageElement.clientWidth;
     }
 
diff --git a/app/src/protyle/render/av/select.ts b/app/src/protyle/render/av/select.ts
index eb64c86a8..660f067e7 100644
--- a/app/src/protyle/render/av/select.ts
+++ b/app/src/protyle/render/av/select.ts
@@ -31,7 +31,7 @@ const filterSelectHTML = (key: string, options: {
                 html += `<button data-type="addColOptionOrCell" class="b3-menu__item" data-name="${escapeAttr(item.name)}" data-desc="${escapeAttr(item.desc || "")}" draggable="true" data-color="${item.color}">
     <svg class="b3-menu__icon fn__grab"><use xlink:href="#iconDrag"></use></svg>
     <div class="fn__flex-1">
-        <span class="b3-chip" style="background-color:var(--b3-font-background${item.color});color:var(--b3-font-color${item.color})">
+        <span class="b3-chip ariaLabel" data-position="2parentW" aria-label="${escapeAriaLabel(item.desc)}" style="background-color:var(--b3-font-background${item.color});color:var(--b3-font-color${item.color})">
             <span class="fn__ellipsis">${escapeHtml(item.name)}</span>
         </span>
     </div>
@@ -50,7 +50,7 @@ const filterSelectHTML = (key: string, options: {
 <svg class="b3-menu__icon"><use xlink:href="#iconAdd"></use></svg>
 <div class="fn__flex-1">
     <span class="b3-chip" style="background-color:var(--b3-font-background${colorIndex});color:var(--b3-font-color${colorIndex})">
-        <span class="fn__ellipsis">${key}</span>
+        <span class="fn__ellipsis">${escapeHtml(key)}</span>
     </span>
 </div>
 <span class="b3-menu__accelerator">${window.siyuan.languages.enterKey}</span>
@@ -165,6 +165,7 @@ export const setColOption = (protyle: IProtyle, data: IAV, target: HTMLElement,
                 column.options.find((item) => {
                     if (item.name === name) {
                         item.name = inputElement.value;
+                        item.desc = descElement.value;
                         return true;
                     }
                 });
@@ -241,6 +242,7 @@ export const setColOption = (protyle: IProtyle, data: IAV, target: HTMLElement,
                 }
             })
             descElement.addEventListener("keydown", (event: KeyboardEvent) => {
+                inputElement.nextElementSibling.setAttribute("aria-label", descElement.value ? escapeAriaLabel(descElement.value) : window.siyuan.languages.addDesc);
                 if (event.isComposing) {
                     return;
                 }