@titaui/pc 1.11.25 → 1.11.27-beta.2

package/lib/components/avatar/name-avatar/index.css

@@ -55,4 +55,5 @@
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
   color: #6F7886;
   line-height: 20px;
+  margin-left: 4px;
 }

package/lib/components/avatar/name-avatar/index.js

@@ -58,7 +58,10 @@ var NameAvatar = function NameAvatar(props) {
       onDelUser = props.onDelUser,
       _props$textWidth = props.textWidth,
       textWidth = _props$textWidth === void 0 ? 42 : _props$textWidth,
-      textClass = props.textClass;
+      textClass = props.textClass,
+      renderRightTopCmp = props.renderRightTopCmp,
+      _props$avatarTips = props.avatarTips,
+      avatarTips = _props$avatarTips === void 0 ? '' : _props$avatarTips;
   var hasAvatar = src && !src.match(/default\w*.jpg$/);
 
   var _useState = (0, _react.useState)(false),
@@ -103,7 +106,7 @@ var NameAvatar = function NameAvatar(props) {
       style: {
         width: size.width,
         height: size.width,
-        verticalAlign: "top"
+        verticalAlign: 'top'
       },
       src: src
     });
@@ -120,11 +123,11 @@ var NameAvatar = function NameAvatar(props) {
         }
       }, /*#__PURE__*/_react["default"].createElement("div", {
         style: {
-          display: "inline-block",
+          display: 'inline-block',
           width: "".concat(size.fontSize, "px"),
-          margin: "0 auto",
-          overflow: "hidden",
-          whiteSpace: "nowrap",
+          margin: '0 auto',
+          overflow: 'hidden',
+          whiteSpace: 'nowrap',
           fontSize: "".concat(size.fontSize, "px"),
           lineHeight: "".concat(size.width, "px")
         }
@@ -134,7 +137,7 @@ var NameAvatar = function NameAvatar(props) {
       })));
     }
 
-    var cuttedName = "";
+    var cuttedName = '';
     var cuttedNameLen = 0;
 
     for (var i = 0, lent = name.length; i < lent; i++) {
@@ -167,11 +170,11 @@ var NameAvatar = function NameAvatar(props) {
     className: "titaui-pc-avator__name-avatar-container",
     onMouseEnter: handleMouseEnter,
     onMouseLeave: handleMouseLeave
-  }, /*#__PURE__*/_react["default"].createElement("div", {
+  }, renderRightTopCmp, /*#__PURE__*/_react["default"].createElement("div", {
     onClick: handleDelUser,
     onMouseLeave: handleCloseIconMouseLeave,
     onMouseEnter: handleCloseIconMouseEnter,
-    className: "titaui-pc-avator__delete-wrapper ".concat(canDelUser && mouseIsEnterUser ? "titaui-pc-avator--enter" : ""),
+    className: "titaui-pc-avator__delete-wrapper ".concat(canDelUser && mouseIsEnterUser ? 'titaui-pc-avator--enter' : ''),
     style: {
       left: "".concat(size.width - 14, "px")
     }
@@ -185,7 +188,10 @@ var NameAvatar = function NameAvatar(props) {
     onClick: onClick,
     onMouseEnter: onMouseEnter,
     onMouseLeave: onMouseLeave
-  }, hasAvatar ? renderImgAvatar() : renderTextAvatar()), showNameTips && isNameOverflow ? /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+  }, avatarTips && /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+    overlay: avatarTips,
+    placement: "top"
+  }, hasAvatar ? renderImgAvatar() : renderTextAvatar()), !avatarTips && (hasAvatar ? renderImgAvatar() : renderTextAvatar())), showNameTips && isNameOverflow ? /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
     overlay: /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
       name: name,
       id: userId
