@titaui/pc 1.9.73 → 1.9.77

package/.eslintrc.js

@@ -26,7 +26,8 @@ module.exports = {
     "eqeqeq": 2,
     "spaced-comment": 2,
     "prefer-object-spread": 2,
-    "no-unused-expressions": 2,
+    'no-unused-expressions': 'off',
+    '@typescript-eslint/no-unused-expressions': 2,
     "no-plusplus": 2,
     "no-multiple-empty-lines": 2,
     "arrow-body-style": 2,
@@ -70,7 +71,8 @@ module.exports = {
     "jsx-a11y/no-static-element-interactions": 0,
     "jsx-a11y/click-events-have-key-events": 0,
     "no-trailing-spaces": 2,
-    "no-unused-vars": 2,
+    "no-unused-vars": 0,
+    "@typescript-eslint/no-unused-vars": 2,
     "default-case": 2,
     "implicit-arrow-linebreak": 2,
     "react/jsx-closing-bracket-location": 2,
@@ -93,7 +95,7 @@ module.exports = {
     "prefer-arrow-callback": 2,
     "arrow-spacing": 2,
     "no-nested-ternary": 2,
-    "max-len": 2,
+    "max-len": ["error", { "code": 200 }],
     "lines-between-class-members": 2,
     "no-tabs": 2,
     "react/jsx-indent": 2,

package/lib/components/dynamic/dynamic-item/dynamic-project/constant.js

@@ -3,17 +3,22 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.EStatusClass2StatusTypeText = void 0;
+exports.getEStatusClass2StatusTypeText = exports["default"] = void 0;
 
 var _getLocale = require("../../../../utils/getLocale");
 
-var EStatusClass2StatusTypeText = {
-  2: (0, _getLocale.getLocale)("OKR_MyO_E_From_Completed"),
-  1: (0, _getLocale.getLocale)("Per_MyRe_text_Inprogress"),
-  4: (0, _getLocale.getLocale)("OKR_MyO_E_From_Cancelled"),
-  3: (0, _getLocale.getLocale)("OKR_MyO_E_From_Delayed"),
-  6: (0, _getLocale.getLocale)("OKR_MyO_E_From_Suspended"),
-  0: (0, _getLocale.getLocale)("OKR_MyO_E_From_NotStarted"),
-  5: (0, _getLocale.getLocale)("OKR_MyO_E_From_Notaccepted")
+var getEStatusClass2StatusTypeText = function getEStatusClass2StatusTypeText() {
+  return {
+    2: (0, _getLocale.getLocale)("OKR_MyO_E_From_Completed"),
+    1: (0, _getLocale.getLocale)("Per_MyRe_text_Inprogress"),
+    4: (0, _getLocale.getLocale)("OKR_MyO_E_From_Cancelled"),
+    3: (0, _getLocale.getLocale)("OKR_MyO_E_From_Delayed"),
+    6: (0, _getLocale.getLocale)("OKR_MyO_E_From_Suspended"),
+    0: (0, _getLocale.getLocale)("OKR_MyO_E_From_NotStarted"),
+    5: (0, _getLocale.getLocale)("OKR_MyO_E_From_Notaccepted")
+  };
 };
-exports.EStatusClass2StatusTypeText = EStatusClass2StatusTypeText;
+
+exports.getEStatusClass2StatusTypeText = getEStatusClass2StatusTypeText;
+var _default = getEStatusClass2StatusTypeText;
+exports["default"] = _default;

package/lib/components/dynamic/dynamic-item/dynamic-project/index.js

@@ -65,7 +65,7 @@ var DynamicProject = function DynamicProject(_ref) {
       feedTypeColor = _getFeedTypeAndTypeCo.feedTypeColor;
 
   var handleClickTitle = function handleClickTitle() {
-    window.open(window.location.href.replace(location.hash, "#work?iTalentNavCode=tita-work&work_id=".concat(data.obj.objId)));
+    window.open(window.location.href.replace(window.location.hash, "#work?iTalentNavCode=tita-work&work_id=".concat(data.obj.objId)));
   };
 
   var renderName = (0, _react.useMemo)(function () {
@@ -98,7 +98,8 @@ var DynamicProject = function DynamicProject(_ref) {
     className: "".concat(prefix, "__content")
   }, /*#__PURE__*/_react["default"].createElement("img", {
     className: "".concat(prefix, "__content-img"),
-    src: _dynamicProject["default"]
+    src: _dynamicProject["default"],
+    alt: ""
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__content-info")
   }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -113,7 +114,7 @@ var DynamicProject = function DynamicProject(_ref) {
     className: (0, _classnames["default"])(_constant2.EStatusStatus2ClassType[status])
   }), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(prefix, "__content-status-text")
-  }, _constant.EStatusClass2StatusTypeText[status]), /*#__PURE__*/_react["default"].createElement("i", {
+  }, (0, _constant.getEStatusClass2StatusTypeText)()[status]), /*#__PURE__*/_react["default"].createElement("i", {
     className: (0, _classnames["default"])("tu-icon-deferred")
   }), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(prefix, "__content-time-range")

package/lib/components/dynamic/dynamic-item/dynamic-replay/index.css

@@ -29,7 +29,7 @@
 }
 
 .titaui-dynamic-reply-item__detail-tasks-item::before {
-  content: "";
+  content: '';
   display: inline-block;
   width: 6px;
   height: 6px;
@@ -53,7 +53,7 @@
 }
 
 .titaui-dynamic-reply-item__detail-block-title::before {
-  content: "";
+  content: '';
   display: inline-block;
   width: 4px;
   height: 12px;
@@ -71,10 +71,11 @@
   color: #3f4755;
   line-height: 22px;
   margin-left: 8px;
+  white-space: pre-wrap;
 }
 
 .titaui-dynamic-reply-item__detail-block-title--sub::before {
-  content: "";
+  content: '';
   display: inline-block;
   width: 6px;
   height: 6px;
@@ -90,6 +91,7 @@
   line-height: 22px;
   margin-bottom: 4px;
   margin-left: 8px;
+  white-space: pre-wrap;
 }
 
 .titaui-dynamic-reply-item__detail-block-content--sub {

package/lib/components/dynamic/dynamic-item/dynamic-replay/index.js

@@ -29,6 +29,8 @@ var _tooltip = _interopRequireDefault(require("../../../tooltip"));
 
 var _getLocale = require("../../../../utils/getLocale");
 
+var _tools = require("../../../../utils/tools");
+
 require("./index.css");
 
 var _excluded = ["data"];
@@ -135,7 +137,7 @@ var DynamicReply = function DynamicReply(_ref) {
   }, (0, _getLocale.getLocale)("OKR_MyO_KRP_Pop_Value")), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__detail-block-content")
   }, /*#__PURE__*/_react["default"].createElement(_searchKeyHandle["default"], {
-    str: data.gains,
+    str: (0, _tools.htmlDecodeByHtmlRegExp)(data.gains),
     keyWord: searchKeyWord
   }))), /*#__PURE__*/_react["default"].createElement("div", null, data.drawbacks && data.drawbacks.map(function (item, index) {
     return /*#__PURE__*/_react["default"].createElement("div", {
@@ -146,21 +148,21 @@ var DynamicReply = function DynamicReply(_ref) {
     }, (0, _getLocale.getLocale)("OKR_MyO_KRP_Pop_Problems"), " ", index + 1), /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(prefix, "__detail-block-content")
     }, /*#__PURE__*/_react["default"].createElement(_searchKeyHandle["default"], {
-      str: item.drawback,
+      str: (0, _tools.htmlDecodeByHtmlRegExp)(item.drawback),
       keyWord: searchKeyWord
     })), item.cause && /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(prefix, "__detail-block-title--sub")
     }, "\u6839\u672C\u539F\u56E0:"), /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])("".concat(prefix, "__detail-block-content"), "".concat(prefix, "__detail-block-content--sub"))
     }, /*#__PURE__*/_react["default"].createElement(_searchKeyHandle["default"], {
-      str: item.cause,
+      str: (0, _tools.htmlDecodeByHtmlRegExp)(item.cause),
       keyWord: searchKeyWord
     }))), item.measures && /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(prefix, "__detail-block-title--sub")
     }, "\u76F8\u5E94\u63AA\u65BD:"), /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])("".concat(prefix, "__detail-block-content"), "".concat(prefix, "__detail-block-content--sub"))
     }, /*#__PURE__*/_react["default"].createElement(_searchKeyHandle["default"], {
-      str: item.measures,
+      str: (0, _tools.htmlDecodeByHtmlRegExp)(item.measures),
       keyWord: searchKeyWord
     }))));
   })), data.tasks && data.tasks.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {

package/lib/components/dynamic/dynamic-item/dynamic-task/constant.js

@@ -3,17 +3,22 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.EStatusClass2StatusTypeText = void 0;
+exports.getEStatusClass2StatusTypeText = exports["default"] = void 0;
 
 var _getLocale = require("../../../../utils/getLocale");
 
-var EStatusClass2StatusTypeText = {
-  2: (0, _getLocale.getLocale)("OKR_MyO_E_From_Completed"),
-  1: (0, _getLocale.getLocale)("Per_MyRe_text_Inprogress"),
-  4: (0, _getLocale.getLocale)("OKR_MyO_E_From_Cancelled"),
-  3: (0, _getLocale.getLocale)("OKR_MyO_E_From_Delayed"),
-  6: (0, _getLocale.getLocale)("OKR_MyO_E_From_Suspended"),
-  0: (0, _getLocale.getLocale)("OKR_MyO_E_From_NotStarted"),
-  5: (0, _getLocale.getLocale)("OKR_MyO_E_From_Notaccepted")
+var getEStatusClass2StatusTypeText = function getEStatusClass2StatusTypeText() {
+  return {
+    2: (0, _getLocale.getLocale)("OKR_MyO_E_From_Completed"),
+    1: (0, _getLocale.getLocale)("Per_MyRe_text_Inprogress"),
+    4: (0, _getLocale.getLocale)("OKR_MyO_E_From_Cancelled"),
+    3: (0, _getLocale.getLocale)("OKR_MyO_E_From_Delayed"),
+    6: (0, _getLocale.getLocale)("OKR_MyO_E_From_Suspended"),
+    0: (0, _getLocale.getLocale)("OKR_MyO_E_From_NotStarted"),
+    5: (0, _getLocale.getLocale)("OKR_MyO_E_From_Notaccepted")
+  };
 };
-exports.EStatusClass2StatusTypeText = EStatusClass2StatusTypeText;
+
+exports.getEStatusClass2StatusTypeText = getEStatusClass2StatusTypeText;
+var _default = getEStatusClass2StatusTypeText;
+exports["default"] = _default;

package/lib/components/dynamic/dynamic-item/dynamic-task/index.js

@@ -92,17 +92,17 @@ var DynamicTask = function DynamicTask(_ref) {
     }
 
     if (objType === _constant2.EObjType.Project) {
-      window.open(window.location.href.replace(location.hash, "#work?iTalentNavCode=tita-work&work_id=".concat(objId)));
+      window.open(window.location.href.replace(window.location.hash, "#work?iTalentNavCode=tita-work&work_id=".concat(objId)));
     }
 
     if (objType === _constant2.EObjType.MileStone) {
       if (workId <= 0) return;
-      window.open(window.location.href.replace(location.hash, "#work?work_id=".concat(workId, "&detail_type=milepost")));
+      window.open(window.location.href.replace(window.location.hash, "#work?work_id=".concat(workId, "&detail_type=milepost")));
     }
 
     if (objType === _constant2.EObjType.KanBan) {
       if (workId <= 0) return;
-      window.open(window.location.href.replace(location.hash, "#work?work_id=".concat(workId, "&detail_type=kanban")));
+      window.open(window.location.href.replace(window.location.hash, "#work?work_id=".concat(workId, "&detail_type=kanban")));
     }
   };
 
@@ -152,7 +152,8 @@ var DynamicTask = function DynamicTask(_ref) {
     className: "".concat(prefix, "__content")
   }, /*#__PURE__*/_react["default"].createElement("img", {
     className: "".concat(prefix, "__content-img"),
-    src: _taskIcon["default"]
+    src: _taskIcon["default"],
+    alt: ""
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__content-info")
   }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -167,7 +168,7 @@ var DynamicTask = function DynamicTask(_ref) {
     className: (0, _classnames["default"])(_constant2.EStatusStatus2ClassType[status])
   }), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(prefix, "__content-status-text")
-  }, _constant.EStatusClass2StatusTypeText[status]), /*#__PURE__*/_react["default"].createElement("i", {
+  }, (0, _constant.getEStatusClass2StatusTypeText)()[status]), /*#__PURE__*/_react["default"].createElement("i", {
     className: (0, _classnames["default"])("tu-icon-deferred")
   }), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(prefix, "__content-time-range")

