@voplus/morpho-workspace 1.0.0-dev66 → 1.0.0-dev68

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.
Files changed (67) hide show
  1. package/changelog.md +1 -0
  2. package/es/controls/FlagIcon/index.d.ts +1 -1
  3. package/es/data/board/mock.js +21 -0
  4. package/es/data/board/mock.js.map +1 -1
  5. package/es/data/meeting/interfaces.d.ts +1 -3
  6. package/es/data/meeting/metas.js +2 -2
  7. package/es/data/meeting/metas.js.map +1 -1
  8. package/es/data/task/interfaces.d.ts +3 -3
  9. package/es/data/task/metas.js +1 -1
  10. package/es/data/task/metas.js.map +1 -1
  11. package/es/data/task/types.d.ts +1 -0
  12. package/es/modules/board/components/DocumentCard/index.js +10 -10
  13. package/es/modules/board/components/DocumentCard/index.js.map +1 -1
  14. package/es/modules/board/components/DocumentCard/index.less +4 -3
  15. package/es/modules/board/components/NewTaskForm/index.js +14 -16
  16. package/es/modules/board/components/NewTaskForm/index.js.map +1 -1
  17. package/es/modules/calendar/components/CalendarMenu/index.d.ts +6 -0
  18. package/es/modules/calendar/components/CalendarMenu/index.js +42 -0
  19. package/es/modules/calendar/components/CalendarMenu/index.js.map +1 -0
  20. package/es/modules/calendar/components/CalendarMenu/index.less +32 -0
  21. package/es/modules/calendar/components/TaskCard/index.less +52 -1
  22. package/es/modules/calendar/pages/CalendarMonth/index.less +168 -129
  23. package/es/modules/meeting/components/MeetingPropertiesView/index.d.ts +5 -0
  24. package/es/modules/meeting/components/{MeetingDetail → MeetingPropertiesView}/index.js +3 -3
  25. package/es/modules/meeting/components/MeetingPropertiesView/index.js.map +1 -0
  26. package/es/modules/meeting/components/MeetingQuickViewDialog/index.js +5 -7
  27. package/es/modules/meeting/components/MeetingQuickViewDialog/index.js.map +1 -1
  28. package/es/modules/meeting/components/NewMeetingForm/index.js +7 -7
  29. package/es/modules/meeting/components/NewMeetingForm/index.js.map +1 -1
  30. package/es/modules/meeting/pages/MeetingList/index.js +3 -3
  31. package/es/modules/meeting/pages/MeetingList/index.js.map +1 -1
  32. package/es/modules/meeting/pages/MeetingTabView/index.js +7 -7
  33. package/es/modules/meeting/pages/MeetingTabView/index.js.map +1 -1
  34. package/es/modules/tasks/components/NewTaskForm/index.js +6 -6
  35. package/es/modules/tasks/components/NewTaskForm/index.js.map +1 -1
  36. package/es/modules/tasks/components/SubTaskList/index.js +7 -8
  37. package/es/modules/tasks/components/SubTaskList/index.js.map +1 -1
  38. package/es/modules/tasks/components/SubTaskList/state.d.ts +3 -1
  39. package/es/modules/tasks/components/SubTaskList/state.js.map +1 -1
  40. package/es/modules/tasks/components/TaskItem/DetailsTaskItem.js +11 -11
  41. package/es/modules/tasks/components/TaskItem/DetailsTaskItem.js.map +1 -1
  42. package/es/modules/tasks/components/TaskItem/SubTaskItem.d.ts +1 -1
  43. package/es/modules/tasks/components/TaskItem/SubTaskItem.js +20 -18
  44. package/es/modules/tasks/components/TaskItem/SubTaskItem.js.map +1 -1
  45. package/es/modules/tasks/components/TaskItem/TaskItem.js +1 -1
  46. package/es/modules/tasks/components/TaskItem/TaskItem.js.map +1 -1
  47. package/es/modules/tasks/components/TaskItem/subTaskItem.less +20 -2
  48. package/es/modules/tasks/components/TaskPropertiesView/index.d.ts +7 -0
  49. package/es/modules/tasks/components/TaskPropertiesView/index.js +38 -0
  50. package/es/modules/tasks/components/TaskPropertiesView/index.js.map +1 -0
  51. package/es/modules/tasks/components/TaskPropertiesView/index.less +17 -0
  52. package/es/modules/tasks/components/TaskQuickViewDialog/index.js +5 -7
  53. package/es/modules/tasks/components/TaskQuickViewDialog/index.js.map +1 -1
  54. package/es/modules/tasks/pages/TaskList/index.js +51 -21
  55. package/es/modules/tasks/pages/TaskList/index.js.map +1 -1
  56. package/es/modules/tasks/pages/TaskTabView/index.js +15 -13
  57. package/es/modules/tasks/pages/TaskTabView/index.js.map +1 -1
  58. package/package.json +2 -2
  59. package/es/modules/meeting/components/MeetingDetail/index.d.ts +0 -5
  60. package/es/modules/meeting/components/MeetingDetail/index.js.map +0 -1
  61. package/es/modules/tasks/components/TaskDetail/index.d.ts +0 -6
  62. package/es/modules/tasks/components/TaskDetail/index.js +0 -21
  63. package/es/modules/tasks/components/TaskDetail/index.js.map +0 -1
  64. package/es/modules/tasks/pages/TaskTabView/state.d.ts +0 -5
  65. package/es/modules/tasks/pages/TaskTabView/state.js +0 -14
  66. package/es/modules/tasks/pages/TaskTabView/state.js.map +0 -1
  67. /package/es/modules/meeting/components/{MeetingDetail → MeetingPropertiesView}/index.less +0 -0
