@titaui/pc 1.11.40-beta.5 → 1.11.40-beta.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/lib/components/create-okr-modal/index.js +1 -1
  2. package/lib/components/dynamic/online-broadcast/data.js +6 -0
  3. package/lib/components/nav-top/components/user-message/components/todos/index.css +1 -0
  4. package/lib/components/okr-detail/detail-header/delete-confirm/delete-confirm.js +11 -11
  5. package/lib/components/okr-detail/request-apis.js +3 -3
  6. package/lib/pages/new-okr-list/header/index.js +1 -1
  7. package/package.json +1 -1
package/lib/components/create-okr-modal/index.js CHANGED
@@ -502,7 +502,7 @@ function CreateOkrModal(_ref, ref) {
502
502
  models: [user]
503
503
  }]
504
504
  }, visibilityArea), {}, {
505
- isFromAssess: isFromAssess
505
+ CreateFromAssess: isFromAssess
506
506
  }));
507
507
 
508
508
  case 24:
package/lib/components/dynamic/online-broadcast/data.js CHANGED
@@ -29,6 +29,12 @@ var onlineBroadcastData = [{
29
29
  preHref: "https://wiki.tita.com/x/pwDQAQ",
30
30
  isNew: true,
31
31
  date: "4/29"
32
+ }, {
33
+ hasOnline: true,
34
+ preContent: "「1 on 1」面谈全新上线",
35
+ preHref: "https://wiki.tita.com/pages/viewpage.action?pageId=27165723",
36
+ isNew: true,
37
+ date: "4/27"
32
38
  }, {
33
39
  hasOnline: true,
34
40
  preContent: "「考核」OKR 维度支持按 KR 评分啦",
package/lib/components/nav-top/components/user-message/components/todos/index.css CHANGED
@@ -50,6 +50,7 @@
50
50
  height: 82px;
51
51
  margin-left: 12px;
52
52
  padding-top: 8px;
53
+ overflow: hidden;
53
54
  }
54
55
 
55
56
  .titaui-user-message-msg-todos__item-right-header {
package/lib/components/okr-detail/detail-header/delete-confirm/delete-confirm.js CHANGED
@@ -37,18 +37,18 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
37
37
 
38
38
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
39
39
 
40
- var prefix = 'okr-detail-delete-confirm';
40
+ var prefix = "okr-detail-delete-confirm";
41
41
  var Radios = _form["default"].Fields.Radios;
42
42
  var radios = [{
43
43
  label: /*#__PURE__*/_react["default"].createElement("span", {
44
44
  className: "".concat(prefix, "__option-text")
45
- }, (0, _getLocale.getLocale)('OKR_MyO_Text_OdeletionNTask')),
45
+ }, (0, _getLocale.getLocale)("OKR_MyO_Text_OdeletionNTask")),
46
46
  value: 0
47
47
  }, {
48
48
  label: /*#__PURE__*/_react["default"].createElement("span", {
49
49
  className: "".concat(prefix, "__option-text")
50
- }, (0, _getLocale.getLocale)('OKR_MyO_Text_OdeletionTask'), /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
51
- overlay: (0, _getLocale.getLocale)('Pro_detail_Tasksapproval'),
50
+ }, (0, _getLocale.getLocale)("OKR_MyO_Text_OdeletionTask"), /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
51
+ overlay: (0, _getLocale.getLocale)("Pro_detail_Tasksapproval"),
52
52
  placement: "top",
53
53
  zIndex: 15000
54
54
  }, /*#__PURE__*/_react["default"].createElement("span", {
@@ -58,8 +58,8 @@ var radios = [{
58
58
  }, {
59
59
  label: /*#__PURE__*/_react["default"].createElement("span", {
60
60
  className: "".concat(prefix, "__option-text")
61
- }, (0, _getLocale.getLocale)('Pro_detail_Attheametime'), /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
62
- overlay: (0, _getLocale.getLocale)('Pro_detail_Tasksapproval'),
61
+ }, (0, _getLocale.getLocale)("Pro_detail_Attheametime"), /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
62
+ overlay: (0, _getLocale.getLocale)("Pro_detail_Tasksapproval"),
63
63
  placement: "top",
64
64
  zIndex: 15000
65
65
  }, /*#__PURE__*/_react["default"].createElement("span", {
@@ -108,7 +108,7 @@ var OkrDeletePop = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
108
108
  };
109
109
 
110
110
  var showApprovalCmp = (0, _react.useMemo)(function () {
111
- return approvalSetting.isOpen && approvalSetting.deleteOkr;
111
+ return approvalSetting.isOpen && approvalSetting.deleteOkr && !okrInfo.OkrAndKrApprovalTypes.includes(53);
112
112
  }, [approvalSetting, okrInfo]);
113
113
 
114
114
  var handleChangeDeleteRadios = function handleChangeDeleteRadios(value) {
@@ -129,19 +129,19 @@ var OkrDeletePop = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
129
129
  className: prefix
130
130
  }, /*#__PURE__*/_react["default"].createElement("span", {
131
131
  type: "title"
132
- }, showApprovalCmp ? (0, _getLocale.getLocale)('OKR_MyO_Deleteoapproval') : (0, _getLocale.getLocale)('OKR_MyO_Determinedeletiono')), /*#__PURE__*/_react["default"].createElement("span", {
132
+ }, showApprovalCmp ? (0, _getLocale.getLocale)("OKR_MyO_Deleteoapproval") : (0, _getLocale.getLocale)("OKR_MyO_Determinedeletiono")), /*#__PURE__*/_react["default"].createElement("span", {
133
133
  type: "content"
134
- }, !showApprovalCmp && (0, _getLocale.getLocale)('OKR_MyO_Text_Odeletion'), /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(Radios, {
134
+ }, !showApprovalCmp && (0, _getLocale.getLocale)("OKR_MyO_Text_Odeletion"), /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(Radios, {
135
135
  radios: radios,
136
136
  value: 0,
137
137
  onChange: handleChangeDeleteRadios
138
138
  }))), /*#__PURE__*/_react["default"].createElement(_dialogConfirm["default"].CancelButton, {
139
139
  type: "button",
140
140
  onClick: handleCancelClick
141
- }, (0, _getLocale.getLocale)('Mod_Cancel')), /*#__PURE__*/_react["default"].createElement(_dialogConfirm["default"].SureButton, {
141
+ }, (0, _getLocale.getLocale)("Mod_Cancel")), /*#__PURE__*/_react["default"].createElement(_dialogConfirm["default"].SureButton, {
142
142
  type: "button",
143
143
  onClick: handleConfirmClick
144
- }, showApprovalCmp ? (0, _getLocale.getLocale)('OKR_MyO_Submittedapproval') : (0, _getLocale.getLocale)('Pro_detail_Submission')));
144
+ }, showApprovalCmp ? (0, _getLocale.getLocale)("OKR_MyO_Submittedapproval") : (0, _getLocale.getLocale)("Pro_detail_Submission")));
145
145
  }, [showConfirmPop, selected]);
