@titaui/pc 1.9.68 → 1.9.72

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 (125) hide show
  1. package/lib/components/change-okr-modal/Filter.js +1 -1
  2. package/lib/components/change-okr-modal/Item.js +1 -1
  3. package/lib/components/change-okr-modal/filterTab.js +1 -1
  4. package/lib/components/change-okr-modal/index.js +1 -1
  5. package/lib/components/communication/CommunicationAttachments.js +1 -1
  6. package/lib/components/communication/ConvertUserName.js +1 -1
  7. package/lib/components/communication/index.js +1 -1
  8. package/lib/components/create-okr-modal/fields/okr-case.js +1 -1
  9. package/lib/components/create-okr-modal/objectType.js +1 -1
  10. package/lib/components/date-picker/BodyItem.js +1 -1
  11. package/lib/components/date-picker/CalendarBody.js +1 -1
  12. package/lib/components/date-picker/CalendarHeader.js +1 -1
  13. package/lib/components/date-picker/index.js +1 -1
  14. package/lib/components/date-range-picker/index.js +1 -1
  15. package/lib/components/delete-confirm-pop/ConfirmPop.js +1 -1
  16. package/lib/components/dynamic/components/dynamic-search-input/index.js +9 -4
  17. package/lib/components/dynamic/constant.js +20 -16
  18. package/lib/components/dynamic/dynamic-liking/item.js +2 -1
  19. package/lib/components/eReport/eReportListEmpty.js +1 -1
  20. package/lib/components/eReport/eReportLists/reportList.js +1 -1
  21. package/lib/components/eReport/eReportShare/index.js +1 -1
  22. package/lib/components/eReport/eReportShare/toast/index.js +1 -1
  23. package/lib/components/edit-kr-wight/EditKrWightModal.js +1 -1
  24. package/lib/components/edit-kr-wight/FormItemV2.js +1 -1
  25. package/lib/components/emotions-selector/selector-content.js +1 -1
  26. package/lib/components/emotions-selector/selector-pop.js +1 -1
  27. package/lib/components/ereport-list/index.js +1 -1
  28. package/lib/components/error-boundary/index.js +1 -1
  29. package/lib/components/form/form-fields/input/index.js +13 -3
  30. package/lib/components/hr-header/index.css +3 -2
  31. package/lib/components/hr-header/index.js +1 -1
  32. package/lib/components/mblog/components/ConfirmPop.js +1 -1
  33. package/lib/components/mblog/components/MblogAction.js +1 -1
  34. package/lib/components/mblog/components/MblogContent.js +1 -1
  35. package/lib/components/mblog/index.js +1 -1
  36. package/lib/components/okr-detail/auth.js +1 -1
  37. package/lib/components/okr-detail/base-info/base-info.css +3 -3
  38. package/lib/components/okr-detail/base-info/other-infos/visibility/index.js +78 -48
  39. package/lib/components/okr-detail/components/base-okr-type/confirm/buttonv2.js +1 -1
  40. package/lib/components/okr-detail/components/base-okr-type/confirm/confirm.js +1 -1
  41. package/lib/components/okr-detail/components/base-okr-type/object-type.js +1 -1
  42. package/lib/components/okr-detail/components/okr-tree/tree-node/kr-node/kr-score-editor/edit-pop.js +1 -1
  43. package/lib/components/okr-detail/components/okr-tree/tree-node/kr-node/kr-score-editor/kr-push-score.js +1 -1
  44. package/lib/components/okr-review/ReviewPop/components/ReviewBody/index.js +1 -1
  45. package/lib/components/okr-review/ReviewPop/components/Toast/index.js +1 -1
  46. package/lib/components/okr-review/ReviewPop/index.js +1 -1
  47. package/lib/components/okr-review/components/ReviewItem/index.js +1 -1
  48. package/lib/components/okr-review/components/confirm-pop/ConfirmPop.js +1 -1
  49. package/lib/components/okr-review/index.js +1 -1
  50. package/lib/components/okrcase-library/okrcases-components/submitOkr-dialog.js +2 -1
  51. package/lib/components/okrcase-library-card/index.js +1 -1
  52. package/lib/components/operation-records/OperationRecordItem.js +1 -1
  53. package/lib/components/operation-records/index.js +1 -1
  54. package/lib/components/part-notice/index.css +40 -0
  55. package/lib/components/part-notice/index.js +90 -0
  56. package/lib/components/photo-card/index.js +6 -3
  57. package/lib/components/photo-card/request.apis.js +2 -2
  58. package/lib/components/point-demo/input/index.js +1 -1
  59. package/lib/components/praise-record/PraiseRecordItem.js +1 -1
  60. package/lib/components/praise-record/index.js +1 -1
  61. package/lib/components/range-picker-pop/index.js +1 -1
  62. package/lib/components/range-selector-pop/RangeList.js +1 -1
  63. package/lib/components/range-selector-pop/RangeSelectorPop.js +1 -1
  64. package/lib/components/select/Option.js +1 -1
  65. package/lib/components/select/index.js +1 -1
  66. package/lib/components/tita-chart/errorBoundary/index.js +1 -1
  67. package/lib/components/upload/components/uploadedPreview.js +1 -1
  68. package/lib/components/upload/index.js +1 -1
  69. package/lib/components/viewer/ImageListRender.js +1 -1
  70. package/lib/components/viewer/index.js +1 -1
  71. package/lib/components-v1/animate/AnimateChild.js +1 -1
  72. package/lib/components-v1/animate/animate.js +1 -1
  73. package/lib/components-v1/avatar/index.js +1 -1
  74. package/lib/components-v1/buttonv2/ButtonOutlined.js +1 -1
  75. package/lib/components-v1/buttonv2/ButtonRounded.js +1 -1
  76. package/lib/components-v1/buttonv2/DefaultButton.js +1 -1
  77. package/lib/components-v1/confirm/index.js +1 -1
  78. package/lib/components-v1/dropDownSelector/StatelessDropdown.js +1 -1
  79. package/lib/components-v1/dropDownSelector/dropDownSelector.js +1 -1
  80. package/lib/components-v1/input/Input.js +1 -1
  81. package/lib/components-v1/input/InputNumber.js +1 -1
  82. package/lib/components-v1/placement/placement.js +1 -1
  83. package/lib/components-v1/placement/placementInner.js +1 -1
  84. package/lib/components-v1/pop/Pop.js +1 -1
  85. package/lib/components-v1/pop/PopInner.js +1 -1
  86. package/lib/components-v1/portals/Portals.js +1 -1
  87. package/lib/components-v1/progress/CircleProgress.js +1 -1
  88. package/lib/components-v1/progress/LineProgress.js +1 -1
  89. package/lib/components-v1/progress/index.js +1 -1
  90. package/lib/components-v1/radio/radio.js +1 -1
  91. package/lib/components-v1/radio/radioGroup.js +1 -1
  92. package/lib/components-v1/search/index.js +1 -1
  93. package/lib/components-v1/select/Option.js +1 -1
  94. package/lib/components-v1/select/index.js +1 -1
  95. package/lib/components-v1/tabs/index.js +1 -1
  96. package/lib/components-v1/textarea/index.js +1 -1
  97. package/lib/components-v1/transition/index.js +1 -1
  98. package/lib/components-v1/userSelector/UserSelectorPop.js +1 -1
  99. package/lib/components-v1/userSelector/components/MultiMode/CommonList.js +1 -1
  100. package/lib/components-v1/userSelector/components/MultiMode/DepartmentList.js +1 -1
  101. package/lib/components-v1/userSelector/components/MultiMode/DepartmentTree.js +1 -1
  102. package/lib/components-v1/userSelector/components/MultiMode/SubsList.js +1 -1
  103. package/lib/components-v1/userSelector/components/MultiMode/index.js +20 -17
  104. package/lib/components-v1/userSelector/components/SearchBar.js +1 -1
  105. package/lib/components-v1/userSelector/components/SingleMode.js +1 -1
  106. package/lib/components-v1/userSelector/components/UserItem.js +1 -1
  107. package/lib/components-v1/userSelector/index.js +1 -1
  108. package/lib/index.js +8 -2
  109. package/lib/pages/aha2021/index.js +2 -45
  110. package/lib/pages/appointment-demo/input/index.js +1 -1
  111. package/lib/pages/group-management/components/input-form/index.js +1 -1
  112. package/lib/pages/new-okr-list/index.js +4 -0
  113. package/lib/utils/auth.js +1 -1
  114. package/lib/utils/open-data.js +4 -5
  115. package/package.json +2 -1
  116. package/src/components/create-okr-modal/fields/okr-case.tsx +1 -1
  117. package/src/components/dynamic/components/dynamic-search-input/index.tsx +7 -5
  118. package/src/components/dynamic/constant.ts +19 -17
  119. package/src/components/dynamic/dynamic-liking/item.tsx +2 -1
  120. package/src/components/okrcase-library/okrcases-components/submitOkr-dialog.tsx +1 -1
  121. package/src/components/okrcase-library-card/index.tsx +1 -1
  122. package/src/components/photo-card/index.tsx +6 -5
  123. package/src/components/photo-card/request.apis.ts +1 -1
  124. package/src/pages/aha2021/index.tsx +3 -27
  125. package/src/pages/new-okr-list/index.tsx +3 -0
