@voplus/morpho-workspace 6.0.198 → 6.0.199

package/es/modules/work/components/WorkFilter/index.d.ts

@@ -1,4 +1,8 @@
 import React from "react";
+import { FilterOption } from "@voplus/morpho-data";
 import "./index.less";
-declare const WorkFilter: () => React.JSX.Element;
+export type WorkFilterProps = {
+    onApply?: (filter: FilterOption[]) => void;
+};
+declare const WorkFilter: (props: WorkFilterProps) => React.JSX.Element;
 export default WorkFilter;

package/es/modules/work/components/WorkFilter/index.js

@@ -1,39 +1,54 @@
-import React from "react";
+import React, { useState } from "react";
 import { observe } from "@voplus/morpho-ui";
 import WorkStatusSelect from "../../work-type/components/WorkStatusSelect";
+import WorkTypeSelect from "../../work-type/components/WorkTypeSelect";
 import { Form, Space, Button } from "antd";
 import { Scrollbars } from "react-custom-scrollbars-2";
 import DatePicker from "@voplus/morpho-ui/es/controls/UTCDatePicker";
+import { State } from "./state";
+import dayjs from "dayjs";
+import { utcdayjs } from "@voplus/morpho-ui/es/controls/UTCDatePicker/state";
 import "./index.less";
-const WorkFilter = () => {
+const WorkFilter = (props) => {
+    const [state] = useState(new State());
     return observe(() => (React.createElement(Scrollbars, { autoHide: true },
         React.createElement("div", { className: "work-filter" },
             React.createElement(Form, { layout: "vertical" },
                 React.createElement(Form.Item, { label: "Work Status" },
-                    React.createElement(WorkStatusSelect, null)),
+                    React.createElement(WorkStatusSelect, { value: state.status, onChange: (values) => (state.status = values) })),
                 React.createElement(Form.Item, { label: "Due Date", className: "due-date" },
                     React.createElement(Form.Item, { label: "From Due Date" },
-                        React.createElement(DatePicker
-                        // value={state.from ? utcdayjs(state.from) : undefined}
-                        // onChange={(date, dateString: string) => {
-                        // 	state.from = dateString;
-                        // 	if (state.date) state.date = undefined;
-                        // }}
-                        , null)),
+                        React.createElement(DatePicker, { value: state.fromDueDate ? utcdayjs(state.fromDueDate) : undefined, onChange: (date, dateString) => {
+                                state.fromDueDate = dateString;
+                            } })),
                     React.createElement(Form.Item, { label: "To Due Date" },
-                        React.createElement(DatePicker
-                        // value={state.to ? utcdayjs(state.to) : undefined}
-                        // onChange={(date, dateString: string) => {
-                        // 	state.to = dateString;
-                        // 	if (state.date) state.date = undefined;
-                        // }}
-                        , null))),
+                        React.createElement(DatePicker, { value: state.toDueDate ? utcdayjs(state.toDueDate) : undefined, onChange: (date, dateString) => {
+                                state.toDueDate = dateString;
+                            } }))),
                 React.createElement(Form.Item, { label: "Work Type" },
-                    React.createElement(WorkStatusSelect, null))),
+                    React.createElement(WorkTypeSelect, { allowClear: true, defaultValue: state.typeId, onChange: (id, workType) => {
+                            state.typeId = id;
+                        } }))),
             React.createElement("div", { className: "filter-bottom" },
                 React.createElement(Space, null,
-                    React.createElement(Button, null, "Reset"),
-                    React.createElement(Button, { type: "primary" }, "Apply")))))));
+                    React.createElement(Button, { onClick: () => state.onCancel() }, "Reset"),
+                    React.createElement(Button, { type: "primary", onClick: onApply }, "Apply")))))));
+    function onApply() {
+        var _a, _b, _c, _d;
+        const filter = [];
+        if (state.typeId) {
+            filter.push({ c: "WorkType", o: "=", l: "And", v1: state.typeId });
+        }
+        if ((_a = state.status) === null || _a === void 0 ? void 0 : _a.length) {
+            filter.push({ c: "WorkStatus", o: "contains", l: "And", v1: JSON.stringify(state.status) });
+        }
+        if (state.fromDueDate || state.toDueDate) {
+            const start = (_b = state.fromDueDate) !== null && _b !== void 0 ? _b : "1753-01-01";
+            const end = (_c = state.toDueDate) !== null && _c !== void 0 ? _c : dayjs().endOf("year").format("YYYY-MM-DD");
+            filter.push({ c: "DueDate", o: "between", l: "And", v1: start, v2: end });
+        }
+        (_d = props.onApply) === null || _d === void 0 ? void 0 : _d.call(props, filter);
+    }
 };
 export default WorkFilter;
 //# sourceMappingURL=index.js.map

