@titaui/pc 1.11.12 → 1.11.13-beta.3
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.
- package/.husky/pre-commit +1 -1
- package/lib/components/avatar/name-avatar/index.css +1 -0
- package/lib/components/avatar/name-avatar/index.js +22 -13
- package/lib/components/button/rect-btn/index.css +25 -11
- package/lib/components/button/rect-btn/index.js +8 -4
- package/lib/components/create-okr-modal/request-api.js +1 -1
- package/lib/components/drawer/headerAction.js +5 -1
- package/lib/components/drawer/headerDrop.js +41 -4
- package/lib/components/drawer/index.css +44 -0
- package/lib/components/drawer/index.js +35 -6
- package/lib/components/dynamic/constant.js +9 -5
- package/lib/components/dynamic/dynamic-item/dynamic-kr/index.js +1 -1
- package/lib/components/dynamic/dynamic-item/dynamic-task/index.js +1 -1
- package/lib/components/icon-button-list/index.css +1 -1
- package/lib/components/nav-top/index.js +6 -2
- package/lib/components/okr-detail/base-info/other-infos/date-cycle/index.js +16 -4
- package/lib/components/okr-detail/base-info/other-infos/principal/index.js +9 -1
- package/lib/components/okr-detail/components/header/index.js +9 -3
- package/lib/components/okr-detail/components/header/o-name.js +9 -3
- package/lib/components/okr-detail/components/o-classify.js +5 -1
- package/lib/components/okr-detail/components/okr-tree/tree-node/kr-node/index.js +9 -6
- package/lib/components/okr-detail/detail-header/constant.js +53 -0
- package/lib/components/okr-detail/detail-header/index.js +12 -1
- package/lib/components/okr-detail/helper.js +62 -0
- package/lib/components/okr-detail/index.js +21 -2
- package/lib/components/okr-detail/okr-list/index.js +8 -3
- package/lib/components/okr-detail/request-apis.js +7 -1
- package/lib/components/okr-flow/child-node/index.css +54 -15
- package/lib/components/okr-flow/child-node/work-node.js +19 -3
- package/lib/components/okr-flow/empty/index.css +8 -1
- package/lib/components/okr-flow/export-modal/index.js +26 -2
- package/lib/components/okr-flow/export-modules/okr-search-panel/index.css +3 -1
- package/lib/components/okr-flow/export-modules/okr-search-panel/index.js +14 -9
- package/lib/components/okr-flow/images/loading-light.gif +0 -0
- package/lib/components/okr-flow/okr-map/index.js +32 -14
- package/lib/components/okr-flow/request-apis.js +11 -4
- package/lib/components/okr-flow/root-node/index.css +2 -2
- package/lib/components/okr-flow/utils/index.js +43 -26
- package/lib/components/okr-flow/utils/tree-handler.js +14 -3
- package/lib/components/okr-period-selector/select-cycle.js +23 -19
- package/lib/components/okrcase-library/okrcases-components/submitOkr-dialog.js +1 -0
- package/lib/components/period-selector/index.js +3 -0
- package/lib/components/textarea/index.css +120 -0
- package/lib/components/textarea/index.js +257 -0
- package/lib/index.js +40 -0
- package/lib/pages/new-okr-list/header/common.js +52 -0
- package/lib/pages/new-okr-list/header/index.css +45 -0
- package/lib/pages/new-okr-list/header/index.js +28 -16
- package/lib/pages/new-okr-list/header/operate-record.js +88 -0
- package/lib/pages/new-okr-list/index.js +3 -1
- package/lib/pages/new-okr-list/list/index.js +19 -2
- package/lib/pages/okr-map/export-modules/okr-map/header/index.css +6 -1
- package/lib/pages/okr-map/export-modules/okr-map/header/index.js +47 -13
- package/lib/pages/okr-map/export-modules/okr-map/okr-map.js +27 -17
- package/lib/pages/okr-map/number-select/index.css +4 -1
- package/lib/pages/okr-map/number-select/index.js +1 -1
- package/lib/utils/format-time.js +8 -1
- package/lib/utils/open-data.js +5 -1
- package/package.json +1 -1
|
@@ -31,6 +31,8 @@ var _progress = _interopRequireDefault(require("../../../progress"));
|
|
|
31
31
|
|
|
32
32
|
var _utils = require("../../../progress/utils");
|
|
33
33
|
|
|
34
|
+
var _helper = require("../../helper");
|
|
35
|
+
|
|
34
36
|
var _tooltip = _interopRequireDefault(require("../../../tooltip"));
|
|
35
37
|
|
|
36
38
|
var _auth = require("../../../../utils/auth");
|
|
@@ -85,6 +87,8 @@ function Header(props) {
|
|
|
85
87
|
setGeneralOkrClassify = _useContext.setGeneralOkrClassify,
|
|
86
88
|
showOkrEvalute = _useContext.showOkrEvalute;
|
|
87
89
|
|
|
90
|
+
var commonContext = (0, _react.useContext)(_context.CommonContext);
|
|
91
|
+
var approvalSetting = commonContext.approvalSetting;
|
|
88
92
|
var showOScore = (_window = window) === null || _window === void 0 ? void 0 : (_window$BSGlobal = _window.BSGlobal) === null || _window$BSGlobal === void 0 ? void 0 : (_window$BSGlobal$OkrA = _window$BSGlobal.OkrAdvancedSetting) === null || _window$BSGlobal$OkrA === void 0 ? void 0 : (_window$BSGlobal$OkrA2 = _window$BSGlobal$OkrA.KRSetting) === null || _window$BSGlobal$OkrA2 === void 0 ? void 0 : _window$BSGlobal$OkrA2.OScore;
|
|
89
93
|
var _okrInfo$progressGrow = okrInfo.progressGrow,
|
|
90
94
|
progressGrow = _okrInfo$progressGrow === void 0 ? 0 : _okrInfo$progressGrow,
|
|
@@ -156,7 +160,7 @@ function Header(props) {
|
|
|
156
160
|
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
157
161
|
className: "".concat(precls, "__avatar")
|
|
158
162
|
}, /*#__PURE__*/_react["default"].createElement(_oAvatar["default"], {
|
|
159
|
-
editable: editable,
|
|
163
|
+
editable: editable && (okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.applyState) !== 1,
|
|
160
164
|
okrId: okrInfo.workId
|
|
161
165
|
})), /*#__PURE__*/_react["default"].createElement("div", {
|
|
162
166
|
className: "".concat(precls, "__content")
|
|
@@ -164,7 +168,9 @@ function Header(props) {
|
|
|
164
168
|
editable: editable,
|
|
165
169
|
okrName: okrName,
|
|
166
170
|
setIsEdit: setIsEdit,
|
|
167
|
-
okrStatus: okrInfo.status
|
|
171
|
+
okrStatus: okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.status,
|
|
172
|
+
applyState: okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.applyState,
|
|
173
|
+
approvalSetting: approvalSetting
|
|
168
174
|
}, /*#__PURE__*/_react["default"].createElement(_oClassify["default"], {
|
|
169
175
|
editable: editable,
|
|
170
176
|
okrId: okrInfo.workId,
|
|
@@ -187,7 +193,7 @@ function Header(props) {
|
|
|
187
193
|
})), /*#__PURE__*/_react["default"].createElement("span", {
|
|
188
194
|
className: "".concat(precls, "__action-item")
|
|
189
195
|
}, /*#__PURE__*/_react["default"].createElement(_oCycle["default"], {
|
|
190
|
-
editable: editable,
|
|
196
|
+
editable: editable && (0, _helper.getApprovalIsShow)(approvalSetting, "changeOkrTime", okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.applyState),
|
|
191
197
|
okrId: okrInfo.workId
|
|
192
198
|
})), /*#__PURE__*/_react["default"].createElement("span", {
|
|
193
199
|
className: "".concat(precls, "__action-item")
|
|
@@ -13,6 +13,8 @@ var _getLocale = require("../../../../utils/getLocale");
|
|
|
13
13
|
|
|
14
14
|
var _tools = require("../../../../utils/tools");
|
|
15
15
|
|
|
16
|
+
var _helper = require("../../helper");
|
|
17
|
+
|
|
16
18
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
17
19
|
|
|
18
20
|
function OName(props) {
|
|
@@ -20,11 +22,15 @@ function OName(props) {
|
|
|
20
22
|
okrName = props.okrName,
|
|
21
23
|
setIsEdit = props.setIsEdit,
|
|
22
24
|
okrStatus = props.okrStatus,
|
|
23
|
-
children = props.children
|
|
25
|
+
children = props.children,
|
|
26
|
+
approvalSetting = props.approvalSetting,
|
|
27
|
+
applyState = props.applyState;
|
|
24
28
|
|
|
25
29
|
var handleEditClick = function handleEditClick() {
|
|
26
|
-
if (
|
|
27
|
-
|
|
30
|
+
if ((0, _helper.getApprovalIsShow)(approvalSetting, "changeOkrName", applyState)) {
|
|
31
|
+
if (editable) {
|
|
32
|
+
setIsEdit(true);
|
|
33
|
+
}
|
|
28
34
|
}
|
|
29
35
|
};
|
|
30
36
|
|
|
@@ -47,6 +47,8 @@ var _EditKrWightModal = _interopRequireDefault(require("../../../../../edit-kr-w
|
|
|
47
47
|
|
|
48
48
|
var _okrProgressModal = _interopRequireDefault(require("../../../../../okr-progress-modal"));
|
|
49
49
|
|
|
50
|
+
var _helper = require("../../../../helper");
|
|
51
|
+
|
|
50
52
|
var _getLocale = require("../../../../../../utils/getLocale");
|
|
51
53
|
|
|
52
54
|
require("./index.css");
|
|
@@ -98,7 +100,8 @@ function _default(props) {
|
|
|
98
100
|
|
|
99
101
|
var _useContext = (0, _react.useContext)(_context2.CommonContext),
|
|
100
102
|
refreshAll = _useContext.refreshAll,
|
|
101
|
-
okrInfo = _useContext.okrInfo
|
|
103
|
+
okrInfo = _useContext.okrInfo,
|
|
104
|
+
approvalSetting = _useContext.approvalSetting;
|
|
102
105
|
|
|
103
106
|
var _useState = (0, _react.useState)(data.confidenceIndex),
|
|
104
107
|
_useState2 = _slicedToArray(_useState, 2),
|
|
@@ -315,7 +318,7 @@ function _default(props) {
|
|
|
315
318
|
}, "KR", index + 1), /*#__PURE__*/_react["default"].createElement("span", {
|
|
316
319
|
className: (0, _classnames["default"])("".concat(_precls["default"], "__kr-node-title"))
|
|
317
320
|
}, /*#__PURE__*/_react["default"].createElement(_editableInput["default"], {
|
|
318
|
-
editable: krCanEdit,
|
|
321
|
+
editable: krCanEdit && (0, _helper.getApprovalIsShow)(approvalSetting, "changeOkrName", okrInfo.applyState),
|
|
319
322
|
defaultValue: krName,
|
|
320
323
|
emptyMessage: "KR\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A",
|
|
321
324
|
onKeyDown: onKrNameChangeHandler,
|
|
@@ -329,10 +332,10 @@ function _default(props) {
|
|
|
329
332
|
name: user.name,
|
|
330
333
|
id: user.userId,
|
|
331
334
|
width: 68,
|
|
332
|
-
editable: krCanEdit,
|
|
335
|
+
editable: krCanEdit && okrInfo.applyState !== _helper.EApproveStatus.UnderApproval,
|
|
333
336
|
onEditUser: onEditUserHandler,
|
|
334
337
|
nameTips: function nameTips(name) {
|
|
335
|
-
return /*#__PURE__*/_react["default"].createElement("span", null,
|
|
338
|
+
return /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)('OKR_MyO_Text_Owner'), name);
|
|
336
339
|
}
|
|
337
340
|
})), showKrWeight && /*#__PURE__*/_react["default"].createElement(OkrRowColumn, {
|
|
338
341
|
width: 60,
|
|
@@ -348,7 +351,7 @@ function _default(props) {
|
|
|
348
351
|
marginLeft: 16
|
|
349
352
|
}, /*#__PURE__*/_react["default"].createElement(_rangePickerPop["default"], {
|
|
350
353
|
data: data,
|
|
351
|
-
editable: krCanEdit
|
|
354
|
+
editable: krCanEdit && (0, _helper.getApprovalIsShow)(approvalSetting, 'changeOkrTime', okrInfo.applyState)
|
|
352
355
|
})), /*#__PURE__*/_react["default"].createElement("div", {
|
|
353
356
|
className: (0, _classnames["default"])("".concat(_precls["default"], "__kr-node-actions"))
|
|
354
357
|
}, showHeart && /*#__PURE__*/_react["default"].createElement("div", {
|
|
@@ -377,7 +380,7 @@ function _default(props) {
|
|
|
377
380
|
evaluateValue: evaluateValue,
|
|
378
381
|
setEvaluateValue: onEvaluateChangeHanler,
|
|
379
382
|
isEvaluate: isEvaluate
|
|
380
|
-
})), krCanEdit && /*#__PURE__*/_react["default"].createElement("div", {
|
|
383
|
+
})), krCanEdit && okrInfo.applyState !== _helper.EApproveStatus.UnderApproval && /*#__PURE__*/_react["default"].createElement("div", {
|
|
381
384
|
className: (0, _classnames["default"])("".concat(_precls["default"], "__kr-node-delete")),
|
|
382
385
|
onClick: function onClick() {
|
|
383
386
|
return setDeleteModalVisible(true);
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.getApproveStatusTextMap = exports.ApproveStatusColor = exports.ApproveStatus = void 0;
|
|
7
|
+
|
|
8
|
+
var _getLocale = require("../../../utils/getLocale");
|
|
9
|
+
|
|
10
|
+
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
11
|
+
|
|
12
|
+
var ApproveStatus;
|
|
13
|
+
exports.ApproveStatus = ApproveStatus;
|
|
14
|
+
|
|
15
|
+
(function (ApproveStatus) {
|
|
16
|
+
ApproveStatus[ApproveStatus["None"] = 0] = "None";
|
|
17
|
+
ApproveStatus[ApproveStatus["WaitCommit"] = 6] = "WaitCommit";
|
|
18
|
+
ApproveStatus[ApproveStatus["Rejected"] = 3] = "Rejected";
|
|
19
|
+
ApproveStatus[ApproveStatus["UnderApproval"] = 1] = "UnderApproval";
|
|
20
|
+
ApproveStatus[ApproveStatus["ApproveAgree"] = 2] = "ApproveAgree";
|
|
21
|
+
ApproveStatus[ApproveStatus["WithDraw"] = 4] = "WithDraw";
|
|
22
|
+
ApproveStatus[ApproveStatus["Done"] = 5] = "Done";
|
|
23
|
+
})(ApproveStatus || (exports.ApproveStatus = ApproveStatus = {}));
|
|
24
|
+
|
|
25
|
+
var getApproveStatusTextMap = function getApproveStatusTextMap(status) {
|
|
26
|
+
var _ApproveStatusTextMap;
|
|
27
|
+
|
|
28
|
+
var ApproveStatusTextMap = (_ApproveStatusTextMap = {}, _defineProperty(_ApproveStatusTextMap, ApproveStatus.WaitCommit, (0, _getLocale.getLocale)('OKR_MyO_Tobesubmitted')), _defineProperty(_ApproveStatusTextMap, ApproveStatus.Rejected, (0, _getLocale.getLocale)('OKR_MyO_Tobesubmitted')), _defineProperty(_ApproveStatusTextMap, ApproveStatus.UnderApproval, (0, _getLocale.getLocale)('Pro_detail_Approval')), _defineProperty(_ApproveStatusTextMap, ApproveStatus.ApproveAgree, ''), _defineProperty(_ApproveStatusTextMap, ApproveStatus.WithDraw, ''), _defineProperty(_ApproveStatusTextMap, ApproveStatus.None, ''), _defineProperty(_ApproveStatusTextMap, ApproveStatus.Done, ''), _ApproveStatusTextMap);
|
|
29
|
+
return ApproveStatusTextMap[status];
|
|
30
|
+
};
|
|
31
|
+
|
|
32
|
+
exports.getApproveStatusTextMap = getApproveStatusTextMap;
|
|
33
|
+
|
|
34
|
+
var ApproveStatusColor = function ApproveStatusColor(status) {
|
|
35
|
+
var _ApprovalStatusColorM;
|
|
36
|
+
|
|
37
|
+
var ApprovalStatusColorMap = (_ApprovalStatusColorM = {}, _defineProperty(_ApprovalStatusColorM, ApproveStatus.WaitCommit, {
|
|
38
|
+
color: '#F0A326',
|
|
39
|
+
bgColor: 'rgba(240, 163, 38, 0.1)'
|
|
40
|
+
}), _defineProperty(_ApprovalStatusColorM, ApproveStatus.Rejected, {
|
|
41
|
+
color: '#F0A326',
|
|
42
|
+
bgColor: 'rgba(240, 163, 38, 0.1)'
|
|
43
|
+
}), _defineProperty(_ApprovalStatusColorM, ApproveStatus.UnderApproval, {
|
|
44
|
+
color: '#2879FF',
|
|
45
|
+
bgColor: 'rgba(40, 121, 255, 0.1)'
|
|
46
|
+
}), _defineProperty(_ApprovalStatusColorM, ApproveStatus.ApproveAgree, {
|
|
47
|
+
color: '#ffffff',
|
|
48
|
+
bgColor: '#ffffff'
|
|
49
|
+
}), _ApprovalStatusColorM);
|
|
50
|
+
return ApprovalStatusColorMap[status];
|
|
51
|
+
};
|
|
52
|
+
|
|
53
|
+
exports.ApproveStatusColor = ApproveStatusColor;
|
|
@@ -29,6 +29,8 @@ var _okrShare = _interopRequireDefault(require("../../okr-share"));
|
|
|
29
29
|
|
|
30
30
|
var _context7 = require("../context");
|
|
31
31
|
|
|
32
|
+
var _constant = require("./constant");
|
|
33
|
+
|
|
32
34
|
var _deleteConfirm = _interopRequireDefault(require("./delete-confirm/delete-confirm"));
|
|
33
35
|
|
|
34
36
|
var _drawerManager = _interopRequireDefault(require("../../drawer-manager"));
|
|
@@ -85,6 +87,8 @@ function OkrDetailHeader(_ref) {
|
|
|
85
87
|
var loginUserId = window.BSGlobal.loginUserInfo.Id;
|
|
86
88
|
var context = (0, _react.useContext)(_context7.GeneralDataContext);
|
|
87
89
|
var commonContext = (0, _react.useContext)(_context7.CommonContext);
|
|
90
|
+
var approvalSetting = commonContext.approvalSetting;
|
|
91
|
+
var approveStatusColor = (0, _constant.ApproveStatusColor)(detailInfo.applyStatus);
|
|
88
92
|
var changVisiblity = (0, _react.useCallback)( /*#__PURE__*/function () {
|
|
89
93
|
var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(workId, visibility) {
|
|
90
94
|
var visibilityScope,
|
|
@@ -366,6 +370,7 @@ function OkrDetailHeader(_ref) {
|
|
|
366
370
|
}
|
|
367
371
|
}
|
|
368
372
|
|
|
373
|
+
(0, _react.useEffect)(function () {}, []);
|
|
369
374
|
return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_drawer["default"].Header, {
|
|
370
375
|
actions: actions,
|
|
371
376
|
actionComponent: /*#__PURE__*/_react["default"].createElement(_wechatBtn["default"], {
|
|
@@ -374,6 +379,8 @@ function OkrDetailHeader(_ref) {
|
|
|
374
379
|
name: detailInfo.workName,
|
|
375
380
|
principalUser: detailInfo.principalUser
|
|
376
381
|
}),
|
|
382
|
+
approvalSetting: approvalSetting,
|
|
383
|
+
detailInfo: detailInfo,
|
|
377
384
|
content: parent ? /*#__PURE__*/_react["default"].createElement("span", {
|
|
378
385
|
className: "okr-detail-head-parent"
|
|
379
386
|
}, /*#__PURE__*/_react["default"].createElement("i", {
|
|
@@ -386,7 +393,11 @@ function OkrDetailHeader(_ref) {
|
|
|
386
393
|
krId: parent.id
|
|
387
394
|
});
|
|
388
395
|
}
|
|
389
|
-
}, /*#__PURE__*/_react["default"].createElement("span", null, parent.type === 'okr' ? 'O ' : 'KR '), parent.name)) : null
|
|
396
|
+
}, /*#__PURE__*/_react["default"].createElement("span", null, parent.type === 'okr' ? 'O ' : 'KR '), parent.name)) : null,
|
|
397
|
+
status: {
|
|
398
|
+
title: (0, _constant.getApproveStatusTextMap)(detailInfo.applyStatus),
|
|
399
|
+
color: approveStatusColor
|
|
400
|
+
}
|
|
390
401
|
}), /*#__PURE__*/_react["default"].createElement(_okrShare["default"], {
|
|
391
402
|
visible: shareVisible,
|
|
392
403
|
onClose: closeShareModal,
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.getApprovalOpenItem = exports.getApprovalIsShow = exports.EApproveStatus = exports.EApprovalTypes = void 0;
|
|
7
|
+
var EApprovalTypes;
|
|
8
|
+
exports.EApprovalTypes = EApprovalTypes;
|
|
9
|
+
|
|
10
|
+
(function (EApprovalTypes) {
|
|
11
|
+
EApprovalTypes[EApprovalTypes["CreateOkr"] = 53] = "CreateOkr";
|
|
12
|
+
EApprovalTypes[EApprovalTypes["ChangeOkrName"] = 54] = "ChangeOkrName";
|
|
13
|
+
EApprovalTypes[EApprovalTypes["ChangeOkrTime"] = 56] = "ChangeOkrTime";
|
|
14
|
+
EApprovalTypes[EApprovalTypes["DeleteOkr"] = 55] = "DeleteOkr";
|
|
15
|
+
})(EApprovalTypes || (exports.EApprovalTypes = EApprovalTypes = {}));
|
|
16
|
+
|
|
17
|
+
var EApproveStatus;
|
|
18
|
+
exports.EApproveStatus = EApproveStatus;
|
|
19
|
+
|
|
20
|
+
(function (EApproveStatus) {
|
|
21
|
+
EApproveStatus[EApproveStatus["None"] = 0] = "None";
|
|
22
|
+
EApproveStatus[EApproveStatus["WaitCommit"] = 6] = "WaitCommit";
|
|
23
|
+
EApproveStatus[EApproveStatus["Rejected"] = 3] = "Rejected";
|
|
24
|
+
EApproveStatus[EApproveStatus["UnderApproval"] = 1] = "UnderApproval";
|
|
25
|
+
EApproveStatus[EApproveStatus["ApproveAgree"] = 2] = "ApproveAgree";
|
|
26
|
+
EApproveStatus[EApproveStatus["WithDraw"] = 4] = "WithDraw";
|
|
27
|
+
EApproveStatus[EApproveStatus["Done"] = 5] = "Done";
|
|
28
|
+
})(EApproveStatus || (exports.EApproveStatus = EApproveStatus = {}));
|
|
29
|
+
|
|
30
|
+
var getApprovalOpenItem = function getApprovalOpenItem(setting) {
|
|
31
|
+
var result = {
|
|
32
|
+
isOpen: setting.isOpened === 1,
|
|
33
|
+
changeOkrName: false,
|
|
34
|
+
changeOkrTime: false,
|
|
35
|
+
deleteOkr: false,
|
|
36
|
+
createOkr: false
|
|
37
|
+
};
|
|
38
|
+
|
|
39
|
+
if (setting !== null && setting !== void 0 && setting.okrApprovalSettings) {
|
|
40
|
+
setting.okrApprovalSettings.forEach(function (item) {
|
|
41
|
+
if (item.approvalType === EApprovalTypes.ChangeOkrName) {
|
|
42
|
+
result.changeOkrName = true;
|
|
43
|
+
} else if (item.approvalType === EApprovalTypes.ChangeOkrTime) {
|
|
44
|
+
result.changeOkrTime = true;
|
|
45
|
+
} else if (item.approvalType === EApprovalTypes.CreateOkr) {
|
|
46
|
+
result.createOkr = true;
|
|
47
|
+
} else if (item.approvalType === EApprovalTypes.DeleteOkr) {
|
|
48
|
+
result.deleteOkr = true;
|
|
49
|
+
}
|
|
50
|
+
});
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
return result;
|
|
54
|
+
};
|
|
55
|
+
|
|
56
|
+
exports.getApprovalOpenItem = getApprovalOpenItem;
|
|
57
|
+
|
|
58
|
+
var getApprovalIsShow = function getApprovalIsShow(approvalSetting, type, applyState) {
|
|
59
|
+
return !approvalSetting.isOpen || approvalSetting.isOpen && !(approvalSetting !== null && approvalSetting !== void 0 && approvalSetting[type]) || approvalSetting.isOpen && (approvalSetting === null || approvalSetting === void 0 ? void 0 : approvalSetting[type]) && applyState !== EApproveStatus.UnderApproval;
|
|
60
|
+
};
|
|
61
|
+
|
|
62
|
+
exports.getApprovalIsShow = getApprovalIsShow;
|
|
@@ -27,6 +27,8 @@ var _schedule = _interopRequireDefault(require("./schedule"));
|
|
|
27
27
|
|
|
28
28
|
var _requestApis = require("./request-apis");
|
|
29
29
|
|
|
30
|
+
var _helper = require("./helper");
|
|
31
|
+
|
|
30
32
|
var _okrReview = _interopRequireDefault(require("../okr-review"));
|
|
31
33
|
|
|
32
34
|
var _reportList = _interopRequireDefault(require("../eReport/eReportLists/reportList"));
|
|
@@ -173,7 +175,14 @@ function OkrDetail(props) {
|
|
|
173
175
|
var _useState23 = (0, _react.useState)(),
|
|
174
176
|
_useState24 = _slicedToArray(_useState23, 2),
|
|
175
177
|
generalRoleType = _useState24[0],
|
|
176
|
-
setGeneralRoleType = _useState24[1];
|
|
178
|
+
setGeneralRoleType = _useState24[1];
|
|
179
|
+
|
|
180
|
+
var _useState25 = (0, _react.useState)({
|
|
181
|
+
isOpen: false
|
|
182
|
+
}),
|
|
183
|
+
_useState26 = _slicedToArray(_useState25, 2),
|
|
184
|
+
approvalSetting = _useState26[0],
|
|
185
|
+
setApprovalSetting = _useState26[1]; // 计算元素的ref,用于实现 tabs 吸顶,点赞吸底
|
|
177
186
|
|
|
178
187
|
|
|
179
188
|
var tabRef = (0, _react.useRef)();
|
|
@@ -203,9 +212,18 @@ function OkrDetail(props) {
|
|
|
203
212
|
getData();
|
|
204
213
|
};
|
|
205
214
|
|
|
215
|
+
var getApprovalShow = function getApprovalShow() {
|
|
216
|
+
(0, _requestApis.getOkrApprovalSettingInfo)().then(function (resp) {
|
|
217
|
+
if (resp.Code === 1) {
|
|
218
|
+
setApprovalSetting((0, _helper.getApprovalOpenItem)(resp.Data));
|
|
219
|
+
}
|
|
220
|
+
});
|
|
221
|
+
};
|
|
222
|
+
|
|
206
223
|
(0, _react.useEffect)(function () {
|
|
207
224
|
setLoading(true);
|
|
208
225
|
getData();
|
|
226
|
+
getApprovalShow();
|
|
209
227
|
}, []);
|
|
210
228
|
(0, _react.useEffect)(function () {
|
|
211
229
|
if (!okrInfo || !okrInfo.workId) return;
|
|
@@ -276,7 +294,8 @@ function OkrDetail(props) {
|
|
|
276
294
|
changeTabActive: changeTabActive,
|
|
277
295
|
refreshAll: refreshAll,
|
|
278
296
|
setOkrInfo: setOkrInfo,
|
|
279
|
-
refreshKrs: refreshKrs
|
|
297
|
+
refreshKrs: refreshKrs,
|
|
298
|
+
approvalSetting: approvalSetting
|
|
280
299
|
})
|
|
281
300
|
}, /*#__PURE__*/_react["default"].createElement(_context.GeneralDataContext.Provider, {
|
|
282
301
|
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"];
|
|
@@ -151,7 +153,8 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
151
153
|
setShowOkrEvalute = _useContext.setShowOkrEvalute;
|
|
152
154
|
|
|
153
155
|
var _useContext2 = (0, _react.useContext)(_context2.CommonContext),
|
|
154
|
-
refreshAll = _useContext2.refreshAll
|
|
156
|
+
refreshAll = _useContext2.refreshAll,
|
|
157
|
+
approvalSetting = _useContext2.approvalSetting;
|
|
155
158
|
|
|
156
159
|
var parentId = generalParent.parentId,
|
|
157
160
|
parentOkr = generalParent.parentOkr,
|
|
@@ -440,9 +443,11 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
440
443
|
padding: "0 32px 0 18px"
|
|
441
444
|
}, /*#__PURE__*/_react["default"].createElement(_okrTree["default"], {
|
|
442
445
|
data: krs,
|
|
443
|
-
|
|
446
|
+
approvalSetting: approvalSetting,
|
|
447
|
+
okrInfo: okrInfo,
|
|
448
|
+
draggable: canEditOkr && (0, _helper.getApprovalIsShow)(approvalSetting, "changeOkrName", okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.applyState),
|
|
444
449
|
onDrop: onOkrItemDropHandler
|
|
445
|
-
}))), (canEditOkr || isInnerUser) && /*#__PURE__*/_react["default"].createElement("div", {
|
|
450
|
+
}))), (canEditOkr || isInnerUser) && (0, _helper.getApprovalIsShow)(approvalSetting, "createOkr", okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.applyState) && /*#__PURE__*/_react["default"].createElement("div", {
|
|
446
451
|
ref: wrapperRef,
|
|
447
452
|
className: (0, _classnames["default"])("".concat(preCls, "__addkr"))
|
|
448
453
|
}, /*#__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;
|
|
@@ -36,12 +36,11 @@
|
|
|
36
36
|
|
|
37
37
|
.titaui-okr-flow--node {
|
|
38
38
|
position: relative;
|
|
39
|
-
padding:
|
|
40
|
-
width:
|
|
41
|
-
height: 96px;
|
|
39
|
+
padding: 12px 12px;
|
|
40
|
+
width: 340px;
|
|
42
41
|
background: #ffffff;
|
|
43
42
|
box-shadow: 0px 4px 10px 0px rgba(127, 145, 180, 0.1);
|
|
44
|
-
border-radius:
|
|
43
|
+
border-radius: 12px;
|
|
45
44
|
box-sizing: border-box;
|
|
46
45
|
}
|
|
47
46
|
|
|
@@ -75,20 +74,60 @@
|
|
|
75
74
|
white-space: unset;
|
|
76
75
|
}
|
|
77
76
|
|
|
77
|
+
.titaui-okr-flow--node-krs {
|
|
78
|
+
margin-top: 12px;
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
.titaui-okr-flow--node-kr {
|
|
82
|
+
display: flex;
|
|
83
|
+
line-height: 20px;
|
|
84
|
+
font-size: 12px;
|
|
85
|
+
margin-top: 8px;
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
.titaui-okr-flow--node-kr-icon {
|
|
89
|
+
color: rgba(40, 121, 255, 0.6);
|
|
90
|
+
margin-right: 8px;
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
.titaui-okr-flow--node-kr-title {
|
|
94
|
+
flex: 1;
|
|
95
|
+
font-size: 13px;
|
|
96
|
+
font-weight: 400;
|
|
97
|
+
color: #3F4755;
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
.titaui-okr-flow--node-kr-progress {
|
|
101
|
+
width: 32px;
|
|
102
|
+
text-align: right;
|
|
103
|
+
margin-left: 8px;
|
|
104
|
+
white-space: nowrap;
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
.titaui-okr-flow--node-kr-status--normal {
|
|
108
|
+
color: #2879ff;
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
.titaui-okr-flow--node-kr-status--risk {
|
|
112
|
+
color: #f6bd16;
|
|
113
|
+
}
|
|
114
|
+
|
|
115
|
+
.titaui-okr-flow--node-kr-status--expired {
|
|
116
|
+
color: #f05e5e;
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
.titaui-okr-flow--node-kr-status--complete {
|
|
120
|
+
color: #5ad8a6;
|
|
121
|
+
}
|
|
122
|
+
|
|
78
123
|
.titaui-okr-flow--node-title {
|
|
79
124
|
max-width: 252px;
|
|
80
|
-
height: 44px;
|
|
81
125
|
margin-right: 54px;
|
|
82
|
-
margin-bottom:
|
|
83
|
-
line-height:
|
|
126
|
+
margin-bottom: 4px;
|
|
127
|
+
line-height: 24px;
|
|
84
128
|
color: #141c28;
|
|
85
129
|
font-size: 14px;
|
|
86
|
-
|
|
87
|
-
text-overflow: ellipsis;
|
|
88
|
-
display: -webkit-box;
|
|
89
|
-
text-overflow: ellipsis;
|
|
90
|
-
-webkit-box-orient: vertical;
|
|
91
|
-
-webkit-line-clamp: 2;
|
|
130
|
+
font-weight: 600;
|
|
92
131
|
}
|
|
93
132
|
|
|
94
133
|
.titaui-okr-flow--node-desp {
|
|
@@ -118,7 +157,7 @@
|
|
|
118
157
|
overflow: hidden;
|
|
119
158
|
text-overflow: ellipsis;
|
|
120
159
|
white-space: nowrap;
|
|
121
|
-
line-height:
|
|
160
|
+
line-height: 20px;
|
|
122
161
|
max-width: 96px;
|
|
123
162
|
}
|
|
124
163
|
|
|
@@ -296,7 +335,7 @@
|
|
|
296
335
|
top: 0;
|
|
297
336
|
width: 50px;
|
|
298
337
|
height: 32px;
|
|
299
|
-
border-radius: 0
|
|
338
|
+
border-radius: 0 12px 0 20px;
|
|
300
339
|
font-size: 13px;
|
|
301
340
|
text-align: center;
|
|
302
341
|
line-height: 32px;
|
|
@@ -71,6 +71,7 @@ function WorkNode(_ref) {
|
|
|
71
71
|
manualRiskLevel = data.manualRiskLevel,
|
|
72
72
|
progress = data.progress,
|
|
73
73
|
okrClassify = data.okrClassify,
|
|
74
|
+
Krs = data.Krs,
|
|
74
75
|
cycleType = data.cycleType,
|
|
75
76
|
startDate = data.startDate,
|
|
76
77
|
endDate = data.endDate,
|
|
@@ -92,6 +93,8 @@ function WorkNode(_ref) {
|
|
|
92
93
|
imgWidth = _useState6[0],
|
|
93
94
|
setImgWidth = _useState6[1];
|
|
94
95
|
|
|
96
|
+
var bodyr = (0, _react.useRef)();
|
|
97
|
+
|
|
95
98
|
var getOkrTypeMap = function getOkrTypeMap() {
|
|
96
99
|
return {
|
|
97
100
|
1: (0, _getLocale.getLocale)("OKR_MyO_Pop_Individual"),
|
|
@@ -210,12 +213,13 @@ function WorkNode(_ref) {
|
|
|
210
213
|
}; // 1:正常 2:有风险 3:过期 4:完成 5:过期完成 ,
|
|
211
214
|
|
|
212
215
|
|
|
213
|
-
var riskLevelSuffix = ["normal", "normal", "risk", "expired", "complete", "complete_over"];
|
|
216
|
+
var riskLevelSuffix = ["normal", "normal", "risk", "expired", "complete", "complete_over", "normal"];
|
|
214
217
|
if (!MapOkrVisible) return /*#__PURE__*/_react["default"].createElement("div", {
|
|
215
218
|
className: (0, _classnames["default"])("".concat(_precls["default"], "--node"), "".concat(_precls["default"], "--node__private"))
|
|
216
219
|
});
|
|
217
220
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
218
|
-
className: (0, _classnames["default"])("".concat(_precls["default"], "--node"), _defineProperty({}, "".concat(_precls["default"], "--node__search"), isSearchRes))
|
|
221
|
+
className: (0, _classnames["default"])("".concat(_precls["default"], "--node"), _defineProperty({}, "".concat(_precls["default"], "--node__search"), isSearchRes)),
|
|
222
|
+
ref: bodyr
|
|
219
223
|
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
220
224
|
className: (0, _classnames["default"])("".concat(_precls["default"], "--node-title"))
|
|
221
225
|
}, workName, /*#__PURE__*/_react["default"].createElement(_okrClassify["default"], {
|
|
@@ -230,7 +234,19 @@ function WorkNode(_ref) {
|
|
|
230
234
|
className: (0, _classnames["default"])("".concat(_precls["default"], "--node-type"))
|
|
231
235
|
}, getOkrTypeMap()[okrType])), /*#__PURE__*/_react["default"].createElement("span", {
|
|
232
236
|
className: (0, _classnames["default"])("".concat(_precls["default"], "--node-cycle"))
|
|
233
|
-
}, getCycleTextByType()))), /*#__PURE__*/_react["default"].createElement("
|
|
237
|
+
}, getCycleTextByType()))), !!(Krs !== null && Krs !== void 0 && Krs.length) && /*#__PURE__*/_react["default"].createElement("div", {
|
|
238
|
+
className: (0, _classnames["default"])("".concat(_precls["default"], "--node-krs"))
|
|
239
|
+
}, Krs.map(function (item, key) {
|
|
240
|
+
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
241
|
+
className: (0, _classnames["default"])("".concat(_precls["default"], "--node-kr"))
|
|
242
|
+
}, /*#__PURE__*/_react["default"].createElement("span", {
|
|
243
|
+
className: (0, _classnames["default"])("".concat(_precls["default"], "--node-kr-icon"))
|
|
244
|
+
}, "KR", item.SortNum + 1), /*#__PURE__*/_react["default"].createElement("div", {
|
|
245
|
+
className: (0, _classnames["default"])("".concat(_precls["default"], "--node-kr-title"))
|
|
246
|
+
}, item.mileStoneName), /*#__PURE__*/_react["default"].createElement("div", {
|
|
247
|
+
className: (0, _classnames["default"])("".concat(_precls["default"], "--node-kr-progress ").concat(_precls["default"], "--node-kr-status--").concat(riskLevelSuffix[item.riskLevel]))
|
|
248
|
+
}, item.progress, "%"));
|
|
249
|
+
})), /*#__PURE__*/_react["default"].createElement("span", {
|
|
234
250
|
className: (0, _classnames["default"])("".concat(_precls["default"], "--node-status"), "".concat(_precls["default"], "--node-status__").concat(riskLevelSuffix[manualRiskLevel]))
|
|
235
251
|
}, /*#__PURE__*/_react["default"].createElement(_tooltipText["default"], {
|
|
236
252
|
text: "".concat(progress, "%"),
|