@titaui/pc 1.11.52-beta.18 → 1.11.52-beta.19
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/lib/components/eReport/eReportLists/reportList.js +29 -30
- package/lib/components/eReport/eReportShare/style.js +1 -1
- package/lib/components/okr-detail/components/okr-tree/tree-node/kr-node/index.css +9 -1
- package/lib/components/okr-detail/components/okr-tree/tree-node/kr-node/index.js +23 -9
- package/lib/components/okr-detail/okr-list/index.js +25 -25
- package/lib/utils/open-data.js +1 -1
- package/package.json +1 -1
|
@@ -64,7 +64,7 @@ var EReportList = /*#__PURE__*/function (_React$Component) {
|
|
|
64
64
|
}
|
|
65
65
|
|
|
66
66
|
return _possibleConstructorReturn(_this, (_this = _super.call.apply(_super, [this].concat(args)), _this.state = {
|
|
67
|
-
selectedPeriodValue:
|
|
67
|
+
selectedPeriodValue: '',
|
|
68
68
|
showDatePick: false,
|
|
69
69
|
eReportWeekList: [],
|
|
70
70
|
timePickRef: /*#__PURE__*/_react["default"].createRef(),
|
|
@@ -73,25 +73,25 @@ var EReportList = /*#__PURE__*/function (_React$Component) {
|
|
|
73
73
|
timePickResultsEmpty: false,
|
|
74
74
|
isShowEReportSharePop: false,
|
|
75
75
|
eReportId: 0,
|
|
76
|
-
eReportDate:
|
|
76
|
+
eReportDate: '',
|
|
77
77
|
isShowToast: false,
|
|
78
|
-
submitStatus:
|
|
78
|
+
submitStatus: ''
|
|
79
79
|
}, _this.setIsTimeSelected = function (v) {
|
|
80
80
|
_this.setState({
|
|
81
81
|
selectedPeriodValue: v
|
|
82
82
|
});
|
|
83
83
|
}, _this.handleClickReportListsDiv = function (e) {
|
|
84
84
|
_this.setState({
|
|
85
|
-
showDatePick: e.target.getAttribute(
|
|
85
|
+
showDatePick: e.target.getAttribute('data-name') === 'time-pick'
|
|
86
86
|
});
|
|
87
87
|
}, _this.handleTimePickConfirm = function (_ref) {
|
|
88
88
|
var startDate = _ref.startDate,
|
|
89
89
|
endDate = _ref.endDate;
|
|
90
90
|
// 将2019-12-3改为2019年12月3日
|
|
91
|
-
var start = startDate.substring(0, startDate.indexOf(
|
|
92
|
-
var end = endDate.substring(0, endDate.indexOf(
|
|
93
|
-
start = start.replace(/-/i,
|
|
94
|
-
end = end.replace(/-/i,
|
|
91
|
+
var start = startDate.substring(0, startDate.indexOf('T'));
|
|
92
|
+
var end = endDate.substring(0, endDate.indexOf('T'));
|
|
93
|
+
start = start.replace(/-/i, '年').replace(/-/i, '月') + (0, _getLocale.getLocale)('Mod_Sun');
|
|
94
|
+
end = end.replace(/-/i, '年').replace(/-/i, '月') + (0, _getLocale.getLocale)('Mod_Sun');
|
|
95
95
|
|
|
96
96
|
_this.setState({
|
|
97
97
|
selectedPeriodValue: "".concat(start, " - ").concat(end),
|
|
@@ -102,7 +102,7 @@ var EReportList = /*#__PURE__*/function (_React$Component) {
|
|
|
102
102
|
|
|
103
103
|
var okrId = _this.props.okrId;
|
|
104
104
|
var url = (0, _requestV.getApiUrl)("okr/weekStatistics/list?okrId=".concat(okrId, "&startDate=").concat(start, "&endDate=").concat(end));
|
|
105
|
-
(0, _requestV.taker)(url,
|
|
105
|
+
(0, _requestV.taker)(url, 'get', null, {}).then(function (res) {
|
|
106
106
|
_this.setState({
|
|
107
107
|
eReportWeekList: res.Data
|
|
108
108
|
});
|
|
@@ -113,15 +113,15 @@ var EReportList = /*#__PURE__*/function (_React$Component) {
|
|
|
113
113
|
});
|
|
114
114
|
|
|
115
115
|
var url = (0, _requestV.getApiUrl)("okr/weekStatistics/info?id=".concat(id));
|
|
116
|
-
(0, _requestV.taker)(url,
|
|
116
|
+
(0, _requestV.taker)(url, 'get', null).then(function (res) {
|
|
117
117
|
window.open();
|
|
118
118
|
});
|
|
119
119
|
}, _this.handlerEReportShareSubmit = function (submitStatus, eReportId, startDate, endDate) {
|
|
120
|
-
if (submitStatus ===
|
|
120
|
+
if (submitStatus === 'success') {
|
|
121
121
|
_this.setState({
|
|
122
122
|
isShowEReportSharePop: false,
|
|
123
123
|
isShowToast: true,
|
|
124
|
-
submitStatus:
|
|
124
|
+
submitStatus: 'success'
|
|
125
125
|
});
|
|
126
126
|
|
|
127
127
|
setTimeout(function () {
|
|
@@ -129,11 +129,11 @@ var EReportList = /*#__PURE__*/function (_React$Component) {
|
|
|
129
129
|
isShowToast: false
|
|
130
130
|
});
|
|
131
131
|
}, 2000);
|
|
132
|
-
} else if (submitStatus ===
|
|
132
|
+
} else if (submitStatus === 'failed') {
|
|
133
133
|
_this.setState({
|
|
134
134
|
isShowEReportSharePop: false,
|
|
135
135
|
isShowToast: true,
|
|
136
|
-
submitStatus:
|
|
136
|
+
submitStatus: 'error'
|
|
137
137
|
});
|
|
138
138
|
|
|
139
139
|
setTimeout(function () {
|
|
@@ -141,11 +141,11 @@ var EReportList = /*#__PURE__*/function (_React$Component) {
|
|
|
141
141
|
isShowToast: false
|
|
142
142
|
});
|
|
143
143
|
}, 2000);
|
|
144
|
-
} else if (submitStatus ===
|
|
144
|
+
} else if (submitStatus === 'cancel') {
|
|
145
145
|
_this.setState({
|
|
146
146
|
isShowEReportSharePop: false
|
|
147
147
|
});
|
|
148
|
-
} else if (submitStatus ===
|
|
148
|
+
} else if (submitStatus === 'showEReportShare') {
|
|
149
149
|
_this.setState({
|
|
150
150
|
isShowEReportSharePop: true,
|
|
151
151
|
eReportId: eReportId || 0,
|
|
@@ -157,6 +157,8 @@ var EReportList = /*#__PURE__*/function (_React$Component) {
|
|
|
157
157
|
isVisible = _this$props.isVisible,
|
|
158
158
|
okrName = _this$props.okrName,
|
|
159
159
|
okrId = _this$props.okrId;
|
|
160
|
+
var StrRreg = /@\$(userName|departmentName)\=(.+?)\$/g;
|
|
161
|
+
var workName = okrName === null || okrName === void 0 ? void 0 : okrName.replace(StrRreg, '');
|
|
160
162
|
return /*#__PURE__*/_react["default"].createElement(_Portals["default"], null, /*#__PURE__*/_react["default"].createElement(_transition["default"], {
|
|
161
163
|
visible: showShare,
|
|
162
164
|
animate: true,
|
|
@@ -168,7 +170,7 @@ var EReportList = /*#__PURE__*/function (_React$Component) {
|
|
|
168
170
|
}, /*#__PURE__*/_react["default"].createElement(_eReportShare["default"], {
|
|
169
171
|
className: "ereport__share__wrapper",
|
|
170
172
|
isVisible: isVisible,
|
|
171
|
-
workName:
|
|
173
|
+
workName: workName,
|
|
172
174
|
workId: okrId,
|
|
173
175
|
eReportId: id,
|
|
174
176
|
eReportDate: date,
|
|
@@ -186,7 +188,7 @@ var EReportList = /*#__PURE__*/function (_React$Component) {
|
|
|
186
188
|
|
|
187
189
|
var okrId = this.props.okrId;
|
|
188
190
|
var url = (0, _requestV.getApiUrl)("okr/weekStatistics/list?okrId=".concat(okrId));
|
|
189
|
-
(0, _requestV.taker)(url,
|
|
191
|
+
(0, _requestV.taker)(url, 'get', null, {}).then(function (res) {
|
|
190
192
|
_this2.setState({
|
|
191
193
|
eReportWeekList: res.Data || [],
|
|
192
194
|
timePick: _this2.state.timePickRef.current
|
|
@@ -204,22 +206,19 @@ var EReportList = /*#__PURE__*/function (_React$Component) {
|
|
|
204
206
|
key: v.id
|
|
205
207
|
}, /*#__PURE__*/_react["default"].createElement(_style.ItemTimeDivStyle, null, /*#__PURE__*/_react["default"].createElement(_style.ItemTimeBackgroundStyle, {
|
|
206
208
|
className: "tu-icon-OKRs-E"
|
|
207
|
-
}), /*#__PURE__*/_react["default"].createElement(_style.ItemTimeTextStyle, null, "(", "".concat(v.startDate, "-").concat(v.endDate), ")")), /*#__PURE__*/_react["default"].createElement(_style.ItemOptionsActionsDivStyle, null, /*#__PURE__*/_react["default"].createElement(_style.ItemOptionsChildsDivStyle,
|
|
209
|
+
}), /*#__PURE__*/_react["default"].createElement(_style.ItemTimeTextStyle, null, "(", "".concat(v.startDate, "-").concat(v.endDate), ")")), /*#__PURE__*/_react["default"].createElement(_style.ItemOptionsActionsDivStyle, null, /*#__PURE__*/_react["default"].createElement(_style.ItemOptionsChildsDivStyle, {
|
|
208
210
|
onClick: function onClick() {
|
|
209
|
-
return _this3.handlerEReportShareSubmit(
|
|
210
|
-
},
|
|
211
|
-
className: "tu-icon-share1"
|
|
212
|
-
}), /*#__PURE__*/_react["default"].createElement(_style.ItemOptionsShareTextStyle, {
|
|
213
|
-
onClick: function onClick() {
|
|
214
|
-
return _this3.handlerEReportShareSubmit("showEReportShare", v.id, v.startDate, v.endDate);
|
|
211
|
+
return _this3.handlerEReportShareSubmit('showEReportShare', v.id, v.startDate, v.endDate);
|
|
215
212
|
}
|
|
216
|
-
},
|
|
213
|
+
}, /*#__PURE__*/_react["default"].createElement(_style.ItemOptionsShareBackgroundStyle, {
|
|
214
|
+
className: "tu-icon-share1 hahahahaha"
|
|
215
|
+
}), /*#__PURE__*/_react["default"].createElement(_style.ItemOptionsShareTextStyle, null, (0, _getLocale.getLocale)('OKR_MyO_Share'))), /*#__PURE__*/_react["default"].createElement(_style.ItemOptionsChildsDivStyle, null, /*#__PURE__*/_react["default"].createElement(_style.ItemOptionsMoreInfoTextStyle, {
|
|
217
216
|
target: "_new",
|
|
218
217
|
onClick: function onClick() {
|
|
219
218
|
return window.open("".concat(location.pathname, "#okr/eReport?okrId=").concat(v.id, "&work_id=").concat(okrId));
|
|
220
219
|
},
|
|
221
220
|
href: void 0
|
|
222
|
-
}, (0, _getLocale.getLocale)(
|
|
221
|
+
}, (0, _getLocale.getLocale)('Mod_Checkdetails')), /*#__PURE__*/_react["default"].createElement(_style.ItemOptionsMoreInfoBackgroundStyle, {
|
|
223
222
|
onClick: function onClick() {
|
|
224
223
|
window.open("".concat(location.pathname, "#okr/eReport?okrId=").concat(v.id, "&work_id=").concat(okrId));
|
|
225
224
|
},
|
|
@@ -239,7 +238,7 @@ var EReportList = /*#__PURE__*/function (_React$Component) {
|
|
|
239
238
|
value: function getTimePick() {
|
|
240
239
|
return /*#__PURE__*/_react["default"].createElement(_style.ListTopDivStyle, {
|
|
241
240
|
ref: this.state.timePickRef
|
|
242
|
-
}, /*#__PURE__*/_react["default"].createElement(_style.ListTopLabelStyle, null, (0, _getLocale.getLocale)(
|
|
241
|
+
}, /*#__PURE__*/_react["default"].createElement(_style.ListTopLabelStyle, null, (0, _getLocale.getLocale)('OKR_MyO_Ew_List')), /*#__PURE__*/_react["default"].createElement(_style.ListTopTimePickDivStyle, null, /*#__PURE__*/_react["default"].createElement(_style.TimePickStyle, {
|
|
243
242
|
"data-name": "time-pick",
|
|
244
243
|
className: "tu-icon-schedule"
|
|
245
244
|
}), /*#__PURE__*/_react["default"].createElement(_rangePickerPop["default"], {
|
|
@@ -250,7 +249,7 @@ var EReportList = /*#__PURE__*/function (_React$Component) {
|
|
|
250
249
|
onConfirm: this.handleTimePickConfirm
|
|
251
250
|
}, /*#__PURE__*/_react["default"].createElement(_style.TimePickTextStyle, {
|
|
252
251
|
"data-name": "time-pick"
|
|
253
|
-
}, this.state.selectedPeriodValue || (0, _getLocale.getLocale)(
|
|
252
|
+
}, this.state.selectedPeriodValue || (0, _getLocale.getLocale)('OKR_MyO_Ew_Butt_Filterbytime')))));
|
|
254
253
|
}
|
|
255
254
|
}, {
|
|
256
255
|
key: "render",
|
|
@@ -267,7 +266,7 @@ var EReportList = /*#__PURE__*/function (_React$Component) {
|
|
|
267
266
|
return timePickResultsEmpty ? /*#__PURE__*/_react["default"].createElement(_style.ListStyle, {
|
|
268
267
|
onClick: this.handleClickReportListsDiv
|
|
269
268
|
}, this.getTimePick(), eReportWeekList.length === 0 ? /*#__PURE__*/_react["default"].createElement(_eReportListEmpty["default"], {
|
|
270
|
-
text: (0, _getLocale.getLocale)(
|
|
269
|
+
text: (0, _getLocale.getLocale)('Mod_ lookingfor')
|
|
271
270
|
}) : this.getListItem(eReportWeekList), this.getShare(isShowEReportSharePop, eReportId, eReportDate), this.getToast(isShowToast, submitStatus)) : eReportWeekList.length === 0 ? /*#__PURE__*/_react["default"].createElement(_eReportListEmpty["default"], {
|
|
272
271
|
text: "\u8FD8\u672A\u5230E-\u5468\u62A5\u751F\u6210\u65F6\u95F4\u54E6~"
|
|
273
272
|
}) : /*#__PURE__*/_react["default"].createElement(_style.ListStyle, {
|
|
@@ -17,7 +17,7 @@ var ModalWrapper = _styledComponents["default"].div(_templateObject || (_templat
|
|
|
17
17
|
|
|
18
18
|
exports.ModalWrapper = ModalWrapper;
|
|
19
19
|
|
|
20
|
-
var ModalContainer = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n width: ", ";\n height: 223px;\n padding: 20px 30px 10px;\n box-shadow: 0 0 4px 0 rgba(0,0,0,0.20);\n border-radius:
|
|
20
|
+
var ModalContainer = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n width: ", ";\n height: 223px;\n padding: 20px 30px 10px;\n box-shadow: 0 0 4px 0 rgba(0,0,0,0.20);\n border-radius: 12px;\n background: #FFFFFF;\n"])), function (p) {
|
|
21
21
|
return p.width;
|
|
22
22
|
});
|
|
23
23
|
|
|
@@ -71,6 +71,10 @@
|
|
|
71
71
|
color: #f05e5e;
|
|
72
72
|
}
|
|
73
73
|
|
|
74
|
+
.tita-okrdt-tree__kr-node-h1 {
|
|
75
|
+
display: flex;
|
|
76
|
+
}
|
|
77
|
+
|
|
74
78
|
.tita-okrdt-tree__kr-node-h2 {
|
|
75
79
|
height: 20px;
|
|
76
80
|
padding-left: 28px;
|
|
@@ -88,7 +92,7 @@
|
|
|
88
92
|
}
|
|
89
93
|
|
|
90
94
|
.tita-okrdt-tree__kr-node-title {
|
|
91
|
-
width: calc(100% - 32px);
|
|
95
|
+
max-width: calc(100% - 32px);
|
|
92
96
|
margin-left: 8px;
|
|
93
97
|
font-size: 14px;
|
|
94
98
|
font-weight: 600;
|
|
@@ -100,6 +104,10 @@
|
|
|
100
104
|
white-space: break-spaces;
|
|
101
105
|
}
|
|
102
106
|
|
|
107
|
+
.tita-okrdt-tree__kr-node-title--editing {
|
|
108
|
+
width: calc(100% - 32px);
|
|
109
|
+
}
|
|
110
|
+
|
|
103
111
|
.tita-okrdt-tree__kr-node-title .tu-icon-bianji2 {
|
|
104
112
|
margin-left: 5px;
|
|
105
113
|
font-size: 13px;
|
|
@@ -13,6 +13,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
|
|
|
13
13
|
|
|
14
14
|
var _richEditor = require("@titaui/rich-editor");
|
|
15
15
|
|
|
16
|
+
var _titaUi = require("tita-ui");
|
|
17
|
+
|
|
16
18
|
var _bsGlobal = require("../../../../../../utils/bs-global");
|
|
17
19
|
|
|
18
20
|
var _avatar = _interopRequireDefault(require("../../../../../avatar"));
|
|
@@ -53,6 +55,8 @@ var _helper = require("../../../../helper");
|
|
|
53
55
|
|
|
54
56
|
var _getLocale = require("../../../../../../utils/getLocale");
|
|
55
57
|
|
|
58
|
+
var _openData = require("../../../../../../utils/open-data");
|
|
59
|
+
|
|
56
60
|
var _i18nFrontTranslate = require("../../../../../../utils/i18n-front-translate");
|
|
57
61
|
|
|
58
62
|
require("./index.css");
|
|
@@ -102,6 +106,8 @@ function _default(props) {
|
|
|
102
106
|
title = props.title,
|
|
103
107
|
key = props.key,
|
|
104
108
|
canEditOkr = props.canEditOkr;
|
|
109
|
+
var mileStoneName = data.mileStoneName,
|
|
110
|
+
mileStoneNameRichText = data.mileStoneNameRichText;
|
|
105
111
|
|
|
106
112
|
var _useContext = (0, _react.useContext)(_context2.CommonContext),
|
|
107
113
|
refreshAll = _useContext.refreshAll,
|
|
@@ -149,9 +155,9 @@ function _default(props) {
|
|
|
149
155
|
setDeleteModalVisible = _useState16[1];
|
|
150
156
|
|
|
151
157
|
var _useState17 = (0, _react.useState)({
|
|
152
|
-
pureText:
|
|
153
|
-
pureTextExcludeAt:
|
|
154
|
-
richText:
|
|
158
|
+
pureText: mileStoneName,
|
|
159
|
+
pureTextExcludeAt: mileStoneName,
|
|
160
|
+
richText: mileStoneNameRichText ? JSON.parse(mileStoneNameRichText) : (0, _richEditor.TitaRichEditorInitTextState)(mileStoneName),
|
|
155
161
|
mentionUsers: []
|
|
156
162
|
}),
|
|
157
163
|
_useState18 = _slicedToArray(_useState17, 2),
|
|
@@ -188,12 +194,12 @@ function _default(props) {
|
|
|
188
194
|
var mentionInputRef = (0, _react.useRef)();
|
|
189
195
|
(0, _react.useEffect)(function () {
|
|
190
196
|
setKrNameData({
|
|
191
|
-
pureText:
|
|
192
|
-
pureTextExcludeAt:
|
|
193
|
-
richText: data.mileStoneNameRichText ? JSON.parse(data.mileStoneNameRichText) : (0, _richEditor.TitaRichEditorInitTextState)(
|
|
197
|
+
pureText: mileStoneName,
|
|
198
|
+
pureTextExcludeAt: mileStoneName,
|
|
199
|
+
richText: data.mileStoneNameRichText ? JSON.parse(data.mileStoneNameRichText) : (0, _richEditor.TitaRichEditorInitTextState)(mileStoneName),
|
|
194
200
|
mentionUsers: []
|
|
195
201
|
});
|
|
196
|
-
}, [
|
|
202
|
+
}, [mileStoneName]);
|
|
197
203
|
|
|
198
204
|
var _useContext2 = (0, _react.useContext)(_context2.OkrListContext),
|
|
199
205
|
updateKrs = _useContext2.updateKrs;
|
|
@@ -333,6 +339,12 @@ function _default(props) {
|
|
|
333
339
|
var mentionUsers = krNameData.mentionUsers,
|
|
334
340
|
pureText = krNameData.pureText,
|
|
335
341
|
richText = krNameData.richText;
|
|
342
|
+
|
|
343
|
+
if (data.mileStoneName == pureText) {
|
|
344
|
+
setEditing(false);
|
|
345
|
+
return;
|
|
346
|
+
}
|
|
347
|
+
|
|
336
348
|
var hasError = !validateKrName(krNameData);
|
|
337
349
|
if (hasError) return;
|
|
338
350
|
(0, _requestApis.updateKrName)({
|
|
@@ -401,8 +413,10 @@ function _default(props) {
|
|
|
401
413
|
}, errorTip),
|
|
402
414
|
visible: editing && errorTip.length > 0,
|
|
403
415
|
placement: "top"
|
|
416
|
+
}, /*#__PURE__*/_react["default"].createElement(_titaUi.Tooltip, {
|
|
417
|
+
content: editing ? '' : (0, _openData.parseString)(krNameData.pureText)
|
|
404
418
|
}, /*#__PURE__*/_react["default"].createElement("span", {
|
|
405
|
-
className: (0, _classnames["default"])("".concat(_precls["default"], "__kr-node-title")),
|
|
419
|
+
className: (0, _classnames["default"])("".concat(_precls["default"], "__kr-node-title"), _defineProperty({}, "".concat(_precls["default"], "__kr-node-title--editing"), editing)),
|
|
406
420
|
onClick: onTitleTextClickHandler
|
|
407
421
|
}, /*#__PURE__*/_react["default"].createElement(_richEditor.TitaInlineRichEditor, {
|
|
408
422
|
editable: editing,
|
|
@@ -417,7 +431,7 @@ function _default(props) {
|
|
|
417
431
|
}, /*#__PURE__*/_react["default"].createElement("span", {
|
|
418
432
|
className: "tu-icon-bianji2",
|
|
419
433
|
onClick: triggerEdit
|
|
420
|
-
}))))), /*#__PURE__*/_react["default"].createElement("div", {
|
|
434
|
+
})))))), /*#__PURE__*/_react["default"].createElement("div", {
|
|
421
435
|
className: (0, _classnames["default"])("".concat(_precls["default"], "__kr-node-h2"))
|
|
422
436
|
}, /*#__PURE__*/_react["default"].createElement(OkrRowColumn, {
|
|
423
437
|
width: 68
|
|
@@ -94,16 +94,16 @@ var _getUserInfo = (0, _bsGlobal.getUserInfo)(),
|
|
|
94
94
|
Id = _getUserInfo.Id,
|
|
95
95
|
UserAvatar = _getUserInfo.UserAvatar;
|
|
96
96
|
|
|
97
|
-
var preCls =
|
|
97
|
+
var preCls = 'okr-detail-okrs-list';
|
|
98
98
|
|
|
99
99
|
var treeDataFormate = function treeDataFormate(nodes) {
|
|
100
|
-
var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] :
|
|
100
|
+
var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'kr';
|
|
101
101
|
var canEditOkr = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
|
|
102
102
|
var formateNodes = [];
|
|
103
103
|
nodes.forEach(function (it, index) {
|
|
104
|
-
var title = "";
|
|
105
|
-
|
|
106
|
-
if (type ==
|
|
104
|
+
var title = ''; // if (type == "kr" || type == "kr-parent") title = it.mileStoneName;
|
|
105
|
+
|
|
106
|
+
if (type == 'o-child' || type == 'o-parent') title = it.workName;
|
|
107
107
|
formateNodes.push({
|
|
108
108
|
key: it.mileStoneId,
|
|
109
109
|
index: index,
|
|
@@ -206,7 +206,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
206
206
|
});
|
|
207
207
|
|
|
208
208
|
if (authChildWorks.length > 0) {
|
|
209
|
-
setChildOkrs(treeDataFormate(authChildWorks,
|
|
209
|
+
setChildOkrs(treeDataFormate(authChildWorks, 'o-child'));
|
|
210
210
|
} else {
|
|
211
211
|
setChildOkrs(null);
|
|
212
212
|
}
|
|
@@ -277,7 +277,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
277
277
|
updateKrs();
|
|
278
278
|
}, []);
|
|
279
279
|
(0, _react.useEffect)(function () {
|
|
280
|
-
var strucKrs = treeDataFormate(pureKrs,
|
|
280
|
+
var strucKrs = treeDataFormate(pureKrs, 'kr', canEditOkr);
|
|
281
281
|
setKrs(strucKrs);
|
|
282
282
|
}, [pureKrs, canEditOkr]);
|
|
283
283
|
|
|
@@ -285,7 +285,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
285
285
|
refreshAll();
|
|
286
286
|
updateKrs();
|
|
287
287
|
|
|
288
|
-
_toast["default"].Success((0, _getLocale.getLocale)(
|
|
288
|
+
_toast["default"].Success((0, _getLocale.getLocale)('OKR_Db_Success'), {
|
|
289
289
|
canClose: false
|
|
290
290
|
});
|
|
291
291
|
};
|
|
@@ -324,7 +324,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
324
324
|
|
|
325
325
|
(0, _requestApis.updateParentId)(params).then(function (data) {
|
|
326
326
|
if (data.Code == 1) {
|
|
327
|
-
_toast["default"].Success((0, _getLocale.getLocale)(
|
|
327
|
+
_toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'));
|
|
328
328
|
|
|
329
329
|
setGeneralParent({
|
|
330
330
|
parentId: params.parentId,
|
|
@@ -376,7 +376,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
376
376
|
if (!canEditOkr) return;
|
|
377
377
|
var dropNode = info.node;
|
|
378
378
|
var dragNode = info.dragNode;
|
|
379
|
-
var dropPos = info.node.pos.split(
|
|
379
|
+
var dropPos = info.node.pos.split('-');
|
|
380
380
|
var dropPosition = info.dropPosition - Number(dropPos[dropPos.length - 1]); // 移动类型,after 1 before 2
|
|
381
381
|
|
|
382
382
|
var isDown = dropPosition != -1;
|
|
@@ -410,17 +410,17 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
410
410
|
parentOkr: parentOkr
|
|
411
411
|
});
|
|
412
412
|
|
|
413
|
-
okrParent = treeDataFormate([newParentKr],
|
|
413
|
+
okrParent = treeDataFormate([newParentKr], 'kr-parent');
|
|
414
414
|
} else if (parentOkr) {
|
|
415
|
-
okrParent = treeDataFormate([parentOkr],
|
|
415
|
+
okrParent = treeDataFormate([parentOkr], 'o-parent');
|
|
416
416
|
}
|
|
417
417
|
|
|
418
418
|
var isShowAlignOkr = (0, _react.useMemo)(function () {
|
|
419
|
-
return childOkrs && childOkrs.length > 0 // 有子目标
|
|
420
|
-
||
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
|
|
419
|
+
return childOkrs && childOkrs.length > 0 || // 有子目标
|
|
420
|
+
parentOkr || // 有父目标
|
|
421
|
+
!parentOkr && canEditOkr;
|
|
422
|
+
}, // 无父目标但有权限编辑
|
|
423
|
+
[parentOkr, childOkrs, canEditOkr]);
|
|
424
424
|
|
|
425
425
|
var renderKrs = function renderKrs() {
|
|
426
426
|
var _classNames;
|
|
@@ -432,9 +432,9 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
432
432
|
},
|
|
433
433
|
canEditOkr: canEditOkr || isInnerUser,
|
|
434
434
|
style: isShowAlignOkr ? {
|
|
435
|
-
padding:
|
|
435
|
+
padding: '40px 0 24px 0'
|
|
436
436
|
} : {
|
|
437
|
-
padding:
|
|
437
|
+
padding: '100px 0'
|
|
438
438
|
}
|
|
439
439
|
});
|
|
440
440
|
}
|
|
@@ -449,7 +449,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
449
449
|
okrInfo: okrInfo,
|
|
450
450
|
draggable: canEditOkr && (okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.applyState) === _helper.EApproveStatus.UnderApproval,
|
|
451
451
|
onDrop: onOkrItemDropHandler
|
|
452
|
-
}))), (canEditOkr || isInnerUser) && (0, _helper.getApprovalOkr)(approvalSetting,
|
|
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", {
|
|
453
453
|
ref: wrapperRef,
|
|
454
454
|
className: (0, _classnames["default"])("".concat(preCls, "__addkr"))
|
|
455
455
|
}, /*#__PURE__*/_react["default"].createElement(_paddingLayout["default"], null, createKrShow ? /*#__PURE__*/_react["default"].createElement(_createKrItem["default"], {
|
|
@@ -468,10 +468,10 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
468
468
|
return setCreateKrShow(true);
|
|
469
469
|
}
|
|
470
470
|
}, /*#__PURE__*/_react["default"].createElement("span", {
|
|
471
|
-
className: (0, _classnames["default"])("".concat(preCls, "__addkr-prefix"),
|
|
471
|
+
className: (0, _classnames["default"])("".concat(preCls, "__addkr-prefix"), 'tu-icon-add1')
|
|
472
472
|
}), /*#__PURE__*/_react["default"].createElement("span", {
|
|
473
473
|
className: (0, _classnames["default"])("".concat(preCls, "__addkr-text"))
|
|
474
|
-
}, (0, _getLocale.getLocale)(
|
|
474
|
+
}, (0, _getLocale.getLocale)('OKR_MyO_Pop_Butt_AddKR'))))));
|
|
475
475
|
};
|
|
476
476
|
|
|
477
477
|
return /*#__PURE__*/_react["default"].createElement(_context2.OkrListContext.Provider, {
|
|
@@ -487,13 +487,13 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
487
487
|
className: (0, _classnames["default"])(preCls)
|
|
488
488
|
}, !loading ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, renderKrs(), isShowAlignOkr && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_blockLine["default"], {
|
|
489
489
|
style: {
|
|
490
|
-
padding:
|
|
490
|
+
padding: '0 32px'
|
|
491
491
|
}
|
|
492
492
|
}), /*#__PURE__*/_react["default"].createElement("div", {
|
|
493
493
|
className: (0, _classnames["default"])("".concat(preCls, "__align-to"))
|
|
494
494
|
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
495
495
|
className: (0, _classnames["default"])("".concat(preCls, "__align-to-title"))
|
|
496
|
-
}, (0, _getLocale.getLocale)(
|
|
496
|
+
}, (0, _getLocale.getLocale)('OKR_MyO_Pop_SetAlignment')), !parentOkr && canEditOkr ? /*#__PURE__*/_react["default"].createElement(_addParentOkr["default"], {
|
|
497
497
|
onClick: onAddParentOkrHandler
|
|
498
498
|
}) : /*#__PURE__*/_react["default"].createElement("div", {
|
|
499
499
|
className: (0, _classnames["default"])("".concat(preCls, "__align-to-tree"))
|
|
@@ -506,7 +506,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
506
506
|
onClick: function onClick() {
|
|
507
507
|
return setIsOpened(!isOpened);
|
|
508
508
|
}
|
|
509
|
-
}, /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)(
|
|
509
|
+
}, /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)('OKR_MyO_KRP_OKRs_Alignedmeobje'), "\uFF08", childOkrs.length, "\uFF09")), /*#__PURE__*/_react["default"].createElement(_reactCollapse.Collapse, {
|
|
510
510
|
isOpened: isOpened
|
|
511
511
|
}, /*#__PURE__*/_react["default"].createElement("div", {
|
|
512
512
|
className: (0, _classnames["default"])("".concat(preCls, "__align-on-tree"))
|
package/lib/utils/open-data.js
CHANGED
|
@@ -245,7 +245,7 @@ var parseString = function parseString(str) {
|
|
|
245
245
|
matchStr = reg.exec(str);
|
|
246
246
|
}
|
|
247
247
|
|
|
248
|
-
var commonStrs = str.split(strReg);
|
|
248
|
+
var commonStrs = str === null || str === void 0 ? void 0 : str.split(strReg);
|
|
249
249
|
var renderData = [];
|
|
250
250
|
|
|
251
251
|
for (var i = 0; i < commonStrs.length; i++) {
|