package/es/modules/work/components/WorkFilter/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/work/components/WorkFilter/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,gBAAgB,MAAM,6CAA6C,CAAC;AAC3E,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,UAAU,MAAM,6CAA6C,CAAC;AAErE,OAAO,cAAc,CAAC;AAEtB,MAAM,UAAU,GAAG,GAAG,EAAE;IACvB,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,CACpB,oBAAC,UAAU,IAAC,QAAQ;QACnB,6BAAK,SAAS,EAAC,aAAa;YAC3B,oBAAC,IAAI,IAAC,MAAM,EAAC,UAAU;gBACtB,oBAAC,IAAI,CAAC,IAAI,IAAC,KAAK,EAAC,aAAa;oBAC7B,oBAAC,gBAAgB,OAAG,CACT;gBACZ,oBAAC,IAAI,CAAC,IAAI,IAAC,KAAK,EAAC,UAAU,EAAC,SAAS,EAAC,UAAU;oBAC/C,oBAAC,IAAI,CAAC,IAAI,IAAC,KAAK,EAAC,eAAe;wBAC/B,oBAAC,UAAU;wBACX,wDAAwD;wBACxD,4CAA4C;wBAC5C,4BAA4B;wBAC5B,2CAA2C;wBAC3C,KAAK;+BACH,CACS;oBACZ,oBAAC,IAAI,CAAC,IAAI,IAAC,KAAK,EAAC,aAAa;wBAC7B,oBAAC,UAAU;wBACX,oDAAoD;wBACpD,4CAA4C;wBAC5C,0BAA0B;wBAC1B,2CAA2C;wBAC3C,KAAK;+BACH,CACS,CACD;gBACZ,oBAAC,IAAI,CAAC,IAAI,IAAC,KAAK,EAAC,WAAW;oBAC3B,oBAAC,gBAAgB,OAAG,CACT,CACN;YACP,6BAAK,SAAS,EAAC,eAAe;gBAC7B,oBAAC,KAAK;oBACL,oBAAC,MAAM,gBAAe;oBACtB,oBAAC,MAAM,IAAC,IAAI,EAAC,SAAS,YAAe,CAC9B,CACH,CACD,CACM,CACb,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,UAAU,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/work/components/WorkFilter/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,gBAAgB,MAAM,6CAA6C,CAAC;AAC3E,OAAO,cAAc,MAAM,2CAA2C,CAAC;AACvE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,UAAU,MAAM,6CAA6C,CAAC;AAErE,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,QAAQ,EAAE,MAAM,mDAAmD,CAAC;AAC7E,OAAO,cAAc,CAAC;AAMtB,MAAM,UAAU,GAAG,CAAC,KAAsB,EAAE,EAAE;IAC7C,MAAM,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC;IAEtC,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,CACpB,oBAAC,UAAU,IAAC,QAAQ;QACnB,6BAAK,SAAS,EAAC,aAAa;YAC3B,oBAAC,IAAI,IAAC,MAAM,EAAC,UAAU;gBACtB,oBAAC,IAAI,CAAC,IAAI,IAAC,KAAK,EAAC,aAAa;oBAC7B,oBAAC,gBAAgB,IAAC,KAAK,EAAE,KAAK,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,GAAI,CAC7E;gBACZ,oBAAC,IAAI,CAAC,IAAI,IAAC,KAAK,EAAC,UAAU,EAAC,SAAS,EAAC,UAAU;oBAC/C,oBAAC,IAAI,CAAC,IAAI,IAAC,KAAK,EAAC,eAAe;wBAC/B,oBAAC,UAAU,IACV,KAAK,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS,EAClE,QAAQ,EAAE,CAAC,IAAI,EAAE,UAAkB,EAAE,EAAE;gCACtC,KAAK,CAAC,WAAW,GAAG,UAAU,CAAC;4BAChC,CAAC,GACA,CACS;oBACZ,oBAAC,IAAI,CAAC,IAAI,IAAC,KAAK,EAAC,aAAa;wBAC7B,oBAAC,UAAU,IACV,KAAK,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,EAC9D,QAAQ,EAAE,CAAC,IAAI,EAAE,UAAkB,EAAE,EAAE;gCACtC,KAAK,CAAC,SAAS,GAAG,UAAU,CAAC;4BAC9B,CAAC,GACA,CACS,CACD;gBACZ,oBAAC,IAAI,CAAC,IAAI,IAAC,KAAK,EAAC,WAAW;oBAC3B,oBAAC,cAAc,IACd,UAAU,QACV,YAAY,EAAE,KAAK,CAAC,MAAM,EAC1B,QAAQ,EAAE,CAAC,EAAU,EAAE,QAAmB,EAAE,EAAE;4BAC7C,KAAK,CAAC,MAAM,GAAG,EAAE,CAAC;wBACnB,CAAC,GACA,CACS,CACN;YACP,6BAAK,SAAS,EAAC,eAAe;gBAC7B,oBAAC,KAAK;oBACL,oBAAC,MAAM,IAAC,OAAO,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,YAAgB;oBACvD,oBAAC,MAAM,IAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAE,OAAO,YAE9B,CACF,CACH,CACD,CACM,CACb,CAAC,CAAC;IAEH,SAAS,OAAO;;QACf,MAAM,MAAM,GAAmB,EAAE,CAAC;QAClC,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YAClB,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;QACpE,CAAC;QACD,IAAI,MAAA,KAAK,CAAC,MAAM,0CAAE,MAAM,EAAE,CAAC;YAC1B,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC7F,CAAC;QACD,IAAI,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;YAC1C,MAAM,KAAK,GAAG,MAAA,KAAK,CAAC,WAAW,mCAAI,YAAY,CAAC;YAChD,MAAM,GAAG,GAAG,MAAA,KAAK,CAAC,SAAS,mCAAI,KAAK,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YAC1E,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;QAC3E,CAAC;QACD,MAAA,KAAK,CAAC,OAAO,sDAAG,MAAM,CAAC,CAAC;IACzB,CAAC;AACF,CAAC,CAAC;AAEF,eAAe,UAAU,CAAC"}

