@titaui/pc 1.10.16 → 1.10.17

package/lib/components/communication/index.js

@@ -169,7 +169,8 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
           replyUser: communicationTrackList[index].publishUser.name,
           replyUserId: communicationTrackList[index].publishUser.userId,
           replyUserCommentId: communicationTrackList[index].commentId,
-          isShowDefaultInput: false
+          isShowDefaultInput: false,
+          needAutoFocus: true
         });
       } else if (actionType === "praise") {
         // 沟通里的点赞
@@ -281,7 +282,8 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
 
     _this.handleShowMblog = function () {
       _this.setState({
-        isShowDefaultInput: false
+        isShowDefaultInput: false,
+        needAutoFocus: true
       });
     };
 
@@ -309,7 +311,8 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
       praiseObjId: "",
       isShowPraiseRecordPop: false,
       okrCommentFeedId: "",
-      isShowDefaultInput: showDefaultInput && communicationLength !== 0 ? true : false
+      isShowDefaultInput: showDefaultInput && communicationLength !== 0 ? true : false,
+      needAutoFocus: false
     };
     return _this;
   }
@@ -359,7 +362,8 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
           submitStatus = _this$state4.submitStatus,
           isShowPraiseRecordPop = _this$state4.isShowPraiseRecordPop,
           praiseObjId = _this$state4.praiseObjId,
-          isShowDefaultInput = _this$state4.isShowDefaultInput;
+          isShowDefaultInput = _this$state4.isShowDefaultInput,
+          needAutoFocus = _this$state4.needAutoFocus;
       var _this$props7 = this.props,
           feedId = _this$props7.feedId,
           className = _this$props7.className,
@@ -457,7 +461,7 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
         submitStatus: submitStatus,
         userSelectorPopAlign: userSelectorPopAlign,
         emotionsSelectorPopAlign: emotionsSelectorPopAlign,
-        autoFocus: autoFocus,
+        autoFocus: autoFocus || needAutoFocus,
         autoResizing: false,
         onMblogSubmit: function onMblogSubmit(submitType, sentData) {
           return _this2.handlerReply(submitType, sentData);

package/lib/components/dynamic/components/first-level-tabs/index.css

@@ -15,7 +15,6 @@
   margin-right: 36px;
   white-space: nowrap;
   word-break: keep-all;
-  overflow: hidden;
   text-overflow: ellipsis;
   font-weight: 400;
 }
@@ -26,7 +25,7 @@
 }
 
 .titaui-dynamic-first-level-tabs__tab--active::before {
-  content: "";
+  content: '';
   display: inline-block;
   position: absolute;
   bottom: 0;
@@ -38,6 +37,20 @@
   border-radius: 2px;
 }
 
