@titaui/pc 1.11.36 → 1.11.39-beta.1

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 (64) hide show
  1. package/lib/components/avatar/name-avatar/index.css +1 -0
  2. package/lib/components/avatar/name-avatar/index.js +22 -13
  3. package/lib/components/avatar/text-avatar/index.css +2 -2
  4. package/lib/components/avatar/text-avatar/index.js +2 -2
  5. package/lib/components/button/rect-btn/index.css +45 -11
  6. package/lib/components/button/rect-btn/index.js +12 -6
  7. package/lib/components/change-okr-modal/index.js +2 -1
  8. package/lib/components/checkbox/index.css +3 -3
  9. package/lib/components/create-okr-modal/index.js +45 -41
  10. package/lib/components/create-okr-modal/request-api.js +1 -1
  11. package/lib/components/dialog-confirm/index.css +2 -2
  12. package/lib/components/drawer/headerAction.js +5 -1
  13. package/lib/components/drawer/headerDrop.js +42 -4
  14. package/lib/components/drawer/index.css +33 -0
  15. package/lib/components/drawer/index.js +26 -3
  16. package/lib/components/dynamic/new-ui.css +4 -4
  17. package/lib/components/nav-top/components/menu/img/new.svg +30 -0
  18. package/lib/components/nav-top/components/menu/img/wecome-temp.png +0 -0
  19. package/lib/components/nav-top/components/menu/index.css +91 -0
  20. package/lib/components/nav-top/components/menu/index.js +72 -24
  21. package/lib/components/nav-top/index.js +6 -2
  22. package/lib/components/okr-detail/base-info/other-infos/date-cycle/index.js +20 -4
  23. package/lib/components/okr-detail/base-info/other-infos/principal/index.js +9 -1
  24. package/lib/components/okr-detail/components/header/index.js +10 -3
  25. package/lib/components/okr-detail/components/header/o-name.js +10 -3
  26. package/lib/components/okr-detail/components/o-classify.js +5 -1
  27. package/lib/components/okr-detail/components/okr-tree/tree-node/kr-node/index.js +13 -14
  28. package/lib/components/okr-detail/detail-header/constant.js +53 -0
  29. package/lib/components/okr-detail/detail-header/delete-confirm/delete-confirm.js +98 -43
  30. package/lib/components/okr-detail/detail-header/delete-confirm/index.css +55 -0
  31. package/lib/components/okr-detail/detail-header/index.css +11 -0
  32. package/lib/components/okr-detail/detail-header/index.js +228 -234
  33. package/lib/components/okr-detail/helper.js +108 -0
  34. package/lib/components/okr-detail/index.js +21 -4
  35. package/lib/components/okr-detail/okr-list/index.js +8 -3
  36. package/lib/components/okr-detail/request-apis.js +10 -4
  37. package/lib/components/okr-flow/child-node/index.css +1 -1
  38. package/lib/components/okr-flow/export-modal/index.js +47 -2
  39. package/lib/components/okr-period-selector/index.js +9 -5
  40. package/lib/components/okr-period-selector/select-cycle.js +23 -19
  41. package/lib/components/operation-records/index.js +1 -1
  42. package/lib/components/operation-records/style.js +1 -1
  43. package/lib/components/task-relation-modal/request-api.js +2 -1
  44. package/lib/components/task-tree/task-item-node/e-status-dropdown.js +33 -13
  45. package/lib/components/task-tree/task-item-node/e-task.js +2 -2
  46. package/lib/components/task-tree/task-item-node/index.css +16 -4
  47. package/lib/components/textarea/index.css +142 -0
  48. package/lib/components/textarea/index.js +259 -0
  49. package/lib/components/time-picker/time-picker.js +34 -102
  50. package/lib/components/time-picker/timer-picker-input.js +0 -6
  51. package/lib/components/toast/index.js +5 -3
  52. package/lib/index.js +40 -0
  53. package/lib/pages/new-okr-list/header/common.js +52 -0
  54. package/lib/pages/new-okr-list/header/index.css +45 -0
  55. package/lib/pages/new-okr-list/header/index.js +38 -16
  56. package/lib/pages/new-okr-list/header/operate-record.js +131 -0
  57. package/lib/pages/new-okr-list/index.js +3 -1
  58. package/lib/pages/new-okr-list/list/index.js +19 -2
  59. package/lib/pages/new-okr-list/request-api.js +8 -2
  60. package/lib/pages/okr-map/unsupport-ie/index.js +3 -5
  61. package/lib/utils/format-time.js +8 -1
  62. package/lib/utils/open-data.js +5 -1
  63. package/package.json +1 -1
  64. package/lib/components/okr-detail/detail-header/delete-confirm/style.js +0 -38
@@ -17,8 +17,6 @@ var _header = _interopRequireDefault(require("./components/header"));
17
17
 
