@voplus/morpho-workspace 6.0.22 → 6.0.24
Sign up to get free protection for your applications and to get access to all the features.
- package/es/controls/filters/EventsFilter/index.js +5 -10
- package/es/controls/filters/EventsFilter/index.js.map +1 -1
- package/es/controls/filters/EventsFilter/state.d.ts +0 -2
- package/es/controls/filters/EventsFilter/state.js +0 -11
- package/es/controls/filters/EventsFilter/state.js.map +1 -1
- package/es/controls/filters/TaskStatusFilter/index.js +7 -9
- package/es/controls/filters/TaskStatusFilter/index.js.map +1 -1
- package/es/controls/filters/TaskStatusFilter/state.d.ts +0 -2
- package/es/controls/filters/TaskStatusFilter/state.js +0 -11
- package/es/controls/filters/TaskStatusFilter/state.js.map +1 -1
- package/es/modules/work/components/WorkCashReport/WorkCashReportTemplate.js +4 -1
- package/es/modules/work/components/WorkCashReport/WorkCashReportTemplate.js.map +1 -1
- package/es/modules/work/components/WorkCashReport/index.d.ts +1 -0
- package/es/modules/work/components/WorkCashReport/index.js +12 -3
- package/es/modules/work/components/WorkCashReport/index.js.map +1 -1
- package/es/modules/work/components/WorkCashReport/state.d.ts +0 -2
- package/es/modules/work/components/WorkCashReport/state.js +1 -16
- package/es/modules/work/components/WorkCashReport/state.js.map +1 -1
- package/es/modules/work/components/WorkList/index.d.ts +5 -0
- package/es/modules/work/components/WorkList/index.js +28 -14
- package/es/modules/work/components/WorkList/index.js.map +1 -1
- package/es/modules/work/work-type/components/WorkTypeIcon/index.js +5 -4
- package/es/modules/work/work-type/components/WorkTypeIcon/index.js.map +1 -1
- package/es/modules/workspace/components/WorkspaceIcon/index.js +6 -5
- package/es/modules/workspace/components/WorkspaceIcon/index.js.map +1 -1
- package/es/modules/workspace/components/WorkspaceIcon/index.less +66 -64
- package/es/modules/workspace/pages/WorkspacePage/WorkTypeWorksDashBoard.js +4 -11
- package/es/modules/workspace/pages/WorkspacePage/WorkTypeWorksDashBoard.js.map +1 -1
- package/package.json +1 -1
|
@@ -3,25 +3,20 @@ import { Badge } from "antd";
|
|
|
3
3
|
import { State } from "./state";
|
|
4
4
|
import classnames from "classnames";
|
|
5
5
|
import { observe } from "@voplus/morpho-ui";
|
|
6
|
-
import { runInAction } from "mobx";
|
|
7
6
|
import { useFilterOptionsContext } from "@voplus/morpho-ui/es/data";
|
|
8
7
|
const EventsFilter = (props) => {
|
|
9
8
|
const context = useFilterOptionsContext();
|
|
10
9
|
const state = context.getFilterState("Events", () => new State());
|
|
11
|
-
// defaultValue 为传入的预选状态
|
|
12
10
|
useEffect(() => {
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
}, [
|
|
11
|
+
var _a;
|
|
12
|
+
state.reset();
|
|
13
|
+
(_a = props.defaultValue) === null || _a === void 0 ? void 0 : _a.map((value) => state.onChangeEvents(value));
|
|
14
|
+
}, [props.defaultValue]);
|
|
17
15
|
return observe(() => (React.createElement("div", null,
|
|
18
16
|
React.createElement("div", { className: "menu-item-title" }, "Events"),
|
|
19
17
|
state.menus.map((item, index) => (React.createElement("div", { key: index, className: classnames("filter-menu-item", {
|
|
20
18
|
bold: state.events.has(item.value),
|
|
21
|
-
}), onClick: () =>
|
|
22
|
-
state.onChangeEvents(item.value);
|
|
23
|
-
runInAction(() => (state.showDefaultValue = false));
|
|
24
|
-
} },
|
|
19
|
+
}), onClick: () => state.onChangeEvents(item.value) },
|
|
25
20
|
React.createElement("div", { className: "filter-name" },
|
|
26
21
|
React.createElement(Badge, { color: item.color }),
|
|
27
22
|
item.name),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/controls/filters/EventsFilter/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEzC,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/controls/filters/EventsFilter/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEzC,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAEpE,MAAM,YAAY,GAAG,CAAC,KAAkC,EAAE,EAAE;IAC3D,MAAM,OAAO,GAAG,uBAAuB,EAAE,CAAC;IAE1C,MAAM,KAAK,GAAG,OAAO,CAAC,cAAc,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC;IAElE,SAAS,CAAC,GAAG,EAAE;;QACd,KAAK,CAAC,KAAK,EAAE,CAAC;QACd,MAAA,KAAK,CAAC,YAAY,0CAAE,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;IACjE,CAAC,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;IAEzB,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,CACpB;QACC,6BAAK,SAAS,EAAC,iBAAiB,aAAa;QAC5C,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,KAAa,EAAE,EAAE,CAAC,CAC9C,6BACC,GAAG,EAAE,KAAK,EACV,SAAS,EAAE,UAAU,CAAC,kBAAkB,EAAE;gBACzC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC;aAClC,CAAC,EACF,OAAO,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC;YAE/C,6BAAK,SAAS,EAAC,aAAa;gBAC3B,oBAAC,KAAK,IAAC,KAAK,EAAE,IAAI,CAAC,KAAK,GAAI;gBAC3B,IAAI,CAAC,IAAI,CACL;YACN,kCAAO,IAAI,CAAC,MAAM,CAAQ,CACrB,CACN,CAAC,CACG,CACN,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,YAAY,CAAC"}
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
import { FilterOption } from "@voplus/morpho-data";
|
|
2
2
|
import { IFilterState } from "@voplus/morpho-ui/es/data/IFilterState";
|
|
3
3
|
export declare class State implements IFilterState {
|
|
4
|
-
/** 是否显示预选status */
|
|
5
|
-
showDefaultValue: boolean;
|
|
6
4
|
/** events of filter */
|
|
7
5
|
events: Map<string, boolean>;
|
|
8
6
|
constructor();
|
|
@@ -2,13 +2,6 @@ import { __decorate } from "tslib";
|
|
|
2
2
|
import { action, makeObservable, observable } from "mobx";
|
|
3
3
|
export class State {
|
|
4
4
|
constructor() {
|
|
5
|
-
/** 是否显示预选status */
|
|
6
|
-
Object.defineProperty(this, "showDefaultValue", {
|
|
7
|
-
enumerable: true,
|
|
8
|
-
configurable: true,
|
|
9
|
-
writable: true,
|
|
10
|
-
value: true
|
|
11
|
-
});
|
|
12
5
|
/** events of filter */
|
|
13
6
|
Object.defineProperty(this, "events", {
|
|
14
7
|
enumerable: true,
|
|
@@ -41,12 +34,8 @@ export class State {
|
|
|
41
34
|
}
|
|
42
35
|
reset() {
|
|
43
36
|
this.events.clear();
|
|
44
|
-
this.showDefaultValue = true;
|
|
45
37
|
}
|
|
46
38
|
}
|
|
47
|
-
__decorate([
|
|
48
|
-
observable
|
|
49
|
-
], State.prototype, "showDefaultValue", void 0);
|
|
50
39
|
__decorate([
|
|
51
40
|
observable
|
|
52
41
|
], State.prototype, "events", void 0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../../src/controls/filters/EventsFilter/state.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAK1D,MAAM,OAAO,KAAK;
|
|
1
|
+
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../../src/controls/filters/EventsFilter/state.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAK1D,MAAM,OAAO,KAAK;IAIjB;QAHA,uBAAuB;QACJ;;;;mBAA+B,IAAI,GAAG,EAAE;WAAC;QAG3D,cAAc,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;IAED,oBAAoB;IAEb,cAAc,CAAC,KAAa;QAClC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACnF,CAAC;IAED,IAAW,KAAK;QACf,OAAO;YACN,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE;YACjE,EAAE,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE;YACxE,EAAE,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE;SACxE,CAAC;IACH,CAAC;IACD,IAAW,OAAO;QACjB,OAAO;YACN;gBACC,CAAC,EAAE,WAAW;gBACd,CAAC,EAAE,UAAU;gBACb,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;gBAClD,CAAC,EAAE,KAAK;aACQ;SACjB,CAAC;IACH,CAAC;IACM,KAAK;QACX,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IACrB,CAAC;CACD;AAhCmB;IAAlB,UAAU;qCAAiD;AAQrD;IADN,MAAM;2CAGN"}
|
|
@@ -1,24 +1,22 @@
|
|
|
1
1
|
import { Badge } from "antd";
|
|
2
|
-
import React from "react";
|
|
2
|
+
import React, { useEffect } from "react";
|
|
3
3
|
import { State } from "./state";
|
|
4
4
|
import classnames from "classnames";
|
|
5
5
|
import { observe } from "@voplus/morpho-ui";
|
|
6
|
-
import { runInAction } from "mobx";
|
|
7
6
|
import { useFilterOptionsContext } from "@voplus/morpho-ui/es/data";
|
|
8
7
|
const TaskStatusFilter = (props) => {
|
|
9
8
|
const context = useFilterOptionsContext();
|
|
10
9
|
const state = context.getFilterState("Status", () => new State());
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
10
|
+
useEffect(() => {
|
|
11
|
+
var _a;
|
|
12
|
+
state.reset();
|
|
13
|
+
(_a = props.defaultValue) === null || _a === void 0 ? void 0 : _a.map((value) => state.onChangeStatus(value));
|
|
14
|
+
}, [props.defaultValue]);
|
|
14
15
|
return observe(() => (React.createElement("div", null,
|
|
15
16
|
React.createElement("div", { className: "menu-item-title" }, "Status"),
|
|
16
17
|
state.menus.map((item, index) => (React.createElement("div", { key: index, className: classnames("filter-menu-item", {
|
|
17
18
|
bold: state.status.has(item.value),
|
|
18
|
-
}), onClick: () =>
|
|
19
|
-
state.onChangeStatus(item.value);
|
|
20
|
-
runInAction(() => (state.showDefaultValue = false));
|
|
21
|
-
} },
|
|
19
|
+
}), onClick: () => state.onChangeStatus(item.value) },
|
|
22
20
|
React.createElement("div", { className: "filter-name" },
|
|
23
21
|
React.createElement(Badge, { color: item.color }),
|
|
24
22
|
item.name),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/controls/filters/TaskStatusFilter/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/controls/filters/TaskStatusFilter/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAIpE,MAAM,gBAAgB,GAAG,CAAC,KAA4B,EAAE,EAAE;IACzD,MAAM,OAAO,GAAG,uBAAuB,EAAE,CAAC;IAE1C,MAAM,KAAK,GAAG,OAAO,CAAC,cAAc,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC;IAElE,SAAS,CAAC,GAAG,EAAE;;QACd,KAAK,CAAC,KAAK,EAAE,CAAC;QACd,MAAA,KAAK,CAAC,YAAY,0CAAE,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;IACjE,CAAC,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;IAEzB,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,CACpB;QACC,6BAAK,SAAS,EAAC,iBAAiB,aAAa;QAC5C,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,KAAa,EAAE,EAAE,CAAC,CAC9C,6BACC,GAAG,EAAE,KAAK,EACV,SAAS,EAAE,UAAU,CAAC,kBAAkB,EAAE;gBACzC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC;aAClC,CAAC,EACF,OAAO,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC;YAE/C,6BAAK,SAAS,EAAC,aAAa;gBAC3B,oBAAC,KAAK,IAAC,KAAK,EAAE,IAAI,CAAC,KAAK,GAAI;gBAC3B,IAAI,CAAC,IAAI,CACL;YACN,kCAAO,IAAI,CAAC,MAAM,CAAQ,CACrB,CACN,CAAC,CACG,CACN,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,gBAAgB,CAAC"}
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
import { FilterOption } from "@voplus/morpho-data";
|
|
2
2
|
import { IFilterState } from "@voplus/morpho-ui/es/data/IFilterState";
|
|
3
3
|
export declare class State implements IFilterState {
|
|
4
|
-
/** 是否显示预选status */
|
|
5
|
-
showDefaultValue: boolean;
|
|
6
4
|
/** Status of filter */
|
|
7
5
|
status: Map<string, boolean>;
|
|
8
6
|
constructor();
|
|
@@ -2,13 +2,6 @@ import { __decorate } from "tslib";
|
|
|
2
2
|
import { action, makeObservable, observable } from "mobx";
|
|
3
3
|
export class State {
|
|
4
4
|
constructor() {
|
|
5
|
-
/** 是否显示预选status */
|
|
6
|
-
Object.defineProperty(this, "showDefaultValue", {
|
|
7
|
-
enumerable: true,
|
|
8
|
-
configurable: true,
|
|
9
|
-
writable: true,
|
|
10
|
-
value: true
|
|
11
|
-
});
|
|
12
5
|
/** Status of filter */
|
|
13
6
|
Object.defineProperty(this, "status", {
|
|
14
7
|
enumerable: true,
|
|
@@ -44,12 +37,8 @@ export class State {
|
|
|
44
37
|
}
|
|
45
38
|
reset() {
|
|
46
39
|
this.status.clear();
|
|
47
|
-
this.showDefaultValue = true;
|
|
48
40
|
}
|
|
49
41
|
}
|
|
50
|
-
__decorate([
|
|
51
|
-
observable
|
|
52
|
-
], State.prototype, "showDefaultValue", void 0);
|
|
53
42
|
__decorate([
|
|
54
43
|
observable
|
|
55
44
|
], State.prototype, "status", void 0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../../src/controls/filters/TaskStatusFilter/state.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAK1D,MAAM,OAAO,KAAK;
|
|
1
|
+
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../../src/controls/filters/TaskStatusFilter/state.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAK1D,MAAM,OAAO,KAAK;IAIjB;QAHA,uBAAuB;QACJ;;;;mBAA+B,IAAI,GAAG,EAAE;WAAC;QAG3D,cAAc,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;IAED,oBAAoB;IAEb,cAAc,CAAC,KAAa;QAClC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACnF,CAAC;IAED,IAAW,KAAK;QACf,OAAO;YACN,iFAAiF;YACjF,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,YAAY,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE;YAC3E,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE;YACtE,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE;YAC9D,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,SAAS,EAAE;SAClE,CAAC;IACH,CAAC;IACD,IAAW,OAAO;QACjB,yCAAyC;QACzC,OAAO;YACN;gBACC,CAAC,EAAE,YAAY;gBACf,CAAC,EAAE,UAAU;gBACb,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;gBAClD,CAAC,EAAE,KAAK;aACQ;SACjB,CAAC;IACH,CAAC;IACM,KAAK;QACX,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;IACrB,CAAC;CACD;AAnCmB;IAAlB,UAAU;qCAAiD;AAQrD;IADN,MAAM;2CAGN"}
|
|
@@ -13,9 +13,12 @@ const WorkCashReportTemplate = (props) => {
|
|
|
13
13
|
chart.scale("total", {
|
|
14
14
|
nice: true,
|
|
15
15
|
});
|
|
16
|
+
chart.axis("total", {
|
|
17
|
+
title: { text: "Monthly Works" },
|
|
18
|
+
});
|
|
16
19
|
chart.interval().position("date*total");
|
|
17
20
|
chart.interaction("active-region");
|
|
18
|
-
chart.interaction(
|
|
21
|
+
chart.interaction("element-active");
|
|
19
22
|
chart.render();
|
|
20
23
|
};
|
|
21
24
|
return observe(() => React.createElement("div", { id: "work-report-container" }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WorkCashReportTemplate.js","sourceRoot":"","sources":["../../../../../src/modules/work/components/WorkCashReport/WorkCashReportTemplate.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAE5C,MAAM,sBAAsB,GAAG,CAAC,KAAkD,EAAE,EAAE;IACrF,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;IAE5B,MAAM,IAAI,GAAG,GAAG,EAAE;QACjB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC;YACvB,SAAS,EAAE,uBAAuB;YAClC,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,GAAG;SACX,CAAC,CAAC;QAEH,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACvB,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE;YACpB,IAAI,EAAE,IAAI;SACV,CAAC,CAAC;QAEH,KAAK,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QAExC,KAAK,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;QACnC,KAAK,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC;QAEpC,KAAK,CAAC,MAAM,EAAE,CAAC;IAChB,CAAC,CAAC;IAEF,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,6BAAK,EAAE,EAAC,uBAAuB,GAAG,CAAC,CAAC;AAC1D,CAAC,CAAC;AAEF,eAAe,sBAAsB,CAAC"}
|
|
1
|
+
{"version":3,"file":"WorkCashReportTemplate.js","sourceRoot":"","sources":["../../../../../src/modules/work/components/WorkCashReport/WorkCashReportTemplate.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAE5C,MAAM,sBAAsB,GAAG,CAAC,KAAkD,EAAE,EAAE;IACrF,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;IAE5B,MAAM,IAAI,GAAG,GAAG,EAAE;QACjB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC;YACvB,SAAS,EAAE,uBAAuB;YAClC,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,GAAG;SACX,CAAC,CAAC;QAEH,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACvB,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE;YACpB,IAAI,EAAE,IAAI;SACV,CAAC,CAAC;QAEH,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE;YACnB,KAAK,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE;SAChC,CAAC,CAAC;QAEH,KAAK,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QAExC,KAAK,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC;QACnC,KAAK,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAC;QAEpC,KAAK,CAAC,MAAM,EAAE,CAAC;IAChB,CAAC,CAAC;IAEF,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,6BAAK,EAAE,EAAC,uBAAuB,GAAG,CAAC,CAAC;AAC1D,CAAC,CAAC;AAEF,eAAe,sBAAsB,CAAC"}
|
|
@@ -5,6 +5,7 @@ import { useWorkStore } from "../../../../data/work";
|
|
|
5
5
|
import { State } from "./state";
|
|
6
6
|
import { FontAwesomeIcon as FAIcon } from "@fortawesome/react-fontawesome";
|
|
7
7
|
import { faBarsFilter } from "@fortawesome/pro-light-svg-icons";
|
|
8
|
+
import { runInAction } from "mobx";
|
|
8
9
|
import { Skeleton } from "antd";
|
|
9
10
|
import { CloseOutlined } from "@ant-design/icons";
|
|
10
11
|
import { WorkStatusFilter } from "../../../../controls/filters";
|
|
@@ -16,6 +17,14 @@ const WorkCashReport = (props) => {
|
|
|
16
17
|
const store = useWorkStore();
|
|
17
18
|
const [state] = useState(new State(props.id, store));
|
|
18
19
|
useEffect(() => state.onLoad(), [props.id]);
|
|
20
|
+
const onResetFilter = (item) => runInAction(() => { var _a; return onFilter((_a = state.filterV1Val) === null || _a === void 0 ? void 0 : _a.filter((v) => v !== item)); });
|
|
21
|
+
const onFilter = (filterV1Val) => runInAction(() => {
|
|
22
|
+
var _a;
|
|
23
|
+
state.filterV1Val = filterV1Val;
|
|
24
|
+
state.filter[0].v1 = JSON.stringify(filterV1Val);
|
|
25
|
+
state.onLoad(state.filter);
|
|
26
|
+
(_a = props.onFilterOutPut) === null || _a === void 0 ? void 0 : _a.call(props, state.filterV1Val);
|
|
27
|
+
});
|
|
19
28
|
return observe(() => {
|
|
20
29
|
var _a;
|
|
21
30
|
return (React.createElement(ListDataContext.Provider, { value: list },
|
|
@@ -24,17 +33,17 @@ const WorkCashReport = (props) => {
|
|
|
24
33
|
React.createElement("div", { className: "work-report-header" },
|
|
25
34
|
React.createElement("div", { className: "selected-filter" }, (_a = state.filterV1Val) === null || _a === void 0 ? void 0 : _a.map((type) => (React.createElement("div", { className: "selected-filter-item" },
|
|
26
35
|
React.createElement("span", { className: "prosemirror-mention-node" }, type),
|
|
27
|
-
React.createElement(CloseOutlined, { className: "selected-filter-item-del", onClick: () =>
|
|
36
|
+
React.createElement(CloseOutlined, { className: "selected-filter-item-del", onClick: () => onResetFilter(type) }))))),
|
|
28
37
|
React.createElement("div", { className: "filter-component" },
|
|
29
38
|
React.createElement(FilterView, { className: "ml-2.5", icon: React.createElement(FAIcon, { icon: faBarsFilter, size: "lg" }), columns: [
|
|
30
39
|
React.createElement(WorkStatusFilter, { key: "WorkStatusFilter", defaultValue: state.filterV1Val }),
|
|
31
40
|
], onFilter: (c) => {
|
|
32
41
|
var _a, _b;
|
|
33
42
|
c.filter();
|
|
34
|
-
|
|
43
|
+
onFilter((state.filterV1Val = ((_a = c === null || c === void 0 ? void 0 : c.options) === null || _a === void 0 ? void 0 : _a.Filters)
|
|
35
44
|
? JSON.parse((_b = c === null || c === void 0 ? void 0 : c.options) === null || _b === void 0 ? void 0 : _b.Filters[0].v1)
|
|
36
45
|
: []));
|
|
37
|
-
}, onReset: () =>
|
|
46
|
+
}, onReset: () => onFilter([]) })))),
|
|
38
47
|
React.createElement("div", { className: "work-report-content" },
|
|
39
48
|
React.createElement(Skeleton, { loading: state.loading, active: true },
|
|
40
49
|
React.createElement(WorkCashReportTemplate, { data: state.dataList }))))));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/work/components/WorkCashReport/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EACN,oBAAoB,EACpB,eAAe,EACf,sBAAsB,GACtB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,eAAe,IAAI,MAAM,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AAChC,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,sBAAsB,MAAM,0BAA0B,CAAC;AAC9D,OAAO,UAAU,MAAM,0CAA0C,CAAC;AAClE,OAAO,MAAM,MAAM,cAAc,CAAC;AAElC,MAAM,cAAc,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/work/components/WorkCashReport/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -25,7 +25,7 @@ export class State {
|
|
|
25
25
|
enumerable: true,
|
|
26
26
|
configurable: true,
|
|
27
27
|
writable: true,
|
|
28
|
-
value: ["
|
|
28
|
+
value: ["Active"]
|
|
29
29
|
});
|
|
30
30
|
Object.defineProperty(this, "filter", {
|
|
31
31
|
enumerable: true,
|
|
@@ -66,15 +66,6 @@ export class State {
|
|
|
66
66
|
total: i.total,
|
|
67
67
|
}));
|
|
68
68
|
}
|
|
69
|
-
onResetFilter(item) {
|
|
70
|
-
var _a;
|
|
71
|
-
this.onFilter((_a = this.filterV1Val) === null || _a === void 0 ? void 0 : _a.filter((v) => v !== item));
|
|
72
|
-
}
|
|
73
|
-
onFilter(filterV1Val) {
|
|
74
|
-
this.filterV1Val = filterV1Val;
|
|
75
|
-
this.filter[0].v1 = JSON.stringify(filterV1Val);
|
|
76
|
-
this.onLoad(this.filter);
|
|
77
|
-
}
|
|
78
69
|
}
|
|
79
70
|
__decorate([
|
|
80
71
|
observable
|
|
@@ -94,10 +85,4 @@ __decorate([
|
|
|
94
85
|
__decorate([
|
|
95
86
|
action
|
|
96
87
|
], State.prototype, "loadCashList", null);
|
|
97
|
-
__decorate([
|
|
98
|
-
action
|
|
99
|
-
], State.prototype, "onResetFilter", null);
|
|
100
|
-
__decorate([
|
|
101
|
-
action
|
|
102
|
-
], State.prototype, "onFilter", null);
|
|
103
88
|
//# sourceMappingURL=state.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../../../src/modules/work/components/WorkCashReport/state.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAG1D,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,OAAO,KAAK;IAkBjB,YAAoB,UAAkB,EAAU,KAAgB;QAApD;;;;mBAAQ,UAAU;WAAQ;QAAE;;;;mBAAQ,KAAK;WAAW;QAjBpD;;;;mBAAU,KAAK;WAAC;QAEhB;;;;mBAAwB,CAAC,
|
|
1
|
+
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../../../src/modules/work/components/WorkCashReport/state.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAG1D,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,OAAO,KAAK;IAkBjB,YAAoB,UAAkB,EAAU,KAAgB;QAApD;;;;mBAAQ,UAAU;WAAQ;QAAE;;;;mBAAQ,KAAK;WAAW;QAjBpD;;;;mBAAU,KAAK;WAAC;QAEhB;;;;mBAAwB,CAAC,QAAQ,CAAC;WAAC;QAEnC;;;;mBAAyB;gBACpC;oBACC,CAAC,EAAE,YAAY;oBACf,CAAC,EAAE,UAAU;oBACb,CAAC,EAAE,KAAK;oBACR,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC;iBACpC;gBACD,EAAE,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,CAAC,UAAU,EAAE;aACxD;WAAC;QAEF,WAAW;QACC;;;;mBAA8C,EAAE;WAAC;QAG5D,cAAc,CAAC,IAAI,CAAC,CAAC;IACtB,CAAC;IAEc,MAAM,CAAC,YAA6B;QAClD,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QAEpB,IAAI,CAAC,KAAK;aACR,cAAc,CAAC,EAAE,OAAO,EAAE,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,IAAI,CAAC,MAAM,EAAE,CAAC;aACxD,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;aACrC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC;IACzC,CAAC;IAED,qBAAqB;IACN,YAAY,CAAC,UAAuB;;QAClD,IAAI,CAAC,QAAQ,GAAG,EAAE,CAAC;QAEnB,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,KAAK,0CAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAC5B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;YAClB,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC;YACtD,KAAK,EAAE,CAAC,CAAC,KAAK;SACd,CAAC,CACF,CAAC;IACH,CAAC;CACD;AAzCY;IAAX,UAAU;sCAAiB;AAEhB;IAAX,UAAU;0CAAoC;AAEnC;IAAX,UAAU;qCAQT;AAGU;IAAX,UAAU;uCAAkD;AAM9C;IAAd,MAAM;mCAON;AAGc;IAAd,MAAM;yCASN"}
|
|
@@ -2,8 +2,12 @@ import React from "react";
|
|
|
2
2
|
import { IWork } from "../../../../data/work";
|
|
3
3
|
import "./index.less";
|
|
4
4
|
export type WorkListProps = {
|
|
5
|
+
/** 是否显示 filter icon */
|
|
6
|
+
filterVisible?: boolean;
|
|
5
7
|
/** status of works shown on the list. */
|
|
6
8
|
status?: string;
|
|
9
|
+
/** filter work status */
|
|
10
|
+
statusArr?: string[];
|
|
7
11
|
/** types id of works shown on the list. */
|
|
8
12
|
typesId?: string;
|
|
9
13
|
/** dueDate of works shown on the list. */
|
|
@@ -40,6 +44,7 @@ declare const WorkList: {
|
|
|
40
44
|
(props: WorkListProps): React.JSX.Element;
|
|
41
45
|
defaultProps: {
|
|
42
46
|
asideable: boolean;
|
|
47
|
+
filterVisible: boolean;
|
|
43
48
|
};
|
|
44
49
|
};
|
|
45
50
|
export default WorkList;
|
|
@@ -14,18 +14,28 @@ import moment from "moment";
|
|
|
14
14
|
import S from "string";
|
|
15
15
|
import "./index.less";
|
|
16
16
|
const WorkList = (props) => {
|
|
17
|
-
const { dueDate, typesId, workspaceId, workId, contactId, contact, addAble, asideable, viewTitle, total, } = props;
|
|
17
|
+
const { dueDate, typesId, roles, status, statusArr, workspaceId, workId, contactId, contact, addAble, asideable, viewTitle, total, } = props;
|
|
18
18
|
const [activeId, setActiveId] = useState("");
|
|
19
19
|
const [workTotal, setWorkTotal] = useState(0);
|
|
20
20
|
const [workTypeList, setWorkTypeList] = useState([]);
|
|
21
21
|
const documentStore = useDocumentStore();
|
|
22
22
|
const workType = useWorkType(typesId);
|
|
23
|
+
let listViewHeaderProps = {};
|
|
24
|
+
if (props.filterVisible)
|
|
25
|
+
listViewHeaderProps = {
|
|
26
|
+
filterViewProps: {
|
|
27
|
+
columns: [
|
|
28
|
+
status && workspaceId ? (React.createElement(WorkTypesFilter, { key: "WorkTypesFilter", workTypeList: workTypeList })) : (React.createElement(WorkStatusFilter, { key: "WorkStatusFilter", defaultValue: defaultValue() })),
|
|
29
|
+
],
|
|
30
|
+
onFilter,
|
|
31
|
+
},
|
|
32
|
+
};
|
|
23
33
|
const list = useCreateListDataState({
|
|
24
34
|
filterDefaults: {
|
|
25
35
|
includes: "tags",
|
|
26
36
|
filters: filters(),
|
|
27
37
|
},
|
|
28
|
-
}, [
|
|
38
|
+
}, [status, dueDate, typesId, statusArr]);
|
|
29
39
|
/** useOnNewDocument, useOnDeleteDocument的sugar syntax 自動更新list. */
|
|
30
40
|
useAutoUpdateListData(list, (d) => d.type === "Work");
|
|
31
41
|
useRenderOnChange(() => list.filters.options);
|
|
@@ -50,12 +60,7 @@ const WorkList = (props) => {
|
|
|
50
60
|
sortable: false,
|
|
51
61
|
quickSearch: true,
|
|
52
62
|
addAble: addAble || (dueDate === "requested" ? true : false),
|
|
53
|
-
|
|
54
|
-
columns: [
|
|
55
|
-
props.status && workspaceId ? (React.createElement(WorkTypesFilter, { key: "WorkTypesFilter", workTypeList: workTypeList })) : (React.createElement(WorkStatusFilter, { key: "WorkStatusFilter", defaultValue: defaultValue() })),
|
|
56
|
-
],
|
|
57
|
-
onFilter,
|
|
58
|
-
},
|
|
63
|
+
...listViewHeaderProps,
|
|
59
64
|
}, asideable: asideable, className: "work-list", moveAfter: moveAfter, formViewTitle: "Add Work", formView: React.createElement(NewWorkForm, { contact: contact, showView: true }), renderItem: ({ item, connectDragSource }) => (React.createElement(DocumentItemFrame, { key: item.id, frameProps: { active: activeId === item.id }, onClick: () => {
|
|
60
65
|
var _a;
|
|
61
66
|
setActiveId(item.id);
|
|
@@ -70,7 +75,7 @@ const WorkList = (props) => {
|
|
|
70
75
|
l: "And",
|
|
71
76
|
v1: JSON.stringify(["Owner"]),
|
|
72
77
|
};
|
|
73
|
-
const
|
|
78
|
+
const defaultFilter = { c: "WorkStatus", l: "And", o: "=", v1: "Active" };
|
|
74
79
|
const dueFilter = {
|
|
75
80
|
c: "DueDate",
|
|
76
81
|
o: "<",
|
|
@@ -91,19 +96,27 @@ const WorkList = (props) => {
|
|
|
91
96
|
v1: JSON.stringify(["Draft", "New", "Active"]),
|
|
92
97
|
},
|
|
93
98
|
];
|
|
94
|
-
if (
|
|
99
|
+
if (roles) {
|
|
95
100
|
filter.push(rolesFilter);
|
|
96
101
|
}
|
|
97
|
-
if (
|
|
102
|
+
if (status) {
|
|
98
103
|
filter.push({
|
|
99
104
|
c: "WorkStatus",
|
|
100
105
|
o: "=",
|
|
101
106
|
l: "And",
|
|
102
|
-
v1: S(
|
|
107
|
+
v1: S(status).capitalize().toString(),
|
|
103
108
|
});
|
|
104
109
|
}
|
|
105
|
-
else {
|
|
106
|
-
filter.push(
|
|
110
|
+
else if (!(statusArr === null || statusArr === void 0 ? void 0 : statusArr.length)) {
|
|
111
|
+
filter.push(defaultFilter);
|
|
112
|
+
}
|
|
113
|
+
if (statusArr === null || statusArr === void 0 ? void 0 : statusArr.length) {
|
|
114
|
+
filter.push({
|
|
115
|
+
c: "WorkStatus",
|
|
116
|
+
o: "contains",
|
|
117
|
+
l: "And",
|
|
118
|
+
v1: JSON.stringify(statusArr),
|
|
119
|
+
});
|
|
107
120
|
}
|
|
108
121
|
if (typesId) {
|
|
109
122
|
filter.push({
|
|
@@ -188,6 +201,7 @@ const WorkList = (props) => {
|
|
|
188
201
|
};
|
|
189
202
|
WorkList.defaultProps = {
|
|
190
203
|
asideable: true,
|
|
204
|
+
filterVisible: true,
|
|
191
205
|
};
|
|
192
206
|
export default WorkList;
|
|
193
207
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/work/components/WorkList/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACxC,OAAO,EAAS,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AACjE,OAAO,EAAa,WAAW,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAC1F,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACpF,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AACjF,OAAO,EAAE,qBAAqB,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AACvF,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAE/D,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAC7B,OAAO,iBAAiB,MAAM,uDAAuD,CAAC;AACtF,OAAO,QAAQ,MAAM,2DAA2D,CAAC;AACjF,OAAO,WAAW,MAAM,gBAAgB,CAAC;AACzC,OAAO,QAAQ,MAAM,aAAa,CAAC;AACnC,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,CAAC,MAAM,QAAQ,CAAC;AACvB,OAAO,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/work/components/WorkList/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -9,10 +9,11 @@ import styles from "../../../../workspace/components/WorkspaceIcon/index.less";
|
|
|
9
9
|
const WorkTypeIcon = (props) => {
|
|
10
10
|
const { id, active } = props;
|
|
11
11
|
const worktype = useWorkType(id);
|
|
12
|
-
return observe(() => (React.createElement(
|
|
13
|
-
React.createElement(
|
|
14
|
-
React.createElement(
|
|
15
|
-
|
|
12
|
+
return observe(() => (React.createElement("div", { className: styles["work-space-type-card"] },
|
|
13
|
+
React.createElement(Card, { className: classnames("diamond-common-style", { active: active }), padding: "15px 12px", shadow: false, hoverShadow: false },
|
|
14
|
+
React.createElement("div", { className: classnames("diamond-icon"), style: { backgroundColor: "#EE6868" } },
|
|
15
|
+
React.createElement(FAIcon, { icon: faFileAlt, className: "diamond-icon-fa" })),
|
|
16
|
+
React.createElement("div", { className: "diamond-name" }, worktype === null || worktype === void 0 ? void 0 : worktype.name)))));
|
|
16
17
|
};
|
|
17
18
|
export default WorkTypeIcon;
|
|
18
19
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/modules/work/work-type/components/WorkTypeIcon/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,eAAe,IAAI,MAAM,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAC/D,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,IAAI,MAAM,oCAAoC,CAAC;AACtD,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,MAAM,MAAM,2DAA2D,CAAC;AAE/E,MAAM,YAAY,GAAG,CAAC,KAMrB,EAAE,EAAE;IACJ,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IAC7B,MAAM,QAAQ,GAAG,WAAW,CAAC,EAAG,CAAC,CAAC;IAElC,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,CACpB,oBAAC,IAAI,IACJ,SAAS,EAAE,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/modules/work/work-type/components/WorkTypeIcon/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,eAAe,IAAI,MAAM,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAC/D,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,IAAI,MAAM,oCAAoC,CAAC;AACtD,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,MAAM,MAAM,2DAA2D,CAAC;AAE/E,MAAM,YAAY,GAAG,CAAC,KAMrB,EAAE,EAAE;IACJ,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IAC7B,MAAM,QAAQ,GAAG,WAAW,CAAC,EAAG,CAAC,CAAC;IAElC,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,CACpB,6BAAK,SAAS,EAAE,MAAM,CAAC,sBAAsB,CAAC;QAC7C,oBAAC,IAAI,IACJ,SAAS,EAAE,UAAU,CAAC,sBAAsB,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,EACjE,OAAO,EAAC,WAAW,EACnB,MAAM,EAAE,KAAK,EACb,WAAW,EAAE,KAAK;YAElB,6BAAK,SAAS,EAAE,UAAU,CAAC,cAAc,CAAC,EAAE,KAAK,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE;gBAChF,oBAAC,MAAM,IAAC,IAAI,EAAE,SAAS,EAAE,SAAS,EAAC,iBAAiB,GAAG,CAClD;YACN,6BAAK,SAAS,EAAC,cAAc,IAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,CAAO,CAC9C,CACF,CACN,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,YAAY,CAAC"}
|
|
@@ -14,11 +14,12 @@ const WorkspaceIcon = (props) => {
|
|
|
14
14
|
const workspace = useWorkspace(id);
|
|
15
15
|
return observe(() => {
|
|
16
16
|
var _a;
|
|
17
|
-
return (React.createElement(
|
|
18
|
-
React.createElement(
|
|
19
|
-
|
|
20
|
-
React.createElement(
|
|
21
|
-
|
|
17
|
+
return (React.createElement("div", { className: styles["work-space-type-card"] },
|
|
18
|
+
React.createElement(Card, { className: classnames("diamond-common-style", { active: active }), padding: "15px 12px", shadow: false, hoverShadow: false },
|
|
19
|
+
React.createElement(Badge, { count: (_a = workspace === null || workspace === void 0 ? void 0 : workspace.stats) === null || _a === void 0 ? void 0 : _a.activeWorks, className: "site-badge-count" }),
|
|
20
|
+
React.createElement("div", { className: classnames("diamond-icon", { "new-workspace-icon": !id }) },
|
|
21
|
+
React.createElement(FAIcon, { icon: id ? faFileAlt : faPlus, className: "diamond-icon-fa" })),
|
|
22
|
+
React.createElement("div", { className: "diamond-name" }, (workspace === null || workspace === void 0 ? void 0 : workspace.name) || "New WorkSpace"))));
|
|
22
23
|
});
|
|
23
24
|
};
|
|
24
25
|
export default WorkspaceIcon;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/workspace/components/WorkspaceIcon/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,eAAe,IAAI,MAAM,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAC/D,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,IAAI,MAAM,oCAAoC,CAAC;AACtD,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,MAAM,MAAM,cAAc,CAAC;AAElC,MAAM,SAAS,GAAG,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;AAErF,MAAM,aAAa,GAAG,CAAC,KAMtB,EAAE,EAAE;IACJ,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IAC7B,MAAM,SAAS,GAAG,YAAY,CAAC,EAAG,CAAC,CAAC;IAEpC,OAAO,OAAO,CAAC,GAAG,EAAE;;QAAC,OAAA,CACpB,oBAAC,IAAI,IACJ,SAAS,EAAE,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/workspace/components/WorkspaceIcon/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,eAAe,IAAI,MAAM,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAC/D,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,IAAI,MAAM,oCAAoC,CAAC;AACtD,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,MAAM,MAAM,cAAc,CAAC;AAElC,MAAM,SAAS,GAAG,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;AAErF,MAAM,aAAa,GAAG,CAAC,KAMtB,EAAE,EAAE;IACJ,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IAC7B,MAAM,SAAS,GAAG,YAAY,CAAC,EAAG,CAAC,CAAC;IAEpC,OAAO,OAAO,CAAC,GAAG,EAAE;;QAAC,OAAA,CACpB,6BAAK,SAAS,EAAE,MAAM,CAAC,sBAAsB,CAAC;YAC7C,oBAAC,IAAI,IACJ,SAAS,EAAE,UAAU,CAAC,sBAAsB,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,EACjE,OAAO,EAAC,WAAW,EACnB,MAAM,EAAE,KAAK,EACb,WAAW,EAAE,KAAK;gBAElB,oBAAC,KAAK,IAAC,KAAK,EAAE,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAK,0CAAE,WAAW,EAAE,SAAS,EAAC,kBAAkB,GAAG;gBAC5E,6BACC,SAAS,EAAE,UAAU,CAAC,cAAc,EAAE,EAAE,oBAAoB,EAAE,CAAC,EAAE,EAAE,CAAC;oBAGpE,oBAAC,MAAM,IAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,EAAE,SAAS,EAAC,iBAAiB,GAAG,CAChE;gBACN,6BAAK,SAAS,EAAC,cAAc,IAAE,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,IAAI,KAAI,eAAe,CAAO,CAClE,CACF,CACN,CAAA;KAAA,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,aAAa,CAAC"}
|
|
@@ -1,79 +1,81 @@
|
|
|
1
1
|
@import "~@voplus/morpho-theme/styles/index.less";
|
|
2
2
|
|
|
3
|
-
.
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
3
|
+
.work-space-type-card {
|
|
4
|
+
:global {
|
|
5
|
+
.diamond-common-style {
|
|
6
|
+
width: 140px;
|
|
7
|
+
display: flex;
|
|
8
|
+
flex-flow: column;
|
|
9
|
+
align-items: center;
|
|
10
|
+
border-radius: @border-radius;
|
|
11
|
+
padding: 15px 8px;
|
|
12
|
+
background: transparent;
|
|
13
|
+
position: relative;
|
|
12
14
|
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
15
|
+
&:hover {
|
|
16
|
+
background: #f1f1f1;
|
|
17
|
+
}
|
|
16
18
|
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
19
|
+
&.active {
|
|
20
|
+
background: #f1f1f1;
|
|
21
|
+
}
|
|
20
22
|
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
top: 10px;
|
|
23
|
+
.site-badge-count {
|
|
24
|
+
position: absolute;
|
|
25
|
+
vertical-align: middle;
|
|
26
|
+
right: 10px;
|
|
27
|
+
top: 10px;
|
|
27
28
|
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
29
|
+
.ant-badge-count {
|
|
30
|
+
background-color: #fff !important;
|
|
31
|
+
border: none;
|
|
32
|
+
box-shadow: @badge-hover-shadow;
|
|
33
|
+
}
|
|
32
34
|
}
|
|
33
|
-
}
|
|
34
35
|
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
36
|
+
.diamond-icon {
|
|
37
|
+
width: 100px;
|
|
38
|
+
height: 100px;
|
|
39
|
+
font-size: 24px;
|
|
40
|
+
color: @white;
|
|
41
|
+
background: #469cff;
|
|
42
|
+
border-radius: @border-radius;
|
|
43
|
+
border: solid 1px @white;
|
|
44
|
+
display: flex;
|
|
45
|
+
justify-content: center;
|
|
46
|
+
align-items: center;
|
|
46
47
|
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
48
|
+
.diamond-icon-fa {
|
|
49
|
+
width: 31px;
|
|
50
|
+
height: 40px;
|
|
51
|
+
opacity: 1;
|
|
52
|
+
}
|
|
51
53
|
}
|
|
52
|
-
}
|
|
53
54
|
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
55
|
+
.new-workspace-icon {
|
|
56
|
+
color: #bdb9b9;
|
|
57
|
+
background: @white !important;
|
|
58
|
+
border: dashed 1px #bdb9b9;
|
|
59
|
+
}
|
|
59
60
|
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
61
|
+
.diamond-name {
|
|
62
|
+
// width: 100%;
|
|
63
|
+
max-width: 100px;
|
|
64
|
+
text-align: center;
|
|
65
|
+
display: -webkit-box;
|
|
66
|
+
-webkit-box-orient: vertical;
|
|
67
|
+
-webkit-line-clamp: 2;
|
|
68
|
+
overflow: hidden;
|
|
69
|
+
text-overflow: ellipsis;
|
|
70
|
+
height: 38px;
|
|
71
|
+
font-size: @font-size-base;
|
|
72
|
+
font-family: Microsoft YaHei;
|
|
73
|
+
font-weight: bold;
|
|
74
|
+
line-height: 19px;
|
|
75
|
+
margin-top: 16px;
|
|
76
|
+
color: #67696d;
|
|
77
|
+
opacity: 1;
|
|
78
|
+
}
|
|
77
79
|
}
|
|
78
80
|
}
|
|
79
81
|
}
|
|
@@ -14,6 +14,7 @@ const Dashboard = (props) => {
|
|
|
14
14
|
const params = useParams();
|
|
15
15
|
const layout = useLayout();
|
|
16
16
|
const [dashboardHeight, setDashboardHeight] = useState();
|
|
17
|
+
const [statusArr, setStatusArr] = useState([]);
|
|
17
18
|
useLayoutEffect(() => {
|
|
18
19
|
var _a;
|
|
19
20
|
setDashboardHeight((_a = ref.current) === null || _a === void 0 ? void 0 : _a.offsetHeight);
|
|
@@ -21,23 +22,15 @@ const Dashboard = (props) => {
|
|
|
21
22
|
return observe(() => (React.createElement("div", { className: styles["worktype-works-dashboard"], ref: ref },
|
|
22
23
|
React.createElement(RelatedDocument, null,
|
|
23
24
|
React.createElement(Card, { className: "work-cash-report" },
|
|
24
|
-
React.createElement(WorkCashReport, { id: params.typesId })),
|
|
25
|
+
React.createElement(WorkCashReport, { id: params.typesId, onFilterOutPut: (statusArr) => setStatusArr(statusArr) })),
|
|
25
26
|
React.createElement("div", { className: "work-list-card" },
|
|
26
|
-
React.createElement(WorkListCard, { style: { height: `${dashboardHeight - 463}px` },
|
|
27
|
+
React.createElement(WorkListCard, { style: { height: `${dashboardHeight - 463}px` }, filterVisible: false, statusArr: statusArr, active: params.active, typesId: params.typesId, workspaceId: params.id, onClickItem: (item) => {
|
|
27
28
|
layout.history.replace(generatePath(props.path, {
|
|
28
29
|
id: params.id,
|
|
29
|
-
status: params.status || "",
|
|
30
30
|
typesId: params.typesId || "",
|
|
31
|
-
dueDate: params.dueDate || "",
|
|
32
31
|
active: item.id,
|
|
33
32
|
}));
|
|
34
|
-
}, onTotal: (total) =>
|
|
35
|
-
runInAction(() => {
|
|
36
|
-
props.state.workStatusTotals[params.status] = total;
|
|
37
|
-
props.state.workTypesTotals[params.typesId] = total;
|
|
38
|
-
props.state.workTotals[params.dueDate] = total;
|
|
39
|
-
});
|
|
40
|
-
} }))))));
|
|
33
|
+
}, onTotal: (total) => runInAction(() => (props.state.workTypesTotals[params.typesId] = total)) }))))));
|
|
41
34
|
};
|
|
42
35
|
export default Dashboard;
|
|
43
36
|
//# sourceMappingURL=WorkTypeWorksDashBoard.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WorkTypeWorksDashBoard.js","sourceRoot":"","sources":["../../../../../src/modules/workspace/pages/WorkspacePage/WorkTypeWorksDashBoard.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,eAAe,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjE,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AAEnC,OAAO,eAAe,MAAM,qDAAqD,CAAC;AAClF,OAAO,YAAY,MAAM,uCAAuC,CAAC;AACjE,OAAO,cAAc,MAAM,yCAAyC,CAAC;AACrE,OAAO,MAAM,MAAM,cAAc,CAAC;AAElC,MAAM,SAAS,GAAG,CAAC,KAAqC,EAAE,EAAE;IAC3D,MAAM,GAAG,GAAG,MAAM,CAAiB,IAAI,CAAC,CAAC;IACzC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAE3B,MAAM,CAAC,eAAe,EAAE,kBAAkB,CAAC,GAAG,QAAQ,EAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"WorkTypeWorksDashBoard.js","sourceRoot":"","sources":["../../../../../src/modules/workspace/pages/WorkspacePage/WorkTypeWorksDashBoard.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,eAAe,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACjE,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AAEnC,OAAO,eAAe,MAAM,qDAAqD,CAAC;AAClF,OAAO,YAAY,MAAM,uCAAuC,CAAC;AACjE,OAAO,cAAc,MAAM,yCAAyC,CAAC;AACrE,OAAO,MAAM,MAAM,cAAc,CAAC;AAElC,MAAM,SAAS,GAAG,CAAC,KAAqC,EAAE,EAAE;IAC3D,MAAM,GAAG,GAAG,MAAM,CAAiB,IAAI,CAAC,CAAC;IACzC,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAC3B,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;IAE3B,MAAM,CAAC,eAAe,EAAE,kBAAkB,CAAC,GAAG,QAAQ,EAAU,CAAC;IACjE,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAW,EAAE,CAAC,CAAC;IAEzD,eAAe,CAAC,GAAG,EAAE;;QACpB,kBAAkB,CAAC,MAAA,GAAG,CAAC,OAAO,0CAAE,YAAY,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,CACpB,6BAAK,SAAS,EAAE,MAAM,CAAC,0BAA0B,CAAC,EAAE,GAAG,EAAE,GAAG;QAC3D,oBAAC,eAAe;YACf,oBAAC,IAAI,IAAC,SAAS,EAAC,kBAAkB;gBACjC,oBAAC,cAAc,IACd,EAAE,EAAE,MAAM,CAAC,OAAQ,EACnB,cAAc,EAAE,CAAC,SAAS,EAAE,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,GACrD,CACI;YAEP,6BAAK,SAAS,EAAC,gBAAgB;gBAC9B,oBAAC,YAAY,IACZ,KAAK,EAAE,EAAE,MAAM,EAAE,GAAG,eAAgB,GAAG,GAAG,IAAI,EAAE,EAChD,aAAa,EAAE,KAAK,EACpB,SAAS,EAAE,SAAS,EACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EACrB,OAAO,EAAE,MAAM,CAAC,OAAO,EACvB,WAAW,EAAE,MAAM,CAAC,EAAE,EACtB,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE;wBACrB,MAAM,CAAC,OAAO,CAAC,OAAO,CACrB,YAAY,CAAC,KAAK,CAAC,IAAI,EAAE;4BACxB,EAAE,EAAE,MAAM,CAAC,EAAG;4BACd,OAAO,EAAE,MAAM,CAAC,OAAO,IAAI,EAAE;4BAC7B,MAAM,EAAE,IAAI,CAAC,EAAE;yBACf,CAAC,CACF,CAAC;oBACH,CAAC,EACD,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAClB,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,OAAQ,CAAC,GAAG,KAAK,CAAC,CAAC,GAEzE,CACG,CACW,CACb,CACN,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,SAAS,CAAC"}
|