+.titaui-dynamic-first-level-tabs__tab--showNumber {
+  position: absolute;
+  right: -12px;
+  top: 25%;
+  background: #f05e5e;
+  box-shadow: 0px 2px 4px 0px rgba(240, 94, 94, 0.4), inset 0px 0px 2px 1px rgba(255, 255, 255, 0.5);
+  border-radius: 8px;
+  height: 16px;
+  font-size: 12px;
+  color: #ffffff;
+  line-height: 18px;
+  padding: 0 4px;
+}
+
 .titaui-dynamic-first-level-tabs__hide-first-level-tabs {
   display: flex;
   flex-direction: column;

package/lib/components/dynamic/components/first-level-tabs/index.js

@@ -15,6 +15,8 @@ var _conditionRender = _interopRequireDefault(require("../../../condition-render
 
 var _popup = _interopRequireDefault(require("../../../popup"));
 
+var _useGlobalValue3 = _interopRequireDefault(require("../../../nav-top/useGlobalValue"));
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -57,9 +59,16 @@ var FirstLevelTabs = function FirstLevelTabs(_ref) {
       popupVisible = _useState2[0],
       setPopupVisible = _useState2[1];
 
+  var _useGlobalValue = (0, _useGlobalValue3["default"])(),
+      _useGlobalValue2 = _slicedToArray(_useGlobalValue, 1),
+      feedNum = _useGlobalValue2[0];
+
   var handleTabsChange = function handleTabsChange(id) {
     setPopupVisible(false);
-    onTabsChange && onTabsChange(id);
+
+    if (onTabsChange) {
+      onTabsChange(id);
+    }
   };
 
   var handlePopupVisibleChange = function handlePopupVisibleChange(visible) {
@@ -69,7 +78,7 @@ var FirstLevelTabs = function FirstLevelTabs(_ref) {
   var renderFoldFirstLevelTab = (0, _react.useMemo)(function () {
     var foldTabs = tabsInfo.slice(3);
     var isActiveHideMeun = foldTabs.filter(function (item) {
-      return item.CodeId == activeTab;
+      return item.CodeId === activeTab;
     }).length > 0;
 
     var popContent = /*#__PURE__*/_react["default"].createElement("div", {
@@ -77,7 +86,7 @@ var FirstLevelTabs = function FirstLevelTabs(_ref) {
     }, foldTabs.map(function (item) {
       return /*#__PURE__*/_react["default"].createElement("div", {
         key: item.CodeId + item.MenuName,
-        className: (0, _classnames["default"])("".concat(prefix, "__hide-first-level-tab"), _defineProperty({}, "".concat(prefix, "__hide-first-level-tab--active"), item.CodeId == activeTab)),
+        className: (0, _classnames["default"])("".concat(prefix, "__hide-first-level-tab"), _defineProperty({}, "".concat(prefix, "__hide-first-level-tab--active"), item.CodeId === activeTab)),
         onClick: function onClick() {
           handleTabsChange(item.CodeId);
         }
@@ -101,14 +110,18 @@ var FirstLevelTabs = function FirstLevelTabs(_ref) {
   }, /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
     condition: !!tabsInfo
   }, tabsInfo.map(function (item, index) {
-    if (index >= 3) return;
+    if (index >= 3) return null;
     return /*#__PURE__*/_react["default"].createElement("span", {
       key: item.CodeId + item.MenuName,
       className: (0, _classnames["default"])("".concat(prefix, "__tab"), _defineProperty({}, "".concat(prefix, "__tab--active"), item.CodeId === activeTab)),
       onClick: function onClick() {
-        onTabsChange && onTabsChange(item.CodeId);
+        if (onTabsChange) {
+          onTabsChange(item.CodeId);
+        }
       }
-    }, item.MenuName);
+    }, item.MenuName, item.CodeId === 1001 && feedNum > 0 && /*#__PURE__*/_react["default"].createElement("span", {
+      className: "".concat(prefix, "__tab--showNumber")
+    }, feedNum));
   })), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(prefix, "__fold-tab")
   }, renderFoldFirstLevelTab));

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

@@ -71,7 +71,6 @@
   font-size: 12px;
   color: #89919f;
   line-height: 18px;
-  margin-right: 8px;
 }
 
 .titaui-dynamic-align-item__obj-principal-user::after {
@@ -88,7 +87,6 @@
   font-size: 12px;
   color: #89919f;
   line-height: 18px;
-  margin-left: 8px;
 }
 
 .titaui-dynamic-align-item__align-img {

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

@@ -33,6 +33,8 @@ var _dynamicAlignO = _interopRequireDefault(require("./img/dynamic-align-o.png")
 
 var _dynamicAlignKr = _interopRequireDefault(require("./img/dynamic-align-kr.png"));
 
+var _tools = require("../../../../utils/tools");
+
 require("./index.css");
 
 var _excluded = ["data"];
@@ -131,7 +133,7 @@ var DynamicAlign = function DynamicAlign(_ref) {
   }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {
     isPercent: true,
     text: /*#__PURE__*/_react["default"].createElement(_searchKeyHandle["default"], {
-      str: parentObjName,
+      str: (0, _tools.htmlDecodeByRegExp)(parentObjName),
       keyWord: searchKeyWord
     })
   })), /*#__PURE__*/_react["default"].createElement("div", {
@@ -168,7 +170,7 @@ var DynamicAlign = function DynamicAlign(_ref) {
     }
   }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {
     isPercent: true,
-    text: okrName
+    text: (0, _tools.htmlDecodeByRegExp)(okrName)
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__obj-other-info")
   }, /*#__PURE__*/_react["default"].createElement("span", {

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

@@ -21,6 +21,8 @@ var _getLocale = require("../../../../utils/getLocale");
 
 var _context = require("../../context");
 
+var _tools = require("../../../../utils/tools");
+
 require("./index.css");
 
 var _excluded = ["data"];
@@ -80,7 +82,7 @@ var DynamicShare = function DynamicShare(_ref) {
     onClick: handleClickTitle
   }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {
     text: /*#__PURE__*/_react["default"].createElement(_searchKeyHandle["default"], {
-      str: data.assessName,
+      str: (0, _tools.htmlDecodeByRegExp)(data.assessName),
       keyWord: searchKeyWord
     }),
     isPercent: true

package/lib/components/dynamic/dynamic-item/dynamic-create-o/index.js

@@ -29,6 +29,8 @@ var _progress = _interopRequireDefault(require("../../../progress"));
 
 var _util = require("../../util");
 
+var _tools = require("../../../../utils/tools");
+
 require("./index.css");
 
 var _excluded = ["data"];
@@ -150,7 +152,7 @@ var DynamicCreateO = function DynamicCreateO(_ref) {
     onClick: handleClickOTitle
   }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {
     text: /*#__PURE__*/_react["default"].createElement(_searchKeyHandle["default"], {
-      str: okrName,
+      str: (0, _tools.htmlDecodeByRegExp)(okrName),
       keyWord: searchKeyWord
     }),
     isPercent: true
@@ -176,7 +178,7 @@ var DynamicCreateO = function DynamicCreateO(_ref) {
         handleClickKrTitle(kr.krId);
       }
     }, /*#__PURE__*/_react["default"].createElement(_searchKeyHandle["default"], {
-      str: kr.krName,
+      str: (0, _tools.htmlDecodeByRegExp)(kr.krName),
       keyWord: searchKeyWord
     })));
   }))))));

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

@@ -21,10 +21,12 @@ var _constant = require("../../constant");
 
 var _searchKeyHandle = _interopRequireDefault(require("../../../search-key-handle"));
 
-require("./index.css");
-
 var _context = require("../../context");
 
+var _tools = require("../../../../utils/tools");
+
+require("./index.css");
+
 var _excluded = ["data"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -95,7 +97,7 @@ var DynamicKr = function DynamicKr(_ref) {
     onClick: handleClickKrTitle
   }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {
     text: /*#__PURE__*/_react["default"].createElement(_searchKeyHandle["default"], {
-      str: name,
+      str: (0, _tools.htmlDecodeByRegExp)(name),
       keyWord: searchKeyWord
     }),
     isPercent: true

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

@@ -25,6 +25,8 @@ var _tooltip = _interopRequireDefault(require("../../../tooltip"));
 
 var _getLocale = require("../../../../utils/getLocale");
 
+var _tools = require("../../../../utils/tools");
+
 require("./index.css");
 
 var _excluded = ["data"];
@@ -81,7 +83,7 @@ var DynamicMilestone = function DynamicMilestone(_ref) {
       className: "".concat(prefix, "__content-title-text"),
       onClick: handleClickTaskTitle
     }, /*#__PURE__*/_react["default"].createElement(_searchKeyHandle["default"], {
-      str: name,
+      str: (0, _tools.htmlDecodeByRegExp)(name),
       keyWord: searchKeyWord
     }));
   }, [name, searchKeyWord]);

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

