@titaui/pc 1.6.15 → 1.6.16

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 (219) hide show
  1. package/lib/components/avatar/index.js +1 -1
  2. package/lib/components/button/index.js +1 -1
  3. package/lib/components/change-okr/styledComponents.js +1 -1
  4. package/lib/components/communication/style.js +1 -1
  5. package/lib/components/create-okr/constant.js +1 -1
  6. package/lib/components/create-okr/createSuccessCmp.js +6 -2
  7. package/lib/components/create-okr/fields/index.js +1 -1
  8. package/lib/components/create-okr/index.js +16 -1
  9. package/lib/components/create-okr/request-api.js +1 -1
  10. package/lib/components/create-okr/style.js +1 -1
  11. package/lib/components/create-okr/utils/helper.js +1 -1
  12. package/lib/components/delete-confirm-pop/style.js +1 -1
  13. package/lib/components/dialog/index.css +1 -0
  14. package/lib/components/dropdown-layer/index.js +1 -1
  15. package/lib/components/dynamic/constant.js +1 -1
  16. package/lib/components/dynamic/dynamic-like-ranking/index.css +1 -1
  17. package/lib/components/dynamic/dynamic-liking/index.css +1 -1
  18. package/lib/components/dynamic/dynamic-list/index.js +7 -1
  19. package/lib/components/dynamic/dynamic-topping/index.css +1 -1
  20. package/lib/components/dynamic/dynamic-topping/request-api.js +1 -1
  21. package/lib/components/dynamic/dynamic.js +3 -3
  22. package/lib/components/dynamic/export-module/index.js +1 -1
  23. package/lib/components/dynamic/index.js +1 -1
  24. package/lib/components/dynamic/request-api.js +1 -1
  25. package/lib/components/dynamic/util.js +1 -1
  26. package/lib/components/eReport/eReportLists/style.js +1 -1
  27. package/lib/components/eReport/eReportShare/style.js +1 -1
  28. package/lib/components/eReport/eReportShare/toast/style.js +1 -1
  29. package/lib/components/edit-kr-wight/style/index.js +1 -1
  30. package/lib/components/emotionsSelector/style.js +1 -1
  31. package/lib/components/file-list/index.js +1 -1
  32. package/lib/components/form/index.js +1 -1
  33. package/lib/components/grid-page/commen-components/index.js +4 -4
  34. package/lib/components/grid-page/commen-components/scroll-tips.js +1 -1
  35. package/lib/components/grid-page/util/network.js +1 -1
  36. package/lib/components/help-card/index.css +4 -4
  37. package/lib/components/mblog/common/index.js +3 -3
  38. package/lib/components/mblog/style.js +1 -1
  39. package/lib/components/menus/components/flip-menu-card/index.css +0 -1
  40. package/lib/components/menus/components/flip-menu-card/index.js +26 -16
  41. package/lib/components/menus/components/menu-tree/images/appraisal-menu/KH-help.svg +10 -0
  42. package/lib/components/menus/components/menu-tree/images/appraisal-menu/mypingjia.svg +10 -0
  43. package/lib/components/menus/components/menu-tree/images/okr-menu/cases.svg +9 -0
  44. package/lib/components/menus/components/menu-tree/images/okr-menu/{rw-zx.svg → panel.svg} +0 -0
  45. package/lib/components/menus/components/menu-tree/index.js +1 -1
  46. package/lib/components/menus/components/menu-tree/tree-node/avatar/index.css +0 -1
  47. package/lib/components/menus/components/menu-tree/tree-node/company-all-node.js +2 -1
  48. package/lib/components/menus/components/menu-tree/tree-node/compony-node/index.js +2 -1
  49. package/lib/components/menus/components/menu-tree/tree-node/depart-node/index.js +1 -0
  50. package/lib/components/menus/components/menu-tree/tree-node/follower-node/index.css +0 -1
  51. package/lib/components/menus/components/menu-tree/tree-node/follower-node/index.js +3 -1
  52. package/lib/components/menus/components/menu-tree/tree-node/group-name-node.js +2 -1
  53. package/lib/components/menus/components/menu-tree/tree-node/index.css +56 -15
  54. package/lib/components/menus/components/menu-tree/tree-node/loading-node.js +2 -1
  55. package/lib/components/menus/components/menu-tree/tree-node/menu-item-node.js +2 -1
  56. package/lib/components/menus/components/menu-tree/tree-node/menu-node.js +2 -1
  57. package/lib/components/menus/components/menu-tree/tree-node/no-follower-node.js +2 -1
  58. package/lib/components/menus/components/menu-tree/tree-node/user-concern-node.js +2 -1
  59. package/lib/components/menus/components/menu-tree/tree-node/user-node/index.css +0 -1
  60. package/lib/components/menus/components/menu-tree/tree-node/user-node/index.js +3 -0
  61. package/lib/components/menus/export-modules/appraisal-menus/datas.js +13 -1
  62. package/lib/components/menus/export-modules/okr-menus/datas.js +7 -2
  63. package/lib/components/menus/export-modules/okr-menus/index.css +2 -0
  64. package/lib/components/menus/export-modules/subordinate-menus/index.js +10 -3
  65. package/lib/components/menus/index.js +1 -1
  66. package/lib/components/menus/request-apis.js +1 -1
  67. package/lib/components/nav-top/components/menu/index.css +1 -0
  68. package/lib/components/nav-top/components/user-message/components/empty/index.js +1 -1
  69. package/lib/components/nav-top/components/user-message/components/inform/index.css +1 -0
  70. package/lib/components/nav-top/components/user-message/components/inform/index.js +14 -107
  71. package/lib/components/nav-top/components/user-message/components/inform/inform-item.js +133 -0
  72. package/lib/components/nav-top/components/user-message/components/remind/index.css +1 -0
  73. package/lib/components/nav-top/components/user-message/components/remind/index.js +8 -48
  74. package/lib/components/nav-top/components/user-message/components/remind/remind-item.js +71 -0
  75. package/lib/components/nav-top/components/user-message/components/reply/index.css +1 -0
  76. package/lib/components/nav-top/components/user-message/components/reply/index.js +14 -57
  77. package/lib/components/nav-top/components/user-message/components/reply/reply-item.js +75 -0
  78. package/lib/components/nav-top/components/user-message/components/tab-title/index.js +8 -3
  79. package/lib/components/nav-top/components/user-message/components/todos/index.css +1 -0
  80. package/lib/components/nav-top/components/user-message/components/todos/index.js +15 -73
  81. package/lib/components/nav-top/components/user-message/components/todos/todo-item.js +70 -0
  82. package/lib/components/nav-top/components/user-message/constant.js +2 -29
  83. package/lib/components/nav-top/components/user-message/index.css +5 -5
  84. package/lib/components/nav-top/components/user-message/index.js +24 -16
  85. package/lib/components/nav-top/components/user-message/msg/index.css +5 -30
  86. package/lib/components/nav-top/components/user-message/msg/index.js +20 -2
  87. package/lib/components/nav-top/components/user-message/utils.js +22 -5
  88. package/lib/components/nav-top/components/user-own-menu/index.css +2 -1
  89. package/lib/components/nav-top/components/user-own-menu/index.js +2 -3
  90. package/lib/components/nav-top/components/user-own-menu/utils.js +6 -20
  91. package/lib/components/nav-top/constant.js +2 -10
  92. package/lib/components/nav-top/index.css +55 -0
  93. package/lib/components/nav-top/index.js +3 -2
  94. package/lib/components/nav-top/request.apis.js +5 -7
  95. package/lib/components/okr-detail/auth.js +1 -1
  96. package/lib/components/okr-detail/base-info/util.js +1 -1
  97. package/lib/components/okr-detail/components/okr-tree/tree-node/e-node/constant.js +1 -1
  98. package/lib/components/okr-detail/components/okr-tree/tree-node/kr-node/kr-score-editor/style.js +1 -1
  99. package/lib/components/okr-detail/context.js +1 -1
  100. package/lib/components/okr-detail/detail-header/actions.js +2 -2
  101. package/lib/components/okr-detail/detail-header/delete-confirm/style.js +1 -1
  102. package/lib/components/okr-detail/detail-header/enums.js +1 -1
  103. package/lib/components/okr-detail/e-list/constant.js +1 -1
  104. package/lib/components/okr-detail/e-list/util.js +1 -1
  105. package/lib/components/okr-detail/okr-list/create-kr-item/style.js +1 -1
  106. package/lib/components/okr-detail/okr-list/drag-order-kr.js +1 -1
  107. package/lib/components/okr-detail/okr-list/index.js +2 -1
  108. package/lib/components/okr-detail/request-apis.js +1 -1
  109. package/lib/components/okr-detail/schedule/util.js +1 -1
  110. package/lib/components/okr-filter-drawer/filter-form.js +64 -38
  111. package/lib/components/okr-filter-drawer/index.js +14 -2
  112. package/lib/components/okr-flow/index.js +1 -1
  113. package/lib/components/okr-flow/mini-map/utils.js +1 -1
  114. package/lib/components/okr-flow/open-data/index.js +1 -1
  115. package/lib/components/okr-flow/request-apis.js +1 -1
  116. package/lib/components/okr-flow/utils/config.js +1 -1
  117. package/lib/components/okr-flow/utils/index.js +1 -1
  118. package/lib/components/okr-flow/utils/tree-handler.js +1 -1
  119. package/lib/components/okr-progress/request-apis.js +1 -1
  120. package/lib/components/okr-progress/util.js +1 -1
  121. package/lib/components/okr-progress-detail/utils.js +1 -1
  122. package/lib/components/okr-progress-modal/helper.js +1 -1
  123. package/lib/components/okr-progress-modal/style.js +1 -1
  124. package/lib/components/okr-progress-modal/textarea/style.js +1 -1
  125. package/lib/components/okr-review/ReviewPop/components/ReviewBody/style.js +1 -1
  126. package/lib/components/okr-review/ReviewPop/style.js +1 -1
  127. package/lib/components/okr-review/components/ReviewItem/style.js +1 -1
  128. package/lib/components/okr-review/components/confirm-pop/style.js +1 -1
  129. package/lib/components/okr-review/style.js +1 -1
  130. package/lib/components/okr-share/common-painter/utils.js +1 -1
  131. package/lib/components/okr-share/pink-card/images.js +1 -1
  132. package/lib/components/okr-share/request-apis.js +1 -1
  133. package/lib/components/okrcase-library/index.css +1 -1
  134. package/lib/components/okrcase-library/index.js +6 -1
  135. package/lib/components/okrcase-library/new-ui.css +52 -0
  136. package/lib/components/okrcase-library/okrcases-components/submitOkr-dialog.js +1 -1
  137. package/lib/components/okrcase-library/server/network.js +1 -1
  138. package/lib/components/open-data-painter/index.js +1 -1
  139. package/lib/components/operation-records/style.js +1 -1
  140. package/lib/components/period-selector/common.js +2 -2
  141. package/lib/components/period-selector/components/button/style.js +1 -1
  142. package/lib/components/period-selector/components/selector/style.js +1 -1
  143. package/lib/components/period-selector/helper/index.js +1 -1
  144. package/lib/components/period-selector/mockData.js +1 -1
  145. package/lib/components/period-selector/style.js +1 -1
  146. package/lib/components/photo-card/components/card/index.css +11 -1
  147. package/lib/components/photo-card/components/card/index.js +68 -105
  148. package/lib/components/photo-card/index.css +3 -2
  149. package/lib/components/photo-card/index.js +48 -8
  150. package/lib/components/pop-down-notification/components/SuccessRender.js +1 -1
  151. package/lib/components/pop-down-notification/style/index.js +1 -1
  152. package/lib/components/praise-record/style.js +1 -1
  153. package/lib/components/progress/index.js +1 -1
  154. package/lib/components/publish-dynamic-modal/requist-api.js +1 -1
  155. package/lib/components/radio/radio.js +1 -1
  156. package/lib/components/tabs/index.js +1 -1
  157. package/lib/components/task-relation/helper.js +1 -1
  158. package/lib/components/task-relation/request-api.js +1 -1
  159. package/lib/components/tita-chart/index.js +4 -4
  160. package/lib/components/tita-chart/util/index.js +12 -12
  161. package/lib/components/tita-chart/util/utils.js +1 -1
  162. package/lib/components/tooltip/index.js +1 -1
  163. package/lib/components/tree/index.js +1 -1
  164. package/lib/components/upload/style.js +1 -1
  165. package/lib/components/upload/util.js +1 -1
  166. package/lib/components/upvote/request-apis.js +1 -1
  167. package/lib/components/user-selector/index.js +1 -1
  168. package/lib/components/user-selector/request-apis.js +1 -1
  169. package/lib/components/user-selector/utils.js +1 -1
  170. package/lib/components/version-change-modal/request-api.js +1 -1
  171. package/lib/components/viewer/index.js +1 -1
  172. package/lib/components-v1/avatar/styles.js +1 -1
  173. package/lib/components-v1/buttonv2/style/style.js +1 -1
  174. package/lib/components-v1/input/Input.js +1 -1
  175. package/lib/components-v1/input/InputNumber.js +1 -1
  176. package/lib/components-v1/input/style/index.js +1 -1
  177. package/lib/components-v1/popConfirm/style.js +1 -1
  178. package/lib/components-v1/tabs/style.js +1 -1
  179. package/lib/components-v1/textarea/style.js +1 -1
  180. package/lib/components-v1/userSelector/UserSelectorPop.js +1 -1
  181. package/lib/components-v1/userSelector/style.js +1 -1
  182. package/lib/index.js +1 -1
  183. package/lib/pages/aha2021/index.css +16 -0
  184. package/lib/pages/group-management/components/PopDownNotification/components/SuccessRender.js +1 -1
  185. package/lib/pages/group-management/components/PopDownNotification/style/index.js +1 -1
  186. package/lib/pages/group-management/components/openData/index.js +1 -1
  187. package/lib/pages/group-management/groupInterface.js +10 -10
  188. package/lib/pages/home-page/components/data-list/table/columns/index.js +1 -1
  189. package/lib/pages/new-okr-list/header/comments.js +104 -0
  190. package/lib/pages/new-okr-list/header/depart-title.js +43 -3
  191. package/lib/pages/new-okr-list/header/filter.js +50 -13
  192. package/lib/pages/new-okr-list/header/index.css +87 -0
  193. package/lib/pages/new-okr-list/header/index.js +62 -23
  194. package/lib/pages/new-okr-list/header/relation-title.js +28 -0
  195. package/lib/pages/new-okr-list/header/user-title.js +10 -3
  196. package/lib/pages/new-okr-list/index.js +110 -29
  197. package/lib/pages/new-okr-list/interface.js +5 -0
  198. package/lib/pages/new-okr-list/keyword-search/index.css +2 -2
  199. package/lib/pages/new-okr-list/keyword-search/index.js +11 -5
  200. package/lib/pages/new-okr-list/list/index.js +0 -1
  201. package/lib/pages/new-okr-list/request-api.js +104 -3
  202. package/lib/pages/new-okr-list/theme.css +4 -0
  203. package/lib/pages/okr-map/hooks/useStorage.js +1 -1
  204. package/lib/pages/okr-map/open-data/index.js +1 -1
  205. package/lib/pages/okr-map/request-apis.js +1 -1
  206. package/lib/pages/okr-map/utils.js +2 -1
  207. package/lib/utils/auth.js +1 -1
  208. package/lib/utils/bs-global.js +1 -1
  209. package/lib/utils/format-time.js +1 -1
  210. package/lib/utils/helpers.js +1 -1
  211. package/lib/utils/local-storage.js +40 -0
  212. package/lib/utils/mblog.js +1 -1
  213. package/lib/utils/open-data.js +1 -1
  214. package/lib/utils/platform.js +1 -1
  215. package/lib/utils/request-v1.js +2 -2
  216. package/lib/utils/request.js +1 -1
  217. package/lib/utils/roundWeight.js +2 -2
  218. package/lib/utils/tools.js +4 -3
  219. package/package.json +2 -2
