@voplus/morpho-workspace 1.0.0-dev40 → 1.0.0-dev42

package/es/modules/meeting/pages/MeetingTabView/index.js

@@ -1,46 +1,40 @@
 import React, { useContext, useEffect, useState } from "react";
-import { Button, Icon, Row, Skeleton, Tabs } from "@voplus/antd";
+import { Icon, Skeleton, Tabs } from "@voplus/antd";
 import Comment from "@voplus/morpho-collaboration/es/components/Comment";
 import DocumentList from "@voplus/morpho-document/es/components/DocumentList";
 import AsideContent from "@voplus/morpho-ui/es/components/layout/AsideContent";
 import RichTextEditor from "@voplus/morpho-ui/es/controls/RichTextEditor";
 import { useObserver } from "mobx-react-lite";
 import ActivityLog from "../../../../components/ActivityLog";
-import ToolBar from "../../../../components/ToolBar";
-import { useLayout, useTabItem } from "@voplus/morpho-data";
+import { useTabItem } from "@voplus/morpho-data";
 import { __RouterContext } from "react-router";
 import { useMeeting, useMeetingStore } from "../../../../data/meeting";
 import "../../../../styles/common.less";
 import AgendaList from "../../components/AgendaList";
-import MeetingItem from "../../components/MeetingItem";
+import MeetingHeader from "../../components/MeetingHeader";
 import styles from "./index.less";
-import { useDocumentStore } from "@voplus/morpho-document";
 const MeetingTabView = () => {
     const { match } = useContext(__RouterContext);
     const id = match.params.id;
-    const meeting = useMeeting(id, { reload: true });
+    const [reload, setReload] = useState(true);
+    const meeting = useMeeting(id, { reload: reload });
     const readonly = meeting.status === "Readonly";
     const tab = useTabItem();
     tab.title = "Meeting Detail";
     const meetingStore = useMeetingStore();
-    const documentStore = useDocumentStore();
-    const [scrollParentRef, setScrollParentRef] = useState();
     const [asideContext] = useState(AsideContent.createContext());
-    const layout = useLayout();
+    const onReLoad = () => {
+        setReload(!reload);
+    };
     useEffect(() => {
         asideContext.openAside(AsideElement, { span: 12 });
     }, []);
-    const onDelete = async () => {
-        layout.history.push(`/meeting`);
-        layout.tabNav.remove(tab);
-        await meetingStore.delete(id, { DeleteChilds: true });
-    };
-    const onLock = () => {
-        documentStore.edit(id, { Status: "Readonly" });
-    };
-    const onUnlock = () => {
-        documentStore.edit(id, { Status: "Normal" });
-    };
+    useObserver(() => {
+        useEffect(() => {
+            if (!reload)
+                setReload(true);
+        }, [reload]);
+    });
     const AsideElement = (React.createElement("div", { className: "module-tab-view_aside" },
         React.createElement(Tabs, { defaultActiveKey: "1" },
             React.createElement(Tabs.TabPane, { tab: "Documents", key: "1" },
@@ -50,23 +44,17 @@ const MeetingTabView = () => {
             React.createElement(Tabs.TabPane, { tab: "Activities", key: "3" },
                 React.createElement("div", { className: "module-box" },
                     React.createElement(ActivityLog, { showHeader: false }))))));
-    return useObserver(() => (React.createElement("div", { className: "module-tab-view" },
-        React.createElement(AsideContent, { context: asideContext },
-            React.createElement("div", { className: styles["meeting-tab-view"], ref: ref => setScrollParentRef(ref) },
-                React.createElement("div", { className: "meeting-tab-view_header" },
-                    React.createElement(Skeleton, { loading: !meeting.loaded },
-                        React.createElement(Row, { type: "flex", justify: "space-between", className: "margin-bottom-10" },
-                            React.createElement(MeetingItem, { id: id, isDetail: true }),
-                            React.createElement("div", { className: styles["meeting-tool-bar"] },
-                                React.createElement(ToolBar, { id: id, onDelete: onDelete, lock: meeting.status === "Draft" || meeting.status === "Normal", unlock: meeting.status === "Readonly", onLock: onLock, onUnlock: onUnlock, onOpen: () => asideContext.asideContent
-                                        ? asideContext.closeAside()
-                                        : asideContext.openAside(AsideElement, { span: 12 }) }),
-                                React.createElement("div", { className: "margin-top-10" },
-                                    React.createElement(Button, { size: "small" }, "+tag")))),
-                        React.createElement(RichTextEditor, { readOnly: readonly, editable: false, content: meeting.description, placeholder: React.createElement("span", null,
-                                React.createElement(Icon, { type: "edit" }),
-                                "Add Description"), onSave: v => meetingStore.edit(id, { Description: v }) }))),
-                React.createElement(AgendaList, { preview: true, readOnly: readonly, parentId: id }))))));
+    return useObserver(() => (React.createElement("div", { className: "module-tab-view" }, reload && (React.createElement(AsideContent, { context: asideContext },
+        React.createElement("div", { className: styles["meeting-tab-view"] },
+            React.createElement("div", { className: "meeting-tab-view_header" },
+                React.createElement(MeetingHeader, { id: id, onReLoad: onReLoad, onExpand: () => asideContext.asideContent
+                        ? asideContext.closeAside()
+                        : asideContext.openAside(AsideElement, { span: 12 }) }),
+                React.createElement(Skeleton, { loading: !meeting.loaded },
+                    React.createElement(RichTextEditor, { readOnly: readonly, editable: false, content: meeting.description || "", placeholder: React.createElement("span", null,
+                            React.createElement(Icon, { type: "edit" }),
+                            "Add Description"), onSave: v => meetingStore.edit(id, { Description: v }) }))),
+            React.createElement(AgendaList, { preview: true, readOnly: readonly, parentId: id })))))));
 };
 export default MeetingTabView;
 //# sourceMappingURL=index.js.map

package/es/modules/meeting/pages/MeetingTabView/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/meeting/pages/MeetingTabView/index.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/meeting/pages/MeetingTabView/index.tsx"],"names":[],"mappings":"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"}

package/es/modules/meeting/pages/MeetingTabView/index.less

@@ -9,6 +9,10 @@
 	:global {
 		.meeting-tab-view_header {
 			padding: 10px 20px;
+			.meeting-item-detail {
+				padding: 0;
+				margin-bottom: 10px;
+			}
 		}
 	}
 }

package/es/modules/tasks/TasksRoutes.d.ts

@@ -12,12 +12,6 @@ declare const Routes: {
         getUrl: (id: string) => string;
         component: () => JSX.Element;
     };
-    Tab: {
-        route: string;
-        tabPattern: RegExp;
-        getUrl: (id: string) => string;
-        component: () => JSX.Element;
-    };
     addRoutes: () => void;
 };
 export default Routes;

