@voplus/morpho-workspace 1.0.0-dev70 → 1.0.0-dev72

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

@@ -1,10 +1,13 @@
 /// <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;
+import { TaskItemProps } from "../TaskItem/state";
+declare const TaskHeader: {
+    (props: TaskItemProps): JSX.Element;
+    defaultProps: {
+        /** includes: path,tags,task-number-reports*/
+        includes: string;
+        /** reload of task */
+        reload: boolean;
+    };
+};
 export default TaskHeader;

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

@@ -1,51 +1,43 @@
+import "./index.less";
 import React, { useState } from "react";
+import { State } from "../TaskItem/state";
+import { useTask, useTaskStore } from "../../../../data/task";
+import AvatarList from "../../../../components/AvatarList";
+import DocumentStatusLabel from "../../../../controls/DocumentStatusLabel";
+import FlagIcon from "../../../../controls/FlagIcon";
+import IconNumebers from "../../../../controls/IconNumbers";
+import { InlineEdit } from "@voplus/morpho-ui";
 import { Skeleton } from "@voplus/antd";
-import { useDocumentStore } from "@voplus/morpho-document";
-import ToolBar from "../../../../components/ToolBar";
-import TaskItem from "../TaskItem";
 import TagView from "@voplus/morpho-document/es/components/TagView";
-import { useAsideContentContext } from "@voplus/morpho-ui/es/components/layout/AsideContent";
+import TaskTimeBox from "../TaskTimeBox";
+import ToolBar from "../../../../components/ToolBar";
 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: true, includes: "path,tags" });
-    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, includes: "path,tags" }),
-            React.createElement("div", { style: { maxWidth: "40%", textAlign: "right" } },
-                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 }),
-                React.createElement(TagView, { id: id, tags: task.tags, editable: !readonly }))))));
+    const { id, includes, onExpand, onReload } = props;
+    const taskStore = useTaskStore();
+    const [state] = useState(new State(taskStore));
+    state.task = useTask(id, { reload: true, includes });
+    const { taskNumbers, incompleteTaskNumbers, documents, comments, members } = state.task;
+    return useObserver(() => (React.createElement("div", { className: "detail-task-item" }, !state.task.loading ? (React.createElement(React.Fragment, null,
+        React.createElement("div", null,
+            React.createElement("div", { className: "task-header" },
+                React.createElement(FlagIcon, { id: id, flag: state.task.flag, className: "task-flag", editable: !state.readonly }),
+                React.createElement(InlineEdit, { editable: state.task.taskStatus !== "Done" && !state.readonly, defaultValue: state.task.name, content: v => React.createElement("div", { className: "task-item-name" }, v.store.value), onSave: (v) => (v ? state.onEdit({ Name: v }) : null) })),
+            React.createElement("div", { className: "file-num" },
+                React.createElement(TaskTimeBox, { id: id, estimatedHours: state.task.estimatedHours || 0, schedule: [state.task.startDate, state.task.dueDate], editable: !state.readonly })),
+            React.createElement("div", { className: "file-num" },
+                React.createElement(IconNumebers, { taskNumbers: taskNumbers, incompleteTaskNumbers: incompleteTaskNumbers, documents: documents, comments: comments, memberNumbers: members ? members.length : 0 }),
+                React.createElement(DocumentStatusLabel, { status: state.task.taskStatus, editable: state.task.taskStatus !== "NotAssigned" || !state.readonly, onChange: TaskStatus => state.onEdit({ TaskStatus }), className: "margin-left-30" })),
+            React.createElement(AvatarList, { editable: !state.readonly, list: state.task.members, onChange: ids => state.onEdit({ MemberIds: ids }) })),
+        React.createElement("div", { className: "toolbar-content" },
+            React.createElement(ToolBar, { id: id, reload: true, size: "small", timer: true, url: onExpand ? "" : `/tasks/${id}`, expand: !!onExpand, del: !state.readonly, move: !state.readonly, lock: state.task.status === "Draft" || state.task.status === "Normal", unlock: state.task.status === "Readonly", onDelete: state.onDelete, onMove: state.onMove, onPaste: state.onPaste, onLock: () => state.onEdit({ Status: "Readonly" }), onUnlock: () => state.onEdit({ Status: "Normal" }), onReLoad: onReload, onExpand: onExpand }),
+            React.createElement(TagView, { id: id, tags: state.task.tags, editable: !state.readonly })))) : (React.createElement(Skeleton, { active: true })))));
+};
+TaskHeader.defaultProps = {
+    /** includes: path,tags,task-number-reports*/
+    includes: "tags,task-number-reports",
+    /** reload of task */
+    reload: false
 };
 export default TaskHeader;
 //# sourceMappingURL=index.js.map

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

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

