@titaui/pc 1.11.32 → 1.11.35-beta.1

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

@@ -0,0 +1,108 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getApprovalOpenItem = exports.getApprovalOkr = exports.getApprovalKr = exports.getApprovalIsShow = exports.getApproval = exports.EApproveStatus = exports.EApprovalTypes = exports.EApprovalKrTypes = void 0;
+var EApprovalTypes;
+exports.EApprovalTypes = EApprovalTypes;
+
+(function (EApprovalTypes) {
+  EApprovalTypes[EApprovalTypes["CreateOkr"] = 53] = "CreateOkr";
+  EApprovalTypes[EApprovalTypes["ChangeOkrName"] = 54] = "ChangeOkrName";
+  EApprovalTypes[EApprovalTypes["ChangeOkrTime"] = 56] = "ChangeOkrTime";
+  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;
+
+(function (EApproveStatus) {
+  EApproveStatus[EApproveStatus["None"] = 0] = "None";
+  EApproveStatus[EApproveStatus["WaitCommit"] = 6] = "WaitCommit";
+  EApproveStatus[EApproveStatus["Rejected"] = 3] = "Rejected";
+  EApproveStatus[EApproveStatus["UnderApproval"] = 1] = "UnderApproval";
+  EApproveStatus[EApproveStatus["ApproveAgree"] = 2] = "ApproveAgree";
+  EApproveStatus[EApproveStatus["WithDraw"] = 4] = "WithDraw";
+  EApproveStatus[EApproveStatus["Done"] = 5] = "Done";
+})(EApproveStatus || (exports.EApproveStatus = EApproveStatus = {}));
+
+var getApprovalOpenItem = function getApprovalOpenItem(setting) {
+  var result = {
+    isOpen: setting.isOpened === 1,
+    changeOkrName: false,
+    changeOkrTime: false,
+    deleteOkr: false,
+    createOkr: false
+  };
+
+  if (setting !== null && setting !== void 0 && setting.okrApprovalSettings) {
+    setting.okrApprovalSettings.forEach(function (item) {
+      if (item.approvalType === EApprovalTypes.ChangeOkrName) {
+        result.changeOkrName = true;
+      } else if (item.approvalType === EApprovalTypes.ChangeOkrTime) {
+        result.changeOkrTime = true;
+      } else if (item.approvalType === EApprovalTypes.CreateOkr) {
+        result.createOkr = true;
+      } else if (item.approvalType === EApprovalTypes.DeleteOkr) {
+        result.deleteOkr = true;
+      }
+    });
+  }
+
+  return result;
+};
+
+exports.getApprovalOpenItem = getApprovalOpenItem;
+
+var getApprovalIsShow = function getApprovalIsShow(approvalSetting, type, applyState) {
+  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;
+
+var getApproval = function getApproval(approvalSetting, type, applyState, isCreate) {
+  return !(!(approvalSetting !== null && approvalSetting !== void 0 && approvalSetting[type]) && applyState === EApproveStatus.UnderApproval && isCreate || approvalSetting !== null && approvalSetting !== void 0 && approvalSetting[type] && applyState === EApproveStatus.UnderApproval);
+};
+
+exports.getApproval = getApproval;
+
+var getApprovalOkr = function getApprovalOkr(approvalSetting, type, applyState) {
+  var okrType = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
+  var okrCreate = okrType === null || okrType === void 0 ? void 0 : okrType.includes(EApprovalTypes.CreateOkr);
+  return getApproval(approvalSetting, type, applyState, okrCreate);
+};
+
+exports.getApprovalOkr = getApprovalOkr;
+
+var getApprovalKr = function getApprovalKr(approvalSetting, type, applyState) {
+  var okrType = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
+  var krType = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : [];
+  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 getApproval(approvalSetting, type, applyState, isCreate);
+};
+
+exports.getApprovalKr = getApprovalKr;

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

@@ -17,8 +17,6 @@ var _header = _interopRequireDefault(require("./components/header"));
 
 var _tabs = _interopRequireWildcard(require("../tabs"));
 
-var _request = require("../../utils/request");
-
 var _tabPanelContent = _interopRequireDefault(require("./components/tab-panel-content"));
 
 var _baseInfo = _interopRequireDefault(require("./base-info"));
@@ -27,6 +25,8 @@ var _schedule = _interopRequireDefault(require("./schedule"));
 
 var _requestApis = require("./request-apis");
 
+var _helper = require("./helper");
+
 var _okrReview = _interopRequireDefault(require("../okr-review"));
 
 var _reportList = _interopRequireDefault(require("../eReport/eReportLists/reportList"));
@@ -173,7 +173,14 @@ function OkrDetail(props) {
   var _useState23 = (0, _react.useState)(),
       _useState24 = _slicedToArray(_useState23, 2),
       generalRoleType = _useState24[0],
-      setGeneralRoleType = _useState24[1]; // 计算元素的ref，用于实现 tabs 吸顶，点赞吸底
+      setGeneralRoleType = _useState24[1];
+
+  var _useState25 = (0, _react.useState)({
+    isOpen: false
+  }),
+      _useState26 = _slicedToArray(_useState25, 2),
+      approvalSetting = _useState26[0],
+      setApprovalSetting = _useState26[1]; // 计算元素的ref，用于实现 tabs 吸顶，点赞吸底
 
 
   var tabRef = (0, _react.useRef)();
@@ -203,9 +210,18 @@ function OkrDetail(props) {
     getData();
   };
 
+  var getApprovalShow = function getApprovalShow() {
+    (0, _requestApis.getOkrApprovalSettingInfo)().then(function (resp) {
+      if (resp.Code === 1) {
+        setApprovalSetting((0, _helper.getApprovalOpenItem)(resp.Data));
+      }
+    });
+  };
+
   (0, _react.useEffect)(function () {
     setLoading(true);
     getData();
+    getApprovalShow();
   }, []);
   (0, _react.useEffect)(function () {
     if (!okrInfo || !okrInfo.workId) return;
@@ -276,7 +292,8 @@ function OkrDetail(props) {
       changeTabActive: changeTabActive,
       refreshAll: refreshAll,
       setOkrInfo: setOkrInfo,
-      refreshKrs: refreshKrs
+      refreshKrs: refreshKrs,
+      approvalSetting: approvalSetting
     })
   }, /*#__PURE__*/_react["default"].createElement(_context.GeneralDataContext.Provider, {
     value: {

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

@@ -43,6 +43,8 @@ var _auth = require("../../../utils/auth");
 
 var _getLocale = require("../../../utils/getLocale");
 
+var _helper = require("../helper");
+
 require("./index.css");
 
 var _excluded = ["mileStoneId"];
@@ -153,7 +155,8 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       setShowOkrEvalute = _useContext.setShowOkrEvalute;
 
   var _useContext2 = (0, _react.useContext)(_context2.CommonContext),
-      refreshAll = _useContext2.refreshAll;
+      refreshAll = _useContext2.refreshAll,
+      approvalSetting = _useContext2.approvalSetting;
 
   var parentId = generalParent.parentId,
       parentOkr = generalParent.parentOkr,
@@ -442,9 +445,11 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       padding: "0 32px 0 18px"
     }, /*#__PURE__*/_react["default"].createElement(_okrTree["default"], {
       data: krs,
-      draggable: canEditOkr,
+      approvalSetting: approvalSetting,
+      okrInfo: okrInfo,
+      draggable: canEditOkr && (okrInfo === null || okrInfo === void 0 ? void 0 : okrInfo.applyState) === _helper.EApproveStatus.UnderApproval,
       onDrop: onOkrItemDropHandler
-    }))), (canEditOkr || isInnerUser) && /*#__PURE__*/_react["default"].createElement("div", {
+    }))), (canEditOkr || isInnerUser) && (0, _helper.getApprovalOkr)(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/components/okr-detail/request-apis.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.workDelete = exports.updateVisibility = exports.updateTaskStatus = exports.updateTaskPrincipal = exports.updateTaskDate = exports.updateProgressDesc = exports.updateProgress = exports.updateParentId = exports.updateOkrVisibility = exports.updateOkrPrincipal = exports.updateOkrName = exports.updateOScore = exports.updateOCommitType = exports.updateOClassify = exports.updateKrProgressAndStatus = exports.updateKrPrincipal = exports.updateKrName = exports.updateKrDate = exports.updateConfidenceIndex = exports.updateClassify = exports.updateChildOkrWeight = exports.transferPrincipal = exports.start = exports.setTaskPriority = exports.saveODesc = exports.remindAction = exports.krChangeOrder = exports.getRelWorks = exports.getRelProgress = exports.getProgress = exports.getPraiseComments = exports.getOrg = exports.getOkrUsers = exports.getOkrDetail = exports.getKrsByCondition = exports.getKrs = exports.getFeedById = exports.deleteUser = exports.deleteProgressDesc = exports.deleteKr = exports.createNewKr = exports.close = exports.cancelRel = exports.cancelPraise = exports.cancelParentOkr = exports.addUserRelation = exports.addUser = exports.addPraise = exports.addComment = void 0;
+exports.workDelete = exports.updateVisibility = exports.updateTaskStatus = exports.updateTaskPrincipal = exports.updateTaskDate = exports.updateProgressDesc = exports.updateProgress = exports.updateParentId = exports.updateOkrVisibility = exports.updateOkrPrincipal = exports.updateOkrName = exports.updateOScore = exports.updateOCommitType = exports.updateOClassify = exports.updateKrProgressAndStatus = exports.updateKrPrincipal = exports.updateKrName = exports.updateKrDate = exports.updateConfidenceIndex = exports.updateClassify = exports.updateChildOkrWeight = exports.transferPrincipal = exports.start = exports.setTaskPriority = exports.saveODesc = exports.remindAction = exports.krChangeOrder = exports.getRelWorks = exports.getRelProgress = exports.getProgress = exports.getPraiseComments = exports.getOrg = exports.getOkrUsers = exports.getOkrDetail = exports.getOkrApprovalSettingInfo = exports.getKrsByCondition = exports.getKrs = exports.getFeedById = exports.deleteUser = exports.deleteProgressDesc = exports.deleteKr = exports.createNewKr = exports.close = exports.cancelRel = exports.cancelPraise = exports.cancelParentOkr = exports.addUserRelation = exports.addUser = exports.addPraise = exports.addComment = void 0;
 
 var _qs = _interopRequireDefault(require("qs"));
 
@@ -110,6 +110,12 @@ var getOkrDetail = function getOkrDetail(_ref5) {
 
 exports.getOkrDetail = getOkrDetail;
 
+var getOkrApprovalSettingInfo = function getOkrApprovalSettingInfo() {
+  return (0, _request.rget)("v1")("WorkManageSetting/GetOkrApproval");
+};
+
+exports.getOkrApprovalSettingInfo = getOkrApprovalSettingInfo;
+
 var updateClassify = function updateClassify(_ref6) {
   var okrId = _ref6.okrId,
       okrClassify = _ref6.okrClassify;
@@ -407,7 +413,7 @@ var deleteUser = function deleteUser(delUserId, okrId, relation) {
 exports.deleteUser = deleteUser;
 
 var workDelete = function workDelete(data) {
-  return (0, _request.rdelete)("v2")("work/deleteV2?workId=".concat(data.workId), {
+  return (0, _request.rdelete)("v1")("okr/deleteV2?workId=".concat(data.workId), {
     data: data
   });
 };
@@ -415,7 +421,7 @@ var workDelete = function workDelete(data) {
 exports.workDelete = workDelete;
 
 var start = function start(okrId) {
-  return (0, _request.rpost)("v1")("Work/Start", {
+  return (0, _request.rpost)("v1")("okr/Start", {
     work_id: okrId
   }, {
     headers: {
@@ -428,7 +434,7 @@ var start = function start(okrId) {
 exports.start = start;
 
 var close = function close(okrId) {
-  return (0, _request.rpost)("v1")("Work/Close", {
+  return (0, _request.rpost)("v1")("okr/Close", {
     work_id: okrId
   }, {
     headers: {

package/lib/components/okr-flow/child-node/index.css

@@ -49,7 +49,7 @@
   width: 340px;
   height: 102px;
   background: url(../images/private-light.png) no-repeat;
-  background-size: contain;
+  background-size: 340px 102px;
 }
 
 .titaui-okr-flow--node__search {

package/lib/components/okr-flow/export-modal/index.js

@@ -37,6 +37,8 @@ var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 
 require("rc-color-picker/assets/index.css");
 
+var Sentry = _interopRequireWildcard(require("@sentry/browser"));
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -170,15 +172,47 @@ var ExportMapModal = function ExportMapModal(props) {
                 var userId = (_window = window) === null || _window === void 0 ? void 0 : (_window$BSGlobal = _window.BSGlobal) === null || _window$BSGlobal === void 0 ? void 0 : (_window$BSGlobal$logi = _window$BSGlobal.loginUserInfo) === null || _window$BSGlobal$logi === void 0 ? void 0 : _window$BSGlobal$logi.Id;
                 var telentId = (_window2 = window) === null || _window2 === void 0 ? void 0 : (_window2$BSGlobal = _window2.BSGlobal) === null || _window2$BSGlobal === void 0 ? void 0 : (_window2$BSGlobal$ten = _window2$BSGlobal.tenantInfo) === null || _window2$BSGlobal$ten === void 0 ? void 0 : _window2$BSGlobal$ten.Id;
                 var imgUrl = result.toDataURL('image/png'); // 得到图片的base64编码数据
-                // @ts-ignore
 
                 // 得到图片的base64编码数据
+                _toast["default"].Warning('导出中，请勿关闭弹窗', {
+                  canClose: true
+                });
+
+                var equalIndex = imgUrl.indexOf('='); // 获取=号下标
+
+                // 获取=号下标
+                var size = 0;
+
+                if (equalIndex > 0) {
+                  var str = imgUrl.substring(0, equalIndex); // 去除=号
+
+                  // 去除=号
+                  var strLength = str.length;
+                  var fileLength = strLength - strLength / 8 * 2; // 真实的图片byte大小
+
+                  // 真实的图片byte大小
+                  size = Math.floor(fileLength); // 向下取整
+                } else {
+                  var _strLength = imgUrl.length;
+
+                  var _fileLength = _strLength - _strLength / 8 * 2;
+
+                  size = Math.floor(_fileLength); // 向下取整
+                }
+
+                size = size / 1024 / 1024; // @ts-ignore
+
                 // @ts-ignore
                 window.titaTracker && window.titaTracker("action").record({
-                  actionName: userId + '租户：' + telentId + '我得到了图片' + imgUrl.slice(1, 200),
+                  actionName: userId + '租户：' + telentId + '我得到了图片大小为：' + size + '，路径为' + imgUrl.slice(1, 200),
                   actionGroup: 'okr地图图片',
                   productName: 'okr地图导出'
                 });
+                Sentry.withScope(function (scope) {
+                  scope.setTag("error-level", "P0");
+                  scope.setTag("error-type", "地图导出-图片生成");
+                  scope.setExtra("userMessage", userId + '租户：' + telentId + '我得到了图片大小为：' + size + '，路径为' + imgUrl);
+                });
                 (0, _requestApis.getBase64DownloadUrl)(imgUrl.split(',')[1]).then(function (url) {
                   var image = new Image(); // @ts-ignore
 
@@ -188,6 +222,16 @@ var ExportMapModal = function ExportMapModal(props) {
                     actionGroup: 'okr地图接口',
                     productName: 'okr地图导出'
                   });
+                  Sentry.withScope(function (scope) {
+                    scope.setTag("error-level", "P0");
+                    scope.setTag("error-type", "地图导出-图片地址");
+                    scope.setExtra("userMessage", userId + '租户：' + telentId + '我得到了图片大小为：' + size + '，路径为' + imgUrl);
+                  });
+
+                  _toast["default"].Warning('图片上传成功，准备本地下载', {
+                    canClose: true
+                  });
+
                   image.setAttribute('crossOrigin', 'anonymous');
 
                   image.onload = function () {
@@ -287,6 +331,7 @@ var ExportMapModal = function ExportMapModal(props) {
     onOk: confirmHandler,
     onCancel: onCloseHandler,
     ref: modalRef,
+    confirmLoading: isExport,
     className: "export-map-modal titaui-dialog",
     forceRender: true
   }, /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {

package/lib/components/okr-period-selector/index.js

@@ -17,6 +17,8 @@ var _selectCycle = _interopRequireDefault(require("./select-cycle"));
 
 var _requestApis = require("./request-apis");
 
+var _getLocale = require("../../utils/getLocale");
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -68,12 +70,14 @@ function _default(props) {
   }, []);
 
   var handleChangeCyecle = function handleChangeCyecle(data) {
-    (0, _requestApis.updateOCyecle)(okrId, data).then(function () {
-      _toast["default"].Success("修改成功", {
-        canClose: false
-      });
+    (0, _requestApis.updateOCyecle)(okrId, data).then(function (resp) {
+      if (resp.Code === 1) {
+        _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'));
 
-      setCycle(data);
+        setCycle(data);
+      } else {
+        _toast["default"].Error(resp.Message);
+      }
     });
   };
 

package/lib/components/okr-period-selector/select-cycle.js

@@ -49,7 +49,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 function _formatCycleData(periodParams, getCycleRange) {
-  if (!periodParams) return "";
+  if (!periodParams) return '';
   var startDate = periodParams.startDate;
   var endDate = periodParams.endDate;
 
@@ -58,7 +58,7 @@ function _formatCycleData(periodParams, getCycleRange) {
     endDate = periodParams.endDate.slice(5);
   }
 
-  return "".concat(_periodSelector["default"].formatPeriod(periodParams)).concat(getCycleRange ? ",".concat(startDate, "~").concat(endDate) : "");
+  return "".concat(_periodSelector["default"].formatPeriod(periodParams)).concat(getCycleRange ? ",".concat(startDate, "~").concat(endDate) : '');
 }
 
 function CreateCycle(_ref) {
@@ -94,21 +94,21 @@ function CreateCycle(_ref) {
       setCycleSetting = _useState4[1];
 
   (0, _react.useEffect)(function () {
-    var settings = localStorage.getItem("OKR_CYCLE_SETTING");
+    var settings = localStorage.getItem('OKR_CYCLE_SETTING');
 
     if (settings) {
       setCycleSetting(JSON.parse(settings));
       return;
     }
 
-    var url = (0, _helper.getApiUrl)("okr/cycleSetting");
-    (0, _helper.taker)(url, "GET").then(function (res) {
+    var url = (0, _helper.getApiUrl)('okr/cycleSetting');
+    (0, _helper.taker)(url, 'GET').then(function (res) {
       if (res.Code == 1) {
         setCycleSetting(res.Data);
       }
     });
   }, []);
-  var cycleWrapperRef = (0, _react.useRef)(document.createElement("div"));
+  var cycleWrapperRef = (0, _react.useRef)(document.createElement('div'));
 
   var onPeriodSelectorChangeHandler = function onPeriodSelectorChangeHandler(c) {
     setSelfCycle(_objectSpread(_objectSpread({}, selfCycle), c));
@@ -148,13 +148,13 @@ function CreateCycle(_ref) {
         },
         ref: cycleWrapperRef,
         style: {
-          backgroundColor: "white",
-          boxShadow: "0px 4px 12px 0px rgb(127 145 180 / 20%)",
+          backgroundColor: 'white',
+          boxShadow: '0px 4px 12px 0px rgb(127 145 180 / 20%)',
           borderRadius: 4
         }
       }, /*#__PURE__*/_react["default"].createElement(_periodSelector["default"], {
         style: {
-          width: "100%"
+          width: '100%'
         },
         selected: selfCycle,
         showFullCycle: false,
@@ -176,9 +176,9 @@ function CreateCycle(_ref) {
       }))), /*#__PURE__*/_react["default"].createElement("div", {
         className: "okr-detail-date-cycle__date-line",
         style: {
-          borderBottom: "1px solid #F0F2F5"
+          borderBottom: '1px solid #F0F2F5'
         }
-      }, (0, _getLocale.getLocale)("Mod_StartDate"), "\uFF1A", /*#__PURE__*/_react["default"].createElement(_rangePickerPop["default"], {
+      }, (0, _getLocale.getLocale)('Mod_StartDate'), "\uFF1A", /*#__PURE__*/_react["default"].createElement(_rangePickerPop["default"], {
         format: "YYYY/MM/DD",
         controlled: true,
         onConfirm: onStartDateConfirmHandler,
@@ -193,7 +193,7 @@ function CreateCycle(_ref) {
         className: "tu-icon-arrow-down okr-detail-date-cycle__select-time-down-icon"
       })))), /*#__PURE__*/_react["default"].createElement("div", {
         className: "okr-detail-date-cycle__date-line"
-      }, (0, _getLocale.getLocale)("Mod_EndDate"), "\uFF1A", /*#__PURE__*/_react["default"].createElement(_rangePickerPop["default"], {
+      }, (0, _getLocale.getLocale)('Mod_EndDate'), "\uFF1A", /*#__PURE__*/_react["default"].createElement(_rangePickerPop["default"], {
         format: "YYYY/MM/DD",
         controlled: true,
         onConfirm: onEndDateCOnfirmHandler,
@@ -208,8 +208,8 @@ function CreateCycle(_ref) {
         className: "tu-icon-arrow-down okr-detail-date-cycle__select-time-down-icon"
       })))), /*#__PURE__*/_react["default"].createElement("div", {
         style: {
-          display: "flex",
-          justifyContent: "flex-end"
+          display: 'flex',
+          justifyContent: 'flex-end'
         }
       }, /*#__PURE__*/_react["default"].createElement(_titaUi.Button, {
         size: "s",
@@ -217,15 +217,15 @@ function CreateCycle(_ref) {
           marginRight: 12
         },
         onClick: onCancelClickHandler
-      }, (0, _getLocale.getLocale)("Mod_Cancel")), /*#__PURE__*/_react["default"].createElement(_titaUi.Button, {
+      }, (0, _getLocale.getLocale)('Mod_Cancel')), /*#__PURE__*/_react["default"].createElement(_titaUi.Button, {
         size: "s",
         type: "primary",
         onClick: onSureClickHandler
-      }, (0, _getLocale.getLocale)("OKR_MyO_Butt_Determine"))));
+      }, (0, _getLocale.getLocale)('OKR_MyO_Butt_Determine'))));
     } else {
-      return /*#__PURE__*/_react["default"].createElement(_periodSelector["default"], {
+      return canEdit ? /*#__PURE__*/_react["default"].createElement(_periodSelector["default"], {
         style: {
-          width: "100%"
+          width: '100%'
         },
         selected: cycle,
         showFullCycle: false,
@@ -245,7 +245,11 @@ function CreateCycle(_ref) {
         btnRef: btnRef,
         clickCallback: function clickCallback() {},
         text: _formatCycleData(cycle, getCycleRange)
-      }));
+      })) : renderInnerContent({
+        btnRef: btnRef,
+        clickCallback: function clickCallback() {},
+        text: _formatCycleData(cycle, getCycleRange)
+      });
     }
   }
 

package/lib/components/operation-records/index.js

@@ -80,7 +80,7 @@ var OperationRecord = /*#__PURE__*/function (_PureComponent) {
 
           _this.setState({
             operationTrackList: newOperationTrackList,
-            operationTrackTotal: _mockData.OperationData.length
+            operationTrackTotal: (_mockData.OperationData === null || _mockData.OperationData === void 0 ? void 0 : _mockData.OperationData.length) || 0
           });
         }
       });

package/lib/components/operation-records/style.js

@@ -17,7 +17,7 @@ var OperationRecordWrapper = _styledComponents["default"].div(_templateObject ||
 
 exports.OperationRecordWrapper = OperationRecordWrapper;
 
-var OperationRecordTotal = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  margin-bottom: 8px;\n  font-size: 12px;\n  color: #8f9ca6;\n  display: inline-block;\n  cursor: pointer;\n\n  &:hover {\n    color: #2879ff;\n  }\n\n  p {\n    line-height: 17px;\n\n    &::before {\n      float: right;\n      margin-left: 4px;\n    }\n  }\n"])));
+var OperationRecordTotal = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  margin-bottom: 16px;\n  font-size: 12px;\n  color: #8f9ca6;\n  display: inline-block;\n  cursor: pointer;\n\n  &:hover {\n    color: #2879ff;\n  }\n\n  p {\n    line-height: 17px;\n\n    &::before {\n      float: right;\n      margin-left: 4px;\n    }\n  }\n"])));
 
 exports.OperationRecordTotal = OperationRecordTotal;
 

package/lib/components/publish-dynamic-modal/publish-dynamic-modal.js

@@ -41,12 +41,9 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-function _objectDestructuringEmpty(obj) { if (obj == null) throw new TypeError("Cannot destructure undefined"); }
-
 var prefix = "publish-dynamic-modal";
-
-var PublishDynamicModal = function PublishDynamicModal(_ref) {
-  _objectDestructuringEmpty(_ref);
+var PublishDynamicModal = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
+  var onSubmitSuccess = _ref.onSubmitSuccess;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -82,10 +79,10 @@ var PublishDynamicModal = function PublishDynamicModal(_ref) {
             localStorage.removeItem("mblogLocalStroage_".concat((0, _bsGlobal.getUserInfo)().Id, "_commentsTypeKey_").concat(isShare ? "share" : "announcement"));
             setVisible(false);
             setSubmitStatus(1);
-            setTimeout(function () {
-              // @ts-ignore 跳到我的发布页签
-              window.setTabsToPublish && window.setTabsToPublish();
-            }, 2000);
+
+            if (onSubmitSuccess) {
+              onSubmitSuccess();
+            }
           } else {
             _toast["default"].Error(resp.Message, {
               canClose: false
@@ -146,6 +143,13 @@ var PublishDynamicModal = function PublishDynamicModal(_ref) {
     setVisible(true);
   };
 
+  (0, _react.useImperativeHandle)(ref, function () {
+    return {
+      hide: hidePublishDynamicModal,
+      showShareModal: showPublishShareDynamicModal,
+      showAnnouncementModal: showPublishAnnouncementDynamicModal
+    };
+  });
   (0, _react.useEffect)(function () {
     // @ts-ignore
     window.hidePublishDynamicModal = hidePublishDynamicModal; // @ts-ignore
@@ -188,7 +192,9 @@ var PublishDynamicModal = function PublishDynamicModal(_ref) {
     ,
     onMblogSubmit: onMblogSubmit
   })));
+});
+PublishDynamicModal.defaultProps = {
+  onSubmitSuccess: function onSubmitSuccess() {}
 };
-
 var _default = PublishDynamicModal;
 exports["default"] = _default;

package/lib/components/task-relation-modal/request-api.js

@@ -15,7 +15,8 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 var okrSearch = function okrSearch(params) {
   return (0, _request.rpost)("v1")("okr/search", _objectSpread(_objectSpread({}, params), {}, {
-    orderType: 1
+    orderType: 1,
+    includeCreateFailApprovalOkr: false
   })).then(function (res) {
     return res.Data;
   });

package/lib/components/task-tree/index.js

@@ -11,6 +11,12 @@ var _helper = _interopRequireDefault(require("./helper"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
+// import React from "react";
+// import mockData from "./mock";
 _taskTree["default"].formatTasksToTreeData = _helper["default"];
-var _default = _taskTree["default"];
+var _default = _taskTree["default"]; // export default () => {
+//   const dataSource = formatTasksToTreeData(mockData);
+//   return <TaskTree dataSource={dataSource} />;
+// };
+
 exports["default"] = _default;