@voplus/morpho-workspace 1.1.0 → 1.2.0-dev.11

package/es/modules/tasks/components/{TaskTimeBox → TaskEstimatedTime}/state.d.ts

@@ -1,12 +1,23 @@
 import { TaskStore } from "../../../../data/task";
+export declare type TaskEstimatedTimeProps = {
+    id: string;
+    estimatedHours?: number;
+    startDate?: string | undefined | Date;
+    dueDate?: string | undefined | Date;
+    editable?: boolean;
+    /** 显示时间段总数 */
+    period?: boolean;
+    className?: string;
+};
 export declare class State {
     private taskStore;
+    props: TaskEstimatedTimeProps;
     /** id of task */
     id: string;
-    /** Schedule of task */
-    schedule: any[];
-    /** Old Schedule of task */
-    oldSchedule: any[] | undefined;
+    /** start Date */
+    startDate: string | undefined | Date;
+    /** due Date  */
+    dueDate: string | undefined | Date;
     /** EstimatedHours of task */
     estimatedHours: number;
     /** Old EstimatedHours of task */
@@ -17,9 +28,10 @@ export declare class State {
     visible: boolean;
     constructor(taskStore: TaskStore);
     /** save  StartDate && DueDate or EstimatedHours*/
-    onSave: () => void;
+    onSave: () => Promise<void>;
     /** edit estimatedHours */
     changeEstimatedHours: (value: number) => void;
     /** edit schedule */
-    changeSchedule: (value: any[]) => void;
+    changeSchedule: (value: any) => void;
+    get dateFormat(): "DD MMM YYYY" | "DD MMM";
 }

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

@@ -0,0 +1,159 @@
+import { __decorate } from "tslib";
+import { action, computed, makeObservable, observable } from "mobx";
+import { message } from "@voplus/antd";
+import moment from "moment";
+export class State {
+    constructor(taskStore) {
+        Object.defineProperty(this, "taskStore", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: taskStore
+        });
+        Object.defineProperty(this, "props", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        /** id of task */
+        Object.defineProperty(this, "id", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: ""
+        });
+        /** start Date */
+        Object.defineProperty(this, "startDate", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: undefined
+        });
+        /** due Date  */
+        Object.defineProperty(this, "dueDate", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: undefined
+        });
+        /** EstimatedHours of task */
+        Object.defineProperty(this, "estimatedHours", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 0
+        });
+        /** Old EstimatedHours of task */
+        Object.defineProperty(this, "oldEstimatedHours", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 0
+        });
+        /** loading of save  */
+        Object.defineProperty(this, "loading", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
+        /** visible of schedule/estimatedHours edit dialog   */
+        Object.defineProperty(this, "visible", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: false
+        });
+        /** save  StartDate && DueDate or EstimatedHours*/
+        Object.defineProperty(this, "onSave", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: async () => {
+                this.loading = true;
+                await this.taskStore.edit(this.id, {
+                    data: {
+                        StartDate: this.startDate || undefined,
+                        DueDate: this.dueDate || undefined,
+                        EstimatedHours: this.estimatedHours,
+                    },
+                    error: (error) => {
+                        message.error(error.message);
+                        this.startDate =
+                            !this.props.estimatedHours && this.props.startDate ? this.props.startDate : undefined;
+                        this.dueDate =
+                            !this.props.estimatedHours && this.props.dueDate ? this.props.dueDate : undefined;
+                        this.estimatedHours = this.props.estimatedHours || 0;
+                    },
+                });
+                this.loading = false;
+                this.visible = false;
+                this.oldEstimatedHours = this.estimatedHours;
+            }
+        });
+        /** edit estimatedHours */
+        Object.defineProperty(this, "changeEstimatedHours", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (value) => {
+                this.estimatedHours = value;
+                this.startDate = undefined;
+                this.dueDate = undefined;
+            }
+        });
+        /** edit schedule */
+        Object.defineProperty(this, "changeSchedule", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: (value) => {
+                this.startDate = value ? value[0] : undefined;
+                this.dueDate = value ? value[1] : undefined;
+                this.estimatedHours = 0;
+            }
+        });
+        makeObservable(this);
+    }
+    get dateFormat() {
+        return moment(this.startDate).year() !== moment().year() ? "DD MMM YYYY" : "DD MMM";
+    }
+}
+__decorate([
+    observable
+], State.prototype, "props", void 0);
+__decorate([
+    observable
+], State.prototype, "id", void 0);
+__decorate([
+    observable
+], State.prototype, "startDate", void 0);
+__decorate([
+    observable
+], State.prototype, "dueDate", void 0);
+__decorate([
+    observable
+], State.prototype, "estimatedHours", void 0);
+__decorate([
+    observable
+], State.prototype, "oldEstimatedHours", void 0);
+__decorate([
+    observable
+], State.prototype, "loading", void 0);
+__decorate([
+    observable
+], State.prototype, "visible", void 0);
+__decorate([
+    action
+], State.prototype, "onSave", void 0);
+__decorate([
+    action
+], State.prototype, "changeEstimatedHours", void 0);
+__decorate([
+    action
+], State.prototype, "changeSchedule", void 0);
+__decorate([
+    computed
+], State.prototype, "dateFormat", null);
+//# sourceMappingURL=state.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../../../src/modules/tasks/components/TaskEstimatedTime/state.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,EAAE,UAAU,EAAQ,MAAM,MAAM,CAAC;AAI1E,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,MAAM,MAAM,QAAQ,CAAC;AAa5B,MAAM,OAAO,KAAK;IAiBjB,YAA2B,SAAoB;;;;;mBAApB;;QAhBf;;;;;WAAqC;QACjD,iBAAiB;QACL;;;;mBAAY,EAAE;WAAC;QAC3B,iBAAiB;QACL;;;;mBAA8C,SAAS;WAAC;QACpE,gBAAgB;QACJ;;;;mBAA4C,SAAS;WAAC;QAClE,6BAA6B;QACjB;;;;mBAAwB,CAAC;WAAC;QACtC,iCAAiC;QACrB;;;;mBAA2B,CAAC;WAAC;QACzC,uBAAuB;QACX;;;;mBAAiB,KAAK;WAAC;QACnC,uDAAuD;QAC3C;;;;mBAAiB,KAAK;WAAC;QAMnC,kDAAkD;QAElD;;;;mBAAgB,KAAK,IAAI,EAAE;gBAC1B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;gBACpB,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE;oBAClC,IAAI,EAAE;wBACL,SAAS,EAAE,IAAI,CAAC,SAAS,IAAI,SAAS;wBACtC,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,SAAS;wBAClC,cAAc,EAAE,IAAI,CAAC,cAAc;qBAChB;oBACpB,KAAK,EAAE,CAAC,KAAY,EAAE,EAAE;wBACvB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;wBAC7B,IAAI,CAAC,SAAS;4BACb,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;wBACvF,IAAI,CAAC,OAAO;4BACX,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;wBACnF,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,IAAI,CAAC,CAAC;oBACtD,CAAC;iBACD,CAAC,CAAC;gBACH,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;gBACrB,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;gBACrB,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,cAAc,CAAC;YAC9C,CAAC;WAAC;QACF,0BAA0B;QAE1B;;;;mBAA8B,CAAC,KAAa,EAAE,EAAE;gBAC/C,IAAI,CAAC,cAAc,GAAG,KAAK,CAAC;gBAC5B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;gBAC3B,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC;YAC1B,CAAC;WAAC;QACF,oBAAoB;QAEpB;;;;mBAAwB,CAAC,KAAU,EAAE,EAAE;gBACtC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;gBAC9C,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;gBAC5C,IAAI,CAAC,cAAc,GAAG,CAAC,CAAC;YACzB,CAAC;WAAC;QAvCD,cAAc,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;IAyCD,IAAW,UAAU;QACpB,OAAO,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,KAAK,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC;IACrF,CAAC;CACD;AA9DY;IAAX,UAAU;oCAAsC;AAErC;IAAX,UAAU;iCAAgB;AAEf;IAAX,UAAU;wCAAyD;AAExD;IAAX,UAAU;sCAAuD;AAEtD;IAAX,UAAU;6CAA2B;AAE1B;IAAX,UAAU;gDAA8B;AAE7B;IAAX,UAAU;sCAAwB;AAEvB;IAAX,UAAU;sCAAwB;AAQnC;IADC,MAAM;qCAqBL;AAGF;IADC,MAAM;mDAKL;AAGF;IADC,MAAM;6CAKL;AAGF;IADC,QAAQ;uCAGR"}

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