@@ -9,7 +9,9 @@ exports["default"] = void 0;
9
9
 
10
10
  var _react = _interopRequireWildcard(require("react"));
11
11
 
12
- var _pc = require("@titaui/pc");
12
+ var _button = require("../../../components/button");
13
+
14
+ var _bsGlobal = require("../../../utils/bs-global");
13
15
 
14
16
  var _precls = require("../precls");
15
17
 
@@ -19,6 +21,16 @@ var _createOkr = _interopRequireDefault(require("./create-okr"));
19
21
 
20
22
  var _userTitle = _interopRequireDefault(require("./user-title"));
21
23
 
24
+ var _departTitle = _interopRequireDefault(require("./depart-title"));
25
+
26
+ var _relationTitle = _interopRequireDefault(require("./relation-title"));
27
+
28
+ var _filter = _interopRequireDefault(require("./filter"));
29
+
30
+ var _comments = _interopRequireDefault(require("./comments"));
31
+
32
+ var _context = require("../context");
33
+
22
34
  require("./index.css");
23
35
 
24
36
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -40,19 +52,52 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
40
52
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
41
53
 
42
54
  var Header = function Header(props) {
55
+ var _useContext = (0, _react.useContext)(_context.Context),
56
+ departmentName = _useContext.departmentName,
57
+ departmentId = _useContext.departmentId,
58
+ toUserId = _useContext.toUserId,
59
+ relation = _useContext.relation;
60
+
61
+ var onSearch = props.onSearch;
62
+
43
63
  var _useState = (0, _react.useState)(false),
44
64
  _useState2 = _slicedToArray(_useState, 2),
45
- filterDrawerVisible = _useState2[0],
46
- setFilterDrawerVisible = _useState2[1];
65
+ onlyThisDept = _useState2[0],
66
+ setOnlyThisDept = _useState2[1];
47
67
 
48
- var onSearch = props.onSearch;
68
+ (0, _react.useEffect)(function () {
69
+ onSearch({
70
+ onlyThisDept: onlyThisDept
71
+ });
72
+ }, [onlyThisDept]);
49
73
 
50
- var openFilterDrawer = function openFilterDrawer() {
51
- setFilterDrawerVisible(true);
74
+ var gotoOkrMap = function gotoOkrMap() {
75
+ location.href = "#/okr/map";
52
76
  };
53
77
 
54
- var gotoOkrMap = function gotoOkrMap() {
55
- location.href = '#/okr/map';
78
+ var getTitle = function getTitle() {
79
+ if (relation == 1) {
80
+ return /*#__PURE__*/_react["default"].createElement(_userTitle["default"], {
81
+ toUserId: (0, _bsGlobal.getUserInfo)().Id
82
+ });
83
+ } else if (relation == 2 || relation == 3) {
84
+ return /*#__PURE__*/_react["default"].createElement(_relationTitle["default"], {
85
+ relation: relation
86
+ });
87
+ } else if (toUserId) {
88
+ return /*#__PURE__*/_react["default"].createElement(_userTitle["default"], {
89
+ toUserId: toUserId
90
+ });
91
+ } else if (departmentName) {
92
+ return /*#__PURE__*/_react["default"].createElement(_departTitle["default"], {
93
+ onlyThisDept: onlyThisDept,
94
+ onChange: setOnlyThisDept,
95
+ departmentName: departmentName,
96
+ departmentId: departmentId
97
+ });
98
+ }
99
+
100
+ return null;
56
101
  };
57
102
 
58
103
  return /*#__PURE__*/_react["default"].createElement("div", {
@@ -61,32 +106,26 @@ var Header = function Header(props) {
61
106
  className: "".concat(_precls.precls, "__header-left")
62
107
  }, /*#__PURE__*/_react["default"].createElement("div", {
63
108
  className: "".concat(_precls.precls, "__header-item")
64
- }, /*#__PURE__*/_react["default"].createElement(_userTitle["default"], null))), /*#__PURE__*/_react["default"].createElement("div", {
109
+ }, getTitle())), /*#__PURE__*/_react["default"].createElement("div", {
65
110
  className: "".concat(_precls.precls, "__header-right")
66
111
  }, /*#__PURE__*/_react["default"].createElement("div", {
67
112
  className: "".concat(_precls.precls, "__header-item")
68
- }, /*#__PURE__*/_react["default"].createElement(_keywordSearch["default"], null)), /*#__PURE__*/_react["default"].createElement("div", {
113
+ }, /*#__PURE__*/_react["default"].createElement(_keywordSearch["default"], {
114
+ onSearch: onSearch
115
+ })), /*#__PURE__*/_react["default"].createElement("div", {
69
116
  className: "".concat(_precls.precls, "__header-item")
70
117
  }, /*#__PURE__*/_react["default"].createElement(_createOkr["default"], null)), /*#__PURE__*/_react["default"].createElement("div", {
71
118
  className: "".concat(_precls.precls, "__header-item"),
72
119
  onClick: gotoOkrMap
73
120
  }, /*#__PURE__*/_react["default"].createElement("span", {
74
121
  className: "".concat(_precls.precls, "__header-icon")
75
- }, /*#__PURE__*/_react["default"].createElement(_pc.IconBtn, {
122
+ }, /*#__PURE__*/_react["default"].createElement(_button.IconBtn, {
76
123
  icon: "tu-icon-yangshi-ditu",
77
124
  size: "big"
78
- }))), /*#__PURE__*/_react["default"].createElement("div", {
79
- className: "".concat(_precls.precls, "__header-item")
80
- }, /*#__PURE__*/_react["default"].createElement("span", {
81
- className: "".concat(_precls.precls, "__header-icon")
82
- }, /*#__PURE__*/_react["default"].createElement(_pc.IconBtn, {
83
- icon: "tu-icon-pinglun",
84
- size: "big"
85
- }))), /*#__PURE__*/_react["default"].createElement("div", {
86
- onClick: openFilterDrawer
87
- }, "\u7B5B\u9009"), /*#__PURE__*/_react["default"].createElement(_pc.OkrFilterDrawer, {
88
- visible: filterDrawerVisible,
89
- setVisible: setFilterDrawerVisible
125
+ }))), /*#__PURE__*/_react["default"].createElement(_comments["default"], {
126
+ toUserId: toUserId
127
+ }), /*#__PURE__*/_react["default"].createElement(_filter["default"], {
128
+ onSearch: onSearch
90
129
  })));
91
130
  };
