@voplus/morpho-workspace 2.0.11 → 4.0.0
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/meeting/pages/MeetingDefaultView/index.less +4 -0
- package/es/modules/tasks/pages/TaskDefaultView/index.less +3 -0
- package/es/modules/work/pages/WorkDefaultView/index.js +5 -6
- package/es/modules/work/pages/WorkDefaultView/index.js.map +1 -1
- package/es/modules/work/pages/WorkDefaultView/index.less +5 -2
- package/es/modules/work/work-schedule/pages/WorkScheduleDefaultView/index.js +9 -8
- package/es/modules/work/work-schedule/pages/WorkScheduleDefaultView/index.js.map +1 -1
- package/es/modules/work/work-schedule/pages/WorkScheduleDefaultView/index.less +19 -18
- package/package.json +4 -4
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import React, { useState } from "react";
|
|
2
2
|
import { TabItemContext, TabItemStore } from "@voplus/morpho-data";
|
|
3
|
-
import { observe } from "@voplus/morpho-ui";
|
|
3
|
+
import { observe, useAsideContentContext } from "@voplus/morpho-ui";
|
|
4
4
|
import { useFrame } from "@voplus/morpho-document/es/components/ViewFrame/ViewFrameContext";
|
|
5
5
|
import AsideContent from "@voplus/morpho-ui/es/components/layout/AsideContent";
|
|
6
6
|
import MainContent from "@voplus/morpho-ui/es/components/layout/MainContent";
|
|
@@ -11,14 +11,13 @@ import styles from "./index.less";
|
|
|
11
11
|
const WorkDefaultView = ({ id }) => {
|
|
12
12
|
const store = new TabItemStore({ url: "" });
|
|
13
13
|
const frame = useFrame();
|
|
14
|
-
const [asideContext] = useState(AsideContent.createContext());
|
|
14
|
+
const [asideContext] = useState(frame ? useAsideContentContext() : AsideContent.createContext());
|
|
15
15
|
return observe(() => (React.createElement(TabItemContext.Provider, { value: store },
|
|
16
|
-
React.createElement(MainContent, { className: styles["work-default-view"] },
|
|
16
|
+
React.createElement(MainContent, { className: styles["work-default-view"], asideable: frame ? false : true },
|
|
17
17
|
React.createElement(MainContent.Nav, { collapsible: true },
|
|
18
18
|
React.createElement(WorksProperties, { id: id, headerVisible: true })),
|
|
19
|
-
React.createElement("div", { className: "work-context" },
|
|
20
|
-
React.createElement(
|
|
21
|
-
React.createElement(WorkTabs, { id: id })))))));
|
|
19
|
+
React.createElement("div", { className: "work-context" }, frame ? (React.createElement(WorkTabs, { id: id })) : (React.createElement(AsideContent, { context: asideContext },
|
|
20
|
+
React.createElement(WorkTabs, { id: id }))))))));
|
|
22
21
|
};
|
|
23
22
|
export default WorkDefaultView;
|
|
24
23
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/work/pages/WorkDefaultView/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/work/pages/WorkDefaultView/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnE,OAAO,EAAE,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,QAAQ,EAAE,MAAM,kEAAkE,CAAC;AAC5F,OAAO,YAAY,MAAM,qDAAqD,CAAC;AAC/E,OAAO,WAAW,MAAM,oDAAoD,CAAC;AAC7E,OAAO,QAAQ,MAAM,2BAA2B,CAAC;AACjD,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAC/D,OAAO,MAAM,MAAM,cAAc,CAAC;AAGlC,8DAA8D;AAC9D,MAAM,eAAe,GAAG,CAAC,EAAE,EAAE,EAAkB,EAAE,EAAE;IAClD,MAAM,KAAK,GAAG,IAAI,YAAY,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC;IAC5C,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;IACzB,MAAM,CAAC,YAAY,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,sBAAsB,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,aAAa,EAAE,CAAC,CAAC;IAEjG,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,CACpB,oBAAC,cAAc,CAAC,QAAQ,IAAC,KAAK,EAAE,KAAK;QACpC,oBAAC,WAAW,IAAC,SAAS,EAAE,MAAM,CAAC,mBAAmB,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;YACnF,oBAAC,WAAW,CAAC,GAAG,IAAC,WAAW;gBAC3B,oBAAC,eAAe,IAAC,EAAE,EAAE,EAAE,EAAE,aAAa,SAAG,CACxB;YAClB,6BAAK,SAAS,EAAC,cAAc,IAC3B,KAAK,CAAC,CAAC,CAAC,CACR,oBAAC,QAAQ,IAAC,EAAE,EAAE,EAAE,GAAI,CACpB,CAAC,CAAC,CAAC,CACH,oBAAC,YAAY,IAAC,OAAO,EAAE,YAAmB;gBACzC,oBAAC,QAAQ,IAAC,EAAE,EAAE,EAAE,GAAI,CACN,CACf,CACI,CACO,CACW,CAC1B,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,eAAe,CAAC"}
|
|
@@ -1,29 +1,30 @@
|
|
|
1
1
|
import React, { useEffect, useState } from "react";
|
|
2
2
|
import { TabItemContext, TabItemStore, useTabItem } from "@voplus/morpho-data";
|
|
3
|
-
import { observe } from "@voplus/morpho-ui";
|
|
3
|
+
import { observe, useAsideContentContext } from "@voplus/morpho-ui";
|
|
4
|
+
import { runInAction } from "mobx";
|
|
5
|
+
import { useFrame } from "@voplus/morpho-document/es/components/ViewFrame/ViewFrameContext";
|
|
6
|
+
import { useParams } from "react-router-dom";
|
|
4
7
|
import AsideContent from "@voplus/morpho-ui/es/components/layout/AsideContent";
|
|
5
8
|
import MainContent from "@voplus/morpho-ui/es/components/layout/MainContent";
|
|
6
9
|
import WorkScheduleProperties from "../../components/WorkScheduleProperties";
|
|
7
10
|
import WorkScheduleTabs from "../../components/WorkScheduleTabs";
|
|
8
|
-
import { runInAction } from "mobx";
|
|
9
11
|
import styles from "./index.less";
|
|
10
|
-
import { useParams } from "react-router-dom";
|
|
11
12
|
const WorkScheduleDefaultView = () => {
|
|
12
13
|
const params = useParams();
|
|
13
14
|
const id = params.id || "";
|
|
14
15
|
const store = new TabItemStore({ url: "" });
|
|
16
|
+
const frame = useFrame();
|
|
15
17
|
const tab = useTabItem();
|
|
16
|
-
const [asideContext] = useState(AsideContent.createContext());
|
|
18
|
+
const [asideContext] = useState(frame ? useAsideContentContext() : AsideContent.createContext());
|
|
17
19
|
useEffect(() => {
|
|
18
20
|
runInAction(() => (tab.title = `Work Schedule`));
|
|
19
21
|
});
|
|
20
22
|
return observe(() => (React.createElement(TabItemContext.Provider, { value: store },
|
|
21
|
-
React.createElement(MainContent, { className: styles["work-schedule-default-view"] },
|
|
23
|
+
React.createElement(MainContent, { className: styles["work-schedule-default-view"], asideable: frame ? false : true },
|
|
22
24
|
React.createElement(MainContent.Nav, { collapsible: true },
|
|
23
25
|
React.createElement(WorkScheduleProperties, { id: id, headerVisible: true })),
|
|
24
|
-
React.createElement("div", { className: "work-schedule-context" },
|
|
25
|
-
React.createElement(
|
|
26
|
-
React.createElement(WorkScheduleTabs, { id: id })))))));
|
|
26
|
+
React.createElement("div", { className: "work-schedule-context" }, frame ? (React.createElement(WorkScheduleTabs, { id: id })) : (React.createElement(AsideContent, { context: asideContext },
|
|
27
|
+
React.createElement(WorkScheduleTabs, { id: id }))))))));
|
|
27
28
|
};
|
|
28
29
|
export default WorkScheduleDefaultView;
|
|
29
30
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/modules/work/work-schedule/pages/WorkScheduleDefaultView/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAC/E,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/modules/work/work-schedule/pages/WorkScheduleDefaultView/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAC/E,OAAO,EAAE,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AACpE,OAAO,EAAE,WAAW,EAAE,MAAM,MAAM,CAAC;AACnC,OAAO,EAAE,QAAQ,EAAE,MAAM,kEAAkE,CAAC;AAC5F,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,YAAY,MAAM,qDAAqD,CAAC;AAC/E,OAAO,WAAW,MAAM,oDAAoD,CAAC;AAC7E,OAAO,sBAAsB,MAAM,yCAAyC,CAAC;AAC7E,OAAO,gBAAgB,MAAM,mCAAmC,CAAC;AACjE,OAAO,MAAM,MAAM,cAAc,CAAC;AAElC,MAAM,uBAAuB,GAAG,GAAG,EAAE;IACpC,MAAM,MAAM,GAAG,SAAS,EAAkB,CAAC;IAC3C,MAAM,EAAE,GAAG,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC;IAE3B,MAAM,KAAK,GAAG,IAAI,YAAY,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC;IAC5C,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;IACzB,MAAM,GAAG,GAAG,UAAU,EAAE,CAAC;IACzB,MAAM,CAAC,YAAY,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,sBAAsB,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,aAAa,EAAE,CAAC,CAAC;IAEjG,SAAS,CAAC,GAAG,EAAE;QACd,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,GAAG,eAAe,CAAC,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,CACpB,oBAAC,cAAc,CAAC,QAAQ,IAAC,KAAK,EAAE,KAAK;QACpC,oBAAC,WAAW,IACX,SAAS,EAAE,MAAM,CAAC,4BAA4B,CAAC,EAC/C,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;YAE/B,oBAAC,WAAW,CAAC,GAAG,IAAC,WAAW;gBAC3B,oBAAC,sBAAsB,IAAC,EAAE,EAAE,EAAE,EAAE,aAAa,SAAG,CAC/B;YAClB,6BAAK,SAAS,EAAC,uBAAuB,IACpC,KAAK,CAAC,CAAC,CAAC,CACR,oBAAC,gBAAgB,IAAC,EAAE,EAAE,EAAE,GAAI,CAC5B,CAAC,CAAC,CAAC,CACH,oBAAC,YAAY,IAAC,OAAO,EAAE,YAAmB;gBACzC,oBAAC,gBAAgB,IAAC,EAAE,EAAE,EAAE,GAAI,CACd,CACf,CACI,CACO,CACW,CAC1B,CAAC,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,uBAAuB,CAAC"}
|
|
@@ -1,22 +1,23 @@
|
|
|
1
1
|
.work-schedule-default-view {
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
2
|
+
:global {
|
|
3
|
+
.main-content-nav {
|
|
4
|
+
width: 370px;
|
|
5
|
+
padding: 0;
|
|
6
|
+
}
|
|
7
7
|
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
8
|
+
.work-schedule-header {
|
|
9
|
+
padding: 10px 0;
|
|
10
|
+
}
|
|
11
11
|
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
12
|
+
.work-schedule-context {
|
|
13
|
+
display: flex;
|
|
14
|
+
padding: 0;
|
|
15
|
+
background: #ffffff;
|
|
16
16
|
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
}
|
|
17
|
+
> div {
|
|
18
|
+
flex: 1;
|
|
19
|
+
width: 100%;
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@voplus/morpho-workspace",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "4.0.0",
|
|
4
4
|
"description": "morpho workspace module",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -34,8 +34,8 @@
|
|
|
34
34
|
"@fullcalendar/interaction": "^5.6.0",
|
|
35
35
|
"@fullcalendar/react": "^5.6.0",
|
|
36
36
|
"@fullcalendar/timegrid": "^5.6.0",
|
|
37
|
-
"@voplus/morpho-collaboration-action": "
|
|
38
|
-
"@voplus/morpho-report": "
|
|
37
|
+
"@voplus/morpho-collaboration-action": "4.x",
|
|
38
|
+
"@voplus/morpho-report": "4.x",
|
|
39
39
|
"react-beautiful-dnd": "^13.1.0",
|
|
40
40
|
"swiper": "^7.0.5",
|
|
41
41
|
"tippy.js": "^5.1.4"
|
|
@@ -43,7 +43,7 @@
|
|
|
43
43
|
"devDependencies": {
|
|
44
44
|
"@types/mockjs": "^1.0.3",
|
|
45
45
|
"@types/react-beautiful-dnd": "^13.0.0",
|
|
46
|
-
"@voplus/morpho-client-test": "
|
|
46
|
+
"@voplus/morpho-client-test": "4.x",
|
|
47
47
|
"@voplus/morpho-build": "4.x",
|
|
48
48
|
"@voplus/morpho-storybook": "4.x",
|
|
49
49
|
"@voplus/morpho-test": "1.x",
|