@@ -1,36 +1,53 @@
-import { faClock } from "@fortawesome/pro-light-svg-icons";
+import "./defaultTaskItem.less";
+import { CommentDataIcon, DocumentDataIcon, UserQuickIcon, } from "@voplus/morpho-document/es/controls/data-icons";
+import React, { useEffect, useState } from "react";
+import { Tooltip, message } from "@voplus/antd";
+import { faBars, faClock } from "@fortawesome/pro-light-svg-icons";
+import { useTask, useTaskStore } from "../../../../data/task";
+import AvatarList from "@voplus/morpho-document/es/components/AvatarList";
+import DataIconBar from "@voplus/morpho-document/es/controls/DataIconBar";
+import DocumentHeader from "@voplus/morpho-document/es/components/DocumentHeader";
 import { FontAwesomeIcon as FAIcon } from "@fortawesome/react-fontawesome";
-import classnames from "classnames";
-import { useObserver } from "mobx-react-lite";
+import FlagIcon from "@voplus/morpho-document/es/controls/data-icons/FlagIcon";
+import TaskAnalyticsDataIcon from "../../reports/TaskAnalyticsDataIcon";
+import TaskStatusLabel from "../../controls/TaskStatusLabel";
+import { autorun } from "mobx";
 import moment from "moment";
