Merge pull request #789 from PBK-B/bin/fix_remove_email_setting

feat(ui): support deleting email input box auto-complete items #174

ui/src/components/workflow/node/ApplyNodeConfigForm.tsx

@@ -1,7 +1,12 @@
 import { forwardRef, memo, useEffect, useImperativeHandle, useMemo, useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Link } from "react-router";
-import { PlusOutlined as PlusOutlinedIcon, QuestionCircleOutlined as QuestionCircleOutlinedIcon, RightOutlined as RightOutlinedIcon } from "@ant-design/icons";
+import {
+  CloseOutlined as CloseOutlinedIcon,
+  PlusOutlined as PlusOutlinedIcon,
+  QuestionCircleOutlined as QuestionCircleOutlinedIcon,
+  RightOutlined as RightOutlinedIcon,
+} from "@ant-design/icons";
 import { useControllableValue } from "ahooks";
 import {
   AutoComplete,
@@ -589,8 +594,7 @@ const ApplyNodeConfigForm = forwardRef<ApplyNodeConfigFormInstance, ApplyNodeCon
 
 const EmailInput = memo(
   ({ disabled, placeholder, ...props }: { disabled?: boolean; placeholder?: string; value?: string; onChange?: (value: string) => void }) => {
-    const { emails, fetchEmails } = useContactEmailsStore();
+    const { emails, fetchEmails, removeEmail } = useContactEmailsStore();
-    const emailsToOptions = () => emails.map((email) => ({ label: email, value: email }));
     useEffect(() => {
       fetchEmails();
     }, []);
@@ -601,24 +605,49 @@ const EmailInput = memo(
       trigger: "onChange",
     });
 
-    const [options, setOptions] = useState<AutoCompleteProps["options"]>([]);
+    const [inputValue, setInputValue] = useState<string>();
-    useEffect(() => {
+
-      setOptions(emailsToOptions());
+    const renderOptionLabel = (email: string, removable: boolean = false) => (
-    }, [emails]);
+      <div className="flex items-center gap-2 overflow-hidden">
+        <span className="flex-1 overflow-hidden truncate">{email}</span>
+        {removable && (
+          <Button
+            color="default"
+            disabled={disabled}
+            icon={<CloseOutlinedIcon />}
+            size="small"
+            type="text"
+            onClick={(e) => {
+              removeEmail(email);
+              e.stopPropagation();
+            }}
+          />
+        )}
+      </div>
+    );
+
+    const options = useMemo(() => {
+      const temp = emails.map((email) => ({
+        label: renderOptionLabel(email, true),
+        value: email,
+      }));
+
+      if (!!inputValue && temp.every((option) => option.value !== inputValue)) {
+        temp.unshift({
+          label: renderOptionLabel(inputValue),
+          value: inputValue,
+        });
+      }
+
+      return temp;
+    }, [emails, inputValue]);
 
     const handleChange = (value: string) => {
       setValue(value);
     };
 
-    const handleSearch = (text: string) => {
+    const handleSearch = (value: string) => {
-      const temp = emailsToOptions();
+      setInputValue(value?.trim());
-      if (text?.trim()) {
-        if (temp.every((option) => option.label !== text)) {
-          temp.unshift({ label: text, value: text });
-        }
-      }
-
-      setOptions(temp);
     };
 
     return (

ui/src/stores/contact/index.ts

@@ -60,6 +60,7 @@ export const useContactEmailsStore = create<ContactEmailsState>((set, get) => {
         if (draft.includes(email)) return;
         draft.push(email);
         draft.sort();
+        return draft;
       });
       get().setEmails(emails);
     },
@@ -68,6 +69,7 @@ export const useContactEmailsStore = create<ContactEmailsState>((set, get) => {
       const emails = produce(get().emails, (draft) => {
         draft = draft.filter((e) => e !== email);
         draft.sort();
+        return draft;
       });
       get().setEmails(emails);
     },