Merge pull request #2010 from visuddhinanda/agile

#2006 有未保存的脏数据不查词

dashboard/src/components/dict/DictComponent.tsx

@@ -1,9 +1,10 @@
 import { useState, useEffect } from "react";
 
 import { useAppSelector } from "../../hooks";
-import { lookup, lookupWord } from "../../reducers/command";
+import { lookup, lookupWord, myDictIsDirty } from "../../reducers/command";
 import store from "../../store";
 import Dictionary from "./Dictionary";
+import { notification } from "antd";
 
 export interface IWidgetDict {
   word?: string;
@@ -12,12 +13,18 @@ const DictComponentWidget = ({ word }: IWidgetDict) => {
   const [wordSearch, setWordSearch] = useState(word);
   //接收查字典消息
   const searchWord = useAppSelector(lookupWord);
+  const myDictDirty = useAppSelector(myDictIsDirty);
+
   useEffect(() => {
     console.log("get command", searchWord);
+    if (myDictDirty) {
+      notification.warning({ message: "用户词典有未保存内容，请保存后再查词" });
+      return;
+    }
     if (typeof searchWord === "string" && searchWord !== wordSearch) {
       setWordSearch(searchWord);
     }
-  }, [searchWord]);
+  }, [searchWord, myDictDirty, wordSearch]);
 
   return (
     <Dictionary

dashboard/src/components/dict/DictContent.tsx

@@ -1,4 +1,4 @@
-import { Button, Col, Divider, Row, Tabs } from "antd";
+import { Col, Divider, Row, Tabs } from "antd";
 
 import type { IAnchorData } from "./DictList";
 import type { IWidgetWordCardData } from "./WordCard";
@@ -33,6 +33,54 @@ export interface IApiDictContentData {
   data: IDictContentData;
 }
 
+interface IMyDict {
+  word?: string;
+}
+const MyDict = ({ word }: IMyDict) => {
+  const user = useAppSelector(currentUser);
+  const [myTab, setMyTab] = useState<string>("list");
+  const [myRefresh, setMyRefresh] = useState(false);
+  return (
+    <div>
+      <Tabs
+        size="small"
+        type="card"
+        style={{ backgroundColor: "white" }}
+        activeKey={myTab}
+        onChange={(activeKey: string) => setMyTab(activeKey)}
+        items={[
+          {
+            label: "列表",
+            key: "list",
+            children: (
+              <UserDictList
+                studioName={user?.realName}
+                word={word}
+                compact={true}
+                refresh={myRefresh}
+                onRefresh={(value: boolean) => setMyRefresh(value)}
+              />
+            ),
+          },
+          {
+            label: "新建",
+            key: "new",
+            children: (
+              <MyCreate
+                word={word}
+                onSave={() => {
+                  setMyRefresh(true);
+                  setMyTab("list");
+                }}
+              />
+            ),
+          },
+        ]}
+      />
+    </div>
+  );
+};
+
 interface IWidget {
   word?: string;
   data: IDictContentData;
@@ -41,51 +89,6 @@ interface IWidget {
 
 const DictContentWidget = ({ word, data, compact }: IWidget) => {
   const intl = useIntl();
-  const user = useAppSelector(currentUser);
-  const [myRefresh, setMyRefresh] = useState(false);
-
-  const MyDict = () => {
-    const [myTab, setMyTab] = useState<string>("list");
-    return (
-      <div>
-        <Tabs
-          size="small"
-          type="card"
-          style={{ backgroundColor: "white" }}
-          activeKey={myTab}
-          onChange={(activeKey: string) => setMyTab(activeKey)}
-          items={[
-            {
-              label: "列表",
-              key: "list",
-              children: (
-                <UserDictList
-                  studioName={user?.realName}
-                  word={word}
-                  compact={true}
-                  refresh={myRefresh}
-                  onRefresh={(value: boolean) => setMyRefresh(value)}
-                />
-              ),
-            },
-            {
-              label: "新建",
-              key: "new",
-              children: (
-                <MyCreate
-                  word={word}
-                  onSave={() => {
-                    setMyRefresh(true);
-                    setMyTab("list");
-                  }}
-                />
-              ),
-            },
-          ]}
-        />
-      </div>
-    );
-  };
 
   return (
     <>
@@ -151,7 +154,7 @@ const DictContentWidget = ({ word, data, compact }: IWidget) => {
               {
                 label: `单词本`,
                 key: "my",
-                children: <MyDict />,
+                children: <MyDict word={word} />,
               },
             ]}
           />

dashboard/src/components/dict/MyCreate.tsx

@@ -187,12 +187,14 @@ const MyCreateWidget = ({ word, onSave }: IWidget) => {
   }
 
   const reset = () => {
-    fieldChanged("meaning", "");
-    fieldChanged("note", "");
-    fieldChanged("type", "");
-    fieldChanged("grammar", "");
-    fieldChanged("factors", "");
-    fieldChanged("factorMeaning", "");
+    let mData: IWbw = JSON.parse(JSON.stringify(editWord));
+    mData.note = { value: "", status: 7 };
+    mData.meaning = { value: "", status: 7 };
+    mData.type = { value: "", status: 7 };
+    mData.grammar = { value: "", status: 7 };
+    mData.factors = { value: "", status: 7 };
+    mData.factorMeaning = { value: "", status: 7 };
+    setEditWord(mData);
   };
   return (
     <div style={{ padding: "0 5px" }}>

dashboard/src/components/dict/UserDictList.tsx

@@ -26,7 +26,7 @@ import {
   IUserDictDeleteRequest,
 } from "../../components/api/Dict";
 import { delete_2, get } from "../../request";
-import { useRef, useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import DictEdit from "../../components/dict/DictEdit";
 import { IDeleteResponse } from "../../components/api/Article";
 import TimeShow from "../general/TimeShow";
@@ -60,6 +60,8 @@ interface IWidget {
   dictName?: string;
   word?: string;
   compact?: boolean;
+  refresh?: boolean;
+  onRefresh?: Function;
 }
 const UserDictListWidget = ({
   studioName,
@@ -67,6 +69,8 @@ const UserDictListWidget = ({
   dictName,
   word,
   compact = false,
+  refresh = false,
+  onRefresh,
 }: IWidget) => {
   const intl = useIntl();
   const [isEditOpen, setIsEditOpen] = useState(false);
@@ -114,6 +118,15 @@ const UserDictListWidget = ({
     });
   };
 
+  useEffect(() => {
+    if (refresh === true) {
+      ref.current?.reload();
+      if (typeof onRefresh !== "undefined") {
+        onRefresh(false);
+      }
+    }
+  }, [onRefresh, refresh]);
+
   const ref = useRef<ActionType>();
 
   return (