-import React, { useState } from "react";
-import AvatarList from "../../../../components/AvatarList";
-import DocumentStatusLabel from "../../../../controls/DocumentStatusLabel";
-import FlagIcon from "../../../../controls/FlagIcon";
-import IconNumebers from "../../../../controls/IconNumbers";
-import { useTask, useTaskStore } from "../../../../data/task";
-import "./defaultTaskItem.less";
-import { State } from "./state";
+import { observe } from "@voplus/morpho-ui";
+import { useApplicationContext } from "@voplus/morpho-data";
 const DefaultTaskItem = (props) => {
-    const { id } = props;
+    const { id, connectDragSource } = props;
+    const { user } = useApplicationContext();
     const taskStore = useTaskStore();
-    const [state] = useState(new State(taskStore));
-    state.task = useTask(id, { reload: false, includes: "task-number-reports" });
-    const { taskNumbers, incompleteTaskNumbers, documents, comments, members } = state.task;
-    return useObserver(() => (React.createElement("div", { className: "default-task-item" },
-        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("div", { className: classnames("task-item-name", {
-                        "task-item-name_done": state.task.taskStatus === "Done"
-                    }) }, state.task.name)),
-            React.createElement("div", { className: "file-num box" },
-                state.task.dueDate && (React.createElement("span", null,
-                    React.createElement(FAIcon, { icon: faClock }),
-                    moment(state.task.dueDate).format("D MMM YYYY"))),
-                React.createElement(IconNumebers, { taskNumbers: taskNumbers, incompleteTaskNumbers: incompleteTaskNumbers, documents: documents, comments: comments, memberNumbers: members ? members.length : 0 })),
-            React.createElement(AvatarList, { editable: false, list: state.task.members, className: "box" })),
-        React.createElement(DocumentStatusLabel, { status: state.task.taskStatus, editable: state.task.taskStatus !== "NotAssigned" || !state.readonly, onChange: TaskStatus => state.onEdit({ TaskStatus }) }))));
+    const task = useTask(id, { reload: false, includes: "tags,versions" });
+    const [taskStatus, setTaskStatus] = useState(task.taskStatus);
+    useEffect(() => autorun(() => setTaskStatus(task.taskStatus)), [task.taskStatus]);
+    return observe(() => {
+        var _a;
+        return (React.createElement(DocumentHeader, Object.assign({ id: task.id, quickDataBarAlign: "left", flagVisible: false, tagsVisible: !!((_a = task.tags) === null || _a === void 0 ? void 0 : _a.length), className: "default-task-item", pre: React.createElement(FlagIcon, { id: task.id, flag: task.flag, editable: !task.readonly }), quickDataBar: React.createElement(React.Fragment, null,
+                connectDragSource &&
+                    connectDragSource(React.createElement("span", { className: "task-move" }, React.createElement(FAIcon, { icon: faBars }))),
+                task.dueDate && (React.createElement(Tooltip, { title: "DueDate" },
+                    React.createElement("span", { className: "margin-right-15" },
+                        React.createElement("span", { className: "margin-right-5" },
+                            React.createElement(FAIcon, { icon: faClock })),
+                        moment(task.dueDate).format("D MMM YYYY")))),
+                React.createElement(DataIconBar, null,
+                    React.createElement(DocumentDataIcon, { id: id }),
+                    React.createElement(CommentDataIcon, { id: id }),
+                    React.createElement(UserQuickIcon, { id: id })),
+                React.createElement(TaskAnalyticsDataIcon, { id: id, className: "margin-left-10" }),
+                React.createElement(AvatarList, { organizationId: user.info.organizationId, editable: false, list: [...(task.members || []), ...(task.childMembers || [])] })), tools: React.createElement(TaskStatusLabel, { status: taskStatus, editable: !task.readonly, onChange: (TaskStatus) => {
+                    setTaskStatus(TaskStatus);
+                    taskStore.edit(task.id, {
+                        data: { TaskStatus },
+                        error: (error) => {
+                            message.error(error.message);
+                            setTaskStatus(task.taskStatus);
+                        },
+                    });
+                } }) }, props.headerProps)));
+    });
 };
 export default DefaultTaskItem;
 //# sourceMappingURL=DefaultTaskItem.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"DefaultTaskItem.js","sourceRoot":"","sources":["../../../../../src/modules/tasks/components/TaskItem/DefaultTaskItem.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"DefaultTaskItem.js","sourceRoot":"","sources":["../../../../../src/modules/tasks/components/TaskItem/DefaultTaskItem.tsx"],"names":[],"mappings":"AAAA,OAAO,wBAAwB,CAAC;AAEhC,OAAO,EACN,eAAe,EACf,gBAAgB,EAChB,aAAa,GACb,MAAM,gDAAgD,CAAC;AACxD,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAE9D,OAAO,UAAU,MAAM,kDAAkD,CAAC;AAC1E,OAAO,WAAW,MAAM,iDAAiD,CAAC;AAC1E,OAAO,cAAc,MAAM,sDAAsD,CAAC;AAClF,OAAO,EAAE,eAAe,IAAI,MAAM,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,QAAQ,MAAM,yDAAyD,CAAC;AAC/E,OAAO,qBAAqB,MAAM,qCAAqC,CAAC;AAExE,OAAO,eAAe,MAAM,gCAAgC,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAE5D,MAAM,eAAe,GAAG,CAAC,KAAoB,EAAE,EAAE;IAChD,MAAM,EAAE,EAAE,EAAE,iBAAiB,EAAE,GAAG,KAAK,CAAC;IAExC,MAAM,EAAE,IAAI,EAAE,GAAG,qBAAqB,EAAE,CAAC;IAEzC,MAAM,SAAS,GAAG,YAAY,EAAE,CAAC;IAEjC,MAAM,IAAI,GAAG,OAAO,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC,CAAC;IAEvE,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAE9D,SAAS,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;IAElF,OAAO,OAAO,CAAC,GAAG,EAAE;;QAAC,OAAA,CACpB,oBAAC,cAAc,kBACd,EAAE,EAAE,IAAI,CAAC,EAAE,EACX,iBAAiB,EAAC,MAAM,EACxB,WAAW,EAAE,KAAK,EAClB,WAAW,EAAE,CAAC,CAAC,CAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,MAAM,CAAA,EAChC,SAAS,EAAC,mBAAmB,EAC7B,GAAG,EAAE,oBAAC,QAAQ,IAAC,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,CAAC,IAAI,CAAC,QAAQ,GAAI,EACzE,YAAY,EACX,oBAAC,KAAK,CAAC,QAAQ;gBACb,iBAAiB;oBACjB,iBAAiB,CAAC,8BAAM,SAAS,EAAC,WAAW,IAAE,oBAAC,MAAM,IAAC,IAAI,EAAE,MAAM,GAAI,CAAQ,CAAC;gBAChF,IAAI,CAAC,OAAO,IAAI,CAChB,oBAAC,OAAO,IAAC,KAAK,EAAC,SAAS;oBACvB,8BAAM,SAAS,EAAC,iBAAiB;wBAChC,8BAAM,SAAS,EAAC,gBAAgB;4BAC/B,oBAAC,MAAM,IAAC,IAAI,EAAE,OAAO,GAAI,CACnB;wBACN,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CACpC,CACE,CACV;gBACD,oBAAC,WAAW;oBACX,oBAAC,gBAAgB,IAAC,EAAE,EAAE,EAAE,GAAI;oBAC5B,oBAAC,eAAe,IAAC,EAAE,EAAE,EAAE,GAAI;oBAC3B,oBAAC,aAAa,IAAC,EAAE,EAAE,EAAE,GAAI,CACZ;gBACd,oBAAC,qBAAqB,IAAC,EAAE,EAAE,EAAE,EAAE,SAAS,EAAC,gBAAgB,GAAG;gBAC5D,oBAAC,UAAU,IACV,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,EACxC,QAAQ,EAAE,KAAK,EACf,IAAI,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,GAC5D,CACc,EAElB,KAAK,EACJ,oBAAC,eAAe,IACf,MAAM,EAAE,UAAU,EAClB,QAAQ,EAAE,CAAC,IAAI,CAAC,QAAQ,EACxB,QAAQ,EAAE,CAAC,UAAU,EAAE,EAAE;oBACxB,aAAa,CAAC,UAAU,CAAC,CAAC;oBAC1B,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE;wBACvB,IAAI,EAAE,EAAE,UAAU,EAAE;wBACpB,KAAK,EAAE,CAAC,KAAY,EAAE,EAAE;4BACvB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;4BAC7B,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;wBAChC,CAAC;qBACD,CAAC,CAAC;gBACJ,CAAC,GACA,IAEC,KAAK,CAAC,WAAW,EACpB,CACF,CAAA;KAAA,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,eAAe,CAAC"}

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

