@titaui/pc 1.6.15 → 1.6.16

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

@@ -13,22 +13,20 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _rcVirtualList = _interopRequireDefault(require("rc-virtual-list"));
 
-var _default2 = _interopRequireDefault(require("../../../../../../components/avatar/default"));
-
 var _conditionRender = _interopRequireDefault(require("../../../../../dynamic/components/condition-render"));
 
-var _tooltipText = _interopRequireDefault(require("../../../../../tooltip/tooltip-text"));
-
 var _request = require("../../../../request.apis");
 
 var _empty = _interopRequireDefault(require("../empty"));
 
-var _loading = _interopRequireDefault(require("../../images/loading.gif"));
+var _informItem = _interopRequireDefault(require("./inform-item"));
 
-require("./index.css");
+var _loading = _interopRequireDefault(require("../../images/loading.gif"));
 
 var _constant = require("../../constant");
 
+require("./index.css");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -71,67 +69,7 @@ var Inform = function Inform(props) {
       isLoading = _useState4[0],
       setIsLoading = _useState4[1];
 
-  var handleItemClick = function handleItemClick(e, data) {
-    onItemClick && onItemClick(false);
-    var isMessageMerging = data.messageType == 13018 || data.messageType == 30362 || data.messageType == 131;
-
-    if (!isMessageMerging) {
-      window.open("".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#more/taskinfo?Id=").concat(data.objId), "_blank");
-      return;
-    }
-
-    var type = "eReport"; // E-周报提醒消息合并
-
-    if (data.messageType == "83") {
-      // 项目，目标进展提醒消息合并
-      type = "objective";
-    } else if (Number(data.messageType) > 93 && Number(data.messageType) <= 100) {
-      // OKR 仪表盘消息提醒
-      type = "okrDashBoard";
-    } else if (data.messageType == 131) {
-      type = "performance";
-    }
-
-    var options = {
-      width: 680,
-      showScroll: true,
-      type: "message",
-      // 推屏类型
-      data: {
-        type: type,
-        // 消息类型
-        objId: data.messageId,
-        objType: data.messageType,
-        startDate: "",
-        endDate: ""
-      }
-    };
-
-    if (data.messageType == 83) {
-      options.data.objType = data.messageType;
-      options.data.startDate = data.createTime;
-    } else if (data.messageType > 93 && data.messageType <= 100) {
-      options.data.startDate = data.createTime;
-    } else if (data.messageType == 131) {
-      options.data.objType = data.objId.split("_")[0];
-      options.data.startDate = data.objId.split("_")[1];
-      options.data.endDate = data.objId.split("_")[2];
-    } else {
-      var regex = /\（(.+?)\）/g,
-          content = e.target.textContent;
-      var date = [];
-      date = content.match(regex); // @ts-ignore
-
-      options.data.startDate = date[0].slice(1, date[0].length - 1).split("-")[0]; // @ts-ignore
-
-      options.data.endDate = date[0].slice(1, date[0].length - 1).split("-")[1];
-    } // @ts-ignore
-
-
-    Talent.app.vent.trigger("openReactScreenPush", options);
-  };
-
-  var _useState5 = (0, _react.useState)(1),
+  var _useState5 = (0, _react.useState)(2),
       _useState6 = _slicedToArray(_useState5, 2),
       pageNum = _useState6[0],
       setPageNum = _useState6[1];
@@ -153,18 +91,17 @@ var Inform = function Inform(props) {
         scrollHeight = _e$target.scrollHeight;
 
     if (offsetHeight + scrollTop >= scrollHeight - 100) {
-      setPageNum(pageNum + 1);
-
       if (!isRequest) {
         setIsRequest(true);
 
-        if (pageNum <= Math.ceil(replysData / 20)) {
+        if (pageNum <= Math.ceil(replysData / 10)) {
           (0, _request.getInforms)(pageNum).then(function (res) {
             if (res.Code === 1) {
               setInforms([].concat(_toConsumableArray(informs), _toConsumableArray(res.Data.todos)));
             }
 
             setIsRequest(false);
+            setPageNum(pageNum + 1);
           });
         }
       }
@@ -177,11 +114,10 @@ var Inform = function Inform(props) {
         if (res.Data.total || res.Data.messags && res.Data.messags.length) {
           setInforms(res.Data.messags);
           setReplysData(res.Data.total);
-          setIsLoading(false);
-        } else {
-          setIsLoading(false);
         }
       }
+
+      setIsLoading(false);
     });
   }, []);
   return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
@@ -201,40 +137,11 @@ var Inform = function Inform(props) {
       return onScrollBottom(e);
     }
   }, function (item) {
-    return /*#__PURE__*/_react["default"].createElement("li", {
-      className: (0, _classnames["default"])("".concat(preCls, "__item")),
-      key: item.messageId
-    }, /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])("".concat(preCls, "__item-photo"))
-    }, /*#__PURE__*/_react["default"].createElement(_default2["default"], {
-      userId: userInfo.Id,
-      name: userInfo.Name,
-      color: userInfo.UserAvatar.Color,
-      src: userInfo.Avatar
-    })), /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])("".concat(preCls, "__item-right"))
-    }, /*#__PURE__*/_react["default"].createElement("a", {
-      target: "_blank",
-      onClick: function onClick(e) {
-        handleItemClick(e, item);
-      }
-    }, /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])("".concat(preCls, "__item-right-name"))
-    }, /*#__PURE__*/_react["default"].createElement(_tooltipText["default"], {
-      overlayClassName: "".concat(preCls, "__item-right-name-tooltip"),
-      text: item.user.name,
-      maxWidth: 100,
-      mouseEnterDelay: 0.8
-    })), /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])("".concat(preCls, "__item-right-content"))
-    }, /*#__PURE__*/_react["default"].createElement(_tooltipText["default"], {
-      overlayClassName: "".concat(preCls, "__item-right-content-tooltip"),
-      text: (0, _constant.htmlToText)(item.content),
-      isPercent: true,
-      mouseEnterDelay: 0.8
-    })), /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])("".concat(preCls, "__item-right-time"))
-    }, item.createTime))));
+    return /*#__PURE__*/_react["default"].createElement(_informItem["default"], {
+      item: item,
+      userInfo: userInfo,
+      onItemClick: onItemClick
+    });
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__footer"))
   }, /*#__PURE__*/_react["default"].createElement("a", {

package/lib/components/nav-top/components/user-message/components/inform/inform-item.js

@@ -0,0 +1,133 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _default2 = _interopRequireDefault(require("../../../../../../components/avatar/default"));
+
+var _tooltipText = _interopRequireDefault(require("../../../../../tooltip/tooltip-text"));
+
+var _utils = require("../../utils");
+
+var _constant = require("../../constant");
+
+require("./index.css");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+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 preCls = "titaui-user-message-msg-inform";
+
+var Inform = function Inform(props) {
+  var item = props.item,
+      userInfo = props.userInfo,
+      onItemClick = props.onItemClick;
+  var domRef = (0, _react.useRef)();
+
+  var handleItemClick = function handleItemClick() {
+    onItemClick && onItemClick(false);
+    var isMessageMerging = item.messageType == 13018 || item.messageType == 30362 || item.messageType == 131;
+
+    if (!isMessageMerging) {
+      window.open("".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#more/taskinfo?Id=").concat(item.objId), "_blank");
+      return;
+    }
+
+    var type = "eReport"; // E-周报提醒消息合并
+
+    if (item.messageType == "83") {
+      // 项目，目标进展提醒消息合并
+      type = "objective";
+    } else if (Number(item.messageType) > 93 && Number(item.messageType) <= 100) {
+      // OKR 仪表盘消息提醒
+      type = "okrDashBoard";
+    } else if (item.messageType == 131) {
+      type = "performance";
+    }
+
+    var options = {
+      width: 680,
+      showScroll: true,
+      type: "message",
+      // 推屏类型
+      data: {
+        type: type,
+        // 消息类型
+        objId: item.messageId,
+        objType: item.messageType,
+        startDate: "",
+        endDate: ""
+      }
+    };
+
+    if (item.messageType == 83) {
+      options.data.objType = item.messageType;
+      options.data.startDate = item.createTime;
+    } else if (item.messageType > 93 && item.messageType <= 100) {
+      options.data.startDate = item.createTime;
+    } else if (item.messageType == 131) {
+      options.data.objType = item.objId.split("_")[0];
+      options.data.startDate = item.objId.split("_")[1];
+      options.data.endDate = item.objId.split("_")[2];
+    } else {
+      var regex = /\（(.+?)\）/g,
+          content = domRef.current.textContent;
+      var date = [];
+      date = content.match(regex); // @ts-ignore
+
+      options.data.startDate = date[0].slice(1, date[0].length - 1).split("-")[0]; // @ts-ignore
+
+      options.data.endDate = date[0].slice(1, date[0].length - 1).split("-")[1];
+    } // @ts-ignore
+
+
+    Talent.app.vent.trigger("openReactScreenPush", options);
+  };
+
+  return /*#__PURE__*/_react["default"].createElement("li", {
+    className: (0, _classnames["default"])("".concat(preCls, "__item")),
+    key: item.messageId,
+    onClick: handleItemClick
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])("".concat(preCls, "__item-photo"))
+  }, /*#__PURE__*/_react["default"].createElement(_default2["default"], {
+    userId: userInfo.Id,
+    name: userInfo.Name,
+    color: userInfo.UserAvatar.Color,
+    src: userInfo.Avatar
+  })), /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])("".concat(preCls, "__item-right"))
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    ref: domRef
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])("".concat(preCls, "__item-right-name"))
+  }, /*#__PURE__*/_react["default"].createElement(_tooltipText["default"], {
+    overlayClassName: "".concat(preCls, "__item-right-name-tooltip"),
+    text: item.user.name,
+    maxWidth: 100,
+    mouseEnterDelay: 0.8
+  })), /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])("".concat(preCls, "__item-right-content"))
+  }, /*#__PURE__*/_react["default"].createElement(_tooltipText["default"], {
+    overlayClassName: "".concat(preCls, "__item-right-content-tooltip"),
+    text: (0, _utils.deleteText)((0, _utils.htmlToText)(item.content)),
+    isPercent: true,
+    mouseEnterDelay: 0.8
+  })), /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])("".concat(preCls, "__item-right-time"))
+  }, item.createTime))));
+};
+
+var _default = Inform;
+exports["default"] = _default;