@@ -33,6 +33,8 @@ var _conditionRender = _interopRequireDefault(require("../../../condition-render
 
 var _tooltip = _interopRequireDefault(require("../../../tooltip"));
 
+var _tools = require("../../../../utils/tools");
+
 require("./index.css");
 
 var _excluded = ["data"];
@@ -142,7 +144,7 @@ var DynamicProgress = function DynamicProgress(_ref) {
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__title")
   }, /*#__PURE__*/_react["default"].createElement(_title["default"], _extends({
-    content: obj === null || obj === void 0 ? void 0 : obj.objName,
+    content: (0, _tools.htmlDecodeByRegExp)(obj === null || obj === void 0 ? void 0 : obj.objName),
     onClickTitle: handleClickTitle
   }, (0, _utils.getDynamicTitleProps)(obj)))), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__status")

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

@@ -25,6 +25,8 @@ var _tooltip = _interopRequireDefault(require("../../../tooltip"));
 
 var _getLocale = require("../../../../utils/getLocale");
 
+var _tools = require("../../../../utils/tools");
+
 require("./index.css");
 
 var _excluded = ["data"];
@@ -65,7 +67,7 @@ var DynamicProject = function DynamicProject(_ref) {
       className: "".concat(prefix, "__content-title-text"),
       onClick: handleClickTitle
     }, /*#__PURE__*/_react["default"].createElement(_searchKeyHandle["default"], {
-      str: workName,
+      str: (0, _tools.htmlDecodeByRegExp)(workName),
       keyWord: searchKeyWord
     }));
   }, [workName, searchKeyWord]);

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