package/es/modules/work/components/WorkFilter/state.d.ts

@@ -0,0 +1,8 @@
+export declare class State {
+    constructor();
+    status?: string[];
+    typeId?: string;
+    fromDueDate?: string;
+    toDueDate?: string;
+    onCancel(): void;
+}

package/es/modules/work/components/WorkFilter/state.js

@@ -0,0 +1,53 @@
+import { __decorate } from "tslib";
+import { makeObservable, observable, action } from "mobx";
+export class State {
+    constructor() {
+        Object.defineProperty(this, "status", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "typeId", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "fromDueDate", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "toDueDate", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        makeObservable(this);
+    }
+    onCancel() {
+        this.status = undefined;
+        this.typeId = undefined;
+        this.toDueDate = undefined;
+        this.fromDueDate = undefined;
+    }
+}
+__decorate([
+    observable
+], State.prototype, "status", void 0);
+__decorate([
+    observable
+], State.prototype, "typeId", void 0);
+__decorate([
+    observable
+], State.prototype, "fromDueDate", void 0);
+__decorate([
+    observable
+], State.prototype, "toDueDate", void 0);
+__decorate([
+    action
+], State.prototype, "onCancel", null);
+//# sourceMappingURL=state.js.map

package/es/modules/work/components/WorkFilter/state.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../../../src/modules/work/components/WorkFilter/state.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAE1D,MAAM,OAAO,KAAK;IACjB;QAGmB;;;;;WAAkB;QAClB;;;;;WAAgB;QAChB;;;;;WAAqB;QACrB;;;;;WAAmB;QALrC,cAAc,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;IAMc,QAAQ;QACtB,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;QACxB,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC;QACxB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,WAAW,GAAG,SAAS,CAAC;IAC9B,CAAC;CACD;AAXmB;IAAlB,UAAU;qCAA0B;AAClB;IAAlB,UAAU;qCAAwB;AAChB;IAAlB,UAAU;0CAA6B;AACrB;IAAlB,UAAU;wCAA2B;AAEvB;IAAd,MAAM;qCAKN"}

package/es/modules/work/components/WorkPanel/index.d.ts

@@ -1,7 +1,9 @@
 import React from "react";
 import { WorkOverviewProps } from "../../components/WorkOverview";
+import { WorkFilterProps } from "../../components/WorkFilter";
 import "./index.less";
 declare const WorkPanel: (props: {
     overviewProps?: WorkOverviewProps;
+    workFilterProps?: WorkFilterProps;
 }) => React.JSX.Element;
 export default WorkPanel;

package/es/modules/work/components/WorkPanel/index.js

@@ -15,7 +15,7 @@ const WorkPanel = (props) => {
                 {
                     key: "Filter",
                     label: "Filter",
-                    children: React.createElement(WorkFilter, null),
+                    children: React.createElement(WorkFilter, { ...props.workFilterProps }),
                 },
             ] }))));
 };

