@voplus/morpho-workspace 1.0.0-dev16 → 1.0.0-dev18

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 (103) hide show
  1. package/es/components/AvatarList/index.js +9 -5
  2. package/es/components/AvatarList/index.js.map +1 -1
  3. package/es/components/ListHeader/index.js +3 -2
  4. package/es/components/ListHeader/index.js.map +1 -1
  5. package/es/components/ListView/index.d.ts +2 -1
  6. package/es/components/ListView/index.js +26 -16
  7. package/es/components/ListView/index.js.map +1 -1
  8. package/es/components/PageListView/index.d.ts +14 -23
  9. package/es/components/PageListView/index.js +35 -38
  10. package/es/components/PageListView/index.js.map +1 -1
  11. package/es/components/PageListView/state.d.ts +9 -0
  12. package/es/components/PageListView/state.js +36 -0
  13. package/es/components/PageListView/state.js.map +1 -0
  14. package/es/components/RichTextEditor/index.js +3 -3
  15. package/es/components/RichTextEditor/index.js.map +1 -1
  16. package/es/components/SortDnD/Card.js +7 -2
  17. package/es/components/SortDnD/Card.js.map +1 -1
  18. package/es/components/SortDnD/Container.d.ts +2 -1
  19. package/es/components/SortDnD/Container.js +5 -5
  20. package/es/components/SortDnD/Container.js.map +1 -1
  21. package/es/components/SortDnD/index.d.ts +1 -0
  22. package/es/components/SortDnD/index.js +1 -1
  23. package/es/components/SortDnD/index.js.map +1 -1
  24. package/es/controls/FilterListDropdown/index.js +2 -2
  25. package/es/controls/FilterListDropdown/index.js.map +1 -1
  26. package/es/controls/FilterListDropdown/index.less +1 -0
  27. package/es/controls/FilterViewsDropdown/index.js +0 -6
  28. package/es/controls/FilterViewsDropdown/index.js.map +1 -1
  29. package/es/controls/SortViewDropdown/index.js +8 -5
  30. package/es/controls/SortViewDropdown/index.js.map +1 -1
  31. package/es/controls/SortViewDropdown/state.d.ts +1 -0
  32. package/es/controls/SortViewDropdown/state.js +4 -0
  33. package/es/controls/SortViewDropdown/state.js.map +1 -1
  34. package/es/data/contexts/StoreContext/index.d.ts +3 -2
  35. package/es/data/contexts/StoreContext/index.js +17 -10
  36. package/es/data/contexts/StoreContext/index.js.map +1 -1
  37. package/es/data/task/TaskStore.d.ts +1 -1
  38. package/es/data/task/TaskStore.js +8 -1
  39. package/es/data/task/TaskStore.js.map +1 -1
  40. package/es/modules/document/components/DocumentDetail/index.js +2 -2
  41. package/es/modules/document/components/DocumentDetail/index.js.map +1 -1
  42. package/es/modules/document/components/DocumentItem/index.js +2 -2
  43. package/es/modules/document/components/DocumentItem/index.js.map +1 -1
  44. package/es/modules/document/pages/DocumentListView/index.js +2 -1
  45. package/es/modules/document/pages/DocumentListView/index.js.map +1 -1
  46. package/es/modules/document/pages/DocumentTabView/index.js +2 -2
  47. package/es/modules/document/pages/DocumentTabView/index.js.map +1 -1
  48. package/es/modules/meeting/components/AgendaList/TaskItem/index.js +1 -3
  49. package/es/modules/meeting/components/AgendaList/TaskItem/index.js.map +1 -1
  50. package/es/modules/meeting/components/AgendaList/index.js +10 -7
  51. package/es/modules/meeting/components/AgendaList/index.js.map +1 -1
  52. package/es/modules/meeting/components/MeetingDetail/index.js +6 -6
  53. package/es/modules/meeting/components/MeetingDetail/index.js.map +1 -1
  54. package/es/modules/meeting/components/MeetingItem/index.js +1 -1
  55. package/es/modules/meeting/components/MeetingItem/index.js.map +1 -1
  56. package/es/modules/meeting/components/MeetingItem/index.less +2 -1
  57. package/es/modules/meeting/components/MeetingList/index.js +10 -9
  58. package/es/modules/meeting/components/MeetingList/index.js.map +1 -1
  59. package/es/modules/meeting/components/NewMeetingForm/index.d.ts +1 -3
  60. package/es/modules/meeting/components/NewMeetingForm/index.js +12 -13
  61. package/es/modules/meeting/components/NewMeetingForm/index.js.map +1 -1
  62. package/es/modules/meeting/pages/MeetingListView/index.js +1 -1
  63. package/es/modules/meeting/pages/MeetingListView/index.js.map +1 -1
  64. package/es/modules/meeting/pages/MeetingTabView/index.js +8 -8
  65. package/es/modules/meeting/pages/MeetingTabView/index.js.map +1 -1
  66. package/es/modules/tasks/components/NewTaskForm/index.d.ts +1 -0
  67. package/es/modules/tasks/components/NewTaskForm/index.js +9 -14
  68. package/es/modules/tasks/components/NewTaskForm/index.js.map +1 -1
  69. package/es/modules/tasks/components/NewTaskForm/index.less +14 -2
  70. package/es/modules/tasks/components/SubTaskList/index.js +75 -64
  71. package/es/modules/tasks/components/SubTaskList/index.js.map +1 -1
  72. package/es/modules/tasks/components/SubTaskList/index.less +1 -6
  73. package/es/modules/tasks/components/SubTaskList/state.js +1 -2
  74. package/es/modules/tasks/components/SubTaskList/state.js.map +1 -1
  75. package/es/modules/tasks/components/TaskDetail/index.js +4 -8
  76. package/es/modules/tasks/components/TaskDetail/index.js.map +1 -1
  77. package/es/modules/tasks/components/TaskItem/TaskItem.js +10 -4
  78. package/es/modules/tasks/components/TaskItem/TaskItem.js.map +1 -1
  79. package/es/modules/tasks/components/TaskItem/index.d.ts +0 -1
  80. package/es/modules/tasks/components/TaskItem/index.js +0 -1
  81. package/es/modules/tasks/components/TaskItem/index.js.map +1 -1
  82. package/es/modules/tasks/components/TaskItem/index.less +10 -0
  83. package/es/modules/tasks/components/TaskList/index.js +22 -22
  84. package/es/modules/tasks/components/TaskList/index.js.map +1 -1
  85. package/es/modules/tasks/components/TaskList/state.d.ts +2 -1
  86. package/es/modules/tasks/components/TaskList/state.js +9 -9
  87. package/es/modules/tasks/components/TaskList/state.js.map +1 -1
  88. package/es/modules/tasks/pages/TaskDefaultView/index.js +9 -8
  89. package/es/modules/tasks/pages/TaskDefaultView/index.js.map +1 -1
  90. package/es/modules/tasks/pages/TaskListView/index.js +2 -1
  91. package/es/modules/tasks/pages/TaskListView/index.js.map +1 -1
  92. package/es/modules/tasks/pages/TaskTabView/index.js +61 -5
  93. package/es/modules/tasks/pages/TaskTabView/index.js.map +1 -1
  94. package/es/modules/tasks/pages/TaskTabView/index.less +21 -0
  95. package/es/styles/common.less +3 -0
  96. package/package.json +44 -50
  97. package/es/components/DocumentList/index.d.ts +0 -13
  98. package/es/components/DocumentList/index.js +0 -116
  99. package/es/components/DocumentList/index.js.map +0 -1
  100. package/es/components/DocumentList/index.less +0 -66
  101. package/es/components/PageListView/data/index.d.ts +0 -9
  102. package/es/components/PageListView/data/index.js +0 -29
  103. package/es/components/PageListView/data/index.js.map +0 -1
