@titaui/pc 1.11.47 → 1.12.0-beta.1

package/lib/components/menus/export-modules/appraisal-menus/menus.js

@@ -28,7 +28,8 @@ exports.defaultRefObject = defaultRefObject;
 var _getBSGlobal = (0, _bsGlobal.getBSGlobal)("AssessAdvancedSetting"),
     _getBSGlobal$AssessFu = _getBSGlobal.AssessFunctionSetting,
     StartAssessByDepartmentLeader = _getBSGlobal$AssessFu.StartAssessByDepartmentLeader,
-    StartAssessByUser = _getBSGlobal$AssessFu.StartAssessByUser;
+    StartAssessByUser = _getBSGlobal$AssessFu.StartAssessByUser,
+    StartAssessByHrbp = _getBSGlobal$AssessFu.StartAssessByHrbp;
 
 var _getUserInfo = (0, _bsGlobal.getUserInfo)(),
     HasSub = _getUserInfo.HasSub,
@@ -36,10 +37,11 @@ var _getUserInfo = (0, _bsGlobal.getUserInfo)(),
     IsLeader = _getUserInfo.IsLeader,
     IsBoss = _getUserInfo.IsBoss,
     IsRoot = _getUserInfo.IsRoot,
-    Role = _getUserInfo.Role;
+    Role = _getUserInfo.Role,
+    IsHrbp = _getUserInfo.IsHrbp;
 
-var performanceManageAuthority = IsAssessManager || IsLeader && StartAssessByDepartmentLeader || StartAssessByUser;
-var performanceStatisticsAuthority = IsAssessManager || IsBoss || IsRoot && Role != 4 || IsLeader;
+var performanceManageAuthority = IsAssessManager || IsLeader && StartAssessByDepartmentLeader || StartAssessByUser || IsHrbp && StartAssessByHrbp;
+var performanceStatisticsAuthority = IsAssessManager || IsBoss || IsRoot && Role !== 4 || IsLeader || IsHrbp;
 var PAGE_MY_APPRAISAL = "my-appraisal";
 exports.PAGE_MY_APPRAISAL = PAGE_MY_APPRAISAL;
 var PAGE_EVALUATE_APPRAISAL = "evaluate-appraisal";
