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

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

@@ -18,10 +18,22 @@ exports.onlineBroadcastData = exports["default"] = void 0;
 //   href = "https://wiki.tita.com/pages/viewpage.action?pageId=15697741";
 // }
 var onlineBroadcastData = [{
+  hasOnline: true,
+  preContent: "「OKR」支持上级审批，管理更规范",
+  preHref: "https://wiki.tita.com/x/F4SeAQ",
+  isNew: true,
+  date: "4/29"
+}, {
+  hasOnline: true,
+  preContent: "「考核」更多位置支持离职人员筛选啦",
+  preHref: "https://wiki.tita.com/x/pwDQAQ",
+  isNew: true,
+  date: "4/29"
+}, {
   hasOnline: true,
   preContent: "「考核」OKR 维度支持按 KR 评分啦",
   preHref: "https://wiki.tita.com/x/JYOeAQ",
-  isNew: true,
+  isNew: false,
   date: "4/11"
 }, {
   hasOnline: true,

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

@@ -9,14 +9,14 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _classnames = _interopRequireDefault(require("classnames"));
-
-var _tooltip = _interopRequireDefault(require("../../../tooltip"));
-
 var _getLocale = require("../../../../utils/getLocale");
 
 var _dialogConfirm = _interopRequireDefault(require("../../../dialog-confirm"));
 
+var _tooltip = _interopRequireDefault(require("../../../tooltip"));
+
+var _form = _interopRequireDefault(require("../../../form"));
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -37,24 +37,36 @@ 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 getDeleteOptions = function getDeleteOptions() {
-  return [{
-    id: 0,
-    text: (0, _getLocale.getLocale)("OKR_MyO_Text_OdeletionNTask"),
-    tips: ""
-  }, {
-    id: 1,
-    text: (0, _getLocale.getLocale)("OKR_MyO_Text_OdeletionTask"),
-    tips: (0, _getLocale.getLocale)("Pro_detail_Tasksapproval")
-  }, {
-    id: 2,
-    text: (0, _getLocale.getLocale)("Pro_detail_Attheametime"),
-    tips: (0, _getLocale.getLocale)("Pro_detail_Tasksapproval")
-  }];
-};
-
+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')),
+  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'),
+    placement: "top",
+    zIndex: 15000
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    className: "".concat(prefix, "__icon tu-icon-wiki")
+  }))),
+  value: 1
+}, {
+  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'),
+    placement: "top",
+    zIndex: 15000
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    className: "".concat(prefix, "__icon tu-icon-wiki")
+  }))),
+  value: 2
+}];
 var OkrDeletePop = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   var onCancel = _ref.onCancel,
       onConfirm = _ref.onConfirm,
@@ -96,10 +108,13 @@ var OkrDeletePop = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   };
 
   var showApprovalCmp = (0, _react.useMemo)(function () {
-    var _okrInfo$OkrAndKrAppr;
-
-    return approvalSetting.isOpen && (!(okrInfo !== null && okrInfo !== void 0 && (_okrInfo$OkrAndKrAppr = okrInfo.OkrAndKrApprovalTypes) !== null && _okrInfo$OkrAndKrAppr !== void 0 && _okrInfo$OkrAndKrAppr.includes(53)) || approvalSetting.deleteOkr);
+    return approvalSetting.isOpen && approvalSetting.deleteOkr;
   }, [approvalSetting, okrInfo]);
