@titaui/pc 1.9.76 → 1.9.81

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,
@@ -125,7 +127,7 @@ module.exports = {
     "react/jsx-no-constructed-context-values": 1,
     "new-cap": 2,
     "function-paren-newline": 2,
-    "global-require": 1,
+    "global-require": 2,
     "jsx-a11y/alt-text": 2,
     "react/no-array-index-key": 2,
     "react/no-unstable-nested-components": 2,
@@ -218,4 +220,4 @@ module.exports = {
     "valid-typeof": 2,
     "no-alert": 2,
   },
-}
+}

package/lib/components/change-okr-modal/Item.js

@@ -65,13 +65,14 @@ var Item = /*#__PURE__*/function (_PureComponent) {
 
   var _super = _createSuper(Item);
 
+  // @ts-ignore
   function Item(props) {
     var _this;
 
     _classCallCheck(this, Item);
 
     _this = _super.call(this, props);
-    _this.isObjectiveRelevanceKr = BSGlobal.OkrAdvancedSetting.KRSetting.ObjectiveRelevanceKr;
+    _this.isObjectiveRelevanceKr = window.BSGlobal.OkrAdvancedSetting.KRSetting.ObjectiveRelevanceKr;
 
     _this.onSelect = function (e, data) {
       e.stopPropagation();
@@ -102,7 +103,7 @@ var Item = /*#__PURE__*/function (_PureComponent) {
 
       if (data.Krs.length > 0) {
         var isRelatedKr = data.Krs.some(function (item) {
-          return item.mileStoneId == (active.workId || active.mileStoneId);
+          return item.mileStoneId === (active.workId || active.mileStoneId);
         });
 
         _this.setState({
@@ -114,8 +115,8 @@ var Item = /*#__PURE__*/function (_PureComponent) {
     _this.htmlToText = function (text) {
       var div = document.createElement("div");
       div.innerHTML = text;
-      text = div.innerText || div.textContent;
-      return text;
+      var newtext = div.innerText || div.textContent;
+      return newtext;
     };
 
     _this.getCycleText = function () {
@@ -136,7 +137,7 @@ var Item = /*#__PURE__*/function (_PureComponent) {
           return "".concat((0, _constant2.getMonth)()[data.yqmnum - 1], "-").concat((0, _constant2.getMonth)()[((data.yqmnum + 1) % 12 || 12) - 1], "\u6708");
 
         case 5:
-          return data.yqmnum == 1 ? (0, _getLocale.getLocale)("OKR_MyO_Pop_Firsthalf") : (0, _getLocale.getLocale)("OKR_MyO_Pop_Secondhalf");
+          return data.yqmnum === 1 ? (0, _getLocale.getLocale)("OKR_MyO_Pop_Firsthalf") : (0, _getLocale.getLocale)("OKR_MyO_Pop_Secondhalf");
 
         default:
           return (0, _getLocale.getLocale)("Mod_Customization");
@@ -156,10 +157,12 @@ var Item = /*#__PURE__*/function (_PureComponent) {
       return newstr;
     };
 
-    _this._dealOkrData = function (data, keyWords) {
+    _this.dealOkrData = function (data, keyWords) {
+      var newData = data;
+
       if (keyWords) {
-        data.workName = _this.formatKeywordsFunc(data.workName, keyWords);
-        data.Krs.forEach(function (item) {
+        newData.workName = _this.formatKeywordsFunc(data.workName, keyWords);
+        newData.Krs.forEach(function (item) {
           item.mileStoneName = _this.formatKeywordsFunc(item.mileStoneName, keyWords);
         });
       }
@@ -167,13 +170,12 @@ var Item = /*#__PURE__*/function (_PureComponent) {
       return data;
     };
 
-    _this.okrData = _this._dealOkrData(_this.props.data, _this.props.keywords);
+    _this.okrData = _this.dealOkrData(_this.props.data, _this.props.keywords);
     _this.state = {
       isExpand: false
     };
     return _this;
-  } // @ts-ignore
-
+  }
 
   _createClass(Item, [{
     key: "componentDidMount",
@@ -205,14 +207,14 @@ var Item = /*#__PURE__*/function (_PureComponent) {
         onClick: function onClick(e) {
           return _this2.onSelect(e, data);
         },
-        active: active && data.workId == active.workId
+        active: active && data.workId === active.workId
       }), /*#__PURE__*/_react["default"].createElement(_styledComponents.Tag, {
         color: colorMap[data.cycleType] || colorMap[4]
       }, this.getCycleText()), /*#__PURE__*/_react["default"].createElement(_styledComponents.WorkNameWrapper, {
         isShowKr: isShowKr
-      }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {
-        isPercent: true,
-        overlayText: this.htmlToText(this.okrData.workName)
+      }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+        placement: "top",
+        overlay: this.htmlToText(this.okrData.workName)
       }, /*#__PURE__*/_react["default"].createElement(_styledComponents.OkrName, {
         isKr: false,
         isShowKr: isShowKr,
@@ -233,30 +235,30 @@ var Item = /*#__PURE__*/function (_PureComponent) {
           onClick: function onClick(e) {
             return _this2.onSelect(e, data.Krs[index]);
           },
-          active: active && item.mileStoneId == (active.workId || active.mileStoneId)
+          active: active && item.mileStoneId === (active.workId || active.mileStoneId)
         }), /*#__PURE__*/_react["default"].createElement(_styledComponents.WorkNameWrapper, {
           isShowKr: isShowKr
-        }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {
-          isPercent: true,
-          overlayText: _this2.htmlToText(item.mileStoneName)
+        }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+          placement: "top",
+          overlay: _this2.htmlToText(item.mileStoneName)
         }, /*#__PURE__*/_react["default"].createElement(_styledComponents.OkrName, {
           isKr: true,
           isShowKr: isShowKr,
           dangerouslySetInnerHTML: {
             __html: "KR".concat(index + 1, "\uFF1A").concat(item.mileStoneName)
           }
-        })))) : active && item.mileStoneId == (active.workId || active.mileStoneId) ? /*#__PURE__*/_react["default"].createElement(_styledComponents.ItemTop, {
+        })))) : active && item.mileStoneId === (active.workId || active.mileStoneId) ? /*#__PURE__*/_react["default"].createElement(_styledComponents.ItemTop, {
           key: item.mileStoneId
         }, /*#__PURE__*/_react["default"].createElement(_styledComponents.Radio, {
           onClick: function onClick(e) {
             return _this2.onSelect(e, data.Krs[index]);
           },
-          active: active && item.mileStoneId == (active.workId || active.mileStoneId)
+          active: active && item.mileStoneId === (active.workId || active.mileStoneId)
         }), /*#__PURE__*/_react["default"].createElement(_styledComponents.WorkNameWrapper, {
           isShowKr: isShowKr
-        }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {
-          isPercent: true,
-          overlayText: _this2.htmlToText(item.mileStoneName)
+        }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+          placement: "top",
+          overlay: _this2.htmlToText(item.mileStoneName)
         }, /*#__PURE__*/_react["default"].createElement(_styledComponents.OkrName, {
           isKr: true,
           isShowKr: isShowKr,

package/lib/components/change-okr-modal/styledComponents.js

@@ -14,7 +14,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 
 var Wrapper = _styledComponents["default"].div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  width: 589px;\n  height: 488px;\n  margin-top: ", ";\n  background: #ffffff;\n  box-shadow: 0 0 8px 0 rgba(0, 0, 0, 0.2);\n  border-radius: 4px;\n  overflow: hidden;\n  display: flex;\n  flex-direction: column;\n"])), function (p) {
-  return p.okrPopType == 1 ? 0 : "32px";
+  return p.okrPopType === 1 ? 0 : "32px";
 });
 
 exports.Wrapper = Wrapper;
@@ -101,7 +101,7 @@ var Tag = _styledComponents["default"].div(_templateObject19 || (_templateObject
 
 exports.Tag = Tag;
 
-var OkrName = _styledComponents["default"].span(_templateObject20 || (_templateObject20 = _taggedTemplateLiteral(["\n  flex: 1;\n  width: 0;\n  font-size: 13px;\n  font-weight: ", ";\n  color: #33383d;\n"])), function (p) {
+var OkrName = _styledComponents["default"].span(_templateObject20 || (_templateObject20 = _taggedTemplateLiteral(["\n  display: inline-block\n  flex: 1;\n  max-width: 400px;\n  font-size: 13px;\n  font-weight: ", ";\n  color: #33383d;\n  white-space: nowrap;\n  overflow: hidden;\n  word-break: keep-all;\n  text-overflow: ellipsis;\n  line-height: 1;\n"])), function (p) {
   return p.isShowKr ? "normal" : "600";
 });
 
@@ -128,11 +128,11 @@ var ButtonGroup = _styledComponents["default"].div(_templateObject25 || (_templa
 exports.ButtonGroup = ButtonGroup;
 
 var Button = _styledComponents["default"].a(_templateObject26 || (_templateObject26 = _taggedTemplateLiteral(["\n  display: block;\n  min-width: 28px;\n  height: 27px;\n  padding: 0 15px;\n  box-shadow: 0 0 2px 0 rgba(0, 0, 0, 0.21);\n  border-radius: 2px;\n  background-color: ", ";\n  color: ", ";\n  cursor: pointer;\n  text-align: center;\n  white-space: nowrap;\n  line-height: 27px;\n  &:hover {\n    color: ", ";\n  }\n"])), function (p) {
-  return p.type != "confirm" ? "#FAFBFC" : p.disabled ? "#E7EEF3" : "#2879FF";
+  return p.type !== "confirm" ? "#FAFBFC" : p.disabled ? "#E7EEF3" : "#2879FF";
 }, function (p) {
-  return p.type != "confirm" ? "#565E66" : "#FFF";
+  return p.type !== "confirm" ? "#565E66" : "#FFF";
 }, function (p) {
-  return p.type != "confirm" ? "#565E66" : "#FFF";
+  return p.type !== "confirm" ? "#565E66" : "#FFF";
 });
 
 exports.Button = Button;

package/lib/components/mblog/style.js

@@ -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: 160px;\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-flow/export-modal/index.js

@@ -61,7 +61,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-function ExportMapModal(props) {
+var ExportMapModal = function ExportMapModal(props) {
   var _props$visible = props.visible,
       visible = _props$visible === void 0 ? false : _props$visible,
       onCloseHandler = props.onCloseHandler,
@@ -89,18 +89,25 @@ function ExportMapModal(props) {
 
   var modalRef = (0, _react.useRef)();
   (0, _react.useEffect)(function () {
-    if ((0, _bsGlobal.isWx)()) {
-      window.WWOpenData && window.WWOpenData.enableCanvasSharing && window.WWOpenData.enableCanvasSharing();
-      window.WWOpenData && window.WWOpenData.initCanvas && window.WWOpenData.initCanvas();
+    if ((0, _bsGlobal.isWx)() && window.WWOpenData) {
+      if (window.WWOpenData.enableCanvasSharing) {
+        window.WWOpenData.enableCanvasSharing();
+      }
+
+      if (window.WWOpenData.initCanvas) {
+        window.WWOpenData.initCanvas();
+      }
     }
   }, []);
   (0, _react.useEffect)(function () {
-    visible && mapInstance && mapInstance.fitView();
+    if (visible && mapInstance) {
+      mapInstance.fitView();
+    }
   }, [visible, mapInstance]);
 
   var downloadImg = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-      var okrMapRef, width, height, canvas, scale, opts, result, imgUrl, url, image;
+      var okrMapRef, width, height, canvas, scale, opts;
       return regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
@@ -112,7 +119,7 @@ function ExportMapModal(props) {
 
               canvas = document.createElement("canvas"); // 创建一个canvas节点
 
-              scale = 20; // 定义任意放大倍数 支持小数
+              scale = 10; // 定义任意放大倍数 支持小数   设置成20之后企业微信工作台导出不了
 
               canvas.width = width * scale; // 定义canvas 宽度 * 缩放
 
@@ -136,52 +143,66 @@ function ExportMapModal(props) {
 
               };
               _context.next = 12;
-              return (0, _html2canvas["default"])(okrMapRef, opts);
-
-            case 12:
-              result = _context.sent;
+              return (0, _html2canvas["default"])(okrMapRef, opts).then(function (result) {
+                if ((0, _bsGlobal.isWx)() && window.WWOpenData) {
+                  if (window.WWOpenData.enableCanvasSharing) {
+                    window.WWOpenData.enableCanvasSharing();
+                  }
+
+                  if (window.WWOpenData.initCanvas) {
+                    window.WWOpenData.initCanvas();
+                  }
+                }
 
-              if ((0, _bsGlobal.isWx)()) {
-                window.WWOpenData && window.WWOpenData.enableCanvasSharing && window.WWOpenData.enableCanvasSharing();
-                window.WWOpenData && window.WWOpenData.initCanvas && window.WWOpenData.initCanvas();
-              }
+                var imgUrl = result.toDataURL("image/png"); // 得到图片的base64编码数据
 
-              imgUrl = result.toDataURL("image/png"); // 得到图片的base64编码数据
+                // 得到图片的base64编码数据
+                (0, _requestApis.getBase64DownloadUrl)(imgUrl.split(",")[1]).then(function (url) {
+                  var image = new Image();
+                  image.setAttribute("crossOrigin", "anonymous");
 
-              _context.next = 17;
-              return (0, _requestApis.getBase64DownloadUrl)(imgUrl.split(",")[1]);
+                  image.onload = function () {
+                    if (!url.Data.obj) {
+                      _toast["default"].Error("导出失败，请稍后重试", {
+                        canClose: false
+                      });
+                    }
 
-            case 17:
-              url = _context.sent;
-              image = new Image();
-              image.setAttribute("crossOrigin", "anonymous");
+                    var a = document.createElement("a"); // 生成一个a元素
 
-              image.onload = function () {
-                if (!url.Data.obj) {
-                  _toast["default"].Error("导出失败，请稍后重试", {
-                    canClose: false
-                  });
-                }
+                    // 生成一个a元素
+                    var event = new MouseEvent("click"); // 创建一个单击事件
 
-                var a = document.createElement("a"); // 生成一个a元素
+                    // 创建一个单击事件
+                    a.download = "okr地图"; // 设置图片名称
 
-                var event = new MouseEvent("click"); // 创建一个单击事件
+                    // 设置图片名称
+                    a.href = url.Data.obj; // 将生成的URL设置为a.href属性
 
-                a.download = "okr地图"; // 设置图片名称
+                    // 将生成的URL设置为a.href属性
+                    a.dispatchEvent(event); // 触发a的单击事件
 
-                a.href = url.Data.obj; // 将生成的URL设置为a.href属性
+                    // 触发a的单击事件
+                    _toast["default"].Success("导出成功");
 
-                a.dispatchEvent(event); // 触发a的单击事件
+                    setIsExport(false);
 
-                _toast["default"].Success("导出成功");
+                    if (onCloseHandler) {
+                      onCloseHandler();
+                    }
+                  };
 
+                  image.src = imgUrl;
+                });
+              })["catch"](function (err) {
                 setIsExport(false);
-                onCloseHandler && onCloseHandler();
-              };
 
-              image.src = imgUrl;
+                _toast["default"].Error(err, {
+                  canClose: false
+                });
+              });
 
-            case 22:
+            case 12:
             case "end":
               return _context.stop();
           }
@@ -201,9 +222,9 @@ function ExportMapModal(props) {
       });
 
       return;
-    }
+    } // setIsExport(true);
+
 
-    setIsExport(true);
     downloadImg();
   };
 
@@ -267,7 +288,10 @@ function ExportMapModal(props) {
       background: bgColor
     }
   }))))));
-}
+};
 
+ExportMapModal.defaultProps = {
+  onCloseHandler: function onCloseHandler() {}
+};
 var _default = ExportMapModal;
 exports["default"] = _default;

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;