@@ -86,7 +88,7 @@ var AppraisalMenus = /*#__PURE__*/function () {
       label: _i18n.locale.menu_department_ass,
       key: PAGE_DEPART_APPRAISAL,
       href: "#/performance?reactRouterName=department",
-      isShow: IsLeader
+      isShow: IsLeader || IsHrbp
     }, {
       icon: "",
       label: _i18n.locale.menu_management_ass,
@@ -151,16 +153,16 @@ var AppraisalMenus = /*#__PURE__*/function () {
   _createClass(AppraisalMenus, [{
     key: "getMenus",
     value: function getMenus() {
-      var menus = this.formateToTreeNodeData(this.menus);
+      var menus = this.formateToTreeNodeData();
       return menus;
     }
   }, {
     key: "formateToTreeNodeData",
-    value: function formateToTreeNodeData(menus) {
+    value: function formateToTreeNodeData() {
       var treeNodes = [];
 
-      for (var i = 0; i < menus.length; i++) {
-        var menu = menus[i];
+      for (var i = 0; i < this.menus.length; i += 1) {
+        var menu = this.menus[i];
 
         if (menu.isShow) {
           treeNodes.push({

package/lib/components/nav-top/components/menu/index.css

@@ -117,97 +117,6 @@
   position: relative;
 }
 
-.titaui-nav-top-menu__tips {
-  position: relative;
-}
-
-.titaui-nav-top-menu__tips-new {
-  width: 36px;
-  height: 26px;
-  position: absolute;
-  top: 4px;
-  right: -12px;
-}
-
-.titaui-nav-top-menu__tips-box {
-  width: 308px;
-  height: 142px;
-  box-sizing: border-box;
-  padding: 16px;
-  background: #5c8eff;
-  box-shadow: 0px 8px 24px 0px rgba(127, 145, 180, 0.3);
-  border: 1px solid #eff0f1;
-  border-radius: 12px;
-  z-index: 99;
-}
-
-.titaui-nav-top-menu__tips-box-head {
-  padding-left: 24px;
-  background-image: url("./img/wecome-temp.png");
-  background-position: 0 0;
-  background-repeat: no-repeat;
-  background-size: 20px 20px;
-}
-
-.titaui-nav-top-menu__tips-box-title {
-  display: block;
-  font-size: 14px;
-  color: #ffffff;
-  line-height: 22px;
-  font-weight: 600;
-}
-
-.titaui-nav-top-menu__tips-box-content {
-  font-size: 12px;
-  color: #ffffff;
-  line-height: 20px;
-  margin-top: 10px;
-}
-
-.titaui-nav-top-menu__tips-box-ok {
-  height: 28px;
-  margin-top: 8px;
-  margin-left: 210px;
-  background: #ffffff;
-  box-shadow: 0px -4px 12px 0px rgba(127, 145, 180, 0.2);
-  border-radius: 14px;
-  box-sizing: border-box;
-  padding: 3px 17px;
-  font-size: 14px;
-  color: #2879ff;
-  line-height: 22px;
-  cursor: pointer;
-}
-
-.titaui-nav-top-menu__tips-triangle {
-  position: absolute;
-  top: -4px;
-  left: 50%;
-  margin-left: -4px;
-  width: 0;
-  height: 0;
-  border-left: 5px solid transparent;
-  border-right: 5px solid transparent;
-  border-bottom: 5px solid #fff;
-}
-
-.titaui-nav-top-menu__tips-triangle::after {
-  content: '';
-  width: 0;
-  height: 0;
-  position: absolute;
-  left: -4px;
-  top: 2px;
-  border-left: solid 4px transparent;
-  border-right: solid 4px transparent;
-  border-bottom: solid 4px #5c8eff;
-  z-index: 99;
-}
-
-.titaui-nav-top-menu__tips-hide {
-  display: none;
-}
-
 .titaui-nav-top-menu .rc-overflow-item {
   position: relative;
 }

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

@@ -21,8 +21,6 @@ var _conditionRender = _interopRequireDefault(require("../../../../components/co
 
 var _useGlobalValue3 = _interopRequireDefault(require("../../useGlobalValue"));
 
-var _new = _interopRequireDefault(require("./img/new.svg"));
-
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -54,15 +52,6 @@ var popupAlign = {
   },
   targetOffset: [0, 0]
 };
-var NewFeatureGuidePopupAlign = {
-  offset: [104, -5],
-  overflow: {
-    adjustX: true,
-    adjustY: true
-  },
-  targetOffset: [0, 0]
-};
-var NEWMENUS = '#/interview';
 
 var Menu = function Menu(_ref) {
   var menus = _ref.menus,
@@ -70,13 +59,8 @@ var Menu = function Menu(_ref) {
 
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
-      isKnow = _useState2[0],
-      setIsKonw = _useState2[1];
-
-  var _useState3 = (0, _react.useState)(false),
-      _useState4 = _slicedToArray(_useState3, 2),
-      popupVisible = _useState4[0],
-      setPopupVisible = _useState4[1];
+      popupVisible = _useState2[0],
+      setPopupVisible = _useState2[1];
 
   var _useGlobalValue = (0, _useGlobalValue3["default"])(),
       _useGlobalValue2 = _slicedToArray(_useGlobalValue, 1),
@@ -100,66 +84,33 @@ var Menu = function Menu(_ref) {
     }
   };
 
-  var handleClick = function handleClick() {
-    setIsKonw(true);
-    localStorage.setItem("isNewMenuItem__".concat(userId), "".concat(userId));
+  var handleClickToLearning = function handleClickToLearning() {
+    window.open("".concat(apiPath, "/").concat(userId, "/eLearningHome#/"), '_self');
   };
 
-  (0, _react.useEffect)(function () {
-    var isKnow = localStorage.getItem("isNewMenuItem__".concat(userId));
-
-    if (isKnow) {
-      setIsKonw(true);
-    }
-  }, []);
-
-  var popup = /*#__PURE__*/_react["default"].createElement("div", {
-    className: "".concat(prefix, "__tips")
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])("".concat(prefix, "__tips-box"), _defineProperty({}, "".concat(prefix, "__tips-hide"), isKnow))
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: "".concat(prefix, "__tips-box-head")
-  }, /*#__PURE__*/_react["default"].createElement("h2", {
-    className: "".concat(prefix, "__tips-box-title")
-  }, "1 : 1 \u9762\u8C08\uFF08\u4E00\u5BF9\u4E00\u9762\u8C08\uFF09\u4E0A\u7EBF\u5566\uFF01"), /*#__PURE__*/_react["default"].createElement("p", {
-    className: "".concat(prefix, "__tips-box-content")
-  }, "\u52A9\u529B\u7ECF\u7406\u548C\u4E0B\u7EA7\u8FDB\u884C\u6301\u7EED\u6C9F\u901A\uFF0C\u4E3A\u4E0D\u540C\u573A\u666F\u63D0\u4F9B\u4E30\u5BCC\u7684\u6C9F\u901A\u6A21\u677F\uFF0C\u5373\u523B\u4E86\u89E3\uFF0CGo~")), /*#__PURE__*/_react["default"].createElement("div", {
-    className: "".concat(prefix, "__tips-box-ok"),
-    onClick: handleClick
-  }, "\u597D\u54D2")), /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])("".concat(prefix, "__tips-triangle"), _defineProperty({}, "".concat(prefix, "__tips-hide"), isKnow))
-  }));
-
   var renderRawItem = function renderRawItem(menu) {
-    var href = menu.href;
-
-    if (menu.title === 'Learning') {
-      href = "".concat(apiPath, "/").concat(userId, "/eLearningHome#/");
-    }
-
     return /*#__PURE__*/_react["default"].createElement(_rcOverflow["default"].Item, {
       component: "span"
     }, /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
-      condition: menu.id
-    }, /*#__PURE__*/_react["default"].createElement(_popup["default"], {
-      popupVisible: !isKnow,
-      popup: menu.href === NEWMENUS ? popup : null,
-      mask: false,
-      action: ['focus'],
-      popupAlign: NewFeatureGuidePopupAlign
+      condition: menu.title !== 'Learning'
     }, /*#__PURE__*/_react["default"].createElement("a", {
       className: (0, _classnames["default"])("".concat(prefix, "__menu-show"), _defineProperty({}, "".concat(prefix, "__menu-show--active"), activeMenuId === menu.id)),
-      href: href,
+      href: "".concat(menu.href),
       target: "_self",
       onClick: function onClick() {
         return handleTracker(menu);
       }
     }, menu.title, menu.href === '#dynamic' && feedNum > 0 && /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])("".concat(prefix, "__menu--hasNum"), _defineProperty({}, "".concat(prefix, "__menu--hasNum-active"), activeMenuId === menu.id && menu.href === '#dynamic'))
-    }, feedNum > 100 ? '99+' : feedNum), menu.href === NEWMENUS && /*#__PURE__*/_react["default"].createElement("img", {
-      src: _new["default"],
-      className: "".concat(prefix, "__tips-new")
-    })))));
+    }, feedNum > 100 ? '99+' : feedNum))), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
+      condition: menu.title === 'Learning'
+    }, /*#__PURE__*/_react["default"].createElement("span", {
+      className: (0, _classnames["default"])("".concat(prefix, "__menu-show"), _defineProperty({}, "".concat(prefix, "__menu-show--active"), activeMenuId === menu.id)),
+      onClick: function onClick() {
+        handleTracker(menu);
+        handleClickToLearning();
+      }
+    }, menu.title)));
   };
 
   var renderRest = function renderRest(items) {
@@ -171,17 +122,18 @@ var Menu = function Menu(_ref) {
     var popContent = /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(prefix, "__hide-menus")
     }, items.map(function (menu) {
-      var href = menu.href;
-
-      if (menu.title === 'Learning') {
-        href = "".concat(apiPath, "/").concat(userId, "/eLearningHome#/");
-      }
-
       return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
-        condition: menu.id
+        condition: menu.title !== 'Learning'
+      }, /*#__PURE__*/_react["default"].createElement("a", {
+        className: (0, _classnames["default"])("".concat(prefix, "__menu-hide"), _defineProperty({}, "".concat(prefix, "__menu-hide--active"), activeMenuId === menu.id)),
+        href: "".concat(menu.href),
+        key: menu.id,
+        target: "_self"
+      }, menu.title)), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
+        condition: menu.title === 'Learning'
       }, /*#__PURE__*/_react["default"].createElement("a", {
         className: (0, _classnames["default"])("".concat(prefix, "__menu-hide"), _defineProperty({}, "".concat(prefix, "__menu-hide--active"), activeMenuId === menu.id)),
-        href: href,
+        href: "".concat(apiPath, "/").concat(userId, "/eLearningHome#/"),
         key: menu.id,
         target: "_self"
       }, menu.title)));