+
+  var handleChangeDeleteRadios = function handleChangeDeleteRadios(value) {
+    setSelected(value);
+  };
+
   (0, _react.useImperativeHandle)(ref, function () {
     return {
       show: show,
@@ -110,39 +125,23 @@ var OkrDeletePop = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     return /*#__PURE__*/_react["default"].createElement(_dialogConfirm["default"], {
       zIndex: 1200,
       visible: showConfirmPop,
-      type: "warning"
+      type: "warning",
+      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, getDeleteOptions().map(function (option) {
-      return /*#__PURE__*/_react["default"].createElement("div", {
-        className: "".concat(prefix, "__option"),
-        key: option.id,
-        onClick: function onClick() {
-          return setSelected(option.id);
-        }
-      }, /*#__PURE__*/_react["default"].createElement("span", {
-        className: (0, _classnames["default"])("".concat(prefix, "__icon"), {
-          "tu-icon-singlebox-avtive": selected === option.id,
-          "tu-icon-singlebox-have": selected !== option.id
-        })
-      }), /*#__PURE__*/_react["default"].createElement("span", {
-        className: "".concat(prefix, "__option-text")
-      }, option.text, option.tips && /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
-        overlay: option.tips,
-        placement: "top",
-        zIndex: 15000
-      }, /*#__PURE__*/_react["default"].createElement("span", {
-        className: "".concat(prefix, "__icon tu-icon-warning")
-      }))));
+    }, !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/detail-header/delete-confirm/index.css

@@ -8,11 +8,6 @@
   font-size: 14px;
   color: #3F4755;
   line-height: 22px;
-  margin-left: 6px;
-}
-
-.okr-detail-delete-confirm__option-text:hover {
-  color: #2879ff;
 }
 
 .okr-detail-delete-confirm__icon {
@@ -27,11 +22,20 @@
   color: #2879ff;
 }
 
-.okr-detail-delete-confirm__icon.tu-icon-warning {
-  font-size: 14px;
+.okr-detail-delete-confirm__icon.tu-icon-singlebox-have {
+  color: #BFC7D5;
+}
+
+.okr-detail-delete-confirm__icon.tu-icon-wiki {
+  display: inline-block;
+  font-size: 16px;
   color: #acb7bf;
   margin-left: 4px;
-  vertical-align: text-top;
+  margin-bottom: 2px;
+}
+
+.okr-detail-delete-confirm .form-field-radio__radios-item {
+  margin-top: 10px;
 }
 
 .isApprovalDisabled {

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

@@ -89,7 +89,7 @@ exports.updateConfidenceIndex = updateConfidenceIndex;
 var updateOkrName = function updateOkrName(_ref4) {
   var workId = _ref4.workId,
       workName = _ref4.workName;
-  return (0, _request.rpost)("v2")("work/name", {
+  return (0, _request.rpost)("v1")("okr/name", {
     workId: workId,
     workName: workName
   });

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

@@ -124,45 +124,45 @@ function Header(props, ref) {
     var rootNode = {
       rootId: 0,
       // @ts-ignore
-      rootName: window.BSGlobal.tenantInfo.Name || ""
+      rootName: window.BSGlobal.tenantInfo.Name || ''
     };
     var level2Selected = {
       id: 0,
       // @ts-ignore
-      name: window.BSGlobal.tenantInfo.Name || ""
+      name: window.BSGlobal.tenantInfo.Name || ''
     };
-    var searchType = "company";
+    var searchType = 'company';
 
     if (departmentId && departmentId !== -1) {
       rootNode.rootId = departmentId;
-      rootNode.rootName = departmentName || "";
-      searchType = "depart";
+      rootNode.rootName = departmentName || '';
+      searchType = 'depart';
       level2Selected.id = departmentId;
-      level2Selected.name = departmentName || "";
+      level2Selected.name = departmentName || '';
     }
 
     if (toUserId) {
       rootNode.rootId = toUserId;
-      rootNode.rootName = userInfo.name || "";
-      searchType = "user";
+      rootNode.rootName = userInfo.name || '';
+      searchType = 'user';
       level2Selected.id = toUserId;
-      level2Selected.name = userInfo.name || "";
+      level2Selected.name = userInfo.name || '';
     }
 
     if (parseInt(relation, 10) === 1) {
       rootNode.rootId = (0, _bsGlobal.getUserInfo)().Id;
-      rootNode.rootName = (0, _bsGlobal.getUserInfo)().Name || "";
-      searchType = "user";
+      rootNode.rootName = (0, _bsGlobal.getUserInfo)().Name || '';
+      searchType = 'user';
       level2Selected.id = (0, _bsGlobal.getUserInfo)().Id;
-      level2Selected.name = (0, _bsGlobal.getUserInfo)().Name || "";
+      level2Selected.name = (0, _bsGlobal.getUserInfo)().Name || '';
     }
 
     var urlQuery = ["searchType=".concat(searchType), "period=".concat(JSON.stringify({
       cycleType: cycleType,
       annualNum: annualNum,
       yqmNum: yqmNum
-    })), "rootNode=".concat(JSON.stringify(rootNode)), "level2Selected=".concat(JSON.stringify(level2Selected))].join("&");
-    var origin = window.location.href.split("#")[0];
+    })), "rootNode=".concat(JSON.stringify(rootNode)), "level2Selected=".concat(JSON.stringify(level2Selected))].join('&');
+    var origin = window.location.href.split('#')[0];
     window.location.href = "".concat(origin, "/#okr/map?").concat(urlQuery);
   };
 
@@ -221,7 +221,7 @@ function Header(props, ref) {
     className: "".concat(_precls.precls, "__header-item"),
     onClick: gotoOkrMap
   }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
-    overlay: (0, _getLocale.getLocale)("OKR_MyO_Text_Alignment"),
+    overlay: (0, _getLocale.getLocale)('OKR_MyO_Text_Alignment'),
     placement: "top"
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(_precls.precls, "__header-icon")
@@ -233,7 +233,7 @@ function Header(props, ref) {
     userInfo: userInfo
   }), /*#__PURE__*/_react["default"].createElement(_filter["default"], {
     onSearch: onSearch
-  }), /*#__PURE__*/_react["default"].createElement(_operateRecord["default"], {
+  }), Number(cycleType) !== -1 && /*#__PURE__*/_react["default"].createElement(_operateRecord["default"], {
     toUserId: toUserId,
     userInfo: userInfo,
     relation: relationShip,

package/lib/pages/new-okr-list/header/operate-record.js

@@ -85,8 +85,6 @@ var OperateRecord = function OperateRecord(props) {
       (0, _requestApi.getOperateRecordAuth)(toUserId).then(function (res) {
         setShowOperateRecord(res.Data.obj);
       });
-    } else if (parseInt(cycleType) === -1) {
-      setShowOperateRecord(false);
     } else {
       setShowOperateRecord(true);
     }

package/package.json

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