@titaui/pc 1.11.40-beta.6 → 1.11.40-beta.9

package/lib/components/dynamic/online-broadcast/data.js

@@ -29,6 +29,12 @@ var onlineBroadcastData = [{
   preHref: "https://wiki.tita.com/x/pwDQAQ",
   isNew: true,
   date: "4/29"
+}, {
+  hasOnline: true,
+  preContent: "「1 on 1」面谈全新上线",
+  preHref: "https://wiki.tita.com/pages/viewpage.action?pageId=27165723",
+  isNew: true,
+  date: "4/27"
 }, {
   hasOnline: true,
   preContent: "「考核」OKR 维度支持按 KR 评分啦",

package/lib/components/mblog/components/MblogContent.js

@@ -208,14 +208,16 @@ var MblogContent = /*#__PURE__*/function (_PureComponent) {
         style: {
           opacity: isFocus ? "0.8" : "1"
         }
-      }, placeholderText)), /*#__PURE__*/_react["default"].createElement(_style.TextareaWrapper, null, /*#__PURE__*/_react["default"].createElement(_style.Textarea, {
+      }, placeholderText)), /*#__PURE__*/_react["default"].createElement(_style.TextareaWrapper, {
+        className: "textarea-wrap"
+      }, /*#__PURE__*/_react["default"].createElement(_style.Textarea, {
         ref: "textareaSetHeight",
         value: textareaValue,
         onChange: function onChange() {},
         className: "textarea-setheight"
       }), /*#__PURE__*/_react["default"].createElement(_style.Textarea, {
         ref: "textareaInput",
-        className: "".concat(visibility === 1 ? "" : "private__bg"),
+        className: "textarea-details ".concat(visibility === 1 ? "" : "private__bg"),
         value: textareaValue,
         onFocus: this._handlerFocus,
         onBlur: this._handlerBlur,
@@ -224,6 +226,7 @@ var MblogContent = /*#__PURE__*/function (_PureComponent) {
         onPaste: this._handlerPaste,
         onChange: this._handleInputChange
       })), /*#__PURE__*/_react["default"].createElement(_style.Tips, {
+        className: "textarea-tips",
         onMouseDown: this._handlerTipsLabelClick,
         color: maxLength && textareaValueLen > maxLength ? "#EB4447" : textareaValueLen > 0 ? "#2879ff" : "#BFC3C7"
       }, textareaValueLen, "/", maxLength));

package/lib/components/nav-top/components/user-message/components/todos/index.css

@@ -50,6 +50,7 @@
   height: 82px;
   margin-left: 12px;
   padding-top: 8px;