package/lib/components/nav-top/components/user-message/components/inform/inform-item.js

@@ -84,8 +84,7 @@ function Inform(props) {
     }
 
     if (objType === _constant.EObjType.Interview) {
-      messageType !== 153 && (0, _tools.openPage)( // 153：删除面谈的通知类型
-      "".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#/interview?reactRouterName=detail&hideNavTop=true&recordId=").concat(objId, "&toUserId=").concat(user === null || user === void 0 ? void 0 : user.userId));
+      (0, _tools.openPage)("".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#/interview?reactRouterName=detail&hideNavTop=true&recordId=").concat(objId, "&toUserId=").concat(user === null || user === void 0 ? void 0 : user.userId));
       return;
     }
 

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

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

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

@@ -15,8 +15,6 @@ 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"));
@@ -172,7 +170,5 @@ var NavTop = function NavTop() {
   }, /*#__PURE__*/_react["default"].createElement(_userOwnMenu["default"], null)));
 };
 
-var _default = NavTop; // @ts-ignore
-
-exports["default"] = _default;
-NavTop.useGlobalValue = _useGlobalValue["default"];
+var _default = NavTop;
+exports["default"] = _default;

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

@@ -13,10 +13,6 @@ 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 }; }
@@ -44,22 +40,14 @@ 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.getApprovalOkr)(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 () {
-    if (canCycleEdit) {
-      setIsFocus(true);
-    }
-  }, [canCycleEdit]);
+    canEdit && setIsFocus(true);
+  }, [canEdit]);
   var handleButtonBlur = (0, _react.useCallback)(function () {
     setIsFocus(false);
   }, []);
