Merge pull request #2146 from visuddhinanda/agile

把前缀后缀移动到 ‘其他’ 类型

dashboard/src/components/article/AnthologyDetail.tsx

@@ -45,12 +45,13 @@ const AnthologyDetailWidget = ({
 
   function fetchData(id?: string) {
     const url = `/v2/anthology/${id}`;
-    console.info("url", url);
+    console.info("api request", url);
     if (typeof onLoading !== "undefined") {
       onLoading(true);
     }
     get<IAnthologyResponse>(url)
       .then((response) => {
+        console.info("api response", response);
         if (response.ok) {
           const item: IAnthologyDataResponse = response.data;
           let newTree: IAnthologyData = {

dashboard/src/components/dict/SelectCase.tsx

@@ -246,14 +246,12 @@ const SelectCaseWidget = ({
       value: "conj",
       label: intl.formatMessage({ id: "dict.fields.type.conj.label" }),
     },
-    {
-      value: "prep",
-      label: intl.formatMessage({ id: "dict.fields.type.prep.label" }),
-    },
     {
       value: "interj",
       label: intl.formatMessage({ id: "dict.fields.type.interj.label" }),
     },
+  ];
+  const caseOthers = [
     {
       value: "pre",
       label: intl.formatMessage({ id: "dict.fields.type.pre.label" }),
@@ -322,6 +320,16 @@ const SelectCaseWidget = ({
       label: intl.formatMessage({ id: "dict.fields.type.ind.label" }),
       children: caseInd,
     },
+    {
+      value: "pron",
+      label: intl.formatMessage({ id: "dict.fields.type.pron.label" }),
+      children: case3_pron,
+    },
+    {
+      value: "num",
+      label: intl.formatMessage({ id: "dict.fields.type.num.label" }),
+      children: case3_num,
+    },
     {
       value: "un",
       label: intl.formatMessage({ id: "dict.fields.type.un.label" }),
@@ -332,14 +340,9 @@ const SelectCaseWidget = ({
       children: case3_ti,
     },
     {
-      value: "pron",
-      label: intl.formatMessage({ id: "dict.fields.type.pron.label" }),
-      children: case3_pron,
-    },
-    {
-      value: "num",
-      label: intl.formatMessage({ id: "dict.fields.type.num.label" }),
-      children: case3_num,
+      value: "others",
+      label: intl.formatMessage({ id: "dict.fields.type.others.label" }),
+      children: caseOthers,
     },
   ];
   return (

dashboard/src/locales/en-US/dict/index.ts

@@ -20,7 +20,7 @@ const items = {
   "dict.fields.type.v.short.label": "v.",
   "dict.fields.type.v:ind.label": "动不变",
   "dict.fields.type.v:ind.short.label": "v. ind.",
-  "dict.fields.type.ind.label": "不变",
+  "dict.fields.type.ind.label": "不变词",
   "dict.fields.type.ind.short.label": "不",
   "dict.fields.type.m.label": "m.",
   "dict.fields.type.m.short.label": "m.",
@@ -161,6 +161,8 @@ const items = {
   "dict.fields.type.vdn.short.label": "动名",
   "dict.fields.type.comp.label": "comp.",
   "dict.fields.type.comp.short.label": "comp.",
+  "dict.fields.type.others.label": "others",
+  "dict.fields.type.others.short.label": "others",
 };
 
 export default items;

dashboard/src/locales/zh-Hans/dict/index.ts

@@ -20,7 +20,7 @@ const items = {
   "dict.fields.type.v.short.label": "动",
   "dict.fields.type.v:ind.label": "动不变",
   "dict.fields.type.v:ind.short.label": "动不变",
-  "dict.fields.type.ind.label": "不变",
+  "dict.fields.type.ind.label": "不变词",
   "dict.fields.type.ind.short.label": "不",
   "dict.fields.type.m.label": "阳性",
   "dict.fields.type.m.short.label": "阳",
@@ -127,10 +127,10 @@ const items = {
   "dict.fields.type.suf.short.label": "后",
   "dict.fields.type.end.label": "语尾",
   "dict.fields.type.end.short.label": "尾",
-  "dict.fields.type.part.label": "组份",
+  "dict.fields.type.part.label": "复合词组份",
   "dict.fields.type.part.short.label": "合",
   "dict.fields.type.un.label": "连音",
-  "dict.fields.type.un.short.label": "连音",
+  "dict.fields.type.un.short.label": "连",
   "dict.fields.type.none.label": "无",
   "dict.fields.type.none.short.label": "_",
   "dict.fields.type.null.label": "空",
@@ -153,14 +153,16 @@ const items = {
   "dict.fields.type.indconj.label": "连词",
   "dict.fields.type.pron:base.short.label": "代干",
   "dict.fields.type.pron:base.label": "代词词干",
-  "dict.fields.type.note.short.label": "注释",
-  "dict.fields.type.note.label": "注释",
+  "dict.fields.type.note.short.label": "缩",
+  "dict.fields.type.note.label": "缩写",
   "dict.fields.type.vind.short.label": "动不变",
   "dict.fields.type.vind.label": "动不变",
-  "dict.fields.type.vdn.label": "衍生动名词",
+  "dict.fields.type.vdn.label": "动名词",
   "dict.fields.type.vdn.short.label": "动名",
   "dict.fields.type.comp.label": "复合词",
   "dict.fields.type.comp.short.label": "合",
+  "dict.fields.type.others.label": "其他",
+  "dict.fields.type.others.short.label": "其他",
 };
 
 export default items;