+  overflow: hidden;
 }
 
 .titaui-user-message-msg-todos__item-right-header {

package/lib/components/okr-detail/detail-header/delete-confirm/delete-confirm.js

@@ -37,18 +37,18 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var prefix = 'okr-detail-delete-confirm';
+var prefix = "okr-detail-delete-confirm";
 var Radios = _form["default"].Fields.Radios;
 var radios = [{
   label: /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(prefix, "__option-text")
-  }, (0, _getLocale.getLocale)('OKR_MyO_Text_OdeletionNTask')),
+  }, (0, _getLocale.getLocale)("OKR_MyO_Text_OdeletionNTask")),
   value: 0
 }, {
   label: /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(prefix, "__option-text")
-  }, (0, _getLocale.getLocale)('OKR_MyO_Text_OdeletionTask'), /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
-    overlay: (0, _getLocale.getLocale)('Pro_detail_Tasksapproval'),
+  }, (0, _getLocale.getLocale)("OKR_MyO_Text_OdeletionTask"), /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+    overlay: (0, _getLocale.getLocale)("Pro_detail_Tasksapproval"),
     placement: "top",
     zIndex: 15000
   }, /*#__PURE__*/_react["default"].createElement("span", {
@@ -58,8 +58,8 @@ var radios = [{
 }, {
   label: /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(prefix, "__option-text")
-  }, (0, _getLocale.getLocale)('Pro_detail_Attheametime'), /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
-    overlay: (0, _getLocale.getLocale)('Pro_detail_Tasksapproval'),
+  }, (0, _getLocale.getLocale)("Pro_detail_Attheametime"), /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+    overlay: (0, _getLocale.getLocale)("Pro_detail_Tasksapproval"),
     placement: "top",
     zIndex: 15000
   }, /*#__PURE__*/_react["default"].createElement("span", {
@@ -108,7 +108,7 @@ var OkrDeletePop = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   };
 
   var showApprovalCmp = (0, _react.useMemo)(function () {
-    return approvalSetting.isOpen && approvalSetting.deleteOkr;
+    return approvalSetting.isOpen && approvalSetting.deleteOkr && !okrInfo.OkrAndKrApprovalTypes.includes(53);
   }, [approvalSetting, okrInfo]);
 
   var handleChangeDeleteRadios = function handleChangeDeleteRadios(value) {
@@ -129,19 +129,19 @@ var OkrDeletePop = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       className: prefix
     }, /*#__PURE__*/_react["default"].createElement("span", {
       type: "title"
-    }, showApprovalCmp ? (0, _getLocale.getLocale)('OKR_MyO_Deleteoapproval') : (0, _getLocale.getLocale)('OKR_MyO_Determinedeletiono')), /*#__PURE__*/_react["default"].createElement("span", {
+    }, showApprovalCmp ? (0, _getLocale.getLocale)("OKR_MyO_Deleteoapproval") : (0, _getLocale.getLocale)("OKR_MyO_Determinedeletiono")), /*#__PURE__*/_react["default"].createElement("span", {
       type: "content"
-    }, !showApprovalCmp && (0, _getLocale.getLocale)('OKR_MyO_Text_Odeletion'), /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(Radios, {
+    }, !showApprovalCmp && (0, _getLocale.getLocale)("OKR_MyO_Text_Odeletion"), /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(Radios, {
       radios: radios,
       value: 0,
       onChange: handleChangeDeleteRadios
     }))), /*#__PURE__*/_react["default"].createElement(_dialogConfirm["default"].CancelButton, {
       type: "button",
       onClick: handleCancelClick
-    }, (0, _getLocale.getLocale)('Mod_Cancel')), /*#__PURE__*/_react["default"].createElement(_dialogConfirm["default"].SureButton, {
+    }, (0, _getLocale.getLocale)("Mod_Cancel")), /*#__PURE__*/_react["default"].createElement(_dialogConfirm["default"].SureButton, {
       type: "button",
       onClick: handleConfirmClick
-    }, showApprovalCmp ? (0, _getLocale.getLocale)('OKR_MyO_Submittedapproval') : (0, _getLocale.getLocale)('Pro_detail_Submission')));
+    }, showApprovalCmp ? (0, _getLocale.getLocale)("OKR_MyO_Submittedapproval") : (0, _getLocale.getLocale)("Pro_detail_Submission")));
   }, [showConfirmPop, selected]);
   return renderDialogConfirm;
 });

package/lib/components/okr-detail/request-apis.js

@@ -371,7 +371,7 @@ var remindAction = function remindAction(_ref15) {
 exports.remindAction = remindAction;
 
 var getOkrUsers = function getOkrUsers(workId) {
-  return (0, _request.rget)("v2")("work/users?workId=".concat(workId));
+  return (0, _request.rget)("v1")("okr/users?workId=".concat(workId));
 };
 
 exports.getOkrUsers = getOkrUsers;
@@ -458,7 +458,7 @@ var updateOCommitType = function updateOCommitType(params) {
 exports.updateOCommitType = updateOCommitType;
 
 var saveODesc = function saveODesc(workId, description) {
-  return (0, _request.rpost)("v2")("work/description", {
+  return (0, _request.rpost)("v1")("okr/description", {
     workId: workId,
     description: description
   });
@@ -508,7 +508,7 @@ var addUserRelation = function addUserRelation(workId, relation, addUser) {
 exports.addUserRelation = addUserRelation;
 
 var getProgress = function getProgress(workId) {
-  return (0, _request.rget)("v1")("Work/GetProgress?work_id=".concat(workId, "&count=10000"));
+  return (0, _request.rget)("v1")("okr/GetProgress?work_id=".concat(workId, "&count=10000"));
 };
 
 exports.getProgress = getProgress;

package/lib/components/task-relation-modal/index.js

@@ -235,7 +235,6 @@ function TaskRelationModal(props) {
   };
 
   var removeSelected = function removeSelected(id) {
-    debugger;
     var newSelected = selected.filter(function (item) {
       return item.id !== id;
     });

package/lib/pages/new-okr-list/header/index.js

@@ -233,7 +233,7 @@ function Header(props, ref) {
     userInfo: userInfo
   }), /*#__PURE__*/_react["default"].createElement(_filter["default"], {
     onSearch: onSearch
-  }), Number(cycleType) !== -1 && /*#__PURE__*/_react["default"].createElement(_operateRecord["default"], {
+  }), Number(cycleType) !== -1 && relation === "1" && /*#__PURE__*/_react["default"].createElement(_operateRecord["default"], {
     toUserId: toUserId,
     userInfo: userInfo,
     relation: relationShip,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.11.40-beta.6",
+  "version": "1.11.40-beta.9",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",