@titaui/pc 1.11.21-beta.2 → 1.11.21-beta.3

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"));
@@ -27,12 +25,14 @@ var _version = _interopRequireDefault(require("./components/version"));
 
 var _utils = require("./utils");
 
-require("./index.css");
-
 var _request = require("../../utils/request");
 
 var _toast = _interopRequireDefault(require("../toast"));
 
+var _useGlobalValue = _interopRequireDefault(require("./useGlobalValue"));
+
+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); }
@@ -172,7 +172,6 @@ var NavTop = function NavTop() {
   }, /*#__PURE__*/_react["default"].createElement(_userOwnMenu["default"], null)));
 };
 
-var _default = NavTop; // @ts-ignore
-
+var _default = NavTop;
 exports["default"] = _default;
 NavTop.useGlobalValue = _useGlobalValue["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,25 +40,17 @@ 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.applyState);
-
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
       isFocus = _useState2[0],
       setIsFocus = _useState2[1];
 
   var handleButtonFocus = (0, _react.useCallback)(function () {
-    canCycleEdit && setIsFocus(true);
-  }, [canCycleEdit]);
+    canEdit && setIsFocus(true);
+  }, [canEdit]);
   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,
@@ -71,7 +59,7 @@ var DateCycle = function DateCycle(_ref) {
     return /*#__PURE__*/_react["default"].createElement("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", {
@@ -90,7 +78,7 @@ var DateCycle = function DateCycle(_ref) {
     cycle: cycle,
     setCycle: setCycle,
     okrId: okrId,
-    canEdit: canCycleEdit,
+    canEdit: canEdit,
     getCycleRange: true
   }));
 };

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.getApprovalIsShow)(approvalSetting, "changeOkrName", okrInfo.applyState) ? /*#__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,9 +164,7 @@ function Header(props) {
     editable: editable,
     okrName: okrName,
     setIsEdit: setIsEdit,
-    okrStatus: okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.status,
-    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,
@@ -193,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.getApprovalIsShow)(approvalSetting, "changeOkrTime", okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.applyState),
+    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,15 +20,11 @@ function OName(props) {
       okrName = props.okrName,
       setIsEdit = props.setIsEdit,
       okrStatus = props.okrStatus,
-      children = props.children,
-      approvalSetting = props.approvalSetting,
-      applyState = props.applyState;
+      children = props.children;
 
   var handleEditClick = function handleEditClick() {
-    if ((0, _helper.getApprovalIsShow)(approvalSetting, "changeOkrName", applyState)) {
-      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");
@@ -100,8 +98,7 @@ function _default(props) {
 
   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),
@@ -318,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.getApprovalIsShow)(approvalSetting, "changeOkrName", okrInfo.applyState),
+    editable: krCanEdit,
     defaultValue: krName,
     emptyMessage: "KR\u540D\u79F0\u4E0D\u80FD\u4E3A\u7A7A",
     onKeyDown: onKrNameChangeHandler,
@@ -332,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,
@@ -351,7 +348,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
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__kr-node-actions"))
   }, showHeart && /*#__PURE__*/_react["default"].createElement("div", {
@@ -380,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);