package/lib/components/nav-top/components/user-message/components/remind/index.css

@@ -10,6 +10,7 @@
   border-radius: 12px;
   margin-bottom: 4px;
   margin-left: 12px;
+  cursor: pointer;
 }
 
 .titaui-user-message-msg-remind__item:first-of-type {

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

@@ -13,8 +13,6 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _rcVirtualList = _interopRequireDefault(require("rc-virtual-list"));
 
-var _tooltipText = _interopRequireDefault(require("../../../../../tooltip/tooltip-text"));
-
 var _conditionRender = _interopRequireDefault(require("../../../../../dynamic/components/condition-render"));
 
 var _request = require("../../../../../../utils/request");
@@ -23,14 +21,12 @@ var _request2 = require("../../../../request.apis");
 
 var _empty = _interopRequireDefault(require("../empty"));
 
-var _appTixing = _interopRequireDefault(require("../../images/app-tixing.svg"));
+var _remindItem = _interopRequireDefault(require("./remind-item"));
 
 var _loading = _interopRequireDefault(require("../../images/loading.gif"));
 
 require("./index.css");
 
-var _constant = require("../../constant");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -64,10 +60,6 @@ var Remind = function Remind(props) {
       isLoading = _useState4[0],
       setIsLoading = _useState4[1];
 
-  var handleRemindClick = function handleRemindClick() {
-    onItemClick && onItemClick(false);
-  };
-
   var deleteTask = function deleteTask(remind) {
     var remindpath = "remind/close?remindId=".concat(remind.id);
     (0, _request.rpost)("v2")(remindpath, remind);
@@ -95,10 +87,9 @@ var Remind = function Remind(props) {
     (0, _request2.getReminds)().then(function (res) {
       if (res.Data.length) {
         setReminds(res.Data);
-        setIsLoading(false);
-      } else {
-        setIsLoading(false);
       }
+
+      setIsLoading(false);
     });
   }, []);
   return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
@@ -115,42 +106,11 @@ var Remind = function Remind(props) {
     height: 386,
     itemKey: "id"
   }, function (item) {
-    return /*#__PURE__*/_react["default"].createElement("li", {
-      className: (0, _classnames["default"])("".concat(preCls, "__item")),
-      key: item.id
-    }, /*#__PURE__*/_react["default"].createElement("img", {
-      src: _appTixing["default"],
-      className: (0, _classnames["default"])("".concat(preCls, "__item-photo"))
-    }), /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])("".concat(preCls, "__item-right"))
-    }, /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])("".concat(preCls, "__item-right-name"))
-    }, /*#__PURE__*/_react["default"].createElement("span", null, "\u4EFB\u52A1"), /*#__PURE__*/_react["default"].createElement("span", {
-      className: (0, _classnames["default"])("".concat(preCls, "__item-right-name-status"))
-    }, item.content)), /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])("".concat(preCls, "__item-right-content"))
-    }, /*#__PURE__*/_react["default"].createElement(_tooltipText["default"], {
-      overlayClassName: "".concat(preCls, "__item-right-content-tooltip"),
-      text: item.objName,
-      isPercent: true,
-      mouseEnterDelay: 0.8
-    }))), /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])("".concat(preCls, "__item-handle"))
-    }, /*#__PURE__*/_react["default"].createElement("span", {
-      className: (0, _classnames["default"])("".concat(preCls, "__item-handle-ignore")),
-      onClick: function onClick() {
-        return deleteTask(item);
-      }
-    }, "\u5FFD\u7565"), /*#__PURE__*/_react["default"].createElement("a", {
-      target: "_blank",
-      href: "".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#more/taskinfo?Id=").concat(item.objId),
-      onClick: handleRemindClick
-    }, /*#__PURE__*/_react["default"].createElement("span", {
-      className: (0, _classnames["default"])("".concat(preCls, "__item-handle-deal")),
-      onClick: function onClick() {
-        return deleteTask(item);
-      }
-    }, "\u53BB\u5904\u7406"))));
+    return /*#__PURE__*/_react["default"].createElement(_remindItem["default"], {
+      item: item,
+      onItemClick: onItemClick,
+      deleteTask: deleteTask
+    });
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__footer"))
   }, /*#__PURE__*/_react["default"].createElement("span", {

package/lib/components/nav-top/components/user-message/components/remind/remind-item.js

@@ -0,0 +1,71 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _tooltipText = _interopRequireDefault(require("../../../../../tooltip/tooltip-text"));
+
+var _appTixing = _interopRequireDefault(require("../../images/app-tixing.svg"));
+
+var _constant = require("../../constant");
+
+require("./index.css");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+var preCls = "titaui-user-message-msg-remind";
+
+var Remind = function Remind(props) {
+  var item = props.item,
+      onItemClick = props.onItemClick,
+      deleteTask = props.deleteTask;
+
+  var handleRemindClick = function handleRemindClick() {
+    onItemClick && onItemClick(false);
+  };
+
+  var deleteOneTask = function deleteOneTask() {
+    deleteTask(item);
+  };
+
+  return /*#__PURE__*/_react["default"].createElement("li", {
+    className: (0, _classnames["default"])("".concat(preCls, "__item")),
+    key: item.id
+  }, /*#__PURE__*/_react["default"].createElement("img", {
+    src: _appTixing["default"],
+    className: (0, _classnames["default"])("".concat(preCls, "__item-photo"))
+  }), /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])("".concat(preCls, "__item-right"))
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])("".concat(preCls, "__item-right-name"))
+  }, /*#__PURE__*/_react["default"].createElement("span", null, "\u4EFB\u52A1"), /*#__PURE__*/_react["default"].createElement("span", {
+    className: (0, _classnames["default"])("".concat(preCls, "__item-right-name-status"))
+  }, item.content)), /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])("".concat(preCls, "__item-right-content"))
+  }, /*#__PURE__*/_react["default"].createElement(_tooltipText["default"], {
+    overlayClassName: "".concat(preCls, "__item-right-content-tooltip"),
+    text: item.objName,
+    isPercent: true,
+    mouseEnterDelay: 0.8
+  }))), /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])("".concat(preCls, "__item-handle"))
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    className: (0, _classnames["default"])("".concat(preCls, "__item-handle-ignore")),
+    onClick: deleteOneTask
+  }, "\u5FFD\u7565"), /*#__PURE__*/_react["default"].createElement("a", {
+    target: "_blank",
+    href: "".concat(_constant.apiServer, "/u/").concat(_constant.userId, "/Home#more/taskinfo?Id=").concat(item.objId),
+    onClick: handleRemindClick
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    className: (0, _classnames["default"])("".concat(preCls, "__item-handle-deal"))
+  }, "\u53BB\u5904\u7406"))));
+};
+
+var _default = Remind;
+exports["default"] = _default;

