From 6ab6af82adfd51bb4e1613c510308f35925def92 Mon Sep 17 00:00:00 2001
From: "Jingwei.Zhang" <zhang.jingwei@99cloud.net>
Date: Tue, 23 Aug 2022 13:45:34 +0800
Subject: [PATCH] fix: fix the linkage between search items and quick search

Quick search becomes selected when the search criteria are consistent with quick search

Change-Id: I517c7f9b74a53a9aaf4facb9b1fd013e115b36b6
---
 src/components/MagicInput/index.jsx | 33 +++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/components/MagicInput/index.jsx b/src/components/MagicInput/index.jsx
index 2be06561..58795952 100644
--- a/src/components/MagicInput/index.jsx
+++ b/src/components/MagicInput/index.jsx
@@ -39,6 +39,19 @@ const filterParam = PropTypes.shape({
   isTime: PropTypes.bool,
 });
 
+const getCheckOptionValue = (name, key) => {
+  return `${name}--${key}`;
+};
+
+const getCheckValueInfo = (value = '') => {
+  const name = value.split('--')[0];
+  const key = value.split('--')[1];
+  return {
+    name,
+    key,
+  };
+};
+
 export const getTags = (initValue, filterParams) => {
   if (!initValue || isEmpty(initValue)) {
     return {};
@@ -56,7 +69,7 @@ export const getTags = (initValue, filterParams) => {
       if (options.length) {
         const optionItem = options.find((op) => op.key === value);
         if (optionItem && optionItem.isQuick) {
-          checkValues.push(`${item.name}--${value}`);
+          checkValues.push(getCheckOptionValue(item.name, value));
         }
       }
       tags.push({
@@ -188,7 +201,7 @@ class MagicInput extends PureComponent {
     const { tags, checkValues } = this.state;
     const newTags = tags.filter((it) => it.filter.name !== name);
     const leftCheckValues = checkValues.filter(
-      (it) => it.split('--')[0] !== name
+      (it) => getCheckValueInfo(it).name !== name
     );
     this.setState(
       {
@@ -406,11 +419,20 @@ class MagicInput extends PureComponent {
     this.clearInputValue();
     const newTags = tags.filter((it) => it.filter.name !== newTag.filter.name);
     newTags.push(newTag);
+    const quickTags = newTags.filter((it) => {
+      const { value: tagValue, filter: { options = [] } = {} } = it;
+      const quickOption = options.find((o) => o.key === tagValue && o.isQuick);
+      return !!quickOption;
+    });
+    const checkValues = quickTags.map((it) => {
+      return getCheckOptionValue(it.filter.name, it.value);
+    });
     this.setState(
       {
         tags: newTags,
         currentFilter: null,
         inputValue: '',
+        checkValues,
       },
       () => {
         this.onTagsChange();
@@ -464,7 +486,7 @@ class MagicInput extends PureComponent {
     });
     const checkValuesNames = Array.from(
       new Set([...checkValues, ...values])
-    ).map((it) => it.split('--')[0]);
+    ).map((it) => getCheckValueInfo(it).name);
     const { filterParams } = this.props;
     const { tags } = this.state;
     const otherTags = tags.filter(
@@ -474,8 +496,7 @@ class MagicInput extends PureComponent {
     changedValues.forEach((it) => {
       const { key, value } = it;
       if (value) {
-        const name = key.split('--')[0];
-        const realValue = key.split('--')[1];
+        const { name, key: realValue } = getCheckValueInfo(key);
         const filter = filterParams.find((tt) => tt.name === name);
         newTags.push({
           value: realValue,
@@ -504,7 +525,7 @@ class MagicInput extends PureComponent {
       const { checkLabel, key, father } = it;
       return {
         label: checkLabel,
-        value: `${father.name}--${key}`,
+        value: getCheckOptionValue(father.name, key),
       };
     });
     return (