@@ -1,5 +1,7 @@
1
1
  import classnames from "classnames";
2
2
  import React, { useEffect, useState } from "react";
3
+ import { faCheck } from "@fortawesome/pro-light-svg-icons";
4
+ import { FontAwesomeIcon as FAIcon } from "@fortawesome/react-fontawesome";
3
5
  import { Avatar, Dropdown, Icon, Input, Menu, Tooltip } from "@voplus/antd";
4
6
  import { useContactListEffect } from "@voplus/morpho-org";
5
7
  import { useObserver } from "mobx-react-lite";
@@ -34,7 +36,7 @@ const AvatarList = (props) => {
34
36
  useEffect(() => {
35
37
  state.items = [];
36
38
  load();
37
- }, [props.list]);
39
+ }, [state.visible]);
38
40
  const load = () => {
39
41
  const avatarList = props.list || [];
40
42
  state.items = state.list.map(item => ({
@@ -49,21 +51,23 @@ const AvatarList = (props) => {
49
51
  });
50
52
  return str;
51
53
  };
54
+ const colorList = ["#765FEE", "#fe4066", "#FFC832", "#FF8F5E", "#3AC43A", "#FFC832"];
55
+ // const colorList = [ "#FF7285", "rgb(255, 202, 131)"];
52
56
  const { list, size, editable } = props;
53
57
  return useObserver(() => (
54
58
  // props.list.slice(0, props.num)
55
59
  React.createElement("div", { className: classnames(styles["avatar-list"], props.className) },
56
60
  list &&
57
- list.map((item, index) => (React.createElement(Tooltip, { key: index, title: item.name },
58
- React.createElement(Avatar, { src: item.url, size: size, className: "avatar-img" }, setName(item.name))))),
61
+ list.slice(0, props.num || list.length).map((item, index) => (React.createElement(Tooltip, { key: index, title: item.name },
62
+ React.createElement(Avatar, { src: item.url, size: size, className: "avatar-img", style: item.url ? {} : { backgroundColor: colorList[index % 6] } }, setName(item.name))))),
59
63
  editable ? (React.createElement(Dropdown, { onVisibleChange: visibleChange, visible: state.visible, overlay: React.createElement(Menu, null,
60
64
  React.createElement("div", { className: "avatar-search" },
61
65
  React.createElement(Input.Search, { onSearch: searchByKeWord })),
62
66
  state.items.map((item, index) => (React.createElement(Menu.Item, { key: item.id },
63
67
  React.createElement("div", { className: "avatar-item", onClick: () => onTick(item, !item.checked) },
64
- React.createElement(Avatar, { src: item.url, size: size, className: "avatar-img" }),
68
+ React.createElement(Avatar, { src: item.url, size: size, className: "avatar-img", style: { backgroundColor: colorList[index % 6] } }),
65
69
  item.name,
66
- item.checked && React.createElement(Icon, { type: "check", className: "icon-check" }),
70
+ item.checked && React.createElement(FAIcon, { icon: faCheck, className: "icon-check" }),
67
71
  state.loading && state.itemId === item.id && (React.createElement(Icon, { type: "loading", className: "icon-check" }))))))), overlayClassName: styles["avatar-dropdown"], placement: "bottomCenter", trigger: ["click"], getPopupContainer: (triggerNode) => triggerNode.parentElement },
68
72
  React.createElement(Avatar, { size: size, className: "avatar-text" },
69
73
  "+",
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/AvatarList/index.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/AvatarList/index.tsx"],"names":[],"mappings":"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"}
@@ -7,6 +7,7 @@ import FilterListDropdown from "../../controls/FilterListDropdown";
7
7
  import FilterViewsDropdown from "../../controls/FilterViewsDropdown";
8
8
  import { useSort } from "../../data/contexts/SortContext";
9
9
  import styles from "./index.less";
10
+ import { useObserver } from "mobx-react-lite";
10
11
  const ListHeader = (props) => {
11
12
  const onAddNewForm = () => {
12
13
  props.onAddNewForm();
@@ -14,7 +15,7 @@ const ListHeader = (props) => {
14
15
  const sortStore = useSort();
15
16
  const isCanDrag = !!(sortStore && sortStore.canDrag);
16
17
  const { sort, sortView, filterList, filterView, form } = props;
17
- return (React.createElement(Row, { type: "flex", justify: "space-between", align: "middle", className: styles["list-header"] },
18
+ return useObserver(() => (React.createElement(Row, { type: "flex", justify: "space-between", align: "middle", className: styles["list-header"] },
18
19
  React.createElement("div", null, filterView && React.createElement(FilterViewsDropdown, null)),
19
20
  React.createElement("div", null,
20
21
  sort && (React.createElement(Tooltip, { title: isCanDrag ? "Cancel drag sort" : "Drag and drop sort" },
@@ -25,7 +26,7 @@ const ListHeader = (props) => {
25
26
  filterList && (React.createElement("span", { className: "icon-margin" },
26
27
  React.createElement(FilterListDropdown, { onChange: ({ value }) => sortStore.setFilters(value) }))),
27
28
  form && (React.createElement("span", { onClick: onAddNewForm, className: "plus-icon" },
28
- React.createElement(FAIcon, { icon: faPlus, color: "#fff" }))))));
29
+ React.createElement(FAIcon, { icon: faPlus, color: "#fff" })))))));
29
30
  };
30
31
  ListHeader.defaultProps = {
31
32
  sort: true,
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/ListHeader/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAc,cAAc,EAAE,MAAM,kCAAkC,CAAC;AACtF,OAAO,EAAE,eAAe,IAAI,MAAM,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,gBAAgB,MAAM,iCAAiC,CAAC;AAC/D,OAAO,kBAAkB,MAAM,mCAAmC,CAAC;AACnE,OAAO,mBAAmB,MAAM,oCAAoC,CAAC;AAErE,OAAO,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAE1D,OAAO,MAAM,MAAM,cAAc,CAAC;AAElC,MAAM,UAAU,GAAG,CAAC,KAQnB,EAAE,EAAE;IACJ,MAAM,YAAY,GAAG,GAAG,EAAE;QACzB,KAAK,CAAC,YAAa,EAAE,CAAC;IACvB,CAAC,CAAC;IACF,MAAM,SAAS,GAAG,OAAO,EAAG,CAAC;IAC7B,MAAM,SAAS,GAAG,CAAC,CAAC,CAAC,SAAS,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC;IACrD,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;IAC/D,OAAO,CACN,oBAAC,GAAG,IAAC,IAAI,EAAC,MAAM,EAAC,OAAO,EAAC,eAAe,EAAC,KAAK,EAAC,QAAQ,EAAC,SAAS,EAAE,MAAM,CAAC,aAAa,CAAC;QACvF,iCAAM,UAAU,IAAI,oBAAC,mBAAmB,OAAG,CAAO;QAClD;YAEE,IAAI,IAAI,CACR,oBAAC,OAAO,IAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,oBAAoB;gBACpE,8BAAM,OAAO,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC;oBAChF,oBAAC,MAAM,IAAC,IAAI,EAAE,cAAc,GAAI,CAC1B,CACE,CACV;YAEA,QAAQ,IAAI,CACZ,8BAAM,SAAS,EAAC,aAAa;gBAC5B,oBAAC,gBAAgB,IAChB,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,IAAI,GAAG,IAAI,CAAC,EACzC,OAAO,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,KAAK,EAAE,GAC/B,CACI,CACP;YACA,UAAU,IAAI,CACd,8BAAM,SAAS,EAAC,aAAa;gBAC5B,oBAAC,kBAAkB,IAAC,QAAQ,EAAE,CAAC,EAAE,KAAK,EAAO,EAAE,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,GAAI,CAC3E,CACP;YACA,IAAI,IAAI,CACR,8BAAM,OAAO,EAAE,YAAY,EAAE,SAAS,EAAC,WAAW;gBACjD,oBAAC,MAAM,IAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAC,MAAM,GAAG,CAC/B,CACP,CACI,CACD,CACN,CAAC;AACH,CAAC,CAAC;AACF,UAAU,CAAC,YAAY,GAAG;IACzB,IAAI,EAAE,IAAI;IACV,QAAQ,EAAE,IAAI;IACd,UAAU,EAAE,IAAI;IAChB,UAAU,EAAE,IAAI;IAChB,IAAI,EAAE,IAAI;CACV,CAAC;AACF,eAAe,UAAU,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/ListHeader/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAc,cAAc,EAAE,MAAM,kCAAkC,CAAC;AACtF,OAAO,EAAE,eAAe,IAAI,MAAM,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,gBAAgB,MAAM,iCAAiC,CAAC;AAC/D,OAAO,kBAAkB,MAAM,mCAAmC,CAAC;AACnE,OAAO,mBAAmB,MAAM,oCAAoC,CAAC;AAErE,OAAO,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAE1D,OAAO,MAAM,MAAM,cAAc,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,MAAM,UAAU,GAAG,CAAC,KAQnB,EAAE,EAAE;IACJ,MAAM,YAAY,GAAG,GAAG,EAAE;QACzB,KAAK,CAAC,YAAa,EAAE,CAAC;IACvB,CAAC,CAAC;IACF,MAAM,SAAS,GAAG,OAAO,EAAG,CAAC;IAC7B,MAAM,SAAS,GAAG,CAAC,CAAC,CAAC,SAAS,IAAI,SAAS,CAAC,OAAO,CAAC,CAAC;IACrD,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;IAC/D,OAAO,WAAW,CAAC,GAAG,EAAE,CAAC,CACxB,oBAAC,GAAG,IAAC,IAAI,EAAC,MAAM,EAAC,OAAO,EAAC,eAAe,EAAC,KAAK,EAAC,QAAQ,EAAC,SAAS,EAAE,MAAM,CAAC,aAAa,CAAC;QACvF,iCAAM,UAAU,IAAI,oBAAC,mBAAmB,OAAG,CAAO;QAClD;YAEE,IAAI,IAAI,CACR,oBAAC,OAAO,IAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,oBAAoB;gBACpE,8BAAM,OAAO,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC;oBAChF,oBAAC,MAAM,IAAC,IAAI,EAAE,cAAc,GAAI,CAC1B,CACE,CACV;YAEA,QAAQ,IAAI,CACZ,8BAAM,SAAS,EAAC,aAAa;gBAC5B,oBAAC,gBAAgB,IAChB,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,IAAI,GAAG,IAAI,CAAC,EACzC,OAAO,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,KAAK,EAAE,GAC/B,CACI,CACP;YACA,UAAU,IAAI,CACd,8BAAM,SAAS,EAAC,aAAa;gBAC5B,oBAAC,kBAAkB,IAAC,QAAQ,EAAE,CAAC,EAAE,KAAK,EAAO,EAAE,EAAE,CAAC,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,GAAI,CAC3E,CACP;YACA,IAAI,IAAI,CACR,8BAAM,OAAO,EAAE,YAAY,EAAE,SAAS,EAAC,WAAW;gBACjD,oBAAC,MAAM,IAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAC,MAAM,GAAG,CAC/B,CACP,CACI,CACD,CACN,CAAC,CAAC;AACJ,CAAC,CAAC;AACF,UAAU,CAAC,YAAY,GAAG;IACzB,IAAI,EAAE,IAAI;IACV,QAAQ,EAAE,IAAI;IACd,UAAU,EAAE,IAAI;IAChB,UAAU,EAAE,IAAI;IAChB,IAAI,EAAE,IAAI;CACV,CAAC;AACF,eAAe,UAAU,CAAC"}
@@ -1,6 +1,7 @@
1
1
  /// <reference types="react" />
2
2
  declare const ListView: (props: {
3
3
  data: any;
4
+ page?: number | undefined;
4
5
  pageSize?: number | undefined;
5
6
  formViewTitle?: any;
6
7
  formView?: any;
@@ -8,7 +9,7 @@ declare const ListView: (props: {
8
9
  renderItem: any;
9
10
  loading?: boolean | undefined;
10
11
  seek?: any;
11
- loadData?: ((page?: number | undefined) => void) | undefined;
12
+ loadMore?: (() => void) | undefined;
12
13
  sort?: boolean | undefined;
13
14
  sortView?: boolean | undefined;
14
15
  filterList?: boolean | undefined;
@@ -1,4 +1,4 @@
1
- import React, { useState } from "react";
1
+ import React, { useState, useEffect, useRef } from "react";
2
2
  import { Scrollbars } from "react-custom-scrollbars";
3
3
  import { faTimes } from "@fortawesome/pro-light-svg-icons";
4
4
  import { FontAwesomeIcon as FAIcon } from "@fortawesome/react-fontawesome";
@@ -12,12 +12,14 @@ import { useSort } from "../../data/contexts/SortContext";
12
12
  const ListView = (props) => {
13
13
  // const asideContext = AsideContent.createContext();
14
14
  const [asideContext] = useState(AsideContent.createContext());
15
- const [pageViewContext] = useState(PageListView.createContext());
15
+ // const [pageViewContext] = useState(PageListView.createContext());
16
16
  const sortStore = useSort();
17
- const [selectedIndex, setSelectedIndex] = useState(-1);
17
+ const [selectedId, setSelectedId] = useState("");
18
+ // pageViewContext.list = props.data;
19
+ // pageViewContext.loading = !!props.loading;
18
20
  // load list data
19
- const loadData = (page) => {
20
- props.loadData(page);
21
+ const loadMore = () => {
22
+ props.loadMore();
21
23
  };
22
24
  // creating a new item
23
25
  const onOpenAside = () => {
@@ -25,23 +27,31 @@ const ListView = (props) => {
25
27
  asideContext.openAside(addFormElement, { span: 12 });
26
28
  };
27
29
  const onItemClick = (id, index) => {
28
- setSelectedIndex(index);
30
+ setSelectedId(id);
29
31
  asideContext.openAside(props.defaultView(id), { span: 12 });
30
32
  };
31
- const addFormElement = (React.createElement("div", { className: "vo-new-form" },
32
- React.createElement("div", { className: "new-form-header" },
33
- React.createElement("span", null, props.formViewTitle),
34
- React.createElement("span", { onClick: () => asideContext.closeAside(), className: "close-icon" },
35
- React.createElement(FAIcon, { icon: faTimes, size: "lg", color: "#666" }))),
36
- React.createElement("div", { className: "new-form-view" }, props.formView)));
37
- const { loading, sort, sortView, filterList, filterView, form } = props;
33
+ const addFormElement = (React.createElement(Scrollbars, null,
34
+ React.createElement("div", { className: "vo-new-form" },
35
+ React.createElement("div", { className: "new-form-header" },
36
+ React.createElement("span", null, props.formViewTitle),
37
+ React.createElement("span", { onClick: () => asideContext.closeAside(), className: "close-icon" },
38
+ React.createElement(FAIcon, { icon: faTimes, size: "lg", color: "#666" }))),
39
+ React.createElement("div", { className: "new-form-view" }, props.formView))));
40
+ const ref = useRef();
41
+ // reset
42
+ useEffect(() => {
43
+ ref.current && ref.current.reset();
44
+ }, [JSON.stringify(sortStore.filters), JSON.stringify(sortStore.data)]);
45
+ const { data, loading, sort, sortView, filterList, filterView, form, page, pageSize } = props;
38
46
  return useObserver(() => (React.createElement("div", { className: styles["vo-layout"] },
39
47
  React.createElement(ListHeader, { sort: sort, sortView: sortView, filterList: filterList, filterView: filterView, form: form, onAddNewForm: onOpenAside }),
40
48
  React.createElement(AsideContent, { context: asideContext },
41
49
  React.createElement("div", { className: "vo-layout-main" },
42
- React.createElement(Scrollbars, null,
43
- React.createElement(PageListView, { context: pageViewContext, data: props.data, loading: !!loading, loadData: loadData, pageSize: props.pageSize },
44
- React.createElement(SortDnD, { canDrag: sortStore ? !!sortStore.canDrag : false, list: pageViewContext.list, text: (item, index) => (React.createElement("div", { key: item.id, onClick: () => onItemClick(item.id, index), className: selectedIndex === index ? "vo-column-item vo-item-selected" : "vo-column-item" }, props.renderItem(item, index))) }))))))));
50
+ React.createElement(PageListView
51
+ // context={pageViewContext}
52
+ , {
53
+ // context={pageViewContext}
54
+ ref: ref, data: data, loading: !!loading, loadMore: loadMore, page: page, pageSize: pageSize }, (list) => (React.createElement(SortDnD, { canDrag: sortStore ? !!sortStore.canDrag : false, list: list, text: (item, index) => (React.createElement("div", { key: item.id, onClick: () => onItemClick(item.id, index), className: selectedId === item.id ? "vo-column-item vo-item-selected" : "vo-column-item" }, props.renderItem(item, index))) }))))))));
45
55
  };
46
56
  export default ListView;
47
57
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/ListView/index.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/ListView/index.tsx"],"names":[],"mappings":"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"}
@@ -1,24 +1,15 @@
1
1
  import React from "react";
2
- import PageViewContext from "./data/index";
3
- declare const PageListView: {
4
- (props: {
5
- context: any;
6
- data: any[];
7
- pageSize?: number | undefined;
8
- loading?: boolean | undefined;
9
- loadData?: ((page?: number | undefined) => void) | undefined;
10
- children?: JSX.Element | JSX.Element[] | undefined;
11
- scrollParentRef?: any;
12
- description?: React.ReactNode;
13
- imageStyle?: React.CSSProperties | undefined;
14
- image?: React.ReactNode;
15
- noDataTip?: boolean | undefined;
16
- }): JSX.Element;
17
- defaultProps: {
18
- noDataTip: boolean;
19
- pageSize: number;
20
- };
21
- createContext(): PageViewContext;
22
- };
23
- export declare const usePageViewContext: () => PageViewContext | undefined;
24
- export default PageListView;
2
+ declare const _default: React.ForwardRefExoticComponent<{
3
+ data: any[];
4
+ page?: number | undefined;
5
+ pageSize?: number | undefined;
6
+ loading?: boolean | undefined;
7
+ loadMore?: (() => void) | undefined;
8
+ children?: any;
9
+ scrollParentRef?: any;
10
+ description?: React.ReactNode;
11
+ imageStyle?: React.CSSProperties | undefined;
12
+ image?: React.ReactNode;
13
+ noDataTip?: boolean | undefined;
14
+ } & React.RefAttributes<unknown>>;
15
+ export default _default;
@@ -1,48 +1,45 @@
1
- import React, { useContext, useEffect } from "react";
2
- import { Empty, Icon, Spin } from "@voplus/antd";
1
+ import React, { forwardRef, useEffect, useImperativeHandle, useState } from "react";
2
+ // import { faSpinnerThird } from "@fortawesome/pro-light-svg-icons";
3
+ // import { FontAwesomeIcon as FAIcon } from "@fortawesome/react-fontawesome";
4
+ import { Empty, Icon, message, Spin } from "@voplus/antd";
5
+ import { Scrollbars } from "react-custom-scrollbars";
3
6
  import InfiniteScroll from "react-infinite-scroller";
4
- import PageViewContext from "./data/index";
7
+ import State from "./state";
5
8
  import { useObserver } from "mobx-react-lite";
6
9
  import styles from "./index.less";
7
- const PageListView = (props) => {
8
- const context = props.context;
10
+ const PageListView = (props, ref) => {
11
+ const { data, children, loading, scrollParentRef, description, imageStyle, image } = props;
12
+ const [context] = useState(new State());
13
+ context.data = data;
14
+ context.noDataTip = props.noDataTip === undefined ? true : props.noDataTip;
15
+ context.pageSize = props.pageSize || 20;
9
16
  useEffect(() => {
10
- // context.page = props.page || 1;
11
- context.list = context.page > 1 ? [...context.list, ...props.data] : props.data;
12
- }, [props.data]);
13
- // useEffect(() => {
14
- // if (!props.data.length || props.data.length < props.pageSize!) context.hasMore = false;
15
- // console.log(loading, context.hasMore, "hasMore");
16
- // }, [context.list]);
17
- // load more data
18
- const loadData = async (page) => {
19
- console.log(page, "page151515");
20
- if (!props.data.length || props.data.length < props.pageSize)
17
+ context.list = props.page > 1 ? [...context.list, ...context.data] : context.data;
18
+ if (!loading && (!context.data.length || context.data.length < context.pageSize))
21
19
  context.hasMore = false;
22
- if (!context.hasMore)
20
+ }, [context.data]);
21
+ const reset = () => {
22
+ context.list = [];
23
+ context.hasMore = true;
24
+ };
25
+ const loadMore = async () => {
26
+ if (loading)
23
27
  return;
24
- context.page = page;
25
- // // if (props.loading) return;
26
- // // if (!context.hasMore) return message.warning("List loaded all");
27
- // context.loading = true;
28
- await props.loadData(page);
29
- // context.loading = false;
28
+ if (!context.data.length || context.data.length < context.pageSize)
29
+ context.hasMore = false;
30
+ if (context.list.length && !context.hasMore)
31
+ return message.warning("List loaded all");
32
+ await props.loadMore();
30
33
  };
31
- const { children, loading, scrollParentRef, description, imageStyle, image, noDataTip } = props;
32
- return useObserver(() => (React.createElement(PageViewContext.ReactContext.Provider, { value: context },
33
- React.createElement(InfiniteScroll, { initialLoad: false, pageStart: 1, loadMore: loadData, hasMore: false,
34
- // hasMore={loading && !!context.hasMore}
35
- useWindow: false, threshold: 150, getScrollParent: () => scrollParentRef },
36
- children,
34
+ useImperativeHandle(ref, () => ({
35
+ reset: reset
36
+ }));
37
+ return useObserver(() => (React.createElement(Scrollbars, null,
38
+ React.createElement(InfiniteScroll, { initialLoad: false, pageStart: 1, loadMore: loadMore, hasMore: loading && !!context.hasMore, useWindow: false, threshold: 150, getScrollParent: () => scrollParentRef },
39
+ children(context.list),
37
40
  loading && context.hasMore && (React.createElement("div", { className: styles["page-list-view_loading"] },
38
- React.createElement(Spin, { tip: "Loading...", indicator: React.createElement(Icon, { type: "loading", spin: true }) }))),
39
- !loading && !context.list.length && noDataTip && (React.createElement(Empty, { description: description, imageStyle: imageStyle, image: image }))))));
40
- };
41
- PageListView.defaultProps = {
42
- noDataTip: true,
43
- pageSize: 200
41
+ React.createElement(Spin, { tip: "Loading...", indicator: React.createElement(Icon, { type: "loading" }) }))),
42
+ !loading && !context.list.length && context.noDataTip && (React.createElement(Empty, { description: description, imageStyle: imageStyle, image: image }))))));
44
43
  };
45
- PageListView.createContext = () => new PageViewContext();
46
- export const usePageViewContext = () => useContext(PageViewContext.ReactContext);
47
- export default PageListView;
44
+ export default forwardRef(PageListView);
48
45
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/PageListView/index.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/PageListView/index.tsx"],"names":[],"mappings":"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"}
@@ -0,0 +1,9 @@
1
+ export default class State {
2
+ list: any[];
3
+ data: any[];
4
+ page: number;
5
+ pageSize: number;
6
+ noDataTip: boolean;
7
+ loading: boolean;
8
+ hasMore: boolean;
9
+ }
@@ -0,0 +1,36 @@
1
+ import { __decorate } from "tslib";
2
+ import { observable } from "mobx";
3
+ export default class State {
4
+ constructor() {
5
+ this.list = [];
6
+ this.data = [];
7
+ this.page = 1;
8
+ this.pageSize = 20;
9
+ this.noDataTip = true;
10
+ this.loading = false;
11
+ this.hasMore = true;
12
+ // public static ReactContext = React.createContext<PageViewContext | undefined>(undefined);
13
+ }
14
+ }
15
+ __decorate([
16
+ observable
17
+ ], State.prototype, "list", void 0);
18
+ __decorate([
19
+ observable
20
+ ], State.prototype, "data", void 0);
21
+ __decorate([
22
+ observable
23
+ ], State.prototype, "page", void 0);
24
+ __decorate([
25
+ observable
26
+ ], State.prototype, "pageSize", void 0);
27
+ __decorate([
28
+ observable
29
+ ], State.prototype, "noDataTip", void 0);
30
+ __decorate([
31
+ observable
32
+ ], State.prototype, "loading", void 0);
33
+ __decorate([
34
+ observable
35
+ ], State.prototype, "hasMore", void 0);
36
+ //# sourceMappingURL=state.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"state.js","sourceRoot":"","sources":["../../../src/components/PageListView/state.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAGlC,MAAM,CAAC,OAAO,OAAO,KAAK;IAA1B;QACoB,SAAI,GAAU,EAAE,CAAC;QACjB,SAAI,GAAU,EAAE,CAAC;QACjB,SAAI,GAAW,CAAC,CAAC;QACjB,aAAQ,GAAW,EAAE,CAAC;QACtB,cAAS,GAAY,IAAI,CAAC;QAC1B,YAAO,GAAY,KAAK,CAAC;QACzB,YAAO,GAAY,IAAI,CAAC;QAC3C,4FAA4F;IAC7F,CAAC;CAAA;AARY;IAAX,UAAU;mCAAyB;AACxB;IAAX,UAAU;mCAAyB;AACxB;IAAX,UAAU;mCAAyB;AACxB;IAAX,UAAU;uCAA8B;AAC7B;IAAX,UAAU;wCAAkC;AACjC;IAAX,UAAU;sCAAiC;AAChC;IAAX,UAAU;sCAAgC"}
@@ -1,6 +1,6 @@
1
- import { faRedo, faSave, faUndo, faSpinnerThird } from "@fortawesome/pro-light-svg-icons";
1
+ import { faRedo, faSave, faUndo } from "@fortawesome/pro-light-svg-icons";
2
2
  import { FontAwesomeIcon as FAIcon } from "@fortawesome/react-fontawesome";
3
- import { Button, Spin, Tooltip } from "@voplus/antd";
3
+ import { Button, Spin, Tooltip, Icon } from "@voplus/antd";
4
4
  import { ContentState, convertFromHTML, convertFromRaw, convertToRaw, Editor, EditorState, getDefaultKeyBinding, RichUtils } from "draft-js";
5
5
  import React, { useEffect, useRef, useState } from "react";
6
6
  import BlockStyleControls from "./BlockStyleControls";
@@ -107,7 +107,7 @@ const RichTextEditor = (props) => {
107
107
  };
108
108
  const { readOnly, editable, toolbar, btn, minHeight } = props;
109
109
  return useObserver(() => (React.createElement(React.Fragment, null, editable || edit ? (React.createElement("div", { className: "rich-text-editor" },
110
- React.createElement(Spin, { spinning: loading && !btn, indicator: React.createElement(FAIcon, { icon: faSpinnerThird }) },
110
+ React.createElement(Spin, { spinning: loading && !btn, indicator: React.createElement(Icon, { type: "loading" }) },
111
111
  React.createElement("div", { className: "richEditor-root" },
112
112
  toolbar && (React.createElement("div", { className: "richEditor-toolbar" },
113
113
  React.createElement("div", { className: "richEditor-controls" },
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/RichTextEditor/index.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/RichTextEditor/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAC1E,OAAO,EAAE,eAAe,IAAI,MAAM,EAAE,MAAM,gCAAgC,CAAC;AAC3E,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAC;AAC3D,OAAO,EACN,YAAY,EACZ,eAAe,EACf,cAAc,EACd,YAAY,EACZ,MAAM,EACN,WAAW,EACX,oBAAoB,EACpB,SAAS,EACT,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC3D,OAAO,kBAAkB,MAAM,sBAAsB,CAAC;AACtD,OAAO,mBAAmB,MAAM,uBAAuB,CAAC;AACxD,OAAO,WAAW,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,cAAc,CAAC;AAEtB,MAAM,cAAc,GAAG,CAAC,KAWvB,EAAE,EAAE;IACJ,MAAM,cAAc,GAAG,eAAe,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACtD,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC,CAAC;IAChF,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAClE,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,EAAE,CAAC;IACnC,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO;QAC5B,CAAC,CAAC,WAAW,CAAC,iBAAiB,CAC7B,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC9B,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC3C,CAAC,CAAC,YAAY,CAAC,oBAAoB,CACjC,cAAc,CAAC,aAAa,EAC5B,cAAc,CAAC,SAAS,CACvB,CACH;QACH,CAAC,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC;IAC7B,SAAS,CAAC,GAAG,EAAE;QACd,OAAO,CAAC,KAAK,CAAC,CAAC;QACf,cAAc,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAClC,cAAc,CAAC,OAAO,CAAC,CAAC;IACzB,CAAC,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;IACzB,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAC9C,MAAM,MAAM,GAAG,MAAM,CAAM,IAAI,CAAC,CAAC;IACjC,MAAM,aAAa,GAAG,CAAC,KAAU,EAAE,EAAE;QACpC,QAAQ,KAAK,CAAC,OAAO,EAAE,EAAE;YACxB,KAAK,YAAY;gBAChB,OAAO,uBAAuB,CAAC;YAChC;gBACC,OAAO,EAAE,CAAC;SACX;IACF,CAAC,CAAC;IACF,MAAM,gBAAgB,GAAG,CAAC,OAAY,EAAE,WAAgB,EAAE,EAAE;QAC3D,MAAM,QAAQ,GAAG,SAAS,CAAC,gBAAgB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;QAClE,IAAI,QAAQ,EAAE;YACb,QAAQ,CAAC,QAAQ,CAAC,CAAC;YACnB,OAAO,IAAI,CAAC;SACZ;QACD,OAAO,KAAK,CAAC;IACd,CAAC,CAAC;IACF,MAAM,qBAAqB,GAAG,CAAC,CAAM,EAAE,EAAE;QACxC,IAAI,CAAC,CAAC,OAAO,KAAK,EAAE,CAAC,SAAS;YAAE,KAAK,EAAE,CAAC;QACxC,IAAI,CAAC,CAAC,OAAO,KAAK,CAAC,CAAC,SAAS,EAAE;YAC9B,MAAM,cAAc,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,cAAc,CAAC,CAAC;YACzE,IAAI,cAAc,KAAK,WAAW,EAAE;gBACnC,QAAQ,CAAC,cAAc,CAAC,CAAC;aACzB;YACD,OAAO;SACP;QACD,OAAO,oBAAoB,CAAC,CAAC,CAAC,CAAC;IAChC,CAAC,CAAC;IACF,MAAM,eAAe,GAAG,CAAC,SAAc,EAAE,EAAE;QAC1C,QAAQ,CAAC,SAAS,CAAC,eAAe,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC;IAC7D,CAAC,CAAC;IACF,MAAM,iBAAiB,GAAG,CAAC,WAAgB,EAAE,EAAE;QAC9C,QAAQ,CAAC,SAAS,CAAC,iBAAiB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC;IACjE,CAAC,CAAC;IACF,MAAM,QAAQ,GAAG;QAChB,GAAG,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE;QACtB,IAAI,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE;QACvB,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE;QACzB,KAAK,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE;KACxB,CAAC;IACF,IAAI,SAAS,GAAG,mBAAmB,CAAC;IACpC,MAAM,YAAY,GAAG,WAAW,CAAC,iBAAiB,EAAE,CAAC;IACrD,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,EAAE;QAC5B,IACC,YAAY;aACV,WAAW,EAAE;aACb,KAAK,EAAE;aACP,OAAO,EAAE,KAAK,UAAU,EACzB;YACD,SAAS,IAAI,6BAA6B,CAAC;SAC3C;KACD;IACD,MAAM,IAAI,GAAG,GAAG,EAAE;QACjB,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;IACzC,CAAC,CAAC;IACF,MAAM,IAAI,GAAG,GAAG,EAAE;QACjB,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;IACzC,CAAC,CAAC;IACF,MAAM,KAAK,GAAG,GAAG,EAAE;QAClB,cAAc,CAAC,EAAE,CAAC,CAAC;QACnB,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC,CAAC;IACF,MAAM,CAAC,GAAG,GAAG,EAAE;QACd,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;QACf,cAAc,CAAC,EAAE,CAAC,CAAC;IACpB,CAAC,CAAC;IACF,MAAM,QAAQ,GAAG,CAAC,WAAgB,EAAE,EAAE;QACrC,cAAc,CAAC,WAAW,CAAC,CAAC;QAC5B,IAAI,KAAK,CAAC,QAAQ;YAAE,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAChF,CAAC,CAAC;IACF,MAAM,IAAI,GAAG,KAAK,IAAI,EAAE;QACvB,UAAU,CAAC,IAAI,CAAC,CAAC;QACjB,MAAM,KAAK,CAAC,MAAO,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAChE,UAAU,CAAC,KAAK,CAAC,CAAC;QAClB,OAAO,CAAC,KAAK,CAAC,CAAC;IAChB,CAAC,CAAC;IACF,MAAM,KAAK,GAAG,GAAG,EAAE;QAClB,QAAQ,CAAC,OAAO,CAAC,CAAC;QAClB,OAAO,CAAC,KAAK,CAAC,CAAC;QACf,cAAc,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IACnC,CAAC,CAAC;IACF,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAC9D,OAAO,WAAW,CAAC,GAAG,EAAE,CAAC,CACxB,oBAAC,KAAK,CAAC,QAAQ,QACb,QAAQ,IAAI,IAAI,CAAC,CAAC,CAAC,CACnB,6BAAK,SAAS,EAAC,kBAAkB;QAChC,oBAAC,IAAI,IAAC,QAAQ,EAAE,OAAO,IAAI,CAAC,GAAG,EAAE,SAAS,EAAE,oBAAC,IAAI,IAAC,IAAI,EAAC,SAAS,GAAG;YAClE,6BAAK,SAAS,EAAC,iBAAiB;gBAC9B,OAAO,IAAI,CACX,6BAAK,SAAS,EAAC,oBAAoB;oBAClC,6BAAK,SAAS,EAAC,qBAAqB;wBACnC,oBAAC,WAAW,IAAC,KAAK,EAAE,oBAAC,MAAM,IAAC,IAAI,EAAE,MAAM,GAAI,EAAE,QAAQ,EAAE,IAAI,GAAI;wBAChE,oBAAC,WAAW,IAAC,KAAK,EAAE,oBAAC,MAAM,IAAC,IAAI,EAAE,MAAM,GAAI,EAAE,QAAQ,EAAE,IAAI,GAAI,CAC3D;oBACN,oBAAC,mBAAmB,IAAC,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAE,iBAAiB,GAAI;oBAC9E,oBAAC,kBAAkB,IAAC,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAE,eAAe,GAAI;oBAE3E,oBAAC,WAAW,IACX,KAAK,EACJ,oBAAC,OAAO,IAAC,KAAK,EAAC,MAAM;4BACpB,oBAAC,MAAM,IAAC,IAAI,EAAE,MAAM,GAAI,CACf,EAEX,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,GACrB,CACG,CACN;gBACD,6BAAK,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE;oBACzE,oBAAC,MAAM,IACN,QAAQ,EAAE,QAAQ,EAClB,YAAY,EAAE,aAAa,EAC3B,cAAc,EAAE,QAAQ,EACxB,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,EAC9C,YAAY,EAAE,qBAAqB,CAAC,IAAI,CAAC,KAAK,CAAC,EAC/C,QAAQ,EAAE,QAAQ,EAClB,WAAW,EAAE,WAAW,EACxB,GAAG,EAAE,MAAM,EACX,UAAU,EAAE,IAAI,GACf,CACG,CACD;YACL,GAAG,IAAI,CACP,6BAAK,SAAS,EAAC,sBAAsB;gBACnC,CAAC,QAAQ,IAAI,CACb,oBAAC,MAAM,IAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAE,KAAK,aAE5B,CACT;gBACD,oBAAC,MAAM,IAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,WAE7C,CACJ,CACN,CACK,CACF,CACN,CAAC,CAAC,CAAC,CACH,6BAAK,SAAS,EAAC,iBAAiB,EAAC,OAAO,EAAE,CAAC,IACzC,YAAY,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CACzB,oBAAC,MAAM,IACN,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,QAAQ,EACxB,QAAQ,EAAE,IAAI,EACd,QAAQ,EAAE,GAAG,EAAE,GAAE,CAAC,GACjB,CACF,CAAC,CAAC,CAAC,CACH,WAAW,CACX,CACI,CACN,CACe,CACjB,CAAC,CAAC;AACJ,CAAC,CAAC;AACF,cAAc,CAAC,YAAY,GAAG;IAC7B,QAAQ,EAAE,IAAI;IACd,OAAO,EAAE,IAAI;IACb,GAAG,EAAE,IAAI;IACT,SAAS,EAAE,EAAE;CACb,CAAC;AACF,eAAe,cAAc,CAAC"}
@@ -38,8 +38,13 @@ export default DropTarget(ItemTypes.CARD, {
38
38
  props.moveCard(droppedId, originalIndex);
39
39
  }
40
40
  const { index } = props.findCard(droppedId);
41
- const afterId = props.list[index] && props.list[index].id;
42
- // console.log(droppedId, afterId, index, props.list);
41
+ const afterId = originalIndex > index
42
+ ? props.list[index - 1]
43
+ ? props.list[index - 1].id
44
+ : ""
45
+ : props.list[index]
46
+ ? props.list[index].id
47
+ : "";
43
48
  // eg: 1, 2, 3 => 1, 3, 2 === moveAfter(3.id, 1.id)
44
49
  if (props.moveAfter)
45
50
  props.moveAfter(droppedId, afterId);
@@ -1 +1 @@
1
- {"version":3,"file":"Card.js","sourceRoot":"","sources":["../../../src/components/SortDnD/Card.tsx"],"names":[],"mappings":"AACA,OAAO,KAAiB,MAAM,OAAO,CAAC;AAStC,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,SAAS,MAAM,QAAQ,CAAC;AAK/B,OAAO,MAAM,MAAM,cAAc,CAAC;AAgBlC,MAAM,IAAI,GAAwB,CAAC,EAClC,IAAI,EACJ,UAAU,EACV,OAAO,EACP,kBAAkB,EAClB,iBAAiB,EACjB,iBAAiB,EACjB,EAAE,EAAE;IACJ,MAAM,OAAO,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACnC,4BAA4B;IAC5B,qCAAqC;IACrC,qCAAqC;IACrC,WAAW;IACX,oFAAoF;IACpF,WAAW;IACX,UAAU;IACV,KAAK;IACL,OAAO,iBAAiB,CACvB,kBAAkB,CACjB,6BAAK,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,eAAe,CAAC,IAMzD,IAAI,CAAC,iBAAiB,CAAC,CACnB,CACN,CACD,CAAC;AACH,CAAC,CAAC;AACF,eAAe,UAAU,CACxB,SAAS,CAAC,IAAI,EACd;IACC,gDAAgD;IAChD,KAAK,CAAC,KAAgB,EAAE,OAA0B;QACjD,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;QAC5C,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;QAE7B,IAAI,SAAS,KAAK,MAAM,EAAE;YACzB,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YACpD,KAAK,CAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;SACrC;IACF,CAAC;CACD,EACD,OAAO,CAAC,EAAE,CAAC,CAAC;IACX,iBAAiB,EAAE,OAAO,CAAC,UAAU,EAAE;CACvC,CAAC,CACF,CACA,UAAU,CACT,SAAS,CAAC,IAAI,EACd;IACC,SAAS,EAAE,CAAC,KAAgB,EAAE,EAAE,CAAC,CAAC;QACjC,EAAE,EAAE,KAAK,CAAC,EAAE;QACZ,aAAa,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,KAAK;KAC7C,CAAC;IACF,OAAO,CAAC,KAAgB,EAAE,OAA0B;QACnD,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;QAC3D,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;QAClC,IAAI,CAAC,OAAO,EAAE;YACb,KAAK,CAAC,QAAQ,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;SACzC;QACD,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC5C,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;QAC1D,sDAAsD;QACtD,mDAAmD;QACnD,IAAI,KAAK,CAAC,SAAS;YAAE,KAAK,CAAC,SAAU,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAC3D,CAAC;IACD,+CAA+C;CAC/C,EACD,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;IACtB,iBAAiB,EAAE,OAAO,CAAC,UAAU,EAAE;IACvC,kBAAkB,EAAE,OAAO,CAAC,WAAW,EAAE;IACzC,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE;CAChC,CAAC,CACF,CAAC,IAAI,CAAC,CACP,CAAC"}
1
+ {"version":3,"file":"Card.js","sourceRoot":"","sources":["../../../src/components/SortDnD/Card.tsx"],"names":[],"mappings":"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"}
@@ -6,9 +6,10 @@ export interface ContainerProps {
6
6
  text: any;
7
7
  canDrag: boolean;
8
8
  moveAfter?: (id: string, afterId: string, list: any[]) => void;
9
+ className?: string;
9
10
  }
10
11
  export interface ContainerState {
11
12
  cards: any[];
12
13
  }
13
- declare const _default: import("react-dnd").DndComponentClass<React.FunctionComponent<ContainerProps>, Pick<ContainerProps, "text" | "list" | "canDrag" | "moveAfter">>;
14
+ declare const _default: import("react-dnd").DndComponentClass<React.FunctionComponent<ContainerProps>, Pick<ContainerProps, "text" | "list" | "className" | "canDrag" | "moveAfter">>;
14
15
  export default _default;
@@ -1,10 +1,10 @@
1
- import React, { useState, useEffect, useCallback, useRef } from "react";
2
- import { DropTarget } from "react-dnd";
3
1
  import update from "immutability-helper";
2
+ import React, { useCallback, useEffect, useRef, useState } from "react";
3
+ import { DropTarget } from "react-dnd";
4
4
  import ItemTypes from "./type";
5
- import Card from "./Card";
6
5
  import { useObserver } from "mobx-react-lite";
7
- const Container = ({ connectDropTarget, list, text, canDrag, moveAfter }) => {
6
+ import Card from "./Card";
7
+ const Container = ({ connectDropTarget, list, text, canDrag, moveAfter, className }) => {
8
8
  const ref = useRef(null);
9
9
  const [cards, setCards] = useState(list);
10
10
  const [beforeList, setBeforeList] = useState(list);
@@ -26,7 +26,7 @@ const Container = ({ connectDropTarget, list, text, canDrag, moveAfter }) => {
26
26
  };
27
27
  }, [cards]);
28
28
  connectDropTarget(ref);
29
- return useObserver(() => (React.createElement("div", { ref: ref }, cards.map((card, index) => (React.createElement(Card, { list: beforeList, key: card.id, id: `${card.id}`, text: (connectDragSource) => text(card, index, connectDragSource), moveCard: moveCard, findCard: findCard, canDrag: canDrag, moveAfter: (id, afterId) => moveAfter(id, afterId, cards) }))))));
29
+ return useObserver(() => (React.createElement("div", { ref: ref, className: className }, cards.map((card, index) => (React.createElement(Card, { list: beforeList, key: card.id, id: `${card.id}`, text: (connectDragSource) => text(card, index, connectDragSource), moveCard: moveCard, findCard: findCard, canDrag: canDrag, moveAfter: (id, afterId) => moveAfter(id, afterId, cards) }))))));
30
30
  };
31
31
  export default DropTarget(ItemTypes.CARD, {}, connect => ({
32
32
  connectDropTarget: connect.dropTarget()
@@ -1 +1 @@
1
- {"version":3,"file":"Container.js","sourceRoot":"","sources":["../../../src/components/SortDnD/Container.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AACxE,OAAO,EAAqB,UAAU,EAAE,MAAM,WAAW,CAAC;AAC1D,OAAO,MAAM,MAAM,qBAAqB,CAAC;AACzC,OAAO,SAAS,MAAM,QAAQ,CAAC;AAE/B,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAa9C,MAAM,SAAS,GAA6B,CAAC,EAC5C,iBAAiB,EACjB,IAAI,EACJ,IAAI,EACJ,OAAO,EACP,SAAS,EACT,EAAE,EAAE;IACJ,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IACzB,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IACzC,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IACnD,SAAS,CAAC,GAAG,EAAE;QACd,QAAQ,CAAC,IAAI,CAAC,CAAC;QACf,aAAa,CAAC,IAAI,CAAC,CAAC;IACrB,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAEX,MAAM,QAAQ,GAAG,WAAW,CAC3B,CAAC,EAAU,EAAE,OAAe,EAAE,EAAE;QAC/B,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;QACrC,QAAQ,CACP,MAAM,CAAC,KAAK,EAAE;YACb,OAAO,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;SACzC,CAAC,CACF,CAAC;IACH,CAAC,EACD,CAAC,KAAK,CAAC,CACP,CAAC;IACF,MAAM,QAAQ,GAAG,WAAW,CAC3B,CAAC,EAAU,EAAE,EAAE;QACd,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACpD,OAAO;YACN,IAAI;YACJ,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;SAC1B,CAAC;IACH,CAAC,EACD,CAAC,KAAK,CAAC,CACP,CAAC;IACF,iBAAiB,CAAC,GAAG,CAAC,CAAC;IACvB,OAAO,WAAW,CAAC,GAAG,EAAE,CAAC,CACxB,6BAAK,GAAG,EAAE,GAAG,IACX,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CAC3B,oBAAC,IAAI,IACJ,IAAI,EAAE,UAAU,EAChB,GAAG,EAAE,IAAI,CAAC,EAAE,EACZ,EAAE,EAAE,GAAG,IAAI,CAAC,EAAE,EAAE,EAChB,IAAI,EAAE,CAAC,iBAAsB,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,iBAAiB,CAAC,EACtE,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC,SAAU,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,GACzD,CACF,CAAC,CACG,CACN,CAAC,CAAC;AACJ,CAAC,CAAC;AACF,eAAe,UAAU,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;IACzD,iBAAiB,EAAE,OAAO,CAAC,UAAU,EAAE;CACvC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC"}
1
+ {"version":3,"file":"Container.js","sourceRoot":"","sources":["../../../src/components/SortDnD/Container.tsx"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,qBAAqB,CAAC;AACzC,OAAO,KAAK,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACxE,OAAO,EAAqB,UAAU,EAAE,MAAM,WAAW,CAAC;AAC1D,OAAO,SAAS,MAAM,QAAQ,CAAC;AAE/B,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,IAAI,MAAM,QAAQ,CAAC;AAc1B,MAAM,SAAS,GAA6B,CAAC,EAC5C,iBAAiB,EACjB,IAAI,EACJ,IAAI,EACJ,OAAO,EACP,SAAS,EACT,SAAS,EACT,EAAE,EAAE;IACJ,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IACzB,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IACzC,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IACnD,SAAS,CAAC,GAAG,EAAE;QACd,QAAQ,CAAC,IAAI,CAAC,CAAC;QACf,aAAa,CAAC,IAAI,CAAC,CAAC;IACrB,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAEX,MAAM,QAAQ,GAAG,WAAW,CAC3B,CAAC,EAAU,EAAE,OAAe,EAAE,EAAE;QAC/B,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;QACrC,QAAQ,CACP,MAAM,CAAC,KAAK,EAAE;YACb,OAAO,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;SACzC,CAAC,CACF,CAAC;IACH,CAAC,EACD,CAAC,KAAK,CAAC,CACP,CAAC;IACF,MAAM,QAAQ,GAAG,WAAW,CAC3B,CAAC,EAAU,EAAE,EAAE;QACd,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACpD,OAAO;YACN,IAAI;YACJ,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;SAC1B,CAAC;IACH,CAAC,EACD,CAAC,KAAK,CAAC,CACP,CAAC;IACF,iBAAiB,CAAC,GAAG,CAAC,CAAC;IACvB,OAAO,WAAW,CAAC,GAAG,EAAE,CAAC,CACxB,6BAAK,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,SAAS,IACjC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CAC3B,oBAAC,IAAI,IACJ,IAAI,EAAE,UAAU,EAChB,GAAG,EAAE,IAAI,CAAC,EAAE,EACZ,EAAE,EAAE,GAAG,IAAI,CAAC,EAAE,EAAE,EAChB,IAAI,EAAE,CAAC,iBAAsB,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,iBAAiB,CAAC,EACtE,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,OAAO,EAChB,SAAS,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,CAAC,SAAU,CAAC,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,GACzD,CACF,CAAC,CACG,CACN,CAAC,CAAC;AACJ,CAAC,CAAC;AACF,eAAe,UAAU,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;IACzD,iBAAiB,EAAE,OAAO,CAAC,UAAU,EAAE;CACvC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC"}
@@ -4,5 +4,6 @@ declare const _default: (props: {
4
4
  text: React.ReactNode;
5
5
  canDrag?: boolean | undefined;
6
6
  moveAfter?: ((id: string, afterId: string, list: any[]) => void) | undefined;
7
+ className?: string | undefined;
7
8
  }) => JSX.Element;
8
9
  export default _default;
@@ -8,6 +8,6 @@ export default (props) => {
8
8
  setBeforeList(props.list);
9
9
  }, [props.list]);
10
10
  return (React.createElement(DndProvider, { backend: HTML5Backend },
11
- React.createElement(Container, { list: beforeList, text: props.text, canDrag: !!props.canDrag, moveAfter: props.moveAfter })));
11
+ React.createElement(Container, { list: beforeList, text: props.text, canDrag: !!props.canDrag, moveAfter: props.moveAfter, className: props.className })));
12
12
  };
13
13
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/SortDnD/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEnD,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,YAAY,MAAM,yBAAyB,CAAC;AAEnD,OAAO,SAAS,MAAM,aAAa,CAAC;AAEpC,eAAe,CAAC,KAKf,EAAE,EAAE;IACJ,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACzD,SAAS,CAAC,GAAG,EAAE;QACd,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC3B,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IACjB,OAAO,CACN,oBAAC,WAAW,IAAC,OAAO,EAAE,YAAY;QACjC,oBAAC,SAAS,IACT,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,KAAK,CAAC,IAAI,EAChB,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,EACxB,SAAS,EAAE,KAAK,CAAC,SAAS,GACzB,CAEW,CACd,CAAC;AACH,CAAC,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/SortDnD/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAEnD,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,YAAY,MAAM,yBAAyB,CAAC;AAEnD,OAAO,SAAS,MAAM,aAAa,CAAC;AAEpC,eAAe,CAAC,KAMf,EAAE,EAAE;IACJ,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACzD,SAAS,CAAC,GAAG,EAAE;QACd,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC3B,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IACjB,OAAO,CACN,oBAAC,WAAW,IAAC,OAAO,EAAE,YAAY;QACjC,oBAAC,SAAS,IACT,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,KAAK,CAAC,IAAI,EAChB,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,EACxB,SAAS,EAAE,KAAK,CAAC,SAAS,EAC1B,SAAS,EAAE,KAAK,CAAC,SAAS,GACzB,CAEW,CACd,CAAC;AACH,CAAC,CAAC"}
@@ -91,9 +91,9 @@ export default (props) => {
91
91
  onChange(["Done", "Progress", "NotStarted"]);
92
92
  };
93
93
  const onChange = (value) => {
94
- setVisible(false);
95
94
  if (props.onChange)
96
95
  props.onChange({ value });
96
+ setVisible(false);
97
97
  };
98
98
  const FilterView = (props) => (React.createElement("div", null,
99
99
  React.createElement("div", { className: "menu-item-title" }, props.type),
@@ -109,7 +109,7 @@ export default (props) => {
109
109
  React.createElement(Row, { type: "flex", className: "filter-menu" }, list.map((item, index) => (React.createElement(FilterView, { key: index, type: item.type, dataList: item.list })))),
110
110
  React.createElement(Row, { type: "flex", justify: "end", className: "filter-views-bottom" },
111
111
  React.createElement(Button, { type: "link", className: "default", onClick: onReset }, "Reset"),
112
- React.createElement(Button, { type: "link", onClick: () => onChange(status) }, "Ok"))));
112
+ React.createElement(Button, { type: "link", onClick: () => onChange(status) }, "Filter"))));
113
113
  return (
114
114
  // <div className={styles["filter-views-dropdown"]}>
115
115
  // <div className="filter-view-title">Filter</div>