From 200fce90e804d85b6c37acde3b6c0fbb3d93d705 Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Wed, 3 Apr 2024 23:40:43 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E4=BF=AE=E6=94=B9=E5=90=8D=E5=AD=97?=
 =?UTF-8?q?=E5=90=8E=E6=9B=B4=E6=96=B0=E5=88=97=E7=B1=BB=E5=9E=8B=E3=80=82?=
 =?UTF-8?q?=E5=90=8D=E5=AD=97=E4=BC=9A=E8=A2=AB=E9=87=8D=E7=BD=AE=E4=B8=BA?=
 =?UTF-8?q?=E4=BB=A5=E5=89=8D=E7=9A=84=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/protyle/render/av/col.ts           | 34 +++++++++++-----------
 app/src/protyle/render/av/openMenuPanel.ts |  4 +--
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/app/src/protyle/render/av/col.ts b/app/src/protyle/render/av/col.ts
index 4ba4bd57b..956ab6267 100644
--- a/app/src/protyle/render/av/col.ts
+++ b/app/src/protyle/render/av/col.ts
@@ -216,21 +216,21 @@ export const getEditHTML = (options: {
         <span class="b3-menu__label ft__center">${window.siyuan.languages.edit}</span>
     </button>
     <button class="b3-menu__separator"></button>
-    ${genUpdateColItem("text", colData.type, colData.name)}
-    ${genUpdateColItem("number", colData.type, colData.name)}
-    ${genUpdateColItem("select", colData.type, colData.name)}
-    ${genUpdateColItem("mSelect", colData.type, colData.name)}
-    ${genUpdateColItem("date", colData.type, colData.name)}
-    ${genUpdateColItem("mAsset", colData.type, colData.name)}
-    ${genUpdateColItem("checkbox", colData.type, colData.name)}
-    ${genUpdateColItem("url", colData.type, colData.name)}
-    ${genUpdateColItem("email", colData.type, colData.name)}
-    ${genUpdateColItem("phone", colData.type, colData.name)}
-    ${genUpdateColItem("template", colData.type, colData.name)}
-    ${genUpdateColItem("relation", colData.type, colData.name)}
-    ${genUpdateColItem("rollup", colData.type, colData.name)}
-    ${genUpdateColItem("created", colData.type, colData.name)}
-    ${genUpdateColItem("updated", colData.type, colData.name)}
+    ${genUpdateColItem("text", colData.type)}
+    ${genUpdateColItem("number", colData.type)}
+    ${genUpdateColItem("select", colData.type)}
+    ${genUpdateColItem("mSelect", colData.type)}
+    ${genUpdateColItem("date", colData.type)}
+    ${genUpdateColItem("mAsset", colData.type)}
+    ${genUpdateColItem("checkbox", colData.type)}
+    ${genUpdateColItem("url", colData.type)}
+    ${genUpdateColItem("email", colData.type)}
+    ${genUpdateColItem("phone", colData.type)}
+    ${genUpdateColItem("template", colData.type)}
+    ${genUpdateColItem("relation", colData.type)}
+    ${genUpdateColItem("rollup", colData.type)}
+    ${genUpdateColItem("created", colData.type)}
+    ${genUpdateColItem("updated", colData.type)}
 </div>`;
 };
 
@@ -850,8 +850,8 @@ export const showColMenu = (protyle: IProtyle, blockElement: Element, cellElemen
     }
 };
 
-const genUpdateColItem = (type: TAVCol, oldType: TAVCol, name: string) => {
-    return `<button class="b3-menu__item" data-type="updateColType"  data-name="${name}" data-old-type="${oldType}" data-new-type="${type}">
+const genUpdateColItem = (type: TAVCol, oldType: TAVCol) => {
+    return `<button class="b3-menu__item" data-type="updateColType" data-old-type="${oldType}" data-new-type="${type}">
     <svg class="b3-menu__icon"><use xlink:href="#${getColIconByType(type)}"></use></svg>
     <span class="b3-menu__label">${getColNameByType(type)}</span>
     ${type === oldType ? '<svg class="b3-menu__checked"><use xlink:href="#iconSelect"></use></svg></span>' : ""}
diff --git a/app/src/protyle/render/av/openMenuPanel.ts b/app/src/protyle/render/av/openMenuPanel.ts
index 988217250..d9d9d86e5 100644
--- a/app/src/protyle/render/av/openMenuPanel.ts
+++ b/app/src/protyle/render/av/openMenuPanel.ts
@@ -863,7 +863,7 @@ export const openMenuPanel = (options: {
                     break;
                 } else if (type === "updateColType") {
                     if (target.dataset.newType !== target.dataset.oldType) {
-                        const name = target.dataset.name;
+                        const name = (avPanelElement.querySelector('.b3-text-field[data-type="name"]') as HTMLInputElement).value;
                         transaction(options.protyle, [{
                             action: "updateAttrViewCol",
                             id: options.colId,
@@ -1076,7 +1076,7 @@ export const openMenuPanel = (options: {
                     break;
                 } else if (type === "addColOptionOrCell") {
                     if (target.querySelector(".b3-menu__checked")) {
-                        removeCellOption(options.protyle, data, options.cellElements,  menuElement.querySelector(`.b3-chips .b3-chip[data-content="${escapeAttr(target.dataset.name)}"]`), options.blockElement);
+                        removeCellOption(options.protyle, data, options.cellElements, menuElement.querySelector(`.b3-chips .b3-chip[data-content="${escapeAttr(target.dataset.name)}"]`), options.blockElement);
                     } else {
                         addColOptionOrCell(options.protyle, data, options.cellElements, target, menuElement, options.blockElement);
                     }