@voplus/morpho-workspace 6.1.21 → 6.1.22

package/es/modules/work/work-schedule/components/WorkScheduleOverview/index.js

@@ -1,22 +1,32 @@
-import React from "react";
+import React, { useState } from "react";
 import { observe } from "@voplus/morpho-ui";
 import DueItem from "@voplus/morpho-ui/es/controls/PanelOverview/DueItem";
 import OverviewItem from "@voplus/morpho-ui/es/controls/PanelOverview/OverviewItem";
 import OverviewAll from "@voplus/morpho-ui/es/controls/PanelOverview/OverviewAll";
 import { Scrollbars } from "react-custom-scrollbars-2";
-import { faPlus, faClock } from "@fortawesome/pro-solid-svg-icons";
 import PanelOverview from "@voplus/morpho-ui/es/controls/PanelOverview";
+import classnames from "classnames";
+import { State } from "./state";
 import dayjs from "dayjs";
-import "./index.less";
 const WorkScheduleOverview = (props) => {
-    const { onOverviewItemClick } = props;
+    const { actives, dueActives, onOverviewItemClick, onDueItemClick } = props;
+    const [state] = useState(new State());
+    state.update(actives, dueActives);
     return observe(() => (React.createElement(Scrollbars, { autoHide: true },
-        React.createElement(PanelOverview, { className: "work-schedule-overview", overviewAll: React.createElement(OverviewAll, { total: 20, description: "Total All Work Schedule" }), overviewList: React.createElement(React.Fragment, null,
-                React.createElement(OverviewItem, { icon: faPlus, total: 20, description: "Work Created" }),
-                React.createElement(OverviewItem, { className: "total", icon: faClock, total: 20, description: "Unscheduled" })), nodeTitle: "DUE OF WORKS SCHEDULE", dueList: React.createElement(React.Fragment, null,
-                React.createElement(DueItem, { title: "Overdue", type: "Works", description: dayjs().format("DD MMM YYYY"), total: 20 }),
-                React.createElement(DueItem, { className: "week", title: "This Week", type: "Works", description: dayjs().endOf("week").format("DD MMM YYYY"), total: 20 }),
-                React.createElement(DueItem, { className: "month", title: "This Month", type: "Works", description: dayjs().endOf("month").format("DD MMM YYYY"), total: 20 })) }))));
+        React.createElement(PanelOverview, { className: "work-schedule-overview", overviewAll: React.createElement(OverviewAll, { className: classnames({ active: state.actives.includes("All") }), total: 20, description: "Total All Work Schedule", onClick: () => onClick("All") }), overviewList: React.createElement(React.Fragment, null,
+                React.createElement(OverviewItem, { className: classnames({ active: state.actives.includes("WorkCreated") }), total: 20, description: "Work Created", onClick: () => onClick("WorkCreated") }),
+                React.createElement(OverviewItem, { className: classnames({ active: state.actives.includes("Unscheduled") }), total: 20, description: "Unscheduled", onClick: () => onClick("Unscheduled") })), nodeTitle: "DUE OF WORKS SCHEDULE", dueList: React.createElement(React.Fragment, null,
+                React.createElement(DueItem, { className: classnames({ active: state.dueActives === "overdue" }), title: "Overdue", type: "Works", description: dayjs().format("DD MMM YYYY"), total: 20, onClick: () => onDueClick("overdue") }),
+                React.createElement(DueItem, { className: classnames("week", { active: state.dueActives === "week" }), title: "This Week", type: "Works", description: dayjs().endOf("week").format("DD MMM YYYY"), total: 20, onClick: () => onDueClick("week") }),
+                React.createElement(DueItem, { className: classnames("month", { active: state.dueActives === "month" }), title: "This Month", type: "Works", description: dayjs().endOf("month").format("DD MMM YYYY"), total: 20, onClick: () => onDueClick("month") })) }))));
+    function onDueClick(dueAct) {
+        state.onDueClick(dueAct);
+        onDueItemClick === null || onDueItemClick === void 0 ? void 0 : onDueItemClick(state.dueActives);
+    }
+    function onClick(status) {
+        state.onClick(status);
+        onOverviewItemClick === null || onOverviewItemClick === void 0 ? void 0 : onOverviewItemClick(state.actives);
+    }
 };
 export default WorkScheduleOverview;
 //# sourceMappingURL=index.js.map