package/es/modules/work/components/WorkPanel/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/work/components/WorkPanel/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,YAAmC,MAAM,+BAA+B,CAAC;AAChF,OAAO,UAAU,MAAM,6BAA6B,CAAC;AACrD,OAAO,cAAc,CAAC;AAEtB,MAAM,SAAS,GAAG,CAAC,KAA4C,EAAE,EAAE;IAClE,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,CACpB,6BAAK,SAAS,EAAC,YAAY;QAC1B,oBAAC,IAAI,IACJ,gBAAgB,EAAC,UAAU,EAC3B,KAAK,EAAE;gBACN;oBACC,GAAG,EAAE,UAAU;oBACf,KAAK,EAAE,UAAU;oBACjB,QAAQ,EAAE,oBAAC,YAAY,OAAK,KAAK,CAAC,aAAa,GAAI;iBACnD;gBACD;oBACC,GAAG,EAAE,QAAQ;oBACb,KAAK,EAAE,QAAQ;oBACf,QAAQ,EAAE,oBAAC,UAAU,OAAG;iBACxB;aACD,GACA,CACG,CACN,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,SAAS,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/work/components/WorkPanel/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,YAAmC,MAAM,+BAA+B,CAAC;AAChF,OAAO,UAA+B,MAAM,6BAA6B,CAAC;AAC1E,OAAO,cAAc,CAAC;AAEtB,MAAM,SAAS,GAAG,CAAC,KAGlB,EAAE,EAAE;IACJ,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,CACpB,6BAAK,SAAS,EAAC,YAAY;QAC1B,oBAAC,IAAI,IACJ,gBAAgB,EAAC,UAAU,EAC3B,KAAK,EAAE;gBACN;oBACC,GAAG,EAAE,UAAU;oBACf,KAAK,EAAE,UAAU;oBACjB,QAAQ,EAAE,oBAAC,YAAY,OAAK,KAAK,CAAC,aAAa,GAAI;iBACnD;gBACD;oBACC,GAAG,EAAE,QAAQ;oBACb,KAAK,EAAE,QAAQ;oBACf,QAAQ,EAAE,oBAAC,UAAU,OAAK,KAAK,CAAC,eAAe,GAAI;iBACnD;aACD,GACA,CACG,CACN,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,SAAS,CAAC"}