@@ -1,55 +1,61 @@
 import "./subTaskItem.less";
-import { Button, Checkbox, Input } from "@voplus/antd";
-import React, { useState } from "react";
+import { Archive, Edit, Open } from "@voplus/morpho-document/es/controls/ToolBar/buttons";
+import { Button, Checkbox } from "@voplus/antd";
+import { CommentDataIcon, DocumentDataIcon, UserQuickIcon, } from "@voplus/morpho-document/es/controls/data-icons";
+import React, { useLayoutEffect, useState } from "react";
 import { State } from "./state";
 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 AvatarList from "@voplus/morpho-document/es/components/AvatarList";
+import DataIconBar from "@voplus/morpho-document/es/controls/DataIconBar";
+import DocumentHeader from "@voplus/morpho-document/es/components/DocumentHeader";
 import { FontAwesomeIcon as FAIcon } from "@fortawesome/react-fontawesome";
-import FlagIcon from "../../../../controls/FlagIcon";
-import IconNumebers from "../../../../controls/IconNumbers";
-import TagView from "@voplus/morpho-document/es/components/TagView";
-import TaskQuickViewDialog from "../TaskQuickViewDialog";
-import TaskTimeBox from "../TaskTimeBox";
-import ToolBar from "../../../../components/ToolBar";
+import FlagIcon from "@voplus/morpho-document/es/controls/data-icons/FlagIcon";
+import TaskAnalyticsDataIcon from "../../reports/TaskAnalyticsDataIcon";
+import TaskEstimatedTime from "../TaskEstimatedTime";
+import TaskStatusLabel from "../../controls/TaskStatusLabel";
+import ToolBar from "@voplus/morpho-document/es/controls/ToolBar/ToolBar2";
 import classnames from "classnames";