package/changelog.md CHANGED
@@ -1,3 +1,4 @@
1
1
  ## 待入 Live
2
2
 
3
3
  [Fix] BoardColumn scroll bar 不會自動隐藏
4
+ [Issuse] Links, Activities, Tag 在很多地方還沒有更新或不能用
@@ -6,7 +6,7 @@ declare const FlagIcon: {
6
6
  flag?: "None" | "Star" | "Urgent" | undefined;
7
7
  icon?: any;
8
8
  color?: string | undefined;
9
- size?: "lg" | "sm" | "xs" | undefined;
9
+ size?: "xs" | "lg" | "sm" | undefined;
10
10
  className?: string | undefined;
11
11
  onchange?: ((params?: any) => void) | undefined;
12
12
  }): JSX.Element;
@@ -7,6 +7,27 @@ const boardList = Mock.mock({
7
7
  type: "board",
8
8
  "status|+1": ["Open", "Pending", "InPRogress", "Reiew", "Ready"],
9
9
  "tasks|0-10": 1
10
+ // "boardColumn|1-2": [
11
+ // {
12
+ // // 随机生成1到2个数组元素
13
+ // "name|1": ["Fix routing problems", "Implement pretty URLs", "Document build plans"], // 名称
14
+ // "id|+1": 1, // 属性值自动加 1,初始值0
15
+ // "tasks|0-10": 1,
16
+ // "comments|0-10": 1,
17
+ // "documents|0-10": 1,
18
+ // "status|1": ["Draft", "Normal", "Readonly", "Archived", "Deleted"],
19
+ // "flag|1": ["None", "Star", "Urgent"],
20
+ // "label|0-1": ["very critical", "project"],
21
+ // startDate: '@date("yyyy-MM-dd")', // 日期
22
+ // dueDate: '@date("yyyy-MM-dd")',
23
+ // "members|0-10": [
24
+ // {
25
+ // "id|+1": 10,
26
+ // name: "@last"
27
+ // }
28
+ // ]
29
+ // }
30
+ // ]
10
31
  }
11
32
  ]
12
33
  });