@@ -194,14 +200,17 @@ var NameAvatar = function NameAvatar(props) {
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "titaui-pc-avator__name ".concat(textClass),
     style: {
-      width: textWidth
+      maxWidth: textWidth
     }
   }, /*#__PURE__*/_react["default"].createElement("span", {
     ref: textRef
-  }, name))) : /*#__PURE__*/_react["default"].createElement("span", {
+  }, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
+    name: name,
+    id: userId
+  })))) : /*#__PURE__*/_react["default"].createElement("span", {
     className: "titaui-pc-avator__name ".concat(textClass),
     style: {
-      width: textWidth
+      maxWidth: textWidth
     }
   }, /*#__PURE__*/_react["default"].createElement("span", {
     ref: textRef

package/lib/components/button/rect-btn/index.css

@@ -13,7 +13,7 @@
   align-items: center;
   justify-content: center;
   min-width: 64px;
-  font-size: 13px;
+  font-size: 14px;
   padding: 0 12px;
 }
 
@@ -60,21 +60,35 @@
   background: #5c8eff;
 }
 
+.titaui-rect-btn--secondary {
+  font-size: 14px;
+  font-weight: normal;
+  color: #2879ff;
+  line-height: 28px;
+  background: rgba(40, 121, 255, 0.2);
+  margin-right: 16px;
+}
+
+.titaui-rect-btn--secondary:hover {
+  color: #fff;
+  background-color: #2879ff;
+}
+
 .titaui-rect-btn--cancel {
-  color: #6F7886;
-  border: 1px solid #DFE3EA;
-  background: #FFFFFF;
+  color: #6f7886;
+  border: 1px solid #dfe3ea;
+  background: #ffffff;
 }
 
 .titaui-rect-btn--cancel:hover {
-  color: #2879FF;
-  border: 1px solid #2879FF;
+  color: #2879ff;
+  border: 1px solid #2879ff;
 }
 
 .titaui-rect-btn--delete {
-  background: #FFFFFF;
-  color: #F05E5E;
-  border: 1px solid #F05E5E;
+  background: #ffffff;
+  color: #f05e5e;
+  border: 1px solid #f05e5e;
 }
 
 .titaui-rect-btn--delete:hover {
@@ -92,11 +106,31 @@
   user-select: none;
 }
 
+.titaui-rect-btn--disabled:hover .titaui-rect-btn--default:hover {
+  background: #fff;
+}
+
+.titaui-rect-btn--disabled:hover .titaui-rect-btn--primary:hover {
+  background: #2879ff;
+}
+
+.titaui-rect-btn--disabled:hover .titaui-rect-btn--secondary:hover {
+  background: rgba(40, 121, 255, 0.2);
+}
+
+.titaui-rect-btn--disabled:hover .titaui-rect-btn--cancel:hover {
+  background: #ffffff;
+}
+
+.titaui-rect-btn--disabled:hover .titaui-rect-btn--delete:hover {
+  background: #ffffff;
+}
+
 .titaui-rect-btn--primary.titaui-rect-btn--disabled {
-  background: #93BCFF;
+  background: #93bcff;
   opacity: 1;
 }
 
 .titaui-rect-btn--primary.titaui-rect-btn--disabled:hover {
-  background: #93BCFF;
+  background: #93bcff;
 }

package/lib/components/button/rect-btn/index.js

@@ -34,7 +34,10 @@ function RectBtn(props) {
       className = _props$className === void 0 ? "" : _props$className,
       _props$disabled = props.disabled,
       disabled = _props$disabled === void 0 ? false : _props$disabled,
-      style = props.style;
+      style = props.style,
+      children = props.children,
+      _props$loading = props.loading,
+      loading = _props$loading === void 0 ? false : _props$loading;
 
   var renderIcon = function renderIcon() {
     if (typeof icon === "string") {
@@ -50,16 +53,19 @@ function RectBtn(props) {
     }, icon);
   };
 
-  var onClickHandler = function onClickHandler() {
-    if (disabled) return;
-    onClick && onClick();
+  var onClickHandler = function onClickHandler(e) {
+    if (disabled || loading) return;
+
+    if (onClick) {
+      onClick(e);
+    }
   };
 
   return /*#__PURE__*/_react["default"].createElement("span", {
-    className: (0, _classnames["default"])(precls, "".concat(precls, "--").concat(type), "".concat(precls, "--").concat(size), _defineProperty({}, "".concat(precls, "--disabled"), disabled), className),
+    className: (0, _classnames["default"])(precls, "".concat(precls, "--").concat(type), "".concat(precls, "--").concat(size), _defineProperty({}, "".concat(precls, "--disabled"), disabled || loading), className),
     style: style,
     onClick: onClickHandler
-  }, icon && renderIcon(), props.children || text);
+  }, icon && renderIcon(), children || text);
 }
 
 var _default = RectBtn;

package/lib/components/change-okr-modal/index.js

@@ -564,7 +564,8 @@ var _initialiseProps = function _initialiseProps() {
                 }).join(','),
                 searchKr: okrPopType,
                 // 是否搜索KR：默认为0-不搜索，1-只有对齐目标弹层可以搜索KR