package/es/modules/work/work-schedule/components/WorkScheduleOverview/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/modules/work/work-schedule/components/WorkScheduleOverview/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,OAAO,MAAM,qDAAqD,CAAC;AAC1E,OAAO,YAAY,MAAM,0DAA0D,CAAC;AACpF,OAAO,WAAW,MAAM,yDAAyD,CAAC;AAClF,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,aAAa,MAAM,6CAA6C,CAAC;AACxE,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,cAAc,CAAC;AAMtB,MAAM,oBAAoB,GAAG,CAAC,KAAgC,EAAE,EAAE;IACjE,MAAM,EAAE,mBAAmB,EAAE,GAAG,KAAK,CAAC;IAEtC,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,CACpB,oBAAC,UAAU,IAAC,QAAQ;QACnB,oBAAC,aAAa,IACb,SAAS,EAAC,wBAAwB,EAClC,WAAW,EAAE,oBAAC,WAAW,IAAC,KAAK,EAAE,EAAE,EAAE,WAAW,EAAC,yBAAyB,GAAG,EAC7E,YAAY,EACX;gBACC,oBAAC,YAAY,IAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,WAAW,EAAC,cAAc,GAAG;gBACpE,oBAAC,YAAY,IAAC,SAAS,EAAC,OAAO,EAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,WAAW,EAAC,aAAa,GAAG,CACpF,EAEJ,SAAS,EAAC,uBAAuB,EACjC,OAAO,EACN;gBACC,oBAAC,OAAO,IACP,KAAK,EAAC,SAAS,EACf,IAAI,EAAC,OAAO,EACZ,WAAW,EAAE,KAAK,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,EAC1C,KAAK,EAAE,EAAE,GACR;gBACF,oBAAC,OAAO,IACP,SAAS,EAAC,MAAM,EAChB,KAAK,EAAC,WAAW,EACjB,IAAI,EAAC,OAAO,EACZ,WAAW,EAAE,KAAK,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,EACxD,KAAK,EAAE,EAAE,GACR;gBACF,oBAAC,OAAO,IACP,SAAS,EAAC,OAAO,EACjB,KAAK,EAAC,YAAY,EAClB,IAAI,EAAC,OAAO,EACZ,WAAW,EAAE,KAAK,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,EACzD,KAAK,EAAE,EAAE,GACR,CACA,GAEH,CACU,CACb,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,oBAAoB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/modules/work/work-schedule/components/WorkScheduleOverview/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,OAAO,MAAM,qDAAqD,CAAC;AAC1E,OAAO,YAAY,MAAM,0DAA0D,CAAC;AACpF,OAAO,WAAW,MAAM,yDAAyD,CAAC;AAClF,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,aAAa,MAAM,6CAA6C,CAAC;AACxE,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,KAAK,MAAM,OAAO,CAAC;AAS1B,MAAM,oBAAoB,GAAG,CAAC,KAAgC,EAAE,EAAE;IACjE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,cAAc,EAAE,GAAG,KAAK,CAAC;IAC3E,MAAM,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC;IAEtC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAElC,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,CACpB,oBAAC,UAAU,IAAC,QAAQ;QACnB,oBAAC,aAAa,IACb,SAAS,EAAC,wBAAwB,EAClC,WAAW,EACV,oBAAC,WAAW,IACX,SAAS,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,EAChE,KAAK,EAAE,EAAE,EACT,WAAW,EAAC,yBAAyB,EACrC,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,GAC5B,EAEH,YAAY,EACX;gBACC,oBAAC,YAAY,IACZ,SAAS,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC,EACxE,KAAK,EAAE,EAAE,EACT,WAAW,EAAC,cAAc,EAC1B,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,GACpC;gBACF,oBAAC,YAAY,IACZ,SAAS,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC,EACxE,KAAK,EAAE,EAAE,EACT,WAAW,EAAC,aAAa,EACzB,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,GACpC,CACA,EAEJ,SAAS,EAAC,uBAAuB,EACjC,OAAO,EACN;gBACC,oBAAC,OAAO,IACP,SAAS,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC,EACjE,KAAK,EAAC,SAAS,EACf,IAAI,EAAC,OAAO,EACZ,WAAW,EAAE,KAAK,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,EAC1C,KAAK,EAAE,EAAE,EACT,OAAO,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,GACnC;gBACF,oBAAC,OAAO,IACP,SAAS,EAAE,UAAU,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,UAAU,KAAK,MAAM,EAAE,CAAC,EACtE,KAAK,EAAC,WAAW,EACjB,IAAI,EAAC,OAAO,EACZ,WAAW,EAAE,KAAK,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,EACxD,KAAK,EAAE,EAAE,EACT,OAAO,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,GAChC;gBACF,oBAAC,OAAO,IACP,SAAS,EAAE,UAAU,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,UAAU,KAAK,OAAO,EAAE,CAAC,EACxE,KAAK,EAAC,YAAY,EAClB,IAAI,EAAC,OAAO,EACZ,WAAW,EAAE,KAAK,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,EACzD,KAAK,EAAE,EAAE,EACT,OAAO,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,GACjC,CACA,GAEH,CACU,CACb,CAAC,CAAC;IAEH,SAAS,UAAU,CAAC,MAAc;QACjC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACzB,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAG,KAAK,CAAC,UAAU,CAAC,CAAC;IACpC,CAAC;IAED,SAAS,OAAO,CAAC,MAAc;QAC9B,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QACtB,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAG,KAAK,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC;AACF,CAAC,CAAC;AAEF,eAAe,oBAAoB,CAAC"}