@@ -1 +1 @@
1
- {"version":3,"file":"mock.js","sourceRoot":"","sources":["../../../src/data/board/mock.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,QAAQ,CAAC;AAE1B,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC;IAC3B,QAAQ,EAAE;QACT;YACC,OAAO,EAAE,EAAE;YACX,SAAS,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,OAAO,CAAC;YAC/D,IAAI,EAAE,OAAO;YACb,WAAW,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,CAAC;YAChE,YAAY,EAAE,CAAC;SACf;KACD;CACD,CAAC,CAAC;AAEH,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC;IAC1B,UAAU,EAAE;QACX;YACC,eAAe;YACf,QAAQ,EAAE,CAAC,sBAAsB,EAAE,uBAAuB,EAAE,sBAAsB,CAAC;YACnF,OAAO,EAAE,CAAC;YACV,YAAY,EAAE,CAAC;YACf,eAAe,EAAE,CAAC;YAClB,gBAAgB,EAAE,CAAC;YACnB,UAAU,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,CAAC;YAClE,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC;YACpC,WAAW,EAAE,CAAC,eAAe,EAAE,SAAS,CAAC;YACzC,SAAS,EAAE,qBAAqB;YAChC,OAAO,EAAE,qBAAqB;YAC9B,cAAc,EAAE;gBACf;oBACC,OAAO,EAAE,EAAE;oBACX,IAAI,EAAE,OAAO;iBACb;aACD;SACD;KACD;CACD,CAAC,CAAC;AAEH,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC"}
1
+ {"version":3,"file":"mock.js","sourceRoot":"","sources":["../../../src/data/board/mock.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,QAAQ,CAAC;AAE1B,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC;IAC3B,QAAQ,EAAE;QACT;YACC,OAAO,EAAE,EAAE;YACX,SAAS,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,OAAO,CAAC;YAC/D,IAAI,EAAE,OAAO;YACb,WAAW,EAAE,CAAC,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,CAAC;YAChE,YAAY,EAAE,CAAC;YACf,uBAAuB;YACvB,KAAK;YACL,oBAAoB;YACpB,+FAA+F;YAC/F,iCAAiC;YACjC,qBAAqB;YACrB,wBAAwB;YACxB,yBAAyB;YACzB,wEAAwE;YACxE,0CAA0C;YAC1C,+CAA+C;YAC/C,4CAA4C;YAC5C,oCAAoC;YACpC,sBAAsB;YACtB,OAAO;YACP,mBAAmB;YACnB,oBAAoB;YACpB,OAAO;YACP,MAAM;YACN,KAAK;YACL,IAAI;SACJ;KACD;CACD,CAAC,CAAC;AAEH,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC;IAC1B,UAAU,EAAE;QACX;YACC,eAAe;YACf,QAAQ,EAAE,CAAC,sBAAsB,EAAE,uBAAuB,EAAE,sBAAsB,CAAC;YACnF,OAAO,EAAE,CAAC;YACV,YAAY,EAAE,CAAC;YACf,eAAe,EAAE,CAAC;YAClB,gBAAgB,EAAE,CAAC;YACnB,UAAU,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,SAAS,CAAC;YAClE,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC;YACpC,WAAW,EAAE,CAAC,eAAe,EAAE,SAAS,CAAC;YACzC,SAAS,EAAE,qBAAqB;YAChC,OAAO,EAAE,qBAAqB;YAC9B,cAAc,EAAE;gBACf;oBACC,OAAO,EAAE,EAAE;oBACX,IAAI,EAAE,OAAO;iBACb;aACD;SACD;KACD;CACD,CAAC,CAAC;AAEH,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC"}
@@ -1,5 +1,5 @@
1
- import { IDocument, ITag } from "@voplus/morpho-document";
2
1
  import { IContactAvatar } from "../task";
2
+ import { IDocument } from "@voplus/morpho-document";
3
3
  export interface IAgenda extends IDocument {
4
4
  /** Total time in number of minutes */
5
5
  time?: number;
@@ -17,8 +17,6 @@ export interface IMeeting extends IDocument {
17
17
  members: IContactAvatar[];
18
18
  /** */
19
19
  channelId: string;
20
- /** Tag of meeting*/
21
- tags?: ITag[];
22
20
  /** Number of meeting */
23
21
  taskNumbers?: number;
24
22
  /** Number of incomplete of meeting */
@@ -2,7 +2,7 @@ import React from "react";
2
2
  import { faColumns } from "@fortawesome/pro-solid-svg-icons";
3
3
  import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
4
4
  import { DefaultDocumentTypeMeta } from "@voplus/morpho-document";
5
- import MeetingDetail from "../../modules/meeting/components/MeetingDetail";
5
+ import MeetingPropertiesView from "../../modules/meeting/components/MeetingPropertiesView";
6
6
  import MeetingQuickViewDialog from "../../modules/meeting/components/MeetingQuickViewDialog";
7
7
  /** Meta information for Meeting document. */
8
8
  export class MeetingTypeMeta extends DefaultDocumentTypeMeta {
@@ -16,7 +16,7 @@ export class MeetingTypeMeta extends DefaultDocumentTypeMeta {
16
16
  throw new Error("Method not implemented.");
17
17
  }
18
18
  getPropertiesView(document) {
19
- return React.createElement(MeetingDetail, { id: document.id });
19
+ return React.createElement(MeetingPropertiesView, { id: document.id });
20
20
  }
21
21
  getQuickView(document, props) {
22
22
  props.id = document.id;
@@ -1 +1 @@
1
- {"version":3,"file":"metas.js","sourceRoot":"","sources":["../../../src/data/meeting/metas.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,uBAAuB,EAAa,MAAM,yBAAyB,CAAC;AAG7E,OAAO,aAAa,MAAM,gDAAgD,CAAC;AAC3E,OAAO,sBAAsB,MAAM,yDAAyD,CAAC;AAE7F,6CAA6C;AAC7C,MAAM,OAAO,eAAgB,SAAQ,uBAAuB;IAG3D,IAAW,IAAI;QACd,OAAO,eAAe,CAAC,QAAQ,CAAC;IACjC,CAAC;IAEM,OAAO,CAAC,QAAmB;QACjC,OAAO,oBAAC,eAAe,IAAC,IAAI,EAAE,SAAS,GAAI,CAAC;IAC7C,CAAC;IAEM,SAAS,CAAC,QAAmB;QACnC,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC5C,CAAC;IAEM,iBAAiB,CAAC,QAAmB;QAC3C,OAAO,oBAAC,aAAa,IAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,GAAI,CAAC;IAC3C,CAAC;IAEM,YAAY,CAAC,QAAmB,EAAE,KAAqB;QAC7D,KAAK,CAAC,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAC;QACvB,OAAO,CACN,oBAAC,sBAAsB,IAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,GAAI,CAC7F,CAAC;IACH,CAAC;;AAvBa,wBAAQ,GAAG,SAAS,CAAC"}
1
+ {"version":3,"file":"metas.js","sourceRoot":"","sources":["../../../src/data/meeting/metas.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,uBAAuB,EAAa,MAAM,yBAAyB,CAAC;AAG7E,OAAO,qBAAqB,MAAM,wDAAwD,CAAC;AAC3F,OAAO,sBAAsB,MAAM,yDAAyD,CAAC;AAE7F,6CAA6C;AAC7C,MAAM,OAAO,eAAgB,SAAQ,uBAAuB;IAG3D,IAAW,IAAI;QACd,OAAO,eAAe,CAAC,QAAQ,CAAC;IACjC,CAAC;IAEM,OAAO,CAAC,QAAmB;QACjC,OAAO,oBAAC,eAAe,IAAC,IAAI,EAAE,SAAS,GAAI,CAAC;IAC7C,CAAC;IAEM,SAAS,CAAC,QAAmB;QACnC,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC5C,CAAC;IAEM,iBAAiB,CAAC,QAAmB;QAC3C,OAAO,oBAAC,qBAAqB,IAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,GAAI,CAAC;IACnD,CAAC;IAEM,YAAY,CAAC,QAAmB,EAAE,KAAqB;QAC7D,KAAK,CAAC,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAC;QACvB,OAAO,CACN,oBAAC,sBAAsB,IAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,GAAI,CAC7F,CAAC;IACH,CAAC;;AAvBa,wBAAQ,GAAG,SAAS,CAAC"}
@@ -1,4 +1,4 @@
1
- import { IDocument, ITag } from "@voplus/morpho-document";
1
+ import { IDocument } from "@voplus/morpho-document";
2
2
  export interface IContactAvatar {
3
3
  /** Id of the contact */
4
4
  id: string;
@@ -8,6 +8,8 @@ export interface IContactAvatar {
8
8
  avatarUrl: string;
9
9
  }
10
10
  export interface ITask extends IDocument {
11
+ /** Number of estimated hours to complete the task. */
12
+ estimatedHours?: number;
11
13
  /** Start date of the task */
12
14
  startDate?: Date;
13
15
  /** Due date of the task */
@@ -27,8 +29,6 @@ export interface ITask extends IDocument {
27
29
  important?: boolean;
28
30
  channelId: string;
29
31
  label?: any[];
30
- /** tag of task */
31
- tags?: ITag[];
32
32
  /** Number of task */
33
33
  taskNumbers?: number;
34
34
  /** Number of incomplete of task */
@@ -2,7 +2,7 @@ import { faBallot } from "@fortawesome/pro-solid-svg-icons";
2
2
  import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
3
3
  import { DefaultDocumentTypeMeta } from "@voplus/morpho-document";
4
4
  import React from "react";
5
- import TaskDetail from "../../modules/tasks/components/TaskDetail";
5
+ import TaskDetail from "../../modules/tasks/components/TaskPropertiesView";
6
6
  import TaskQuickViewDialog from "../../modules/tasks/components/TaskQuickViewDialog";
7
7
  /** Meta information for Task document. */
8
8
  export class TaskTypeMeta extends DefaultDocumentTypeMeta {
@@ -1 +1 @@
1
- {"version":3,"file":"metas.js","sourceRoot":"","sources":["../../../src/data/task/metas.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,uBAAuB,EAAa,MAAM,yBAAyB,CAAC;AAE7E,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,UAAU,MAAM,2CAA2C,CAAC;AACnE,OAAO,mBAAmB,MAAM,oDAAoD,CAAC;AAErF,0CAA0C;AAC1C,MAAM,OAAO,YAAa,SAAQ,uBAAuB;IAGxD,IAAW,IAAI;QACd,OAAO,YAAY,CAAC,QAAQ,CAAC;IAC9B,CAAC;IAEM,OAAO,CAAC,QAAmB;QACjC,OAAO,oBAAC,eAAe,IAAC,IAAI,EAAE,QAAQ,GAAI,CAAC;IAC5C,CAAC;IAEM,iBAAiB,CAAC,QAAmB;QAC3C,OAAO,oBAAC,UAAU,IAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,GAAI,CAAC;IACxC,CAAC;IAEM,YAAY,CAAC,QAAmB,EAAE,KAAqB;QAC7D,KAAK,CAAC,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAC;QACvB,OAAO,CACN,oBAAC,mBAAmB,IAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,GAAI,CAC1F,CAAC;IACH,CAAC;;AAnBa,qBAAQ,GAAG,MAAM,CAAC"}
1
+ {"version":3,"file":"metas.js","sourceRoot":"","sources":["../../../src/data/task/metas.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,kCAAkC,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,uBAAuB,EAAa,MAAM,yBAAyB,CAAC;AAE7E,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,UAAU,MAAM,mDAAmD,CAAC;AAC3E,OAAO,mBAAmB,MAAM,oDAAoD,CAAC;AAErF,0CAA0C;AAC1C,MAAM,OAAO,YAAa,SAAQ,uBAAuB;IAGxD,IAAW,IAAI;QACd,OAAO,YAAY,CAAC,QAAQ,CAAC;IAC9B,CAAC;IAEM,OAAO,CAAC,QAAmB;QACjC,OAAO,oBAAC,eAAe,IAAC,IAAI,EAAE,QAAQ,GAAI,CAAC;IAC5C,CAAC;IAEM,iBAAiB,CAAC,QAAmB;QAC3C,OAAO,oBAAC,UAAU,IAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,GAAI,CAAC;IACxC,CAAC;IAEM,YAAY,CAAC,QAAmB,EAAE,KAAqB;QAC7D,KAAK,CAAC,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAC;QACvB,OAAO,CACN,oBAAC,mBAAmB,IAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,GAAI,CAC1F,CAAC;IACH,CAAC;;AAnBa,qBAAQ,GAAG,MAAM,CAAC"}
@@ -18,6 +18,7 @@ export declare type CreateTaskOptions = {
18
18
  export declare type EditTaskOptions = {
19
19
  Name?: string;
20
20
  Description?: string;
21
+ EstimatedHours?: number;
21
22
  StartDate?: Date;
22
23
  DueDate?: Date;
23
24
  TaskStatus?: string;
@@ -1,18 +1,18 @@
1
+ import { Button, Checkbox, Input, Spin, Tooltip, message } from "@voplus/antd";
2
+ import React, { useState } from "react";
1
3
  import { faBars, faCommentDots, faCopy, faPaperclip, faSave, faUndo } from "@fortawesome/pro-light-svg-icons";
2
- import { FontAwesomeIcon as FAIcon } from "@fortawesome/react-fontawesome";
3
- import { Button, Checkbox, Input, message, Spin, Tooltip } from "@voplus/antd";
4
- import { useLayout } from "@voplus/morpho-data";
5
4
  import { useDocument, useDocumentStore } from "@voplus/morpho-document";
6
- import DocumentQuickViewDialog from "@voplus/morpho-document/es/components/QuickViewDialog";
7
5
  import Card from "@voplus/morpho-ui/es/controls/Card";
8
- import classnames from "classnames";
9
- import { useObserver } from "mobx-react-lite";
10
- import React, { useState } from "react";
11
- import ToolBar from "../../../../components/ToolBar";
6
+ import DocumentQuickViewDialog from "@voplus/morpho-document/es/components/DocumentQuickViewDialog";
7
+ import { FontAwesomeIcon as FAIcon } from "@fortawesome/react-fontawesome";
12
8
  import FlagIcon from "../../../../controls/FlagIcon";
13
9
  import { LinkStore } from "../../../../data/board";
14
- import styles from "./index.less";
15
10
  import { State } from "./state";
11
+ import ToolBar from "../../../../components/ToolBar";
12
+ import classnames from "classnames";
13
+ import styles from "./index.less";
14
+ import { useLayout } from "@voplus/morpho-data";
15
+ import { useObserver } from "mobx-react-lite";
16
16
  const DocumentCard = (props) => {
17
17
  const [state] = useState(new State());
18
18
  const [store] = useState(new LinkStore());
@@ -104,7 +104,7 @@ const DocumentCard = (props) => {
104
104
  React.createElement(FAIcon, { icon: faUndo })),
105
105
  React.createElement(Button, { type: "primary", size: "small", ghost: true, shape: "circle", onClick: onSave },
106
106
  React.createElement(FAIcon, { icon: faSave })))))),
107
- React.createElement(DocumentQuickViewDialog, { id: props.id, visible: state.visibleQuickView, onCancel: () => (state.visibleQuickView = false) })));
107
+ React.createElement(DocumentQuickViewDialog, { id: props.id, doc: state.document, visible: state.visibleQuickView, onCancel: () => (state.visibleQuickView = false) })));
108
108
  });
109
109
  };
110
110
  export default DocumentCard;
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/board/components/DocumentCard/index.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/board/components/DocumentCard/index.tsx"],"names":[],"mappings":"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"}
@@ -34,8 +34,8 @@
34
34
  > span:hover {
35
35
  color: @primary-color;
36
36
  }
37
- .task-icon-move {
38
- &:hover {
37
+ .task-icon-move{
38
+ &:hover{
39
39
  color: #666;
40
40
  }
41
41
  .svg-inline--fa {
@@ -47,7 +47,7 @@
47
47
  }
48
48
  }
49
49
  .task-card-label {
50
- height: 24px;
50
+ height: 23px;
51
51
  margin-top: 8px;
52
52
  .item {
53
53
  display: inline-block;
@@ -111,5 +111,6 @@
111
111
  opacity: 0.5;
112
112
  }
113
113
  }
114
+
114
115
  }
115
116
  }
@@ -1,16 +1,16 @@
1
+ import { Button, DatePicker, Form, Input, Modal, Spin, message } from "@voplus/antd";
2
+ import React, { useState } from "react";
1
3
  import { faCalendar, faCalendarCheck, faFlag, faListAlt, faTimes, faUserPlus } from "@fortawesome/pro-light-svg-icons";
4
+ import AvatarList from "../../../../components/AvatarList";
2
5
  import { FontAwesomeIcon as FAIcon } from "@fortawesome/react-fontawesome";
3
- import { Button, DatePicker, Form, Input, message, Modal, Spin } from "@voplus/antd";
4
- import { useDocumentStore } from "@voplus/morpho-document";
5
- import { useObserver } from "mobx-react-lite";
6
- import moment from "moment";
7
- import React, { useState } from "react";
8
6
  import FlagIcon from "../../../../controls/FlagIcon";
9
- import AvatarList from "../../../../components/AvatarList";
10
- import { useBoardStore } from "../../../../data/board";
7
+ import { State } from "./state";
11
8
  import TaskForm from "../../../tasks/components/NewTaskForm";
9
+ import moment from "moment";
12
10
  import styles from "./index.less";
13
- import { State } from "./state";
11
+ import { useBoardStore } from "../../../../data/board";
12
+ import { useDocumentStore } from "@voplus/morpho-document";
13
+ import { useObserver } from "mobx-react-lite";
14
14
  const NewTaskForm = (props) => {
15
15
  const boards = useBoardStore();
16
16
  const document = useDocumentStore();
@@ -53,11 +53,11 @@ const NewTaskForm = (props) => {
53
53
  return +moment(StartDate) > +moment(DueDate);
54
54
  };
55
55
  const disabledEndDate = (DueDate) => {
56
- const { StartDate } = state.params;
57
- if (!DueDate || !StartDate) {
58
- return false;
59
- }
60
- return +moment(DueDate) <= +moment(StartDate);
56
+ // const { StartDate } = state.params;
57
+ // if (!DueDate || !StartDate) {
58
+ // return false;
59
+ // }
60
+ // return +moment(DueDate) <= +moment(StartDate);
61
61
  };
62
62
  return useObserver(() => (React.createElement("div", { className: styles["add-board-form"] },
63
63
  React.createElement(Form, null,
@@ -74,9 +74,7 @@ const NewTaskForm = (props) => {
74
74
  React.createElement("span", { className: "datePicker" },
75
75
  startDate ? (React.createElement("span", { className: "task-date" }, startDate)) : (React.createElement(FAIcon, { className: "fa-icon", icon: faCalendar })),
76
76
  React.createElement(DatePicker, { value: state.params.StartDate, disabledDate: value => disabledStartDate(value), onChange: (value, dateString, type) => onChange(value, dateString, "start"), allowClear: false })),
77
- React.createElement("span", { className: "datePicker" },
78
- dueDate ? (React.createElement("span", { className: "task-date" }, dueDate)) : (React.createElement(FAIcon, { className: "fa-icon", icon: faCalendarCheck })),
79
- React.createElement(DatePicker, { value: state.params.DueDate, disabledDate: value => disabledEndDate(value), onChange: (value, dateString, type) => onChange(value, dateString, "due"), allowClear: false })),
77
+ React.createElement("span", { className: "datePicker" }, dueDate ? (React.createElement("span", { className: "task-date" }, dueDate)) : (React.createElement(FAIcon, { className: "fa-icon", icon: faCalendarCheck }))),
80
78
  React.createElement("span", { className: "task-manager", onClick: () => (state.assign = !state.assign) },
81
79
  React.createElement(AvatarList, { className: "manager", num: 1, icon: React.createElement(FAIcon, { icon: faUserPlus }), list: state.memberIds, onChange: onAvatarChange }))),
82
80
  React.createElement(Button, { type: "primary", size: "small", onClick: onSave }, "SAVE")))),
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/board/components/NewTaskForm/index.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/board/components/NewTaskForm/index.tsx"],"names":[],"mappings":"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"}
@@ -0,0 +1,6 @@
1
+ /// <reference types="react" />
2
+ declare const CalendarMenu: (props: {
3
+ layout?: any;
4
+ onEdit?: (() => void) | undefined;
5
+ }) => JSX.Element;
6
+ export default CalendarMenu;
@@ -0,0 +1,42 @@
1
+ import { Button, Dropdown, Menu } from "@voplus/antd";
2
+ import { faArchive, faCopy, faCut, faEllipsisH, faExternalLink, faPencilAlt, faProjectDiagram, faStream, faTrashAlt, faWindowRestore } from "@fortawesome/pro-light-svg-icons";
3
+ import { FontAwesomeIcon as FAIcon } from "@fortawesome/react-fontawesome";
4
+ import React from "react";
5
+ import styles from "./index.less";
6
+ const CalendarMenu = (props) => {
7
+ const { layout, onEdit } = { ...props };
8
+ const menu = (React.createElement(Menu, { className: styles["more-calendar-dropdown"] },
9
+ React.createElement(Menu.Item, null,
10
+ React.createElement("div", { className: "menu-item" },
11
+ React.createElement(Button, { className: "menu-open", onClick: () => layout.history.push("/tasks/1") },
12
+ React.createElement(FAIcon, { icon: faExternalLink })),
13
+ React.createElement(Button, { className: "menu-edit", onClick: onEdit },
14
+ React.createElement(FAIcon, { icon: faPencilAlt })),
15
+ React.createElement(Button, { className: "menu-del" },
16
+ React.createElement(FAIcon, { icon: faTrashAlt })))),
17
+ React.createElement(Menu.Item, null,
18
+ React.createElement(FAIcon, { icon: faProjectDiagram, color: "#666", size: "sm" }),
19
+ React.createElement("span", { className: "type-name" }, "convert to subtask")),
20
+ React.createElement(Menu.Item, null,
21
+ React.createElement(FAIcon, { icon: faStream, color: "#666", size: "sm" }),
22
+ React.createElement("span", { className: "type-name" }, "dependencies")),
23
+ React.createElement(Menu.Item, null,
24
+ React.createElement(FAIcon, { icon: faCopy, color: "#666", size: "sm" }),
25
+ React.createElement("span", { className: "type-name" }, "duplicate")),
26
+ React.createElement(Menu.Item, null,
27
+ React.createElement(FAIcon, { icon: faCut, color: "#666", size: "sm" }),
28
+ React.createElement("span", { className: "type-name" }, "move")),
29
+ React.createElement(Menu.Item, null,
30
+ React.createElement(FAIcon, { icon: faWindowRestore, color: "#666", size: "sm" }),
31
+ React.createElement("span", { className: "type-name" }, "merge")),
32
+ React.createElement(Menu.Item, null,
33
+ React.createElement(FAIcon, { icon: faArchive, color: "#666", size: "sm" }),
34
+ React.createElement("span", { className: "type-name" }, "archive")),
35
+ React.createElement(Menu.Item, null,
36
+ React.createElement(Button, { className: "menu-cancel" }, "cancel"))));
37
+ return (React.createElement(Dropdown, { overlay: menu, className: "calendar-menu" },
38
+ React.createElement("span", null,
39
+ React.createElement(FAIcon, { icon: faEllipsisH }))));
40
+ };
41
+ export default CalendarMenu;
42
+ //# sourceMappingURL=index.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/modules/calendar/components/CalendarMenu/index.tsx"],"names":[],"mappings":"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"}
@@ -0,0 +1,32 @@
1
+ .more-calendar-dropdown{
2
+ :global {
3
+ .menu-item{
4
+ display: flex;
5
+ >.ant-btn{
6
+ flex: 1;
7
+ padding: 0;
8
+ background: none;
9
+ border: none;
10
+ }
11
+ .ant-btn:hover {
12
+ box-shadow: none;
13
+ }
14
+ .menu-open{
15
+ text-align: left;
16
+ }
17
+ .menu-edit{
18
+ text-align: center;
19
+ }
20
+ .menu-del{
21
+ text-align: right;
22
+ }
23
+ }
24
+ .menu-cancel{
25
+ width: 100%;
26
+ }
27
+ .type-name {
28
+ margin-left: 10px;
29
+ display: inline-block;
30
+ }
31
+ }
32
+ }
@@ -1,13 +1,64 @@
1
1
  @import "../../../../style/common.less";
2
2
  .calendar-task {
3
+ height: 100%;
3
4
  display: flex;
4
5
  align-items: center;
5
- padding: 3px 2px;
6
+ padding: 3px 5px;
7
+ position: relative;
6
8
  :global {
7
9
  .task-card-title {
8
10
  flex: 1;
9
11
  line-height: 24px;
10
12
  margin: 0 3px;
13
+ overflow: hidden;
14
+ white-space: nowrap;
15
+ text-overflow:ellipsis;
16
+ .ant-input{
17
+ padding: 0;
18
+ text-indent: 10px;
19
+ }
20
+ }
21
+ .task-status{
22
+ font-size: 16px;
23
+ margin-left: 3px;
24
+ }
25
+ .calendar-menu {
26
+ color: #ffffff;
27
+ font-size: 16px;
28
+ margin-left: 6px;
11
29
  }
12
30
  }
13
31
  }
32
+
33
+ .more-operate-dropdown {
34
+ :global {
35
+ .menu-item{
36
+ display: flex;
37
+ >.ant-btn{
38
+ flex: 1;
39
+ padding: 0;
40
+ background: none;
41
+ border: none;
42
+ }
43
+ .ant-btn:hover {
44
+ box-shadow: none;
45
+ }
46
+ .menu-open{
47
+ text-align: left;
48
+ }
49
+ .menu-edit{
50
+ text-align: center;
51
+ }
52
+ .menu-del{
53
+ text-align: right;
54
+ }
55
+ }
56
+ .menu-cancel{
57
+ width: 100%;
58
+ }
59
+ .type-name {
60
+ margin-left: 10px;
61
+ display: inline-block;
62
+ }
63
+ }
64
+ }