@@ -1,6 +1,51 @@
+@import "~@voplus/antd/es/style/themes/default.less";
+@import "../../../../style/common.less";
 :global {
-	.task-detail_header {
+	.detail-task-item {
 		display: flex;
-		padding: 10px 20px;
+		flex: 1;
+		justify-content: space-between;
+		padding: 10px 0;
+		margin: 0 20px;
+		> div {
+			flex: 1;
+		}
+		.task-header {
+			display: flex;
+			align-items: center;
+			padding-bottom: 5px;
+			.task-flag {
+				width: 25px;
+			}
+			.morpho-inline-edit {
+				flex: 1;
+			}
+		}
+		.task-item-name {
+			color: #000;
+			font-size: 15px;
+			font-weight: 500;
+			&.task-item-name_done {
+				color: #a8a8a8;
+			}
+		}
+		.file-num {
+			color: #444;
+			font-size: 13px;
+			padding-bottom: 5px;
+			// > span + span {
+			// 	margin-left: 12px;
+			// }
+			.svg-inline--fa {
+				margin-right: 5px;
+			}
+			.box {
+				margin: 0 30px 0 12px;
+			}
+		}
+		.toolbar-content {
+			max-width: 40%;
+			text-align: right;
+		}
 	}
 }

package/es/modules/tasks/components/TaskItem/SubTaskItem.js

@@ -1,20 +1,19 @@
 import "./subTaskItem.less";
-import { Button, Checkbox, DatePicker, Input, Skeleton } from "@voplus/antd";
+import { Button, Checkbox, Input } from "@voplus/antd";
 import React, { useState } from "react";
 import { State } from "./state";
-import { faBars, faSave, faStopwatch, faUndo } from "@fortawesome/pro-light-svg-icons";
+import { faBars, faSave, faUndo } from "@fortawesome/pro-light-svg-icons";
 import { useTask, useTaskStore } from "../../../../data/task";
 import AvatarList from "../../../../components/AvatarList";
 import DocumentStatusLabel from "../../../../controls/DocumentStatusLabel";
 import { FontAwesomeIcon as FAIcon } from "@fortawesome/react-fontawesome";
 import FlagIcon from "../../../../controls/FlagIcon";
 import IconNumebers from "../../../../controls/IconNumbers";
+import QuickViewDialog from "@voplus/morpho-document/es/components/QuickViewDialog";
 import TagView from "@voplus/morpho-document/es/components/TagView";
-import TaskQuickViewDialog from "../TaskQuickViewDialog";
+import TaskTimeBox from "../TaskTimeBox";
 import ToolBar from "../../../../components/ToolBar";
 import classnames from "classnames";
-import moment from "moment";
-import { toJS } from "mobx";
 import { useObserver } from "mobx-react-lite";
 const SubTaskItem = (props) => {
     const { id, multiple, reload, connectDragSource } = props;
@@ -23,7 +22,7 @@ const SubTaskItem = (props) => {
     state.task = useTask(id, { reload: !!reload, includes: "tags,task-number-reports" });
     const { taskNumbers, incompleteTaskNumbers, documents, comments, members } = state.task;
     return useObserver(() => (React.createElement(React.Fragment, null,
-        React.createElement("div", { className: "sub-task-item", onMouseLeave: () => (state.isHover = false) }, !state.task.loading ? (React.createElement(React.Fragment, null,
+        React.createElement("div", { className: "sub-task-item", onMouseLeave: () => (state.isHover = false) },
             React.createElement("div", { className: classnames("sub-task-item_box", { "sub-task-item_hover": state.isHover }), onMouseOver: () => (state.isHover = !multiple && !state.editable) },
                 React.createElement("div", null,
                     React.createElement("div", { className: "task-header" },
@@ -34,34 +33,23 @@ const SubTaskItem = (props) => {
                         !multiple ? (connectDragSource &&
                             connectDragSource(React.createElement("span", { className: classnames("task-move", { show: state.editable }) }, React.createElement(FAIcon, { icon: faBars })))) : (React.createElement("span", { className: "task-move" })),
                         React.createElement("div", null,
-                            React.createElement("p", null, state.open ? (React.createElement(DatePicker.RangePicker, { autoFocus: true, format: "YYYY-MM-DD", 
-                                // disabledDate={disabledDate}
-                                value: state.clockDate, open: state.open, onChange: onChangeDate, onOpenChange: onOpenChange })) : state.startDate || state.editable ? (React.createElement("span", { onClick: () => state.startEditDate() },
-                                React.createElement(FAIcon, { icon: faStopwatch }),
-                                state.startDate ? (React.createElement(React.Fragment, null, moment(state.startDate).format("DD MMM YYYY") +
-                                    "~" +
-                                    moment(state.dueDate).format("DD MMM YYYY"))) : ("Add Task Time"),
-                                React.createElement("span", { className: "padding-left-20" }, moment(state.startDate).from(moment(state.dueDate), true)))) : ("")),
+                            React.createElement("p", null,
+                                React.createElement(TaskTimeBox, { id: id, estimatedHours: state.task.estimatedHours || 0, schedule: [state.task.startDate, state.task.dueDate], editable: !state.readonly &&
+                                        !!(state.editable || state.task.startDate || state.task.estimatedHours), className: "task-time-box" })),
                             React.createElement("p", null,
                                 React.createElement(IconNumebers, { taskNumbers: taskNumbers, incompleteTaskNumbers: incompleteTaskNumbers, documents: documents, comments: comments, memberNumbers: members ? members.length : 0 }))))),
-                React.createElement(AvatarList, { num: 3, multiple: state.editable, list: [...(state.task.members || []), ...state.inheritedMembers], editable: state.editable, onChange: (ids) => (state.ids = ids), className: "box" })),
+                React.createElement(AvatarList, { num: 3, multiple: state.editable, list: [...(state.task.members || []), ...state.inheritedMembers], editable: state.editable, onChange: (ids) => {
+                        state.ids = ids;
+                        console.log(ids, "ids");
+                    }, className: "box" })),
             state.editable ? (React.createElement("div", null,
                 React.createElement(Button, { shape: "circle", onClick: () => (state.editable = false) },
                     React.createElement(FAIcon, { icon: faUndo })),
-                React.createElement(Button, { type: "primary", ghost: true, shape: "circle", className: "margin-left-10", onClick: () => state.save() },
+                React.createElement(Button, { type: "primary", ghost: true, shape: "circle", disabled: !state.hasChanges, loading: state.loading, className: "margin-left-10", onClick: () => state.save() },
                     React.createElement(FAIcon, { icon: faSave })))) : (React.createElement(DocumentStatusLabel, { status: state.task.taskStatus, editable: state.task.taskStatus !== "NotAssigned" || !state.readonly, onChange: TaskStatus => state.onEdit({ TaskStatus }), className: classnames({ hide: state.isHover }) })),
             React.createElement("div", { className: classnames("hover-operate-icon", { show: state.isHover }) },
-                React.createElement(ToolBar, { size: "default", url: `/tasks/${props.id}`, del: false, move: !state.readonly, lock: state.task.status === "Draft" || state.task.status === "Normal", unlock: state.task.status === "Readonly", hoverEdit: !state.readonly, hoverDel: !state.readonly, onEdit: () => state.startEdit(), onDelete: state.onDelete, onMove: state.onMove, onPaste: state.onPaste, onLock: () => state.onEdit({ Status: "Readonly" }), onUnlock: () => state.onEdit({ Status: "Normal" }) })))) : (React.createElement(Skeleton, { active: true }))),
-        React.createElement(TaskQuickViewDialog, { id: id, visible: state.visibleQuickView, onCancel: () => (state.visibleQuickView = false) }))));
-    function onChangeDate(dates) {
-        state.clockDate = toJS(dates);
-    }
-    /** */
-    function onOpenChange(open) {
-        if (state.task.startDate)
-            state.clockDate = toJS([state.task.startDate, state.task.dueDate]);
-        state.open = open;
-    }
+                React.createElement(ToolBar, { size: "default", url: `/tasks/${props.id}`, del: false, move: !state.readonly, lock: state.task.status === "Draft" || state.task.status === "Normal", unlock: state.task.status === "Readonly", hoverEdit: !state.readonly, hoverDel: !state.readonly, onEdit: () => state.startEdit(), onDelete: state.onDelete, onMove: state.onMove, onPaste: state.onPaste, onLock: () => state.onEdit({ Status: "Readonly" }), onUnlock: () => state.onEdit({ Status: "Normal" }) }))),
+        React.createElement(QuickViewDialog, { id: id, type: "task", visible: state.visibleQuickView, onCancel: () => (state.visibleQuickView = false) }))));
 };
 export default SubTaskItem;
 //# sourceMappingURL=SubTaskItem.js.map

