@titaui/pc 1.11.13-beta.1 → 1.11.13-beta.2
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/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/okr-tree/tree-node/kr-node/index.js +0 -1
- package/lib/components/okr-period-selector/select-cycle.js +23 -19
- package/package.json +1 -1
|
@@ -13,6 +13,10 @@ var _okrPeriodSelector = _interopRequireDefault(require("../../../../okr-period-
|
|
|
13
13
|
|
|
14
14
|
var _getLocale = require("../../../../../utils/getLocale");
|
|
15
15
|
|
|
16
|
+
var _context = require("../../../context");
|
|
17
|
+
|
|
18
|
+
var _helper = require("../../../helper");
|
|
19
|
+
|
|
16
20
|
require("./index.css");
|
|
17
21
|
|
|
18
22
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
@@ -40,17 +44,25 @@ var DateCycle = function DateCycle(_ref) {
|
|
|
40
44
|
_ref$canEdit = _ref.canEdit,
|
|
41
45
|
canEdit = _ref$canEdit === void 0 ? false : _ref$canEdit;
|
|
42
46
|
|
|
47
|
+
var _useContext = (0, _react.useContext)(_context.CommonContext),
|
|
48
|
+
okrInfo = _useContext.okrInfo,
|
|
49
|
+
approvalSetting = _useContext.approvalSetting;
|
|
50
|
+
|
|
51
|
+
var canCycleEdit = canEdit && (0, _helper.getApprovalIsShow)(approvalSetting, "changeOkrTime", okrInfo.applyState);
|
|
52
|
+
|
|
43
53
|
var _useState = (0, _react.useState)(false),
|
|
44
54
|
_useState2 = _slicedToArray(_useState, 2),
|
|
45
55
|
isFocus = _useState2[0],
|
|
46
56
|
setIsFocus = _useState2[1];
|
|
47
57
|
|
|
48
58
|
var handleButtonFocus = (0, _react.useCallback)(function () {
|
|
49
|
-
|
|
50
|
-
}, [
|
|
59
|
+
canCycleEdit && setIsFocus(true);
|
|
60
|
+
}, [canCycleEdit]);
|
|
51
61
|
var handleButtonBlur = (0, _react.useCallback)(function () {
|
|
52
62
|
setIsFocus(false);
|
|
53
63
|
}, []);
|
|
64
|
+
console.log('approvalSetting', approvalSetting);
|
|
65
|
+
console.log('okrInfo', okrInfo);
|
|
54
66
|
|
|
55
67
|
var renderClickArea = function renderClickArea(_ref2) {
|
|
56
68
|
var btnRef = _ref2.btnRef,
|
|
@@ -59,7 +71,7 @@ var DateCycle = function DateCycle(_ref) {
|
|
|
59
71
|
return /*#__PURE__*/_react["default"].createElement("button", {
|
|
60
72
|
onFocus: handleButtonFocus,
|
|
61
73
|
onBlur: handleButtonBlur,
|
|
62
|
-
className: "base-info-date-cycle__button ".concat(isFocus ? "base-info-date-cycle__button--focus" : "", " ").concat(!
|
|
74
|
+
className: "base-info-date-cycle__button ".concat(isFocus ? "base-info-date-cycle__button--focus" : "", " ").concat(!canCycleEdit && "base-info-date-cycle__button--disable"),
|
|
63
75
|
ref: btnRef,
|
|
64
76
|
onClick: clickCallback
|
|
65
77
|
}, /*#__PURE__*/_react["default"].createElement("span", {
|
|
@@ -78,7 +90,7 @@ var DateCycle = function DateCycle(_ref) {
|
|
|
78
90
|
cycle: cycle,
|
|
79
91
|
setCycle: setCycle,
|
|
80
92
|
okrId: okrId,
|
|
81
|
-
canEdit:
|
|
93
|
+
canEdit: canCycleEdit,
|
|
82
94
|
getCycleRange: true
|
|
83
95
|
}));
|
|
84
96
|
};
|
|
@@ -21,6 +21,10 @@ var _popConfirm = _interopRequireDefault(require("../../../../../components-v1/p
|
|
|
21
21
|
|
|
22
22
|
var _getLocale = require("../../../../../utils/getLocale");
|
|
23
23
|
|
|
24
|
+
var _context2 = require("../../../context");
|
|
25
|
+
|
|
26
|
+
var _helper = require("../../../helper");
|
|
27
|
+
|
|
24
28
|
require("./index.css");
|
|
25
29
|
|
|
26
30
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
@@ -60,6 +64,10 @@ var Principal = function Principal(_ref) {
|
|
|
60
64
|
selectUser = _useState2[0],
|
|
61
65
|
setSelectUser = _useState2[1];
|
|
62
66
|
|
|
67
|
+
var _useContext = (0, _react.useContext)(_context2.CommonContext),
|
|
68
|
+
okrInfo = _useContext.okrInfo,
|
|
69
|
+
approvalSetting = _useContext.approvalSetting;
|
|
70
|
+
|
|
63
71
|
var handleSelected = function handleSelected(_ref2) {
|
|
64
72
|
var _ref3 = _slicedToArray(_ref2, 1),
|
|
65
73
|
user = _ref3[0];
|
|
@@ -114,7 +122,7 @@ var Principal = function Principal(_ref) {
|
|
|
114
122
|
}, (0, _getLocale.getLocale)("Mod_Owner")), /*#__PURE__*/_react["default"].createElement("div", {
|
|
115
123
|
className: "base-info-other-infos__principal-user",
|
|
116
124
|
ref: selectUserRef
|
|
117
|
-
}, canEdit ? /*#__PURE__*/_react["default"].createElement(_popConfirm["default"], {
|
|
125
|
+
}, canEdit && (0, _helper.getApprovalIsShow)(approvalSetting, "changeOkrName", okrInfo.applyState) ? /*#__PURE__*/_react["default"].createElement(_popConfirm["default"], {
|
|
118
126
|
ref: popConfirmRef,
|
|
119
127
|
showArrow: false,
|
|
120
128
|
style: {
|
|
@@ -49,7 +49,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
|
|
|
49
49
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
50
50
|
|
|
51
51
|
function _formatCycleData(periodParams, getCycleRange) {
|
|
52
|
-
if (!periodParams) return
|
|
52
|
+
if (!periodParams) return '';
|
|
53
53
|
var startDate = periodParams.startDate;
|
|
54
54
|
var endDate = periodParams.endDate;
|
|
55
55
|
|
|
@@ -58,7 +58,7 @@ function _formatCycleData(periodParams, getCycleRange) {
|
|
|
58
58
|
endDate = periodParams.endDate.slice(5);
|
|
59
59
|
}
|
|
60
60
|
|
|
61
|
-
return "".concat(_periodSelector["default"].formatPeriod(periodParams)).concat(getCycleRange ? ",".concat(startDate, "~").concat(endDate) :
|
|
61
|
+
return "".concat(_periodSelector["default"].formatPeriod(periodParams)).concat(getCycleRange ? ",".concat(startDate, "~").concat(endDate) : '');
|
|
62
62
|
}
|
|
63
63
|
|
|
64
64
|
function CreateCycle(_ref) {
|
|
@@ -94,21 +94,21 @@ function CreateCycle(_ref) {
|
|
|
94
94
|
setCycleSetting = _useState4[1];
|
|
95
95
|
|
|
96
96
|
(0, _react.useEffect)(function () {
|
|
97
|
-
var settings = localStorage.getItem(
|
|
97
|
+
var settings = localStorage.getItem('OKR_CYCLE_SETTING');
|
|
98
98
|
|
|
99
99
|
if (settings) {
|
|
100
100
|
setCycleSetting(JSON.parse(settings));
|
|
101
101
|
return;
|
|
102
102
|
}
|
|
103
103
|
|
|
104
|
-
var url = (0, _helper.getApiUrl)(
|
|
105
|
-
(0, _helper.taker)(url,
|
|
104
|
+
var url = (0, _helper.getApiUrl)('okr/cycleSetting');
|
|
105
|
+
(0, _helper.taker)(url, 'GET').then(function (res) {
|
|
106
106
|
if (res.Code == 1) {
|
|
107
107
|
setCycleSetting(res.Data);
|
|
108
108
|
}
|
|
109
109
|
});
|
|
110
110
|
}, []);
|
|
111
|
-
var cycleWrapperRef = (0, _react.useRef)(document.createElement(
|
|
111
|
+
var cycleWrapperRef = (0, _react.useRef)(document.createElement('div'));
|
|
112
112
|
|
|
113
113
|
var onPeriodSelectorChangeHandler = function onPeriodSelectorChangeHandler(c) {
|
|
114
114
|
setSelfCycle(_objectSpread(_objectSpread({}, selfCycle), c));
|
|
@@ -148,13 +148,13 @@ function CreateCycle(_ref) {
|
|
|
148
148
|
},
|
|
149
149
|
ref: cycleWrapperRef,
|
|
150
150
|
style: {
|
|
151
|
-
backgroundColor:
|
|
152
|
-
boxShadow:
|
|
151
|
+
backgroundColor: 'white',
|
|
152
|
+
boxShadow: '0px 4px 12px 0px rgb(127 145 180 / 20%)',
|
|
153
153
|
borderRadius: 4
|
|
154
154
|
}
|
|
155
155
|
}, /*#__PURE__*/_react["default"].createElement(_periodSelector["default"], {
|
|
156
156
|
style: {
|
|
157
|
-
width:
|
|
157
|
+
width: '100%'
|
|
158
158
|
},
|
|
159
159
|
selected: selfCycle,
|
|
160
160
|
showFullCycle: false,
|
|
@@ -176,9 +176,9 @@ function CreateCycle(_ref) {
|
|
|
176
176
|
}))), /*#__PURE__*/_react["default"].createElement("div", {
|
|
177
177
|
className: "okr-detail-date-cycle__date-line",
|
|
178
178
|
style: {
|
|
179
|
-
borderBottom:
|
|
179
|
+
borderBottom: '1px solid #F0F2F5'
|
|
180
180
|
}
|
|
181
|
-
}, (0, _getLocale.getLocale)(
|
|
181
|
+
}, (0, _getLocale.getLocale)('Mod_StartDate'), "\uFF1A", /*#__PURE__*/_react["default"].createElement(_rangePickerPop["default"], {
|
|
182
182
|
format: "YYYY/MM/DD",
|
|
183
183
|
controlled: true,
|
|
184
184
|
onConfirm: onStartDateConfirmHandler,
|
|
@@ -193,7 +193,7 @@ function CreateCycle(_ref) {
|
|
|
193
193
|
className: "tu-icon-arrow-down okr-detail-date-cycle__select-time-down-icon"
|
|
194
194
|
})))), /*#__PURE__*/_react["default"].createElement("div", {
|
|
195
195
|
className: "okr-detail-date-cycle__date-line"
|
|
196
|
-
}, (0, _getLocale.getLocale)(
|
|
196
|
+
}, (0, _getLocale.getLocale)('Mod_EndDate'), "\uFF1A", /*#__PURE__*/_react["default"].createElement(_rangePickerPop["default"], {
|
|
197
197
|
format: "YYYY/MM/DD",
|
|
198
198
|
controlled: true,
|
|
199
199
|
onConfirm: onEndDateCOnfirmHandler,
|
|
@@ -208,8 +208,8 @@ function CreateCycle(_ref) {
|
|
|
208
208
|
className: "tu-icon-arrow-down okr-detail-date-cycle__select-time-down-icon"
|
|
209
209
|
})))), /*#__PURE__*/_react["default"].createElement("div", {
|
|
210
210
|
style: {
|
|
211
|
-
display:
|
|
212
|
-
justifyContent:
|
|
211
|
+
display: 'flex',
|
|
212
|
+
justifyContent: 'flex-end'
|
|
213
213
|
}
|
|
214
214
|
}, /*#__PURE__*/_react["default"].createElement(_titaUi.Button, {
|
|
215
215
|
size: "s",
|
|
@@ -217,15 +217,15 @@ function CreateCycle(_ref) {
|
|
|
217
217
|
marginRight: 12
|
|
218
218
|
},
|
|
219
219
|
onClick: onCancelClickHandler
|
|
220
|
-
}, (0, _getLocale.getLocale)(
|
|
220
|
+
}, (0, _getLocale.getLocale)('Mod_Cancel')), /*#__PURE__*/_react["default"].createElement(_titaUi.Button, {
|
|
221
221
|
size: "s",
|
|
222
222
|
type: "primary",
|
|
223
223
|
onClick: onSureClickHandler
|
|
224
|
-
}, (0, _getLocale.getLocale)(
|
|
224
|
+
}, (0, _getLocale.getLocale)('OKR_MyO_Butt_Determine'))));
|
|
225
225
|
} else {
|
|
226
|
-
return /*#__PURE__*/_react["default"].createElement(_periodSelector["default"], {
|
|
226
|
+
return canEdit ? /*#__PURE__*/_react["default"].createElement(_periodSelector["default"], {
|
|
227
227
|
style: {
|
|
228
|
-
width:
|
|
228
|
+
width: '100%'
|
|
229
229
|
},
|
|
230
230
|
selected: cycle,
|
|
231
231
|
showFullCycle: false,
|
|
@@ -245,7 +245,11 @@ function CreateCycle(_ref) {
|
|
|
245
245
|
btnRef: btnRef,
|
|
246
246
|
clickCallback: function clickCallback() {},
|
|
247
247
|
text: _formatCycleData(cycle, getCycleRange)
|
|
248
|
-
}))
|
|
248
|
+
})) : renderInnerContent({
|
|
249
|
+
btnRef: btnRef,
|
|
250
|
+
clickCallback: function clickCallback() {},
|
|
251
|
+
text: _formatCycleData(cycle, getCycleRange)
|
|
252
|
+
});
|
|
249
253
|
}
|
|
250
254
|
}
|
|
251
255
|
|