package/lib/components/dynamic/dynamic-like-ranking/index.css

@@ -69,8 +69,9 @@
 
 .danamic-like-ranking__content-table-items {
   display: grid;
-  grid-template-columns: auto auto auto auto;
+  grid-template-columns: auto 28px auto auto;
   grid-row-gap: 16px;
+  margin-left: -8px;
 }
 
 .danamic-like-ranking__item:last-of-type {
@@ -92,10 +93,6 @@
   font-size: 14px;
 }
 
-.danamic-like-ranking__item-avatar {
-  margin-left: 9px;
-}
-
 .danamic-like-ranking__item-avatar .titaui-pc-avator-container {
   display: inline-flex !important;
 }

package/lib/components/dynamic/dynamic.js

@@ -185,9 +185,14 @@ var Dynamic = function Dynamic() {
   };
 
   var handleDeleteFeed = function handleDeleteFeed(feedId) {
-    setDynamicData(_toConsumableArray(dynamicData.filter(function (item) {
+    var newDatas = dynamicData.filter(function (item) {
       return item.feedId !== feedId;
-    })));
+    });
+    setDynamicData([]); // 动画效果如果直接设置新的数据，diff时间会比较长，所以直接清空再赋值，这样不会出现删除时等待长时间空白
+
+    setTimeout(function () {
+      setDynamicData(_toConsumableArray(newDatas));
+    }, 0);
   };
 
   var getDynamicData = function getDynamicData(needResetValue) {

package/lib/components/mblog/style.js

@@ -18,7 +18,7 @@ var MBlogBox = _styledComponents["default"].div(_templateObject || (_templateObj
 
 exports.MBlogBox = MBlogBox;
 
-var DivMblogContent = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  padding: 8px 10px 6px;\n  border: 1px solid #DFE3EA;\n  border-radius: 8px;\n  background-color: #fff;\n  position: relative;\n  transition: all .2s ease-in-out;\n  height: 124px;\n  box-sizing: border-box;\n\n  &.input_default-active {\n    box-shadow: inset 0px 0px 4px 0px rgba(40, 121, 255, 0.3);\n    border-color: #2879ff;\n  }\n"])));
+var DivMblogContent = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  padding: 8px 10px 6px;\n  border: 1px solid #DFE3EA;\n  border-radius: 8px;\n  background-color: #fff;\n  position: relative;\n  transition: all .2s ease-in-out;\n  height: 200px;\n  box-sizing: border-box;\n\n  &.input_default-active {\n    box-shadow: inset 0px 0px 4px 0px rgba(40, 121, 255, 0.3);\n    border-color: #2879ff;\n  }\n"])));
 
 exports.DivMblogContent = DivMblogContent;
 
@@ -36,11 +36,11 @@ var TextareaWrapper = _styledComponents["default"].div(_templateObject5 || (_tem
 
 exports.TextareaWrapper = TextareaWrapper;
 
-var Textarea = _styledComponents["default"].textarea(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n  width: 100%;\n  padding: 0;\n  border: 0 none;\n  background-color: transparent;\n  color: #3F4755;\n  resize: none;\n  word-break: break-all;\n  word-wrap: break-word;\n  height: 86px;\n\n  &.textarea-setheight {\n    visibility: hidden;\n    position: absolute;\n  }\n/* \n  &.private__bg {\n    background: url(", ") no-repeat right top;\n  } */\n"])), require("./assets/lock-radius.png"));
+var Textarea = _styledComponents["default"].textarea(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n  width: 100%;\n  padding: 0;\n  border: 0 none;\n  background-color: transparent;\n  color: #3F4755;\n  resize: none;\n  word-break: break-all;\n  word-wrap: break-word;\n  height: 160px;\n  font-size: 14px;\n  line-height: 22px;\n\n  &.textarea-setheight {\n    visibility: hidden;\n    position: absolute;\n  }\n"])));
 
 exports.Textarea = Textarea;
 
-var Tips = _styledComponents["default"].div(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n  line-height: 18px;\n  color: ", ";\n  text-align: right;\n"])), function (p) {
+var Tips = _styledComponents["default"].div(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n  font-size: 14px;\n  line-height: 22px;\n  color: ", ";\n  text-align: right;\n"])), function (p) {
   return p.color;
 }); // MblogAction
 

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

@@ -51,7 +51,8 @@ function OkrDetailHeaderConfirm(_ref) {
   }, []);
   return /*#__PURE__*/_react["default"].createElement(_dialogConfirm["default"], {
     visible: visible,
-    type: "warning"
+    type: "warning",
+    zIndex: 2400
   },
   /*#__PURE__*/
   // @ts-ignore

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

@@ -140,7 +140,7 @@ function OkrDetailHeader(_ref) {
       detailInfo: detailInfo,
       openShareModal: function () {
         var _openShareModal = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
-          var krs;
+          var krss;
           return regeneratorRuntime.wrap(function _callee2$(_context2) {
             while (1) {
               switch (_context2.prev = _context2.next) {
@@ -151,8 +151,8 @@ function OkrDetailHeader(_ref) {
                   });
 
                 case 2:
-                  krs = _context2.sent;
-                  setKrs(krs);
+                  krss = _context2.sent;
+                  setKrs(krss);
                   setShareVisible(true);
 
                 case 5:
@@ -170,8 +170,11 @@ function OkrDetailHeader(_ref) {
         return openShareModal;
       }(),
       changeVisiblilty: function changeVisiblilty(visibility) {
-        if (visibility == 4) {
-          userSelectRef.current && userSelectRef.current.open();
+        if (visibility === 4) {
+          if (userSelectRef.current) {
+            userSelectRef.current.open();
+          }
+
           return;
         }
 
@@ -205,8 +208,7 @@ function OkrDetailHeader(_ref) {
                     break;
                   }
 
-                  if (!follow // @ts-ignore
-                  ) {
+                  if (!follow) {
                     _context3.next = 9;
                     break;
                   }
@@ -367,13 +369,13 @@ 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", {
           krId: parent.id
         });
       }
-    }, /*#__PURE__*/_react["default"].createElement("span", null, parent.type == "okr" ? "O " : "KR "), parent.name)) : null
+    }, /*#__PURE__*/_react["default"].createElement("span", null, parent.type === "okr" ? "O " : "KR "), parent.name)) : null
   }), /*#__PURE__*/_react["default"].createElement(_okrShare["default"], {
     visible: shareVisible,
     onClose: closeShareModal,
@@ -389,7 +391,8 @@ function OkrDetailHeader(_ref) {
           src: detailInfo.principalUser.avatar.medium
         }
       })
-    }
+    },
+    zIndex: 2400
   }), /*#__PURE__*/_react["default"].createElement(_titaUi.PopConfirm, {
     ref: popRef,
     showArrow: false,

package/lib/components/okr-progress-modal/helper.js

@@ -5,7 +5,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.transProgress = exports.getOptions = exports.getO_SETTING = exports.getKrOptions = exports.getKR_SETTING = void 0;
+exports.transProgress = exports.getOptions = exports.getOSetting = exports.getKrSetting = exports.getKrOptions = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
@@ -15,7 +15,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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; }
 
-var getO_SETTING = function getO_SETTING() {
+var getOSetting = function getOSetting() {
   return {
     settingTitle: (0, _getLocale.getLocale)("OKR_MyO_Pop_Upd_Setmatically"),
     switchLabel: (0, _getLocale.getLocale)("OKR_MyO_Pop_Upd_Setmatically"),
@@ -28,38 +28,45 @@ var getO_SETTING = function getO_SETTING() {
       key: 2,
       tooltip: (0, _getLocale.getLocale)("OKR_MyO_Pop_Upd_SubO")
     }],
-    getRecommandText: function getRecommandText() {
-      var autoUpdate = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
-      var updateWay = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
-      var recommandProgressObj = arguments.length > 2 ? arguments[2] : undefined;
+    getRecommandText: function getRecommandText(recommandProgressObj) {
+      var autoUpdate = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+      var updateWay = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
 
       if (autoUpdate) {
-        if (updateWay == 1) return /*#__PURE__*/_react["default"].createElement("span", {
+        if (updateWay === 1) return /*#__PURE__*/_react["default"].createElement("span", {
           className: "auto-update__recommand-tip"
         }, (0, _getLocale.getLocale)("OKR_MyO_Pop_Upd_Automatic"));
-        if (updateWay == 2) return /*#__PURE__*/_react["default"].createElement("span", {
+        if (updateWay === 2) return /*#__PURE__*/_react["default"].createElement("span", {
           className: "auto-update__recommand-tip"
         }, (0, _getLocale.getLocale)("OKR_MyO_calculationSubO"));
-      } else {
-        var childOkrProgress = recommandProgressObj.childOkrProgress,
-            childkrProgress = recommandProgressObj.childkrProgress;
-        var textArr = [];
-        childkrProgress !== -1 && textArr.push("".concat((0, _getLocale.getLocale)("OKR_MyO_Pop_Upd_KRCom")).concat(childkrProgress).concat((0, _getLocale.getLocale)("OKR_MyO_Pop_Upd_Percentage")));
-        childOkrProgress !== -1 && textArr.push("".concat((0, _getLocale.getLocale)("OKR_MyO_Ew_SubobjCom")).concat(childOkrProgress).concat((0, _getLocale.getLocale)("OKR_MyO_Pop_Upd_Percentage")));
-        if (textArr.length == 0) return "";
-        return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("span", {
-          className: "auto-update__recommand-icon"
-        }, (0, _getLocale.getLocale)("Per_Ass_Pop_title_Recommend")), /*#__PURE__*/_react["default"].createElement("span", {
-          className: "auto-update__recommand-tip"
-        }, "\uFF08", textArr.join("，"), "\uFF09"));
+        return /*#__PURE__*/_react["default"].createElement("span", null);
+      }
+
+      var childOkrProgress = recommandProgressObj.childOkrProgress,
+          childkrProgress = recommandProgressObj.childkrProgress;
+      var textArr = [];
+
+      if (childkrProgress !== -1) {
+        textArr.push("".concat((0, _getLocale.getLocale)("OKR_MyO_Pop_Upd_KRCom")).concat(childkrProgress).concat((0, _getLocale.getLocale)("OKR_MyO_Pop_Upd_Percentage")));
       }
+
+      if (childOkrProgress !== -1) {
+        textArr.push("".concat((0, _getLocale.getLocale)("OKR_MyO_Ew_SubobjCom")).concat(childOkrProgress).concat((0, _getLocale.getLocale)("OKR_MyO_Pop_Upd_Percentage")));
+      }
+
+      if (textArr.length === 0) return "";
+      return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("span", {
+        className: "auto-update__recommand-icon"
+      }, (0, _getLocale.getLocale)("Per_Ass_Pop_title_Recommend")), /*#__PURE__*/_react["default"].createElement("span", {
+        className: "auto-update__recommand-tip"
+      }, "\uFF08", textArr.join("，"), "\uFF09"));
     }
   };
 };
 
-exports.getO_SETTING = getO_SETTING;
+exports.getOSetting = getOSetting;
 
-var getKR_SETTING = function getKR_SETTING() {
+var getKrSetting = function getKrSetting() {
   return {
     settingTitle: (0, _getLocale.getLocale)("OKR_MyO_KRCompletion"),
     switchLabel: (0, _getLocale.getLocale)("OKR_MyO_SetKRcompletion"),
@@ -72,42 +79,49 @@ var getKR_SETTING = function getKR_SETTING() {
       key: 2,
       tooltip: (0, _getLocale.getLocale)("OKR_MyO_KRcompletionde")
     }],
-    getRecommandText: function getRecommandText() {
-      var autoUpdate = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
-      var updateWay = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
-      var recommandProgressObj = arguments.length > 2 ? arguments[2] : undefined;
+    getRecommandText: function getRecommandText(recommandProgressObj) {
+      var autoUpdate = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+      var updateWay = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
 
       if (autoUpdate) {
-        if (updateWay == 1) return /*#__PURE__*/_react["default"].createElement("span", {
+        if (updateWay === 1) return /*#__PURE__*/_react["default"].createElement("span", {
           className: "auto-update__recommand-tip"
         }, (0, _getLocale.getLocale)("OKR_MyO_Automatic"));
-        if (updateWay == 2) return /*#__PURE__*/_react["default"].createElement("span", {
+        if (updateWay === 2) return /*#__PURE__*/_react["default"].createElement("span", {
           className: "auto-update__recommand-tip"
         }, (0, _getLocale.getLocale)("OKR_MyO_calculationSubO"));
-      } else {
-        var childOkrProgress = recommandProgressObj.childOkrProgress,
-            childEProgress = recommandProgressObj.childEProgress;
-        var textArr = [];
-        childEProgress !== -1 && textArr.push("".concat((0, _getLocale.getLocale)("OKR_MyO_Ecompletion")).concat(childEProgress).concat((0, _getLocale.getLocale)("OKR_MyO_Pop_Upd_Percentage")));
-        childOkrProgress !== -1 && textArr.push("".concat((0, _getLocale.getLocale)("OKR_MyO_Ew_SubobjCom")).concat(childOkrProgress).concat((0, _getLocale.getLocale)("OKR_MyO_Pop_Upd_Percentage")));
-        if (textArr.length == 0) return "";
-        return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("span", {
-          className: "auto-update__recommand-icon"
-        }, (0, _getLocale.getLocale)("Per_Ass_Pop_title_Recommend")), /*#__PURE__*/_react["default"].createElement("span", {
-          className: "auto-update__recommand-tip",
-          style: {
-            marginLeft: 0
-          }
-        }, "(", textArr.join("，"), ")"));
+        return /*#__PURE__*/_react["default"].createElement("span", null);
       }
+
+      var childOkrProgress = recommandProgressObj.childOkrProgress,
+          childEProgress = recommandProgressObj.childEProgress;
+      var textArr = [];
+
+      if (childEProgress !== -1) {
+        textArr.push("".concat((0, _getLocale.getLocale)("OKR_MyO_Ecompletion")).concat(childEProgress).concat((0, _getLocale.getLocale)("OKR_MyO_Pop_Upd_Percentage")));
+      }
+
+      if (childOkrProgress !== -1) {
+        textArr.push("".concat((0, _getLocale.getLocale)("OKR_MyO_Ew_SubobjCom")).concat(childOkrProgress).concat((0, _getLocale.getLocale)("OKR_MyO_Pop_Upd_Percentage")));
+      }
+
+      if (textArr.length === 0) return "";
+      return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("span", {
+        className: "auto-update__recommand-icon"
+      }, (0, _getLocale.getLocale)("Per_Ass_Pop_title_Recommend")), /*#__PURE__*/_react["default"].createElement("span", {
+        className: "auto-update__recommand-tip",
+        style: {
+          marginLeft: 0
+        }
+      }, "(", textArr.join("，"), ")"));
     }
   };
 };
 
-exports.getKR_SETTING = getKR_SETTING;
+exports.getKrSetting = getKrSetting;
 
 var transProgress = function transProgress(progress) {
-  return progress == -1 ? 0 : progress;
+  return progress === -1 ? 0 : progress;
 };
 
 exports.transProgress = transProgress;

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

@@ -52,6 +52,8 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var ProgressModal = function ProgressModal(props) {
+  var _window, _window$BSGlobal, _window$BSGlobal$OkrA, _window$BSGlobal$OkrA2;
+
   var maxLength = props.maxLength,
       okrInfo = props.okrInfo,
       onClose = props.onClose,
@@ -60,7 +62,7 @@ var ProgressModal = function ProgressModal(props) {
       title = _props$title === void 0 ? window.getLocale("OKR_MyO_Prog_Butt_Update") : _props$title,
       visible = props.visible,
       isKr = props.isKr;
-  var configure = isKr ? (0, _helper.getKR_SETTING)() : (0, _helper.getO_SETTING)();
+  var configure = isKr ? (0, _helper.getKrSetting)() : (0, _helper.getOSetting)();
   var reg = /^[0-9]*[1-9][0-9]*$/;
 
   var _useState = (0, _react.useState)(false),
@@ -95,11 +97,7 @@ var ProgressModal = function ProgressModal(props) {
       selected = _useState12[0],
       setSelected = _useState12[1];
 
-  var _useState13 = (0, _react.useState)(function () {
-    return (// @ts-ignore
-      window.BSGlobal.OkrAdvancedSetting.KRSetting.ShowKrProgress
-    );
-  }),
+  var _useState13 = (0, _react.useState)((_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.ShowKrProgress),
       _useState14 = _slicedToArray(_useState13, 1),
       ShowKrProgress = _useState14[0];
 
@@ -136,11 +134,11 @@ var ProgressModal = function ProgressModal(props) {
             case 3:
               data = _context.sent;
 
-              if (data.Code == 1) {
+              if (data.Code === 1) {
                 _data$Data = data.Data, UpdateProgressWay = _data$Data.UpdateProgressWay, Progress = _data$Data.Progress;
                 setRecommandProgressObj(data.Data);
-                setUpdate(UpdateProgressWay != 0);
-                setUpdateWay(UpdateProgressWay == 0 ? 1 : UpdateProgressWay);
+                setUpdate(UpdateProgressWay !== 0);
+                setUpdateWay(UpdateProgressWay === 0 ? 1 : UpdateProgressWay);
                 setProgress(Progress);
               }
 
@@ -169,8 +167,14 @@ var ProgressModal = function ProgressModal(props) {
     var childOkrProgress = recommandProgressObj.childOkrProgress,
         childkrProgress = recommandProgressObj.childkrProgress,
         childEProgress = recommandProgressObj.childEProgress;
-    updateWay == 1 && setProgress(isKr ? (0, _helper.transProgress)(childEProgress) : (0, _helper.transProgress)(childkrProgress));
-    updateWay == 2 && setProgress((0, _helper.transProgress)(childOkrProgress));
+
+    if (updateWay === 1) {
+      setProgress(isKr ? (0, _helper.transProgress)(childEProgress) : (0, _helper.transProgress)(childkrProgress));
+    }
+
+    if (updateWay === 2) {
+      setProgress((0, _helper.transProgress)(childOkrProgress));
+    }
   }, [updateWay, autoUpdate, recommandProgressObj]);
 
   var descriptionText = /*#__PURE__*/_react["default"].createElement(_style.Item, null, /*#__PURE__*/_react["default"].createElement("span", {
@@ -229,7 +233,8 @@ var ProgressModal = function ProgressModal(props) {
     okDisabled: errorProgress || errorRemark,
     title: title,
     visible: visible,
-    width: 600
+    width: 600,
+    zIndex: 2400
   }, /*#__PURE__*/_react["default"].createElement(_style.List, null, /*#__PURE__*/_react["default"].createElement(_style.Item, null, /*#__PURE__*/_react["default"].createElement("span", {
     className: "auto-update__item-label"
   }, (0, _getLocale.getLocale)("OKR_MyO_Pop_Upd_Progresss1")), /*#__PURE__*/_react["default"].createElement("div", {
@@ -259,7 +264,7 @@ var ProgressModal = function ProgressModal(props) {
       }
     }, /*#__PURE__*/_react["default"].createElement(_style.Icon, {
       color: option.color,
-      className: selected == option.id ? "tu-icon-singlebox-avtive" : "tu-icon-singlebox-have"
+      className: selected === option.id ? "tu-icon-singlebox-avtive" : "tu-icon-singlebox-have"
     }), /*#__PURE__*/_react["default"].createElement("p", null, option.text));
   }))), descriptionText, /*#__PURE__*/_react["default"].createElement("div", {
     className: "auto-update-setting"
@@ -278,7 +283,7 @@ var ProgressModal = function ProgressModal(props) {
       },
       className: "auto-update-setting__option"
     }, /*#__PURE__*/_react["default"].createElement("span", {
-      className: (0, _classnames["default"])("auto-update-setting__radio", "auto-update-setting__radio".concat(updateWay == option.key ? "--selected" : ""))
+      className: (0, _classnames["default"])("auto-update-setting__radio", "auto-update-setting__radio".concat(updateWay === option.key ? "--selected" : ""))
     }), /*#__PURE__*/_react["default"].createElement("span", null, option.label), /*#__PURE__*/_react["default"].createElement(_titaUi.Tooltip, {
       content: option.tooltip,
       container: document.body,