146
146
  return renderDialogConfirm;
147
147
  });
package/lib/components/okr-detail/request-apis.js CHANGED
@@ -371,7 +371,7 @@ var remindAction = function remindAction(_ref15) {
371
371
  exports.remindAction = remindAction;
372
372
 
373
373
  var getOkrUsers = function getOkrUsers(workId) {
374
- return (0, _request.rget)("v2")("work/users?workId=".concat(workId));
374
+ return (0, _request.rget)("v1")("okr/users?workId=".concat(workId));
375
375
  };
376
376
 
377
377
  exports.getOkrUsers = getOkrUsers;
@@ -458,7 +458,7 @@ var updateOCommitType = function updateOCommitType(params) {
458
458
  exports.updateOCommitType = updateOCommitType;
459
459
 
460
460
  var saveODesc = function saveODesc(workId, description) {
461
- return (0, _request.rpost)("v2")("work/description", {
461
+ return (0, _request.rpost)("v1")("okr/description", {
462
462
  workId: workId,
463
463
  description: description
464
464
  });
@@ -508,7 +508,7 @@ var addUserRelation = function addUserRelation(workId, relation, addUser) {
508
508
  exports.addUserRelation = addUserRelation;
509
509
 
510
510
  var getProgress = function getProgress(workId) {
511
- return (0, _request.rget)("v1")("Work/GetProgress?work_id=".concat(workId, "&count=10000"));
511
+ return (0, _request.rget)("v1")("okr/GetProgress?work_id=".concat(workId, "&count=10000"));
512
512
  };
513
513
 
514
514
  exports.getProgress = getProgress;
package/lib/pages/new-okr-list/header/index.js CHANGED
@@ -233,7 +233,7 @@ function Header(props, ref) {
233
233
  userInfo: userInfo
234
234
  }), /*#__PURE__*/_react["default"].createElement(_filter["default"], {
235
235
  onSearch: onSearch
236
- }), Number(cycleType) !== -1 && /*#__PURE__*/_react["default"].createElement(_operateRecord["default"], {
236
+ }), Number(cycleType) !== -1 && relation === "1" && /*#__PURE__*/_react["default"].createElement(_operateRecord["default"], {
237
237
  toUserId: toUserId,
238
238
  userInfo: userInfo,
239
239
  relation: relationShip,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@titaui/pc",
3
- "version": "1.11.40-beta.5",
3
+ "version": "1.11.40-beta.8",
4
4
  "nameCN": "",
5
5
  "description": "",
6
6
  "main": "lib/index.js",