package/lib/index.js CHANGED
@@ -303,6 +303,12 @@ Object.defineProperty(exports, "Pagination", {
303
303
  return _pagination["default"];
304
304
  }
305
305
  });
306
+ Object.defineProperty(exports, "PartNotice", {
307
+ enumerable: true,
308
+ get: function get() {
309
+ return _partNotice["default"];
310
+ }
311
+ });
306
312
  Object.defineProperty(exports, "PasswordInput", {
307
313
  enumerable: true,
308
314
  get: function get() {
@@ -528,8 +534,6 @@ Object.defineProperty(exports, "upload", {
528
534
 
529
535
  require("./index.css");
530
536
 
531
- var _stopTakingModal = _interopRequireDefault(require("./components/stop-taking-modal"));
532
-
533
537
  var _dialog = _interopRequireDefault(require("./components/dialog"));
534
538
 
535
539
  var _switch = _interopRequireDefault(require("./components/switch"));
@@ -644,6 +648,8 @@ var _okrcaseLibraryCard = _interopRequireDefault(require("./components/okrcase-l
644
648
 
645
649
  var _operationRecords = _interopRequireDefault(require("./components/operation-records"));
646
650
 
651
+ var _partNotice = _interopRequireDefault(require("./components/part-notice"));
652
+
647
653
  var _pagination = _interopRequireDefault(require("./components/pagination"));
648
654
 
649
655
  var _passwordInput = _interopRequireDefault(require("./components/password-input"));
@@ -25,8 +25,6 @@ var _pointDemo = _interopRequireDefault(require("../../components/point-demo/poi
25
25
 
26
26
  var _platform = require("../../utils/platform");
27
27
 
28
- var _topGlobalPrompt = _interopRequireDefault(require("../../components/top-global-prompt"));
29
-
30
28
  require("./index.css");
31
29
 
32
30
  var _helpers = require("../../utils/helpers");
@@ -35,28 +33,13 @@ var _hrHeader = _interopRequireDefault(require("../../components/hr-header"));
35
33
 
36
34
  var _hrMessage = _interopRequireDefault(require("../../components/nav-top/components/user-message/hrMessage"));
37
35
 
38
- var _localStorage = require("../../utils/local-storage");
39
-
40
36
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
41
37
 
42
38
  function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
43
39
 
44
40
  function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
45
41
 
46
- function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
47
-
48
- function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
49
-
50
- function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
51
-
52
- function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
53
-
54
- function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
55
-
56
- function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
57
-
58
42
  var preCls = "titaui-aha-2021";
59
- var storage = new _localStorage.LocalStorage();
60
43
 
61
44
  function ContentTemplate(props) {
62
45
  var children = props.children,
@@ -81,28 +64,6 @@ function ContentTemplate(props) {
81
64
 
82
65
  function PageLayout(props) {
83
66
  var children = props.children;
84
-
85
- var _useState = (0, _react.useState)(function () {
86
- if ((0, _helpers.getTenantInfo)().Source == 964) return false;
87
- var stopTaking = storage.getItem("topGlobalCard");
88
-
89
- if (stopTaking !== null && stopTaking !== void 0 && stopTaking.date) {
90
- var oldDate = new Date(stopTaking === null || stopTaking === void 0 ? void 0 : stopTaking.date).getDate();
91
- var newDate = new Date().getDate();
92
-
93
- if (newDate > oldDate) {
94
- return true;
95
- }
96
-
97
- return false;
98
- }
99
-
100
- return true;
101
- }),
102
- _useState2 = _slicedToArray(_useState, 2),
103
- topCardVisible = _useState2[0],
104
- setTopCardVisible = _useState2[1];
105
-
106
67
  var isTrial = window.BSGlobal.tenantAuthentication.Version === 1 && (0, _platform.isOfficialSite)();
107
68
  var isTencentHr = window.BSGlobal.tenantInfo.Source === 964;
108
69
 
@@ -120,16 +81,12 @@ function PageLayout(props) {
120
81
  className: (0, _classnames["default"])(preCls)
121
82
  }, /*#__PURE__*/_react["default"].createElement("div", {
122
83
  className: (0, _classnames["default"])("".concat(preCls, "__header"))
123
- }, topCardVisible ? /*#__PURE__*/_react["default"].createElement(_topGlobalPrompt["default"], {
124
- text: "\u4E3A\u4E86\u7ED9\u60A8\u5E26\u6765\u5B89\u5168\u4E0E\u7A33\u5B9A\u7684\u4F53\u9A8C\uFF0C\u6211\u4EEC\u5C06\u4E8E 1.21 23:00 - 1.22 23:59 \u8FDB\u884C\u505C\u670D\u5347\u7EA7\uFF0C\u8BF7\u60A8\u63D0\u524D\u5B89\u6392\u597D\u5DE5\u4F5C\uFF0C\u611F\u8C22\u60A8\u7684\u652F\u6301\u4E0E\u7406\u89E3\uFF01",
125
- link: "https://wiki.tita.com/x/RICeAQ",
126
- setTopCardVisible: setTopCardVisible
127
- }) : null, (0, _helpers.getTenantInfo)().Source === 964 ? /*#__PURE__*/_react["default"].createElement(_hrHeader["default"], null) : /*#__PURE__*/_react["default"].createElement(_navTop["default"], null)), /*#__PURE__*/_react["default"].createElement("div", {
84
+ }, (0, _helpers.getTenantInfo)().Source === 964 ? /*#__PURE__*/_react["default"].createElement(_hrHeader["default"], null) : /*#__PURE__*/_react["default"].createElement(_navTop["default"], null)), /*#__PURE__*/_react["default"].createElement("div", {
128
85
  className: (0, _classnames["default"])("".concat(preCls, "__message"))
129
86
  }, /*#__PURE__*/_react["default"].createElement(_followerVisitor["default"], null)), /*#__PURE__*/_react["default"].createElement("div", {
130
87
  className: (0, _classnames["default"])("".concat(preCls, "__body")),
131
88
  style: {
132
- height: "calc(100vh - ".concat(topCardVisible ? 114 : 74, "px)")
89
+ height: "calc(100vh - ".concat(74, "px)")
133
90
  }
134
91
  }, children), !isTencentHr && /*#__PURE__*/_react["default"].createElement("div", {
135
92
  className: (0, _classnames["default"])("".concat(preCls, "__help"))
@@ -23,7 +23,7 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
23
23
 
24
24
  function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
25
25
 
26
- function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
26
+ function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } Object.defineProperty(subClass, "prototype", { value: Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }), writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
27
27
 
28
28
  function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
29
29
 
@@ -23,7 +23,7 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
23
23
 
24
24
  function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
25
25
 
26
- function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
26
+ function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } Object.defineProperty(subClass, "prototype", { value: Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }), writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
27
27
 
28
28
  function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
29
29
 
@@ -205,6 +205,10 @@ var NewOkrList = function NewOkrList(props) {
205
205
  params.Searchpage = 2;
206
206
  }
207
207
 
208
+ if (departmentId != 0) {
209
+ params.keyWords = '';
210
+ }
211
+
208
212
  var request;
209
213
 
210
214
  if (!relation) {
package/lib/utils/auth.js CHANGED
@@ -9,7 +9,7 @@ exports.hasSuperior = exports.OAuth = exports.KRAuth = exports.EAuth = exports.D
9
9
 
10
10
  var _bsGlobal = require("./bs-global");
11
11
 
12
- function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
12
+ function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } Object.defineProperty(subClass, "prototype", { value: Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }), writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
13
13
 
14
14
  function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
15
15
 
@@ -70,11 +70,10 @@ function openData(p) {
70
70
  if (!openId) return p.name || p.id || null;
71
71
  var ref = (0, _react.useRef)(null);
72
72
  (0, _react.useEffect)(function () {
73
- var wWOpenData = window.WWOpenData; // 如果当前页面中没有 WWOpenData 则去 top 上尝试获取
74
-
75
- if (!wWOpenData && window.top.WWOpenData) {
76
- wWOpenData = window.top.WWOpenData;
77
- }
73
+ var wWOpenData = window.top.WWOpenData; // // 如果当前页面中没有 WWOpenData 则去 top 上尝试获取
74
+ // if (!wWOpenData && window.top.WWOpenData) {
75
+ // wWOpenData = window.top.WWOpenData;
76
+ // }
78
77
 
79
78
  wWOpenData && wWOpenData.bind(ref.current);
80
79
  });
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@titaui/pc",
3
- "version": "1.9.68",
3
+ "version": "1.9.72",
4
4
  "nameCN": "",
5
5
  "description": "",
6
6
  "main": "src/index.js",
@@ -61,6 +61,7 @@
61
61
  "gulp-replace": "^1.0.0",
62
62
  "gulp-sass": "^4.1.0",
63
63
  "gulp-sourcemaps": "^2.6.5",
64
+ "gulp-util": "^3.0.8",
64
65
  "husky": "^7.0.4",
65
66
  "lint-staged": "^12.2.0",
66
67
  "pretty-quick": "^3.1.3",
@@ -38,7 +38,7 @@ export default function ({ onOkrApply, okrTemplateEnabled }: Props) {
38
38
  ) : null}
39
39
  {okrTemplateEnabled && (
40
40
  <Dialog
41
- zIndex={99999}
41
+ zIndex={1200}
42
42
  noHeadLine
43
43
  visible={visible}
44
44
  onClose={onCasesCloseHandler}
@@ -8,10 +8,12 @@ import "./index.scss";
8
8
 
9
9
  const prefix = "titaui-dynamic-search-input";
10
10
 
11
- const SearchType = {
12
- dynamic: getLocale("Menu_Title_Feed"),
13
- person: getLocale("Mod_UserName"),
14
- };
11
+ const SearchType = () => {
12
+ return {
13
+ dynamic: getLocale("Menu_Title_Feed"),
14
+ person: getLocale("Mod_UserName"),
15
+ }
16
+ }
15
17
 
16
18
  const DynamicSearchInput: FC<IDynamicSearchInputProps> = ({
17
19
  setSearchKey,
@@ -114,7 +116,7 @@ const DynamicSearchInput: FC<IDynamicSearchInputProps> = ({
114
116
  }}
115
117
  >
116
118
  <span className={`${prefix}__select-type`}>
117
- <span>{SearchType[searchDynamicType]}</span>
119
+ <span>{SearchType()?.[searchDynamicType]}</span>
118
120
  <i className={classNames("tu-icon-sort-down", `${prefix}__icon`)} />
119
121
  </span>
120
122
  </Popup>
@@ -55,23 +55,25 @@ export const ObjTypeMapText = {
55
55
  [EObjType.KanBan]: getLocale("Pro_page_V_Tab_Kanban"),
56
56
  };
57
57
 
58
- export const ObjectType = {
59
- 1: getLocale("Mod_sannouncement"),
60
- 4: getLocale("Menu_Title_Projects"),
61
- 5: getLocale("Mod_sPerformanceForm"),
62
- 6: getLocale("Mod_sPerformanceGoals"),
63
- 7: getLocale("Mod_stasks"),
64
- 8: getLocale("Mod_sDailySummary"),
65
- 10: getLocale("Feed_sFeed"),
66
- 11: getLocale("Pro_page_Plan"),
67
- 12: getLocale("Feed_OperationTasks"),
68
- 62: getLocale("Mod_sobjective"),
69
- 65: getLocale("Feed_Keyresults"),
70
- 70: getLocale("OKR_MyO_KRP_Review"),
71
- 79: getLocale("Mod_skeyprogress"),
72
- 80: getLocale("Feed_sAnnouncement"),
73
- 42: getLocale("OKR_MyO_E_Reward"),
74
- };
58
+ export const ObjectType = () => {
59
+ return {
60
+ 1: getLocale("Mod_sannouncement"),
61
+ 4: getLocale("Menu_Title_Projects"),
62
+ 5: getLocale("Mod_sPerformanceForm"),
63
+ 6: getLocale("Mod_sPerformanceGoals"),
64
+ 7: getLocale("Mod_stasks"),
65
+ 8: getLocale("Mod_sDailySummary"),
66
+ 10: getLocale("Feed_sFeed"),
67
+ 11: getLocale("Pro_page_Plan"),
68
+ 12: getLocale("Feed_OperationTasks"),
69
+ 62: getLocale("Mod_sobjective"),
70
+ 65: getLocale("Feed_Keyresults"),
71
+ 70: getLocale("OKR_MyO_KRP_Review"),
72
+ 79: getLocale("Mod_skeyprogress"),
73
+ 80: getLocale("Feed_sAnnouncement"),
74
+ 42: getLocale("OKR_MyO_E_Reward"),
75
+ };
76
+ }
75
77
 
76
78
  export const EStatusStatus2ClassType = {
77
79
  2: "tu-icon-finished",
@@ -28,6 +28,7 @@ const Item: FC<any> = ({ userInfo }) => {
28
28
  // const handleOpenUserPage = () => {
29
29
  // window.open(url, "_blank");
30
30
  // };
31
+ const ObjectTypeText = ObjectType();
31
32
  return (
32
33
  <div className={`${preCls}`}>
33
34
  <div className={`${preCls}-center`}>
@@ -47,7 +48,7 @@ const Item: FC<any> = ({ userInfo }) => {
47
48
  <span>
48
49
  {getLocale("Feed_Kudos")}
49
50
  <OpenUserName id={toUserId} name={toUserName} />
50
- {`${ObjectType[pariseObjType] || "feed"}`}
51
+ {`${ObjectTypeText[pariseObjType] || "feed"}`}
51
52
  </span>
52
53
  )}
53
54
  maxWidth={150}
@@ -44,7 +44,7 @@ export function SubmitDialog(props: Props1) {
44
44
  };
45
45
 
46
46
  return (
47
- <Dialog visible={isShowSubmitOkrWindow} noFooter width="480px" destroyOnClose noCloseIcon getContainer={() => document.body}>
47
+ <Dialog visible={isShowSubmitOkrWindow} noFooter width="480px" destroyOnClose noCloseIcon getContainer={() => document.body} zIndex={1200}>
48
48
  <div className="okr-cases-library__submitWindow">
49
49
  <img src={require("../image/submit小驴.svg")} />
50
50
  <div className="tu-icon-canceled" onClick={() => handleShowSubmitOkrWindow(false)} />
@@ -70,7 +70,7 @@ function OkrCaseCard(props: Props) {
70
70
  window.titaTracker
71
71
  // @ts-ignore
72
72
  && window.titaTracker("action").record({
73
- action: getLocale("Per_Ass_Pop_button_Apply"),
73
+ action: '套用',
74
74
  actionGroup: getLocale("OKR_OKRex_Casebase"),
75
75
  productName: getLocale("OKR_OKRex_Casebase"),
76
76
  });
@@ -6,7 +6,7 @@ import Tooltip from "../tooltip";
6
6
  import ConditionRender from "../condition-render";
7
7
  import Avatar from "../../components/avatar";
8
8
  import { OpenUserName } from "../../utils/open-data";
9
- import { getUserInfo } from "../../utils/bs-global";
9
+ import { getBSGlobal, getUserInfo } from "../../utils/bs-global";
10
10
  import Card from "./components/card";
11
11
  import {
12
12
  getAttentionData,
@@ -32,7 +32,6 @@ interface IProps {
32
32
 
33
33
  function PhotoCard(props: IProps) {
34
34
  const { userId, isNameVisible = true } = props;
35
-
36
35
  const [userInfo, setUserInfo] = useState<any>();
37
36
  const [isAttention, setIsAttention] = useState(false);
38
37
 
@@ -51,13 +50,15 @@ function PhotoCard(props: IProps) {
51
50
 
52
51
  useEffect(() => {
53
52
  getOtherUserInfo(userId).then((res) => {
53
+ let currentUser;
54
54
  if (res.Code === 1) {
55
+ currentUser = res.Data;
55
56
  setUserInfo(res.Data);
56
57
  }
57
- getAttentionData(userId).then((res) => {
58
+ getAttentionData().then((res) => {
58
59
  if (res.Code === 1) {
59
- res.Data.followerUsers.forEach((item) => {
60
- if (item.userId === userownInfo.Id) {
60
+ (res.Data || []).forEach((item) => {
61
+ if (item.userId === currentUser.userId) {
61
62
  setIsAttention(true);
62
63
  }
63
64
  });
@@ -1,6 +1,6 @@
1
1
  import { rget, rpost } from "../../utils/request";
2
2
 
3
- export const getAttentionData = (userId) => rget("v1")(`follow/getFollowerList?toUserId=${userId}`);
3
+ export const getAttentionData = () => rget("v1")(`follow/followerList`);
4
4
 
5
5
  export const getVisitData = (userId) => rget("v1")(`okr/okrCyclePageVisitor?toUserId=${userId}`);
6
6
 
@@ -1,5 +1,5 @@
1
1
  import React, {
2
- Children, ReactChild, useEffect, useState,
2
+ Children, ReactChild, useEffect,
3
3
  } from "react";
4
4
  import classNames from "classnames";
5
5
  import Tooltip from "../../components/tooltip";
@@ -9,15 +9,12 @@ import InvitePeople from "../../components/invite-people";
9
9
  import HelpCard from "../../components/help-card";
10
10
  import PointDemo from "../../components/point-demo/point-demo";
11
11
  import { isOfficialSite } from "../../utils/platform";
12
- import TopGlobalCard from "../../components/top-global-prompt";
13
12
  import "./index.scss";
14
13
  import { getTenantInfo } from "../../utils/helpers";
15
14
  import HrHeader from "../../components/hr-header";
16
15
  import HrMessage from "../../components/nav-top/components/user-message/hrMessage";
17
- import { LocalStorage } from "../../utils/local-storage";
18
16
 
19
17
  const preCls = "titaui-aha-2021";
20
- const storage = new LocalStorage();
21
18
 
22
19
  function ContentTemplate(props: {
23
20
  children: ReactChild,
@@ -50,19 +47,7 @@ function PageLayout(props: {
50
47
  children: ReactChild
51
48
  }) {
52
49
  const { children } = props;
53
- const [topCardVisible, setTopCardVisible] = useState(() => {
54
- if (getTenantInfo().Source === 964) return false;
55
- const stopTaking: any = storage.getItem("topGlobalCard");
56
- if (stopTaking?.date) {
57
- const oldDate = new Date(stopTaking?.date).getDate();
58
- const newDate = new Date().getDate();
59
- if (newDate > oldDate) {
60
- return true;
61
- }
62
- return false;
63
- }
64
- return true;
65
- });
50
+
66
51
  const isTrial = window.BSGlobal.tenantAuthentication.Version === 1 && isOfficialSite();
67
52
  const isTencentHr = window.BSGlobal.tenantInfo.Source === 964;
68
53
 
@@ -82,21 +67,12 @@ function PageLayout(props: {
82
67
  return (
83
68
  <div className={classNames(preCls)}>
84
69
  <div className={classNames(`${preCls}__header`)}>
85
- {topCardVisible
86
- ? (
87
- <TopGlobalCard
88
- text="为了给您带来安全与稳定的体验,我们将于 1.21 23:00 - 1.22 23:59 进行停服升级,请您提前安排好工作,感谢您的支持与理解!"
89
- link="https://wiki.tita.com/x/RICeAQ"
90
- setTopCardVisible={setTopCardVisible}
91
- />
92
- )
93
- : null}
94
70
  {getTenantInfo().Source === 964 ? <HrHeader /> : <NavTop />}
95
71
  </div>
96
72
  <div className={classNames(`${preCls}__message`)}>
97
73
  <FollowerVisitor />
98
74
  </div>
99
- <div className={classNames(`${preCls}__body`)} style={{ height: `calc(100vh - ${topCardVisible ? 114 : 74}px)` }}>
75
+ <div className={classNames(`${preCls}__body`)} style={{ height: `calc(100vh - ${74}px)` }}>
100
76
  {children}
101
77
  </div>
102
78
  {!isTencentHr && (
@@ -120,6 +120,9 @@ const NewOkrList: FC<any> = (props: {
120
120
  params.showOkrE = 1;
121
121
  params.Searchpage = 2;
122
122
  }
123
+ if(departmentId != 0) {
124
+ params.keyWords = ''
125
+ }
123
126
  let request;
124
127
 
125
128
  if (!relation) {