@titaui/pc 1.11.21-beta.13 → 1.11.21-beta.30

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

@@ -351,7 +351,9 @@ function CreateOkrModal(_ref, ref) {
       setData: function setData(data) {
         setOkrName(data.okrName);
         setUser(data.user);
-      }
+      },
+      show: showCreateOkrModal,
+      hide: hideCreateOkrModal
     };
   });
   var handleOnSuccess = (0, _react.useCallback)(function () {

package/lib/components/drawer/index.css

@@ -48,17 +48,6 @@
   background: linear-gradient(180deg, rgba(191, 199, 213, 0) 0%, #BFC7D5 50%, rgba(240, 242, 245, 0) 100%);
 }
 
-.titaui-drawer-header-status {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  border-radius: 16px;
-  width: 68px;
-  height: 28px;
-  margin-right: 18px;
-  font-size: 12px;
-}
-
 .titaui-drawer-header-action {
   font-size: 18px;
   color: #a4acb9;

package/lib/components/drawer/index.js

@@ -141,8 +141,8 @@ function DrawerHeader(_ref) {
       content = _ref.content,
       style = _ref.style,
       onClose = _ref.onClose,
-      status = _ref.status,
       actionComponent = _ref.actionComponent,
+      onlyShowContent = _ref.onlyShowContent,
       approvalSetting = _ref.approvalSetting,
       detailInfo = _ref.detailInfo;
   var drawer = (0, _react.useContext)(DrawerContext);
@@ -173,13 +173,7 @@ function DrawerHeader(_ref) {
     style: {
       flex: 1
     }
-  }), status && status.color && /*#__PURE__*/_react["default"].createElement("div", {
-    className: "titaui-drawer-header-status",
-    style: {
-      color: status.color.color,
-      backgroundColor: status.color.bgColor
-    }
-  }, status.title), /*#__PURE__*/_react["default"].createElement("div", null, actionComponent), displayActions.map(function (action) {
+  }), /*#__PURE__*/_react["default"].createElement("div", null, onlyShowContent), /*#__PURE__*/_react["default"].createElement("div", null, actionComponent), displayActions.map(function (action) {
     return /*#__PURE__*/_react["default"].createElement(_headerAction["default"], action);
   }), !!collapsedActions.length && /*#__PURE__*/_react["default"].createElement(_headerAction["default"], {
     approvalSetting: approvalSetting,

package/lib/components/dynamic/constant.js

@@ -118,5 +118,5 @@ var EStatusStatus2ClassType = {
   5: "tu-icon-jiantou-right"
 };
 exports.EStatusStatus2ClassType = EStatusStatus2ClassType;
-var PlanReportType = ["titaPlanReport"];
+var PlanReportType = ["titaPlanReport", "titaPlanManagerReport"];
 exports.PlanReportType = PlanReportType;

package/lib/components/dynamic/dynamic-list/index.js

@@ -17,6 +17,8 @@ var _conditionRender = _interopRequireDefault(require("../../condition-render"))
 
 var _getLocale = require("../../../utils/getLocale");
 
+var _context = require("../context");
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -29,7 +31,9 @@ var DynamicList = function DynamicList(_ref) {
       dynamicShareIsShowToping = _ref.dynamicShareIsShowToping,
       onDeleteFeed = _ref.onDeleteFeed,
       _ref$height = _ref.height,
-      height = _ref$height === void 0 ? -1 : _ref$height;
+      height = _ref$height === void 0 ? -1 : _ref$height,
+      _ref$searchKeyWord = _ref.searchKeyWord,
+      searchKeyWord = _ref$searchKeyWord === void 0 ? "" : _ref$searchKeyWord;
 
   var handleDeleteFeed = function handleDeleteFeed(feedId) {
     if (onDeleteFeed) {
@@ -37,7 +41,11 @@ var DynamicList = function DynamicList(_ref) {
     }
   };
 
-  return /*#__PURE__*/_react["default"].createElement("div", {
+  return /*#__PURE__*/_react["default"].createElement(_context.SearchKeyContext.Provider, {
+    value: {
+      searchKeyWord: searchKeyWord
+    }
+  }, /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix,
     style: {
       minHeight: height === -1 ? "auto" : height
@@ -72,7 +80,7 @@ var DynamicList = function DynamicList(_ref) {
       onDeleteFeed: handleDeleteFeed,
       dynamicShareIsShowToping: dynamicShareIsShowToping
     }));
-  }))));
+  })))));
 };
 
 var _default = DynamicList;

