Merge pull request #2186 from visuddhinanda/agile

缅文语尾本词特征点击在侧边语法手册中打开

dashboard/src/components/discussion/DiscussionButton.tsx

@@ -74,7 +74,7 @@ const DiscussionButton = ({
     );
   }
 
-  console.debug("DiscussionButton", discussions, wbw, withStudent);
+  //console.debug("DiscussionButton", discussions, wbw, withStudent);
 
   let currCount = CommentCount;
   if (onlyMe) {

dashboard/src/components/general/NissayaCard.tsx

@@ -105,10 +105,11 @@ const NissayaCardWidget = ({
     }
 
     const url = `/v2/nissaya-card/${text}?lang=${uiLang}&content_type=json`;
-    console.log("url", url);
+    console.debug("api request", url);
     setLoading(true);
     get<INissayaCardResponse>(url)
       .then((json) => {
+        console.debug("api response", json);
         if (json.ok) {
           setCardData(json.data.row);
           setTerm(json.data.ending);
@@ -169,7 +170,7 @@ const NissayaCardWidget = ({
       </div>
       <Paragraph>{term?.meaning}</Paragraph>
       <MdView html={term?.html} />
-      {cardData ? <NissayaCardTable data={cardData} /> : undefined}
+      {cardData ? <NissayaCardTable data={cardData} /> : <></>}
     </div>
   );
 };

dashboard/src/components/general/NissayaCardTable.tsx

@@ -12,6 +12,7 @@ const randomString = () =>
 
 interface ICaseItem {
   label: string;
+  case: string;
   link: string;
 }
 interface IRelationNode {
@@ -42,12 +43,11 @@ interface IWidget {
   data?: INissayaRelation[];
 }
 const NissayaCardTableWidget = ({ data }: IWidget) => {
-  const [tableData, setTableData] = useState<DataType[]>();
-  useEffect(() => {
-    if (typeof data === "undefined") {
-      setTableData(undefined);
-      return;
-    }
+  let tableData: DataType[] = [];
+
+  if (typeof data === "undefined") {
+    tableData = [];
+  } else {
     console.log("data", data);
     let category: string[] = [];
     let newData: DataType[] = [];
@@ -104,8 +104,9 @@ const NissayaCardTableWidget = ({ data }: IWidget) => {
       }
     });
     console.log("newData", newData);
-    setTableData(newData);
-  }, [data]);
+    tableData = newData;
+  }
+
   return (
     <Table
       size="small"
@@ -120,14 +121,11 @@ const NissayaCardTableWidget = ({ data }: IWidget) => {
               <Space>
                 {record.from?.case?.map((item, id) => {
                   return (
-                    <Button
-                      key={id}
-                      type="link"
-                      size="small"
-                      onClick={() => window.open(item.link, "_blank")}
-                    >
-                      <Tag>{item.label}</Tag>
-                    </Button>
+                    <GrammarLookup key={id} word={item.case}>
+                      <Link>
+                        <Tag>{item.label}</Tag>
+                      </Link>
+                    </GrammarLookup>
                   );
                 })}
                 {record.from?.spell}

dashboard/src/components/tag/TagSelectButton.tsx

@@ -33,8 +33,6 @@ const TagSelectButtonWidget = ({
   const studioName =
     course?.course?.studio?.realName ?? user?.nickName ?? undefined;
 
-  console.debug("TagSelectButton studioName", studioName);
-
   return (
     <TagsManager
       title={selectorTitle}

dashboard/src/components/template/Wbw/RelaGraphic.tsx

@@ -1,4 +1,5 @@
 import { Typography } from "antd";
+import { useIntl } from "react-intl";
 
 import Mermaid from "../../general/Mermaid";
 import { useAppSelector } from "../../../hooks";
@@ -6,7 +7,10 @@ import { getGrammar } from "../../../reducers/term-vocabulary";
 import { IWbwRelation } from "./WbwDetailRelation";
 import { IWbw } from "./WbwWord";
 import { relationWordId } from "./WbwRelationAdd";
-import { useIntl } from "react-intl";
+import store from "../../../store";
+import { openPanel } from "../../../reducers/right-panel";
+import { grammar } from "../../../reducers/command";
+import { fullUrl } from "../../../utils";
 
 const { Text } = Typography;
 
@@ -27,6 +31,32 @@ const RelaGraphicWidget = ({ wbwData }: IWidget) => {
   const terms = useAppSelector(getGrammar);
   const intl = useIntl();
 
+  const onLoad = () => {
+    const links = document.getElementsByTagName("a");
+    alert(links.length + "links");
+    // 为每个链接添加点击事件监听器
+    for (let i = 0; i < links.length; i++) {
+      (function (index) {
+        links[index].addEventListener("click", function (e) {
+          // 阻止链接的默认点击行为
+          e.preventDefault();
+          // 在这里执行你想在点击链接时执行的代码
+          console.log("链接被点击: ", this.href);
+          alert("链接被点击" + this.href);
+          const iPos = this.href.lastIndexOf("grammar/");
+          if (iPos >= 0) {
+            const word = this.href.substring(iPos + 8);
+            console.debug("relation graphic", word);
+            store.dispatch(grammar(word));
+            store.dispatch(openPanel("grammar"));
+          } else {
+            window.location.href = this.href;
+          }
+        });
+      })(i);
+    }
+  };
+
   const grammarStr = (input?: string | null) => {
     if (!input) {
       return "";
@@ -75,9 +105,12 @@ const RelaGraphicWidget = ({ wbwData }: IWidget) => {
               (value: IWbw) => relationWordId(value) === relation.dest_id
             );
             const toMeaning = pureMeaning(toWord?.meaning?.value);
+            const url = fullUrl("/term/list/" + relation.relation);
             const toGrammar = grammarStr(toWord?.case?.value);
-
-            return `${relation.sour_id}("${relation.sour_spell}<br />${fromMeaning}<br />${fromGrammar}") --"${relation.relation}<br />${localName}"--> ${relation.dest_id}("${relation.dest_spell}<br />${toMeaning}<br />${toGrammar}")\n`;
+            const strFrom = `${relation.sour_id}("${relation.sour_spell}<br />${fromMeaning}<br />${fromGrammar}")`;
+            const strRelation = `"<a href='${url}' target='_blank'>${relation.relation}</a><br />${localName}"`;
+            const strTo = `${relation.dest_id}("${relation.dest_spell}<br />${toMeaning}<br />${toGrammar}")`;
+            return `${strFrom} --${strRelation}--> ${strTo}\n`;
           });
           return graphic.join("");
         } else {

dashboard/src/components/template/Wbw/WbwDetailRelation.tsx

@@ -123,13 +123,12 @@ const WbwDetailRelationWidget = ({
         grammar = [data.grammar2?.value.replaceAll(".", "")];
       }
     }
-    console.log("relation match grammar", grammar);
     if (typeof grammar === "undefined") {
       return;
     }
 
     //找出符合条件的relation
-    console.debug("relation match data=", data);
+
     const filteredRelation = relations?.filter((value) => {
       let caseMatch = true;
       let spellMatch = true;
@@ -159,12 +158,8 @@ const WbwDetailRelationWidget = ({
         // 使用正则表达式
         spellMatch = regex.test(data.real.value);
       }
-
-      console.debug("relation match", value, caseMatch, spellMatch);
-
       return caseMatch && spellMatch;
     });
-    console.debug("relation match filteredRelation=", filteredRelation);
 
     setCurrRelation(filteredRelation);
     setRelationOptions(filteredRelation);

dashboard/src/components/template/Wbw/WbwPali.tsx

@@ -108,8 +108,6 @@ const WbwPaliWidget = ({
    * 高亮可能的单词
    */
   useEffect(() => {
-    console.debug("relation match data=", data);
-
     let grammar = data.case?.value
       ?.replace("v:ind", "v")
       .replace("#", "$")
@@ -150,8 +148,6 @@ const WbwPaliWidget = ({
           spellMatch = false;
         }
       }
-      console.debug("relation match", value, caseMatch, spellMatch);
-
       return caseMatch && spellMatch;
     });
     if (match && match.length > 0) {