Merge pull request #1574 from visuddhinanda/agile

文集修改提交deletedAt

dashboard/src/components/anthology/EditableTocTree.tsx

@@ -10,6 +10,7 @@ import {
   IArticleDataResponse,
   IArticleMapAddResponse,
   IArticleMapListResponse,
+  IArticleMapRequest,
   IArticleMapUpdateRequest,
   IArticleResponse,
 } from "../api/Article";
@@ -45,25 +46,26 @@ const EditableTocTreeWidget = ({
     if (typeof data === "undefined") {
       return;
     }
-    put<IArticleMapUpdateRequest, IArticleMapAddResponse>(
-      `/v2/article-map/${anthologyId}`,
-      {
-        data: data.map((item) => {
-          let title = "";
-          if (typeof item.title === "string") {
-            title = item.title;
-          }
-          //TODO 整一个string title
-          return {
-            article_id: item.key,
-            level: item.level,
-            title: title,
-            children: item.children,
-          };
-        }),
-        operation: "anthology",
+    const url = `/v2/article-map/${anthologyId}`;
+    const newData: IArticleMapRequest[] = data.map((item) => {
+      let title = "";
+      if (typeof item.title === "string") {
+        title = item.title;
       }
-    )
+      //TODO 整一个string title
+      return {
+        article_id: item.key,
+        level: item.level,
+        title: title,
+        children: item.children,
+        deleted_at: item.deletedAt,
+      };
+    });
+
+    put<IArticleMapUpdateRequest, IArticleMapAddResponse>(url, {
+      data: newData,
+      operation: "anthology",
+    })
       .finally(() => {})
       .then((json) => {
         if (json.ok) {

dashboard/src/components/api/Article.ts

@@ -135,8 +135,11 @@ export interface IArticleMapRequest {
   article_id?: string;
   level: number;
   title: string;
+  editor?: IUser;
   children?: number;
-  deleted_at?: string;
+  deleted_at?: string | null;
+  created_at?: string;
+  updated_at?: string;
 }
 export interface IArticleMapListResponse {
   ok: boolean;

dashboard/src/components/article/ArticleEdit.tsx

@@ -19,6 +19,7 @@ import PublicitySelect from "../../components/studio/PublicitySelect";
 
 import MDEditor from "@uiw/react-md-editor";
 import ArticlePrevDrawer from "../../components/article/ArticlePrevDrawer";
+import { IStudio } from "../auth/StudioName";
 
 interface IFormData {
   uid: string;
@@ -48,6 +49,7 @@ const ArticleEditWidget = ({
   const [unauthorized, setUnauthorized] = useState(false);
   const [readonly, setReadonly] = useState(false);
   const [content, setContent] = useState<string>();
+  const [owner, setOwner] = useState<IStudio>();
 
   return unauthorized ? (
     <Result
@@ -60,7 +62,7 @@ const ArticleEditWidget = ({
     <>
       {readonly ? (
         <Alert
-          message="该资源为只读，如果需要修改，请联络拥有者分配权限。"
+          message={`该资源为只读，如果需要修改，请联络拥有者${owner?.nickName}分配权限。`}
           type="warning"
           closable
           action={
@@ -108,6 +110,7 @@ const ArticleEditWidget = ({
           let mTitle: string,
             mReadonly = false;
           if (res.ok) {
+            setOwner(res.data.studio);
             mReadonly = res.data.role === "editor" ? false : true;
             setReadonly(mReadonly);
             mTitle = res.data.title;

dashboard/src/components/article/EditableTree.tsx

@@ -115,6 +115,7 @@ function treeToList(treeNode: TreeNodeData[]): ListNodeData[] {
       title: node.title,
       level: iTocTreeCurrLevel,
       children: children,
+      deletedAt: node.deletedAt,
     });
     if (children > 0) {
       iTocTreeCurrLevel++;