-                toUserId: toUserId
+                toUserId: toUserId,
+                includeCreateFailApprovalOkr: false
               }).then(function (res) {
                 _this4.pending = false;
                 var resData = res && res.Data && res.Data.works || [];

package/lib/components/create-okr-modal/request-api.js

@@ -46,7 +46,7 @@ var createWidthKr = /*#__PURE__*/function () {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            url = "".concat(requestDomain(), "/api/v2/").concat(tenantId, "/").concat(userId, "/work/createWithKr");
+            url = "".concat(requestDomain(), "/api/v1/").concat(tenantId, "/").concat(userId, "/okr/createWithKr");
             _context.next = 3;
             return _axios["default"].post(url, _objectSpread({
               workType: 6

package/lib/components/drawer/headerAction.js

@@ -49,7 +49,9 @@ function HeaderAction(_ref) {
       _onClick = _ref.onClick,
       className = _ref.className,
       title = _ref.title,
-      children = _ref.children;
+      children = _ref.children,
+      approvalSetting = _ref.approvalSetting,
+      detailInfo = _ref.detailInfo;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -99,6 +101,8 @@ function HeaderAction(_ref) {
   if (children && children.length > 0) {
     content = /*#__PURE__*/_react["default"].createElement(_headerDrop["default"], {
       visible: dropVisible,
+      detailInfo: detailInfo,
+      approvalSetting: approvalSetting,
       onVisibleChange: function onVisibleChange(visible) {
         active.current = visible;
         !visible && setDropVisible(false);

package/lib/components/drawer/headerDrop.js

@@ -9,6 +9,8 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _helper = require("../okr-detail/helper");
+
 var _popup = _interopRequireDefault(require("../popup"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -44,7 +46,9 @@ var HeaderDropItem = function HeaderDropItem(_ref) {
       colorInDrop = _ref.colorInDrop,
       hoverColorInDrop = _ref.hoverColorInDrop,
       _onClick = _ref.onClick,
-      onClose = _ref.onClose;
+      onClose = _ref.onClose,
+      approvalSetting = _ref.approvalSetting,
+      detailInfo = _ref.detailInfo;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -52,7 +56,37 @@ var HeaderDropItem = function HeaderDropItem(_ref) {
       setHover = _useState2[1];
 
   var hasIcon = !!icon && typeof icon === "string";
-  return /*#__PURE__*/_react["default"].createElement("div", {
+  var applyState = detailInfo === null || detailInfo === void 0 ? void 0 : detailInfo.applyState;
+  var OkrAndKrApprovalTypes = detailInfo === null || detailInfo === void 0 ? void 0 : detailInfo.OkrAndKrApprovalTypes;
+  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, icon === 'tu-icon-del' ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, (0, _helper.getApprovalIsShow)(approvalSetting, 'deleteOkr', applyState, OkrAndKrApprovalTypes) ? /*#__PURE__*/_react["default"].createElement("div", {
+    className: "header-drop-item",
+    style: {
+      color: hover ? hoverColorInDrop || hoverColor : colorInDrop || color
+    },
+    onClick: function onClick(e) {
+      _onClick && _onClick(e);
+      onClose(false);
+    },
+    onMouseOver: function onMouseOver() {
+      return setHover(true);
+    },
+    onMouseOut: function onMouseOut() {
+      return setHover(false);
+    }
+  }, hasIcon && /*#__PURE__*/_react["default"].createElement("div", {
+    className: "header-drop-item-icon",
+    style: {
+      color: hover ? hoverIconColorInDrop || hoverColorInDrop || hoverColor : iconColorInDrop || colorInDrop || color
+    }
+  }, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement("span", {
+    className: icon
+  }) : icon), title) : /*#__PURE__*/_react["default"].createElement("div", {
+    className: "header-drop-item-approval"
+  }, hasIcon && /*#__PURE__*/_react["default"].createElement("div", {
+    className: "header-drop-item-icon"
+  }, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement("span", {
+    className: icon
+  }) : icon), title)) : /*#__PURE__*/_react["default"].createElement("div", {
     className: "header-drop-item",
     style: {
       color: hover ? hoverColorInDrop || hoverColor : colorInDrop || color
@@ -74,19 +108,23 @@ var HeaderDropItem = function HeaderDropItem(_ref) {
     }
   }, typeof icon === "string" ? /*#__PURE__*/_react["default"].createElement("span", {
     className: icon
-  }) : icon), title);
+  }) : icon), title));
 };
 
 var HeaderDrop = function HeaderDrop(_ref2) {
   var visible = _ref2.visible,
       onVisibleChange = _ref2.onVisibleChange,
       items = _ref2.items,
-      children = _ref2.children;
+      children = _ref2.children,
+      approvalSetting = _ref2.approvalSetting,
+      detailInfo = _ref2.detailInfo;
   var renderDrop = (0, _react.useMemo)(function () {
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "titaui-drawer-header-action-drop-wrapper"
     }, items.map(function (item) {
       return /*#__PURE__*/_react["default"].createElement(HeaderDropItem, _extends({}, item, {
+        detailInfo: detailInfo,
+        approvalSetting: approvalSetting,
         onClose: function onClose() {
           return onVisibleChange(false);
         }

package/lib/components/drawer/index.css

@@ -164,6 +164,39 @@
   background-repeat: no-repeat;
 }
 
+.titaui-drawer-header-action-drop-wrapper .header-drop-item-approval {
+  height: 32px;
+  display: flex;
+  align-items: center;
+  padding: 0 23px;
+  cursor: pointer;
+  color: #BFC7D5;
+}
+
+.titaui-drawer-header-action-drop-wrapper .header-drop-item-approval-icon {
+  font-size: 18px;
+  color: inherit;
+  width: 18px;
+  height: 18px;
+  cursor: pointer;
+  margin-right: 10px;
+  background-size: contain;
+  background-position: center center;
+  background-repeat: no-repeat;
+}
+
+.titaui-drawer-header-action-drop-wrapper .header-drop-item-approval-icon > span {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: inherit;
+  width: 18px;
+  height: 18px;
+  background-size: contain;
+  background-position: center center;
+  background-repeat: no-repeat;
+}
+
 .drawer-left .drawer-content-wrapper,
 .drawer-right .drawer-content-wrapper,
 .drawer-left .drawer-content,

package/lib/components/drawer/index.js

@@ -25,7 +25,9 @@ require("./index.css");
 
 var _context = _interopRequireDefault(require("../drawer-manager/context"));
 
-var _excluded = ["visible", "placement", "children", "mask", "width", "className", "contentWrapperStyle", "onClose", "style", "afterVisibleChange", "destroyOnClose", "bodyStyle", "zIndex"];
+var _dom = require("./utils/dom");
+
+var _excluded = ["visible", "placement", "children", "mask", "width", "className", "contentWrapperStyle", "onClose", "style", "afterVisibleChange", "destroyOnClose", "bodyStyle", "zIndex", "autoClosable"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -54,7 +56,7 @@ var Drawer = function Drawer(props) {
 
   var visible = props.visible,
       _props$placement = props.placement,
-      placement = _props$placement === void 0 ? "right" : _props$placement,
+      placement = _props$placement === void 0 ? 'right' : _props$placement,
       children = props.children,
       _props$mask = props.mask,
       mask = _props$mask === void 0 ? false : _props$mask,
@@ -70,6 +72,8 @@ var Drawer = function Drawer(props) {
       bodyStyle = props.bodyStyle,
       _props$zIndex = props.zIndex,
       zIndex = _props$zIndex === void 0 ? 1200 : _props$zIndex,
+      _props$autoClosable = props.autoClosable,
+      autoClosable = _props$autoClosable === void 0 ? false : _props$autoClosable,
       rest = _objectWithoutProperties(props, _excluded);
 
   var handleAfterVisibleChange = (0, _react.useCallback)(function (opened) {
@@ -89,6 +93,20 @@ var Drawer = function Drawer(props) {
     return children;
   }
 
+  var autoClose = function autoClose(e) {
+    if ((0, _dom.hasAncestorElement)(e.target, 'document-mouse-event-ignore,rc-tooltip,titaui-popup,rc-dialog-root,common-modal,in-modal,task-hot-add')) return;
+    onClose();
+  };
+
+  (0, _react.useEffect)(function () {
+    if (autoClosable) {
+      document.addEventListener('mousedown', autoClose);
+    }
+
+    return function () {
+      document.removeEventListener('mousedown', autoClose);
+    };
+  }, []);
   return /*#__PURE__*/_react["default"].createElement(DrawerContext.Provider, {
     value: {
       close: function close() {
@@ -96,7 +114,7 @@ var Drawer = function Drawer(props) {
       }
     }
   }, /*#__PURE__*/_react["default"].createElement(_rcDrawer["default"], _extends({
-    className: (0, _classnames["default"])("titaui-drawer", "document-mouse-event-ignore", className),
+    className: (0, _classnames["default"])('titaui-drawer', 'document-mouse-event-ignore', className),
     style: _objectSpread(_objectSpread({}, style), {}, {
       zIndex: zIndex
     })
@@ -123,7 +141,10 @@ function DrawerHeader(_ref) {
       content = _ref.content,
       style = _ref.style,
       onClose = _ref.onClose,
-      actionComponent = _ref.actionComponent;
+      actionComponent = _ref.actionComponent,
+      onlyShowContent = _ref.onlyShowContent,
+      approvalSetting = _ref.approvalSetting,
+      detailInfo = _ref.detailInfo;
   var drawer = (0, _react.useContext)(DrawerContext);
   var manager = (0, _react.useContext)(_context["default"]);
   var showClose = closable && (!!onClose || !!drawer);
@@ -146,16 +167,18 @@ function DrawerHeader(_ref) {
     onClick: manager && manager.goBack
   }, /*#__PURE__*/_react["default"].createElement("i", {
     className: "tu-icon-fanhui"
-  }), (0, _getLocale.getLocale)("Mod_Back")), showBackBtn && hasContent && /*#__PURE__*/_react["default"].createElement("div", {
+  }), (0, _getLocale.getLocale)('Mod_Back')), showBackBtn && hasContent && /*#__PURE__*/_react["default"].createElement("div", {
     className: "titaui-drawer-header-divider"
   }), hasContent && content, /*#__PURE__*/_react["default"].createElement("div", {
     style: {
       flex: 1
     }
-  }), /*#__PURE__*/_react["default"].createElement("div", null, actionComponent), displayActions.map(function (action) {
+  }), /*#__PURE__*/_react["default"].createElement("div", null, onlyShowContent), /*#__PURE__*/_react["default"].createElement("div", null, actionComponent), displayActions.map(function (action) {
     return /*#__PURE__*/_react["default"].createElement(_headerAction["default"], action);
   }), !!collapsedActions.length && /*#__PURE__*/_react["default"].createElement(_headerAction["default"], {
-    title: (0, _getLocale.getLocale)("Mod_MoreOperate"),
+    approvalSetting: approvalSetting,
+    detailInfo: detailInfo,
+    title: (0, _getLocale.getLocale)('Mod_MoreOperate'),
     icon: "tu-icon-10",
     children: collapsedActions
   }), showClose && /*#__PURE__*/_react["default"].createElement("div", {

package/lib/components/grid-layout/sub-employee-okr/person-okr.js

@@ -19,6 +19,8 @@ var _dateTestChange = require("../../../utils/date-test-change");
 
 var _openData = require("../../../utils/open-data");
 
+var _getLocale = require("../../../utils/getLocale");
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -54,7 +56,11 @@ function PersonalOkr(props) {
 
   var toolTipRef = (0, _react.useRef)();
   (0, _react.useEffect)(function () {
-    setSubUpdateTime((0, _dateTestChange.judgeTimeSpaceFromNow)(updateTime));
+    if (updateTime) {
+      setSubUpdateTime((0, _dateTestChange.judgeTimeSpaceFromNow)(updateTime) + (0, _getLocale.getLocale)("OKR_MyO_Butt_Update"));
+    } else {
+      setSubUpdateTime((0, _getLocale.getLocale)("OKR_MyO_KRP_Notupdated"));
+    }
   }, [updateTime]);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "subOKRComponents-PersonalOkr"
@@ -85,7 +91,7 @@ function PersonalOkr(props) {
     id: userId
   }))), /*#__PURE__*/_react["default"].createElement("span", {
     className: "subOKRComponents-PersonalOkr__left__updatetime"
-  }, subUpdateTime, "\u66F4\u65B0"))), /*#__PURE__*/_react["default"].createElement("span", {
+  }, subUpdateTime))), /*#__PURE__*/_react["default"].createElement("span", {
     className: "subOKRComponents-PersonalOkr__right"
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "subOKRComponents-PersonalOkr__right__percentNum"

package/lib/components/nav-top/index.js

@@ -15,6 +15,8 @@ var _bsGlobal = require("../../utils/bs-global");
 
 var _userOwnMenu = _interopRequireDefault(require("./components/user-own-menu"));
 
+var _useGlobalValue = _interopRequireDefault(require("./useGlobalValue"));
+
 var _menu = _interopRequireDefault(require("./components/menu"));
 
 var _userMessage = _interopRequireDefault(require("./components/user-message"));
@@ -170,5 +172,7 @@ var NavTop = function NavTop() {
   }, /*#__PURE__*/_react["default"].createElement(_userOwnMenu["default"], null)));
 };
 
-var _default = NavTop;
-exports["default"] = _default;
+var _default = NavTop; // @ts-ignore
+
+exports["default"] = _default;
+NavTop.useGlobalValue = _useGlobalValue["default"];

package/lib/components/okr-detail/base-info/other-infos/date-cycle/index.js

@@ -13,6 +13,10 @@ var _okrPeriodSelector = _interopRequireDefault(require("../../../../okr-period-
 
 var _getLocale = require("../../../../../utils/getLocale");
 
+var _context = require("../../../context");
+
+var _helper = require("../../../helper");
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -40,14 +44,22 @@ var DateCycle = function DateCycle(_ref) {
       _ref$canEdit = _ref.canEdit,
       canEdit = _ref$canEdit === void 0 ? false : _ref$canEdit;
 
+  var _useContext = (0, _react.useContext)(_context.CommonContext),
+      okrInfo = _useContext.okrInfo,
+      approvalSetting = _useContext.approvalSetting;
+
+  var canCycleEdit = canEdit && (0, _helper.getApprovalIsShow)(approvalSetting, "changeOkrTime", okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.applyState, okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.OkrAndKrApprovalTypes);
+
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
       isFocus = _useState2[0],
       setIsFocus = _useState2[1];
 
   var handleButtonFocus = (0, _react.useCallback)(function () {
-    canEdit && setIsFocus(true);
-  }, [canEdit]);
+    if (canCycleEdit) {
+      setIsFocus(true);
+    }
+  }, [canCycleEdit]);
   var handleButtonBlur = (0, _react.useCallback)(function () {
     setIsFocus(false);
   }, []);
@@ -57,9 +69,10 @@ var DateCycle = function DateCycle(_ref) {
         clickCallback = _ref2.clickCallback,
         text = _ref2.text;
     return /*#__PURE__*/_react["default"].createElement("button", {
+      type: "button",
       onFocus: handleButtonFocus,
       onBlur: handleButtonBlur,
-      className: "base-info-date-cycle__button ".concat(isFocus ? "base-info-date-cycle__button--focus" : "", " ").concat(!canEdit && "base-info-date-cycle__button--disable"),
+      className: "base-info-date-cycle__button ".concat(isFocus ? "base-info-date-cycle__button--focus" : "", " ").concat(!canCycleEdit && "base-info-date-cycle__button--disable"),
       ref: btnRef,
       onClick: clickCallback
     }, /*#__PURE__*/_react["default"].createElement("span", {
@@ -77,11 +90,15 @@ var DateCycle = function DateCycle(_ref) {
     renderInnerContent: renderClickArea,
     cycle: cycle,
     setCycle: setCycle,
-    okrId: okrId,
-    canEdit: canEdit,
+    okrId: okrId // canEdit={canCycleEdit}
+    ,
+    canEdit: false,
     getCycleRange: true
   }));
 };
 
+DateCycle.defaultProps = {
+  canEdit: false
+};
 var _default = DateCycle;
 exports["default"] = _default;

package/lib/components/okr-detail/base-info/other-infos/principal/index.js

@@ -21,6 +21,10 @@ var _popConfirm = _interopRequireDefault(require("../../../../../components-v1/p
 
 var _getLocale = require("../../../../../utils/getLocale");
 
+var _context2 = require("../../../context");
+
+var _helper = require("../../../helper");
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -60,6 +64,10 @@ var Principal = function Principal(_ref) {
       selectUser = _useState2[0],
       setSelectUser = _useState2[1];
 
+  var _useContext = (0, _react.useContext)(_context2.CommonContext),
+      okrInfo = _useContext.okrInfo,
+      approvalSetting = _useContext.approvalSetting;
+
   var handleSelected = function handleSelected(_ref2) {
     var _ref3 = _slicedToArray(_ref2, 1),
         user = _ref3[0];
@@ -114,7 +122,7 @@ var Principal = function Principal(_ref) {
   }, (0, _getLocale.getLocale)("Mod_Owner")), /*#__PURE__*/_react["default"].createElement("div", {
     className: "base-info-other-infos__principal-user",
     ref: selectUserRef
-  }, canEdit ? /*#__PURE__*/_react["default"].createElement(_popConfirm["default"], {
+  }, canEdit && (0, _helper.getApprovalIsShow)(approvalSetting, "changeOkrName", okrInfo.applyState, okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.OkrAndKrApprovalTypes) ? /*#__PURE__*/_react["default"].createElement(_popConfirm["default"], {
     ref: popConfirmRef,
     showArrow: false,
     style: {