package/es/modules/work/work-schedule/components/WorkScheduleOverview/state.d.ts

@@ -0,0 +1,8 @@
+export declare class State {
+    actives: string[];
+    dueActives?: string;
+    constructor();
+    update(currents?: string[], dueActives?: string): void;
+    onClick(status: string): void;
+    onDueClick(dueAct: string): void;
+}

package/es/modules/work/work-schedule/components/WorkScheduleOverview/state.js

@@ -0,0 +1,63 @@
+import { __decorate } from "tslib";
+import { action, makeObservable, observable } from "mobx";
+export class State {
+    constructor() {
+        Object.defineProperty(this, "actives", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: []
+        });
+        Object.defineProperty(this, "dueActives", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        makeObservable(this);
+    }
+    update(currents, dueActives) {
+        if (JSON.stringify(currents) !== JSON.stringify(this.actives)) {
+            this.actives = currents !== null && currents !== void 0 ? currents : [];
+        }
+        if (dueActives !== this.dueActives) {
+            this.dueActives = dueActives;
+        }
+    }
+    onClick(status) {
+        this.actives = [status];
+        // if (status === "All") {
+        // 	this.actives = [status];
+        // } else {
+        // 	if (this.actives.includes("All")) {
+        // 		this.actives = [status];
+        // 	} else {
+        // 		if (this.actives.includes(status)) {
+        // 			this.actives = this.actives.filter((item) => item !== status);
+        // 		} else {
+        // 			const actives = Array.isArray(this.actives) ? [...this.actives, status] : [status];
+        // 			this.actives = actives;
+        // 		}
+        // 	}
+        // }
+    }
+    onDueClick(dueAct) {
+        this.dueActives = dueAct;
+    }
+}
+__decorate([
+    observable
+], State.prototype, "actives", void 0);
+__decorate([
+    observable
+], State.prototype, "dueActives", void 0);
+__decorate([
+    action
+], State.prototype, "update", null);
+__decorate([
+    action
+], State.prototype, "onClick", null);
+__decorate([
+    action
+], State.prototype, "onDueClick", null);
+//# sourceMappingURL=state.js.map

package/es/modules/work/work-schedule/components/WorkScheduleOverview/state.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../../../../src/modules/work/work-schedule/components/WorkScheduleOverview/state.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAE1D,MAAM,OAAO,KAAK;IAIjB;QAHmB;;;;mBAAoB,EAAE;WAAC;QACvB;;;;;WAAoB;QAGtC,cAAc,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;IAEc,MAAM,CAAC,QAAmB,EAAE,UAAmB;QAC7D,IAAI,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;YAC/D,IAAI,CAAC,OAAO,GAAG,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,EAAE,CAAC;QAC/B,CAAC;QACD,IAAI,UAAU,KAAK,IAAI,CAAC,UAAU,EAAE,CAAC;YACpC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC9B,CAAC;IACF,CAAC;IAEc,OAAO,CAAC,MAAc;QACpC,IAAI,CAAC,OAAO,GAAG,CAAC,MAAM,CAAC,CAAC;QACxB,0BAA0B;QAC1B,4BAA4B;QAC5B,WAAW;QACX,uCAAuC;QACvC,6BAA6B;QAC7B,YAAY;QACZ,yCAAyC;QACzC,oEAAoE;QACpE,aAAa;QACb,yFAAyF;QACzF,6BAA6B;QAC7B,MAAM;QACN,KAAK;QACL,IAAI;IACL,CAAC;IAEc,UAAU,CAAC,MAAc;QACvC,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC;IAC1B,CAAC;CACD;AArCmB;IAAlB,UAAU;sCAA+B;AACvB;IAAlB,UAAU;yCAA4B;AAMxB;IAAd,MAAM;mCAON;AAEc;IAAd,MAAM;oCAgBN;AAEc;IAAd,MAAM;uCAEN"}

package/es/modules/work/work-schedule/pages/WorkScheduleListPage/index.js

@@ -5,38 +5,41 @@ import PageHeadDashboard from "@voplus/morpho-ui/es/components/layout/headers/Pa
 import DefaultViewLayout from "@voplus/morpho-ui/es/components/layout/DefaultViewLayout";
 import DocumentTabs from "@voplus/morpho-document/es/components/DocumentTabs";
 import ActivityLog from "@voplus/morpho-org/es/components/ActivityLog2/ActivityLog2";
-import FilterStatusLabel from "@voplus/morpho-ui/es/controls/FilterStatusLabel";
 import { observe } from "@voplus/morpho-ui";
 import WorkScheduleList from "../../components/WorkScheduleList";
-import WorkTypesFilter from "../../../../../controls/filters/WorkTypesFilter";
-import WorkScheduleFilter from "../../controls/WorkScheduleFilter";
 import WorkSchedulePanel from "../../components/WorkSchedulePanel";