package/es/modules/work/pages/WorkListPage2/index.d.ts

@@ -1,3 +1,4 @@
 import React from "react";
-declare const WorkListPage: () => React.JSX.Element;
+import { WorkListProps } from "../../components/WorkList2";
+declare const WorkListPage: (props: WorkListProps) => React.JSX.Element;
 export default WorkListPage;

package/es/modules/work/pages/WorkListPage2/index.js

@@ -9,26 +9,33 @@ import WorkPanel from "../../components/WorkPanel";
 import dayjs from "dayjs";
 import { State } from "./state";
 import styles from "./index.less";
-const WorkListPage = () => {
-    const [status, setStatus] = useState();
-    const [state] = useState(new State());
+const WorkListPage = (props) => {
+    const [state] = useState(new State(props.contactId));
     return observe(() => (React.createElement(DefaultViewLayout, { className: styles["work-list-page"], header: React.createElement(PageHeadDashboard, { avatarIcon: React.createElement(FAIcon, { icon: faBriefcase }), title: "Works", upAble: true, description: "Your tasks: prioritize and complete your work" }), propertiesWidth: "295px", properties: React.createElement(WorkPanel, { overviewProps: {
                 onOverviewItemClick: (s) => {
                     state.filerOptions = [{ c: "WorkStatus", o: "=", l: "And", v1: s }];
+                    state.contactFilter();
                 },
                 onTodayClick: () => {
                     const date = "day";
                     const v1 = dayjs().startOf(date).format("YYYY-MM-DD HH:mm:ss");
                     const v2 = dayjs().endOf(date).format("YYYY-MM-DD HH:mm:ss");
                     state.filerOptions = [{ c: "Date", o: "between", l: "And", v1: v1, v2: v2 }];
+                    state.contactFilter();
                 },
                 onDueItemClick: (d) => {
                     state.date(d);
+                    state.contactFilter();
+                },
+            }, workFilterProps: {
+                onApply: (filters) => {
+                    state.filerOptions = filters;
+                    state.contactFilter();
                 },
             } }) },
-        React.createElement(WorkList2, { workHeaderProps: {
+        React.createElement(WorkList2, { ...props, workHeaderProps: {
                 addAble: true,
-            }, status: status, asideable: false, filterVisible: false, filterOptions: state.filerOptions }))));
+            }, asideable: false, filterVisible: false, filterOptions: state.filerOptions }))));
 };
 export default WorkListPage;
 //# sourceMappingURL=index.js.map