package/es/modules/tasks/components/TaskItem/SubTaskItem.js.map

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

package/es/modules/tasks/components/TaskItem/state.d.ts

@@ -15,11 +15,14 @@ export declare class State {
     ids: string[];
     members: any[];
     name: string;
-    clockDate: any;
+    /** Schedule of task */
+    schedule: any[];
+    /** EstimatedHours of task */
+    estimatedHours: number;
     /** Edit model of task  */
     editable: boolean;
+    /** loading of save  */
     loading: boolean;
-    visible: boolean;
     visibleQuickView: boolean;
     modalType: string;
     /** MouseOver of sub task  */
@@ -36,11 +39,9 @@ export declare class State {
     onEdit: (option: any) => Promise<void>;
     /** task delete */
     onDelete: () => Promise<void>;
-    /** */
     onMove: () => void;
     /** */
     onPaste: () => void;
-    saveDate: (startDate: Date, dueDate: Date) => void;
     get inheritedMembers(): {
         disabled: boolean;
         id: string;
@@ -48,8 +49,5 @@ export declare class State {
         avatarUrl: string;
     }[];
     get readonly(): boolean;
-    /** Start date of the task */
-    get startDate(): any;
-    /** Due date of the task */
-    get dueDate(): any;
+    get hasChanges(): boolean | undefined;
 }

package/es/modules/tasks/components/TaskItem/state.js

@@ -1,18 +1,22 @@
 import { __decorate } from "tslib";
-import { message } from "@voplus/antd";
-import { FileStore } from "@voplus/morpho-document/es/data/FileStore/FileContext";
 import { action, computed, observable, toJS } from "mobx";
+import { FileStore } from "@voplus/morpho-document/es/data/FileStore/FileContext";
+import { isEqual } from "lodash-es";
+import { message } from "@voplus/antd";
 export class State {
     constructor(taskStore) {
         this.taskStore = taskStore;
         this.ids = [];
         this.members = [];
         this.name = "";
-        this.clockDate = [];
+        /** Schedule of task */
+        this.schedule = [];
+        /** EstimatedHours of task */
+        this.estimatedHours = 0;
         /** Edit model of task  */
         this.editable = false;
+        /** loading of save  */
         this.loading = false;
-        this.visible = false;
         this.visibleQuickView = false;
         this.modalType = "";
         /** MouseOver of sub task  */
@@ -32,22 +36,14 @@ export class State {
             this.editable = true;
         };
         this.save = async () => {
-            if (!this.name)
-                return;
-            const ids = [...(this.task.members || []), ...this.inheritedMembers].map(({ id }) => id);
-            const noChange = this.name.trim() === this.task.name &&
-                this.ids.sort().toString() === ids.sort().toString() &&
-                this.startDate === this.task.startDate &&
-                this.dueDate === this.task.dueDate;
-            // 有变更才保存
-            if (!noChange) {
-                let params = { Name: this.name, MemberIds: this.ids };
-                if (this.startDate)
-                    params = { ...params, StartDate: this.startDate, DueDate: this.dueDate };
-                this.loading = true;
-                await this.taskStore.edit(this.task.id, params);
-                this.loading = false;
-            }
+            const params = { Name: this.name, MemberIds: this.ids };
+            // if (this.estimatedHours) params = { ...params, EstimatedHours: this.estimatedHours };
+            // if (this.schedule[0])
+            // 	params = { ...params, StartDate: this.schedule[0], DueDate: this.schedule[1] };
+            this.loading = true;
+            await this.taskStore.edit(this.task.id, params);
+            this.loading = false;
+            // }
             this.editable = false;
         };
         /** task edit */
@@ -58,7 +54,6 @@ export class State {
         this.onDelete = async () => {
             await this.taskStore.delete([this.task.id], { DeleteChilds: true });
         };
-        /** */
         this.onMove = () => {
             this.store.onMove([this.task.id]);
         };
@@ -71,12 +66,6 @@ export class State {
             });
             // state.reload = true;
         };
-        this.saveDate = (startDate, dueDate) => {
-            this.taskStore.edit(this.task.id, {
-                StartDate: startDate,
-                DueDate: dueDate
-            });
-        };
     }
     get inheritedMembers() {
         return (this.task.inheritedMembers || [])
@@ -89,13 +78,21 @@ export class State {
     get readonly() {
         return this.task.status === "Readonly";
     }
-    /** Start date of the task */
-    get startDate() {
-        return toJS(this.clockDate)[0] || this.task.startDate;
-    }
-    /** Due date of the task */
-    get dueDate() {
-        return toJS(this.clockDate)[1] || this.task.dueDate;
+    get hasChanges() {
+        if (!this.name)
+            return;
+        const ids = toJS([...(this.task.members || []), ...this.inheritedMembers].map(({ id }) => id));
+        const { name, startDate, dueDate, estimatedHours } = this.task;
+        const originalData = { name, ids };
+        const modifiedData = {
+            name: this.name.trim(),
+            ids: this.ids
+            // startDate: toJS(this.schedule)[0],
+            // dueDate: toJS(this.schedule)[1],
+            // estimatedHours: this.estimatedHours || estimatedHours
+        };
+        // console.log(originalData, modifiedData, isEqual(originalData, modifiedData), "4444");
+        return !isEqual(originalData, modifiedData);
     }
 }
 __decorate([
@@ -112,16 +109,16 @@ __decorate([
 ], State.prototype, "name", void 0);
 __decorate([
     observable
-], State.prototype, "clockDate", void 0);
+], State.prototype, "schedule", void 0);
 __decorate([
     observable
-], State.prototype, "editable", void 0);
+], State.prototype, "estimatedHours", void 0);
 __decorate([
     observable
-], State.prototype, "loading", void 0);
+], State.prototype, "editable", void 0);
 __decorate([
     observable
-], State.prototype, "visible", void 0);
+], State.prototype, "loading", void 0);
 __decorate([
     observable
 ], State.prototype, "visibleQuickView", void 0);
