ISentence.content 可能为空

dashboard/src/components/template/SentEdit/SentCell.tsx

@@ -85,37 +85,37 @@ const SentCellWidget = ({
           switch (format) {
             case "json":
               const wbw: IWbw[] = sentData.content
-                .split("\n")
-                .map((item, id) => {
-                  const parts = item.split("=");
-                  const word = my_to_roman(parts[0]);
-                  const meaning: string =
-                    parts.length > 1 ? parts[1].trim() : "";
-                  let parent: string = "";
-                  let factors: string = "";
-                  if (!meaning.includes(" ") && endings) {
-                    const base = nissayaBase(meaning, endings);
-                    parent = base.base;
-                    const end = base.ending ? base.ending : [];
-                    factors = [base.base, ...end].join("+");
-                  } else {
-                    factors = meaning.replaceAll(" ", "+");
-                  }
-                  return {
-                    book: sentData.book,
-                    para: sentData.para,
-                    sn: [id],
-                    word: { value: word ? word : parts[0], status: 0 },
-                    real: { value: meaning, status: 0 },
-                    meaning: { value: "", status: 0 },
-                    parent: { value: parent, status: 0 },
-                    factors: {
-                      value: factors,
-                      status: 0,
-                    },
-                    confidence: 0.5,
-                  };
-                });
+                ? sentData.content.split("\n").map((item, id) => {
+                    const parts = item.split("=");
+                    const word = my_to_roman(parts[0]);
+                    const meaning: string =
+                      parts.length > 1 ? parts[1].trim() : "";
+                    let parent: string = "";
+                    let factors: string = "";
+                    if (!meaning.includes(" ") && endings) {
+                      const base = nissayaBase(meaning, endings);
+                      parent = base.base;
+                      const end = base.ending ? base.ending : [];
+                      factors = [base.base, ...end].join("+");
+                    } else {
+                      factors = meaning.replaceAll(" ", "+");
+                    }
+                    return {
+                      book: sentData.book,
+                      para: sentData.para,
+                      sn: [id],
+                      word: { value: word ? word : parts[0], status: 0 },
+                      real: { value: meaning, status: 0 },
+                      meaning: { value: "", status: 0 },
+                      parent: { value: parent, status: 0 },
+                      factors: {
+                        value: factors,
+                        status: 0,
+                      },
+                      confidence: 0.5,
+                    };
+                  })
+                : [];
               setSentData((origin) => {
                 origin.contentType = "json";
                 origin.content = JSON.stringify(wbw);
@@ -126,7 +126,9 @@ const SentCellWidget = ({
               break;
             case "markdown":
               setSentData((origin) => {
-                const wbwData: IWbw[] = JSON.parse(origin.content);
+                const wbwData: IWbw[] = origin.content
+                  ? JSON.parse(origin.content)
+                  : [];
                 const newContent = wbwData
                   .map((item) => {
                     return [

dashboard/src/components/template/SentEdit/SentCellEditable.tsx

@@ -45,6 +45,9 @@ const SentCellEditableWidget = ({
 
   const savePr = () => {
     setSaving(true);
+    if (!value) {
+      return;
+    }
     post<ISentencePrRequest, ISentencePrResponse>(`/v2/sentpr`, {
       book: data.book,
       para: data.para,
@@ -121,7 +124,7 @@ const SentCellEditableWidget = ({
   return (
     <Typography.Paragraph style={{ width: "100%" }}>
       <TermTextArea
-        value={value}
+        value={value ? value : ""}
         menuOptions={termList}
         onChange={(value: string) => {
           setValue(value);

dashboard/src/components/template/SentEdit/SentContent.tsx

@@ -132,7 +132,7 @@ const SentContentWidget = ({
                 wordEnd={wordEnd}
                 magicDict={magicDict}
                 channelId={item.channel.id}
-                data={JSON.parse(item.content)}
+                data={JSON.parse(item.content ? item.content : "")}
                 mode={mode}
                 onChange={(data: IWbw[]) => {
                   if (typeof onWbwChange !== "undefined") {

dashboard/src/components/template/SentEdit/SentEditMenu.tsx

@@ -137,9 +137,13 @@ const SentEditMenuWidget = ({
           icon={<CopyOutlined />}
           size="small"
           onClick={() => {
-            navigator.clipboard.writeText(data.content).then(() => {
-              message.success("已经拷贝到剪贴板");
-            });
+            if (data.content) {
+              navigator.clipboard.writeText(data.content).then(() => {
+                message.success("已经拷贝到剪贴板");
+              });
+            } else {
+              message.success("内容为空");
+            }
           }}
         />
         <Dropdown menu={{ items, onClick }} placement="bottomRight">

dashboard/src/components/template/SentEdit/SentMenu.tsx

@@ -4,8 +4,9 @@ import { MoreOutlined, CheckOutlined } from "@ant-design/icons";
 import type { MenuProps } from "antd";
 import RelatedPara from "../../corpus/RelatedPara";
 import { ArticleMode } from "../../article/Article";
+import { IResNumber } from "../SentEdit";
 
-interface ISentMenu {
+interface IWidget {
   book?: number;
   para?: number;
   loading?: boolean;
@@ -20,7 +21,7 @@ const SentMenuWidget = ({
   loading = false,
   onMagicDict,
   onMenuClick,
-}: ISentMenu) => {
+}: IWidget) => {
   const intl = useIntl();
   const items: MenuProps["items"] = [
     {

dashboard/src/components/template/SentEdit/SentTab.tsx

@@ -15,6 +15,7 @@ import { IWbw } from "../Wbw/WbwWord";
 import RelaGraphic from "../Wbw/RelaGraphic";
 import SentMenu from "./SentMenu";
 import { ArticleMode } from "../../article/Article";
+import { IResNumber } from "../SentEdit";
 
 const { Text } = Typography;
 
@@ -36,6 +37,7 @@ interface IWidget {
   magicDictLoading?: boolean;
   compact?: boolean;
   mode?: ArticleMode;
+  loadedRes?: IResNumber;
   onMagicDict?: Function;
   onCompact?: Function;
   onModeChange?: Function;
@@ -57,6 +59,7 @@ const SentTabWidget = ({
   magicDictLoading = false,
   compact = false,
   mode,
+  loadedRes,
   onMagicDict,
   onCompact,
   onModeChange,
@@ -171,7 +174,12 @@ const SentTabWidget = ({
               icon={<TranslationOutlined />}
               type="translation"
               sentId={id}
-              count={tranNum}
+              count={
+                tranNum
+                  ? tranNum -
+                    (loadedRes?.translation ? loadedRes.translation : 0)
+                  : undefined
+              }
               title={intl.formatMessage({
                 id: "channel.type.translation.label",
               })}
@@ -196,7 +204,11 @@ const SentTabWidget = ({
               icon={<CloseOutlined />}
               type="nissaya"
               sentId={id}
-              count={nissayaNum}
+              count={
+                nissayaNum
+                  ? nissayaNum - (loadedRes?.nissaya ? loadedRes.nissaya : 0)
+                  : undefined
+              }
               title={intl.formatMessage({
                 id: "channel.type.nissaya.label",
               })}
@@ -221,7 +233,11 @@ const SentTabWidget = ({
               icon={<TranslationOutlined />}
               type="commentary"
               sentId={id}
-              count={commNum}
+              count={
+                commNum
+                  ? commNum - (loadedRes?.commentary ? loadedRes.commentary : 0)
+                  : undefined
+              }
               title={intl.formatMessage({
                 id: "channel.type.commentary.label",
               })}

dashboard/src/components/template/SentEdit/SentWbwEdit.tsx

@@ -66,7 +66,7 @@ const SentWbwEditWidget = ({ data, onSave, onClose }: IWidget) => {
   const [wbwData, setWbwData] = useState<IWbw[]>([]);
 
   useEffect(() => {
-    if (data.contentType === "json") {
+    if (data.contentType === "json" && data.content) {
       setWbwData(JSON.parse(data.content));
     }
   }, [data.content, data.contentType]);

dashboard/src/components/template/SentEdit/SuggestionToolbar.tsx

@@ -75,7 +75,9 @@ const SuggestionToolbarWidget = ({
       />
       {CommentCount}
       {compact ? undefined : <Divider type="vertical" />}
-      {compact ? undefined : <Text copyable={{ text: data.content }}></Text>}
+      {compact ? undefined : (
+        <Text copyable={{ text: data.content ? data.content : "" }}></Text>
+      )}
     </Space>
   );
   return (