@@ -37,6 +37,8 @@ var _dynamicRelaProject = _interopRequireDefault(require("./img/dynamic-rela-pro
 
 var _dynamicRelaTask = _interopRequireDefault(require("./img/dynamic-rela-task.png"));
 
+var _tools = require("../../../../utils/tools");
+
 require("./index.css");
 
 var _excluded = ["data"];
@@ -144,7 +146,7 @@ var DynamicRelative = function DynamicRelative(_ref) {
   }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {
     isPercent: true,
     text: /*#__PURE__*/_react["default"].createElement(_searchKeyHandle["default"], {
-      str: relateObjName,
+      str: (0, _tools.htmlDecodeByRegExp)(relateObjName),
       keyWord: searchKeyWord
     })
   })), /*#__PURE__*/_react["default"].createElement("div", {
@@ -181,7 +183,7 @@ var DynamicRelative = function DynamicRelative(_ref) {
     }
   }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {
     isPercent: true,
-    text: objName
+    text: (0, _tools.htmlDecodeByRegExp)(objName)
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__obj-other-info")
   }, /*#__PURE__*/_react["default"].createElement("span", {

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

@@ -113,7 +113,7 @@ var DynamicReply = function DynamicReply(_ref) {
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__content-title")
   }, /*#__PURE__*/_react["default"].createElement(_title["default"], {
-    content: data.name,
+    content: (0, _tools.htmlDecodeByRegExp)(data.name),
     onClickTitle: handleClickTitle,
     type: getEReportType(reportType),
     typeBgColor: "rgba(92, 142, 255, 0.5)",

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

@@ -96,3 +96,8 @@
   cursor: default !important;
   color: #3f4755 !important;
 }
+
+.titaui-dynamic-reward-item__reward-img {
+  width: 25px;
+  margin-left: 8px;
+}

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

@@ -33,6 +33,10 @@ var _openData = require("../../../../utils/open-data");
 
 var _getLocale = require("../../../../utils/getLocale");
 
+var _utils = require("../dynamic-progress/utils");
+
+var _reward = _interopRequireDefault(require("./img/reward.png"));
+
 require("./index.css");
 
 var _excluded = ["data"];
@@ -60,7 +64,6 @@ var DynamicReward = function DynamicReward(_ref) {
   var rewardContent = data.rewardContent,
       rewardTags = data.rewardTags,
       obj = data.obj,
-      classify = data.classify,
       rewardUser = data.rewardUser,
       publishUser = data.publishUser;
 
@@ -93,47 +96,6 @@ var DynamicReward = function DynamicReward(_ref) {
     }
   };
 
-  var renderTitle = (0, _react.useMemo)(function () {
-    if (!obj) {
-      return "";
-    }
-
-    var objType = obj.objType,
-        objName = obj.objName;
-
-    if (objType === _constant.EObjType.Kr) {
-      return "KR\uFF1A".concat(objName);
-    }
-
-    if (objType === _constant.EObjType.O) {
-      return "O\uFF1A".concat(objName);
-    }
-
-    if (objType === _constant.EObjType.Task) {
-      return "".concat((0, _getLocale.getLocale)("Mod_Tasks"), "\uFF1A").concat(objName);
-    }
-
-    if (objType === _constant.EObjType.Project) {
-      return "".concat((0, _getLocale.getLocale)("Mod_Project"), "\uFF1A").concat(objName);
-    }
-
-    if (objType === _constant.EObjType.Assess) {
-      return "".concat((0, _getLocale.getLocale)("Mod_Performance"), "\uFF1A").concat(objName);
-    }
-
-    return "";
-  }, []);
-  var Classify = (0, _react.useMemo)(function () {
-    var _classNames;
-
-    if (!classify || Number(classify) === 0) {
-      return "";
-    }
-
-    return /*#__PURE__*/_react["default"].createElement("span", {
-      className: (0, _classnames["default"])("".concat(prefix, "__classify"), (_classNames = {}, _defineProperty(_classNames, "".concat(prefix, "__classify--desire"), classify === 1), _defineProperty(_classNames, "".concat(prefix, "__classify--promise"), classify === 2), _classNames))
-    });
-  }, [classify]);
   var renderDesc = (0, _react.useMemo)(function () {
     var url = ""; // const url = getUrlForUserPage({
     //   userId: rewardUser.name,
@@ -155,7 +117,11 @@ var DynamicReward = function DynamicReward(_ref) {
     }, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
       name: rewardUser.name,
       id: rewardUser.userId
-    })), (0, _getLocale.getLocale)("OKR_MyO_E_Reward")));
+    })), (0, _getLocale.getLocale)("OKR_MyO_E_Reward"), /*#__PURE__*/_react["default"].createElement("img", {
+      alt: "",
+      src: _reward["default"],
+      className: "".concat(prefix, "__reward-img")
+    })));
   }, []);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix
