@voplus/morpho-workspace 1.1.0-dev047 → 1.1.0-dev048
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/changelog.md +7 -0
- package/es/modules/board/components/SubDocumentList/index.js +6 -3
- package/es/modules/board/components/SubDocumentList/index.js.map +1 -1
- package/es/modules/meeting/MeetingRoutes.d.ts +1 -1
- package/es/modules/meeting/MeetingRoutes.js +16 -16
- package/es/modules/meeting/MeetingRoutes.js.map +1 -1
- package/es/modules/meeting/components/MeetingHeader/index.js +9 -9
- package/es/modules/meeting/components/MeetingHeader/index.js.map +1 -1
- package/es/modules/meeting/components/NewMeetingForm/index.d.ts +3 -1
- package/es/modules/meeting/components/NewMeetingForm/index.js +40 -59
- package/es/modules/meeting/components/NewMeetingForm/index.js.map +1 -1
- package/es/modules/meeting/pages/MeetingList/index.js +18 -13
- package/es/modules/meeting/pages/MeetingList/index.js.map +1 -1
- package/es/modules/tasks/components/TaskPropertiesView/index.js +8 -8
- package/es/modules/tasks/components/TaskPropertiesView/index.js.map +1 -1
- package/package.json +10 -10
package/changelog.md
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
|
|
2
|
+
feature: Meeting List 新增Filter Parent Id
|
|
3
|
+
【Fix】Board 起始/documents 请求数量比column数高
|
|
4
|
+
|
|
5
|
+
# 15 Sep 2020
|
|
6
|
+
|
|
7
|
+
【Fix】Board View filter 没有更新内容
|
|
1
8
|
[Improve] improvement：Task 可以只输入开始或结束时间
|
|
2
9
|
[Improve] Calendar 修改滾動條样式
|
|
3
10
|
【Improvement】Board Default View 新增 Tool 打開 Board 的 PropertiesView
|
|
@@ -40,8 +40,11 @@ const SubDocumentList = (props) => {
|
|
|
40
40
|
}, [destination, source]);
|
|
41
41
|
useEffect(() => {
|
|
42
42
|
/** Filters.name */
|
|
43
|
-
|
|
44
|
-
|
|
43
|
+
const name = lists.name || "";
|
|
44
|
+
if (name !== state.name) {
|
|
45
|
+
docList.triggerName(lists.name);
|
|
46
|
+
state.name = lists.name;
|
|
47
|
+
}
|
|
45
48
|
}, [lists.name]);
|
|
46
49
|
useEffect(() => {
|
|
47
50
|
/** sort */
|
|
@@ -54,7 +57,7 @@ const SubDocumentList = (props) => {
|
|
|
54
57
|
const result = filters.length === ((_c = state.filters) === null || _c === void 0 ? void 0 : _c.length) &&
|
|
55
58
|
filters.every((a) => state.filters.some((b) => a.c === b.c && a.v1 === b.v1)) &&
|
|
56
59
|
state.filters.every((_b) => filters.some((_a) => _a.c === _b.c && _a.v1 === _b.v1));
|
|
57
|
-
if (
|
|
60
|
+
if (!result) {
|
|
58
61
|
docList.reset();
|
|
59
62
|
docList.loading = true;
|
|
60
63
|
state.filters = filters;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/board/components/SubDocumentList/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGN,qBAAqB,EACrB,gBAAgB,EAChB,mBAAmB,EACnB,gBAAgB,GAChB,MAAM,8BAA8B,CAAC;AAEtC,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACnD,OAAO,EAAE,KAAK,EAAwB,MAAM,SAAS,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAEvF,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,kBAAkB,MAAM,kDAAkD,CAAC;AAClF,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,MAAM,MAAM,cAAc,CAAC;AAClC,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AAEpE,MAAM,eAAe,GAAG,CAAC,KAA2B,EAAE,EAAE;;IACvD,MAAM,EAAE,GAAG,oBAAoB,EAAE,CAAC;IAElC,MAAM,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC;IACtC,wCAAwC;IACxC,MAAM,IAAI,GAAG,kBAAkB,EAAE,CAAC;IAClC,MAAM,KAAK,GAAG,oBAAoB,EAAE,CAAC;IACrC,MAAM,KAAK,GAAG,gBAAgB,EAAE,CAAC;IACjC,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,EAAE,CAAC;IAC7C,cAAc;IACd,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAEhD;;OAEG;IACH,IAAI,OAAO,GAAmB,EAAE,CAAC;IACjC,gBAAI,IAAI,CAAC,OAAO,0CAAE,OAAO,0CAAE,OAAO,EAAE;QACnC,OAAO,eAAG,IAAI,CAAC,OAAO,0CAAE,OAAO,0CAAE,OAAO,CAAC;KACzC;IACD,IAAI,IAAI,GAAmB,EAAE,CAAC;IAC9B,gBAAI,IAAI,CAAC,OAAO,0CAAE,OAAO,0CAAE,IAAI,EAAE;QAChC,IAAI,eAAG,IAAI,CAAC,OAAO,0CAAE,OAAO,0CAAE,IAAI,CAAC;KACnC;IAED,MAAM,OAAO,GAAG,sBAAsB,CACrC;QACC,cAAc,EAAE,EAAE;KAClB,EACD,CAAC,KAAK,CAAC,EAAE,CAAC,CACV,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACd,IAAI,EAAE,CAAC;IACR,CAAC,EAAE,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC;IAE1B,SAAS,CAAC,GAAG,EAAE;QACd,mBAAmB;QACnB,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,IAAK,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/board/components/SubDocumentList/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import React from "react";
|
|
2
1
|
import { Route, Switch } from "react-router";
|
|
3
2
|
import { BaseRoutes } from "@voplus/morpho-data";
|
|
4
3
|
import MeetingList from "./pages/MeetingList";
|
|
5
4
|
import MeetingPrintView from "./pages/MeetingPrintView";
|
|
6
5
|
import MeetingTabView from "./pages/MeetingTabView";
|
|
6
|
+
import React from "react";
|
|
7
7
|
const MeetingRoutes = () => {
|
|
8
8
|
return (React.createElement(Switch, null,
|
|
9
9
|
React.createElement(Route, { path: Routes.MeetingList.route, exact: true, component: Routes.MeetingList.component }),
|
|
@@ -12,40 +12,40 @@ const MeetingRoutes = () => {
|
|
|
12
12
|
};
|
|
13
13
|
const Routes = {
|
|
14
14
|
MeetingList: {
|
|
15
|
-
route: "/meetings",
|
|
15
|
+
route: "/meetings/:id?",
|
|
16
16
|
tabPattern: RegExp("/meetings"),
|
|
17
|
-
getUrl: () => `/meetings`,
|
|
18
|
-
component: MeetingList
|
|
17
|
+
getUrl: (id) => `/meetings${id ? "/" + id : ""}`,
|
|
18
|
+
component: MeetingList
|
|
19
19
|
},
|
|
20
20
|
Meeting: {
|
|
21
|
-
route: "/
|
|
22
|
-
tabPattern: RegExp("/
|
|
23
|
-
getUrl: (id) => `/
|
|
24
|
-
component: MeetingTabView
|
|
21
|
+
route: "/meeting/:id",
|
|
22
|
+
tabPattern: RegExp("/meeting/[^/]+"),
|
|
23
|
+
getUrl: (id) => `/meeting/${id}`,
|
|
24
|
+
component: MeetingTabView
|
|
25
25
|
},
|
|
26
26
|
MeetingPrint: {
|
|
27
|
-
route: "/
|
|
28
|
-
tabPattern: RegExp("/
|
|
29
|
-
getUrl: (id) => `/
|
|
30
|
-
component: MeetingPrintView
|
|
27
|
+
route: "/meeting/print/:id",
|
|
28
|
+
tabPattern: RegExp("/meeting/[^/]+"),
|
|
29
|
+
getUrl: (id) => `/meeting/print/${id}`,
|
|
30
|
+
component: MeetingPrintView
|
|
31
31
|
},
|
|
32
32
|
addRoutes: () => {
|
|
33
33
|
BaseRoutes.routes.push({
|
|
34
34
|
name: "meeting",
|
|
35
35
|
tabBasePattern: Routes.Meeting.tabPattern,
|
|
36
|
-
component: React.createElement(MeetingRoutes, null)
|
|
36
|
+
component: React.createElement(MeetingRoutes, null)
|
|
37
37
|
});
|
|
38
38
|
BaseRoutes.routes.push({
|
|
39
39
|
name: "meeting-print",
|
|
40
40
|
tabBasePattern: Routes.MeetingPrint.tabPattern,
|
|
41
|
-
component: React.createElement(MeetingRoutes, null)
|
|
41
|
+
component: React.createElement(MeetingRoutes, null)
|
|
42
42
|
});
|
|
43
43
|
BaseRoutes.routes.push({
|
|
44
44
|
name: "meeting-list",
|
|
45
45
|
tabBasePattern: Routes.MeetingList.tabPattern,
|
|
46
|
-
component: React.createElement(MeetingRoutes, null)
|
|
46
|
+
component: React.createElement(MeetingRoutes, null)
|
|
47
47
|
});
|
|
48
|
-
}
|
|
48
|
+
}
|
|
49
49
|
};
|
|
50
50
|
export default Routes;
|
|
51
51
|
//# sourceMappingURL=MeetingRoutes.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MeetingRoutes.js","sourceRoot":"","sources":["../../../src/modules/meeting/MeetingRoutes.tsx"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"MeetingRoutes.js","sourceRoot":"","sources":["../../../src/modules/meeting/MeetingRoutes.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAE7C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,WAAW,MAAM,qBAAqB,CAAC;AAC9C,OAAO,gBAAgB,MAAM,0BAA0B,CAAC;AACxD,OAAO,cAAc,MAAM,wBAAwB,CAAC;AACpD,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,aAAa,GAAG,GAAG,EAAE;IAC1B,OAAO,CACN,oBAAC,MAAM;QACN,oBAAC,KAAK,IACL,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,KAAK,EAC9B,KAAK,EAAE,IAAI,EACX,SAAS,EAAE,MAAM,CAAC,WAAW,CAAC,SAAS,GACtC;QACF,oBAAC,KAAK,IAAC,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,SAAS,GAAI;QACvF,oBAAC,KAAK,IACL,IAAI,EAAE,MAAM,CAAC,YAAY,CAAC,KAAK,EAC/B,KAAK,EAAE,IAAI,EACX,SAAS,EAAE,MAAM,CAAC,YAAY,CAAC,SAAS,GACvC,CACM,CACT,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG;IACd,WAAW,EAAE;QACZ,KAAK,EAAE,gBAAgB;QACvB,UAAU,EAAE,MAAM,CAAC,WAAW,CAAC;QAC/B,MAAM,EAAE,CAAC,EAAW,EAAE,EAAE,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE;QACzD,SAAS,EAAE,WAAW;KACtB;IACD,OAAO,EAAE;QACR,KAAK,EAAE,cAAc;QACrB,UAAU,EAAE,MAAM,CAAC,gBAAgB,CAAC;QACpC,MAAM,EAAE,CAAC,EAAU,EAAE,EAAE,CAAC,YAAY,EAAE,EAAE;QACxC,SAAS,EAAE,cAAc;KACzB;IACD,YAAY,EAAE;QACb,KAAK,EAAE,oBAAoB;QAC3B,UAAU,EAAE,MAAM,CAAC,gBAAgB,CAAC;QACpC,MAAM,EAAE,CAAC,EAAU,EAAE,EAAE,CAAC,kBAAkB,EAAE,EAAE;QAC9C,SAAS,EAAE,gBAAgB;KAC3B;IAED,SAAS,EAAE,GAAG,EAAE;QACf,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC;YACtB,IAAI,EAAE,SAAS;YACf,cAAc,EAAE,MAAM,CAAC,OAAO,CAAC,UAAU;YACzC,SAAS,EAAE,oBAAC,aAAa,OAAG;SAC5B,CAAC,CAAC;QACH,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC;YACtB,IAAI,EAAE,eAAe;YACrB,cAAc,EAAE,MAAM,CAAC,YAAY,CAAC,UAAU;YAC9C,SAAS,EAAE,oBAAC,aAAa,OAAG;SAC5B,CAAC,CAAC;QACH,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC;YACtB,IAAI,EAAE,cAAc;YACpB,cAAc,EAAE,MAAM,CAAC,WAAW,CAAC,UAAU;YAC7C,SAAS,EAAE,oBAAC,aAAa,OAAG;SAC5B,CAAC,CAAC;IACJ,CAAC;CACD,CAAC;AAEF,eAAe,MAAM,CAAC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import "./index.less";
|
|
2
|
-
import { Archive, Open, Print, Reload, Sidebar
|
|
3
|
-
import { CommentDataIcon, DocumentDataIcon, UserQuickIcon
|
|
2
|
+
import { Archive, Open, Print, Reload, Sidebar } from "@voplus/morpho-document/es/controls/ToolBar/buttons";
|
|
3
|
+
import { CommentDataIcon, DocumentDataIcon, UserQuickIcon } from "@voplus/morpho-document/es/controls/data-icons";
|
|
4
4
|
import { DatePicker, Row, Skeleton, Tooltip } from "@voplus/antd";
|
|
5
5
|
import { InlineEdit } from "@voplus/morpho-ui";
|
|
6
6
|
import React, { useState } from "react";
|
|
7
|
-
import { faClock, faMapMarkerAlt, faStopwatch, faUserFriends
|
|
7
|
+
import { faClock, faMapMarkerAlt, faStopwatch, faUserFriends } from "@fortawesome/pro-light-svg-icons";
|
|
8
8
|
import { localFormat, toLocal } from "../../../../data/contexts/StoreContext";
|
|
9
9
|
import { useMeeting, useMeetingStore } from "../../../../data/meeting";
|
|
10
10
|
import AvatarList from "@voplus/morpho-document/es/components/AvatarList";
|
|
@@ -24,11 +24,11 @@ const MeetingHeader = (props) => {
|
|
|
24
24
|
React.createElement(DocumentHeader, { id: id, size: "h3", autoSaveName: true, quickDataBarAlign: "left", clickNameEffect: "edit", statusVisible: false, flagVisible: false, tagsVisible: false, style: { padding: "0" }, quickDataBar: React.createElement(React.Fragment, null,
|
|
25
25
|
React.createElement(DocumentDataIcon, { id: id, includes: "tags,task-number-reports" }),
|
|
26
26
|
React.createElement(CommentDataIcon, { id: id }),
|
|
27
|
-
React.createElement(UserQuickIcon, { id: id })), tools: React.createElement(ToolBar, { id: id },
|
|
27
|
+
React.createElement(UserQuickIcon, { id: id })), tools: React.createElement(ToolBar, { id: id, menuProps: { closeAside: true } },
|
|
28
28
|
React.createElement(Reload, { action: onReLoad }),
|
|
29
|
-
onExpand ? React.createElement(Sidebar, { action: onExpand }) : React.createElement(Open, { url: `/
|
|
29
|
+
onExpand ? React.createElement(Sidebar, { action: onExpand }) : React.createElement(Open, { url: `/meeting/${id}` }),
|
|
30
30
|
React.createElement(Archive, null),
|
|
31
|
-
React.createElement(Print, { url: `
|
|
31
|
+
React.createElement(Print, { url: `meeting/print/${id}` })) }),
|
|
32
32
|
editable && !readonly ? (React.createElement("div", { style: { padding: "5px 0" } },
|
|
33
33
|
React.createElement(DatePicker.RangePicker, { autoFocus: true, showTime: { format: "HH:mm" }, format: "YYYY-MM-DD HH:mm", value: [toLocal(meeting.startTime), toLocal(meeting.endTime)], open: open, onChange: onChangeDate, onOpenChange: onOpenChange }))) : (React.createElement("div", null,
|
|
34
34
|
React.createElement(Tooltip, { title: meeting.startTime
|
|
@@ -48,9 +48,9 @@ const MeetingHeader = (props) => {
|
|
|
48
48
|
moment(meeting.startTime).from(moment(meeting.endTime), true))))),
|
|
49
49
|
React.createElement(Row, { justify: "start", align: "middle" },
|
|
50
50
|
React.createElement("div", { className: "meeting-clock" },
|
|
51
|
-
React.createElement(InlineEdit, { editable: !readonly, defaultValue: meeting.venue || "", content:
|
|
51
|
+
React.createElement(InlineEdit, { editable: !readonly, defaultValue: meeting.venue || "", content: v => (React.createElement(React.Fragment, null,
|
|
52
52
|
React.createElement(FAIcon, { icon: faMapMarkerAlt }),
|
|
53
|
-
v.store.value || "Venue")), onSave:
|
|
53
|
+
v.store.value || "Venue")), onSave: value => onSave(value, meeting.venue || "", { Venue: value }) })),
|
|
54
54
|
React.createElement(FAIcon, { icon: faUserFriends, flip: "horizontal", color: "#666", size: "sm", className: "margin-right-5" }),
|
|
55
55
|
React.createElement(AvatarList, { list: meeting.members || [], editable: !readonly, onChange: onChangeMember })))))));
|
|
56
56
|
async function onChangeMember(ids) {
|
|
@@ -64,7 +64,7 @@ const MeetingHeader = (props) => {
|
|
|
64
64
|
async function onOk(dates) {
|
|
65
65
|
await meetingStore.edit(meeting.id, {
|
|
66
66
|
StartTime: new Date(dates[0]),
|
|
67
|
-
EndTime: new Date(dates[1])
|
|
67
|
+
EndTime: new Date(dates[1])
|
|
68
68
|
});
|
|
69
69
|
}
|
|
70
70
|
function onChangeDate(value, dateString) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/meeting/components/MeetingHeader/index.tsx"],"names":[],"mappings":"AAAA,OAAO,cAAc,CAAC;AAEtB,OAAO,EACN,OAAO,EACP,IAAI,EACJ,KAAK,EACL,MAAM,EACN,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/meeting/components/MeetingHeader/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ import { useAsideContentContext } from "@voplus/morpho-ui/es/components/layout/A
|
|
|
12
12
|
import { useMeetingStore } from "../../../../data/meeting";
|
|
13
13
|
import { useObserver } from "mobx-react-lite";
|
|
14
14
|
const { TextArea } = Input;
|
|
15
|
-
const NewMeetingForm = () => {
|
|
15
|
+
const NewMeetingForm = (props) => {
|
|
16
16
|
const Params = {
|
|
17
17
|
Name: "",
|
|
18
18
|
Description: "",
|
|
@@ -21,74 +21,22 @@ const NewMeetingForm = () => {
|
|
|
21
21
|
Venue: "",
|
|
22
22
|
Url: "",
|
|
23
23
|
MemberIds: [],
|
|
24
|
-
Agendas: []
|
|
24
|
+
Agendas: []
|
|
25
25
|
};
|
|
26
26
|
const meetings = useMeetingStore();
|
|
27
27
|
const [state] = useState(new State());
|
|
28
28
|
const asideContext = useAsideContentContext();
|
|
29
|
-
const disabledStartTime = (StartTime) => {
|
|
30
|
-
const { EndTime } = state.params;
|
|
31
|
-
if (!StartTime || !EndTime) {
|
|
32
|
-
return false;
|
|
33
|
-
}
|
|
34
|
-
return +moment(StartTime) > +moment(EndTime);
|
|
35
|
-
};
|
|
36
|
-
const disabledEndTime = (EndTime) => {
|
|
37
|
-
const { StartTime } = state.params;
|
|
38
|
-
if (!EndTime || !StartTime) {
|
|
39
|
-
return false;
|
|
40
|
-
}
|
|
41
|
-
return +moment(EndTime) <= +moment(StartTime);
|
|
42
|
-
};
|
|
43
|
-
// 不可选hour
|
|
44
|
-
const hours = Array.from(new Array(24).keys());
|
|
45
|
-
const disabledHours = (value, type) => {
|
|
46
|
-
const { StartTime, EndTime } = state.params;
|
|
47
|
-
if (!value || +moment(EndTime).startOf("day") > +moment(StartTime).startOf("day"))
|
|
48
|
-
return [];
|
|
49
|
-
const hour = moment(value).get("hour");
|
|
50
|
-
return hours.filter((h) => (type === "EndTime" ? h <= hour : h > hour));
|
|
51
|
-
};
|
|
52
|
-
// 不可选minute
|
|
53
|
-
const minutes = Array.from(new Array(60).keys());
|
|
54
|
-
const disabledMinutes = (value, type) => {
|
|
55
|
-
const { StartTime, EndTime } = state.params;
|
|
56
|
-
if (moment(EndTime).get("hour") === moment(StartTime).get("hour")) {
|
|
57
|
-
const minute = moment(value).get("minute");
|
|
58
|
-
return minutes.filter((m) => (type === "EndTime" ? m <= minute : m > minute));
|
|
59
|
-
}
|
|
60
|
-
return [];
|
|
61
|
-
};
|
|
62
|
-
const onChangeAgenda = (params) => {
|
|
63
|
-
state.params.Agendas = params;
|
|
64
|
-
};
|
|
65
|
-
const changeAllDay = (e) => {
|
|
66
|
-
state.allDay = e.target.checked;
|
|
67
|
-
state.params.StartTime = state.allDay ? moment().startOf("day") : "";
|
|
68
|
-
state.params.EndTime = state.allDay ? moment().endOf("day") : "";
|
|
69
|
-
};
|
|
70
29
|
const agendaRef = createRef();
|
|
71
|
-
const onSubmit = async () => {
|
|
72
|
-
if (!state.params.Name)
|
|
73
|
-
return message.warning("Title is required");
|
|
74
|
-
state.loading = true;
|
|
75
|
-
const res = await meetings.create(state.params);
|
|
76
|
-
state.loading = false;
|
|
77
|
-
asideContext.openAside(React.createElement(MeetingPropertiesView, { id: res.id }), { span: 12 });
|
|
78
|
-
state.params = Params;
|
|
79
|
-
if (agendaRef.current)
|
|
80
|
-
agendaRef.current.clear();
|
|
81
|
-
};
|
|
82
30
|
return useObserver(() => (React.createElement(Form, { layout: "vertical", className: styles["new-meeting-form"] },
|
|
83
31
|
React.createElement(Form.Item, { label: "Title for your meeting" },
|
|
84
|
-
React.createElement(Input, { autoFocus: true, value: state.params.Name, onChange:
|
|
32
|
+
React.createElement(Input, { autoFocus: true, value: state.params.Name, onChange: e => (state.params.Name = e.target.value) })),
|
|
85
33
|
React.createElement(Form.Item, { label: "Description or objectives of you meeting" },
|
|
86
|
-
React.createElement(TextArea, { value: state.params.Description, rows: 2, onChange:
|
|
34
|
+
React.createElement(TextArea, { value: state.params.Description, rows: 2, onChange: e => (state.params.Description = e.target.value) })),
|
|
87
35
|
React.createElement(Form.Item, { label: "" },
|
|
88
36
|
React.createElement(Row, null,
|
|
89
37
|
React.createElement(Col, { span: 16 },
|
|
90
38
|
React.createElement("span", { className: "date-title" }, "Start"),
|
|
91
|
-
React.createElement(DatePicker, { showTime: { format: "HH:mm" }, format: "YYYY-MM-DD HH:mm", placeholder: "StartTime", disabledDate: disabledStartTime, value: state.params.StartTime, onChange:
|
|
39
|
+
React.createElement(DatePicker, { showTime: { format: "HH:mm" }, format: "YYYY-MM-DD HH:mm", placeholder: "StartTime", disabledDate: disabledStartTime, value: state.params.StartTime, onChange: value => (state.params.StartTime = value) })),
|
|
92
40
|
React.createElement(Col, { span: 8 },
|
|
93
41
|
React.createElement(Row, { justify: "start", align: "middle" },
|
|
94
42
|
React.createElement(FAIcon, { icon: faClock, className: "margin-right-10" }),
|
|
@@ -97,7 +45,7 @@ const NewMeetingForm = () => {
|
|
|
97
45
|
React.createElement(Row, null,
|
|
98
46
|
React.createElement(Col, { span: 16 },
|
|
99
47
|
React.createElement("span", { className: "date-title" }, "End"),
|
|
100
|
-
React.createElement(DatePicker, { showTime: { format: "HH:mm" }, format: "YYYY-MM-DD HH:mm", placeholder: "EndTime", disabledDate: disabledEndTime, value: state.params.EndTime, onChange:
|
|
48
|
+
React.createElement(DatePicker, { showTime: { format: "HH:mm" }, format: "YYYY-MM-DD HH:mm", placeholder: "EndTime", disabledDate: disabledEndTime, value: state.params.EndTime, onChange: value => (state.params.EndTime = value) })),
|
|
101
49
|
React.createElement(Col, { span: 8 },
|
|
102
50
|
React.createElement(Row, { justify: "start", align: "middle" },
|
|
103
51
|
React.createElement(FAIcon, { icon: faClock, className: "margin-right-10" }),
|
|
@@ -109,7 +57,7 @@ const NewMeetingForm = () => {
|
|
|
109
57
|
React.createElement(FAIcon, { icon: faUserFriends, className: "margin-right-10" }),
|
|
110
58
|
React.createElement(AvatarList, { multiple: true, onChange: onChangMember })),
|
|
111
59
|
React.createElement(Form.Item, { label: "Enter Place" },
|
|
112
|
-
React.createElement(Input, { prefix: React.createElement(FAIcon, { icon: faMapMarkerAlt }), value: state.params.Venue, onChange:
|
|
60
|
+
React.createElement(Input, { prefix: React.createElement(FAIcon, { icon: faMapMarkerAlt }), value: state.params.Venue, onChange: e => (state.params.Venue = e.target.value) })),
|
|
113
61
|
React.createElement(Form.Item, { label: "Agenda" },
|
|
114
62
|
React.createElement(AgendaNewForm, { ref: agendaRef, addOnly: true, onChange: onChangeAgenda })),
|
|
115
63
|
React.createElement(Form.Item, null,
|
|
@@ -119,6 +67,39 @@ const NewMeetingForm = () => {
|
|
|
119
67
|
function onChangMember(ids) {
|
|
120
68
|
state.params.MemberIds = ids;
|
|
121
69
|
}
|
|
70
|
+
function disabledStartTime(StartTime) {
|
|
71
|
+
const { EndTime } = state.params;
|
|
72
|
+
if (!StartTime || !EndTime) {
|
|
73
|
+
return false;
|
|
74
|
+
}
|
|
75
|
+
return +moment(StartTime) > +moment(EndTime);
|
|
76
|
+
}
|
|
77
|
+
function disabledEndTime(EndTime) {
|
|
78
|
+
const { StartTime } = state.params;
|
|
79
|
+
if (!EndTime || !StartTime) {
|
|
80
|
+
return false;
|
|
81
|
+
}
|
|
82
|
+
return +moment(EndTime) <= +moment(StartTime);
|
|
83
|
+
}
|
|
84
|
+
function onChangeAgenda(params) {
|
|
85
|
+
state.params.Agendas = params;
|
|
86
|
+
}
|
|
87
|
+
function changeAllDay(e) {
|
|
88
|
+
state.allDay = e.target.checked;
|
|
89
|
+
state.params.StartTime = state.allDay ? moment().startOf("day") : "";
|
|
90
|
+
state.params.EndTime = state.allDay ? moment().endOf("day") : "";
|
|
91
|
+
}
|
|
92
|
+
async function onSubmit() {
|
|
93
|
+
if (!state.params.Name)
|
|
94
|
+
return message.warning("Title is required");
|
|
95
|
+
state.loading = true;
|
|
96
|
+
const res = await meetings.create({ ...state.params, ParentId: props.parentId });
|
|
97
|
+
state.loading = false;
|
|
98
|
+
asideContext.openAside(React.createElement(MeetingPropertiesView, { id: res.id }), { span: 12 });
|
|
99
|
+
state.params = Params;
|
|
100
|
+
if (agendaRef.current)
|
|
101
|
+
agendaRef.current.clear();
|
|
102
|
+
}
|
|
122
103
|
};
|
|
123
104
|
export default NewMeetingForm;
|
|
124
105
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/meeting/components/NewMeetingForm/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACpG,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AAE1F,OAAO,aAAa,MAAM,6BAA6B,CAAC;AACxD,OAAO,UAAU,MAAM,kDAAkD,CAAC;AAC1E,OAAO,EAAE,eAAe,IAAI,MAAM,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,qBAAqB,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,MAAM,MAAM,cAAc,CAAC;AAClC,OAAO,EAAE,sBAAsB,EAAE,MAAM,qDAAqD,CAAC;AAC7F,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;AAE3B,MAAM,cAAc,GAAG,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/meeting/components/NewMeetingForm/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,39 +1,44 @@
|
|
|
1
1
|
import { AssigneeViewFilter, DueDateFilter, StartDateFilter } from "../../../../controls/filters";
|
|
2
2
|
import { ListDataContext, useCreateListDataState } from "@voplus/morpho-ui/es/data";
|
|
3
|
-
import React from "react";
|
|
3
|
+
import React, { useContext, useEffect } from "react";
|
|
4
|
+
import { __RouterContext } from "react-router";
|
|
5
|
+
import { useAutoUpdateListData, useDocument } from "@voplus/morpho-document-core";
|
|
4
6
|
import ListView from "@voplus/morpho-ui/es/components/layout/ListView/ListView2";
|
|
5
7
|
import MeetingItem from "../../components/MeetingItem";
|
|
6
8
|
import MeetingPropertiesView from "../../components/MeetingPropertiesView";
|
|
7
9
|
import NewMeetingForm from "../../components/NewMeetingForm";
|
|
8
|
-
import { useAutoUpdateListData } from "@voplus/morpho-document-core";
|
|
9
10
|
import { useMeetingListEffect } from "../../../../data/meeting";
|
|
10
11
|
import { useObserver } from "mobx-react-lite";
|
|
11
12
|
import { useRenderOnChange } from "@voplus/morpho-ui";
|
|
12
13
|
import { useTabItem } from "@voplus/morpho-data";
|
|
13
14
|
const MeetingList = (props) => {
|
|
15
|
+
const { match } = useContext(__RouterContext);
|
|
16
|
+
const id = props.parentId || match.params.id;
|
|
17
|
+
console.log(match, id, "MeetingList");
|
|
14
18
|
const tab = useTabItem();
|
|
15
|
-
|
|
19
|
+
const document = useDocument(id);
|
|
16
20
|
const list = useCreateListDataState({
|
|
17
21
|
filterDefaults: {
|
|
18
22
|
includes: "tags,task-number-reports",
|
|
19
|
-
filters:
|
|
20
|
-
|
|
21
|
-
: [],
|
|
22
|
-
},
|
|
23
|
+
filters: id ? [{ c: "ParentNodeId", o: "=", l: "And", v1: id }] : []
|
|
24
|
+
}
|
|
23
25
|
}, []);
|
|
24
|
-
useAutoUpdateListData(list,
|
|
26
|
+
useAutoUpdateListData(list, d => d.type === "Meeting");
|
|
25
27
|
useRenderOnChange(() => list.filters.options);
|
|
26
|
-
useMeetingListEffect(list,
|
|
28
|
+
useMeetingListEffect(list, result => list.union(result), list.filters.options);
|
|
29
|
+
useEffect(() => {
|
|
30
|
+
tab.title = id ? document.name : "Meetings";
|
|
31
|
+
}, [id]);
|
|
27
32
|
return useObserver(() => (React.createElement(ListDataContext.Provider, { value: list },
|
|
28
33
|
React.createElement(ListView, { headerProps: {
|
|
29
34
|
filterViewProps: {
|
|
30
35
|
columns: [
|
|
31
36
|
React.createElement(AssigneeViewFilter, { key: "AssigneeViewFilter" }),
|
|
32
37
|
React.createElement(StartDateFilter, { key: "StartDateFilter" }),
|
|
33
|
-
React.createElement(DueDateFilter, { key: "DueDateFilter" })
|
|
34
|
-
]
|
|
35
|
-
}
|
|
36
|
-
}, formViewTitle: "Add Meeting", formView: React.createElement(NewMeetingForm,
|
|
38
|
+
React.createElement(DueDateFilter, { key: "DueDateFilter" })
|
|
39
|
+
]
|
|
40
|
+
}
|
|
41
|
+
}, formViewTitle: "Add Meeting", formView: React.createElement(NewMeetingForm, { parentId: id }), propertiesView: (id) => React.createElement(MeetingPropertiesView, { id: id }), renderItem: ({ item }) => React.createElement(MeetingItem, { id: item.id }) }))));
|
|
37
42
|
};
|
|
38
43
|
export default MeetingList;
|
|
39
44
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/meeting/pages/MeetingList/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAClG,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AACpF,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/meeting/pages/MeetingList/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import "./index.less";
|
|
2
2
|
import { Archive, Open, Reload } from "@voplus/morpho-document/es/controls/ToolBar/buttons";
|
|
3
|
-
import { CommentDataIcon, DocumentDataIcon, UserQuickIcon
|
|
3
|
+
import { CommentDataIcon, DocumentDataIcon, UserQuickIcon } from "@voplus/morpho-document/es/controls/data-icons";
|
|
4
4
|
import React, { useState } from "react";
|
|
5
5
|
import { useTask, useTaskStore } from "../../../../data/task";
|
|
6
6
|
import AvatarList from "@voplus/morpho-document/es/components/AvatarList";
|
|
@@ -32,18 +32,18 @@ const TaskPropertiesView = (props) => {
|
|
|
32
32
|
React.createElement(AvatarList, { editable: !task.readonly, multiple: true, list: [
|
|
33
33
|
...(task.members || []),
|
|
34
34
|
...(task.childMembers || [])
|
|
35
|
-
.filter(
|
|
36
|
-
.map(
|
|
35
|
+
.filter(item => !(task.members || []).some(member => member.id === item.id))
|
|
36
|
+
.map(item => ({
|
|
37
37
|
...item,
|
|
38
|
-
disabled: true
|
|
39
|
-
}))
|
|
40
|
-
], onChange:
|
|
38
|
+
disabled: true
|
|
39
|
+
}))
|
|
40
|
+
], onChange: ids => taskStore.edit(id, { MemberIds: ids }) })), tools: React.createElement("div", { className: "tools-bar" },
|
|
41
41
|
React.createElement("div", null,
|
|
42
|
-
React.createElement(ToolBar, { id: id },
|
|
42
|
+
React.createElement(ToolBar, { id: id, menuProps: { closeAside: true } },
|
|
43
43
|
React.createElement(Reload, { action: onReload }),
|
|
44
44
|
React.createElement(Open, { url: `/tasks/${id}` }),
|
|
45
45
|
React.createElement(Archive, null))),
|
|
46
|
-
React.createElement(DocumentStatusLabel, { status: task.taskStatus, editable: task.taskStatus !== "NotAssigned" || !task.readonly, onChange:
|
|
46
|
+
React.createElement(DocumentStatusLabel, { status: task.taskStatus, editable: task.taskStatus !== "NotAssigned" || !task.readonly, onChange: TaskStatus => taskStore.edit(id, { TaskStatus }), className: "margin-top-10" })), descriptionVisible: false }),
|
|
47
47
|
React.createElement(DocumentTabs, { id: id, exclude: ["Task"], details: React.createElement("div", { className: "task-properties-view" },
|
|
48
48
|
task.loading ? (React.createElement("div", { className: "task-description" },
|
|
49
49
|
React.createElement(Skeleton, { active: true }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/tasks/components/TaskPropertiesView/index.tsx"],"names":[],"mappings":"AAAA,OAAO,cAAc,CAAC;AAEtB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,qDAAqD,CAAC;AAC5F,OAAO,EACN,eAAe,EACf,gBAAgB,EAChB,aAAa,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/tasks/components/TaskPropertiesView/index.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@voplus/morpho-workspace",
|
|
3
|
-
"version": "1.1.0-
|
|
3
|
+
"version": "1.1.0-dev048",
|
|
4
4
|
"description": "morpho workspace module",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -39,14 +39,14 @@
|
|
|
39
39
|
"@voplus/morpho-collaboration": "^1.0.0-dev030",
|
|
40
40
|
"@voplus/morpho-collaboration-action": "^1.0.0-dev003",
|
|
41
41
|
"@voplus/morpho-config": "^1.0.0-dev61",
|
|
42
|
-
"@voplus/morpho-data": "^1.0.0-
|
|
43
|
-
"@voplus/morpho-document": "^1.0.0-
|
|
42
|
+
"@voplus/morpho-data": "^1.0.0-dev129",
|
|
43
|
+
"@voplus/morpho-document": "^1.0.0-dev318",
|
|
44
44
|
"@voplus/morpho-document-core": "^1.0.0-dev021",
|
|
45
45
|
"@voplus/morpho-form": "^1.0.0-dev004",
|
|
46
|
-
"@voplus/morpho-org": "^1.0.0-
|
|
46
|
+
"@voplus/morpho-org": "^1.0.0-dev043",
|
|
47
47
|
"@voplus/morpho-report": "^1.0.0-dev012",
|
|
48
48
|
"@voplus/morpho-text": "^1.0.0-dev084",
|
|
49
|
-
"@voplus/morpho-ui": "^1.0.0-
|
|
49
|
+
"@voplus/morpho-ui": "^1.0.0-dev163",
|
|
50
50
|
"mockjs": "^1.1.0",
|
|
51
51
|
"typemoq": "^2.1.0"
|
|
52
52
|
},
|
|
@@ -56,11 +56,11 @@
|
|
|
56
56
|
"@voplus/morpho-report": "*"
|
|
57
57
|
},
|
|
58
58
|
"dependencies": {
|
|
59
|
-
"@fullcalendar/core": "^5.
|
|
60
|
-
"@fullcalendar/daygrid": "^5.
|
|
61
|
-
"@fullcalendar/interaction": "^5.
|
|
62
|
-
"@fullcalendar/react": "^5.
|
|
63
|
-
"@fullcalendar/timegrid": "^5.
|
|
59
|
+
"@fullcalendar/core": "^5.5.0",
|
|
60
|
+
"@fullcalendar/daygrid": "^5.5.0",
|
|
61
|
+
"@fullcalendar/interaction": "^5.5.0",
|
|
62
|
+
"@fullcalendar/react": "^5.5.0",
|
|
63
|
+
"@fullcalendar/timegrid": "^5.5.0",
|
|
64
64
|
"object-hash": "^2.0.3",
|
|
65
65
|
"react-beautiful-dnd": "^12.2.0",
|
|
66
66
|
"tippy.js": "^5.1.4"
|