@voplus/morpho-workspace 7.0.2 → 7.0.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/es/modules/work/components/RelatedWorkList/RelatedWorkList.d.ts +2 -0
- package/es/modules/work/components/RelatedWorkList/RelatedWorkList.js +3 -2
- package/es/modules/work/components/RelatedWorkList/RelatedWorkList.js.map +1 -1
- package/es/modules/work/components/WorkCashReport/WorkCashReportTemplate.js +1 -1
- package/es/modules/work/components/WorkCashReport/WorkCashReportTemplate.js.map +1 -1
- package/package.json +2 -2
|
@@ -10,9 +10,10 @@ import WorkItem from "../WorkItem";
|
|
|
10
10
|
import classnames from "classnames";
|
|
11
11
|
import "./index.less";
|
|
12
12
|
const RelatedWorkList = (props) => {
|
|
13
|
-
const { id, addAble, title, primaryContact } = props;
|
|
13
|
+
const { id, addAble, title, primaryContact, noUseWork } = props;
|
|
14
14
|
const [add, setAdd] = useState(false);
|
|
15
|
-
|
|
15
|
+
// 只有当primaryContact为undefined且noUseWork不为true时才运行useWork(id)
|
|
16
|
+
const work = primaryContact === undefined && noUseWork !== true ? useWork(id) : undefined;
|
|
16
17
|
/** 建立 ListView 和useWorkErrorListEffect所需的ListDataState. 会根据state.id重建所以不需reset. */
|
|
17
18
|
const list = useCreateListDataState({
|
|
18
19
|
filterDefaults: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RelatedWorkList.js","sourceRoot":"","sources":["../../../../../src/modules/work/components/RelatedWorkList/RelatedWorkList.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,iBAAiB,MAAM,uDAAuD,CAAC;AACtF,OAAO,EAAE,yBAAyB,EAAS,MAAM,8BAA8B,CAAC;AAChF,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACpF,OAAO,QAAQ,MAAM,2DAA2D,CAAC;AACjF,OAAO,WAAW,MAAM,gBAAgB,CAAC;AACzC,OAAO,QAAQ,MAAM,aAAa,CAAC;AACnC,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"RelatedWorkList.js","sourceRoot":"","sources":["../../../../../src/modules/work/components/RelatedWorkList/RelatedWorkList.tsx"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@ const WorkCashReportTemplate = (props) => {
|
|
|
16
16
|
chart.axis("total", {
|
|
17
17
|
title: { text: "Monthly Works" },
|
|
18
18
|
});
|
|
19
|
-
chart.interval().
|
|
19
|
+
chart.interval().encode("x", "date").encode("y", "total");
|
|
20
20
|
chart.interaction("active-region");
|
|
21
21
|
chart.interaction("element-active");
|
|
22
22
|
chart.render();
|
|
@@ -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,IAAI,CAAC,OAAO,EAAE;YACnB,KAAK,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE;SAChC,CAAC,CAAC;QAEH,KAAK,CAAC,QAAQ,EAAE,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,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAE1D,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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@voplus/morpho-workspace",
|
|
3
|
-
"version": "7.0.
|
|
3
|
+
"version": "7.0.4",
|
|
4
4
|
"description": "morpho workspace module",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
}
|
|
33
33
|
},
|
|
34
34
|
"dependencies": {
|
|
35
|
-
"@antv/g2": "
|
|
35
|
+
"@antv/g2": ">=2.2.0",
|
|
36
36
|
"@fullcalendar/core": "6.x",
|
|
37
37
|
"@fullcalendar/daygrid": "6.x",
|
|
38
38
|
"@fullcalendar/interaction": "6.x",
|