package/es/modules/tasks/TasksRoutes.js

@@ -1,21 +1,19 @@
 import React from "react";
 import { Route, Switch } from "react-router";
 import { BaseRoutes } from "@voplus/morpho-data";
-import TaskDefaultView from "./pages/TaskDefaultView";
-import TaskListView from "./pages/TaskListView";
+import TaskList from "./pages/TaskList";
 import TaskTabView from "./pages/TaskTabView";
 const TaskRoutes = () => {
     return (React.createElement(Switch, null,
         React.createElement(Route, { path: Routes.TaskList.route, exact: true, component: Routes.TaskList.component }),
-        React.createElement(Route, { path: Routes.Task.route, exact: true, component: Routes.Task.component }),
-        React.createElement(Route, { path: Routes.Tab.route, exact: true, component: Routes.Tab.component })));
+        React.createElement(Route, { path: Routes.Task.route, exact: true, component: Routes.Task.component })));
 };
 const Routes = {
     TaskList: {
         route: "/tasks",
         tabPattern: RegExp("/tasks"),
         getUrl: () => `/tasks`,
-        component: TaskListView
+        component: TaskList
     },
     Task: {
         route: "/tasks/:id",
@@ -23,12 +21,6 @@ const Routes = {
         getUrl: (id) => `/tasks/${id}`,
         component: TaskTabView
     },
-    Tab: {
-        route: "/tasks/tab/:id",
-        tabPattern: RegExp("/tasks/tab/[^/]+"),
-        getUrl: (id) => `/tasks/tab/${id}`,
-        component: TaskDefaultView
-    },
     addRoutes: () => {
         BaseRoutes.routes.push({
             name: "task",

package/es/modules/tasks/TasksRoutes.js.map

@@ -1 +1 @@
-{"version":3,"file":"TasksRoutes.js","sourceRoot":"","sources":["../../../src/modules/tasks/TasksRoutes.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE7C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,OAAO,eAAe,MAAM,yBAAyB,CAAC;AACtD,OAAO,YAAY,MAAM,sBAAsB,CAAC;AAChD,OAAO,WAAW,MAAM,qBAAqB,CAAC;AAE9C,MAAM,UAAU,GAAG,GAAG,EAAE;IACvB,OAAO,CACN,oBAAC,MAAM;QACN,oBAAC,KAAK,IAAC,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC,SAAS,GAAI;QACzF,oBAAC,KAAK,IAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,SAAS,GAAI;QACjF,oBAAC,KAAK,IAAC,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC,SAAS,GAAI,CACvE,CACT,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG;IACd,QAAQ,EAAE;QACT,KAAK,EAAE,QAAQ;QACf,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC;QAC5B,MAAM,EAAE,GAAG,EAAE,CAAC,QAAQ;QACtB,SAAS,EAAE,YAAY;KACvB;IACD,IAAI,EAAE;QACL,KAAK,EAAE,YAAY;QACnB,UAAU,EAAE,MAAM,CAAC,cAAc,CAAC;QAClC,MAAM,EAAE,CAAC,EAAU,EAAE,EAAE,CAAC,UAAU,EAAE,EAAE;QACtC,SAAS,EAAE,WAAW;KACtB;IACD,GAAG,EAAE;QACJ,KAAK,EAAE,gBAAgB;QACvB,UAAU,EAAE,MAAM,CAAC,kBAAkB,CAAC;QACtC,MAAM,EAAE,CAAC,EAAU,EAAE,EAAE,CAAC,cAAc,EAAE,EAAE;QAC1C,SAAS,EAAE,eAAe;KAC1B;IAED,SAAS,EAAE,GAAG,EAAE;QACf,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC;YACtB,IAAI,EAAE,MAAM;YACZ,cAAc,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU;YACtC,SAAS,EAAE,oBAAC,UAAU,OAAG;SACzB,CAAC,CAAC;QACH,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC;YACtB,IAAI,EAAE,WAAW;YACjB,cAAc,EAAE,MAAM,CAAC,QAAQ,CAAC,UAAU;YAC1C,SAAS,EAAE,oBAAC,UAAU,OAAG;SACzB,CAAC,CAAC;IACJ,CAAC;CACD,CAAC;AAEF,eAAe,MAAM,CAAC"}
+{"version":3,"file":"TasksRoutes.js","sourceRoot":"","sources":["../../../src/modules/tasks/TasksRoutes.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE7C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,OAAO,QAAQ,MAAM,kBAAkB,CAAC;AACxC,OAAO,WAAW,MAAM,qBAAqB,CAAC;AAE9C,MAAM,UAAU,GAAG,GAAG,EAAE;IACvB,OAAO,CACN,oBAAC,MAAM;QACN,oBAAC,KAAK,IAAC,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,QAAQ,CAAC,SAAS,GAAI;QACzF,oBAAC,KAAK,IAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,SAAS,GAAI,CACzE,CACT,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG;IACd,QAAQ,EAAE;QACT,KAAK,EAAE,QAAQ;QACf,UAAU,EAAE,MAAM,CAAC,QAAQ,CAAC;QAC5B,MAAM,EAAE,GAAG,EAAE,CAAC,QAAQ;QACtB,SAAS,EAAE,QAAQ;KACnB;IACD,IAAI,EAAE;QACL,KAAK,EAAE,YAAY;QACnB,UAAU,EAAE,MAAM,CAAC,cAAc,CAAC;QAClC,MAAM,EAAE,CAAC,EAAU,EAAE,EAAE,CAAC,UAAU,EAAE,EAAE;QACtC,SAAS,EAAE,WAAW;KACtB;IAED,SAAS,EAAE,GAAG,EAAE;QACf,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC;YACtB,IAAI,EAAE,MAAM;YACZ,cAAc,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU;YACtC,SAAS,EAAE,oBAAC,UAAU,OAAG;SACzB,CAAC,CAAC;QACH,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC;YACtB,IAAI,EAAE,WAAW;YACjB,cAAc,EAAE,MAAM,CAAC,QAAQ,CAAC,UAAU;YAC1C,SAAS,EAAE,oBAAC,UAAU,OAAG;SACzB,CAAC,CAAC;IACJ,CAAC;CACD,CAAC;AAEF,eAAe,MAAM,CAAC"}

package/es/modules/tasks/components/SubTaskList/index.js

@@ -1,13 +1,9 @@
 import classnames from "classnames";
 import React, { useEffect, useRef, useState } from "react";
-import SortDnD from "@voplus/morpho-ui/es/controls/SortDnD";
-// import PageListView from "@voplus/morpho-ui/es/controls/PageListView";
-import PageListView from "../../../../components/PageListView";
-import SortViewDropdown from "../../../../controls/SortViewDropdown";
+import { ListView } from "@voplus/morpho-ui";
 import TaskItem from "../TaskItem";
 import "./index.less";
 import { FileStore } from "@voplus/morpho-document/es/data/FileStore/FileContext";
-import FilterListDropdown from "@voplus/morpho-ui/es/components/layout/ListView/controls/FilterListDropdown";
 import { toJS } from "mobx";
 import { useObserver } from "mobx-react-lite";
 import { useTaskListEffect, useTaskStore } from "../../../../data/task";
@@ -45,6 +41,9 @@ const SubTaskList = (props) => {
         state.loading = true;
         state.page = state.page + 1;
     };
+    const onMove = (ids) => {
+        store.onMove(ids);
+    };
     const onSort = async (value) => {
         reset();
         state.data = value;
@@ -70,7 +69,7 @@ const SubTaskList = (props) => {
         state.page = 1;
         state.tasks = [];
         state.loading = true;
-        ref.current.reset();
+        // ref.current!.reset();
     };
     const scrollParentRef = useRef();
     const ref = useRef();
@@ -81,9 +80,29 @@ const SubTaskList = (props) => {
     }, [props.parentId]);
     return useObserver(() => (React.createElement(React.Fragment, null,
         React.createElement("div", { className: classnames("sub-task-list", props.className) },
-            !state.showMore && (React.createElement(PageListView, { ref: ref, header: !!props.header, addAble: !readonly, title: "Sub-Tasks", data: state.tasks, page: state.page, loading: state.loading, loadMore: loadMore, onDelete: onDelete, onAdd: () => (state.addAble = true), scrollParentRef: scrollParentRef && scrollParentRef.current && scrollParentRef.current.view, extra: React.createElement(React.Fragment, null,
-                    React.createElement(SortViewDropdown, { onChange: data => onSort(data), onReset: onSort }),
-                    React.createElement(FilterListDropdown, { status: state.filters, onChange: ({ value }) => onFilter(value) })) }, (list, multiple) => (React.createElement(SortDnD, { list: list, moveAfter: moveAfter, text: (task, index, connectDragSource) => (React.createElement(TaskItem, { type: "sub", id: task.id, index: index, connectDragSource: connectDragSource, multiple: multiple, readonly: readonly })) })))),
+            !state.showMore && (React.createElement(ListView
+            // ref={ref}
+            , { 
+                // ref={ref}
+                renderId: props.parentId, addAble: !readonly, subTitle: "Sub-Tasks", showMultiple: true, data: state.tasks, page: state.page, loading: state.loading, loadMore: loadMore, onDelete: onDelete, onMove: onMove, onSort: onSort, onFilter: onFilter, onAdd: () => (state.addAble = true), moveAfter: moveAfter, renderItem: ({ item, index, connectDragSource, multiple }) => (React.createElement(TaskItem, { type: "sub", id: item.id, index: index, connectDragSource: connectDragSource, multiple: multiple, readonly: readonly })) })
+            /* {(list: any[], multiple: boolean) => (
+                    <SortDnD
+                        list={list}
+                        moveAfter={moveAfter}
+                        text={(task: any, index: number, connectDragSource: any) => (
+                            <TaskItem
+                                type="sub"
+                                id={task.id}
+                                index={index}
+                                connectDragSource={connectDragSource}
+                                multiple={multiple}
+                                readonly={readonly}
+                            />
+                        )}
+                    />
+                )}
+            </ListView> */
+            ),
             state.addAble && (React.createElement(NewTaskForm, { simple: true, parentId: props.parentId, block: true, onSave: onCancel, onCancel: onCancel, onShowMore: () => (state.showMore = !state.showMore) }))))));
 };
 SubTaskList.defaultProps = {

package/es/modules/tasks/components/SubTaskList/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/tasks/components/SubTaskList/index.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/tasks/components/SubTaskList/index.tsx"],"names":[],"mappings":"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"}

package/es/modules/tasks/components/SubTaskList/index.less

@@ -5,74 +5,10 @@
 		display: flex;
 		flex-direction: column;
 		height: 100%;
-		.sub-task-list_header {
-			position: relative;
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			// padding: 2px 0 10px 0;
-			padding: 10px 0;
-			margin: 0 20px;
-			color: #000;
+		.multiple-icon-text {
 			font-size: 15px;
-			font-weight: 500;
-			line-height: 15px;
-			.multiple-icon-text {
-				cursor: pointer;
-				.ant-btn {
-					padding: 0 10px 0 0;
-					font-size: 16px;
-				}
-			}
-			.select-operate-btn {
-				.ant-btn {
-					padding: 0 10px;
-					font-style: italic;
-				}
-				.del-btn {
-					color: #ff4d4f;
-					&:hover {
-						color: #ff7875;
-					}
-				}
-				.cancel-btn {
-					color: #666;
-					&:hover {
-						color: @primary-color;
-					}
-				}
-			}
-			.operate-icon span {
-				margin-left: 10px;
-				cursor: pointer;
-			}
-			.plus-icon {
-				display: inline-block;
-				padding: 4px;
-				font-size: 13px;
-				line-height: 1px;
-				background: #1abc9c;
-				cursor: pointer;
-			}
-		}
-		.sub-task-list_header:after {
-			position: absolute;
-			content: "";
-			left: 0;
-			bottom: 0;
-			right: 0;
-			border-bottom: 1px solid @border-color-base;
-		}
-		.sub-task-list_page {
-			flex: 1;
-			// overflow-x: hidden;
-			padding: 10px 0 20px 0;
-			.task-row-item {
-				padding: 0 20px;
-			}
-			.select-checkbox {
-				padding: 5px 10px 0 0;
-			}
+			font-weight: 600;
+			color: #000;
 		}
 	}
 }

package/es/modules/tasks/components/TaskDescription/index.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="react" />
+declare const TaskDescription: (props: {
+    id: string;
+    readonly?: boolean | undefined;
+}) => JSX.Element;
+export default TaskDescription;

package/es/modules/tasks/components/TaskDescription/index.js

@@ -0,0 +1,33 @@
+import { faEdit } from "@fortawesome/pro-light-svg-icons";
+import { FontAwesomeIcon as FAIcon } from "@fortawesome/react-fontawesome";
+import { Skeleton } from "@voplus/antd";
+import RichTextEditor from "@voplus/morpho-ui/es/controls/RichTextEditor";
+import { useObserver } from "mobx-react-lite";
+import React, { useEffect, useState } from "react";
+import { useTaskStore } from "../../../../data/task";
+import { useTask } from "../../../../data/task/hooks";
+import SubTaskList from "../SubTaskList";
+import styles from "./index.less";
+const TaskDescription = (props) => {
+    const tasks = useTaskStore();
+    const id = props.id;
+    useEffect(() => {
+        task.loaded = false;
+    }, [id]);
+    useEffect(() => {
+        setReload(props.readonly ? true : false);
+    }, [props.readonly]);
+    const [reload, setReload] = useState(false);
+    const task = useTask(id, { reload: reload });
+    const readonly = task.status === "Readonly" ? true : false;
+    const [scrollParentRef, setScrollParentRef] = useState();
+    return useObserver(() => (React.createElement("div", { className: styles["sub-task-tab-view"], ref: ref => setScrollParentRef(ref) },
+        React.createElement("div", { className: "task-description" },
+            React.createElement(Skeleton, { loading: !task.loaded, active: true },
+                React.createElement(RichTextEditor, { readOnly: readonly, editable: false, defaultValue: id, content: task.description || "", placeholder: readonly ? ("No description") : (React.createElement("span", null,
+                        React.createElement(FAIcon, { icon: faEdit }),
+                        "Add Description")), onSave: v => tasks.edit(task.id, { Description: v }) }))),
+        React.createElement(SubTaskList, { parentId: id, readonly: readonly, scrollParentRef: scrollParentRef }))));
+};
+export default TaskDescription;
+//# sourceMappingURL=index.js.map

package/es/modules/tasks/components/TaskDescription/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/tasks/components/TaskDescription/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAC1D,OAAO,EAAE,eAAe,IAAI,MAAM,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,cAAc,MAAM,8CAA8C,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEnD,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,WAAW,MAAM,gBAAgB,CAAC;AACzC,OAAO,MAAM,MAAM,cAAc,CAAC;AAElC,MAAM,eAAe,GAAG,CAAC,KAAyC,EAAE,EAAE;IACrE,MAAM,KAAK,GAAG,YAAa,EAAE,CAAC;IAC9B,MAAM,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC;IACpB,SAAU,CAAC,GAAG,EAAE;QACf,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACrB,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IACT,SAAS,CAAC,GAAG,EAAE;QACd,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IAC1C,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;IACrB,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC5C,MAAM,IAAI,GAAG,OAAO,CAAC,EAAG,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC9C,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,KAAK,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC;IAC3D,MAAM,CAAC,eAAe,EAAE,kBAAkB,CAAC,GAAG,QAAQ,EAAE,CAAC;IAEzD,OAAO,WAAW,CAAC,GAAG,EAAE,CAAC,CACxB,6BAAK,SAAS,EAAE,MAAM,CAAC,mBAAmB,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,kBAAkB,CAAC,GAAG,CAAC;QAC/E,6BAAK,SAAS,EAAC,kBAAkB;YAChC,oBAAC,QAAQ,IAAC,OAAO,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM;gBACtC,oBAAC,cAAc,IACd,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,KAAK,EACf,YAAY,EAAE,EAAE,EAChB,OAAO,EAAE,IAAI,CAAC,WAAW,IAAI,EAAE,EAC/B,WAAW,EACV,QAAQ,CAAC,CAAC,CAAC,CACV,gBAAgB,CAChB,CAAC,CAAC,CAAC,CACH;wBACC,oBAAC,MAAM,IAAC,IAAI,EAAE,MAAM,GAAI;0CAElB,CACP,EAEF,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC,GACnD,CACQ,CACN;QACN,oBAAC,WAAW,IAAC,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,eAAe,EAAE,eAAe,GAAI,CAC9E,CACN,CAAC,CAAC;AACJ,CAAC,CAAC;AACF,eAAe,eAAe,CAAC"}

package/es/modules/tasks/components/TaskDescription/index.less

@@ -0,0 +1,11 @@
+@import "../../../../styles/common.less";
+.sub-task-tab-view {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+	:global {
+		.task-description {
+			padding: 10px 20px;
+		}
+	}
+}

package/es/modules/tasks/components/TaskDetail/index.js

@@ -1,75 +1,39 @@
-import React, { useEffect, useState } from "react";
-import { faEdit } from "@fortawesome/pro-light-svg-icons";
-import { FontAwesomeIcon as FAIcon } from "@fortawesome/react-fontawesome";
-import { Button, Row, Skeleton, Tabs } from "@voplus/antd";
+import { Spin, Tabs } from "@voplus/antd";
 import Comment from "@voplus/morpho-collaboration/es/components/Comment";
-import { useDocumentStore } from "@voplus/morpho-document";
 import DocumentList from "@voplus/morpho-document/es/components/DocumentList";
-import ActivityLog from "../../../../components/ActivityLog";
-import ToolBar from "../../../../components/ToolBar";
-import SubTaskList from "../SubTaskList";
-import TaskItem from "../TaskItem";
-import { useAsideContentContext } from "@voplus/morpho-ui/es/components/layout/AsideContent";
 import { useObserver } from "mobx-react-lite";
-import { useTaskStore } from "../../../../data/task";
+import React, { useEffect, useState } from "react";
+import ActivityLog from "../../../../components/ActivityLog";
 import { useTask } from "../../../../data/task/hooks";
-// import { FileStore } from "@voplus/morpho-document/es/data/FileStore/FileContext";
-import { FileStore } from "@voplus/morpho-document/es/data/FileStore/FileContext";
-import RichTextEditor from "@voplus/morpho-ui/es/controls/RichTextEditor";
-import styles from "./index.less";
-// id of the task
+import TaskDescription from "../TaskDescription";
+import TaskHeader from "../TaskHeader";
 const TaskDetail = (props) => {
-    // const { match } = useContext(__RouterContext) as {
-    // 	match: match<any>;
-    // };
-    const tasks = useTaskStore();
-    const documents = useDocumentStore();
     const id = props.id;
-    useEffect(() => {
-        task.loaded = false;
-    }, [id]);
-    const [store] = useState(new FileStore());
-    const task = useTask(id, { reload: true });
-    const readonly = task.status === "Readonly" ? true : false;
-    const [scrollParentRef, setScrollParentRef] = useState();
-    const asideContext = useAsideContentContext();
-    const onItemDelete = async () => {
-        await tasks.delete([id], { DeleteChilds: true });
-        asideContext.closeAside();
-    };
-    const onMove = () => {
-        store.onMove([id]);
+    const [reload, setReload] = useState(true);
+    const task = useTask(id, { reload: reload });
+    const [readonly, setReadonly] = useState();
+    const onChangeReadonly = (newReadonly) => {
+        setReadonly(newReadonly);
     };
-    const onLock = () => {
-        documents.edit(task.id, { Status: "Readonly" });
+    const onReLoad = () => {
+        setReload(!reload);
     };
-    const onUnlock = () => {
-        documents.edit(task.id, { Status: "Normal" });
-    };
-    return useObserver(() => (React.createElement("div", { className: "module-detail-view" },
-        React.createElement(Row, { type: "flex", justify: "space-between", className: "module-view-header" },
-            React.createElement(Skeleton, { loading: !task.loaded, active: true },
-                React.createElement(TaskItem, { type: "detail", id: task.id }),
-                React.createElement("div", { className: styles["task-tool-bar"] },
-                    React.createElement(ToolBar, { id: id, size: "small", timer: true, url: `/tasks/${id}`, del: !readonly, move: !readonly, lock: task.status === "Draft" || task.status === "Normal", unlock: task.status === "Readonly", onDelete: onItemDelete, onMove: onMove, onPaste: () => store.onPaste(() => tasks.move(store.moveIds, task.id)), onLock: onLock, onUnlock: onUnlock }),
-                    React.createElement("div", { className: "margin-top-10" },
-                        React.createElement(Button, { size: "small" }, "+tag"))))),
+    useEffect(() => {
+        if (!reload && task.loaded)
+            setReload(true);
+    }, [reload]);
+    return useObserver(() => reload ? (React.createElement("div", { className: "module-detail-view" },
+        React.createElement(TaskHeader, { id: id, onChangeReadonly: onChangeReadonly, onReLoad: onReLoad }),
         React.createElement(Tabs, { defaultActiveKey: "Details" },
             React.createElement(Tabs.TabPane, { tab: "Details", key: "Details" },
-                React.createElement("div", { className: styles["sub-task-tab-view"], ref: ref => setScrollParentRef(ref) },
-                    React.createElement("div", { className: "task-description" },
-                        React.createElement(Skeleton, { loading: !task.loaded, active: true },
-                            React.createElement(RichTextEditor, { readOnly: readonly, editable: false, defaultValue: id, content: task.description || "", placeholder: readonly ? ("No description") : (React.createElement("span", null,
-                                    React.createElement(FAIcon, { icon: faEdit }),
-                                    "Add Description")), onSave: v => tasks.edit(task.id, { Description: v }) }))),
-                    React.createElement(SubTaskList, { parentId: id, readonly: readonly, scrollParentRef: scrollParentRef }))),
+                React.createElement(TaskDescription, { id: id, readonly: readonly })),
             React.createElement(Tabs.TabPane, { tab: "Documents", key: "Documents" },
                 React.createElement(DocumentList, { id: id })),
             React.createElement(Tabs.TabPane, { tab: "Comments", key: "Comments" },
                 React.createElement(Comment, { channelId: task.channelId })),
             React.createElement(Tabs.TabPane, { tab: "Activities", key: "Activities" },
                 React.createElement("div", { className: "module-box" },
-                    React.createElement(ActivityLog, null)))))));
+                    React.createElement(ActivityLog, null)))))) : (React.createElement(Spin, null)));
 };
 export default TaskDetail;
 //# sourceMappingURL=index.js.map

package/es/modules/tasks/components/TaskDetail/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/tasks/components/TaskDetail/index.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/tasks/components/TaskDetail/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAC1C,OAAO,OAAO,MAAM,oDAAoD,CAAC;AACzE,OAAO,YAAY,MAAM,oDAAoD,CAAC;AAC9E,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEnD,OAAO,WAAW,MAAM,oCAAoC,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,eAAe,MAAM,oBAAoB,CAAC;AACjD,OAAO,UAAU,MAAM,eAAe,CAAC;AAEvC,MAAM,UAAU,GAAG,CAAC,KAAwC,EAAE,EAAE;IAC/D,MAAM,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC;IACpB,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC3C,MAAM,IAAI,GAAG,OAAO,CAAC,EAAG,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC9C,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,EAAE,CAAC;IAC3C,MAAM,gBAAgB,GAAG,CAAC,WAAoB,EAAE,EAAE;QACjD,WAAW,CAAC,WAAW,CAAC,CAAC;IAC1B,CAAC,CAAC;IACF,MAAM,QAAQ,GAAG,GAAG,EAAE;QACrB,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC;IACpB,CAAC,CAAC;IACF,SAAS,CAAC,GAAG,EAAE;QACd,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM;YAAE,SAAS,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IACb,OAAO,WAAW,CAAC,GAAG,EAAE,CACvB,MAAM,CAAC,CAAC,CAAC,CACR,6BAAK,SAAS,EAAC,oBAAoB;QAClC,oBAAC,UAAU,IAAC,EAAE,EAAE,EAAE,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,QAAQ,EAAE,QAAQ,GAAI;QAE9E,oBAAC,IAAI,IAAC,gBAAgB,EAAC,SAAS;YAC/B,oBAAC,IAAI,CAAC,OAAO,IAAC,GAAG,EAAC,SAAS,EAAC,GAAG,EAAC,SAAS;gBACxC,oBAAC,eAAe,IAAC,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,QAAQ,GAAI,CACjC;YACf,oBAAC,IAAI,CAAC,OAAO,IAAC,GAAG,EAAC,WAAW,EAAC,GAAG,EAAC,WAAW;gBAC5C,oBAAC,YAAY,IAAC,EAAE,EAAE,EAAE,GAAI,CACV;YACf,oBAAC,IAAI,CAAC,OAAO,IAAC,GAAG,EAAC,UAAU,EAAC,GAAG,EAAC,UAAU;gBAC1C,oBAAC,OAAO,IAAC,SAAS,EAAE,IAAI,CAAC,SAAS,GAAI,CACxB;YACf,oBAAC,IAAI,CAAC,OAAO,IAAC,GAAG,EAAC,YAAY,EAAC,GAAG,EAAC,YAAY;gBAC9C,6BAAK,SAAS,EAAC,YAAY;oBAC1B,oBAAC,WAAW,OAAG,CACV,CACQ,CACT,CACF,CACN,CAAC,CAAC,CAAC,CACH,oBAAC,IAAI,OAAG,CACR,CACD,CAAC;AACH,CAAC,CAAC;AACF,eAAe,UAAU,CAAC"}

package/es/modules/tasks/components/TaskHeader/index.d.ts

@@ -0,0 +1,10 @@
+/// <reference types="react" />
+import "./index.less";
+declare const TaskHeader: (props: {
+    id: string;
+    onChangeReadonly?: any;
+    reload?: boolean | undefined;
+    onReLoad?: (() => void) | undefined;
+    onExpand?: (() => void) | undefined;
+}) => JSX.Element;
+export default TaskHeader;

package/es/modules/tasks/components/TaskHeader/index.js

@@ -0,0 +1,46 @@
+import React, { useState } from "react";
+import { Skeleton } from "@voplus/antd";
+import { useDocumentStore } from "@voplus/morpho-document";
+import ToolBar from "../../../../components/ToolBar";
+import TaskItem from "../TaskItem";
+import { useAsideContentContext } from "@voplus/morpho-ui/es/components/layout/AsideContent";
+import { useObserver } from "mobx-react-lite";
+import { useTaskStore } from "../../../../data/task";
+import { useTask } from "../../../../data/task/hooks";
+import { FileStore } from "@voplus/morpho-document/es/data/FileStore/FileContext";
+import "./index.less";
+const TaskHeader = (props) => {
+    const tasks = useTaskStore();
+    const documents = useDocumentStore();
+    const { id, reload, onReLoad, onExpand } = props;
+    // useEffect!(() => {
+    // 	task.loaded = false;
+    // }, [id]);
+    const [store] = useState(new FileStore());
+    const task = useTask(id, { reload: !!reload });
+    const readonly = task.status === "Readonly" ? true : false;
+    const asideContext = useAsideContentContext();
+    const onItemDelete = async () => {
+        await tasks.delete([id], { DeleteChilds: true });
+        asideContext.closeAside();
+    };
+    const onMove = () => {
+        store.onMove([id]);
+    };
+    const onLock = async () => {
+        await documents.edit(task.id, { Status: "Readonly" });
+        if (props.onChangeReadonly)
+            props.onChangeReadonly(true);
+    };
+    const onUnlock = async () => {
+        await documents.edit(task.id, { Status: "Normal" });
+        if (props.onChangeReadonly)
+            props.onChangeReadonly(false);
+    };
+    return useObserver(() => (React.createElement("div", { className: "task-detail_header" },
+        React.createElement(Skeleton, { loading: !task.loaded, active: true },
+            React.createElement(TaskItem, { type: "detail", id: task.id }),
+            React.createElement(ToolBar, { id: id, reload: true, size: "small", timer: true, url: !!onExpand ? "" : `/tasks/${id}`, expand: !!onExpand, del: !readonly, move: !readonly, lock: task.status === "Draft" || task.status === "Normal", unlock: task.status === "Readonly", onDelete: onItemDelete, onMove: onMove, onPaste: () => store.onPaste(() => tasks.move(store.moveIds, task.id)), onLock: onLock, onUnlock: onUnlock, onReLoad: onReLoad, onExpand: onExpand })))));
+};
+export default TaskHeader;
+//# sourceMappingURL=index.js.map

package/es/modules/tasks/components/TaskHeader/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/tasks/components/TaskHeader/index.tsx"],"names":[],"mappings":"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"}

package/es/modules/tasks/components/TaskHeader/index.less

@@ -0,0 +1,6 @@
+:global {
+	.task-detail_header {
+		display: flex;
+		padding: 10px 20px;
+	}
+}