From 807db89c5e3b7123469f634c49e14f2c9623a15c Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Mon, 10 Jul 2023 10:29:26 +0800
Subject: [PATCH] :sparkles: https://github.com/siyuan-note/siyuan/issues/8694

---
 app/src/assets/scss/business/_av.scss      |   1 +
 app/src/protyle/render/av/openMenuPanel.ts |  14 ++-
 app/src/protyle/render/av/render.ts        |   2 +-
 app/src/protyle/render/av/select.ts        | 102 +++++++++++++++++----
 app/src/types/index.d.ts                   |   2 +
 5 files changed, 95 insertions(+), 26 deletions(-)

diff --git a/app/src/assets/scss/business/_av.scss b/app/src/assets/scss/business/_av.scss
index c253fcab0..dadd8c3b8 100644
--- a/app/src/assets/scss/business/_av.scss
+++ b/app/src/assets/scss/business/_av.scss
@@ -175,6 +175,7 @@
           border: 0;
           background-color: var(--b3-menu-background);
           flex: 1;
+          height: 38px;
         }
       }
 
diff --git a/app/src/protyle/render/av/openMenuPanel.ts b/app/src/protyle/render/av/openMenuPanel.ts
index a3b7fa4df..d1d106502 100644
--- a/app/src/protyle/render/av/openMenuPanel.ts
+++ b/app/src/protyle/render/av/openMenuPanel.ts
@@ -4,7 +4,7 @@ import {addCol} from "./addCol";
 import {getColIconByType} from "./col";
 import {setPosition} from "../../../util/setPosition";
 import {hasClosestByAttribute} from "../../util/hasClosest";
-import {bindSelectEvent, getSelectHTML, setOptionCell, setSelectOption} from "./select";
+import {bindSelectEvent, getSelectHTML, addSelectColAndCell, setSelectCol, removeSelectCell} from "./select";
 import {addFilter, getFiltersHTML, setFilter} from "./filter";
 import {addSort, bindSortsEvent, getSortsHTML} from "./sort";
 
@@ -431,12 +431,16 @@ export const openMenuPanel = (protyle: IProtyle,
                     setPosition(menuElement, tabRect.right - menuElement.clientWidth, tabRect.bottom, tabRect.height);
                     event.stopPropagation();
                     break;
-                } else if (type === "editOption") {
-                    setSelectOption(protyle, data, options, target);
+                } else if (type === "setSelectCol") {
+                    setSelectCol(protyle, data, options, target);
                     event.stopPropagation();
                     break;
-                } else if (type === "setOptionCell") {
-                    setOptionCell(protyle, data, options, target, menuElement);
+                } else if (type === "addSelectColAndCell") {
+                    addSelectColAndCell(protyle, data, options, target, menuElement);
+                    event.stopPropagation();
+                    break;
+                } else if (type === "removeSelectCell") {
+                    removeSelectCell(protyle, data, options, target);
                     event.stopPropagation();
                     break;
                 }