package/lib/components/dynamic/index.js

@@ -1,23 +1,20 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
 
-var _exportModule = _interopRequireWildcard(require("./export-module"));
+var _dynamicList = _interopRequireDefault(require("./dynamic-list"));
+
+var _dynamicItem = _interopRequireDefault(require("./dynamic-item"));
 
-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); }
+var _context = require("./context");
 
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-_exportModule["default"].List = _exportModule.DynamicList;
-_exportModule["default"].Item = _exportModule.DynamicItem;
-_exportModule["default"].LikeRanking = _exportModule.DynamicLikeRanking;
-_exportModule["default"].Liking = _exportModule.DynamicLiking;
-_exportModule["default"].QuickOperation = _exportModule.DynamicQuickOperation;
-_exportModule["default"].Topping = _exportModule.DynamicTopping;
-var _default = _exportModule["default"];
+var Dynamic = _dynamicList["default"];
+Dynamic.Item = _dynamicItem["default"];
+Dynamic.SearchKeyContext = _context.SearchKeyContext;
+var _default = Dynamic;
 exports["default"] = _default;

package/lib/components/dynamic/request-api.js

@@ -3,105 +3,44 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.topDynamic = exports.getRanking = exports.getPraise = exports.getMenu = exports.getLeastPariseInfo = exports.getDynamicFeedList = exports.getAdvertise = exports.deleteDynamic = exports.collectDynamic = exports.cancelTopDynamic = exports.cancelCollectDynamic = void 0;
+exports.topDynamic = exports.deleteDynamic = exports.collectDynamic = exports.cancelTopDynamic = exports.cancelCollectDynamic = void 0;
 
 var _request = require("../../utils/request");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 // @ts-ignore
 var userId = BSGlobal && BSGlobal.loginUserInfo.Id || 0;
 
 var topDynamic = function topDynamic(_ref) {
   var feedId = _ref.feedId;
-  return (0, _request.rget)("v2")("user/feednew/setTop?feedId=".concat(feedId));
+  return (0, _request.rget)('v2')("user/feednew/setTop?feedId=".concat(feedId));
 };
 
 exports.topDynamic = topDynamic;
 
 var cancelTopDynamic = function cancelTopDynamic(_ref2) {
   var feedId = _ref2.feedId;
-  return (0, _request.rget)("v2")("user/feednew/cancelTop?feedId=".concat(feedId));
+  return (0, _request.rget)('v2')("user/feednew/cancelTop?feedId=".concat(feedId));
 };
 
 exports.cancelTopDynamic = cancelTopDynamic;
 
 var collectDynamic = function collectDynamic(_ref3) {
   var feedId = _ref3.feedId;
-  return (0, _request.rput)("v2")("user/feed/Collect?feed_id=".concat(feedId));
+  return (0, _request.rput)('v2')("user/feed/Collect?feed_id=".concat(feedId));
 };
 
 exports.collectDynamic = collectDynamic;
 
 var cancelCollectDynamic = function cancelCollectDynamic(_ref4) {
   var feedId = _ref4.feedId;
-  return (0, _request.rdelete)("v2")("user/feed/CancelCollect?feed_id=".concat(feedId));
+  return (0, _request.rdelete)('v2')("user/feed/CancelCollect?feed_id=".concat(feedId));
 };
 
 exports.cancelCollectDynamic = cancelCollectDynamic;
 
 var deleteDynamic = function deleteDynamic(_ref5) {
   var feedId = _ref5.feedId;
-  return (0, _request.rdelete)("v2")("user/feed/Delete?feed_id=".concat(feedId));
-};
-
-exports.deleteDynamic = deleteDynamic;
-
-var getPraise = function getPraise(_ref6) {
-  var objId = _ref6.objId,
-      _ref6$start = _ref6.start,
-      start = _ref6$start === void 0 ? "" : _ref6$start,
-      _ref6$count = _ref6.count,
-      count = _ref6$count === void 0 ? 5 : _ref6$count,
-      _ref6$objType = _ref6.objType,
-      objType = _ref6$objType === void 0 ? 10 : _ref6$objType;
-  return (0, _request.rget)("v1")("praise/get?objId=".concat(objId, "&start=&count=").concat(count, "&objType=").concat(objType));
-};
-
-exports.getPraise = getPraise;
-
-var getRanking = function getRanking(data) {
-  return (0, _request.rpost)("v1")("praise/getRanking", data);
-};
-
-exports.getRanking = getRanking;
-
-var getLeastPariseInfo = function getLeastPariseInfo() {
-  return (0, _request.rget)("v1")("praise/getLeastPariseInfo?count=10");
-};
-
-exports.getLeastPariseInfo = getLeastPariseInfo;
-
-var getMenu = function getMenu() {
-  return (0, _request.rget)("v2")("feed/FeedTabMenus");
-};
-
-exports.getMenu = getMenu;
-
-var getDynamicFeedList = function getDynamicFeedList() {
-  var data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
-    PageSize: 20,
-    PageNum: 1,
-    KeyWord: "",
-    ChannelIds: "",
-    Domain: "",
-    TitaHost: "",
-    RequestSource: 0,
-    CommentCount: 3
-  };
-  return (0, _request.rpost)("v2")("feed/feeds", _objectSpread(_objectSpread({}, data), {}, {
-    CommentCount: 3
-  }));
-};
-
-exports.getDynamicFeedList = getDynamicFeedList;
-
-var getAdvertise = function getAdvertise() {
-  return (0, _request.rget)("v1")("operationAd/getByTerminalType?terminalType=1");
+  return (0, _request.rdelete)('v2')("user/feed/Delete?feed_id=".concat(feedId));
 };
 