-import { useObserver } from "mobx-react-lite";
+import { observe } from "@voplus/morpho-ui";
+import { runInAction } from "mobx";
+import { useApplicationContext } from "@voplus/morpho-data";
 const SubTaskItem = (props) => {
-    const { id, multiple, reload, connectDragSource } = props;
+    const { id, multiple, reload, connectDragSource, memberAlign } = props;
+    const { user } = useApplicationContext();
     const taskStore = useTaskStore();
-    const [state] = useState(new State(taskStore));
-    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) },
-            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" },
-                        multiple ? (React.createElement(Checkbox, { value: props.id, disabled: state.readonly, className: "multiple-checkbox" })) : (React.createElement(FlagIcon, { id: id, flag: state.task.flag, className: "task-flag", editable: !state.readonly })),
-                        state.editable ? (React.createElement(Input.TextArea, { autosize: true, autoFocus: true, value: state.name, onChange: e => (state.name = e.target.value) })) : (React.createElement("div", { className: "task-item-name", onClick: () => (state.visibleQuickView = true) }, state.task.name)),
-                        React.createElement(TagView, { id: id, tags: state.task.tags, editable: !state.readonly })),
-                    React.createElement("div", { className: "task-file-info" },
-                        !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,
-                                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;
-                        console.log(ids, "ids");
-                    }, className: "box" })),
+    const [state] = useState(new State(id, taskStore));
+    const task = useTask(id, {
+        reload: !!reload,
+        includes: "tags,versions",
+    });
+    state.update(task);
+    useLayoutEffect(() => {
+        runInAction(() => (state.members = state.taskMembers));
+    }, []);
+    return observe(() => (React.createElement(DocumentHeader, { id: state.task.id, quickDataBarAlign: "left", flagVisible: false, editMode: state.editable, clickNameEffect: state.editable ? "edit" : "quick-view", className: "sub-task-item", onMouse: (over) => (state.isHover = over && !multiple && !state.editable), onChange: (value) => (state.name = value), pre: multiple ? (React.createElement(Checkbox, { value: state.task.id, disabled: state.task.readonly })) : (React.createElement(FlagIcon, { id: state.task.id, flag: state.task.flag, editable: !state.task.readonly })), quickDataBar: React.createElement(React.Fragment, null,
+            !multiple && connectDragSource ? (connectDragSource(React.createElement("span", { className: classnames("task-move", { show: state.isHover }) }, React.createElement(FAIcon, { icon: faBars })))) : (React.createElement("span", { className: "task-move" })),
+            state.task.loaded && (React.createElement(TaskEstimatedTime, { id: id, estimatedHours: state.task.estimatedHours || 0, startDate: state.task.startDate, dueDate: state.task.dueDate, editable: !state.task.readonly &&
+                    !!(state.editable || state.task.startDate || state.task.estimatedHours), period: false, className: "margin-right-10" })),
+            React.createElement(DataIconBar, null,
+                React.createElement(DocumentDataIcon, { id: id }),
+                React.createElement(CommentDataIcon, { id: id }),
+                React.createElement(UserQuickIcon, { id: id }),
+                React.createElement(TaskAnalyticsDataIcon, { id: id, className: "data-icon" })),
+            memberAlign === "block" && (React.createElement(AvatarList, { visible: state.isHover, organizationId: user.info.organizationId, buttonText: state.editable ? "Ok" : "Save", maxCount: 3, multiple: true, list: state.members, editable: state.editable || (state.isHover && !!state.taskMembers.length), className: "member-align-block", onChange: state.onChange }))), tools: React.createElement(React.Fragment, null,
+            memberAlign !== "block" && (React.createElement("div", { className: "sub-task-members", onMouseOver: () => runInAction(() => (state.isHover = !multiple && !state.editable)) },
+                React.createElement(AvatarList, { visible: state.isHover, organizationId: user.info.organizationId, buttonText: state.editable ? "Ok" : "Save", maxCount: 3, multiple: true, list: state.members, editable: state.editable || state.isHover, onChange: state.onChange }))),
             state.editable ? (React.createElement("div", null,
-                React.createElement(Button, { shape: "circle", onClick: () => (state.editable = false) },
+                React.createElement(Button, { shape: "circle", onClick: () => state.undo() },
                     React.createElement(FAIcon, { icon: faUndo })),
                 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, { id: props.id, includes: "tags,task-number-reports", 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(TaskQuickViewDialog, { id: id, visible: state.visibleQuickView, onCancel: () => (state.visibleQuickView = false) }))));
+                    React.createElement(FAIcon, { icon: faSave })))) : (React.createElement(TaskStatusLabel, { status: state.task.taskStatus, editable: !state.task.readonly, onChange: (TaskStatus) => state.onEdit(TaskStatus), className: classnames("task-status-label", { hide: state.isHover }) })),
+            React.createElement("div", { className: classnames("hover-operate-icon", {
+                    show: state.isHover,
+                }) },
+                React.createElement(ToolBar, { id: id, moreProps: { buttonProps: { size: "middle" } } },
+                    React.createElement(Open, { size: "middle", url: `/tasks/${id}` }),
+                    React.createElement(Edit, { size: "middle", disabled: state.task.readonly, action: () => state.startEdit() }),
+                    React.createElement(Archive, { size: "middle" })))) })));
 };
 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/defaultTaskItem.less

