@titaui/pc 1.11.12 → 1.11.13-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.
- 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/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 +10 -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 +7 -2
- 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/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
|
@@ -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");
|
|
@@ -95,10 +97,12 @@ function _default(props) {
|
|
|
95
97
|
index = props.index,
|
|
96
98
|
title = props.title,
|
|
97
99
|
key = props.key;
|
|
100
|
+
console.log('props', props);
|
|
98
101
|
|
|
99
102
|
var _useContext = (0, _react.useContext)(_context2.CommonContext),
|
|
100
103
|
refreshAll = _useContext.refreshAll,
|
|
101
|
-
okrInfo = _useContext.okrInfo
|
|
104
|
+
okrInfo = _useContext.okrInfo,
|
|
105
|
+
approvalSetting = _useContext.approvalSetting;
|
|
102
106
|
|
|
103
107
|
var _useState = (0, _react.useState)(data.confidenceIndex),
|
|
104
108
|
_useState2 = _slicedToArray(_useState, 2),
|
|
@@ -315,7 +319,7 @@ function _default(props) {
|
|
|
315
319
|
}, "KR", index + 1), /*#__PURE__*/_react["default"].createElement("span", {
|
|
316
320
|
className: (0, _classnames["default"])("".concat(_precls["default"], "__kr-node-title"))
|
|
317
321
|
}, /*#__PURE__*/_react["default"].createElement(_editableInput["default"], {
|
|
318
|
-
editable: krCanEdit,
|
|
322
|
+
editable: krCanEdit && (0, _helper.getApprovalIsShow)(approvalSetting, 'changeOkrName', okrInfo.applyState),
|
|
319
323
|
defaultValue: krName,
|
|
320
324
|
emptyMessage: "KR\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A",
|
|
321
325
|
onKeyDown: onKrNameChangeHandler,
|
|
@@ -329,10 +333,10 @@ function _default(props) {
|
|
|
329
333
|
name: user.name,
|
|
330
334
|
id: user.userId,
|
|
331
335
|
width: 68,
|
|
332
|
-
editable: krCanEdit,
|
|
336
|
+
editable: krCanEdit && okrInfo.applyState !== _helper.EApproveStatus.UnderApproval,
|
|
333
337
|
onEditUser: onEditUserHandler,
|
|
334
338
|
nameTips: function nameTips(name) {
|
|
335
|
-
return /*#__PURE__*/_react["default"].createElement("span", null,
|
|
339
|
+
return /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)('OKR_MyO_Text_Owner'), name);
|
|
336
340
|
}
|
|
337
341
|
})), showKrWeight && /*#__PURE__*/_react["default"].createElement(OkrRowColumn, {
|
|
338
342
|
width: 60,
|
|
@@ -348,7 +352,7 @@ function _default(props) {
|
|
|
348
352
|
marginLeft: 16
|
|
349
353
|
}, /*#__PURE__*/_react["default"].createElement(_rangePickerPop["default"], {
|
|
350
354
|
data: data,
|
|
351
|
-
editable: krCanEdit
|
|
355
|
+
editable: krCanEdit && (0, _helper.getApprovalIsShow)(approvalSetting, 'changeOkrTime', okrInfo.applyState)
|
|
352
356
|
})), /*#__PURE__*/_react["default"].createElement("div", {
|
|
353
357
|
className: (0, _classnames["default"])("".concat(_precls["default"], "__kr-node-actions"))
|
|
354
358
|
}, showHeart && /*#__PURE__*/_react["default"].createElement("div", {
|
|
@@ -377,7 +381,7 @@ function _default(props) {
|
|
|
377
381
|
evaluateValue: evaluateValue,
|
|
378
382
|
setEvaluateValue: onEvaluateChangeHanler,
|
|
379
383
|
isEvaluate: isEvaluate
|
|
380
|
-
})), krCanEdit && /*#__PURE__*/_react["default"].createElement("div", {
|
|
384
|
+
})), krCanEdit && okrInfo.applyState !== _helper.EApproveStatus.UnderApproval && /*#__PURE__*/_react["default"].createElement("div", {
|
|
381
385
|
className: (0, _classnames["default"])("".concat(_precls["default"], "__kr-node-delete")),
|
|
382
386
|
onClick: function onClick() {
|
|
383
387
|
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,
|
|
446
|
+
approvalSetting: approvalSetting,
|
|
447
|
+
okrInfo: okrInfo,
|
|
443
448
|
draggable: canEditOkr,
|
|
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, "%"),
|
|
@@ -33,6 +33,8 @@ var _precls = _interopRequireDefault(require("../precls"));
|
|
|
33
33
|
|
|
34
34
|
var _getLocale = require("../../../utils/getLocale");
|
|
35
35
|
|
|
36
|
+
var _lodash = _interopRequireDefault(require("lodash"));
|
|
37
|
+
|
|
36
38
|
require("rc-color-picker/assets/index.css");
|
|
37
39
|
|
|
38
40
|
require("./index.css");
|
|
@@ -45,6 +47,14 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
|
|
|
45
47
|
|
|
46
48
|
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; }
|
|
47
49
|
|
|
50
|
+
function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
|
|
51
|
+
|
|
52
|
+
function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
|
|
53
|
+
|
|
54
|
+
function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
|
|
55
|
+
|
|
56
|
+
function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
|
|
57
|
+
|
|
48
58
|
function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
|
|
49
59
|
|
|
50
60
|
function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
|
|
@@ -88,6 +98,7 @@ var ExportMapModal = function ExportMapModal(props) {
|
|
|
88
98
|
setIsExport = _useState6[1];
|
|
89
99
|
|
|
90
100
|
var modalRef = (0, _react.useRef)();
|
|
101
|
+
var virtualElements = (0, _react.useRef)([]);
|
|
91
102
|
(0, _react.useEffect)(function () {
|
|
92
103
|
if ((0, _bsGlobal.isWx)() && window.WWOpenData) {
|
|
93
104
|
if (window.WWOpenData.enableCanvasSharing) {
|
|
@@ -236,6 +247,19 @@ var ExportMapModal = function ExportMapModal(props) {
|
|
|
236
247
|
setBgColor(colors ? colors.color : "none");
|
|
237
248
|
};
|
|
238
249
|
|
|
250
|
+
var NodeDebug = function NodeDebug() {
|
|
251
|
+
var elements = (0, _reactFlowRenderer.useStoreState)(function (state) {
|
|
252
|
+
return [].concat(_toConsumableArray(state.nodes), _toConsumableArray(state.edges));
|
|
253
|
+
}, _lodash["default"].isEqual);
|
|
254
|
+
var setElements = (0, _reactFlowRenderer.useStoreActions)(function (actions) {
|
|
255
|
+
return actions.setElements;
|
|
256
|
+
});
|
|
257
|
+
var newElements = (0, _utils.getLayoutedElements)(elements, direction);
|
|
258
|
+
virtualElements = newElements;
|
|
259
|
+
setElements(newElements);
|
|
260
|
+
return null;
|
|
261
|
+
};
|
|
262
|
+
|
|
239
263
|
return /*#__PURE__*/_react["default"].createElement(_dialog["default"], {
|
|
240
264
|
title: (0, _getLocale.getLocale)("OKR_Ali_Exportmap"),
|
|
241
265
|
noFooterLine: true,
|
|
@@ -275,7 +299,7 @@ var ExportMapModal = function ExportMapModal(props) {
|
|
|
275
299
|
nodesDraggable: false,
|
|
276
300
|
nodesConnectable: false,
|
|
277
301
|
className: (0, _classnames["default"])("".concat(_precls["default"], "__export"), _defineProperty({}, "".concat(_precls["default"], "__dark"), darkTheme)),
|
|
278
|
-
elements:
|
|
302
|
+
elements: dataSource,
|
|
279
303
|
nodeTypes: _utils.nodeTypes,
|
|
280
304
|
minZoom: 0.05,
|
|
281
305
|
zoomOnScroll: false,
|
|
@@ -287,7 +311,7 @@ var ExportMapModal = function ExportMapModal(props) {
|
|
|
287
311
|
width: "100%",
|
|
288
312
|
background: bgColor
|
|
289
313
|
}
|
|
290
|
-
}))))));
|
|
314
|
+
}, /*#__PURE__*/_react["default"].createElement(NodeDebug, null)))))));
|
|
291
315
|
};
|
|
292
316
|
|
|
293
317
|
ExportMapModal.defaultProps = {
|
|
@@ -4,12 +4,14 @@
|
|
|
4
4
|
display: flex;
|
|
5
5
|
justify-content: center;
|
|
6
6
|
align-items: center;
|
|
7
|
+
background: #f0f4fa;
|
|
7
8
|
}
|
|
8
9
|
|
|
9
10
|
.titaui-okr-flow--loading-img {
|
|
10
|
-
width:
|
|
11
|
+
width: 80px;
|
|
11
12
|
height: 140px;
|
|
12
13
|
background: url("../../images/loading-light.gif") no-repeat;
|
|
14
|
+
background-size: 100% auto;
|
|
13
15
|
}
|
|
14
16
|
|
|
15
17
|
.titaui-okr-flow--loading-img__dark {
|