@voplus/morpho-workspace 1.0.0-dev36 → 1.0.0-dev38
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/components/AvatarList/index.d.ts +2 -0
- package/es/components/AvatarList/index.js +19 -22
- package/es/components/AvatarList/index.js.map +1 -1
- package/es/components/PageListView/index.d.ts +21 -0
- package/es/components/PageListView/index.js +97 -0
- package/es/components/PageListView/index.js.map +1 -0
- package/es/components/PageListView/index.less +68 -0
- package/es/components/PageListView/state.d.ts +12 -0
- package/es/components/PageListView/state.js +48 -0
- package/es/components/PageListView/state.js.map +1 -0
- package/es/controls/FlagIcon/index.d.ts +16 -0
- package/es/controls/FlagIcon/index.js +42 -0
- package/es/controls/FlagIcon/index.js.map +1 -0
- package/es/controls/FlagIcon/index.less +17 -0
- package/es/data/meeting/AgendaStore.d.ts +3 -0
- package/es/data/meeting/AgendaStore.js +12 -0
- package/es/data/meeting/AgendaStore.js.map +1 -1
- package/es/data/task/TaskStore.d.ts +1 -1
- package/es/data/task/TaskStore.js +2 -1
- package/es/data/task/TaskStore.js.map +1 -1
- package/es/modules/meeting/components/AgendaList/AgendaItem/components/TaskItem/index.js +18 -17
- package/es/modules/meeting/components/AgendaList/AgendaItem/components/TaskItem/index.js.map +1 -1
- package/es/modules/meeting/components/AgendaList/AgendaItem/components/TaskItem/index.less +15 -17
- package/es/modules/meeting/components/AgendaList/AgendaItem/components/TaskList/index.js +18 -14
- package/es/modules/meeting/components/AgendaList/AgendaItem/components/TaskList/index.js.map +1 -1
- package/es/modules/meeting/components/AgendaList/AgendaItem/components/TaskList/state.d.ts +4 -2
- package/es/modules/meeting/components/AgendaList/AgendaItem/components/TaskList/state.js +17 -7
- package/es/modules/meeting/components/AgendaList/AgendaItem/components/TaskList/state.js.map +1 -1
- package/es/modules/meeting/components/AgendaList/AgendaItem/index.d.ts +2 -0
- package/es/modules/meeting/components/AgendaList/AgendaItem/index.js +70 -23
- package/es/modules/meeting/components/AgendaList/AgendaItem/index.js.map +1 -1
- package/es/modules/meeting/components/AgendaList/AgendaItem/index.less +82 -23
- package/es/modules/meeting/components/AgendaList/AgendaItem/state.d.ts +4 -0
- package/es/modules/meeting/components/AgendaList/AgendaItem/state.js +16 -0
- package/es/modules/meeting/components/AgendaList/AgendaItem/state.js.map +1 -1
- package/es/modules/meeting/components/AgendaList/AgendaNewForm/index.js +1 -1
- package/es/modules/meeting/components/AgendaList/AgendaNewForm/index.js.map +1 -1
- package/es/modules/meeting/components/AgendaList/index.js +12 -10
- package/es/modules/meeting/components/AgendaList/index.js.map +1 -1
- package/es/modules/meeting/components/AgendaList/index.less +5 -2
- package/es/modules/meeting/components/AgendaList/state.d.ts +7 -0
- package/es/modules/meeting/components/AgendaList/state.js +23 -1
- package/es/modules/meeting/components/AgendaList/state.js.map +1 -1
- package/es/modules/meeting/components/MeetingDetail/index.js +19 -5
- package/es/modules/meeting/components/MeetingDetail/index.js.map +1 -1
- package/es/modules/meeting/components/MeetingItem/index.js +6 -10
- package/es/modules/meeting/components/MeetingItem/index.js.map +1 -1
- package/es/modules/meeting/components/MeetingList/index.js +3 -0
- package/es/modules/meeting/components/MeetingList/index.js.map +1 -1
- package/es/modules/meeting/pages/MeetingTabView/index.js +10 -2
- package/es/modules/meeting/pages/MeetingTabView/index.js.map +1 -1
- package/es/modules/tasks/components/SubTaskList/index.js +8 -56
- package/es/modules/tasks/components/SubTaskList/index.js.map +1 -1
- package/es/modules/tasks/components/SubTaskList/state.d.ts +1 -1
- package/es/modules/tasks/components/SubTaskList/state.js +4 -4
- package/es/modules/tasks/components/SubTaskList/state.js.map +1 -1
- package/es/modules/tasks/components/TaskDetail/index.js +4 -7
- package/es/modules/tasks/components/TaskDetail/index.js.map +1 -1
- package/es/modules/tasks/components/TaskItem/TaskItem.js +22 -25
- package/es/modules/tasks/components/TaskItem/TaskItem.js.map +1 -1
- package/es/modules/tasks/components/TaskItem/index.less +11 -16
- package/es/modules/tasks/pages/TaskDefaultView/index.js +2 -3
- package/es/modules/tasks/pages/TaskDefaultView/index.js.map +1 -1
- package/es/modules/tasks/pages/TaskTabView/index.js +2 -3
- package/es/modules/tasks/pages/TaskTabView/index.js.map +1 -1
- package/package.json +6 -6
- package/es/controls/StarIcon/index.d.ts +0 -9
- package/es/controls/StarIcon/index.js +0 -14
- package/es/controls/StarIcon/index.js.map +0 -1
- package/es/controls/StarIcon/index.less +0 -8
@@ -1,9 +1,8 @@
|
|
1
1
|
import classnames from "classnames";
|
2
|
-
import React, { useEffect, useState } from "react";
|
3
|
-
import
|
4
|
-
import { FontAwesomeIcon as FAIcon } from "@fortawesome/react-fontawesome";
|
5
|
-
import PageListView from "@voplus/morpho-ui/es/controls/PageListView";
|
2
|
+
import React, { useEffect, useRef, useState } from "react";
|
3
|
+
// import PageListView from "@voplus/morpho-ui/es/controls/PageListView";
|
6
4
|
import SortDnD from "@voplus/morpho-ui/es/controls/SortDnD";
|
5
|
+
import PageListView from "../../../../components/PageListView";
|
7
6
|
import AgendaItem from "./AgendaItem";
|
8
7
|
import AgendaNewForm from "./AgendaNewForm";
|
9
8
|
import { useObserver } from "mobx-react-lite";
|
@@ -25,7 +24,11 @@ const AgendaList = (props) => {
|
|
25
24
|
Page: { Page: state.page, PageSize: 20 }
|
26
25
|
});
|
27
26
|
useEffect(() => {
|
27
|
+
state.page = 1;
|
28
|
+
state.list = [];
|
28
29
|
state.loading = true;
|
30
|
+
state.addAble = false;
|
31
|
+
// ref.current!.reset();
|
29
32
|
}, [props.parentId]);
|
30
33
|
const loadData = async () => {
|
31
34
|
state.loading = true;
|
@@ -35,13 +38,12 @@ const AgendaList = (props) => {
|
|
35
38
|
await taskStore.moveAfter(id, afterId);
|
36
39
|
state.list = list;
|
37
40
|
};
|
41
|
+
const onDelete = async (ids) => {
|
42
|
+
await agendaStore.delete(ids, { DeleteChilds: true });
|
43
|
+
};
|
44
|
+
const ref = useRef();
|
38
45
|
return useObserver(() => (React.createElement("div", { className: classnames("agenda-list", props.className) },
|
39
|
-
React.createElement("
|
40
|
-
React.createElement("div", null, "Agenda"),
|
41
|
-
React.createElement("div", { className: "operate-icon" },
|
42
|
-
React.createElement("span", { className: "plus-icon", onClick: () => (state.addAble = !state.addAble) },
|
43
|
-
React.createElement(FAIcon, { icon: faPlus, color: "#fff" })))),
|
44
|
-
React.createElement(PageListView, { data: state.list, loading: state.loading, loadMore: loadData }, (list) => (React.createElement(SortDnD, { list: list, text: (item, index, connectDragSource) => (React.createElement(AgendaItem, { key: item.id, id: item.id, index: index, connectDragSource: connectDragSource })), moveAfter: moveAfter }))),
|
46
|
+
React.createElement(PageListView, { ref: ref, header: true, title: "Agenda", data: state.list, loading: state.loading, loadMore: loadData, onDelete: onDelete, addAble: true, onAdd: () => (state.addAble = true) }, (list, multiple) => (React.createElement(SortDnD, { list: list, moveAfter: moveAfter, text: (item, index, connectDragSource) => (React.createElement(AgendaItem, { key: item.id, id: item.id, index: index, multiple: multiple, readonly: !!props.readonly, connectDragSource: connectDragSource })) }))),
|
45
47
|
state.addAble && (React.createElement(AgendaNewForm, { id: props.parentId, single: true, onCancel: () => (state.addAble = false) })))));
|
46
48
|
};
|
47
49
|
export default AgendaList;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/meeting/components/AgendaList/index.tsx"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/meeting/components/AgendaList/index.tsx"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAI3D,yEAAyE;AACzE,OAAO,OAAO,MAAM,uCAAuC,CAAC;AAC5D,OAAO,YAAY,MAAM,qCAAqC,CAAC;AAC/D,OAAO,UAAU,MAAM,cAAc,CAAC;AACtC,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAE5C,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC/E,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACrD,OAAO,cAAc,CAAC;AACtB,OAAO,EAAmB,KAAK,EAAE,MAAM,SAAS,CAAC;AAEjD,MAAM,UAAU,GAAG,CAAC,KAAsB,EAAE,EAAE;IAC7C,MAAM,SAAS,GAAG,YAAY,EAAE,CAAC;IACjC,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IACrC,MAAM,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,IAAI,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC;IACjD,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC;IAEpB,SAAS,CAAC,KAAK,CAAC,+BAA+B,EAAE,EAAE,CAAC,CAAC;IAErD,mBAAmB,CAClB,IAAI,CAAC,EAAE;QACN,KAAK,CAAC,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC;QACxB,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC;IACvB,CAAC,EACD;QACC,OAAO,EAAE,CAAC,EAAE,CAAC,EAAE,cAAc,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC;QACtE,IAAI,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE;KACxC,CACD,CAAC;IACF,SAAS,CAAC,GAAG,EAAE;QACd,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC;QACf,KAAK,CAAC,IAAI,GAAG,EAAE,CAAC;QAChB,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC;QACrB,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC;QACtB,wBAAwB;IACzB,CAAC,EAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;IAErB,MAAM,QAAQ,GAAG,KAAK,IAAI,EAAE;QAC3B,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC;QACrB,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC;IAC7B,CAAC,CAAC;IACF,MAAM,SAAS,GAAG,KAAK,EAAE,EAAU,EAAE,OAAe,EAAE,IAAW,EAAE,EAAE;QACpE,MAAM,SAAS,CAAC,SAAS,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;QACvC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC;IACnB,CAAC,CAAC;IACF,MAAM,QAAQ,GAAG,KAAK,EAAE,GAAa,EAAE,EAAE;QACxC,MAAM,WAAW,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;IACvD,CAAC,CAAC;IACF,MAAM,GAAG,GAAG,MAAM,EAAO,CAAC;IAC1B,OAAO,WAAW,CAAC,GAAG,EAAE,CAAC,CACxB,6BAAK,SAAS,EAAE,UAAU,CAAC,aAAa,EAAE,KAAK,CAAC,SAAS,CAAC;QAUzD,oBAAC,YAAY,IACZ,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,IAAI,EACZ,KAAK,EAAC,QAAQ,EACd,IAAI,EAAE,KAAK,CAAC,IAAI,EAChB,OAAO,EAAE,KAAK,CAAC,OAAO,EACtB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,IAAI,EACb,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,IAElC,CAAC,IAAW,EAAE,QAAiB,EAAE,EAAE,CAAC,CACpC,oBAAC,OAAO,IACP,IAAI,EAAE,IAAI,EACV,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,CAAC,IAAS,EAAE,KAAa,EAAE,iBAAsB,EAAE,EAAE,CAAC,CAC3D,oBAAC,UAAU,IACV,GAAG,EAAE,IAAI,CAAC,EAAE,EACZ,EAAE,EAAE,IAAI,CAAC,EAAE,EACX,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,QAAQ,EAC1B,iBAAiB,EAAE,iBAAiB,GACnC,CACF,GACA,CACF,CACa;QAEd,KAAK,CAAC,OAAO,IAAI,CACjB,oBAAC,aAAa,IAAC,EAAE,EAAE,KAAK,CAAC,QAAQ,EAAE,MAAM,QAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC,GAAI,CACrF,CACI,CACN,CAAC,CAAC;AACJ,CAAC,CAAC;AACF,eAAe,UAAU,CAAC"}
|
@@ -4,6 +4,9 @@
|
|
4
4
|
display: flex;
|
5
5
|
flex-direction: column;
|
6
6
|
height: 100%;
|
7
|
+
.agenda-list-page-view {
|
8
|
+
flex: 1;
|
9
|
+
}
|
7
10
|
.agenda-list-header {
|
8
11
|
position: relative;
|
9
12
|
display: flex;
|
@@ -11,9 +14,9 @@
|
|
11
14
|
align-items: center;
|
12
15
|
padding: 10px 0;
|
13
16
|
margin: 0 20px;
|
14
|
-
color:
|
17
|
+
// color: rgb(109, 98, 98);
|
15
18
|
font-size: 15px;
|
16
|
-
line-height: 15px;
|
19
|
+
// line-height: 15px;
|
17
20
|
font-weight: 500;
|
18
21
|
.operate-icon span {
|
19
22
|
margin-left: 10px;
|
@@ -1,15 +1,20 @@
|
|
1
|
+
import { SortParameters } from "@voplus/morpho-data/es/types";
|
1
2
|
import { AgendaStore, IAgenda } from "../../../../data/meeting";
|
2
3
|
export declare type AgendaListProps = {
|
3
4
|
parentId: string;
|
4
5
|
isAdd?: boolean;
|
5
6
|
className?: string;
|
6
7
|
preview?: boolean;
|
8
|
+
readonly?: boolean;
|
7
9
|
};
|
8
10
|
export declare class State {
|
9
11
|
private _store;
|
10
12
|
constructor(_store: AgendaStore);
|
11
13
|
props: AgendaListProps;
|
12
14
|
list: IAgenda[];
|
15
|
+
ids: string[];
|
16
|
+
multiple: boolean;
|
17
|
+
checkAll: boolean;
|
13
18
|
params: any[];
|
14
19
|
tasks: any[];
|
15
20
|
page: number;
|
@@ -18,7 +23,9 @@ export declare class State {
|
|
18
23
|
canDrag: boolean;
|
19
24
|
cutAble: boolean;
|
20
25
|
addAble: boolean;
|
26
|
+
data: SortParameters;
|
21
27
|
onAgendaCreated: (s: AgendaStore, t: IAgenda) => void;
|
22
28
|
onAgendaDeleted: (s: AgendaStore, t: IAgenda) => void;
|
29
|
+
onAgendaMoved: (targetId: string, t: IAgenda[]) => void;
|
23
30
|
subscribeOnAgendaCreateCallback: () => () => void;
|
24
31
|
}
|
@@ -4,6 +4,9 @@ export class State {
|
|
4
4
|
constructor(_store) {
|
5
5
|
this._store = _store;
|
6
6
|
this.list = [];
|
7
|
+
this.ids = [];
|
8
|
+
this.multiple = false;
|
9
|
+
this.checkAll = false;
|
7
10
|
this.params = [];
|
8
11
|
this.tasks = [];
|
9
12
|
this.page = 1;
|
@@ -12,20 +15,27 @@ export class State {
|
|
12
15
|
this.canDrag = false;
|
13
16
|
this.cutAble = false;
|
14
17
|
this.addAble = false;
|
18
|
+
this.data = {};
|
15
19
|
this.onAgendaCreated = (s, t) => {
|
16
|
-
console.log(t, this.props, this.props);
|
17
20
|
if (t.parentId === this.props.parentId)
|
18
21
|
this.list.push(t);
|
19
22
|
};
|
20
23
|
this.onAgendaDeleted = (s, t) => {
|
21
24
|
this.list = this.list.filter(agenda => agenda.id !== t.id);
|
22
25
|
};
|
26
|
+
this.onAgendaMoved = (targetId, t) => {
|
27
|
+
// const t = list.filter(({ type }) => type === "Task");
|
28
|
+
if (targetId === this.props.parentId)
|
29
|
+
this.list = [...t, ...this.list];
|
30
|
+
};
|
23
31
|
this.subscribeOnAgendaCreateCallback = () => {
|
24
32
|
this._store.ItemCreatedEvent.subscribe(this.onAgendaCreated);
|
25
33
|
this._store.ItemDeletedEvent.subscribe(this.onAgendaDeleted);
|
34
|
+
this._store.AgendaMovedEvent.subscribe(this.onAgendaMoved);
|
26
35
|
return () => {
|
27
36
|
this._store.ItemCreatedEvent.unsubscribe(this.onAgendaCreated);
|
28
37
|
this._store.ItemDeletedEvent.unsubscribe(this.onAgendaDeleted);
|
38
|
+
this._store.AgendaMovedEvent.subscribe(this.onAgendaMoved);
|
29
39
|
};
|
30
40
|
};
|
31
41
|
}
|
@@ -33,6 +43,15 @@ export class State {
|
|
33
43
|
__decorate([
|
34
44
|
observable
|
35
45
|
], State.prototype, "list", void 0);
|
46
|
+
__decorate([
|
47
|
+
observable
|
48
|
+
], State.prototype, "ids", void 0);
|
49
|
+
__decorate([
|
50
|
+
observable
|
51
|
+
], State.prototype, "multiple", void 0);
|
52
|
+
__decorate([
|
53
|
+
observable
|
54
|
+
], State.prototype, "checkAll", void 0);
|
36
55
|
__decorate([
|
37
56
|
observable
|
38
57
|
], State.prototype, "params", void 0);
|
@@ -57,4 +76,7 @@ __decorate([
|
|
57
76
|
__decorate([
|
58
77
|
observable
|
59
78
|
], State.prototype, "addAble", void 0);
|
79
|
+
__decorate([
|
80
|
+
observable
|
81
|
+
], State.prototype, "data", void 0);
|
60
82
|
//# sourceMappingURL=state.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../../../src/modules/meeting/components/AgendaList/state.ts"],"names":[],"mappings":";
|
1
|
+
{"version":3,"file":"state.js","sourceRoot":"","sources":["../../../../../src/modules/meeting/components/AgendaList/state.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAWlC,MAAM,OAAO,KAAK;IACjB,YAA2B,MAAmB;QAAnB,WAAM,GAAN,MAAM,CAAa;QAG3B,SAAI,GAAc,EAAE,CAAC;QACrB,QAAG,GAAa,EAAE,CAAC;QACnB,aAAQ,GAAY,KAAK,CAAC;QAC1B,aAAQ,GAAY,KAAK,CAAC;QAC1B,WAAM,GAAU,EAAE,CAAC;QACnB,UAAK,GAAU,EAAE,CAAC;QAClB,SAAI,GAAW,CAAC,CAAC;QACjB,YAAO,GAAY,IAAI,CAAC;QACxB,aAAQ,GAAY,KAAK,CAAC;QAC1B,YAAO,GAAY,KAAK,CAAC;QACzB,YAAO,GAAY,KAAK,CAAC;QACzB,YAAO,GAAY,KAAK,CAAC;QACzB,SAAI,GAAmB,EAAE,CAAC;QAEtC,oBAAe,GAAG,CAAC,CAAc,EAAE,CAAU,EAAE,EAAE;YACvD,IAAI,CAAC,CAAC,QAAQ,KAAK,IAAI,CAAC,KAAK,CAAC,QAAQ;gBAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC3D,CAAC,CAAC;QACK,oBAAe,GAAG,CAAC,CAAc,EAAE,CAAU,EAAE,EAAE;YACvD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;QAC5D,CAAC,CAAC;QACK,kBAAa,GAAG,CAAC,QAAgB,EAAE,CAAY,EAAE,EAAE;YACzD,wDAAwD;YACxD,IAAI,QAAQ,KAAK,IAAI,CAAC,KAAK,CAAC,QAAQ;gBAAE,IAAI,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;QACxE,CAAC,CAAC;QACK,oCAA+B,GAAG,GAAG,EAAE;YAC7C,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YAC7D,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YAC7D,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAC3D,OAAO,GAAG,EAAE;gBACX,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,WAAW,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;gBAC/D,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,WAAW,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;gBAC/D,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAC5D,CAAC,CAAC;QACH,CAAC,CAAC;IApC+C,CAAC;CAqClD;AAlCY;IAAX,UAAU;mCAA6B;AAC5B;IAAX,UAAU;kCAA2B;AAC1B;IAAX,UAAU;uCAAkC;AACjC;IAAX,UAAU;uCAAkC;AACjC;IAAX,UAAU;qCAA2B;AAC1B;IAAX,UAAU;oCAA0B;AACzB;IAAX,UAAU;mCAAyB;AACxB;IAAX,UAAU;sCAAgC;AAC/B;IAAX,UAAU;uCAAkC;AACjC;IAAX,UAAU;sCAAiC;AAChC;IAAX,UAAU;sCAAiC;AAChC;IAAX,UAAU;sCAAiC;AAChC;IAAX,UAAU;mCAAkC"}
|
@@ -1,41 +1,55 @@
|
|
1
|
-
import React from "react";
|
1
|
+
import React, { useState } from "react";
|
2
2
|
import { Button, Icon, Row, Tabs } from "@voplus/antd";
|
3
3
|
import ToolBar from "../../../../components/ToolBar";
|
4
4
|
import MeetingItem from "../MeetingItem";
|
5
5
|
import Comment from "@voplus/morpho-collaboration/es/components/Comment";
|
6
|
+
import { useDocumentStore } from "@voplus/morpho-document";
|
6
7
|
import DocumentList from "@voplus/morpho-document/es/components/DocumentList";
|
8
|
+
import { FileStore } from "@voplus/morpho-document/es/data/FileStore/FileContext";
|
7
9
|
import { useAsideContentContext } from "@voplus/morpho-ui";
|
8
10
|
import RichTextEditor from "@voplus/morpho-ui/es/controls/RichTextEditor";
|
9
11
|
import { useObserver } from "mobx-react-lite";
|
10
12
|
import ActivityLog from "../../../../components/ActivityLog";
|
11
|
-
import { useMeeting, useMeetingStore } from "../../../../data/meeting";
|
13
|
+
import { useAgendaStore, useMeeting, useMeetingStore } from "../../../../data/meeting";
|
12
14
|
import AgendaList from "../AgendaList";
|
13
15
|
import styles from "./index.less";
|
14
16
|
const MeetingDetail = (props) => {
|
15
17
|
const { id } = props;
|
16
18
|
const meetingStore = useMeetingStore();
|
19
|
+
const agendaStore = useAgendaStore();
|
20
|
+
const documentStore = useDocumentStore();
|
17
21
|
const meeting = useMeeting(id, { reload: true });
|
22
|
+
const readonly = meeting.status === "Readonly";
|
23
|
+
const [store] = useState(new FileStore());
|
18
24
|
const asideContext = useAsideContentContext();
|
19
25
|
const onDelete = async () => {
|
20
26
|
await meetingStore.delete([id], { DeleteChilds: true });
|
21
27
|
asideContext.closeAside();
|
22
28
|
};
|
29
|
+
const onLock = () => {
|
30
|
+
documentStore.edit(id, { Status: "Readonly" });
|
31
|
+
};
|
32
|
+
const onUnlock = () => {
|
33
|
+
documentStore.edit(id, { Status: "Normal" });
|
34
|
+
};
|
23
35
|
return useObserver(() => (React.createElement("div", { className: "module-detail-view" },
|
24
36
|
React.createElement("div", { className: "module-view-header" },
|
25
37
|
React.createElement(Row, { type: "flex", justify: "space-between" },
|
26
38
|
React.createElement(MeetingItem, { id: id, isDetail: true }),
|
27
39
|
React.createElement("div", { className: styles["meeting-tool-bar"] },
|
28
|
-
React.createElement(ToolBar, { id: id, url: `/meetings/${id}`, onDelete: onDelete
|
40
|
+
React.createElement(ToolBar, { id: id, move: false, url: `/meetings/${id}`, onDelete: onDelete, lock: meeting.status === "Draft" || meeting.status === "Normal", unlock: meeting.status === "Readonly",
|
41
|
+
// onMove={onMove}
|
42
|
+
onLock: onLock, onUnlock: onUnlock, onPaste: () => store.onPaste(() => agendaStore.move(store.moveIds, id)) }),
|
29
43
|
React.createElement("div", { className: "margin-top-10" },
|
30
44
|
React.createElement(Button, { size: "small" }, "+tag"))))),
|
31
45
|
React.createElement(Tabs, null,
|
32
46
|
React.createElement(Tabs.TabPane, { tab: "Details", key: "1" },
|
33
47
|
React.createElement("div", { className: styles["meeting-detail-view"] },
|
34
48
|
React.createElement("div", { className: "meeting-detail-description" },
|
35
|
-
React.createElement(RichTextEditor, { editable: false, defaultValue: id, content: meeting.description || "", placeholder: React.createElement("span", null,
|
49
|
+
React.createElement(RichTextEditor, { readOnly: readonly, editable: false, defaultValue: id, content: meeting.description || "", placeholder: React.createElement("span", null,
|
36
50
|
React.createElement(Icon, { type: "edit" }),
|
37
51
|
"Add Description"), onSave: v => meetingStore.edit(meeting.id, { Description: v }) })),
|
38
|
-
React.createElement(AgendaList, { parentId: meeting.id }))),
|
52
|
+
React.createElement(AgendaList, { parentId: meeting.id, readonly: readonly }))),
|
39
53
|
React.createElement(Tabs.TabPane, { tab: "Documents", key: "2" },
|
40
54
|
React.createElement("div", { className: "module-box" },
|
41
55
|
React.createElement(DocumentList, { id: id }))),
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/meeting/components/MeetingDetail/index.tsx"],"names":[],"mappings":"AACA,OAAO,
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/meeting/components/MeetingDetail/index.tsx"],"names":[],"mappings":"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"}
|
@@ -14,11 +14,11 @@ const MeetingItem = (props) => {
|
|
14
14
|
const meetingStore = useMeetingStore();
|
15
15
|
const [state] = useState(new State());
|
16
16
|
state.meeting = useMeeting(props.id, { reload: false });
|
17
|
+
const readonly = state.meeting.status === "Readonly";
|
17
18
|
const onChangeMember = async (ids) => {
|
18
19
|
await meetingStore.edit(state.meeting.id, { MemberIds: ids });
|
19
20
|
};
|
20
21
|
const onSave = async (v, name, params) => {
|
21
|
-
console.log(v, name, params, "252525");
|
22
22
|
if (v.trim() === name)
|
23
23
|
return;
|
24
24
|
await meetingStore.edit(state.meeting.id, params);
|
@@ -28,27 +28,23 @@ const MeetingItem = (props) => {
|
|
28
28
|
StartTime: new Date(new Date(dates[0])),
|
29
29
|
EndTime: new Date(new Date(dates[1]))
|
30
30
|
});
|
31
|
-
console.log(new Date(dates[0]), new Date(dates[1]), "dates");
|
32
|
-
console.log(state.meeting.startTime, state.meeting.endTime, "state.meeting");
|
33
31
|
};
|
34
32
|
const onChangeDate = (value, dateString) => {
|
35
33
|
state.meeting.startTime = value[0];
|
36
34
|
state.meeting.endTime = value[1];
|
37
|
-
console.log(value);
|
38
35
|
};
|
39
36
|
const onEditDate = () => {
|
40
37
|
state.open = true;
|
41
38
|
state.editable = true;
|
42
39
|
};
|
43
40
|
const onOpenChange = (open) => {
|
44
|
-
console.log(open);
|
45
41
|
state.editable = true;
|
46
42
|
if (!open)
|
47
43
|
state.editable = false;
|
48
44
|
};
|
49
45
|
return useObserver(() => (React.createElement(React.Fragment, null, props.isDetail ? (React.createElement("div", { className: "meeting-item-detail" },
|
50
|
-
React.createElement(InlineEdit, { defaultValue: state.meeting.name, content: v => React.createElement("div", { className: "meeting-item-name" }, v.store.value), onSave: value => onSave(value, state.meeting.name, { Name: value }) }),
|
51
|
-
state.editable ? (React.createElement("div", { style: { padding: "5px 0" } },
|
46
|
+
React.createElement(InlineEdit, { editable: !readonly, defaultValue: state.meeting.name, content: v => React.createElement("div", { className: "meeting-item-name" }, v.store.value), onSave: value => onSave(value, state.meeting.name, { Name: value }) }),
|
47
|
+
state.editable && !readonly ? (React.createElement("div", { style: { padding: "5px 0" } },
|
52
48
|
React.createElement(DatePicker.RangePicker, { autoFocus: true, showTime: { format: "HH:mm" }, format: "YYYY-MM-DD HH:mm", value: [moment(state.meeting.startTime), moment(state.meeting.endTime)], open: state.open, onChange: onChangeDate, onOpenChange: onOpenChange, onOk: onOk }))) : (React.createElement("div", null,
|
53
49
|
React.createElement("span", { className: "meeting-clock", onClick: onEditDate },
|
54
50
|
React.createElement(FAIcon, { icon: faClock }),
|
@@ -60,11 +56,11 @@ const MeetingItem = (props) => {
|
|
60
56
|
moment(state.meeting.startTime).from(moment(state.meeting.endTime), true)))),
|
61
57
|
React.createElement(Row, { type: "flex", align: "middle" },
|
62
58
|
React.createElement("div", { className: "meeting-clock" },
|
63
|
-
React.createElement(InlineEdit, { defaultValue: state.meeting.venue || "", content: v => (React.createElement(React.Fragment, null,
|
59
|
+
React.createElement(InlineEdit, { editable: !readonly, defaultValue: state.meeting.venue || "", content: v => (React.createElement(React.Fragment, null,
|
64
60
|
React.createElement(FAIcon, { icon: faMapMarkerAlt }),
|
65
|
-
v.store.value)), onSave: value => onSave(value, state.meeting.venue || "", { Venue: value }) })),
|
61
|
+
v.store.value || "Venue")), onSave: value => onSave(value, state.meeting.venue || "", { Venue: value }) })),
|
66
62
|
React.createElement(FAIcon, { icon: faUserFriends, flip: "horizontal", color: "#666", size: "sm" }),
|
67
|
-
React.createElement(AvatarList, { list: state.meeting.members || [], onChange: onChangeMember })))) : (React.createElement(Row, { type: "flex", align: "middle", className: classnames("meeting-item-list", props.className) },
|
63
|
+
React.createElement(AvatarList, { list: state.meeting.members || [], editable: !readonly, onChange: onChangeMember })))) : (React.createElement(Row, { type: "flex", align: "middle", className: classnames("meeting-item-list", props.className) },
|
68
64
|
React.createElement("div", { className: "meeting-item-date" },
|
69
65
|
React.createElement("div", null, moment(state.meeting.startTime).format("DD")),
|
70
66
|
React.createElement("div", { className: "month" }, moment(state.meeting.startTime).format("ddd"))),
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/meeting/components/MeetingItem/index.tsx"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,KAAK,EAAE,EAAa,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEnD,OAAO,EACN,OAAO,EACP,cAAc,EACd,WAAW,EACX,aAAa,EACb,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EAAE,eAAe,IAAI,MAAM,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAA6B,GAAG,EAAQ,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AACzF,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,UAAU,MAAM,mCAAmC,CAAC;AAE3D,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AACvE,OAAO,cAAc,CAAC;AACtB,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,MAAM,WAAW,GAAG,CAAC,KAKpB,EAAE,EAAE;IACJ,MAAM,YAAY,GAAG,eAAe,EAAE,CAAC;IACvC,MAAM,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC;IACtC,KAAK,CAAC,OAAO,GAAG,UAAU,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;IACxD,MAAM,cAAc,GAAG,KAAK,EAAE,GAAa,EAAE,EAAE;QAC9C,MAAM,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC;IAC/D,CAAC,CAAC;IACF,MAAM,MAAM,GAAG,KAAK,EAAE,CAAS,EAAE,IAAY,EAAE,MAAc,EAAE,EAAE;QAChE,
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/meeting/components/MeetingItem/index.tsx"],"names":[],"mappings":"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"}
|
@@ -1,5 +1,6 @@
|
|
1
1
|
import React, { useEffect, useState } from "react";
|
2
2
|
// import ListView from "../../../../components/ListView";
|
3
|
+
import { useTabItem } from "@voplus/morpho-data";
|
3
4
|
import { ListView } from "@voplus/morpho-ui";
|
4
5
|
import { useSort } from "@voplus/morpho-ui/es/components/layout/ListView/data/contexts";
|
5
6
|
import { toJS } from "mobx";
|
@@ -10,6 +11,8 @@ import MeetingItem from "../MeetingItem";
|
|
10
11
|
import NewMeetingForm from "../NewMeetingForm";
|
11
12
|
import { State } from "./state";
|
12
13
|
const MeetingList = () => {
|
14
|
+
const tab = useTabItem();
|
15
|
+
tab.title = "Meetings";
|
13
16
|
const meetings = useMeetingStore();
|
14
17
|
const [state] = useState(new State(meetings));
|
15
18
|
const sortStore = useSort();
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/meeting/components/MeetingList/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEnD,0DAA0D;AAC1D,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,+DAA+D,CAAC;AACxF,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,oBAAoB,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AACjF,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAC7C,OAAO,WAAW,MAAM,gBAAgB,CAAC;AACzC,OAAO,cAAc,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,MAAM,WAAW,GAAG,GAAG,EAAE;IACxB,MAAM,QAAQ,GAAG,eAAe,EAAE,CAAC;IACnC,MAAM,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC9C,MAAM,SAAS,GAAG,OAAO,EAAE,CAAC;IAC5B,SAAS,CAAC,GAAG,EAAE;QACd,KAAK,CAAC,gCAAgC,EAAE,CAAC;IAC1C,CAAC,EAAE,EAAE,CAAC,CAAC;IACP,sBAAsB;IACtB,oBAAoB,CACnB,IAAI,CAAC,EAAE;QACN,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC;QACtB,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC;IACvB,CAAC,EACD,EAAE,IAAI,EAAE,IAAI,CAAC,SAAU,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,EAAE,CACxD,CAAC;IACF,yBAAyB;IACzB,MAAM;IACN,MAAM,QAAQ,GAAG,GAAG,EAAE;QACrB,qBAAqB;QACrB,wBAAwB;IACzB,CAAC,CAAC;IACF,OAAO,WAAW,CAAC,GAAG,EAAE,CAAC,CACxB,oBAAC,QAAQ,IACR,IAAI,EAAE,KAAK,CAAC,QAAQ,EACpB,OAAO,EAAE,KAAK,CAAC,OAAO,EACtB,aAAa,EAAC,aAAa,EAC3B,QAAQ,EAAE,oBAAC,cAAc,OAAG,EAC5B,WAAW,EAAE,CAAC,EAAU,EAAE,EAAE,CAAC,oBAAC,aAAa,IAAC,EAAE,EAAE,EAAE,GAAI,EACtD,UAAU,EAAE,CAAC,OAAY,EAAE,SAAkB,EAAE,EAAE,CAAC,CACjD,oBAAC,WAAW,IAAC,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,SAAS,EAAE,SAAS,GAAI,CACrD,EACD,QAAQ,EAAE,QAAQ,GACjB,CACF,CAAC,CAAC;AACJ,CAAC,CAAC;AACF,eAAe,WAAW,CAAC"}
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/meeting/components/MeetingList/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEnD,0DAA0D;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,+DAA+D,CAAC;AACxF,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,oBAAoB,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AACjF,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAC7C,OAAO,WAAW,MAAM,gBAAgB,CAAC;AACzC,OAAO,cAAc,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,MAAM,WAAW,GAAG,GAAG,EAAE;IACxB,MAAM,GAAG,GAAG,UAAU,EAAE,CAAC;IACzB,GAAG,CAAC,KAAK,GAAG,UAAU,CAAC;IACvB,MAAM,QAAQ,GAAG,eAAe,EAAE,CAAC;IACnC,MAAM,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;IAC9C,MAAM,SAAS,GAAG,OAAO,EAAE,CAAC;IAC5B,SAAS,CAAC,GAAG,EAAE;QACd,KAAK,CAAC,gCAAgC,EAAE,CAAC;IAC1C,CAAC,EAAE,EAAE,CAAC,CAAC;IACP,sBAAsB;IACtB,oBAAoB,CACnB,IAAI,CAAC,EAAE;QACN,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC;QACtB,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC;IACvB,CAAC,EACD,EAAE,IAAI,EAAE,IAAI,CAAC,SAAU,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,EAAE,CACxD,CAAC;IACF,yBAAyB;IACzB,MAAM;IACN,MAAM,QAAQ,GAAG,GAAG,EAAE;QACrB,qBAAqB;QACrB,wBAAwB;IACzB,CAAC,CAAC;IACF,OAAO,WAAW,CAAC,GAAG,EAAE,CAAC,CACxB,oBAAC,QAAQ,IACR,IAAI,EAAE,KAAK,CAAC,QAAQ,EACpB,OAAO,EAAE,KAAK,CAAC,OAAO,EACtB,aAAa,EAAC,aAAa,EAC3B,QAAQ,EAAE,oBAAC,cAAc,OAAG,EAC5B,WAAW,EAAE,CAAC,EAAU,EAAE,EAAE,CAAC,oBAAC,aAAa,IAAC,EAAE,EAAE,EAAE,GAAI,EACtD,UAAU,EAAE,CAAC,OAAY,EAAE,SAAkB,EAAE,EAAE,CAAC,CACjD,oBAAC,WAAW,IAAC,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,SAAS,EAAE,SAAS,GAAI,CACrD,EACD,QAAQ,EAAE,QAAQ,GACjB,CACF,CAAC,CAAC;AACJ,CAAC,CAAC;AACF,eAAe,WAAW,CAAC"}
|
@@ -14,6 +14,7 @@ import "../../../../styles/common.less";
|
|
14
14
|
import AgendaList from "../../components/AgendaList";
|
15
15
|
import MeetingItem from "../../components/MeetingItem";
|
16
16
|
import styles from "./index.less";
|
17
|
+
import { useDocumentStore } from "@voplus/morpho-document";
|
17
18
|
const MeetingTabView = () => {
|
18
19
|
const { match } = useContext(__RouterContext);
|
19
20
|
const id = match.params.id;
|
@@ -21,17 +22,24 @@ const MeetingTabView = () => {
|
|
21
22
|
const tab = useTabItem();
|
22
23
|
tab.title = "Meeting Detail";
|
23
24
|
const meetingStore = useMeetingStore();
|
25
|
+
const documentStore = useDocumentStore();
|
24
26
|
const [scrollParentRef, setScrollParentRef] = useState();
|
25
27
|
const [asideContext] = useState(AsideContent.createContext());
|
26
28
|
const layout = useLayout();
|
27
29
|
useEffect(() => {
|
28
|
-
asideContext.openAside(AsideElement, { span: 12 });
|
30
|
+
// asideContext.openAside(AsideElement, { span: 12 });
|
29
31
|
}, []);
|
30
32
|
const onDelete = async () => {
|
31
33
|
layout.history.push(`/meeting`);
|
32
34
|
layout.tabNav.remove(tab);
|
33
35
|
await meetingStore.delete(id, { DeleteChilds: true });
|
34
36
|
};
|
37
|
+
const onLock = () => {
|
38
|
+
documentStore.edit(id, { Status: "Readonly" });
|
39
|
+
};
|
40
|
+
const onUnlock = () => {
|
41
|
+
documentStore.edit(id, { Status: "Normal" });
|
42
|
+
};
|
35
43
|
const AsideElement = (React.createElement("div", { className: "module-tab-view_aside" },
|
36
44
|
React.createElement(Tabs, { defaultActiveKey: "1" },
|
37
45
|
React.createElement(Tabs.TabPane, { tab: "Documents", key: "1" },
|
@@ -49,7 +57,7 @@ const MeetingTabView = () => {
|
|
49
57
|
React.createElement(Row, { type: "flex", justify: "space-between", className: "margin-bottom-10" },
|
50
58
|
React.createElement(MeetingItem, { id: id, isDetail: true }),
|
51
59
|
React.createElement("div", { className: styles["meeting-tool-bar"] },
|
52
|
-
React.createElement(ToolBar, { id: id, onDelete: onDelete, onOpen: () => asideContext.asideContent
|
60
|
+
React.createElement(ToolBar, { id: id, onDelete: onDelete, lock: meeting.status === "Draft" || meeting.status === "Normal", unlock: meeting.status === "Readonly", onLock: onLock, onUnlock: onUnlock, onOpen: () => asideContext.asideContent
|
53
61
|
? asideContext.closeAside()
|
54
62
|
: asideContext.openAside(AsideElement, { span: 12 }) }),
|
55
63
|
React.createElement("div", { className: "margin-top-10" },
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/meeting/pages/MeetingTabView/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAE/D,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AACjE,OAAO,OAAO,MAAM,oDAAoD,CAAC;AACzE,OAAO,YAAY,MAAM,oDAAoD,CAAC;AAC9E,OAAO,YAAY,MAAM,qDAAqD,CAAC;AAC/E,OAAO,cAAc,MAAM,8CAA8C,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,WAAW,MAAM,oCAAoC,CAAC;AAC7D,OAAO,OAAO,MAAM,gCAAgC,CAAC;AAErD,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAS,MAAM,cAAc,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AACvE,OAAO,gCAAgC,CAAC;AACxC,OAAO,UAAU,MAAM,6BAA6B,CAAC;AACrD,OAAO,WAAW,MAAM,8BAA8B,CAAC;AAEvD,OAAO,MAAM,MAAM,cAAc,CAAC;
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/meeting/pages/MeetingTabView/index.tsx"],"names":[],"mappings":"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"}
|
@@ -1,24 +1,21 @@
|
|
1
1
|
import classnames from "classnames";
|
2
2
|
import React, { useEffect, useRef, useState } from "react";
|
3
|
-
import { faCheckSquare, faPlus } from "@fortawesome/pro-light-svg-icons";
|
4
|
-
import { FontAwesomeIcon as FAIcon } from "@fortawesome/react-fontawesome";
|
5
|
-
import PageListView from "@voplus/morpho-ui/es/controls/PageListView";
|
6
|
-
// import PageListView from "../../../../components/PageListView";
|
7
3
|
import SortDnD from "@voplus/morpho-ui/es/controls/SortDnD";
|
4
|
+
// import PageListView from "@voplus/morpho-ui/es/controls/PageListView";
|
5
|
+
import PageListView from "../../../../components/PageListView";
|
8
6
|
import SortViewDropdown from "../../../../controls/SortViewDropdown";
|
9
7
|
import TaskItem from "../TaskItem";
|
10
8
|
import "./index.less";
|
11
|
-
import {
|
9
|
+
import { FileStore } from "@voplus/morpho-document/es/data/FileStore/FileContext";
|
12
10
|
import FilterListDropdown from "@voplus/morpho-ui/es/components/layout/ListView/controls/FilterListDropdown";
|
13
11
|
import { toJS } from "mobx";
|
14
12
|
import { useObserver } from "mobx-react-lite";
|
15
13
|
import { useTaskListEffect, useTaskStore } from "../../../../data/task";
|
16
14
|
import NewTaskForm from "../NewTaskForm";
|
17
15
|
import { State } from "./state";
|
18
|
-
import { Store } from "../../../../data/contexts/StoreContext";
|
19
16
|
const SubTaskList = (props) => {
|
20
17
|
const taskStore = useTaskStore();
|
21
|
-
const [store] = useState(new
|
18
|
+
const [store] = useState(new FileStore());
|
22
19
|
const [state] = useState(new State(taskStore));
|
23
20
|
const [readonly, setreadonly] = useState(false);
|
24
21
|
state.props = props;
|
@@ -61,22 +58,8 @@ const SubTaskList = (props) => {
|
|
61
58
|
await taskStore.moveAfter(id, afterId);
|
62
59
|
state.tasks = list;
|
63
60
|
};
|
64
|
-
const
|
65
|
-
|
66
|
-
return message.info("Nothing to choice");
|
67
|
-
return store.onMove(state.ids);
|
68
|
-
};
|
69
|
-
const onDelete = async () => {
|
70
|
-
if (!state.ids.length)
|
71
|
-
return message.info("Nothing to choice");
|
72
|
-
Modal.confirm({
|
73
|
-
title: "Do you want to delete these items?",
|
74
|
-
async onOk() {
|
75
|
-
await taskStore.delete(state.ids, { DeleteChilds: true });
|
76
|
-
state.checkAll = false;
|
77
|
-
},
|
78
|
-
onCancel() { }
|
79
|
-
});
|
61
|
+
const onDelete = async (ids) => {
|
62
|
+
await taskStore.delete(ids, { DeleteChilds: true });
|
80
63
|
};
|
81
64
|
const onCancel = () => {
|
82
65
|
state.addAble = false;
|
@@ -89,22 +72,6 @@ const SubTaskList = (props) => {
|
|
89
72
|
state.loading = true;
|
90
73
|
ref.current.reset();
|
91
74
|
};
|
92
|
-
const onMultiple = () => {
|
93
|
-
state.multiple = true;
|
94
|
-
};
|
95
|
-
const onCheckAll = (e) => {
|
96
|
-
state.ids = e.target.checked ? state.tasks.map(({ id }) => id) : [];
|
97
|
-
state.checkAll = e.target.checked;
|
98
|
-
};
|
99
|
-
const onCheck = (checkedValues) => {
|
100
|
-
state.ids = checkedValues;
|
101
|
-
state.checkAll = checkedValues.length === state.tasks.length;
|
102
|
-
};
|
103
|
-
const cancelMultiple = () => {
|
104
|
-
state.multiple = false;
|
105
|
-
state.ids = [];
|
106
|
-
state.checkAll = false;
|
107
|
-
};
|
108
75
|
const scrollParentRef = useRef();
|
109
76
|
const ref = useRef();
|
110
77
|
useEffect(() => {
|
@@ -114,24 +81,9 @@ const SubTaskList = (props) => {
|
|
114
81
|
}, [props.parentId]);
|
115
82
|
return useObserver(() => (React.createElement(React.Fragment, null,
|
116
83
|
React.createElement("div", { className: classnames("sub-task-list", props.className) },
|
117
|
-
|
118
|
-
!state.multiple ? (React.createElement("div", { className: "multiple-icon-text", onClick: onMultiple },
|
119
|
-
React.createElement(Button, { type: "link" },
|
120
|
-
React.createElement(FAIcon, { icon: faCheckSquare })),
|
121
|
-
"Sub-Tasks")) : (React.createElement("div", { className: "select-operate-btn" },
|
122
|
-
React.createElement(Checkbox, { onChange: onCheckAll, checked: state.checkAll }, "Select All"),
|
123
|
-
React.createElement(Button, { type: "link", onClick: onMove }, "Move"),
|
124
|
-
React.createElement(Button, { type: "link", className: "del-btn", onClick: onDelete }, "Delete"),
|
125
|
-
React.createElement(Button, { type: "link", className: "cancel-btn", onClick: cancelMultiple }, "Cancel"))),
|
126
|
-
React.createElement("div", { className: "operate-icon" },
|
84
|
+
!state.showMore && (React.createElement(PageListView, { ref: ref, header: !!props.header, addAble: !readonly, title: "Sub-Tasks", data: state.tasks, page: state.page, loading: state.loading, loadMore: loadMore, onDelete: onDelete, onAdd: () => (state.addAble = true), scrollParentRef: scrollParentRef && scrollParentRef.current && scrollParentRef.current.view, extra: React.createElement(React.Fragment, null,
|
127
85
|
React.createElement(SortViewDropdown, { onChange: data => onSort(data), onReset: onSort }),
|
128
|
-
React.createElement(FilterListDropdown, { status: state.filters, onChange: ({ value }) => onFilter(value) }),
|
129
|
-
React.createElement("span", { className: "plus-icon", onClick: () => (state.addAble = !state.addAble) },
|
130
|
-
React.createElement(FAIcon, { icon: faPlus, color: "#fff" }))))),
|
131
|
-
!state.showMore && (React.createElement(Checkbox.Group, { value: state.ids, onChange: onCheck, className: "sub-task-list_page" },
|
132
|
-
React.createElement(PageListView, { ref: ref, data: state.tasks, page: state.page, loading: state.loading, loadMore: loadMore, scrollParentRef: scrollParentRef && scrollParentRef.current && scrollParentRef.current.view }, (list) => (React.createElement(SortDnD, { list: list, text: (task, index, connectDragSource) => (React.createElement(Row, { key: task.id, type: "flex", className: "task-row-item" },
|
133
|
-
state.multiple && React.createElement(Checkbox, { value: task.id, className: "select-checkbox" }),
|
134
|
-
React.createElement(TaskItem, { type: "sub", id: task.id, index: index, connectDragSource: connectDragSource, multiple: state.multiple, readonly: readonly }))), moveAfter: moveAfter }))))),
|
86
|
+
React.createElement(FilterListDropdown, { status: state.filters, onChange: ({ value }) => onFilter(value) })) }, (list, multiple) => (React.createElement(SortDnD, { list: list, moveAfter: moveAfter, text: (task, index, connectDragSource) => (React.createElement(TaskItem, { type: "sub", id: task.id, index: index, connectDragSource: connectDragSource, multiple: multiple, readonly: readonly })) })))),
|
135
87
|
state.addAble && (React.createElement(NewTaskForm, { simple: true, parentId: props.parentId, block: true, onSave: onCancel, onCancel: onCancel, onShowMore: () => (state.showMore = !state.showMore) }))))));
|
136
88
|
};
|
137
89
|
SubTaskList.defaultProps = {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/tasks/components/SubTaskList/index.tsx"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/tasks/components/SubTaskList/index.tsx"],"names":[],"mappings":"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"}
|
@@ -23,7 +23,7 @@ export declare class State {
|
|
23
23
|
filters: any[];
|
24
24
|
data: SortParameters;
|
25
25
|
onTaskCreated: (s: TaskStore, t: ITask) => void;
|
26
|
-
onTaskMoved: (
|
26
|
+
onTaskMoved: (targetId: string, list: ITask[]) => void;
|
27
27
|
onTaskDeleted: (s: TaskStore, t: ITask) => void;
|
28
28
|
subscribeOnTaskCreateCallback: () => () => void;
|
29
29
|
reset(): void;
|
@@ -19,10 +19,10 @@ export class State {
|
|
19
19
|
this.tasks.push(t);
|
20
20
|
}
|
21
21
|
};
|
22
|
-
this.onTaskMoved = (
|
23
|
-
const t = list.filter(({ type }) => type === "Task");
|
24
|
-
if (
|
25
|
-
this.tasks = [...
|
22
|
+
this.onTaskMoved = (targetId, list) => {
|
23
|
+
// const t = list.filter(({ type }) => type === "Task");
|
24
|
+
if (targetId === this.props.parentId)
|
25
|
+
this.tasks = [...list, ...this.tasks];
|
26
26
|
};
|
27
27
|
this.onTaskDeleted = (s, t) => {
|
28
28
|
this.tasks =
|