package/es/modules/work/pages/WorkListPage2/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/work/pages/WorkListPage2/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAC/D,OAAO,EAAE,eAAe,IAAI,MAAM,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,iBAAiB,MAAM,kEAAkE,CAAC;AACjG,OAAO,iBAAiB,MAAM,0DAA0D,CAAC;AACzF,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,SAAS,MAAM,4BAA4B,CAAC;AACnD,OAAO,SAAS,MAAM,4BAA4B,CAAC;AACnD,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,MAAM,MAAM,cAAc,CAAC;AAElC,MAAM,YAAY,GAAG,GAAG,EAAE;IACzB,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,EAAU,CAAC;IAC/C,MAAM,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC;IAEtC,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,CACpB,oBAAC,iBAAiB,IACjB,SAAS,EAAE,MAAM,CAAC,gBAAgB,CAAC,EACnC,MAAM,EACL,oBAAC,iBAAiB,IACjB,UAAU,EAAE,oBAAC,MAAM,IAAC,IAAI,EAAE,WAAW,GAAI,EACzC,KAAK,EAAC,OAAO,EACb,MAAM,QACN,WAAW,EAAC,+CAA+C,GAC1D,EAEH,eAAe,EAAC,OAAO,EACvB,UAAU,EACT,oBAAC,SAAS,IACT,aAAa,EAAE;gBACd,mBAAmB,EAAE,CAAC,CAAC,EAAE,EAAE;oBAC1B,KAAK,CAAC,YAAY,GAAG,CAAC,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;gBACrE,CAAC;gBACD,YAAY,EAAE,GAAG,EAAE;oBAClB,MAAM,IAAI,GAAmB,KAAK,CAAC;oBACnC,MAAM,EAAE,GAAG,KAAK,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;oBAC/D,MAAM,EAAE,GAAG,KAAK,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;oBAC7D,KAAK,CAAC,YAAY,GAAG,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;gBAC9E,CAAC;gBACD,cAAc,EAAE,CAAC,CAAM,EAAE,EAAE;oBAC1B,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBACf,CAAC;aACD,GACA;QAGH,oBAAC,SAAS,IACT,eAAe,EAAE;gBAChB,OAAO,EAAE,IAAI;aACb,EACD,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,KAAK,EAChB,aAAa,EAAE,KAAK,EACpB,aAAa,EAAE,KAAK,CAAC,YAAY,GAChC,CACiB,CACpB,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,YAAY,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/work/pages/WorkListPage2/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAC/D,OAAO,EAAE,eAAe,IAAI,MAAM,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,iBAAiB,MAAM,kEAAkE,CAAC;AACjG,OAAO,iBAAiB,MAAM,0DAA0D,CAAC;AACzF,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,SAA4B,MAAM,4BAA4B,CAAC;AACtE,OAAO,SAAS,MAAM,4BAA4B,CAAC;AACnD,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,MAAM,MAAM,cAAc,CAAC;AAElC,MAAM,YAAY,GAAG,CAAC,KAAoB,EAAE,EAAE;IAC7C,MAAM,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;IAErD,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,CACpB,oBAAC,iBAAiB,IACjB,SAAS,EAAE,MAAM,CAAC,gBAAgB,CAAC,EACnC,MAAM,EACL,oBAAC,iBAAiB,IACjB,UAAU,EAAE,oBAAC,MAAM,IAAC,IAAI,EAAE,WAAW,GAAI,EACzC,KAAK,EAAC,OAAO,EACb,MAAM,QACN,WAAW,EAAC,+CAA+C,GAC1D,EAEH,eAAe,EAAC,OAAO,EACvB,UAAU,EACT,oBAAC,SAAS,IACT,aAAa,EAAE;gBACd,mBAAmB,EAAE,CAAC,CAAC,EAAE,EAAE;oBAC1B,KAAK,CAAC,YAAY,GAAG,CAAC,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;oBACpE,KAAK,CAAC,aAAa,EAAE,CAAC;gBACvB,CAAC;gBACD,YAAY,EAAE,GAAG,EAAE;oBAClB,MAAM,IAAI,GAAmB,KAAK,CAAC;oBACnC,MAAM,EAAE,GAAG,KAAK,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;oBAC/D,MAAM,EAAE,GAAG,KAAK,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;oBAC7D,KAAK,CAAC,YAAY,GAAG,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;oBAC7E,KAAK,CAAC,aAAa,EAAE,CAAC;gBACvB,CAAC;gBACD,cAAc,EAAE,CAAC,CAAM,EAAE,EAAE;oBAC1B,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;oBACd,KAAK,CAAC,aAAa,EAAE,CAAC;gBACvB,CAAC;aACD,EACD,eAAe,EAAE;gBAChB,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE;oBACpB,KAAK,CAAC,YAAY,GAAG,OAAO,CAAC;oBAC7B,KAAK,CAAC,aAAa,EAAE,CAAC;gBACvB,CAAC;aACD,GACA;QAGH,oBAAC,SAAS,OACL,KAAK,EACT,eAAe,EAAE;gBAChB,OAAO,EAAE,IAAI;aACb,EACD,SAAS,EAAE,KAAK,EAChB,aAAa,EAAE,KAAK,EACpB,aAAa,EAAE,KAAK,CAAC,YAAY,GAChC,CACiB,CACpB,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,YAAY,CAAC"}

package/es/modules/work/pages/WorkListPage2/state.d.ts