@@ -1,45 +1,42 @@
 @import "~@voplus/antd/es/style/themes/default.less";
-@import "../../../../style/common.less";
 :global {
 	.default-task-item {
-		display: flex;
-		flex: 1;
-		justify-content: space-between;
+		position: relative;
 		align-items: center;
-		padding: 10px 0;
-		margin: 0 20px;
-		border-bottom: 1px solid @border-color-base;
-		> div {
-			flex: 1;
+		cursor: pointer;
+		background-color: transparent;
+		.flag-icon {
+			display: inline-block;
+			width: 23px;
+			margin-left: 0;
 		}
-		.task-header {
-			display: flex;
-			align-items: center;
-			.task-flag {
-				width: 25px;
-			}
+		.task-move {
+			display: inline-block;
+			width: 23px;
+			opacity: 0;
+			margin-right: 7px;
+			font-size: 18px;
+			line-height: 24px;
+			vertical-align: bottom;
+			text-align: center;
+			cursor: move;
 		}
-		.task-item-name {
-			color: #000;
-			font-size: 15px;
-			font-weight: 500;
-			&.task-item-name_done {
-				color: #a8a8a8;
-			}
+		.avatar-list {
+			display: block;
+			margin-left: 30px;
 		}
-		.file-num {
-			color: #444;
-			font-size: 13px;
-			& > span + span {
-				margin-left: 12px;
-			}
-			.svg-inline--fa {
-				margin-right: 5px;
+		&:hover {
+			.task-move {
+				opacity: 1;
 			}
 		}
-		.box {
-			display: block;
-			margin: 5px 0 0 25px;
+		&:after {
+			position: absolute;
+			content: "";
+			left: 20px;
+			right: 20px;
+			bottom: 0;
+			border-bottom: 1px solid #f2f2f2;
 		}
 	}
 }

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

@@ -1,19 +1,28 @@
 import { ITask, TaskStore } from "../../../../data/task";
+import { ConnectDragSource } from "react-dnd";
+import { DocumentHeaderProps } from "@voplus/morpho-document-core/es/props/DocumentHeaderProps";
+import { IUnit } from "@voplus/morpho-org";
 export declare type TaskItemProps = {
     id: string;
     includes?: string;
     reload?: boolean;
     multiple?: boolean;
-    connectDragSource?: any;
-    onExpand?: () => void;
-    onReload?: () => void;
+    /** AvatarList 显示位置 */
+    memberAlign?: "center" | "block";
+    connectDragSource?: ConnectDragSource;
+    /** Header props */
+    headerProps?: Partial<DocumentHeaderProps>;
 };
 export declare class State {
+    private id;
     private taskStore;
     /** Detail of task */
     task: ITask;
+    /** id of member of task of list */
     ids: string[];
+    /** members of task */
     members: any[];
+    /** name of task */
     name: string;
     /** Schedule of task */
     schedule: any[];
@@ -23,31 +32,24 @@ export declare class State {
     editable: boolean;
     /** loading of save  */
     loading: boolean;
-    visibleQuickView: boolean;
     modalType: string;
     /** MouseOver of sub task  */
     isHover: boolean;
-    reload: boolean;
-    /** Start edit date of task  */
-    open: boolean;
-    constructor(taskStore: TaskStore);
-    private store;
+    constructor(id: string, taskStore: TaskStore);
+    update(task: ITask): void;
     startEdit: () => void;
-    startEditDate: () => void;
     save: () => Promise<void>;
-    /** task edit */
-    onEdit: (option: any) => Promise<void>;
     /** task delete */
     onDelete: () => Promise<void>;
-    onMove: () => void;
-    /** */
-    onPaste: () => void;
-    get inheritedMembers(): {
+    undo(): void;
+    onChange: (ids: string[], members: IUnit[]) => Promise<void>;
+    onEdit(TaskStatus: string): Promise<void>;
+    get childMembers(): {
         disabled: boolean;
         id: string;
         name: string;
         avatarUrl: string;
     }[];
-    get readonly(): boolean;
+    get taskMembers(): import("../../../../data/task").IContactAvatar[];
     get hasChanges(): boolean | undefined;
 }