@@ -167,14 +133,13 @@ var DynamicReward = function DynamicReward(_ref) {
     className: "".concat(prefix, "__content")
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__title")
-  }, renderTitle && /*#__PURE__*/_react["default"].createElement(_title["default"], {
-    content: renderTitle,
-    onClickTitle: handleClickTitle,
-    suffixContent: Classify
-  })), rewardContent && /*#__PURE__*/_react["default"].createElement("div", {
+  }, obj && obj.objName && /*#__PURE__*/_react["default"].createElement(_title["default"], _extends({
+    content: (0, _tools.htmlDecodeByRegExp)(obj.objName),
+    onClickTitle: handleClickTitle
+  }, (0, _utils.getDynamicTitleProps)(obj)))), rewardContent && /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__description"),
     style: {
-      marginTop: renderTitle ? "12px" : "0"
+      marginTop: obj && obj.objName ? "12px" : "0"
     }
   }, /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("img", {
     className: (0, _classnames["default"])("".concat(prefix, "__description-quoto"), "".concat(prefix, "__description-quoto--left")),
@@ -188,7 +153,7 @@ var DynamicReward = function DynamicReward(_ref) {
     alt: "",
     src: _dynamicRightQuoto["default"]
   }), rewardTags && rewardTags.length && rewardTags.map(function (reward) {
-    return /*#__PURE__*/_react["default"].createElement("span", {
+    return reward.tagName && /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(prefix, "__reward-tag"),
       style: {
         background: (0, _tools.hexToRgba)(reward.color, 0.2),

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

@@ -69,6 +69,12 @@ 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; }
 
+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; }
+
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -98,7 +104,9 @@ var DynamicItem = function DynamicItem(_ref) {
   var feedId = data.feedId,
       feedComments = data.feedComments,
       praiseType = data.praiseType,
-      praiseUsers = data.praiseUsers;
+      praiseUsers = data.praiseUsers,
+      feedType = data.feedType,
+      publishUser = data.publishUser;
 
   var _useState = (0, _react.useState)(feedComments.total > 0),
       _useState2 = _slicedToArray(_useState, 2),
@@ -281,20 +289,24 @@ var DynamicItem = function DynamicItem(_ref) {
     }
 
     return count || type;
-  }; // const handlePayReward = () => {
-  //   const data = {
-  //     multi: false,
-  //     toUserInfo: publishUser,
-  //     objId: feedId,
-  //     objType: feedType,
-  //   };
-  //   if (window.util) {
-  //     window.util.rewardGetFile((myReward) => {
-  //       myReward.renderPayReward(data);
-  //     });
-  //   }
-  // };
+  };
 
+  var handlePayReward = function handlePayReward() {
+    var data = {
+      multi: false,
+      toUserInfo: _objectSpread(_objectSpread({}, publishUser), {}, {
+        id: publishUser.userId
+      }),
+      objId: feedId,
+      objType: feedType
+    };
+
+    if (window.util) {
+      window.util.rewardGetFile(function (myReward) {
+        myReward.renderPayReward(data);
+      });
+    }
+  };
 
   (0, _react.useEffect)(function () {
     setTimeout(function () {
@@ -358,6 +370,9 @@ var DynamicItem = function DynamicItem(_ref) {
   }, (0, _getLocale.getLocale)("Mod_Fold"), /*#__PURE__*/_react["default"].createElement("i", {
     className: (0, _classnames["default"])("tu-icon-arrow-down", "".concat(prefix, "__icon"), "".concat(prefix, "__icon-up"))
   }))), /*#__PURE__*/_react["default"].createElement("span", {
+    onClick: handlePayReward,
+    className: (0, _classnames["default"])("tu-icon-red-envelopes", "".concat(prefix, "__footer-icon"))
+  }), /*#__PURE__*/_react["default"].createElement("span", {
     onClick: handleCommentClick,
     className: (0, _classnames["default"])("tu-icon-pinglun-m", "".concat(prefix, "__footer-icon"))
   }, /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {

package/lib/components/dynamic/dynamic.js

@@ -269,7 +269,7 @@ var Dynamic = function Dynamic() {
       } // 滚动到距离底部40px之后加载新的数据
 
 
-      if (contentDom.scrollHeight - contentDom.scrollTop <= contentDom.offsetHeight) {
+      if (contentDom.scrollHeight - contentDom.scrollTop <= contentDom.offsetHeight + 40) {
         // 滚动加载防止重复请求
         if (noMoreData || isLoadingMore) {
           return;

package/lib/components/nav-top/components/menu/index.css

@@ -13,6 +13,7 @@
   font-weight: 600;
   cursor: pointer;
   color: #ffffff;
+  position: relative;
 }
 
 .titaui-nav-top-menu__menu-show:hover {
@@ -38,6 +39,18 @@
   transform: translate(-50%, 0);
 }
 
+.titaui-nav-top-menu__menu--hasPoint::before {
+  content: '';
+  position: absolute;
+  width: 6px;
+  height: 6px;
+  background: #f05e5e;
+  border: 2px solid #2879ff;
+  border-radius: 50%;
+  right: 12px;
+  top: 10px;
+}
+
 .titaui-nav-top-menu__hide-menus {
   display: flex;
   flex-direction: column;

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

@@ -19,6 +19,8 @@ var _popup = _interopRequireDefault(require("../../../popup"));
 
 var _conditionRender = _interopRequireDefault(require("../../../../components/condition-render"));
 
+var _useGlobalValue3 = _interopRequireDefault(require("../../useGlobalValue"));
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -60,6 +62,10 @@ var Menu = function Menu(_ref) {
       popupVisible = _useState2[0],
       setPopupVisible = _useState2[1];
 
+  var _useGlobalValue = (0, _useGlobalValue3["default"])(),
+      _useGlobalValue2 = _slicedToArray(_useGlobalValue, 1),
+      feedNum = _useGlobalValue2[0];
+
   var containerRef = (0, _react.useRef)();
   var apiPath = (0, _bsGlobal.getBSGlobal)("apiPath");
   var userId = (0, _bsGlobal.getUserInfo)().Id;
@@ -83,12 +89,14 @@ var Menu = function Menu(_ref) {
   };
 
   var renderRawItem = function renderRawItem(menu) {
+    var _classNames;
+
     return /*#__PURE__*/_react["default"].createElement(_rcOverflow["default"].Item, {
       component: "span"
     }, /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
       condition: menu.title !== "Learning"
     }, /*#__PURE__*/_react["default"].createElement("a", {
-      className: (0, _classnames["default"])("".concat(prefix, "__menu-show"), _defineProperty({}, "".concat(prefix, "__menu-show--active"), activeMenuId === menu.id)),
+      className: (0, _classnames["default"])("".concat(prefix, "__menu-show"), (_classNames = {}, _defineProperty(_classNames, "".concat(prefix, "__menu-show--active"), activeMenuId === menu.id), _defineProperty(_classNames, "".concat(prefix, "__menu--hasPoint"), menu.id === 21841 && feedNum > 0), _classNames)),
       href: "".concat(menu.href),
       target: "_self",
       onClick: function onClick() {

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

@@ -27,6 +27,8 @@ var _request = require("../../request.apis");
 
 var _bell3x = _interopRequireDefault(require("./images/bell@3x.png"));
 
+var _useGlobalValue = _interopRequireDefault(require("../../useGlobalValue"));
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -82,6 +84,8 @@ function UserMessage() {
       firstTab = _useState12[0],
       setFirstTab = _useState12[1];
 
+  var setFeedNum = (0, _useGlobalValue["default"])()[1];
+
   var handleShowInfos = function handleShowInfos() {
     setPopupVisible(true);
   };
@@ -137,18 +141,28 @@ function UserMessage() {
 
         var enterpriseMedalMsg = indicators.filter(function (item) {
           return item.messageType === 1 && item.indicatorType === 1969002;
-        }); // @ts-ignore
+        });
 
-        enterpriseMedalMsg.length > 0 && window.util.upaasEnterpriseMedal(); // upaas 勋章
+        if (enterpriseMedalMsg.length > 0) {
+          window.util.upaasEnterpriseMedal();
+        } // upaas 勋章
 
-        var medalDetail = (0, _bsGlobal.getBSGlobal)("medalDetail"); // @ts-ignore
 
-        medalDetail && window.util.upaasMedal()(medalDetail); // 红包
+        var medalDetail = (0, _bsGlobal.getBSGlobal)("medalDetail");
+
+        if (medalDetail) {
+          window.util.upaasMedal()(medalDetail);
+        } // 红包
+
 
         var mRedPackIndicator = indicators.filter(function (item) {
           return item.type === "mRedPackIndicator";
         });
-        mRedPackIndicator.length > 0 && setRedPackNum(mRedPackIndicator[0].value); // 祝福，拆礼物
+
+        if (mRedPackIndicator.length > 0) {
+          setRedPackNum(mRedPackIndicator[0].value);
+        } // 祝福，拆礼物
+
 
         var blessIndicator = indicators.filter(function (item) {
           return item.type === "mZhufu";
@@ -173,6 +187,15 @@ function UserMessage() {
 
           (_window = window) === null || _window === void 0 ? void 0 : _window.Talent.app.vent.trigger("open-weekly-report-modal");
         }
+
+        var feedInfo = indicators.find(function (item) {
+          return item.type === "feedAboutMeIndicator";
+        });
+
+        if (feedInfo) {
+          // @ts-ignore
+          setFeedNum(feedInfo.value);
+        }
       }
     });
   };
@@ -203,7 +226,8 @@ function UserMessage() {
     className: (0, _classnames["default"])("".concat(prefixCls, "__msg-total"))
   }, infosNum > 100 ? "99+" : infosNum)), /*#__PURE__*/_react["default"].createElement("img", {
     src: _bell3x["default"],
-    className: (0, _classnames["default"])(_defineProperty({}, "".concat(prefixCls, "__msg-dot"), infosNum !== preData))
+    className: (0, _classnames["default"])(_defineProperty({}, "".concat(prefixCls, "__msg-dot"), infosNum !== preData)),
+    alt: ""
   }))), /*#__PURE__*/_react["default"].createElement(_redPack["default"], {
     redPackNum: redPackNum
   }));

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

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _useGlobalState = _interopRequireDefault(require("../../hooks/useGlobalState"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+var useGlobalValue = (0, _useGlobalState["default"])(0);
+var _default = useGlobalValue;
+exports["default"] = _default;

package/lib/hooks/useGlobalState.js

@@ -0,0 +1,63 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createGlobalState = createGlobalState;
+exports["default"] = void 0;
+
+var _react = require("react");
+
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+function createGlobalState(initialState) {
+  var store = {
+    state: initialState,
+    setState: function setState(state) {
+      if (Object.prototype.toString.call(state) === "[object Function]") {
+        var stateFunc = state;
+        store.state = stateFunc(store.state);
+      } else {
+        store.state = state;
+      }
+
+      store.setters.forEach(function (setter) {
+        return setter(store.state);
+      });
+    },
+    setters: []
+  };
+  return function () {
+    var _useState = (0, _react.useState)(store.state),
+        _useState2 = _slicedToArray(_useState, 2),
+        globalState = _useState2[0],
+        stateSetter = _useState2[1];
+
+    (0, _react.useEffect)(function () {
+      return function () {
+        store.setters = store.setters.filter(function (setter) {
+          return setter !== stateSetter;
+        });
+      };
+    }, []);
+    (0, _react.useLayoutEffect)(function () {
+      if (!store.setters.includes(stateSetter)) {
+        store.setters.push(stateSetter);
+      }
+    });
+    return [globalState, store.setState];
+  };
+}
+
+var _default = createGlobalState;
+exports["default"] = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.10.16",
+  "version": "1.10.17",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",