@@ -154,7 +151,7 @@ __decorate([
 ], State.prototype, "onDelete", void 0);
 __decorate([
     action
-], State.prototype, "saveDate", void 0);
+], State.prototype, "onMove", void 0);
 __decorate([
     computed
 ], State.prototype, "inheritedMembers", null);
@@ -163,8 +160,5 @@ __decorate([
 ], State.prototype, "readonly", null);
 __decorate([
     computed
-], State.prototype, "startDate", null);
-__decorate([
-    computed
-], State.prototype, "dueDate", null);
+], State.prototype, "hasChanges", null);
 //# sourceMappingURL=state.js.map

package/es/modules/tasks/components/TaskItem/state.js.map

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

package/es/modules/tasks/components/TaskItem/subTaskItem.less

@@ -64,7 +64,8 @@
 			.padding-left-25 {
 				padding-left: 25px;
 			}
-			.tag-view {
+			.tag-view,
+			.task-time-box {
 				position: relative;
 				z-index: 100;
 				.ant-tag {
@@ -92,7 +93,8 @@
 					background-color: #fff;
 					z-index: 99;
 				}
-				.task-item-name {
+				.task-item-name,
+				.task-time-box {
 					opacity: 0.5;
 				}
 				.task-move {

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

@@ -1,34 +1,31 @@
 import "./index.less";
 import React, { useState } from "react";
 import { useTask, useTaskStore } from "../../../../data/task";
-import DetailsTaskItem from "../TaskItem/DetailsTaskItem";
 import DocumentTabs from "@voplus/morpho-document/es/components/DocumentTabs";
 import { FontAwesomeIcon as FAIcon } from "@fortawesome/react-fontawesome";
 import RichTextEditor from "@voplus/morpho-ui/es/controls/RichTextEditor";
 import Scrollbars from "react-custom-scrollbars";
 import { Skeleton } from "@voplus/antd";
 import SubTaskList from "../SubTaskList";
+import TaskHeader from "../TaskHeader";
 import { faEdit } from "@fortawesome/pro-light-svg-icons";
 import { useObserver } from "mobx-react-lite";
 const TaskPropertiesView = (props) => {
     const id = props.id;
     const task = useTask(id, { reload: false, includes: "tags,task-number-reports" });
     const taskStore = useTaskStore();
-    const readonly = task.status === "Readonly" ? true : false;
     const [loaded, setLoaded] = useState(true);
-    const [reload, setReload] = useState(true);
     return useObserver(() => (React.createElement("div", { className: "module-detail-view" }, loaded && (React.createElement(React.Fragment, null,
-        React.createElement(DetailsTaskItem, { id: id, onReload: onReload }),
+        React.createElement(TaskHeader, { id: id, onReload: onReload }),
         React.createElement(DocumentTabs, { id: id, exclude: ["Task"], details: React.createElement("div", { className: "task-properties-view" },
                 React.createElement(Scrollbars, { autoHide: true },
-                    React.createElement("div", { className: "task-description" }, task.loading ? (React.createElement(Skeleton, { active: true })) : (React.createElement(RichTextEditor, { readOnly: readonly, editable: false, defaultValue: id, content: task.description || "", placeholder: readonly ? ("No description") : (React.createElement("span", null,
+                    React.createElement("div", { className: "task-description" }, task.loading ? (React.createElement(Skeleton, { active: true })) : (React.createElement(RichTextEditor, { readOnly: task.status === "Readonly", editable: false, defaultValue: id, content: task.description || "", placeholder: task.status === "Readonly" ? ("No description") : (React.createElement("span", null,
                             React.createElement(FAIcon, { icon: faEdit }),
                             "Add Description")), onSave: v => taskStore.edit(task.id, { Description: v }) }))),
-                    React.createElement(SubTaskList, { parentId: id, readonly: readonly, reload: reload }))) }))))));
+                    React.createElement(SubTaskList, { parentId: id, readonly: task.status === "Readonly" }))) }))))));
     /** reload data */
     function onReload() {
         setLoaded(false);
-        setReload(true);
         setTimeout(() => {
             setLoaded(true);
         }, 100);

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/tasks/components/TaskPropertiesView/index.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/tasks/components/TaskPropertiesView/index.tsx"],"names":[],"mappings":"AAAA,OAAO,cAAc,CAAC;AAEtB,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE9D,OAAO,YAAY,MAAM,oDAAoD,CAAC;AAC9E,OAAO,EAAE,eAAe,IAAI,MAAM,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,cAAc,MAAM,8CAA8C,CAAC;AAC1E,OAAO,UAAU,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,WAAW,MAAM,gBAAgB,CAAC;AACzC,OAAO,UAAU,MAAM,eAAe,CAAC;AACvC,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,MAAM,kBAAkB,GAAG,CAAC,KAAwC,EAAE,EAAE;IACvE,MAAM,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC;IAEpB,MAAM,IAAI,GAAG,OAAO,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,0BAA0B,EAAE,CAAC,CAAC;IAClF,MAAM,SAAS,GAAG,YAAY,EAAE,CAAC;IACjC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC3C,OAAO,WAAW,CAAC,GAAG,EAAE,CAAC,CACxB,6BAAK,SAAS,EAAC,oBAAoB,IACjC,MAAM,IAAI,CACV,oBAAC,KAAK,CAAC,QAAQ;QACd,oBAAC,UAAU,IAAC,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,QAAQ,GAAI;QAC1C,oBAAC,YAAY,IACZ,EAAE,EAAE,EAAE,EACN,OAAO,EAAE,CAAC,MAAM,CAAC,EACjB,OAAO,EACN,6BAAK,SAAS,EAAC,sBAAsB;gBACpC,oBAAC,UAAU,IAAC,QAAQ;oBACnB,6BAAK,SAAS,EAAC,kBAAkB,IAC/B,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CACf,oBAAC,QAAQ,IAAC,MAAM,SAAG,CACnB,CAAC,CAAC,CAAC,CACH,oBAAC,cAAc,IACd,QAAQ,EAAE,IAAI,CAAC,MAAM,KAAK,UAAU,EACpC,QAAQ,EAAE,KAAK,EACf,YAAY,EAAE,EAAE,EAChB,OAAO,EAAE,IAAI,CAAC,WAAW,IAAI,EAAE,EAC/B,WAAW,EACV,IAAI,CAAC,MAAM,KAAK,UAAU,CAAC,CAAC,CAAC,CAC5B,gBAAgB,CAChB,CAAC,CAAC,CAAC,CACH;4BACC,oBAAC,MAAM,IAAC,IAAI,EAAE,MAAM,GAAI;8CAElB,CACP,EAEF,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC,GACvD,CACF,CACI;oBACN,oBAAC,WAAW,IAAC,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,MAAM,KAAK,UAAU,GAAI,CACvD,CACR,GAEN,CACc,CACjB,CACI,CACN,CAAC,CAAC;IACH,kBAAkB;IAClB,SAAS,QAAQ;QAChB,SAAS,CAAC,KAAK,CAAC,CAAC;QACjB,UAAU,CAAC,GAAG,EAAE;YACf,SAAS,CAAC,IAAI,CAAC,CAAC;QACjB,CAAC,EAAE,GAAG,CAAC,CAAC;IACT,CAAC;AACF,CAAC,CAAC;AACF,eAAe,kBAAkB,CAAC"}

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

@@ -0,0 +1,16 @@
+/// <reference types="react" />
+import "./index.less";
+declare const TaskTimeBox: {
+    (props: {
+        id: string;
+        estimatedHours?: number | undefined;
+        schedule?: any[] | undefined;
+        editable?: boolean | undefined;
+        className?: string | undefined;
+    }): JSX.Element;
+    defaultProps: {
+        editable: boolean;
+        autoSave: boolean;
+    };
+};
+export default TaskTimeBox;