package/lib/components/nav-top/components/user-message/components/reply/index.css

@@ -20,6 +20,7 @@
   border-radius: 12px;
   margin-bottom: 4px;
   margin-left: 12px;
+  cursor: pointer;
 }
 
 .titaui-user-message-msg-reply__item:first-of-type {

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

@@ -13,22 +13,20 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _rcVirtualList = _interopRequireDefault(require("rc-virtual-list"));
 
-var _default2 = _interopRequireDefault(require("../../../../../../components/avatar/default"));
-
 var _conditionRender = _interopRequireDefault(require("../../../../../dynamic/components/condition-render"));
 
-var _tooltipText = _interopRequireDefault(require("../../../../../tooltip/tooltip-text"));
-
 var _empty = _interopRequireDefault(require("../empty"));
 
+var _replyItem = _interopRequireDefault(require("./reply-item"));
+
 var _request = require("../../../../request.apis");
 
+var _constant = require("../../constant");
+
 var _loading = _interopRequireDefault(require("../../images/loading.gif"));
 
 require("./index.css");
 
-var _constant = require("../../constant");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -75,7 +73,7 @@ var Reply = function Reply(props) {
       isLoading = _useState6[0],
       setIsLoading = _useState6[1];
 
-  var _useState7 = (0, _react.useState)(1),
+  var _useState7 = (0, _react.useState)(2),
       _useState8 = _slicedToArray(_useState7, 2),
       pageNum = _useState8[0],
       setPageNum = _useState8[1];
@@ -85,10 +83,6 @@ var Reply = function Reply(props) {
       isRequest = _useState10[0],
       setIsRequest = _useState10[1];
 
-  var handleReplyClick = function handleReplyClick() {
-    onItemClick && onItemClick(false);
-  };
-
   var onScrollBottom = function onScrollBottom(e) {
     var _e$target = e.target,
         offsetHeight = _e$target.offsetHeight,
@@ -96,18 +90,17 @@ var Reply = function Reply(props) {
         scrollHeight = _e$target.scrollHeight;
 
     if (offsetHeight + scrollTop >= scrollHeight - 100) {
-      setPageNum(pageNum + 1);
-
       if (!isRequest) {
         setIsRequest(true);
 
-        if (pageNum <= Math.ceil(replysData / 20)) {
+        if (pageNum <= Math.ceil(replysData / 10)) {
           (0, _request.getReplys)(pageNum).then(function (res) {
             if (res.Code === 1) {
               setReplys([].concat(_toConsumableArray(replys), _toConsumableArray(res.Data.todos)));
             }
 
             setIsRequest(false);
+            setPageNum(pageNum + 1);
           });
         }
       }
@@ -120,11 +113,10 @@ var Reply = function Reply(props) {
         if (res.Data.total || res.Data.messages && res.Data.messages.length) {
           setReplys(res.Data.messages);
           setReplysData(res.Data.total);
-          setIsLoading(false);
-        } else {
-          setIsLoading(false);
         }
       }
+
+      setIsLoading(false);
     });
   }, []);
   return /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
@@ -143,46 +135,11 @@ var Reply = function Reply(props) {
     onScroll: function onScroll(e) {
       return onScrollBottom(e);
     }
-  }, function (item, index) {
-    return /*#__PURE__*/_react["default"].createElement("li", {
-      className: (0, _classnames["default"])("".concat(preCls, "__item")),
-      key: index
-    }, /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])("".concat(preCls, "__item-photo"))
-    }, /*#__PURE__*/_react["default"].createElement(_default2["default"], {
-      userId: item.feed.user.userId,
-      name: item.feed.user.name,
-      color: item.feed.user.avatar.color,
-      src: item.feed.user.avatar.big
-    })), /*#__PURE__*/_react["default"].createElement("span", {
-      className: (0, _classnames["default"])("".concat(preCls, "__item-symbol"))
-    }, "\u201C"), /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])("".concat(preCls, "__item-right"))
-    }, /*#__PURE__*/_react["default"].createElement("a", {
-      target: "_blank",
-      href: "".concat(_constant.apiServer, "/").concat(_constant.userId, "/ITalentHome#more/shareinfo?id=").concat(item.feed.feedId),
-      onClick: handleReplyClick
-    }, /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])("".concat(preCls, "__item-right-header"))
-    }, /*#__PURE__*/_react["default"].createElement("span", {
-      className: (0, _classnames["default"])("".concat(preCls, "__item-right-header-name"))
-    }, /*#__PURE__*/_react["default"].createElement(_tooltipText["default"], {
-      overlayClassName: "".concat(preCls, "__item-right-header-name-tooltip"),
-      text: item.user.name,
-      maxWidth: 100,
-      mouseEnterDelay: 0.8
-    })), /*#__PURE__*/_react["default"].createElement("span", {
-      className: (0, _classnames["default"])("".concat(preCls, "__item-right-header-status"))
-    }, item.content.trim().substr(0, 1) === "@" ? "@我" : "回复我")), /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])("".concat(preCls, "__item-right-content"))
-    }, /*#__PURE__*/_react["default"].createElement(_tooltipText["default"], {
-      overlayClassName: "".concat(preCls, "__item-right-content-tooltip"),
-      text: (0, _constant.htmlToText)(item.content),
-      isPercent: true,
-      mouseEnterDelay: 0.8
-    })), /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])("".concat(preCls, "__item-right-time"))
-    }, item.createDate))));
+  }, function (item) {
+    return /*#__PURE__*/_react["default"].createElement(_replyItem["default"], {
+      item: item,
+      onItemClick: onItemClick
+    });
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__footer"))
   }, /*#__PURE__*/_react["default"].createElement("a", {