+import FilterLabel from "@voplus/morpho-ui/es/controls/FilterLabel";
 import { State } from "./state";
 import styles from "./index.less";
 const WorkScheduleListPage = (props) => {
     var _a;
     const [state] = useState(new State((_a = props.contact) === null || _a === void 0 ? void 0 : _a.id));
     const [activeKey, setActiveKey] = useState("WorkScheduleList");
-    return observe(() => (React.createElement(DefaultViewLayout, { className: styles["workSchedule-list-page"], header: React.createElement(PageHeadDashboard, { avatarIcon: React.createElement(FAIcon, { icon: faSuitcase }), title: "Work Schedules", upAble: true, description: "Your tasks: prioritize and complete your work." }), propertiesWidth: "295px", properties: React.createElement(WorkSchedulePanel, { workScheduleFilterProps: {
-                onFilter(options) {
-                    state.onFilterOptions(options);
-                },
-            } }) },
-        React.createElement(DocumentTabs, { id: "", active: "WorkScheduleList", tabItems: [
-                {
-                    key: "WorkScheduleList",
-                    label: "Work Schedule List",
-                    children: (React.createElement(WorkScheduleList, { ...props, filter: false, asideable: false, headerType: "tool", filterOptions: state.filerOptions })),
-                },
-                {
-                    key: "Activities",
-                    label: "Activities",
-                    children: (React.createElement(React.Fragment, null, activeKey === "Activities" ? (React.createElement(ActivityLog, { id: "", bar: false })) : null)),
-                },
-            ], onChange: (key) => setActiveKey(key), tabBarExtraContent: activeKey === "WorkScheduleList" ? (React.createElement(FilterStatusLabel, { filterKey: "WorkTypes", statusFilter: [
-                    React.createElement(WorkScheduleFilter, { key: "WorkScheduleFilter" }),
-                    React.createElement(WorkTypesFilter, { key: "WorkTypesFilter" }),
-                ], onFilter: (filters) => state.onFilterOptions(filters) })) : undefined }))));
+    return observe(() => {
+        var _a, _b;
+        return (React.createElement(DefaultViewLayout, { className: styles["workSchedule-list-page"], header: React.createElement(PageHeadDashboard, { avatarIcon: React.createElement(FAIcon, { icon: faSuitcase }), title: "Work Schedules", upAble: true, description: "Your tasks: prioritize and complete your work." }), propertiesWidth: "295px", properties: React.createElement(WorkSchedulePanel, { overviewProps: {
+                    actives: state.status,
+                    dueActives: state.dueActives,
+                    onOverviewItemClick: (s) => state.onOverviewItemClick(s),
+                    onDueItemClick: (d) => state.onDueItemClick(d),
+                }, workScheduleFilterProps: {
+                    onFilter(options) {
+                        state.onFilterOptions(options);
+                    },
+                } }) },
+            React.createElement(DocumentTabs, { id: "", active: "WorkScheduleList", tabItems: [
+                    {
+                        key: "WorkScheduleList",
+                        label: "Work Schedule List",
+                        children: (React.createElement(WorkScheduleList, { ...props, filter: false, asideable: false, headerType: "tool", filterOptions: state.filerOptions })),
+                    },
+                    {
+                        key: "Activities",
+                        label: "Activities",
+                        children: (React.createElement(React.Fragment, null, activeKey === "Activities" ? (React.createElement(ActivityLog, { id: "", bar: false })) : null)),
+                    },
+                ], onChange: (key) => setActiveKey(key), tabBarExtraContent: activeKey === "WorkScheduleList" ? (React.createElement("div", { className: "list-tabBar-filter" }, ((_a = state.status) === null || _a === void 0 ? void 0 : _a.includes("All")) ? ("Showed: Total All Work Schedules") : ((_b = state.status) === null || _b === void 0 ? void 0 : _b.length) || state.dueActives ? (React.createElement(FilterLabel, { status: state.status.concat(state.dueActives ? [state.dueActives] : []), maxCount: 2, onFilter: (s) => state.onFilterLabel(s) })) : undefined)) : undefined })));
+    });
 };
 export default WorkScheduleListPage;
 //# sourceMappingURL=index.js.map

package/es/modules/work/work-schedule/pages/WorkScheduleListPage/index.js.map

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

package/es/modules/work/work-schedule/pages/WorkScheduleListPage/state.d.ts

@@ -3,8 +3,13 @@ export declare class State {
     private contactId?;
     /** 默认值 */
     filerOptions?: FilterOption[];
+    status: string[];
+    dueActives?: "overdue" | "week" | "month";
     constructor(contactId?: string | undefined);
     onFilterOptions(options?: FilterOption[]): void;
-    date(d: "day" | "week" | "month"): FilterOption[];
-    onTodayClick(): void;
+    onDueItemClick(d: "overdue" | "week" | "month"): void;
+    onOverviewItemClick(s?: string[]): void;
+    onFilterLabel(s?: string): void;
+    get statusFilerOptions(): FilterOption[];
+    get dateFilerOptions(): FilterOption[];
 }

package/es/modules/work/work-schedule/pages/WorkScheduleListPage/state.js