-exports.getAdvertise = getAdvertise;
+exports.deleteDynamic = deleteDynamic;

package/lib/components/eReport/eReportShare/index.js

@@ -64,7 +64,7 @@ var EReportShare = /*#__PURE__*/function (_PureComponent) {
       var _this$props = _this.props,
           onSubmit = _this$props.onSubmit,
           workId = _this$props.workId;
-      sentData.ObjType = 4;
+      sentData.ObjType = 62;
       sentData.ObjId = workId;
 
       if (submitType === "submit") {

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

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

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

@@ -27,12 +27,12 @@ var _version = _interopRequireDefault(require("./components/version"));
 
 var _utils = require("./utils");
 
-require("./index.css");
-
 var _request = require("../../utils/request");
 
 var _toast = _interopRequireDefault(require("../toast"));
 
+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); }

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

@@ -90,9 +90,8 @@ var DateCycle = function DateCycle(_ref) {
     renderInnerContent: renderClickArea,
     cycle: cycle,
     setCycle: setCycle,
-    okrId: okrId // canEdit={canCycleEdit}
-    ,
-    canEdit: false,
+    okrId: okrId,
+    canEdit: canCycleEdit,
     getCycleRange: true
   }));
 };

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

@@ -38,23 +38,28 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 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 getDeleteOptions = function getDeleteOptions() {
+  return [{
+    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;
+      approvalSetting = _ref.approvalSetting,
+      okrInfo = _ref.okrInfo;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -90,6 +95,11 @@ var OkrDeletePop = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     setShowConfirmPop(false);
   };
 
+  var showApprovalCmp = (0, _react.useMemo)(function () {
+    var _okrInfo$OkrAndKrAppr;
+
+    return approvalSetting.isOpen && !(okrInfo !== null && okrInfo !== void 0 && (_okrInfo$OkrAndKrAppr = okrInfo.OkrAndKrApprovalTypes) !== null && _okrInfo$OkrAndKrAppr !== void 0 && _okrInfo$OkrAndKrAppr.includes(53));
+  }, [approvalSetting, okrInfo]);
   (0, _react.useImperativeHandle)(ref, function () {
     return {
       show: show,
@@ -103,9 +113,9 @@ var OkrDeletePop = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
       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", {
+    }, showApprovalCmp ? (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) {
+    }, !showApprovalCmp && (0, _getLocale.getLocale)('OKR_MyO_Text_Odeletion'), /*#__PURE__*/_react["default"].createElement("div", null, getDeleteOptions().map(function (option) {
       return /*#__PURE__*/_react["default"].createElement("div", {
         className: "".concat(prefix, "__option"),
         key: option.id,
@@ -132,7 +142,7 @@ var OkrDeletePop = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
     }, (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')));
+    }, showApprovalCmp ? (0, _getLocale.getLocale)('OKR_MyO_Submittedapproval') : (0, _getLocale.getLocale)('Pro_detail_Submission')));
   }, [showConfirmPop, selected]);
   return renderDialogConfirm;
 });

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

@@ -25,3 +25,14 @@
 .okr-detail-head-parent > span:hover {
   color: #2879ff;
 }
+
+.okr-detail-header-status {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 16px;
+  width: 68px;
+  height: 28px;
+  margin-right: 18px;
+  font-size: 12px;
+}

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

@@ -87,7 +87,7 @@ function OkrDetailHeader(_ref) {
   var commonContext = (0, _react.useContext)(_context6.CommonContext);
   var approvalSetting = commonContext.approvalSetting,
       okrInfo = commonContext.okrInfo;
-  var approveStatusColor = (0, _constant.ApproveStatusColor)(detailInfo.applyState);
+  var approveStatusColor = (0, _constant.ApproveStatusColor)(okrInfo.applyState);
   var changVisiblity = (0, _react.useCallback)( /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(workId, visibility) {
       var visibilityScope,
@@ -114,7 +114,7 @@ function OkrDetailHeader(_ref) {
               }));
 
             case 3:
-              _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"));
+              _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'));
 
               context.setGeneralVisibility({
                 visibility: visibility,
@@ -143,7 +143,7 @@ function OkrDetailHeader(_ref) {
       workId: detailInfo.workId
     }).then(function (resp) {
       if (resp.Code === 1) {
-        _toast["default"].Success((0, _getLocale.getLocale)("Pro_detail_Deletsuccess"));
+        _toast["default"].Success((0, _getLocale.getLocale)('Pro_detail_Deletsuccess'));
 
         setTimeout(function () {
           commonContext.refreshAll();
@@ -224,7 +224,7 @@ function OkrDetailHeader(_ref) {
               switch (_context3.prev = _context3.next) {
                 case 0:
                   _context3.next = 2;
-                  return (0, _confirm["default"])(follow ? (0, _getLocale.getLocale)("OKR_MyO_Err_Focuson") : (0, _getLocale.getLocale)("OKR_MyO_Err_Unfollow"), follow ? (0, _getLocale.getLocale)("OKR_MyO_Err_Payatten") : (0, _getLocale.getLocale)("OKR_MyO_Err_Progress"));
+                  return (0, _confirm["default"])(follow ? (0, _getLocale.getLocale)('OKR_MyO_Err_Focuson') : (0, _getLocale.getLocale)('OKR_MyO_Err_Unfollow'), follow ? (0, _getLocale.getLocale)('OKR_MyO_Err_Payatten') : (0, _getLocale.getLocale)('OKR_MyO_Err_Progress'));
 
                 case 2:
                   res = _context3.sent;
@@ -253,7 +253,7 @@ function OkrDetailHeader(_ref) {
                 case 11:
                   context.setGeneralRoleType(follow ? 3 : 0); // 关注
 
-                  _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"));
+                  _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'));
 
                   if (!follow) {
                     commonContext.refreshAll();
@@ -281,7 +281,7 @@ function OkrDetailHeader(_ref) {
               switch (_context4.prev = _context4.next) {
                 case 0:
                   _context4.next = 2;
-                  return (0, _confirm["default"])(isFinish ? (0, _getLocale.getLocale)("OKR_MyO_Areycloseobjective") : (0, _getLocale.getLocale)("OKR_MyO_Err_Restart"));
+                  return (0, _confirm["default"])(isFinish ? (0, _getLocale.getLocale)('OKR_MyO_Areycloseobjective') : (0, _getLocale.getLocale)('OKR_MyO_Err_Restart'));
 
                 case 2:
                   res = _context4.sent;
@@ -310,7 +310,7 @@ function OkrDetailHeader(_ref) {
                 case 11:
                   commonContext.refreshAll(); // 刷新
 
-                  _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"));
+                  _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'));
 
                 case 13:
                 case "end":
@@ -334,7 +334,7 @@ function OkrDetailHeader(_ref) {
               switch (_context5.prev = _context5.next) {
                 case 0:
                   _context5.next = 2;
-                  return (0, _confirm["default"])((0, _getLocale.getLocale)("OKR_MyO_Err_Quit"), (0, _getLocale.getLocale)("OKR_MyO_Err_Inchargec"));
+                  return (0, _confirm["default"])((0, _getLocale.getLocale)('OKR_MyO_Err_Quit'), (0, _getLocale.getLocale)('OKR_MyO_Err_Inchargec'));
 
                 case 2:
                   res = _context5.sent;
@@ -351,7 +351,7 @@ function OkrDetailHeader(_ref) {
                   // context.setGeneralRoleType(0)
                   commonContext.refreshAll(); // 刷新
 
-                  _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"));
+                  _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'));
 
                 case 8:
                 case "end":
@@ -374,13 +374,13 @@ function OkrDetailHeader(_ref) {
   if (context.generalParent) {
     if (context.generalParent.parentKr) {
       parent = {
-        type: "kr",
+        type: 'kr',
         id: context.generalParent.parentKr.mileStoneId,
         name: context.generalParent.parentKr.mileStoneName
       };
     } else if (context.generalParent.parentOkr) {
       parent = {
-        type: "okr",
+        type: 'okr',
         id: context.generalParent.parentOkr.workId,
         name: context.generalParent.parentOkr.workName
       };
@@ -403,17 +403,20 @@ function OkrDetailHeader(_ref) {
       className: "tu-icon-liebiao-duiqinubiao"
     }), /*#__PURE__*/_react["default"].createElement("span", {
       onClick: function onClick() {
-        return parent.type === "okr" ? _drawerManager["default"].open("okrDetail", {
+        return parent.type === 'okr' ? _drawerManager["default"].open('okrDetail', {
           okrId: parent.id
-        }) : _drawerManager["default"].open("krDetail", {
+        }) : _drawerManager["default"].open('krDetail', {
           krId: parent.id
         });
       }
-    }, /*#__PURE__*/_react["default"].createElement("span", null, parent.type === "okr" ? "O " : "KR "), parent.name)) : null,
-    status: {
-      title: (0, _constant.getApproveStatusTextMap)(okrInfo.applyState),
-      color: approveStatusColor
-    }
+    }, /*#__PURE__*/_react["default"].createElement("span", null, parent.type === 'okr' ? 'O ' : 'KR '), parent.name)) : null,
+    onlyShowContent: approveStatusColor ? /*#__PURE__*/_react["default"].createElement("div", {
+      className: "okr-detail-header-status",
+      style: {
+        color: approveStatusColor.color,
+        backgroundColor: approveStatusColor.bgColor
+      }
+    }, (0, _constant.getApproveStatusTextMap)(okrInfo.applyState)) : null
   }), /*#__PURE__*/_react["default"].createElement(_okrShare["default"], {
     visible: shareVisible,
     onClose: closeShareModal,
@@ -433,11 +436,12 @@ function OkrDetailHeader(_ref) {
     zIndex: 2400
   }), /*#__PURE__*/_react["default"].createElement(_deleteConfirm["default"], {
     ref: deletePopRef,
+    okrInfo: okrInfo,
     approvalSetting: approvalSetting,
     onConfirm: handleDeleteOkr
   }), /*#__PURE__*/_react["default"].createElement("div", {
     style: {
-      textAlign: "right",
+      textAlign: 'right',
       height: 0
     }
   }, /*#__PURE__*/_react["default"].createElement(_userSelector["default"], {
@@ -451,9 +455,9 @@ function OkrDetailHeader(_ref) {
     selectNodes: context.generalVisibility.visibilityScope || {},
     trigger: /*#__PURE__*/_react["default"].createElement("div", {
       style: {
-        visibility: "hidden",
+        visibility: 'hidden',
         zIndex: -1,
-        display: "inline-block",
+        display: 'inline-block',
         height: 0
       }
     }, "empty select")

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/okrcase-library/okrcases-components/submitOkr-dialog.js

@@ -304,8 +304,13 @@ function PayDialog(props) {
       e.preventDefault();
       var path = window.location.href.split("#")[0];
       path = path.replace(/eLearningHome/, "Home");
-      var encode = encodeURIComponent("orderId=".concat(orderId, "&payCode=").concat(payCode, "&payName=").concat(payName));
-      window.open("".concat(path, "#/pay?").concat(encode), "_blank"); // postWxPayOrder({
+      var encode = encodeURIComponent("orderId=".concat(orderId, "&payCode=").concat(payCode, "&payName=").concat(payName)); // if(isDingDing()){
+      // window.open(`${path}#/pay?${encode}`, "_self");
+      // window.location.reload();
+      // }else{
+
+      window.open("".concat(path, "#/pay?").concat(encode), "_blank"); // }
+      // postWxPayOrder({
       //   order_id: orderId,
       //   default_bank: payCode,
       //   default_bank_name: payName,

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
           });
         }
       });