@@ -1,6 +1,9 @@
 import { FilterOption } from "@voplus/morpho-data";
 export declare class State {
+    private contactId?;
+    /** 默认值 */
     filerOptions?: FilterOption[];
-    constructor();
+    constructor(contactId?: string | undefined);
+    contactFilter(): void;
     date(d: "day" | "week" | "month" | "tomorrow"): void;
 }

package/es/modules/work/pages/WorkListPage2/state.js

@@ -2,16 +2,30 @@ import { __decorate } from "tslib";
 import { action, makeObservable, observable } from "mobx";
 import dayjs from "dayjs";
 export class State {
-    constructor() {
+    constructor(contactId) {
+        Object.defineProperty(this, "contactId", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: contactId
+        });
+        /** 默认值 */
         Object.defineProperty(this, "filerOptions", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: [
-                { c: "WorkStatus", o: "=", l: "And", v1: "Active" },
+                { c: "WorkStatus", o: "contains", l: "And", v1: JSON.stringify(["New", "Active"]) },
             ]
         });
         makeObservable(this);
+        this.contactFilter();
+    }
+    contactFilter() {
+        var _a;
+        if (this.contactId) {
+            (_a = this.filerOptions) === null || _a === void 0 ? void 0 : _a.push({ c: "Contact", o: "=", l: "And", v1: this.contactId });
+        }
     }
     date(d) {
         if (d !== "tomorrow") {
@@ -28,6 +42,9 @@ export class State {
 __decorate([
     observable
 ], State.prototype, "filerOptions", void 0);
+__decorate([
+    action
+], State.prototype, "contactFilter", null);
 __decorate([
     action
 ], State.prototype, "date", null);

package/es/modules/work/pages/WorkListPage2/state.js.map

@@ -1 +1 @@
-{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../../../src/modules/work/pages/WorkListPage2/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;IAKjB;QAJmB;;;;mBAAgC;gBAClD,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,QAAQ,EAAE;aACnD;WAAC;QAGD,cAAc,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;IAEc,IAAI,CAAC,CAAwC;QAC3D,IAAI,CAAC,KAAK,UAAU,EAAE,CAAC;YACtB,MAAM,EAAE,GAAG,KAAK,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;YAC5D,MAAM,EAAE,GAAG,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;YAC1D,IAAI,CAAC,YAAY,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;QAChF,CAAC;aAAM,CAAC;YACP,MAAM,QAAQ,GAAG,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YAC5D,IAAI,CAAC,YAAY,GAAG,CAAC,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC5F,CAAC;IACF,CAAC;CACD;AAlBmB;IAAlB,UAAU;2CAET;AAMa;IAAd,MAAM;iCASN"}
+{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../../../src/modules/work/pages/WorkListPage2/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;IAMjB,YAA2B,SAAkB;QAA1B;;;;mBAAQ,SAAS;WAAS;QAL7C,UAAU;QACS;;;;mBAAgC;gBAClD,EAAE,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,EAAE;aACnF;WAAC;QAGD,cAAc,CAAC,IAAI,CAAC,CAAC;QACrB,IAAI,CAAC,aAAa,EAAE,CAAC;IACtB,CAAC;IAEc,aAAa;;QAC3B,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,MAAA,IAAI,CAAC,YAAY,0CAAE,IAAI,CAAC,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;QACjF,CAAC;IACF,CAAC;IAEc,IAAI,CAAC,CAAwC;QAC3D,IAAI,CAAC,KAAK,UAAU,EAAE,CAAC;YACtB,MAAM,EAAE,GAAG,KAAK,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;YAC5D,MAAM,EAAE,GAAG,KAAK,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;YAC1D,IAAI,CAAC,YAAY,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;QAChF,CAAC;aAAM,CAAC;YACP,MAAM,QAAQ,GAAG,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YAC5D,IAAI,CAAC,YAAY,GAAG,CAAC,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC5F,CAAC;IACF,CAAC;CACD;AAzBmB;IAAlB,UAAU;2CAET;AAOa;IAAd,MAAM;0CAIN;AAEc;IAAd,MAAM;iCASN"}

package/package.json

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