@@ -1,5 +1,5 @@
 import { __decorate } from "tslib";
-import { action, makeObservable, observable } from "mobx";
+import { action, makeObservable, observable, computed, toJS } from "mobx";
 import dayjs from "dayjs";
 export class State {
     constructor(contactId) {
@@ -16,6 +16,18 @@ export class State {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "status", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: []
+        });
+        Object.defineProperty(this, "dueActives", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         makeObservable(this);
         this.onFilterOptions();
     }
@@ -23,37 +35,98 @@ export class State {
         var _a, _b;
         this.filerOptions = options !== null && options !== void 0 ? options : [];
         if (this.contactId && !((_a = this.filerOptions) === null || _a === void 0 ? void 0 : _a.some((item) => item.c === "Contact"))) {
-            (_b = this.filerOptions) === null || _b === void 0 ? void 0 : _b.push({
-                c: "Contact",
-                o: "=",
-                l: "And",
-                v1: this.contactId,
-            });
+            (_b = this.filerOptions) === null || _b === void 0 ? void 0 : _b.push({ c: "Contact", o: "=", l: "And", v1: this.contactId });
         }
     }
-    date(d) {
-        let filters = [];
-        const v1 = dayjs().startOf(d).format("YYYY-MM-DD HH:mm:ss");
-        const v2 = dayjs().endOf(d).format("YYYY-MM-DD HH:mm:ss");
-        filters = [{ c: "DueDate", o: "between", l: "And", v1: v1, v2: v2 }];
-        return filters;
+    onDueItemClick(d) {
+        this.dueActives = d;
+        if (this.status.includes("All"))
+            this.status = [];
+        this.onFilterOptions(this.statusFilerOptions.concat(this.dateFilerOptions));
+    }
+    onOverviewItemClick(s) {
+        this.status = s !== null && s !== void 0 ? s : [];
+        if (this.status.includes("All"))
+            this.dueActives = undefined;
+        this.onFilterOptions(this.statusFilerOptions.concat(this.dateFilerOptions));
     }
-    onTodayClick() {
-        const v1 = dayjs().startOf("day").format("YYYY-MM-DD HH:mm:ss");
-        const v2 = dayjs().endOf("day").format("YYYY-MM-DD HH:mm:ss");
-        this.onFilterOptions([{ c: "Date", o: "between", l: "And", v1: v1, v2: v2 }]);
+    onFilterLabel(s) {
+        if (s) {
+            if (s === "overdue" || s === "week" || s === "month") {
+                this.dueActives = undefined;
+            }
+            let status = toJS(this.status);
+            status = status === null || status === void 0 ? void 0 : status.filter((i) => i !== s);
+            this.onOverviewItemClick(status);
+        }
+        else {
+            this.status = [];
+            this.dueActives = undefined;
+            this.onFilterOptions();
+        }
+    }
+    get statusFilerOptions() {
+        let f = [];
+        if (this.status.includes("All"))
+            return f;
+        let status = toJS(this.status);
+        if (status.includes("WorkCreated")) {
+            f.push({ c: "Work", o: "!=", v1: "null", l: "And" });
+        }
+        if (status.includes("Unscheduled")) {
+            f = f.concat([
+                { c: "ScheduleDate", o: "is null", l: "And", v1: "" },
+                { c: "Work", o: "=", v1: "null", l: "And" },
+            ]);
+        }
+        return f;
+    }
+    get dateFilerOptions() {
+        let f = [];
+        if (this.status.includes("All"))
+            return f;
+        if (this.dueActives) {
+            if (this.dueActives === "overdue") {
+                f = [{ c: "DueDate", o: "<=", l: "And", v1: dayjs().format("YYYY-MM-DD") }];
+            }
+            else {
+                const v1 = dayjs()
+                    .startOf(this.dueActives)
+                    .format("YYYY-MM-DD HH:mm:ss");
+                const v2 = dayjs()
+                    .endOf(this.dueActives)
+                    .format("YYYY-MM-DD HH:mm:ss");
+                f = [{ c: "DueDate", o: "between", l: "And", v1: v1, v2: v2 }];
+            }
+        }
+        return f;
     }
 }
 __decorate([
     observable
 ], State.prototype, "filerOptions", void 0);
+__decorate([
+    observable
+], State.prototype, "status", void 0);
+__decorate([
+    observable
+], State.prototype, "dueActives", void 0);
 __decorate([
     action
 ], State.prototype, "onFilterOptions", null);
 __decorate([
     action
-], State.prototype, "date", null);
+], State.prototype, "onDueItemClick", null);
+__decorate([
+    action
+], State.prototype, "onOverviewItemClick", null);
 __decorate([
     action
-], State.prototype, "onTodayClick", null);
+], State.prototype, "onFilterLabel", null);
+__decorate([
+    computed
+], State.prototype, "statusFilerOptions", null);
+__decorate([
+    computed
+], State.prototype, "dateFilerOptions", null);
 //# sourceMappingURL=state.js.map