92
131
 
@@ -0,0 +1,28 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
6
+ exports["default"] = void 0;
7
+
8
+ var _react = _interopRequireDefault(require("react"));
9
+
10
+ var _precls = require("../precls");
11
+
12
+ require("./index.css");
13
+
14
+ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
15
+
16
+ var RelationTitle = function RelationTitle(_ref) {
17
+ var relation = _ref.relation;
18
+ var relationTitle = {
19
+ "2": "我参与的",
20
+ "3": "我关注的"
21
+ };
22
+ return /*#__PURE__*/_react["default"].createElement("div", {
23
+ className: "".concat(_precls.precls, "__header-relation-title")
24
+ }, relationTitle[relation]);
25
+ };
26
+
27
+ var _default = RelationTitle;
28
+ exports["default"] = _default;
@@ -7,12 +7,19 @@ exports["default"] = void 0;
7
7
 
8
8
  var _react = _interopRequireDefault(require("react"));
9
9
 
10
- var _pc = require("@titaui/pc");
10
+ var _photoCard = _interopRequireDefault(require("../../../components/photo-card"));
11
+
12
+ require("./index.css");
11
13
 
12
14
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
13
15
 
14
- var UserTitle = function UserTitle() {
15
- return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_pc.PhotoCard, null));
16
+ var UserTitle = function UserTitle(_ref) {
17
+ var toUserId = _ref.toUserId;
18
+ // todo: 关注 | 取消关注
19
+ if (!toUserId) return null;
20
+ return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_photoCard["default"], {
21
+ userId: toUserId
22
+ }));
16
23
  };
