@titaui/pc 1.11.21-beta.8 → 1.11.21-beta.9

package/lib/components/drawer/headerDrop.js

@@ -57,7 +57,8 @@ var HeaderDropItem = function HeaderDropItem(_ref) {
 
   var hasIcon = !!icon && typeof icon === "string";
   var applyState = detailInfo === null || detailInfo === void 0 ? void 0 : detailInfo.applyState;
-  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) ? /*#__PURE__*/_react["default"].createElement("div", {
+  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

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

@@ -48,7 +48,7 @@ var DateCycle = function DateCycle(_ref) {
       okrInfo = _useContext.okrInfo,
       approvalSetting = _useContext.approvalSetting;
 
-  var canCycleEdit = canEdit && (0, _helper.getApprovalIsShow)(approvalSetting, "changeOkrTime", okrInfo.applyState);
+  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),
@@ -56,19 +56,20 @@ var DateCycle = function DateCycle(_ref) {
       setIsFocus = _useState2[1];
 
   var handleButtonFocus = (0, _react.useCallback)(function () {
-    canCycleEdit && setIsFocus(true);
+    if (canCycleEdit) {
+      setIsFocus(true);
+    }
   }, [canCycleEdit]);
   var handleButtonBlur = (0, _react.useCallback)(function () {
     setIsFocus(false);
   }, []);
-  console.log('approvalSetting', approvalSetting);
-  console.log('okrInfo', okrInfo);
 
   var renderClickArea = function renderClickArea(_ref2) {
     var btnRef = _ref2.btnRef,
         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(!canCycleEdit && "base-info-date-cycle__button--disable"),
@@ -89,11 +90,15 @@ var DateCycle = function DateCycle(_ref) {
     renderInnerContent: renderClickArea,
     cycle: cycle,
     setCycle: setCycle,
-    okrId: okrId,
-    canEdit: canCycleEdit,
+    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

@@ -122,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 && (0, _helper.getApprovalIsShow)(approvalSetting, "changeOkrName", okrInfo.applyState) ? /*#__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: {

package/lib/components/okr-detail/components/header/index.js

@@ -169,6 +169,7 @@ function Header(props) {
     okrName: okrName,
     setIsEdit: setIsEdit,
     okrStatus: okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.status,
+    OkrAndKrApprovalTypes: okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.OkrAndKrApprovalTypes,
     applyState: okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.applyState,
     approvalSetting: approvalSetting
   }, /*#__PURE__*/_react["default"].createElement(_oClassify["default"], {
@@ -193,7 +194,7 @@ function Header(props) {
   })), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(precls, "__action-item")
   }, /*#__PURE__*/_react["default"].createElement(_oCycle["default"], {
-    editable: editable && (0, _helper.getApprovalIsShow)(approvalSetting, "changeOkrTime", okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.applyState),
+    editable: editable && (0, _helper.getApprovalIsShow)(approvalSetting, "changeOkrTime", okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.applyState, okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.OkrAndKrApprovalTypes),
     okrId: okrInfo.workId
   })), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(precls, "__action-item")

package/lib/components/okr-detail/components/header/o-name.js

@@ -24,10 +24,11 @@ function OName(props) {
       okrStatus = props.okrStatus,
       children = props.children,
       approvalSetting = props.approvalSetting,
-      applyState = props.applyState;
+      applyState = props.applyState,
+      OkrAndKrApprovalTypes = props.OkrAndKrApprovalTypes;
 
   var handleEditClick = function handleEditClick() {
-    if ((0, _helper.getApprovalIsShow)(approvalSetting, "changeOkrName", applyState)) {
+    if ((0, _helper.getApprovalIsShow)(approvalSetting, "changeOkrName", applyState, OkrAndKrApprovalTypes)) {
       if (editable) {
         setIsEdit(true);
       }

package/lib/components/okr-detail/components/okr-tree/tree-node/kr-node/index.js

@@ -303,7 +303,9 @@ function _default(props) {
     _drawerManager["default"].open("krDetail", {
       krId: data.mileStoneId
     });
-  };
+  }; // console.log('okrInfo',okrInfo?.OkrAndKrApprovalTypes)
+  // console.log('data',data?.KrApprovalTypes)
+
 
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__kr-node"))
@@ -318,7 +320,7 @@ function _default(props) {
   }, "KR", index + 1), /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__kr-node-title"))
   }, /*#__PURE__*/_react["default"].createElement(_editableInput["default"], {
-    editable: krCanEdit && (0, _helper.getApprovalIsShow)(approvalSetting, "changeOkrName", okrInfo.applyState),
+    editable: krCanEdit && (0, _helper.getApprovalIsShow)(approvalSetting, "changeOkrName", okrInfo.applyState, okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.OkrAndKrApprovalTypes, data === null || data === void 0 ? void 0 : data.KrApprovalTypes),
     defaultValue: krName,
     emptyMessage: "KR\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A",
     onKeyDown: onKrNameChangeHandler,
@@ -351,7 +353,7 @@ function _default(props) {
     marginLeft: 16
   }, /*#__PURE__*/_react["default"].createElement(_rangePickerPop["default"], {
     data: data,
-    editable: krCanEdit && (0, _helper.getApprovalIsShow)(approvalSetting, 'changeOkrTime', okrInfo.applyState)
+    editable: krCanEdit && (0, _helper.getApprovalIsShow)(approvalSetting, "changeOkrTime", okrInfo.applyState, okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.OkrAndKrApprovalTypes, data === null || data === void 0 ? void 0 : data.KrApprovalTypes)
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__kr-node-actions"))
   }, showHeart && /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -9,14 +9,16 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _titaUi = require("tita-ui");
-
-var _style = require("./style");
+var _classnames = _interopRequireDefault(require("classnames"));
 
 var _tooltip = _interopRequireDefault(require("../../../tooltip"));
 
 var _getLocale = require("../../../../utils/getLocale");
 
+var _dialogConfirm = _interopRequireDefault(require("../../../dialog-confirm"));
+
+require("./index.css");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -35,61 +37,104 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var getDeleteOptions = function getDeleteOptions() {
-  return [{
-    id: 0,
-    text: "不删除目标下的任务",
-    tips: ""
-  }, {
-    id: 1,
-    text: "同时删除目标下所有任务",
-    tips: (0, _getLocale.getLocale)("Pro_detail_Tasksapproval")
-  }, {
-    id: 2,
-    text: (0, _getLocale.getLocale)("Pro_detail_Attheametime"),
-    tips: (0, _getLocale.getLocale)("Pro_detail_Tasksapproval")
-  }];
-};
-
-function OkrDeleteConfirm(_ref) {
-  var onConfirm = _ref.onConfirm,
-      onCancel = _ref.onCancel;
-
-  var _useState = (0, _react.useState)(0),
+var prefix = 'okr-detail-delete-confirm';
+var deleteOptions = [{
+  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 OkrDeletePop = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
+  var onCancel = _ref.onCancel,
+      onConfirm = _ref.onConfirm,
+      approvalSetting = _ref.approvalSetting;
+
+  var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
-      selected = _useState2[0],
-      setSelected = _useState2[1];
+      showConfirmPop = _useState2[0],
+      setShowConfirmPop = _useState2[1];
 
-  return /*#__PURE__*/_react["default"].createElement(_style.DeleteWrapper, {
-    onClick: function onClick(e) {
-      return e.stopPropagation();
-    }
-  }, /*#__PURE__*/_react["default"].createElement(_style.DeleteTitle, null, "\u76EE\u6807\u5220\u9664\u64CD\u4F5C\u4E0D\u53EF\u6062\u590D\uFF01\u8BF7\u8C28\u614E\u64CD\u4F5C"), /*#__PURE__*/_react["default"].createElement("div", null, getDeleteOptions().map(function (option) {
-    return /*#__PURE__*/_react["default"].createElement(_style.Options, {
-      key: option.id,
-      onClick: function onClick() {
-        return setSelected(option.id);
-      }
-    }, /*#__PURE__*/_react["default"].createElement(_style.Icon, {
-      className: selected == option.id ? "tu-icon-singlebox-avtive" : "tu-icon-singlebox-have"
-    }), /*#__PURE__*/_react["default"].createElement("p", null, option.text), option.tips && /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
-      overlay: option.tips,
-      placement: "top",
-      zIndex: 15000
-    }, /*#__PURE__*/_react["default"].createElement(_style.Icon, {
-      className: "tu-icon-warning"
-    })));
-  })), /*#__PURE__*/_react["default"].createElement(_style.ButtonGroup, null, /*#__PURE__*/_react["default"].createElement(_titaUi.Button, {
-    onClick: function onClick() {
+  var _useState3 = (0, _react.useState)(0),
+      _useState4 = _slicedToArray(_useState3, 2),
+      selected = _useState4[0],
+      setSelected = _useState4[1];
+
+  var handleCancelClick = function handleCancelClick() {
+    if (onCancel) {
       onCancel();
     }
-  }, (0, _getLocale.getLocale)("Mod_Cancel")), /*#__PURE__*/_react["default"].createElement(_titaUi.Button, {
-    type: "primary",
-    onClick: function onClick() {
-      return onConfirm(selected);
+
+    setShowConfirmPop(false);
+  };
+
+  var handleConfirmClick = function handleConfirmClick() {
+    if (onConfirm) {
+      onConfirm(selected);
     }
-  }, (0, _getLocale.getLocale)("Pro_detail_Submission"))));
-}
 
-var _default = OkrDeleteConfirm;
+    setShowConfirmPop(false);
+  };
+
+  var show = function show() {
+    setShowConfirmPop(true);
+  };
+
+  var hide = function hide() {
+    setShowConfirmPop(false);
+  };
+
+  (0, _react.useImperativeHandle)(ref, function () {
+    return {
+      show: show,
+      hide: hide
+    };
+  });
+  var renderDialogConfirm = (0, _react.useMemo)(function () {
+    return /*#__PURE__*/_react["default"].createElement(_dialogConfirm["default"], {
+      zIndex: 1200,
+      visible: showConfirmPop,
+      type: "warning"
+    }, /*#__PURE__*/_react["default"].createElement("span", {
+      type: "title"
+    }, approvalSetting.isOpen ? (0, _getLocale.getLocale)('OKR_MyO_Deleteoapproval') : (0, _getLocale.getLocale)('OKR_MyO_Determinedeletiono')), /*#__PURE__*/_react["default"].createElement("span", {
+      type: "content"
+    }, !approvalSetting.isOpen && (0, _getLocale.getLocale)('OKR_MyO_Text_Odeletion'), /*#__PURE__*/_react["default"].createElement("div", null, deleteOptions.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")
+      }))));
+    }))), /*#__PURE__*/_react["default"].createElement(_dialogConfirm["default"].CancelButton, {
+      type: "button",
+      onClick: handleCancelClick
+    }, (0, _getLocale.getLocale)('Mod_Cancel')), /*#__PURE__*/_react["default"].createElement(_dialogConfirm["default"].SureButton, {
+      type: "button",
+      onClick: handleConfirmClick
+    }, approvalSetting.isOpen ? (0, _getLocale.getLocale)('OKR_MyO_Submittedapproval') : (0, _getLocale.getLocale)('Pro_detail_Submission')));
+  }, [showConfirmPop, selected]);
+  return renderDialogConfirm;
+});
+var _default = OkrDeletePop;
 exports["default"] = _default;