package/es/modules/work/work-schedule/pages/WorkScheduleListPage/state.js.map

@@ -1 +1 @@
-{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../../../../src/modules/work/work-schedule/pages/WorkScheduleListPage/state.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAE1D,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,OAAO,KAAK;IAIjB,YAA2B,SAAkB;QAA1B;;;;mBAAQ,SAAS;WAAS;QAH7C,UAAU;QACS;;;;;WAA8B;QAGhD,cAAc,CAAC,IAAI,CAAC,CAAC;QACrB,IAAI,CAAC,eAAe,EAAE,CAAC;IACxB,CAAC;IAEc,eAAe,CAAC,OAAwB;;QACtD,IAAI,CAAC,YAAY,GAAG,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,EAAE,CAAC;QAElC,IAAI,IAAI,CAAC,SAAS,IAAI,CAAC,CAAA,MAAA,IAAI,CAAC,YAAY,0CAAE,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,KAAK,SAAS,CAAC,CAAA,EAAE,CAAC;YAChF,MAAA,IAAI,CAAC,YAAY,0CAAE,IAAI,CAAC;gBACvB,CAAC,EAAE,SAAS;gBACZ,CAAC,EAAE,GAAG;gBACN,CAAC,EAAE,KAAK;gBACR,EAAE,EAAE,IAAI,CAAC,SAAS;aAClB,CAAC,CAAC;QACJ,CAAC;IACF,CAAC;IAEc,IAAI,CAAC,CAA2B;QAC9C,IAAI,OAAO,GAAmB,EAAE,CAAC;QAEjC,MAAM,EAAE,GAAG,KAAK,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;QAC5D,MAAM,EAAE,GAAG,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;QAE1D,OAAO,GAAG,CAAC,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QACrE,OAAO,OAAO,CAAC;IAChB,CAAC;IAEc,YAAY;QAC1B,MAAM,EAAE,GAAG,KAAK,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;QAChE,MAAM,EAAE,GAAG,KAAK,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;QAC9D,IAAI,CAAC,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IAC/E,CAAC;CACD;AAnCmB;IAAlB,UAAU;2CAAsC;AAOlC;IAAd,MAAM;4CAWN;AAEc;IAAd,MAAM;iCAQN;AAEc;IAAd,MAAM;yCAIN"}
+{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../../../../src/modules/work/work-schedule/pages/WorkScheduleListPage/state.ts"],"names":[],"mappings":"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"}

package/es/modules/work/work-type/components/WorkTypeHeader/index.d.ts

@@ -1,5 +1,6 @@
 import React from "react";
 declare const WorkTypeHeader: (props: {
     id: string;
+    close?: boolean;
 }) => React.JSX.Element;
 export default WorkTypeHeader;

package/es/modules/work/work-type/components/WorkTypeHeader/index.js

@@ -1,19 +1,20 @@
 import React, { useState } from "react";
 import { State } from "../WorkTypeProperties/state";
-import { Open } from "@voplus/morpho-document/es/controls/ToolBar/buttons";
 import { observe, InlineEdit } from "@voplus/morpho-ui";
+import { Open, Close } from "@voplus/morpho-org/es/controls/ToolBar/items";
 import { useWorkType, useWorkTypeStore } from "../../../../../data/worktype";
 import NodeHeaderLayout from "@voplus/morpho-ui/es/controls/NodeHeaderLayout";
 import ToolBar from "@voplus/morpho-document/es/controls/ToolBar/ToolBar2";
 import WorkTypeMenu from "../../controls/WorkTypeMenu";
 const WorkTypeHeader = (props) => {
-    const id = props.id;
+    const { id, close } = props;
     const worktype = useWorkType(id);
     const store = useWorkTypeStore();
     const [state] = useState(new State(store));
     state.update(worktype);
     return observe(() => (React.createElement(NodeHeaderLayout, { content: React.createElement(InlineEdit, { defaultValue: worktype === null || worktype === void 0 ? void 0 : worktype.name, content: (v) => React.createElement("span", null, worktype === null || worktype === void 0 ? void 0 : worktype.name), onSave: (value) => state.save(value, worktype.name, { Name: value }) }), tool: React.createElement(ToolBar, { id: id, showMenu: false },
             React.createElement(Open, { url: `/work-types-page/${id}` }),
+            close && React.createElement(Close, null),
             React.createElement(WorkTypeMenu, { id: id, closeAside: true })) })));
 };
 export default WorkTypeHeader;

package/es/modules/work/work-type/components/WorkTypeHeader/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/modules/work/work-type/components/WorkTypeHeader/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACxC,OAAO,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACpD,OAAO,EAAE,IAAI,EAAE,MAAM,qDAAqD,CAAC;AAC3E,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAC7E,OAAO,gBAAgB,MAAM,gDAAgD,CAAC;AAC9E,OAAO,OAAO,MAAM,sDAAsD,CAAC;AAC3E,OAAO,YAAY,MAAM,6BAA6B,CAAC;AAEvD,MAAM,cAAc,GAAG,CAAC,KAAqB,EAAE,EAAE;IAChD,MAAM,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC;IACpB,MAAM,QAAQ,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC;IACjC,MAAM,KAAK,GAAG,gBAAgB,EAAE,CAAC;IAEjC,MAAM,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;IAE3C,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAEvB,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,CACpB,oBAAC,gBAAgB,IAChB,OAAO,EACN,oBAAC,UAAU,IACV,YAAY,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,EAC5B,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,kCAAO,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,CAAQ,EAC7C,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,GACnE,EAEH,IAAI,EACH,oBAAC,OAAO,IAAC,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK;YAC/B,oBAAC,IAAI,IAAC,GAAG,EAAE,oBAAoB,EAAE,EAAE,GAAI;YACvC,oBAAC,YAAY,IAAC,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,IAAI,GAAI,CACjC,GAEV,CACF,CAAC,CAAC;AACJ,CAAC,CAAC;AACF,eAAe,cAAc,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/modules/work/work-type/components/WorkTypeHeader/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACxC,OAAO,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,8CAA8C,CAAC;AAC3E,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAC7E,OAAO,gBAAgB,MAAM,gDAAgD,CAAC;AAC9E,OAAO,OAAO,MAAM,sDAAsD,CAAC;AAC3E,OAAO,YAAY,MAAM,6BAA6B,CAAC;AAEvD,MAAM,cAAc,GAAG,CAAC,KAAsC,EAAE,EAAE;IACjE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC;IAC5B,MAAM,QAAQ,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC;IACjC,MAAM,KAAK,GAAG,gBAAgB,EAAE,CAAC;IAEjC,MAAM,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;IAE3C,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAEvB,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,CACpB,oBAAC,gBAAgB,IAChB,OAAO,EACN,oBAAC,UAAU,IACV,YAAY,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,EAC5B,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,kCAAO,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,CAAQ,EAC7C,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,IAAI,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,GACnE,EAEH,IAAI,EACH,oBAAC,OAAO,IAAC,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,KAAK;YAC/B,oBAAC,IAAI,IAAC,GAAG,EAAE,oBAAoB,EAAE,EAAE,GAAI;YACtC,KAAK,IAAI,oBAAC,KAAK,OAAG;YACnB,oBAAC,YAAY,IAAC,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,IAAI,GAAI,CACjC,GAEV,CACF,CAAC,CAAC;AACJ,CAAC,CAAC;AACF,eAAe,cAAc,CAAC"}

package/es/modules/work/work-type/components/WorkTypePropertiesView/index.js

@@ -23,7 +23,7 @@ const WorkTypePropertiesView = (props) => {
         });
     }, [id]);
     return observe(() => (React.createElement(ViewContext.Provider, { value: view }, worktype.loaded && (React.createElement("div", { className: "module-detail-view worktype-properties-view" },
-        React.createElement(WorkTypeHeader, { id: id }),
+        React.createElement(WorkTypeHeader, { id: id, close: true }),
         React.createElement(WorktypeCompleteWorksChart, { id: id }),
         React.createElement(WorkTypePropertiesTabs, { id: id }))))));
 };