@@ -69,10 +57,9 @@ 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(!canCycleEdit && "base-info-date-cycle__button--disable"),
+      className: "base-info-date-cycle__button ".concat(isFocus ? "base-info-date-cycle__button--focus" : "", " ").concat(!canEdit && "base-info-date-cycle__button--disable"),
       ref: btnRef,
       onClick: clickCallback
     }, /*#__PURE__*/_react["default"].createElement("span", {
@@ -91,13 +78,10 @@ var DateCycle = function DateCycle(_ref) {
     cycle: cycle,
     setCycle: setCycle,
     okrId: okrId,
-    canEdit: canCycleEdit,
+    canEdit: canEdit,
     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,10 +21,6 @@ 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 }; }
@@ -64,10 +60,6 @@ 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];
@@ -122,7 +114,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.getApprovalOkr)(approvalSetting, "changeOkrName", okrInfo.applyState, okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.OkrAndKrApprovalTypes) ? /*#__PURE__*/_react["default"].createElement(_popConfirm["default"], {
+  }, canEdit ? /*#__PURE__*/_react["default"].createElement(_popConfirm["default"], {
     ref: popConfirmRef,
     showArrow: false,
     style: {

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

@@ -31,8 +31,6 @@ var _progress = _interopRequireDefault(require("../../../progress"));
 
 var _utils = require("../../../progress/utils");
 
-var _helper = require("../../helper");
-
 var _tooltip = _interopRequireDefault(require("../../../tooltip"));
 
 var _auth = require("../../../../utils/auth");
@@ -87,8 +85,6 @@ function Header(props) {
       setGeneralOkrClassify = _useContext.setGeneralOkrClassify,
       showOkrEvalute = _useContext.showOkrEvalute;
 
-  var commonContext = (0, _react.useContext)(_context.CommonContext);
-  var approvalSetting = commonContext.approvalSetting;
   var showOScore = (_window = window) === null || _window === void 0 ? void 0 : (_window$BSGlobal = _window.BSGlobal) === null || _window$BSGlobal === void 0 ? void 0 : (_window$BSGlobal$OkrA = _window$BSGlobal.OkrAdvancedSetting) === null || _window$BSGlobal$OkrA === void 0 ? void 0 : (_window$BSGlobal$OkrA2 = _window$BSGlobal$OkrA.KRSetting) === null || _window$BSGlobal$OkrA2 === void 0 ? void 0 : _window$BSGlobal$OkrA2.OScore;
   var _okrInfo$progressGrow = okrInfo.progressGrow,
       progressGrow = _okrInfo$progressGrow === void 0 ? 0 : _okrInfo$progressGrow,
@@ -160,7 +156,7 @@ function Header(props) {
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(precls, "__avatar")
   }, /*#__PURE__*/_react["default"].createElement(_oAvatar["default"], {
-    editable: editable && (okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.applyState) !== 1,
+    editable: editable,
     okrId: okrInfo.workId
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(precls, "__content")
@@ -168,10 +164,7 @@ function Header(props) {
     editable: editable,
     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
+    okrStatus: okrInfo.status
   }, /*#__PURE__*/_react["default"].createElement(_oClassify["default"], {
     editable: editable,
     okrId: okrInfo.workId,
@@ -194,7 +187,7 @@ function Header(props) {
   })), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(precls, "__action-item")
   }, /*#__PURE__*/_react["default"].createElement(_oCycle["default"], {
-    editable: editable && (0, _helper.getApprovalOkr)(approvalSetting, "changeOkrTime", okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.applyState, okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.OkrAndKrApprovalTypes),
+    editable: editable,
     okrId: okrInfo.workId
   })), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(precls, "__action-item")

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

@@ -13,8 +13,6 @@ var _getLocale = require("../../../../utils/getLocale");
 
 var _tools = require("../../../../utils/tools");
 
-var _helper = require("../../helper");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function OName(props) {
@@ -22,16 +20,11 @@ function OName(props) {
       okrName = props.okrName,
       setIsEdit = props.setIsEdit,
       okrStatus = props.okrStatus,
-      children = props.children,
-      approvalSetting = props.approvalSetting,
-      applyState = props.applyState,
-      OkrAndKrApprovalTypes = props.OkrAndKrApprovalTypes;
+      children = props.children;
 
   var handleEditClick = function handleEditClick() {
-    if ((0, _helper.getApprovalOkr)(approvalSetting, "changeOkrName", applyState, OkrAndKrApprovalTypes)) {
-      if (editable) {
-        setIsEdit(true);
-      }
+    if (editable) {
+      setIsEdit(true);
     }
   };
 

package/lib/components/okr-detail/components/o-classify.js

@@ -84,11 +84,7 @@ function OClassify(props) {
 
             case 5:
               res = _context.sent;
-
-              if (onOkrClassifyChange) {
-                onOkrClassifyChange(select);
-              }
-
+              onOkrClassifyChange(select);
               setVisible(false);
 
               _toast["default"].Success("修改成功", {

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

@@ -47,8 +47,6 @@ var _EditKrWightModal = _interopRequireDefault(require("../../../../../edit-kr-w
 
 var _okrProgressModal = _interopRequireDefault(require("../../../../../okr-progress-modal"));
 
-var _helper = require("../../../../helper");
-
 var _getLocale = require("../../../../../../utils/getLocale");
 
 require("./index.css");
@@ -96,13 +94,11 @@ function _default(props) {
   var data = props.data,
       index = props.index,
       title = props.title,
-      key = props.key,
-      canEditOkr = props.canEditOkr;
+      key = props.key;
 
   var _useContext = (0, _react.useContext)(_context2.CommonContext),
       refreshAll = _useContext.refreshAll,
-      okrInfo = _useContext.okrInfo,
-      approvalSetting = _useContext.approvalSetting;
+      okrInfo = _useContext.okrInfo;
 
   var _useState = (0, _react.useState)(data.confidenceIndex),
       _useState2 = _slicedToArray(_useState, 2),
@@ -159,7 +155,7 @@ function _default(props) {
     var hasAuth = new _auth.KRAuth({
       user: data.user,
       createUserId: data.createUserId
-    }).hasAuth() || canEditOkr;
+    }).hasAuth();
     var livetime = okrInfo.status != 2;
     return hasAuth && livetime;
   }),
@@ -223,13 +219,17 @@ function _default(props) {
       updateProgressWay: updateProgressWay
     }).then(function (res) {
       if (res.Code == 1) {
-        _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"));
+        _toast["default"].Success("修改成功", {
+          top: 60
+        });
 
         refreshAll();
         updateKrs();
         setKrModalVsible(false);
       } else {
-        _toast["default"].Error(res.Message);
+        _toast["default"].Error(res.Message, {
+          top: 60
+        });
       }
     });
   };
@@ -251,7 +251,7 @@ function _default(props) {
               setDeleteModalVisible(false);
 
               if (!Message) {
-                _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"));
+                _toast["default"].Success((0, _getLocale.getLocale)("Pro_detail_Deletsuccess"));
 
                 setTimeout(function () {
                   refreshAll();
@@ -280,7 +280,7 @@ function _default(props) {
       workId: data.workId,
       workMileStoneId: data.mileStoneId
     }).then(function () {
-      _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"));
+      _toast["default"].Success("修改成功");
     });
   };
 
@@ -315,7 +315,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.getApprovalKr)(approvalSetting, "changeOkrName", okrInfo.applyState, okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.OkrAndKrApprovalTypes, data === null || data === void 0 ? void 0 : data.KrApprovalTypes),
+    editable: krCanEdit,
     defaultValue: krName,
     emptyMessage: "KR\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A",
     onKeyDown: onKrNameChangeHandler,
@@ -329,10 +329,10 @@ function _default(props) {
     name: user.name,
     id: user.userId,
     width: 68,
-    editable: krCanEdit && okrInfo.applyState !== _helper.EApproveStatus.UnderApproval,
+    editable: krCanEdit,
     onEditUser: onEditUserHandler,
     nameTips: function nameTips(name) {
-      return /*#__PURE__*/_react["default"].createElement("span", null, (0, _getLocale.getLocale)('OKR_MyO_Text_Owner'), name);
+      return /*#__PURE__*/_react["default"].createElement("span", null, "\u8D1F\u8D23\u4EBA\uFF1A", name);
     }
   })), showKrWeight && /*#__PURE__*/_react["default"].createElement(OkrRowColumn, {
     width: 60,
@@ -348,7 +348,7 @@ function _default(props) {
     marginLeft: 16
   }, /*#__PURE__*/_react["default"].createElement(_rangePickerPop["default"], {
     data: data,
-    editable: krCanEdit && (0, _helper.getApprovalKr)(approvalSetting, "changeOkrTime", okrInfo.applyState, okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.OkrAndKrApprovalTypes, data === null || data === void 0 ? void 0 : data.KrApprovalTypes)
+    editable: krCanEdit
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__kr-node-actions"))
   }, showHeart && /*#__PURE__*/_react["default"].createElement("div", {
@@ -377,7 +377,7 @@ function _default(props) {
     evaluateValue: evaluateValue,
     setEvaluateValue: onEvaluateChangeHanler,
     isEvaluate: isEvaluate
-  })), krCanEdit && okrInfo.applyState !== _helper.EApproveStatus.UnderApproval && /*#__PURE__*/_react["default"].createElement("div", {
+  })), krCanEdit && /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__kr-node-delete")),
     onClick: function onClick() {
       return setDeleteModalVisible(true);

package/lib/components/okr-detail/components/okr-tree/tree-node/kr-node/range-picker-pop.js

@@ -15,10 +15,6 @@ var _requestApis = require("../../../../request-apis");
 
 var _rangePickerPop = _interopRequireDefault(require("../../../../../range-picker-pop"));
 
-var _toast = _interopRequireDefault(require("../../../../../toast"));
-
-var _getLocale = require("../../../../../../utils/getLocale");
-
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -72,12 +68,6 @@ function _default(props) {
       kr: data,
       startDate: startDate,
       endDate: endDate
-    }).then(function (resp) {
-      if (resp.Code === 1) {
-        _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'));
-      } else {
-        _toast["default"].Error(resp.Message);
-      }
     });
     rangePicker.current.setRange({
       startDate: startDate,