17
24
 
18
25
  var _default = UserTitle;
@@ -9,6 +9,12 @@ exports["default"] = void 0;
9
9
 
10
10
  var _react = _interopRequireWildcard(require("react"));
11
11
 
12
+ var _reactRouter = require("react-router");
13
+
14
+ var _moment = _interopRequireDefault(require("moment"));
15
+
16
+ var _tools = require("../../utils/tools");
17
+
12
18
  var _header = _interopRequireDefault(require("./header"));
13
19
 
14
20
  var _list = _interopRequireDefault(require("./list"));
@@ -21,6 +27,10 @@ var _pagination = _interopRequireDefault(require("../../components/pagination"))
21
27
 
22
28
  var _requestApi = require("./request-api");
23
29
 
30
+ var _localStorage = require("../../utils/local-storage");
31
+
32
+ var _bsGlobal = require("../../utils/bs-global");
33
+
24
34
  require("./index.css");
25
35
 
26
36
  require("./theme.css");
@@ -50,48 +60,108 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
50
60
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
51
61
 
52
62
  var NewOkrList = function NewOkrList(props) {
53
- var OkrListCmp = props.OkrListCmp;
63
+ var OkrListCmp = props.OkrListCmp,
64
+ OkrCommunicationPush = props.OkrCommunicationPush;
65
+ var useLocalStorage = new _localStorage.localStorage();
66
+ var formFieldValues = useLocalStorage.getItem('okr-filter-values') || {
67
+ targetType: "",
68
+ targetCategory: "",
69
+ targetSort: ""
70
+ };
71
+ var showWorkExecution = (0, _bsGlobal.getBSGlobal)('OkrAdvancedSetting').KRSetting.ShowWorkExecution;
54
72
 
55
- var _useState = (0, _react.useState)([]),
73
+ var _useState = (0, _react.useState)(false),
56
74
  _useState2 = _slicedToArray(_useState, 2),
57
- okrs = _useState2[0],
58
- setOkrs = _useState2[1];
75
+ loading = _useState2[0],
76
+ setLoading = _useState2[1];
59
77
 
60
- var _useState3 = (0, _react.useState)(0),
78
+ var _useState3 = (0, _react.useState)([]),
61
79
  _useState4 = _slicedToArray(_useState3, 2),
62
- total = _useState4[0],
63
- setTotal = _useState4[1];
80
+ okrs = _useState4[0],
81
+ setOkrs = _useState4[1];
64
82
 
65
- var _useState5 = (0, _react.useState)(1),
83
+ var _useState5 = (0, _react.useState)(0),
66
84
  _useState6 = _slicedToArray(_useState5, 2),
67
- pageNum = _useState6[0],
68
- setPageNum = _useState6[1];
85
+ total = _useState6[0],
86
+ setTotal = _useState6[1];
69
87
 
70
- var _useState7 = (0, _react.useState)(10),
88
+ var _useState7 = (0, _react.useState)(1),
71
89
  _useState8 = _slicedToArray(_useState7, 2),
72
- pageSize = _useState8[0],
73
- setPageSize = _useState8[1];
90
+ pageNum = _useState8[0],
91
+ setPageNum = _useState8[1];
74
92
 
75
- var _useState9 = (0, _react.useState)({}),
93
+ var _useState9 = (0, _react.useState)(10),
76
94
  _useState10 = _slicedToArray(_useState9, 2),
77
- query = _useState10[0],
78
- setQuery = _useState10[1]; // const routerData = getQueryString();
79
-
80
-
95
+ pageSize = _useState10[0],
96
+ setPageSize = _useState10[1];
97
+
98
+ var _useState11 = (0, _react.useState)({
99
+ okrType: formFieldValues.okrType,
100
+ okrClassify: formFieldValues.okrClassify,
101
+ orderType: formFieldValues.orderType,
102
+ annualNum: new Date().getFullYear() + "",
103
+ cycleType: "2",
104
+ yqmNum: "".concat((0, _moment["default"])().quarter()),
105
+ onlyThisDept: false,
106
+ keyWords: ''
107
+ }),
108
+ _useState12 = _slicedToArray(_useState11, 2),
109
+ query = _useState12[0],
110
+ setQuery = _useState12[1];
111
+
112
+ var routerData = (0, _tools.getQueryString)();
113
+ var departmentName = routerData.departmentName,
114
+ departmentId = routerData.departmentId,
115
+ _routerData$relation = routerData.relation,
116
+ relation = _routerData$relation === void 0 ? 0 : _routerData$relation,
117
+ _routerData$toUserId = routerData.toUserId,
118
+ toUserId = _routerData$toUserId === void 0 ? "" : _routerData$toUserId;
81
119
  (0, _react.useEffect)(function () {
82
120
  getOkrs();
83
121
  }, [pageNum, pageSize, query]);
84
122
 
85
123
  var getOkrs = function getOkrs() {
86
- (0, _requestApi.okrSearch)(_objectSpread({
124
+ var params = _objectSpread({
87
125
  pageNum: pageNum,
88
- pageSize: pageSize
89
- }, query)).then(function (res) {
90
- var _res$total = res.total,
91
- total = _res$total === void 0 ? 0 : _res$total,
92
- works = res.works;
93
- setTotal(total);
94
- setOkrs(works || []);
126
+ pageSize: pageSize,
127
+ relation: relation,
128
+ toUserId: (0, _bsGlobal.getUserInfo)().Id,
129
+ userIds: toUserId,
130
+ searchKr: 0,
131
+ status: 0,
132
+ haveSubDept: false,
133
+ departmentIds: departmentId
134
+ }, query);
135
+
136
+ if (showWorkExecution) {
137
+ params.showOkrE = 1;
138
+ params.Searchpage = 2;
139
+ }
140
+
141
+ var request;
142
+
143
+ if (!relation) {
144
+ request = (0, _requestApi.okrSearch)(params);
145
+ } // else if (relation == 23) {
146
+ // // 公司全部目标
147
+ // let pars = { ...params, departmentIds: departmentId ? departmentId + '' : '' };
148
+ // if (query.keywords && !departmentId) {
149
+ // Object.assign(pars, {
150
+ // searchKr: 0,
151
+ // });
152
+ // }
153
+ // request = okrSearch(params);
154
+ // }
155
+ else {
156
+ request = (0, _requestApi.okrList)(params);
157
+ }
158
+
159
+ setLoading(true); // recordVisitUser();
160
+
161
+ request.then(function (res) {
162
+ setOkrs(res.works || []);
163
+ setTotal(res.total);
164
+ setLoading(false);
95
165
  });
96
166
  };
97
167
 
@@ -101,11 +171,21 @@ var NewOkrList = function NewOkrList(props) {
101
171
  };
102
172
 
103
173
  var handleOnSearch = function handleOnSearch(params) {
104
- setQuery(_objectSpread({}, params));
174
+ console.log(params);
175
+ console.log(_objectSpread(_objectSpread({}, query), params));
176
+ setQuery(_objectSpread(_objectSpread(_objectSpread({}, query), params), {}, {
177
+ pageNum: 1
178
+ }));
105
179
  };
106
180
 
107
181
  return /*#__PURE__*/_react["default"].createElement(_context.Context.Provider, {
108
- value: {}
182
+ value: _objectSpread({
183
+ OkrCommunicationPush: OkrCommunicationPush,
184
+ relation: relation,
185
+ departmentName: departmentName,
186
+ departmentId: departmentId,
187
+ toUserId: toUserId
188
+ }, query)
109
189
  }, /*#__PURE__*/_react["default"].createElement("div", {
110
190
  className: _precls.precls
111
191
  }, /*#__PURE__*/_react["default"].createElement(_header["default"], {
@@ -123,5 +203,6 @@ var NewOkrList = function NewOkrList(props) {
123
203
  }))));
124
204
  };
125
205
 
126
- var _default = NewOkrList;
206
+ var _default = (0, _reactRouter.withRouter)(NewOkrList);
207
+
127
208
  exports["default"] = _default;
@@ -0,0 +1,5 @@
1
+ "use strict";
2
+
3
+ Object.defineProperty(exports, "__esModule", {
4
+ value: true
5
+ });
@@ -36,7 +36,7 @@
36
36
 
37
37
  .titaui-keyword-search__input {
38
38
  width: 0;
39
- animation: shrink 1s ease;
39
+ animation: shrink 0.1s ease;
40
40
  }
41
41
 
42
42
  .titaui-keyword-search__input input {
@@ -47,7 +47,7 @@
47
47
  .titaui-keyword-search--active .titaui-keyword-search__input {
48
48
  width: 120px;
49
49
  margin-right: 12px;
50
- animation: grow 1s ease;
50
+ animation: grow 0.1s ease;
51
51
  }
52
52
 
53
53
  @keyframes grow {
@@ -60,23 +60,27 @@ var KeywordSearch = function KeywordSearch(props) {
60
60
  };
61
61
 
62
62
  var handleSearch = function handleSearch() {
63
- onSearch && onSearch(keyword);
63
+ onSearch && onSearch({
64
+ keyWords: keyword
65
+ });
64
66
  };
65
67
 
66
68
  var handleOnBlur = function handleOnBlur(e) {
67
69
  if (!keyword.length) setActive(false);
68
70
  };
69
71
 
72
+ var changeValue = function changeValue(e) {
73
+ setKeyword(e.target.value);
74
+ };
75
+
70
76
  var handleOnKeyDown = function handleOnKeyDown(e) {
71
77
  if (e.keyCode == 13) {
72
78
  handleSearch();
73
- } else {
74
- setKeyword(e.target.value);
75
79
  }
76
80
  };
77
81
 
78
- var clearKeyword = function clearKeyword() {
79
- return setKeyword('');
82
+ var clearKeyword = function clearKeyword(e) {
83
+ setKeyword('');
80
84
  };
81
85
 
82
86
  return /*#__PURE__*/_react["default"].createElement("div", {
@@ -84,7 +88,9 @@ var KeywordSearch = function KeywordSearch(props) {
84
88
  }, /*#__PURE__*/_react["default"].createElement("span", {
85
89
  className: "".concat(precls, "__input")
86
90
  }, /*#__PURE__*/_react["default"].createElement("input", {
91
+ value: keyword,
87
92
  onKeyUp: handleOnKeyDown,
93
+ onChange: changeValue,
88
94
  ref: inputRef,
89
95
  onBlur: handleOnBlur
90
96
  })), keyword.length > 0 && /*#__PURE__*/_react["default"].createElement("span", {
@@ -29,7 +29,6 @@ var List = function List(props) {
29
29
  var openCreateModal = function openCreateModal() {};
30
30
 
31
31
  return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(OkrListCmp, {
32
- searchKey: '',
33
32
  okrData: okrs,
34
33
  addOkr: function addOkr(okr) {
35
34
  setOkrs([].concat(_toConsumableArray(okrs), [okr]));
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.okrSearch = void 0;
6
+ exports.okrSearch = exports.okrList = exports.okrCrowd = exports.getUserInfoById = void 0;
7
7
 
8
8
  var _request = require("../../utils/request");
9
9
 
@@ -28,7 +28,8 @@ var okrSearch = /*#__PURE__*/function () {
28
28
  return (0, _request.rpost)('v1')('okr/search', _objectSpread({
29
29
  orderType: 2,
30
30
  // 默认创建时间正序
31
- relation: 0
31
+ relation: 0,
32
+ haveSubDept: false
32
33
  }, param));
33
34
 
34
35
  case 2:
@@ -54,4 +55,104 @@ var okrSearch = /*#__PURE__*/function () {
54
55
  };
55
56
  }();
56
57
 
57
- exports.okrSearch = okrSearch;
58
+ exports.okrSearch = okrSearch;
59
+
60
+ var okrCrowd = /*#__PURE__*/function () {
61
+ var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(param) {
62
+ var res;
63
+ return regeneratorRuntime.wrap(function _callee2$(_context2) {
64
+ while (1) {
65
+ switch (_context2.prev = _context2.next) {
66
+ case 0:
67
+ _context2.next = 2;
68
+ return (0, _request.rpost)('v1')("okr/crowd", _objectSpread({
69
+ orderType: 2
70
+ }, param));
71
+
72
+ case 2:
73
+ res = _context2.sent;
74
+
75
+ if (!(res.Code == 1)) {
76
+ _context2.next = 5;
77
+ break;
78
+ }
79
+
80
+ return _context2.abrupt("return", res.Data);
81
+
82
+ case 5:
83
+ case "end":
84
+ return _context2.stop();
85
+ }
86
+ }
87
+ }, _callee2);
88
+ }));
89
+
90
+ return function okrCrowd(_x2) {
91
+ return _ref2.apply(this, arguments);
92
+ };
93
+ }();
94
+
95
+ exports.okrCrowd = okrCrowd;
96
+
97
+ var okrList = /*#__PURE__*/function () {
98
+ var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(param) {
99
+ var res;
100
+ return regeneratorRuntime.wrap(function _callee3$(_context3) {
101
+ while (1) {
102
+ switch (_context3.prev = _context3.next) {
103
+ case 0:
104
+ _context3.next = 2;
105
+ return (0, _request.rpost)('v1')("okr/list?toUserId=".concat(param.toUserId), _objectSpread({
106
+ orderType: 2,
107
+ // 默认创建时间正序
108
+ relation: 0,
109
+ haveSubDept: false
110
+ }, param));
111
+
112
+ case 2:
113
+ res = _context3.sent;
114
+
115
+ if (!(res.Code == 1)) {
116
+ _context3.next = 5;
117
+ break;
118
+ }
119
+
120
+ return _context3.abrupt("return", res.Data);
121
+
122
+ case 5:
123
+ case "end":
124
+ return _context3.stop();
125
+ }
126
+ }
127
+ }, _callee3);
128
+ }));
129
+
130
+ return function okrList(_x3) {
131
+ return _ref3.apply(this, arguments);
132
+ };
133
+ }();
134
+
135
+ exports.okrList = okrList;
136
+
137
+ var getUserInfoById = /*#__PURE__*/function () {
138
+ var _ref4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4(toUserId) {
139
+ return regeneratorRuntime.wrap(function _callee4$(_context4) {
140
+ while (1) {
141
+ switch (_context4.prev = _context4.next) {
142
+ case 0:
143
+ return _context4.abrupt("return", (0, _request.rget)('v2')("user/GetById?toUserid=".concat(toUserId)));
144
+
145
+ case 1:
146
+ case "end":
147
+ return _context4.stop();
148
+ }
149
+ }
150
+ }, _callee4);
151
+ }));
152
+
153
+ return function getUserInfoById(_x4) {
154
+ return _ref4.apply(this, arguments);
155
+ };
156
+ }();
157
+
158
+ exports.getUserInfoById = getUserInfoById;
@@ -1,3 +1,7 @@
1
1
  .tita-okr-list-v2 .okr-list-v1 {
2
2
  padding: 0;
3
3
  }
4
+
5
+ .screenpush-wrapper {
6
+ top: 0 !important;
7
+ }
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports["default"] = exports.getHashQuery = void 0;
6
+ exports.getHashQuery = exports["default"] = void 0;
7
7
 
8
8
  var _react = require("react");
9
9
 
@@ -5,7 +5,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "functi
5
5
  Object.defineProperty(exports, "__esModule", {
6
6
  value: true
7
7
  });
8
- exports.OpenDepartmentName = exports.OpenUserName = exports.getOpenId = exports.isWechat = exports.getSource = void 0;
8
+ exports.isWechat = exports.getSource = exports.getOpenId = exports.OpenUserName = exports.OpenDepartmentName = void 0;
9
9
 
10
10
  var _react = _interopRequireWildcard(require("react"));
11
11
 
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.checkTenantOkrExist = exports.onUpdateKr = exports.getShareUrl = void 0;
6
+ exports.onUpdateKr = exports.getShareUrl = exports.checkTenantOkrExist = void 0;
7
7
 
8
8
  var _axios = _interopRequireDefault(require("axios"));
9
9
 
@@ -3,8 +3,9 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
+ exports.closeFullscreen = exports.OkrTypeSetting = void 0;
6
7
  exports.getBSGlobal = getBSGlobal;
7
- exports.okrTypeMap = exports.OkrTypeSetting = exports.tenantLogo = exports.tenantName = exports.closeFullscreen = exports.openFullscreen = void 0;
8
+ exports.tenantName = exports.tenantLogo = exports.openFullscreen = exports.okrTypeMap = void 0;
8
9
 
9
10
  var openFullscreen = function openFullscreen() {
10
11
  // 隐藏侧边栏和头部
package/lib/utils/auth.js CHANGED
@@ -5,7 +5,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "functi
5
5
  Object.defineProperty(exports, "__esModule", {
6
6
  value: true
7
7
  });
8
- exports.DynamicManagerAuth = exports.hasSuperior = exports.EAuth = exports.KRAuth = exports.OAuth = exports.BaseAuth = void 0;
8
+ exports.hasSuperior = exports.OAuth = exports.KRAuth = exports.EAuth = exports.DynamicManagerAuth = exports.BaseAuth = void 0;
9
9
 
10
10
  var _bsGlobal = require("./bs-global");
11
11
 
@@ -3,8 +3,8 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
+ exports.hasWebHead = exports.getVersion = exports.getUserInfo = exports.getUploadMaxSize = exports.getTenantInfo = exports.getSource = exports.getOkrAdvancedSetting = exports.getBSGlobal = exports.getAppHead = exports.formatNum = void 0;
6
7
  exports.isWx = isWx;
7
- exports.hasWebHead = exports.formatNum = exports.getAppHead = exports.getUploadMaxSize = exports.getSource = exports.getVersion = exports.getOkrAdvancedSetting = exports.getBSGlobal = exports.getTenantInfo = exports.getUserInfo = void 0;
8
8
 
9
9
  var _mockBsglobal = require("./mock-bsglobal");
10
10
 
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.showNextMonthFirstDay = exports.showMonthLastDay = exports.showMonthFirstDay = exports.showNextWeekFirstDay = exports.showWeekLastDay = exports.showWeekFirstDay = exports.getNextDayOfYear = exports.getFirstDayOfYear = exports.timeFormat = exports.getTimeString = void 0;
6
+ exports.timeFormat = exports.showWeekLastDay = exports.showWeekFirstDay = exports.showNextWeekFirstDay = exports.showNextMonthFirstDay = exports.showMonthLastDay = exports.showMonthFirstDay = exports.getTimeString = exports.getNextDayOfYear = exports.getFirstDayOfYear = void 0;
7
7
 
8
8
  var getTimeString = function getTimeString(time, nowTime) {
9
9
  if (!time) {
@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.cssSupport = cssSupport;
7
- exports.getUploadMaxSize = getUploadMaxSize;
8
7
  exports.getTenantInfo = getTenantInfo;
8
+ exports.getUploadMaxSize = getUploadMaxSize;
9
9
  exports.isDingDing = void 0;
10
10
 
11
11
  var _bsGlobal = require("./bs-global");