package/es/modules/work/work-type/components/WorkTypePropertiesView/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/modules/work/work-type/components/WorkTypePropertiesView/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AACnC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EACN,WAAW,EACX,eAAe,GACf,MAAM,0DAA0D,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAC7E,OAAO,0BAA0B,MAAM,2CAA2C,CAAC;AACnF,OAAO,sBAAsB,MAAM,2BAA2B,CAAC;AAC/D,OAAO,cAAc,MAAM,mBAAmB,CAAC;AAC/C,OAAO,cAAc,CAAC;AAEtB,MAAM,sBAAsB,GAAG,CAAC,KAAqB,EAAE,EAAE;IACxD,MAAM,EAAE,EAAE,EAAE,GAAG,KAAK,CAAC;IAErB,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,eAAe,CAAC,gBAAgB,CAAC,EAAE,EAAE,CAAC,CAAC;IACtE,MAAM,QAAQ,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC;IACjC,MAAM,KAAK,GAAG,gBAAgB,EAAE,CAAC;IACjC,MAAM,QAAQ,GAAG,gBAAgB,EAAE,CAAC;IAEpC,MAAM,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,IAAI,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC;IAE/C,SAAS,CAAC,GAAG,EAAE;QACd,WAAW,CAAC,KAAK,IAAI,EAAE;YACtB,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;YAC1C,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACnB,CAAC,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAET,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,CACpB,oBAAC,WAAW,CAAC,QAAQ,IAAC,KAAK,EAAE,IAAI,IAC/B,QAAQ,CAAC,MAAM,IAAI,CACnB,6BAAK,SAAS,EAAC,6CAA6C;QAC3D,oBAAC,cAAc,IAAC,EAAE,EAAE,EAAE,GAAI;QAC1B,oBAAC,0BAA0B,IAAC,EAAE,EAAE,EAAE,GAAI;QACtC,oBAAC,sBAAsB,IAAC,EAAE,EAAE,EAAE,GAAI,CAC7B,CACN,CACqB,CACvB,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,sBAAsB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/modules/work/work-type/components/WorkTypePropertiesView/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AACnC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EACN,WAAW,EACX,eAAe,GACf,MAAM,0DAA0D,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAC7E,OAAO,0BAA0B,MAAM,2CAA2C,CAAC;AACnF,OAAO,sBAAsB,MAAM,2BAA2B,CAAC;AAC/D,OAAO,cAAc,MAAM,mBAAmB,CAAC;AAC/C,OAAO,cAAc,CAAC;AAEtB,MAAM,sBAAsB,GAAG,CAAC,KAAqB,EAAE,EAAE;IACxD,MAAM,EAAE,EAAE,EAAE,GAAG,KAAK,CAAC;IAErB,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,eAAe,CAAC,gBAAgB,CAAC,EAAE,EAAE,CAAC,CAAC;IACtE,MAAM,QAAQ,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC;IACjC,MAAM,KAAK,GAAG,gBAAgB,EAAE,CAAC;IACjC,MAAM,QAAQ,GAAG,gBAAgB,EAAE,CAAC;IAEpC,MAAM,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,IAAI,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC;IAE/C,SAAS,CAAC,GAAG,EAAE;QACd,WAAW,CAAC,KAAK,IAAI,EAAE;YACtB,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;YAC1C,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACnB,CAAC,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAET,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,CACpB,oBAAC,WAAW,CAAC,QAAQ,IAAC,KAAK,EAAE,IAAI,IAC/B,QAAQ,CAAC,MAAM,IAAI,CACnB,6BAAK,SAAS,EAAC,6CAA6C;QAC3D,oBAAC,cAAc,IAAC,EAAE,EAAE,EAAE,EAAE,KAAK,SAAG;QAChC,oBAAC,0BAA0B,IAAC,EAAE,EAAE,EAAE,GAAI;QACtC,oBAAC,sBAAsB,IAAC,EAAE,EAAE,EAAE,GAAI,CAC7B,CACN,CACqB,CACvB,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,sBAAsB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@voplus/morpho-workspace",
-	"version": "6.1.21",
+	"version": "6.1.22",
 	"description": "morpho workspace module",
 	"repository": {
 		"type": "git",

package/es/modules/notification/components/NotificationOverview/index.less

@@ -1,24 +0,0 @@
-:global {
-	.notification-overview {
-		.overview-item {
-			&.total {
-				background: #fffdea;
-				.icon {
-					color: #b2a722;
-				}
-			}
-			&.done {
-				background: #eaffee;
-				.icon {
-					color: #21b264;
-				}
-			}
-			&.closed {
-				background: #f7f7f7;
-				.icon {
-					color: #5d5d5d;
-				}
-			}
-		}
-	}
-}

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

@@ -1,49 +0,0 @@
-:global {
-	.task-overview {
-		.overview-item {
-			&.total {
-				background: #fffdea;
-				.icon {
-					color: #b2a722;
-				}
-			}
-			&.done {
-				background: #eaffee;
-				.icon {
-					color: #21b264;
-				}
-			}
-			&.closed {
-				background: #fff4f4;
-				.icon {
-					color: #b32120;
-				}
-			}
-		}
-		.due-list {
-			.due-item {
-				&.tomorrow {
-					background-color: #fff0e0;
-					border-left-color: #ff951a;
-					.total {
-						color: #ff951a;
-					}
-				}
-				&.week {
-					background-color: #fffad5;
-					border-left-color: #e6d504;
-					.total {
-						color: #e6d504;
-					}
-				}
-				&.month {
-					background-color: #f0faff;
-					border-left-color: #0688e6;
-					.total {
-						color: #0688e6;
-					}
-				}
-			}
-		}
-	}
-}

package/es/modules/work/components/WorkOverview/index.less

@@ -1,49 +0,0 @@
-:global {
-	.work-overview {
-		.overview-item {
-			&.total {
-				background: #fffdea;
-				.icon {
-					color: #b2a722;
-				}
-			}
-			&.done {
-				background: #eaffee;
-				.icon {
-					color: #21b264;
-				}
-			}
-			&.closed {
-				background: #fff4f4;
-				.icon {
-					color: #b32120;
-				}
-			}
-		}
-		.due-list {
-			.due-item {
-				&.tomorrow {
-					background-color: #fff0e0;
-					border-left-color: #ff951a;
-					.total {
-						color: #ff951a;
-					}
-				}
-				&.week {
-					background-color: #fffad5;
-					border-left-color: #e6d504;
-					.total {
-						color: #e6d504;
-					}
-				}
-				&.month {
-					background-color: #f0faff;
-					border-left-color: #0688e6;
-					.total {
-						color: #0688e6;
-					}
-				}
-			}
-		}
-	}
-}