diff --git a/app/src/protyle/render/av/render.ts b/app/src/protyle/render/av/render.ts
index 398bf1101..6fbaba88d 100644
--- a/app/src/protyle/render/av/render.ts
+++ b/app/src/protyle/render/av/render.ts
@@ -68,7 +68,7 @@ ${column.wrap ? "" : "white-space: nowrap;"}">
                                 text = "<span class=\"av__celltext\"></span>";
                             }
                         } else if (cell.valueType === "mSelect") {
-                            (cell.value?.mSelect as [])?.forEach((item: { content: string, color: string }) => {
+                            cell.value.mSelect.forEach((item: { content: string, color: string }) => {
                                 text += `<span class="av__celltext"><span class="b3-chip b3-chip--middle" style="background-color:var(--b3-font-background${item.color});color:var(--b3-font-color${item.color})">${item.content}</span></span>`;
                             });
                         } else if (cell.valueType === "date") {
diff --git a/app/src/protyle/render/av/select.ts b/app/src/protyle/render/av/select.ts
index 866447fec..c95129fa5 100644
--- a/app/src/protyle/render/av/select.ts
+++ b/app/src/protyle/render/av/select.ts
@@ -13,14 +13,14 @@ const filterSelectHTML = (key: string, options: { name: string, color: string }[
             if (!key ||
                 (key.toLowerCase().indexOf(item.name.toLowerCase()) > -1 ||
                     item.name.toLowerCase().indexOf(key.toLowerCase()) > -1)) {
-                html += `<button data-type="setOptionCell" class="b3-menu__item${html ? "" : " b3-menu__item--current"}" draggable="true" data-name="${item.name}" data-color="${item.color}">
+                html += `<button data-type="addSelectColAndCell" class="b3-menu__item${html ? "" : " b3-menu__item--current"}" draggable="true" data-name="${item.name}" data-color="${item.color}">
     <svg class="b3-menu__icon"><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" style="background-color:var(--b3-font-background${item.color});color:var(--b3-font-color${item.color})">
             <span class="fn__ellipsis">${item.name}</span>
         </span>
     </div>
-    <svg class="b3-menu__action" data-type="editOption"><use xlink:href="#iconEdit"></use></svg>
+    <svg class="b3-menu__action" data-type="setSelectCol"><use xlink:href="#iconEdit"></use></svg>
 </button>`;
             }
             if (key === item.name) {
@@ -30,7 +30,7 @@ const filterSelectHTML = (key: string, options: { name: string, color: string }[
     }
     if (!hasMatch && key) {
         const colorIndex = (options?.length || 0) % 13 + 1;
-        html = `<button data-type="setOptionCell" class="b3-menu__item${html ? "" : " b3-menu__item--current"}" data-name="${key}" data-color="${colorIndex}">
+        html = `<button data-type="addSelectColAndCell" class="b3-menu__item${html ? "" : " b3-menu__item--current"}" data-name="${key}" data-color="${colorIndex}">
 <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})">
@@ -43,7 +43,73 @@ const filterSelectHTML = (key: string, options: { name: string, color: string }[
     return html;
 };
 
-export const setSelectOption = (protyle: IProtyle, data: IAV, options: {
+export const removeSelectCell = (protyle: IProtyle, data: IAV, options: {
+    cellElement: HTMLElement
+}, target: HTMLElement) => {
+    if (!target) {
+        return;
+    }
+    const rowId = options.cellElement.parentElement.dataset.id;
+    const colId = options.cellElement.dataset.colId;
+    const cellId = options.cellElement.dataset.id;
+    let colData: IAVColumn;
+    data.columns.find((item: IAVColumn) => {
+        if (item.id === colId) {
+            colData = item;
+            return;
+        }
+    });
+    if (!colData.options) {
+        colData.options = [];
+    }
+    let cellData: IAVCell;
+    data.rows.find(row => {
+        if (row.id === rowId) {
+            row.cells.find(cell => {
+                if (cell.id === cellId) {
+                    cellData = cell;
+                    return true;
+                }
+            });
+            return true;
+        }
+    });
+    let oldValue;
+    if (colData.type !== "select") {
+        oldValue = Object.assign([], cellData.value.mSelect);
+        cellData.value.mSelect?.find((item: { content: string }, index: number) => {
+            if (item.content === target.dataset.content) {
+                cellData.value.mSelect.splice(index, 1);
+                return true;
+            }
+        });
+    } else {
+        oldValue = Object.assign({}, cellData.value.select);
+        cellData.value.select = {
+            color: "",
+            content: ""
+        };
+    }
+    target.remove();
+
+    transaction(protyle, [{
+        action: "updateAttrViewCell",
+        id: cellId,
+        rowID: rowId,
+        parentID: data.id,
+        data: cellData.value
+    }], [{
+        action: "updateAttrViewCell",
+        id: cellId,
+        rowID: rowId,
+        parentID: data.id,
+        data: {
+            [colData.type]: oldValue
+        }
+    }]);
+}
+
+export const setSelectCol = (protyle: IProtyle, data: IAV, options: {
     cellElement: HTMLElement;
 }, target: HTMLElement,) => {
     const name = target.parentElement.dataset.name;
@@ -189,14 +255,16 @@ export const bindSelectEvent = (protyle: IProtyle, data: IAV, menuElement: HTMLE
             if (!currentElement) {
                 currentElement = menuElement.querySelector(".b3-menu__item--current");
             }
-            setOptionCell(protyle, data, options, currentElement, menuElement);
+            addSelectColAndCell(protyle, data, options, currentElement, menuElement);
+        } else if (event.key === "Backspace" && inputElement.value === "") {
+            removeSelectCell(protyle, data, options, inputElement.previousElementSibling as HTMLElement);
         }
     });
 };
 
-export const setOptionCell = (protyle: IProtyle, data: IAV, options: {
+export const addSelectColAndCell = (protyle: IProtyle, data: IAV, options: {
     cellElement: HTMLElement
-}, currentElement: HTMLElement, menuElement:HTMLElement) => {
+}, currentElement: HTMLElement, menuElement: HTMLElement) => {
     const rowId = options.cellElement.parentElement.dataset.id;
     const colId = options.cellElement.dataset.colId;
     const cellId = options.cellElement.dataset.id;
@@ -225,8 +293,8 @@ export const setOptionCell = (protyle: IProtyle, data: IAV, options: {
 
     let oldValue;
     if (colData.type !== "select") {
-        oldValue = Object.assign([], cellData.value.mSelect.content);
-        cellData.value.mSelect.content.push({
+        oldValue = Object.assign([], cellData.value.mSelect);
+        cellData.value.mSelect?.push({
             color: currentElement.dataset.color,
             content: currentElement.dataset.name
         });
@@ -297,17 +365,11 @@ export const getSelectHTML = (data: IAV, options: { cellElement: HTMLElement })
             row.cells.find(cell => {
                 if (cell.id === cellId && cell.value) {
                     if (colData.type === "mSelect") {
-                        cell.value.mSelect?.content.forEach((value: string) => {
-                            let colorIndex = "";
-                            colData.options.find(option => {
-                                if (option.name === value) {
-                                    colorIndex = option.color;
-                                }
-                            });
-                            selectedHTML += `<div class="b3-chip" style="background-color:var(--b3-font-background${colorIndex});color:var(--b3-font-color${colorIndex})">${value}<svg class="b3-chip__close" data-type="remove-option"><use xlink:href="#iconCloseRound"></use></svg></div>`;
+                        cell.value.mSelect?.forEach((item: { content: string, color: string }) => {
+                            selectedHTML += `<div class="b3-chip" data-type="removeSelectCell" data-content="${item.content}" style="background-color:var(--b3-font-background${item.color});color:var(--b3-font-color${item.color})">${item.content}<svg class="b3-chip__close" data-type="remove-option"><use xlink:href="#iconCloseRound"></use></svg></div>`;
                         });
-                    } else {
-                        selectedHTML += `<div class="b3-chip" style="background-color:var(--b3-font-background${cell.value.select.color})";color:var(--b3-font-color${cell.value.select.color})>${options.cellElement.textContent.trim()}<svg class="b3-chip__close" data-type="remove-option"><use xlink:href="#iconCloseRound"></use></svg></div>`;
+                    } else if (cell.value.select.content) {
+                        selectedHTML += `<div class="b3-chip" data-type="removeSelectCell" data-content="${cell.value.select.content}" style="background-color:var(--b3-font-background${cell.value.select.color})";color:var(--b3-font-color${cell.value.select.color})>${cell.value.select.content}<svg class="b3-chip__close" data-type="remove-option"><use xlink:href="#iconCloseRound"></use></svg></div>`;
                     }
                     return true;
                 }
diff --git a/app/src/types/index.d.ts b/app/src/types/index.d.ts
index 5cd130185..28fcacfeb 100644
--- a/app/src/types/index.d.ts
+++ b/app/src/types/index.d.ts
@@ -891,6 +891,8 @@ interface IAVCell {
     bgColor: string,
     value: {
         [key in TAVCol]?: IAVCellValue
+    } & {
+        mSelect?: {content: string, color: string}[]
     },
     valueType: TAVCol,
 }