package/lib/components/okr-detail/detail-header/delete-confirm/index.css

@@ -0,0 +1,55 @@
+.okr-detail-delete-confirm__option {
+  cursor: pointer;
+  display: flex;
+  margin-top: 10px;
+}
+
+.okr-detail-delete-confirm__option-text {
+  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 {
+  font-size: 12px;
+  color: #89919f;
+  vertical-align: middle;
+}
+
+.okr-detail-delete-confirm__icon.tu-icon-singlebox-have, .okr-detail-delete-confirm__icon.tu-icon-singlebox-avtive {
+  margin-top: 4px;
+  font-size: 16px;
+  color: #2879ff;
+}
+
+.okr-detail-delete-confirm__icon.tu-icon-warning {
+  font-size: 14px;
+  color: #acb7bf;
+  margin-left: 4px;
+  vertical-align: text-top;
+}
+
+.isApprovalDisabled {
+  margin-bottom: 0;
+  padding: 5px 24px;
+  font-size: 14px;
+  line-height: 22px;
+  transition: all .3s ease-in;
+  color: #BFC7D5;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  white-space: nowrap;
+}
+
+.isApprovalDisabled .options-icon {
+  margin-right: 12px;
+  font-size: 14px;
+  transition: all .3s ease-in;
+  color: #89919f;
+}

package/lib/components/okr-detail/detail-header/index.js

@@ -9,8 +9,6 @@ exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _titaUi = require("tita-ui");
-
 var _userSelector = _interopRequireDefault(require("../../user-selector"));
 
 var _drawer = _interopRequireDefault(require("../../drawer"));
@@ -27,7 +25,7 @@ var _requestApis = require("../request-apis");
 
 var _okrShare = _interopRequireDefault(require("../../okr-share"));
 
-var _context7 = require("../context");
+var _context6 = require("../context");
 
 var _constant = require("./constant");
 
@@ -76,7 +74,7 @@ function OkrDetailHeader(_ref) {
       setShareVisible = _useState2[1];
 
   var userSelectRef = (0, _react.useRef)();
-  var popRef = (0, _react.useRef)();
+  var deletePopRef = (0, _react.useRef)();
 
   var _useState3 = (0, _react.useState)([]),
       _useState4 = _slicedToArray(_useState3, 2),
@@ -85,8 +83,8 @@ function OkrDetailHeader(_ref) {
 
 
   var loginUserId = window.BSGlobal.loginUserInfo.Id;
-  var context = (0, _react.useContext)(_context7.GeneralDataContext);
-  var commonContext = (0, _react.useContext)(_context7.CommonContext);
+  var context = (0, _react.useContext)(_context6.GeneralDataContext);
+  var commonContext = (0, _react.useContext)(_context6.CommonContext);
   var approvalSetting = commonContext.approvalSetting,
       okrInfo = commonContext.okrInfo;
   var approveStatusColor = (0, _constant.ApproveStatusColor)(detailInfo.applyState);
@@ -138,6 +136,24 @@ function OkrDetailHeader(_ref) {
   var closeShareModal = (0, _react.useCallback)(function () {
     setShareVisible(false);
   }, []);
+
+  var handleDeleteOkr = function handleDeleteOkr(selected) {
+    (0, _requestApis.workDelete)({
+      deleteType: selected,
+      workId: detailInfo.workId
+    }).then(function (resp) {
+      if (resp.Code === 1) {
+        _toast["default"].Success((0, _getLocale.getLocale)("Pro_detail_Deletsuccess"));
+
+        setTimeout(function () {
+          commonContext.refreshAll();
+        }, 500);
+      } else {
+        _toast["default"].Error(resp.Message);
+      }
+    });
+  };
+
   var actions = (0, _react.useMemo)(function () {
     if (!detailInfo) {
       return [];
@@ -191,7 +207,7 @@ function OkrDetailHeader(_ref) {
         changVisiblity(detailInfo.workId, visibility);
       },
       onDeleteOkr: function onDeleteOkr(e) {
-        popRef.current.getRef().show(e.target);
+        deletePopRef.current.show();
       },
       onCopyOkr: function onCopyOkr() {
         // @ts-ignore
@@ -415,48 +431,11 @@ function OkrDetailHeader(_ref) {
       })
     },
     zIndex: 2400
-  }), /*#__PURE__*/_react["default"].createElement(_titaUi.PopConfirm, {
-    ref: popRef,
-    showArrow: false,
-    align: "top",
-    className: "document-mouse-event-ignore",
-    content: /*#__PURE__*/_react["default"].createElement(_deleteConfirm["default"], {
-      onConfirm: /*#__PURE__*/function () {
-        var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6(selected) {
-          return regeneratorRuntime.wrap(function _callee6$(_context6) {
-            while (1) {
-              switch (_context6.prev = _context6.next) {
-                case 0:
-                  _context6.next = 2;
-                  return (0, _requestApis.workDelete)({
-                    deleteType: selected,
-                    workId: detailInfo.workId
-                  });
-
-                case 2:
-                  _toast["default"].Success((0, _getLocale.getLocale)("Pro_detail_Deletsuccess"));
-
-                  setTimeout(function () {
-                    commonContext.refreshAll();
-                  }, 500);
-
-                case 4:
-                case "end":
-                  return _context6.stop();
-              }
-            }
-          }, _callee6);
-        }));
-
-        return function (_x5) {
-          return _ref3.apply(this, arguments);
-        };
-      }(),
-      onCancel: function onCancel() {
-        return popRef.current && popRef.current.getRef().hide();
-      }
-    })
-  }, /*#__PURE__*/_react["default"].createElement("span", null)), /*#__PURE__*/_react["default"].createElement("div", {
+  }), /*#__PURE__*/_react["default"].createElement(_deleteConfirm["default"], {
+    ref: deletePopRef,
+    approvalSetting: approvalSetting,
+    onConfirm: handleDeleteOkr
+  }), /*#__PURE__*/_react["default"].createElement("div", {
     style: {
       textAlign: "right",
       height: 0

package/lib/components/okr-detail/helper.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getApprovalOpenItem = exports.getApprovalIsShow = exports.EApproveStatus = exports.EApprovalTypes = void 0;
+exports.getApprovalOpenItem = exports.getApprovalIsShow = exports.EApproveStatus = exports.EApprovalTypes = exports.EApprovalKrTypes = void 0;
 var EApprovalTypes;
 exports.EApprovalTypes = EApprovalTypes;
 
@@ -14,6 +14,16 @@ exports.EApprovalTypes = EApprovalTypes;
   EApprovalTypes[EApprovalTypes["DeleteOkr"] = 55] = "DeleteOkr";
 })(EApprovalTypes || (exports.EApprovalTypes = EApprovalTypes = {}));
 
+var EApprovalKrTypes;
+exports.EApprovalKrTypes = EApprovalKrTypes;
+
+(function (EApprovalKrTypes) {
+  EApprovalKrTypes[EApprovalKrTypes["Createkr"] = 57] = "Createkr";
+  EApprovalKrTypes[EApprovalKrTypes["ChangekrName"] = 58] = "ChangekrName";
+  EApprovalKrTypes[EApprovalKrTypes["ChangekrTime"] = 60] = "ChangekrTime";
+  EApprovalKrTypes[EApprovalKrTypes["Deletekr"] = 59] = "Deletekr";
+})(EApprovalKrTypes || (exports.EApprovalKrTypes = EApprovalKrTypes = {}));
+
 var EApproveStatus;
 exports.EApproveStatus = EApproveStatus;
 
@@ -56,7 +66,18 @@ var getApprovalOpenItem = function getApprovalOpenItem(setting) {
 exports.getApprovalOpenItem = getApprovalOpenItem;
 
 var getApprovalIsShow = function getApprovalIsShow(approvalSetting, type, applyState) {
-  return !approvalSetting.isOpen || approvalSetting.isOpen && !(approvalSetting !== null && approvalSetting !== void 0 && approvalSetting[type]) || approvalSetting.isOpen && (approvalSetting === null || approvalSetting === void 0 ? void 0 : approvalSetting[type]) && applyState !== EApproveStatus.UnderApproval;
+  var okrType = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
+  var krType = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : [];
+  {
+    /* 有编辑权限，
+      且审批开关没有开启
+      或者审批开关开启但是没开修改okr名字审批 且(状态不是审批中或者状态审批中且不为新建)
+      或者开启okr审批开关 且开启okr名字审批 且当前状态不是审批中的时候是可编辑的 */
+  }
+  var okrCreate = okrType === null || okrType === void 0 ? void 0 : okrType.includes(EApprovalTypes.CreateOkr);
+  var krCreate = krType === null || krType === void 0 ? void 0 : krType.includes(EApprovalKrTypes.Createkr);
+  var isCreate = okrCreate || krCreate;
+  return !approvalSetting.isOpen || approvalSetting.isOpen && !(approvalSetting !== null && approvalSetting !== void 0 && approvalSetting[type]) && (applyState !== EApproveStatus.UnderApproval || applyState === EApproveStatus.UnderApproval && !isCreate) || approvalSetting.isOpen && (approvalSetting === null || approvalSetting === void 0 ? void 0 : approvalSetting[type]) && applyState !== EApproveStatus.UnderApproval;
 };
 
 exports.getApprovalIsShow = getApprovalIsShow;

package/lib/components/okr-detail/okr-list/index.js

@@ -445,9 +445,9 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       data: krs,
       approvalSetting: approvalSetting,
       okrInfo: okrInfo,
-      draggable: canEditOkr && (0, _helper.getApprovalIsShow)(approvalSetting, "changeOkrName", okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.applyState),
+      draggable: canEditOkr && (okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.applyState) === _helper.EApproveStatus.UnderApproval,
       onDrop: onOkrItemDropHandler
-    }))), (canEditOkr || isInnerUser) && (0, _helper.getApprovalIsShow)(approvalSetting, "createOkr", okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.applyState) && /*#__PURE__*/_react["default"].createElement("div", {
+    }))), (canEditOkr || isInnerUser) && (0, _helper.getApprovalIsShow)(approvalSetting, "createOkr", okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.applyState, okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.OkrAndKrApprovalTypes) && /*#__PURE__*/_react["default"].createElement("div", {
       ref: wrapperRef,
       className: (0, _classnames["default"])("".concat(preCls, "__addkr"))
     }, /*#__PURE__*/_react["default"].createElement(_paddingLayout["default"], null, createKrShow ? /*#__PURE__*/_react["default"].createElement(_createKrItem["default"], {

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

@@ -13,6 +13,8 @@ var _popup = _interopRequireDefault(require("../../../components/popup"));
 
 var _getLocale = require("../../../utils/getLocale");
 
+var _tooltip = _interopRequireDefault(require("../../../components/tooltip"));
+
 var _precls = require("../precls");
 
 var _context = require("../context");
@@ -98,11 +100,14 @@ var OperateRecord = function OperateRecord(props) {
     popupAlign: {
       offset: [0, 4]
     }
+  }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+    overlay: (0, _getLocale.getLocale)('Per_details_OperationRecord'),
+    placement: "top"
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(_precls.precls, "__header-record")
   }, /*#__PURE__*/_react["default"].createElement("i", {
     className: "tu-icon-more1"
-  }))), (toUserId !== undefined || relation === 1) && !!userInfo && /*#__PURE__*/_react["default"].createElement(OkrOperateRecordDrawer, {
+  })))), (toUserId !== undefined || relation === 1) && !!userInfo && /*#__PURE__*/_react["default"].createElement(OkrOperateRecordDrawer, {
     ref: drawerRef,
     userInfo: {
       Id: userInfo.userId,

package/package.json

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

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

@@ -1,38 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.Options = exports.Icon = exports.DeleteWrapper = exports.DeleteTitle = exports.ButtonGroup = void 0;
-
-var _styledComponents = _interopRequireDefault(require("styled-components"));
-
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-
-var DeleteWrapper = _styledComponents["default"].div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    width: 300px;\n\n    .tu-icon-warning {\n        transition: all .3s ease-in;\n\n        &:hover {\n            color: #2879ff;\n        }\n    }\n"])));
-
-exports.DeleteWrapper = DeleteWrapper;
-
-var DeleteTitle = _styledComponents["default"].h2(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n    font-size: 14px;\n    color: #1F2329;\n"])));
-
-exports.DeleteTitle = DeleteTitle;
-
-var Options = _styledComponents["default"].div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n    cursor: pointer;\n    display: flex;\n    align-items: center;\n\n    p {\n        margin: 6px;\n        font-size: 12px;\n        transition: all .3s ease-in;\n        color: #3e4e59;\n\n        &:hover {\n            color: #2879ff;\n        }\n    }\n"])));
-
-exports.Options = Options;
-
-var ButtonGroup = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n    margin-top: 5px;\n    display: flex;\n    align-items: center;\n    justify-content: flex-end;\n\n    button {\n        min-width: 58px !important;\n        height: 30px !important;\n        margin-left: 10px;\n        white-space: nowrap;\n    }\n"])));
-
-exports.ButtonGroup = ButtonGroup;
-
-var Icon = _styledComponents["default"].span(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n  font-size: 12px;\n  color: ", ";\n\n  &.tu-icon-diot {\n    color: #a4acb9;\n  }\n\n  // &.okr-type {\n  //   font-size: 16px;\n  //   color: #7f91b4;\n  //   position: relative;\n  //   top: ", ";\n  // }\n\n  // &.tu-icon-bianji2 {\n  //   margin-left: 6px;\n  //   font-size: 14px;\n  //   color: #2879ff;\n  //   cursor: pointer;\n  // }\n\n  // &.tu-icon-heart-solid {\n  //   margin-right: 6px;\n  //   color: #ff8c00;\n  // }\n\n  &.execute-icon {\n    font-size: 14px;\n    cursor: pointer;\n    position: relative;\n    top: 2px;\n  }\n\n  &.tu-icon-singlebox-have,\n  &.tu-icon-singlebox-avtive {\n    font-size: 14px;\n    color: #2879ff;\n  }\n\n  &.tu-icon-warning {\n    font-size: 14px;\n    color: #acb7bf;\n  }\n\n  &.tu-icon-more-diji {\n      position: relative;\n\n      &::after {\n          content: '';\n          \n      }\n  }\n"])), function (p) {
-  return p.color || "#89919F";
-}, function (p) {
-  return p.top;
-});
-
-exports.Icon = Icon;