18
18
  var _tabs = _interopRequireWildcard(require("../tabs"));
19
19
 
20
- var _request = require("../../utils/request");
21
-
22
20
  var _tabPanelContent = _interopRequireDefault(require("./components/tab-panel-content"));
23
21
 
24
22
  var _baseInfo = _interopRequireDefault(require("./base-info"));
@@ -27,6 +25,8 @@ var _schedule = _interopRequireDefault(require("./schedule"));
27
25
 
28
26
  var _requestApis = require("./request-apis");
29
27
 
28
+ var _helper = require("./helper");
29
+
30
30
  var _okrReview = _interopRequireDefault(require("../okr-review"));
31
31
 
32
32
  var _reportList = _interopRequireDefault(require("../eReport/eReportLists/reportList"));
@@ -173,7 +173,14 @@ function OkrDetail(props) {
173
173
  var _useState23 = (0, _react.useState)(),
174
174
  _useState24 = _slicedToArray(_useState23, 2),
175
175
  generalRoleType = _useState24[0],
176
- setGeneralRoleType = _useState24[1]; // 计算元素的ref,用于实现 tabs 吸顶,点赞吸底
176
+ setGeneralRoleType = _useState24[1];
177
+
178
+ var _useState25 = (0, _react.useState)({
179
+ isOpen: false
180
+ }),
181
+ _useState26 = _slicedToArray(_useState25, 2),
182
+ approvalSetting = _useState26[0],
183
+ setApprovalSetting = _useState26[1]; // 计算元素的ref,用于实现 tabs 吸顶,点赞吸底
177
184
 
178
185
 
179
186
  var tabRef = (0, _react.useRef)();
@@ -203,9 +210,18 @@ function OkrDetail(props) {
203
210
  getData();
204
211
  };
205
212
 
213
+ var getApprovalShow = function getApprovalShow() {
214
+ (0, _requestApis.getOkrApprovalSettingInfo)().then(function (resp) {
215
+ if (resp.Code === 1) {
216
+ setApprovalSetting((0, _helper.getApprovalOpenItem)(resp.Data));
217
+ }
218
+ });
219
+ };
220
+
206
221
  (0, _react.useEffect)(function () {
207
222
  setLoading(true);
208
223
  getData();
224
+ getApprovalShow();
209
225
  }, []);
210
226
  (0, _react.useEffect)(function () {
211
227
  if (!okrInfo || !okrInfo.workId) return;
@@ -276,7 +292,8 @@ function OkrDetail(props) {
276
292
  changeTabActive: changeTabActive,
277
293
  refreshAll: refreshAll,
278
294
  setOkrInfo: setOkrInfo,
279
- refreshKrs: refreshKrs
295
+ refreshKrs: refreshKrs,
296
+ approvalSetting: approvalSetting
280
297
  })
281
298
  }, /*#__PURE__*/_react["default"].createElement(_context.GeneralDataContext.Provider, {
282
299
  value: {
@@ -43,6 +43,8 @@ var _auth = require("../../../utils/auth");
43
43
 
44
44
  var _getLocale = require("../../../utils/getLocale");
45
45
 
46
+ var _helper = require("../helper");
47
+
46
48
  require("./index.css");
47
49
 
48
50
  var _excluded = ["mileStoneId"];
@@ -153,7 +155,8 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
153
155
  setShowOkrEvalute = _useContext.setShowOkrEvalute;
154
156
 
155
157
  var _useContext2 = (0, _react.useContext)(_context2.CommonContext),
156
- refreshAll = _useContext2.refreshAll;
158
+ refreshAll = _useContext2.refreshAll,
159
+ approvalSetting = _useContext2.approvalSetting;
157
160
 
158
161
  var parentId = generalParent.parentId,
159
162
  parentOkr = generalParent.parentOkr,
@@ -442,9 +445,11 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
442
445
  padding: "0 32px 0 18px"
443
446
  }, /*#__PURE__*/_react["default"].createElement(_okrTree["default"], {
444
447
  data: krs,
445
- draggable: canEditOkr,
448
+ approvalSetting: approvalSetting,
449
+ okrInfo: okrInfo,
450
+ draggable: canEditOkr && (okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.applyState) === _helper.EApproveStatus.UnderApproval,
446
451
  onDrop: onOkrItemDropHandler
447
- }))), (canEditOkr || isInnerUser) && /*#__PURE__*/_react["default"].createElement("div", {
452
+ }))), (canEditOkr || isInnerUser) && (0, _helper.getApprovalOkr)(approvalSetting, "createOkr", okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.applyState, okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.OkrAndKrApprovalTypes) && /*#__PURE__*/_react["default"].createElement("div", {
448
453
  ref: wrapperRef,
449
454
  className: (0, _classnames["default"])("".concat(preCls, "__addkr"))
450
455
  }, /*#__PURE__*/_react["default"].createElement(_paddingLayout["default"], null, createKrShow ? /*#__PURE__*/_react["default"].createElement(_createKrItem["default"], {
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.workDelete = exports.updateVisibility = exports.updateTaskStatus = exports.updateTaskPrincipal = exports.updateTaskDate = exports.updateProgressDesc = exports.updateProgress = exports.updateParentId = exports.updateOkrVisibility = exports.updateOkrPrincipal = exports.updateOkrName = exports.updateOScore = exports.updateOCommitType = exports.updateOClassify = exports.updateKrProgressAndStatus = exports.updateKrPrincipal = exports.updateKrName = exports.updateKrDate = exports.updateConfidenceIndex = exports.updateClassify = exports.updateChildOkrWeight = exports.transferPrincipal = exports.start = exports.setTaskPriority = exports.saveODesc = exports.remindAction = exports.krChangeOrder = exports.getRelWorks = exports.getRelProgress = exports.getProgress = exports.getPraiseComments = exports.getOrg = exports.getOkrUsers = exports.getOkrDetail = exports.getKrsByCondition = exports.getKrs = exports.getFeedById = exports.deleteUser = exports.deleteProgressDesc = exports.deleteKr = exports.createNewKr = exports.close = exports.cancelRel = exports.cancelPraise = exports.cancelParentOkr = exports.addUserRelation = exports.addUser = exports.addPraise = exports.addComment = void 0;
6
+ exports.workDelete = exports.updateVisibility = exports.updateTaskStatus = exports.updateTaskPrincipal = exports.updateTaskDate = exports.updateProgressDesc = exports.updateProgress = exports.updateParentId = exports.updateOkrVisibility = exports.updateOkrPrincipal = exports.updateOkrName = exports.updateOScore = exports.updateOCommitType = exports.updateOClassify = exports.updateKrProgressAndStatus = exports.updateKrPrincipal = exports.updateKrName = exports.updateKrDate = exports.updateConfidenceIndex = exports.updateClassify = exports.updateChildOkrWeight = exports.transferPrincipal = exports.start = exports.setTaskPriority = exports.saveODesc = exports.remindAction = exports.krChangeOrder = exports.getRelWorks = exports.getRelProgress = exports.getProgress = exports.getPraiseComments = exports.getOrg = exports.getOkrUsers = exports.getOkrDetail = exports.getOkrApprovalSettingInfo = exports.getKrsByCondition = exports.getKrs = exports.getFeedById = exports.deleteUser = exports.deleteProgressDesc = exports.deleteKr = exports.createNewKr = exports.close = exports.cancelRel = exports.cancelPraise = exports.cancelParentOkr = exports.addUserRelation = exports.addUser = exports.addPraise = exports.addComment = void 0;
7
7
 
8
8
  var _qs = _interopRequireDefault(require("qs"));
9
9
 
@@ -110,6 +110,12 @@ var getOkrDetail = function getOkrDetail(_ref5) {
110
110
 
111
111
  exports.getOkrDetail = getOkrDetail;
112
112
 
113
+ var getOkrApprovalSettingInfo = function getOkrApprovalSettingInfo() {
114
+ return (0, _request.rget)("v1")("WorkManageSetting/GetOkrApproval");
115
+ };
116
+
117
+ exports.getOkrApprovalSettingInfo = getOkrApprovalSettingInfo;
118
+
113
119
  var updateClassify = function updateClassify(_ref6) {
114
120
  var okrId = _ref6.okrId,
115
121
  okrClassify = _ref6.okrClassify;
@@ -407,7 +413,7 @@ var deleteUser = function deleteUser(delUserId, okrId, relation) {
407
413
  exports.deleteUser = deleteUser;
408
414
 
409
415
  var workDelete = function workDelete(data) {
410
- return (0, _request.rdelete)("v2")("work/deleteV2?workId=".concat(data.workId), {
416
+ return (0, _request.rdelete)("v1")("okr/deleteV2?workId=".concat(data.workId), {
411
417
  data: data
412
418
  });
413
419
  };
@@ -415,7 +421,7 @@ var workDelete = function workDelete(data) {
415
421
  exports.workDelete = workDelete;
416
422
 
417
423
  var start = function start(okrId) {
418
- return (0, _request.rpost)("v1")("Work/Start", {
424
+ return (0, _request.rpost)("v1")("okr/Start", {
419
425
  work_id: okrId
420
426
  }, {
421
427
  headers: {
@@ -428,7 +434,7 @@ var start = function start(okrId) {
428
434
  exports.start = start;
429
435
 
430
436
  var close = function close(okrId) {
431
- return (0, _request.rpost)("v1")("Work/Close", {
437
+ return (0, _request.rpost)("v1")("okr/Close", {
432
438
  work_id: okrId
433
439
  }, {
434
440
  headers: {
@@ -49,7 +49,7 @@
49
49
  width: 340px;
50
50
  height: 102px;
51
51
  background: url(../images/private-light.png) no-repeat;
52
- background-size: contain;
52
+ background-size: 340px 102px;
53
53
  }
54
54
 
55
55
  .titaui-okr-flow--node__search {
@@ -37,6 +37,8 @@ var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
37
37
 
38
38
  require("rc-color-picker/assets/index.css");
39
39
 
40
+ var Sentry = _interopRequireWildcard(require("@sentry/browser"));
41
+
40
42
  require("./index.css");
41
43
 
42
44
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -170,15 +172,47 @@ var ExportMapModal = function ExportMapModal(props) {
170
172
  var userId = (_window = window) === null || _window === void 0 ? void 0 : (_window$BSGlobal = _window.BSGlobal) === null || _window$BSGlobal === void 0 ? void 0 : (_window$BSGlobal$logi = _window$BSGlobal.loginUserInfo) === null || _window$BSGlobal$logi === void 0 ? void 0 : _window$BSGlobal$logi.Id;
171
173
  var telentId = (_window2 = window) === null || _window2 === void 0 ? void 0 : (_window2$BSGlobal = _window2.BSGlobal) === null || _window2$BSGlobal === void 0 ? void 0 : (_window2$BSGlobal$ten = _window2$BSGlobal.tenantInfo) === null || _window2$BSGlobal$ten === void 0 ? void 0 : _window2$BSGlobal$ten.Id;
172
174
  var imgUrl = result.toDataURL('image/png'); // 得到图片的base64编码数据
173
- // @ts-ignore
174
175
 
175
176
  // 得到图片的base64编码数据
177
+ _toast["default"].Warning('导出中,请勿关闭弹窗', {
178
+ canClose: true
179
+ });
180
+
181
+ var equalIndex = imgUrl.indexOf('='); // 获取=号下标
182
+
183
+ // 获取=号下标
184
+ var size = 0;
185
+
186
+ if (equalIndex > 0) {
187
+ var str = imgUrl.substring(0, equalIndex); // 去除=号
188
+
189
+ // 去除=号
190
+ var strLength = str.length;
191
+ var fileLength = strLength - strLength / 8 * 2; // 真实的图片byte大小
192
+
193
+ // 真实的图片byte大小
194
+ size = Math.floor(fileLength); // 向下取整
195
+ } else {
196
+ var _strLength = imgUrl.length;
197
+
198
+ var _fileLength = _strLength - _strLength / 8 * 2;
199
+
200
+ size = Math.floor(_fileLength); // 向下取整
201
+ }
202
+
203
+ size = size / 1024 / 1024; // @ts-ignore
204
+
176
205
  // @ts-ignore
177
206
  window.titaTracker && window.titaTracker("action").record({
178
- actionName: userId + '租户:' + telentId + '我得到了图片' + imgUrl.slice(1, 200),
207
+ actionName: userId + '租户:' + telentId + '我得到了图片大小为:' + size + ',路径为' + imgUrl.slice(1, 200),
179
208
  actionGroup: 'okr地图图片',
180
209
  productName: 'okr地图导出'
181
210
  });
211
+ Sentry.withScope(function (scope) {
212
+ scope.setTag("error-level", "P0");
213
+ scope.setTag("error-type", "地图导出-图片生成");
214
+ scope.setExtra("userMessage", userId + '租户:' + telentId + '我得到了图片大小为:' + size + ',路径为' + imgUrl);
215
+ });
182
216
  (0, _requestApis.getBase64DownloadUrl)(imgUrl.split(',')[1]).then(function (url) {
183
217
  var image = new Image(); // @ts-ignore
184
218
 
@@ -188,6 +222,16 @@ var ExportMapModal = function ExportMapModal(props) {
188
222
  actionGroup: 'okr地图接口',
189
223
  productName: 'okr地图导出'
190
224
  });
225
+ Sentry.withScope(function (scope) {
226
+ scope.setTag("error-level", "P0");
227
+ scope.setTag("error-type", "地图导出-图片地址");
228
+ scope.setExtra("userMessage", userId + '租户:' + telentId + '我得到了图片大小为:' + size + ',路径为' + imgUrl);
229
+ });
230
+
231
+ _toast["default"].Warning('图片上传成功,准备本地下载', {
232
+ canClose: true
233
+ });
234
+
191
235
  image.setAttribute('crossOrigin', 'anonymous');
192
236
 
193
237
  image.onload = function () {
@@ -287,6 +331,7 @@ var ExportMapModal = function ExportMapModal(props) {
287
331
  onOk: confirmHandler,
288
332
  onCancel: onCloseHandler,
289
333
  ref: modalRef,
334
+ confirmLoading: isExport,
290
335
  className: "export-map-modal titaui-dialog",
291
336
  forceRender: true
292
337
  }, /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
@@ -17,6 +17,8 @@ var _selectCycle = _interopRequireDefault(require("./select-cycle"));
17
17
 
18
18
  var _requestApis = require("./request-apis");
19
19
 
20
+ var _getLocale = require("../../utils/getLocale");
21
+
20
22
  require("./index.css");
21
23
 
22
24
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -68,12 +70,14 @@ function _default(props) {
68
70
  }, []);
69
71
 
70
72
  var handleChangeCyecle = function handleChangeCyecle(data) {
71
- (0, _requestApis.updateOCyecle)(okrId, data).then(function () {
72
- _toast["default"].Success("修改成功", {
73
- canClose: false
74
- });
73
+ (0, _requestApis.updateOCyecle)(okrId, data).then(function (resp) {
74
+ if (resp.Code === 1) {
75
+ _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'));
75
76
 
76
- setCycle(data);
77
+ setCycle(data);
78
+ } else {
79
+ _toast["default"].Error(resp.Message);
80
+ }
77
81
  });
78
82
  };
79
83
 
@@ -49,7 +49,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
49
49
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
50
50
 
51
51
  function _formatCycleData(periodParams, getCycleRange) {
52
- if (!periodParams) return "";
52
+ if (!periodParams) return '';
53
53
  var startDate = periodParams.startDate;
54
54
  var endDate = periodParams.endDate;
55
55
 
@@ -58,7 +58,7 @@ function _formatCycleData(periodParams, getCycleRange) {
58
58
  endDate = periodParams.endDate.slice(5);
59
59
  }
60
60
 
61
- return "".concat(_periodSelector["default"].formatPeriod(periodParams)).concat(getCycleRange ? ",".concat(startDate, "~").concat(endDate) : "");
61
+ return "".concat(_periodSelector["default"].formatPeriod(periodParams)).concat(getCycleRange ? ",".concat(startDate, "~").concat(endDate) : '');
62
62
  }
63
63
 
64
64
  function CreateCycle(_ref) {
@@ -94,21 +94,21 @@ function CreateCycle(_ref) {
94
94
  setCycleSetting = _useState4[1];
95
95
 
96
96
  (0, _react.useEffect)(function () {
97
- var settings = localStorage.getItem("OKR_CYCLE_SETTING");
97
+ var settings = localStorage.getItem('OKR_CYCLE_SETTING');
98
98
 
99
99
  if (settings) {
100
100
  setCycleSetting(JSON.parse(settings));
101
101
  return;
102
102
  }
103
103
 
104
- var url = (0, _helper.getApiUrl)("okr/cycleSetting");
105
- (0, _helper.taker)(url, "GET").then(function (res) {
104
+ var url = (0, _helper.getApiUrl)('okr/cycleSetting');
105
+ (0, _helper.taker)(url, 'GET').then(function (res) {
106
106
  if (res.Code == 1) {
107
107
  setCycleSetting(res.Data);
108
108
  }
109
109
  });
110
110
  }, []);
111
- var cycleWrapperRef = (0, _react.useRef)(document.createElement("div"));
111
+ var cycleWrapperRef = (0, _react.useRef)(document.createElement('div'));
112
112
 
113
113
  var onPeriodSelectorChangeHandler = function onPeriodSelectorChangeHandler(c) {
114
114
  setSelfCycle(_objectSpread(_objectSpread({}, selfCycle), c));
@@ -148,13 +148,13 @@ function CreateCycle(_ref) {
148
148
  },
149
149
  ref: cycleWrapperRef,
150
150
  style: {
151
- backgroundColor: "white",
152
- boxShadow: "0px 4px 12px 0px rgb(127 145 180 / 20%)",
151
+ backgroundColor: 'white',
152
+ boxShadow: '0px 4px 12px 0px rgb(127 145 180 / 20%)',
153
153
  borderRadius: 4
154
154
  }
155
155
  }, /*#__PURE__*/_react["default"].createElement(_periodSelector["default"], {
156
156
  style: {
157
- width: "100%"
157
+ width: '100%'
158
158
  },
159
159
  selected: selfCycle,
160
160
  showFullCycle: false,
@@ -176,9 +176,9 @@ function CreateCycle(_ref) {
176
176
  }))), /*#__PURE__*/_react["default"].createElement("div", {
177
177
  className: "okr-detail-date-cycle__date-line",
178
178
  style: {
179
- borderBottom: "1px solid #F0F2F5"
179
+ borderBottom: '1px solid #F0F2F5'
180
180
  }
181
- }, (0, _getLocale.getLocale)("Mod_StartDate"), "\uFF1A", /*#__PURE__*/_react["default"].createElement(_rangePickerPop["default"], {
181
+ }, (0, _getLocale.getLocale)('Mod_StartDate'), "\uFF1A", /*#__PURE__*/_react["default"].createElement(_rangePickerPop["default"], {
182
182
  format: "YYYY/MM/DD",
183
183
  controlled: true,
184
184
  onConfirm: onStartDateConfirmHandler,
@@ -193,7 +193,7 @@ function CreateCycle(_ref) {
193
193
  className: "tu-icon-arrow-down okr-detail-date-cycle__select-time-down-icon"
194
194
  })))), /*#__PURE__*/_react["default"].createElement("div", {
195
195
  className: "okr-detail-date-cycle__date-line"
196
- }, (0, _getLocale.getLocale)("Mod_EndDate"), "\uFF1A", /*#__PURE__*/_react["default"].createElement(_rangePickerPop["default"], {
196
+ }, (0, _getLocale.getLocale)('Mod_EndDate'), "\uFF1A", /*#__PURE__*/_react["default"].createElement(_rangePickerPop["default"], {
197
197
  format: "YYYY/MM/DD",
198
198
  controlled: true,
199
199
  onConfirm: onEndDateCOnfirmHandler,
@@ -208,8 +208,8 @@ function CreateCycle(_ref) {
208
208
  className: "tu-icon-arrow-down okr-detail-date-cycle__select-time-down-icon"
209
209
  })))), /*#__PURE__*/_react["default"].createElement("div", {
210
210
  style: {
211
- display: "flex",
212
- justifyContent: "flex-end"
211
+ display: 'flex',
212
+ justifyContent: 'flex-end'
213
213
  }
214
214
  }, /*#__PURE__*/_react["default"].createElement(_titaUi.Button, {
215
215
  size: "s",
@@ -217,15 +217,15 @@ function CreateCycle(_ref) {
217
217
  marginRight: 12
218
218
  },
219
219
  onClick: onCancelClickHandler
220
- }, (0, _getLocale.getLocale)("Mod_Cancel")), /*#__PURE__*/_react["default"].createElement(_titaUi.Button, {
220
+ }, (0, _getLocale.getLocale)('Mod_Cancel')), /*#__PURE__*/_react["default"].createElement(_titaUi.Button, {
221
221
  size: "s",
222
222
  type: "primary",
223
223
  onClick: onSureClickHandler
224
- }, (0, _getLocale.getLocale)("OKR_MyO_Butt_Determine"))));
224
+ }, (0, _getLocale.getLocale)('OKR_MyO_Butt_Determine'))));
225
225
  } else {
226
- return /*#__PURE__*/_react["default"].createElement(_periodSelector["default"], {
226
+ return canEdit ? /*#__PURE__*/_react["default"].createElement(_periodSelector["default"], {
227
227
  style: {
228
- width: "100%"
228
+ width: '100%'
229
229
  },
230
230
  selected: cycle,
231
231
  showFullCycle: false,
@@ -245,7 +245,11 @@ function CreateCycle(_ref) {
245
245
  btnRef: btnRef,
246
246
  clickCallback: function clickCallback() {},
247
247
  text: _formatCycleData(cycle, getCycleRange)
248
- }));
248
+ })) : renderInnerContent({
249
+ btnRef: btnRef,
250
+ clickCallback: function clickCallback() {},
251
+ text: _formatCycleData(cycle, getCycleRange)
252
+ });
249
253
  }
250
254
  }
251
255
 
@@ -80,7 +80,7 @@ var OperationRecord = /*#__PURE__*/function (_PureComponent) {
80
80
 
81
81
  _this.setState({
82
82
  operationTrackList: newOperationTrackList,
83
- operationTrackTotal: _mockData.OperationData.length
83
+ operationTrackTotal: (_mockData.OperationData === null || _mockData.OperationData === void 0 ? void 0 : _mockData.OperationData.length) || 0
84
84
  });
85
85
  }
86
86
  });
@@ -17,7 +17,7 @@ var OperationRecordWrapper = _styledComponents["default"].div(_templateObject ||
17
17
 
18
18
  exports.OperationRecordWrapper = OperationRecordWrapper;
19
19
 
20
- var OperationRecordTotal = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n margin-bottom: 8px;\n font-size: 12px;\n color: #8f9ca6;\n display: inline-block;\n cursor: pointer;\n\n &:hover {\n color: #2879ff;\n }\n\n p {\n line-height: 17px;\n\n &::before {\n float: right;\n margin-left: 4px;\n }\n }\n"])));
20
+ var OperationRecordTotal = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n margin-bottom: 16px;\n font-size: 12px;\n color: #8f9ca6;\n display: inline-block;\n cursor: pointer;\n\n &:hover {\n color: #2879ff;\n }\n\n p {\n line-height: 17px;\n\n &::before {\n float: right;\n margin-left: 4px;\n }\n }\n"])));
21
21
 
22
22
  exports.OperationRecordTotal = OperationRecordTotal;
23
23
 
@@ -15,7 +15,8 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
15
15
 
16
16
  var okrSearch = function okrSearch(params) {
17
17
  return (0, _request.rpost)("v1")("okr/search", _objectSpread(_objectSpread({}, params), {}, {
18
- orderType: 1
18
+ orderType: 1,
19
+ includeCreateFailApprovalOkr: false
19
20
  })).then(function (res) {
20
21
  return res.Data;
21
22
  });
@@ -5,7 +5,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
5
5
  Object.defineProperty(exports, "__esModule", {
6
6
  value: true
7
7
  });
8
- exports["default"] = _default;
8
+ exports["default"] = void 0;
9
9
 
10
10
  var _react = _interopRequireWildcard(require("react"));
11
11
 
@@ -35,34 +35,51 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
35
35
 
36
36
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
37
37
 
38
- function _default(props) {
38
+ var EStatusDropdown = function EStatusDropdown(props) {
39
+ // eslint-disable-next-line react/prop-types
39
40
  var onChange = props.onChange,
40
41
  checked = props.checked,
41
42
  hasAuth = props.hasAuth;
42
43
 
43
- var _useState = (0, _react.useState)('tu-icon-notstart'),
44
+ var _useState = (0, _react.useState)("tu-icon-notstart"),
44
45
  _useState2 = _slicedToArray(_useState, 2),
45
46
  status = _useState2[0],
46
47
  setStatus = _useState2[1];
47
48
 
48
49
  var onMenuClickHandler = function onMenuClickHandler(name) {
49
50
  setStatus(name);
50
- onChange && onChange(name);
51
+
52
+ if (onChange) {
53
+ onChange(name);
54
+ }
51
55
  };
52
56
 
53
57
  (0, _react.useEffect)(function () {
54
58
  setStatus(checked);
55
59
  }, [checked]);
60
+
61
+ if (!hasAuth) {
62
+ return /*#__PURE__*/_react["default"].createElement("span", {
63
+ style: {
64
+ color: "#89919F",
65
+ fontSize: 16,
66
+ marginRight: 4,
67
+ verticalAlign: "baseline"
68
+ },
69
+ className: (0, _classnames["default"])(status)
70
+ });
71
+ }
72
+
56
73
  return /*#__PURE__*/_react["default"].createElement(_dropSelector["default"], {
57
74
  onChange: onMenuClickHandler,
58
75
  checked: status,
59
76
  canEdit: hasAuth,
60
77
  trigger: /*#__PURE__*/_react["default"].createElement("span", {
61
78
  style: {
62
- color: '#89919F',
79
+ color: "#89919F",
63
80
  fontSize: 16,
64
81
  marginRight: 4,
65
- verticalAlign: 'baseline'
82
+ verticalAlign: "baseline"
66
83
  },
67
84
  className: (0, _classnames["default"])(status)
68
85
  })
@@ -70,25 +87,28 @@ function _default(props) {
70
87
  name: "tu-icon-finished",
71
88
  icon: "tu-icon-finished",
72
89
  exIconClass: "e-node-status-icon"
73
- }, (0, _getLocale.getLocale)('OKR_MyO_E_From_Completed')), /*#__PURE__*/_react["default"].createElement(_dropSelector.IconItem, {
90
+ }, (0, _getLocale.getLocale)("OKR_MyO_E_From_Completed")), /*#__PURE__*/_react["default"].createElement(_dropSelector.IconItem, {
74
91
  name: "tu-icon-running",
75
92
  icon: "tu-icon-running",
76
93
  exIconClass: "e-node-status-icon"
77
- }, (0, _getLocale.getLocale)('Per_MyRe_text_Inprogress')), /*#__PURE__*/_react["default"].createElement(_dropSelector.IconItem, {
94
+ }, (0, _getLocale.getLocale)("Per_MyRe_text_Inprogress")), /*#__PURE__*/_react["default"].createElement(_dropSelector.IconItem, {
78
95
  name: "tu-icon-canceled",
79
96
  icon: "tu-icon-canceled",
80
97
  exIconClass: "e-node-status-icon"
81
- }, (0, _getLocale.getLocale)('OKR_MyO_E_From_Cancelled')), /*#__PURE__*/_react["default"].createElement(_dropSelector.IconItem, {
98
+ }, (0, _getLocale.getLocale)("OKR_MyO_E_From_Cancelled")), /*#__PURE__*/_react["default"].createElement(_dropSelector.IconItem, {
82
99
  name: "tu-icon-deferred",
83
100
  icon: "tu-icon-deferred",
84
101
  exIconClass: "e-node-status-icon"
85
- }, (0, _getLocale.getLocale)('OKR_MyO_E_From_Delayed')), /*#__PURE__*/_react["default"].createElement(_dropSelector.IconItem, {
102
+ }, (0, _getLocale.getLocale)("OKR_MyO_E_From_Delayed")), /*#__PURE__*/_react["default"].createElement(_dropSelector.IconItem, {
86
103
  name: "tu-icon-paused",
87
104
  icon: "tu-icon-paused",
88
105
  exIconClass: "e-node-status-icon"
89
- }, (0, _getLocale.getLocale)('OKR_MyO_E_From_Suspended')), /*#__PURE__*/_react["default"].createElement(_dropSelector.IconItem, {
106
+ }, (0, _getLocale.getLocale)("OKR_MyO_E_From_Suspended")), /*#__PURE__*/_react["default"].createElement(_dropSelector.IconItem, {
90
107
  name: "tu-icon-notstart",
91
108
  icon: "tu-icon-notstart",
92
109
  exIconClass: "e-node-status-icon"
93
- }, (0, _getLocale.getLocale)('OKR_MyO_E_From_NotStarted')));
94
- }
110
+ }, (0, _getLocale.getLocale)("OKR_MyO_E_From_NotStarted")));
111
+ };
112
+
113
+ var _default = EStatusDropdown;
114
+ exports["default"] = _default;
@@ -347,7 +347,7 @@ function ETaskNode(props) {
347
347
  }, /*#__PURE__*/_react["default"].createElement(_eStatusDropdown["default"], {
348
348
  onChange: onEStatusChangeHandler,
349
349
  checked: _constant.EStatusStatus2ClassType[dataInfo.status],
350
- hasAuth: hasEditAuth && dataInfo.editStatusable
350
+ hasAuth: hasEditAuth && data.editStatusable
351
351
  })), isShowPriority && /*#__PURE__*/_react["default"].createElement("span", {
352
352
  className: (0, _classnames["default"])("".concat(_precls["default"], "__e-task-node-priority"))
353
353
  }, /*#__PURE__*/_react["default"].createElement(_ePriority["default"], {
@@ -376,7 +376,7 @@ function ETaskNode(props) {
376
376
  avatar: user === null || user === void 0 ? void 0 : user.avatar,
377
377
  extraCls: (isCancel || isGray) && "".concat(_precls["default"], "__e-project-node-gray")
378
378
  })), /*#__PURE__*/_react["default"].createElement("span", {
379
- className: (0, _classnames["default"])("".concat(_precls["default"], "__e-task-node-actions-date")),
379
+ className: (0, _classnames["default"])("".concat(_precls["default"], "__e-task-node-actions-date"), _defineProperty({}, "".concat(_precls["default"], "__e-task-node-actions-date--canedit"), dataInfo.status !== 2 && hasEditAuth)),
380
380
  onClick: updateDateHandler
381
381
  }, /*#__PURE__*/_react["default"].createElement(_statusTime["default"], {
382
382
  deadLine: dataInfo.deadLine,
@@ -85,10 +85,10 @@
85
85
  align-items: center;
86
86
  box-sizing: border-box;
87
87
  width: 82px;
88
- height: 26px;
88
+ height: 32px;
89
89
  padding: 4px;
90
90
  text-align: left;
91
- line-height: 26px;
91
+ line-height: 32px;
92
92
  margin-left: 28px;
93
93
  }
94
94
 
@@ -96,6 +96,12 @@
96
96
  vertical-align: text-bottom;
97
97
  }
98
98
 
99
+ .titaui-task-tree__e-task-node-actions-date--canedit:hover {
100
+ border-radius: 8px;
101
+ border: 1px solid #DFE3EA;
102
+ padding: 3px;
103
+ }
104
+
99
105
  .titaui-task-tree__e-task-node-actions-progress {
100
106
  position: relative;
101
107
  top: 3px;
@@ -235,10 +241,10 @@
235
241
  align-items: center;
236
242
  box-sizing: border-box;
237
243
  width: 82px;
238
- height: 26px;
244
+ height: 32px;
239
245
  padding: 4px;
240
246
  text-align: left;
241
- line-height: 26px;
247
+ line-height: 32px;
242
248
  margin-left: 28px;
243
249
  }
244
250
 
@@ -246,6 +252,12 @@
246
252
  vertical-align: text-bottom;
247
253
  }
248
254
 
255
+ .titaui-task-tree__e-project-node-actions-date--canedit:hover {
256
+ border-radius: 8px;
257
+ border: 1px solid #DFE3EA;
258
+ padding: 3px;
259
+ }
260
+
249
261
  .titaui-task-tree__e-project-node-actions-progress {
250
262
  position: relative;
251
263
  top: 3px;