@titaui/pc 1.10.4 → 1.10.6-3.beta-2

package/lib/components/communication/CommunicationRecord.js

@@ -11,7 +11,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _reactTooltip = _interopRequireDefault(require("react-tooltip"));
 
-var _avatar = _interopRequireDefault(require("../../components-v1/avatar"));
+var _avatar = _interopRequireDefault(require("../avatar"));
 
 var _Portals = _interopRequireDefault(require("../../components-v1/portals/Portals"));
 
@@ -64,7 +64,11 @@ var CommunicationRecord = function CommunicationRecord(_ref) {
   return /*#__PURE__*/_react["default"].createElement(_style.CommunicationItem, {
     className: className
   }, /*#__PURE__*/_react["default"].createElement(_avatar["default"], {
-    size: _avatar["default"].size(7),
+    size: {
+      width: 28,
+      fontSize: 14,
+      textNum: 1
+    },
     name: communicationTrack.publishUser.name,
     src: communicationTrack.publishUser.avatar.small,
     color: communicationTrack.publishUser.avatar.color,
@@ -72,14 +76,20 @@ var CommunicationRecord = function CommunicationRecord(_ref) {
   }), /*#__PURE__*/_react["default"].createElement(_style.CommunicationDetail, null, /*#__PURE__*/_react["default"].createElement("p", {
     style: {
       color: "#3a4247",
-      wordBreak: "break-all"
+      wordBreak: "break-all",
+      display: 'flex',
+      alignItems: 'center'
     }
-  }, communicationTrack.commentType != 2 ? /*#__PURE__*/_react["default"].createElement("span", null, /*#__PURE__*/_react["default"].createElement(_ConvertUserName["default"], {
+  }, communicationTrack.commentType != 2 ? /*#__PURE__*/_react["default"].createElement("span", {
+    className: "".concat(prefix, "__communication-item")
+  }, /*#__PURE__*/_react["default"].createElement(_ConvertUserName["default"], {
     userName: communicationTrack.publishUser.name,
     userId: communicationTrack.publishUser.userId
   }), /*#__PURE__*/_react["default"].createElement("span", {
-    className: "".concat(prefix, "__communication-colon")
-  }, "\uFF1A")) : /*#__PURE__*/_react["default"].createElement("span", null, /*#__PURE__*/_react["default"].createElement(_ConvertUserName["default"], {
+    className: "".concat(prefix, "__communication-time")
+  }, communicationTrack.createDate)) : /*#__PURE__*/_react["default"].createElement("span", {
+    className: "".concat(prefix, "__communication-item")
+  }, /*#__PURE__*/_react["default"].createElement(_ConvertUserName["default"], {
     userName: communicationTrack.publishUser.name,
     userId: communicationTrack.publishUser.userId
   }), /*#__PURE__*/_react["default"].createElement("span", {
@@ -88,25 +98,21 @@ var CommunicationRecord = function CommunicationRecord(_ref) {
     userName: communicationTrack.parentUser.name,
     userId: communicationTrack.parentUser.userId
   }), /*#__PURE__*/_react["default"].createElement("span", {
-    className: "".concat(prefix, "__communication-colon")
-  }, "\uFF1A"), /*#__PURE__*/_react["default"].createElement(_Portals["default"], null, /*#__PURE__*/_react["default"].createElement(_reactTooltip["default"], {
+    className: "".concat(prefix, "__communication-time")
+  }, communicationTrack.createDate), /*#__PURE__*/_react["default"].createElement(_Portals["default"], null, /*#__PURE__*/_react["default"].createElement(_reactTooltip["default"], {
     html: true,
     className: "tt-react-tooltip",
     place: "top",
     type: "dark",
     effect: "solid"
-  }))), /*#__PURE__*/_react["default"].createElement("span", {
+  })))), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(prefix, "__communication-content"),
     ref: contentRef
-  }, (0, _openData.parseTag)(communicationTrack.content.trim()))), communicationTrack.attachments && /*#__PURE__*/_react["default"].createElement("div", {
+  }, (0, _openData.parseTag)(communicationTrack.content.trim())), communicationTrack.attachments && /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__communication-attachments")
   }, /*#__PURE__*/_react["default"].createElement(_fileList["default"], {
     data: communicationTrack.attachments
-  })), /*#__PURE__*/_react["default"].createElement("div", {
-    className: "".concat(prefix, "__communication-bottom")
-  }, /*#__PURE__*/_react["default"].createElement("span", {
-    className: "".concat(prefix, "__communication-time")
-  }, communicationTrack.createDate), /*#__PURE__*/_react["default"].createElement(_style.CommunicationActionbar, {
+  })), /*#__PURE__*/_react["default"].createElement(_style.CommunicationActionbar, {
     className: "communication__actionbar"
   }, /*#__PURE__*/_react["default"].createElement(_style.ActionbarList, null, /*#__PURE__*/_react["default"].createElement(_style.ActionbarItem, {
     onMouseDown: function onMouseDown(event) {
@@ -135,7 +141,7 @@ var CommunicationRecord = function CommunicationRecord(_ref) {
     onSubmit: function onSubmit(event) {
       return onCommunicationRecordChange(event, "delete", index);
     }
-  }, /*#__PURE__*/_react["default"].createElement(_style.ActionbarItem, null, (0, _getLocale.getLocale)("Mod_Delete"))))))), /*#__PURE__*/_react["default"].createElement(_reactTooltip["default"], {
+  }, /*#__PURE__*/_react["default"].createElement(_style.ActionbarItem, null, (0, _getLocale.getLocale)("Mod_Delete")))))), /*#__PURE__*/_react["default"].createElement(_reactTooltip["default"], {
     id: "praise-record",
     className: "tt-react-tooltip",
     place: "top",

package/lib/components/communication/index.css

@@ -1,21 +1,21 @@
-.titaui-communication__communication-text {
-  font-size: 14px;
-  color: #89919f;
-  line-height: 22px;
-  margin: 0 8px;
+.titaui-communication__communication-item {
+  display: flex;
+  align-items: center;
 }
 
-.titaui-communication__communication-colon {
+.titaui-communication__communication-text {
   font-size: 14px;
-  font-weight: 600;
   color: #3f4755;
   line-height: 22px;
+  margin: 0 4px;
 }
 
 .titaui-communication__communication-content {
   font-size: 14px;
   color: #6f7886;
   line-height: 22px;
+  position: relative;
+  margin-top: 4px;
 }
 
 .titaui-communication__communication-content .highlight {
@@ -29,7 +29,7 @@
 .titaui-communication__communication-content__user-link {
   font-size: 14px;
   font-weight: 600;
-  color: #3F4755;
+  color: #3f4755;
   line-height: 22px;
 }
 
@@ -47,9 +47,10 @@
 
 .titaui-communication__communication-time {
   font-size: 12px;
+  font-weight: 400;
   color: #89919f;
   line-height: 18px;
-  margin-top: 4px;
+  margin-left: 12px;
 }
 
 .titaui-communication__communication-bottom {
@@ -57,7 +58,7 @@
 }
 
 .titaui-communication__communication-list {
-  margin-bottom: 8px;
+  margin-bottom: 12px;
 }
 
 .titaui-communication__communication-attachments {
@@ -68,8 +69,47 @@
   display: flex;
   align-items: center;
   user-select: none;
+  color: #2879ff;
 }
 
 .titaui-communication__communication-total-icon {
   margin-left: 4px;
 }
+
+.titaui-communication__reply-container-text {
+  margin-right: 4px;
+}
+
+.titaui-communication__reply-container--show-user {
+  margin-left: 40px;
+  margin-top: -12px;
+}
+
+.titaui-communication__reply-default-input {
+  display: flex;
+}
+
+.titaui-communication__reply-default-input-text {
+  flex: 1;
+  cursor: text;
+  font-size: 12px;
+  color: #bfc7d5;
+  line-height: 22px;
+  margin-left: 12px;
+  height: 32px;
+  border-radius: 16px;
+  border-radius: 16px;
+  border: 1px solid #e9ecf0;
+  display: flex;
+  align-items: center;
+  box-sizing: border-box;
+  padding-left: 12px;
+}
+
+.titaui-communication__reply-default-input-avatar {
+  height: 32px;
+}
+
+.titaui-communication__reply-default-input-avatar .titaui-pc-avator-container {
+  display: inline-flex;
+}

package/lib/components/communication/index.js

@@ -19,12 +19,16 @@ var _CommunicationRecord = _interopRequireDefault(require("./CommunicationRecord
 
 var _requestV = require("../../utils/request-v1");
 
+var _bsGlobal = require("../../utils/bs-global");
+
 var _style = require("./style");
 
 var _openData = require("../../utils/open-data");
 
 var _getLocale = require("../../utils/getLocale");
 
+var _avatar = _interopRequireDefault(require("../avatar"));
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -33,6 +37,8 @@ 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 _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."); }
@@ -91,7 +97,7 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
           _this.setState({
             communicationTrackList: data.comments ? data.comments : [],
             communicationTrackTotal: data.total,
-            okrCommentFeedId: commentType == 2 ? res.Data.feedId : ""
+            okrCommentFeedId: commentType === 2 ? res.Data.feedId : ""
           });
         } else {
           _this.setState({
@@ -137,6 +143,12 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
         (0, _requestV.taker)(url, "DELETE").then(function (res) {
           if (res.Code === 1) {
             isShowAllCommunicationRecord ? _this.getFeedInfo(feedId, communicationTrackTotal - 1) : _this.getFeedInfo(feedId, commentCount);
+
+            if (_this.props.onReplyChange) {
+              _this.props.onReplyChange({
+                submitType: 'delete'
+              });
+            }
           }
         });
       } else if (actionType === "reply") {
@@ -162,7 +174,9 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
           isShowReplyToUser: true,
           replyUser: communicationTrackList[index].publishUser.name,
           replyUserId: communicationTrackList[index].publishUser.userId,
-          replyUserCommentId: communicationTrackList[index].commentId
+          replyUserCommentId: communicationTrackList[index].commentId,
+          isShowDefaultInput: false,
+          needAutoFocus: true
         });
       } else if (actionType === "praise") {
         // 沟通里的点赞
@@ -219,7 +233,8 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
           feedId = _this$props4.feedId,
           commentCount = _this$props4.commentCount,
           commentType = _this$props4.commentType,
-          okrFeedParams = _this$props4.okrFeedParams;
+          okrFeedParams = _this$props4.okrFeedParams,
+          onReplyChange = _this$props4.onReplyChange;
       var _this$state3 = _this.state,
           isShowReplyToUser = _this$state3.isShowReplyToUser,
           replyUserCommentId = _this$state3.replyUserCommentId,
@@ -242,14 +257,15 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
           submitStatus: 2
         });
 
-        var url = commentType == 1 ? (0, _requestV.getApiUrl2)("comment/Add") : (0, _requestV.getApiUrl)("okr/cycle/addComment?objId=".concat(okrFeedParams && okrFeedParams.objId, "&objType=").concat(okrFeedParams && okrFeedParams.objType, "&cycleType=").concat(okrFeedParams && okrFeedParams.cycleType, "&yqmNum=").concat(okrFeedParams && okrFeedParams.yqmNum, "&annualNum=").concat(okrFeedParams && okrFeedParams.annualNum));
+        var url = commentType === 1 ? (0, _requestV.getApiUrl2)("comment/Add") : (0, _requestV.getApiUrl)("okr/cycle/addComment?objId=".concat(okrFeedParams && okrFeedParams.objId, "&objType=").concat(okrFeedParams && okrFeedParams.objType, "&cycleType=").concat(okrFeedParams && okrFeedParams.cycleType, "&yqmNum=").concat(okrFeedParams && okrFeedParams.yqmNum, "&annualNum=").concat(okrFeedParams && okrFeedParams.annualNum));
         (0, _requestV.taker)(url, "POST", sentData).then(function (res) {
           if (res.Code === 1) {
             isShowAllCommunicationRecord ? _this.getFeedInfo(feedId, communicationTrackTotal + 1) : _this.getFeedInfo(feedId, commentCount);
 
             _this.setState({
               submitStatus: 1,
-              isShowReplyToUser: false
+              isShowReplyToUser: false,
+              isShowDefaultInput: true
             });
           } else {
             _this.setState({
@@ -263,6 +279,12 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
           submitStatus: 0
         });
       }
+
+      if (onReplyChange) {
+        onReplyChange({
+          submitType: submitType
+        });
+      }
     };
 
     _this.handlerCancelReplyUser = function () {
@@ -271,11 +293,22 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
       });
     };
 
-    var comments = props.usePropsComment ? props.communication || [] : [];
+    _this.handleShowMblog = function () {
+      _this.setState({
+        isShowDefaultInput: false,
+        needAutoFocus: true
+      });
+    };
+
+    var showDefaultInput = props.showDefaultInput,
+        usePropsComment = props.usePropsComment,
+        communication = props.communication;
+    var comments = usePropsComment ? communication || [] : [];
+    var communicationLength = props.totalCommunicationNum || comments.length;
     _this.state = {
       communicationTrackList: comments,
       // 沟通记录
-      communicationTrackTotal: props.totalCommunicationNum || comments.length,
+      communicationTrackTotal: communicationLength,
       // 沟通记录条数
       isShowAllCommunicationRecord: false,
       // 是否显示所有记录
@@ -290,7 +323,9 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
       // 点赞记录
       praiseObjId: "",
       isShowPraiseRecordPop: false,
-      okrCommentFeedId: ""
+      okrCommentFeedId: "",
+      isShowDefaultInput: showDefaultInput && communicationLength !== 0 ? true : false,
+      needAutoFocus: false
     };
     return _this;
   }
@@ -304,14 +339,14 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
           commentType = _this$props5.commentType,
           usePropsComment = _this$props5.usePropsComment;
 
-      if ((feedId || commentType == 2) && !usePropsComment) {
+      if ((feedId || commentType === 2) && !usePropsComment) {
         this.getFeedInfo(feedId, commentCount);
       }
     }
   }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps, prevState) {
-      if (prevProps.feedId != this.props.feedId || prevProps.okrFeedParams != this.props.okrFeedParams || prevProps.usePropsComment != this.props.usePropsComment) {
+      if (prevProps.feedId !== this.props.feedId || prevProps.okrFeedParams !== this.props.okrFeedParams || prevProps.usePropsComment !== this.props.usePropsComment) {
         var _this$props6 = this.props,
             feedId = _this$props6.feedId,
             commentCount = _this$props6.commentCount;
@@ -339,7 +374,9 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
           isShowReplyToUser = _this$state4.isShowReplyToUser,
           submitStatus = _this$state4.submitStatus,
           isShowPraiseRecordPop = _this$state4.isShowPraiseRecordPop,
-          praiseObjId = _this$state4.praiseObjId;
+          praiseObjId = _this$state4.praiseObjId,
+          isShowDefaultInput = _this$state4.isShowDefaultInput,
+          needAutoFocus = _this$state4.needAutoFocus;
       var _this$props7 = this.props,
           feedId = _this$props7.feedId,
           className = _this$props7.className,
@@ -356,21 +393,24 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
           _this$props7$highLigh = _this$props7.highLightKeyWord,
           highLightKeyWord = _this$props7$highLigh === void 0 ? "" : _this$props7$highLigh,
           _this$props7$autoFocu = _this$props7.autoFocus,
-          autoFocus = _this$props7$autoFocu === void 0 ? false : _this$props7$autoFocu;
+          autoFocus = _this$props7$autoFocu === void 0 ? false : _this$props7$autoFocu,
+          _this$props7$showUser = _this$props7.showUser,
+          showUser = _this$props7$showUser === void 0 ? false : _this$props7$showUser;
+      var user = (0, _bsGlobal.getUserInfo)();
       return /*#__PURE__*/_react["default"].createElement(_style.CommunicationWrapper, {
         className: "communcation-wrapper ".concat(className)
-      }, /*#__PURE__*/_react["default"].createElement("div", null, communicationTrackTotal > 0 && /*#__PURE__*/_react["default"].createElement(_style.CommunicationRecordTotal, null, /*#__PURE__*/_react["default"].createElement("div", {
+      }, /*#__PURE__*/_react["default"].createElement("div", null, communicationTrackTotal > 3 && /*#__PURE__*/_react["default"].createElement(_style.CommunicationRecordTotal, null, /*#__PURE__*/_react["default"].createElement("div", {
         className: "".concat(prefix, "__communication-total"),
         onMouseDown: function onMouseDown() {
           return _this2.handlerSwitchShowRecord();
         }
       }, (0, _getLocale.getLocale)("Mod_Allcommu"), "\xA0", /*#__PURE__*/_react["default"].createElement("span", null, communicationTrackTotal), communicationTrackTotal > commentCount && /*#__PURE__*/_react["default"].createElement("i", {
         className: (0, _classnames["default"])("".concat(prefix, "__communication-total-icon"), {
-          "tu-icon-APP-xi": isShowAllCommunicationRecord,
-          "tu-icon-arrow-down1": !isShowAllCommunicationRecord
+          "tu-icon-APP-xi": !isShowAllCommunicationRecord,
+          "tu-icon-arrow-down1": isShowAllCommunicationRecord
         })
       }))), /*#__PURE__*/_react["default"].createElement("div", {
-        className: "".concat(prefix, "__communication-list")
+        className: (0, _classnames["default"])(_defineProperty({}, "".concat(prefix, "__communication-list"), communicationTrackList.length > 0))
       }, communicationTrackList.length > 0 && communicationTrackList.map(function (item, index) {
         var length = communicationTrackList.length;
 
@@ -390,16 +430,14 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
           }
         });
       }))), !useCustomMblog && /*#__PURE__*/_react["default"].createElement("div", {
-        className: "communication__reply__cintainer"
-      }, /*#__PURE__*/_react["default"].createElement(_style.ReplyToUser, {
+        className: "".concat(prefix, "__reply-container")
+      }, isShowReplyToUser && /*#__PURE__*/_react["default"].createElement(_style.ReplyToUser, {
         height: isShowReplyToUser ? "auto" : "0",
-        padding: isShowReplyToUser ? "3px 0" : "0"
-      }, /*#__PURE__*/_react["default"].createElement("span", {
-        style: {
-          position: "relative",
-          top: "2px"
-        }
-      }, (0, _getLocale.getLocale)("Mod_Reply")), /*#__PURE__*/_react["default"].createElement(_style.ReplyUser, null, /*#__PURE__*/_react["default"].createElement("span", {
+        padding: isShowReplyToUser ? "4px 0" : "0",
+        className: (0, _classnames["default"])(_defineProperty({}, "".concat(prefix, "__reply-container--show-user"), showUser))
+      }, /*#__PURE__*/_react["default"].createElement(_style.ReplyUser, null, /*#__PURE__*/_react["default"].createElement("span", {
+        className: "".concat(prefix, "__reply-container-text")
+      }, (0, _getLocale.getLocale)("Mod_Reply")), /*#__PURE__*/_react["default"].createElement("span", {
         className: "name"
       }, /*#__PURE__*/_react["default"].createElement(_openData.OpenUserName, {
         name: replyUser,
@@ -407,7 +445,23 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
       })), /*#__PURE__*/_react["default"].createElement("span", {
         className: "tu-icon-cross",
         onMouseDown: this.handlerCancelReplyUser
-      }))), /*#__PURE__*/_react["default"].createElement(_mblog["default"], {
+      }))), isShowDefaultInput && !isShowReplyToUser && /*#__PURE__*/_react["default"].createElement("div", {
+        className: "".concat(prefix, "__reply-default-input")
+      }, /*#__PURE__*/_react["default"].createElement("span", {
+        className: "".concat(prefix, "__reply-default-input-avatar")
+      }, /*#__PURE__*/_react["default"].createElement(_avatar["default"], {
+        size: {
+          width: 28,
+          textNum: 1,
+          fontSize: 14
+        },
+        name: user.Name,
+        color: user.UserAvatar.Color,
+        src: user.UserAvatar.Medium
+      })), /*#__PURE__*/_react["default"].createElement("span", {
+        onClick: this.handleShowMblog,
+        className: "".concat(prefix, "__reply-default-input-text")
+      }, "\u8F93\u5165\u6C9F\u901A\u5185\u5BB9")), !isShowDefaultInput && /*#__PURE__*/_react["default"].createElement(_mblog["default"], {
         setTextareaRef: setTextareaRef || function () {},
         isHasPlaceholder: true,
         placeholderText: (0, _getLocale.getLocale)("Mod_contentofyour"),
@@ -420,11 +474,12 @@ 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);
-        }
+        },
+        showUser: showUser
       })), isShowPraiseRecordPop && /*#__PURE__*/_react["default"].createElement(_praiseRecord["default"], {
         objId: praiseObjId,
         objType: 19,
@@ -441,7 +496,8 @@ var Communication = /*#__PURE__*/function (_PureComponent) {
   return Communication;
 }(_react.PureComponent);
 
-exports["default"] = Communication;
 Communication.defaultProps = {
   commentType: 1
-};
+};
+var _default = Communication;
+exports["default"] = _default;

package/lib/components/communication/style.js

@@ -7,6 +7,8 @@ exports.ReplyUser = exports.ReplyToUser = exports.ConfirmWrapper = exports.Confi
 
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 
+var _praiseBg = _interopRequireDefault(require("./praise-bg.png"));
+
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11, _templateObject12, _templateObject13, _templateObject14, _templateObject15, _templateObject16, _templateObject17, _templateObject18, _templateObject19, _templateObject20, _templateObject21;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -17,7 +19,7 @@ var CommunicationWrapper = _styledComponents["default"].div(_templateObject || (
 
 exports.CommunicationWrapper = CommunicationWrapper;
 
-var CommunicationRecordTotal = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  margin-bottom: 8px;\n  font-size: 12px;\n  color: #8f9ca6;\n  display: inline-block;\n  cursor: pointer;\n\n  &:hover {\n    color: #2879ff;\n  }\n"])));
+var CommunicationRecordTotal = _styledComponents["default"].div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  margin-bottom: 8px;\n  font-size: 12px;\n  line-height: 22px;\n  color: #8f9ca6;\n  display: inline-block;\n  cursor: pointer;\n\n  &:hover {\n    color: #2879ff;\n  }\n"])));
 
 exports.CommunicationRecordTotal = CommunicationRecordTotal;
 
@@ -29,15 +31,15 @@ var ReplyToUser = _styledComponents["default"].div(_templateObject3 || (_templat
 
 exports.ReplyToUser = ReplyToUser;
 
-var ReplyUser = _styledComponents["default"].div(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral([void 0], ["\n  min-height: 20px;\n  margin-left: 10px;\n  padding: 2px 8px;\n  line-height: 20px;\n  font-family: '\\5B8B\\4F53';\n  border-radius: 12px;\n  display: inline-block;\n  color: #647481;\n  background-color: #f5f8fa;\n  vertical-align: middle;\n  word-break: break-all;\n  cursor: pointer;\n\n  &:hover {\n    color: #ff5b5b;\n    .tu-icon-cross {\n      color: #f04d4d;\n    }\n  }\n\n  .tu-icon-cross {\n    margin-left: 5px;\n    color: #a9b8bf;\n  }\n"])));
+var ReplyUser = _styledComponents["default"].span(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  padding: 2px 8px;\n  line-height: 20px;\n  border-radius: 12px;\n  display: inline-flex;\n  align-items: center;\n  color: #89919F;\n  background-color: #f5f8fa;\n  word-break: break-all;\n\n  .tu-icon-cross {\n    margin-left: 4px;\n    font-size: 16px;\n    color: #89919F;\n    cursor: pointer;\n    &:hover {\n      color: #f05e5e;\n    }\n  }\n"])));
 
 exports.ReplyUser = ReplyUser;
 
-var CommunicationItem = _styledComponents["default"].div(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n  margin-left: -8px;\n  padding: 8px 8px 4px 8px;\n  margin-bottom: 4px;\n  font-size: 12px;\n  color: #83898f;\n  border-radius: 8px;\n  display: flex;\n  position: relative;\n\n  &:hover {\n    background: #F7F9FB;\n    .communication__actionbar {\n      display: inline-block;\n    }\n  }\n"])));
+var CommunicationItem = _styledComponents["default"].div(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n  margin-left: -8px;\n  padding: 8px;\n  margin-bottom: 4px;\n  font-size: 12px;\n  color: #83898f;\n  border-radius: 8px;\n  display: flex;\n  position: relative;\n\n  &:hover {\n    background: #F7F9FB;\n    .communication__actionbar {\n      display: inline-block;\n    }\n  }\n"])));
 
 exports.CommunicationItem = CommunicationItem;
 
-var CommunicationDetail = _styledComponents["default"].div(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n  width: calc(100% - 35px);\n  margin-top: 2px;\n  margin-left: 8px;\n  display: flex;\n  flex-direction: column;\n\n  p {\n    line-height: 17px;\n  }\n"])));
+var CommunicationDetail = _styledComponents["default"].div(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n  width: calc(100% - 35px);\n  margin-top: 2px;\n  margin-left: 12px;\n  display: flex;\n  flex-direction: column;\n  position: relative;\n\n  p {\n    line-height: 17px;\n  }\n"])));
 
 exports.CommunicationDetail = CommunicationDetail;
 
@@ -45,7 +47,7 @@ var CommunicationContent = _styledComponents["default"].p(_templateObject7 || (_
 
 exports.CommunicationContent = CommunicationContent;
 
-var CommunicationActionbar = _styledComponents["default"].div(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["\n  display: none;\n  position: absolute;\n  right: 0;\n"])));
+var CommunicationActionbar = _styledComponents["default"].div(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["\n  display: none;\n  position: absolute;\n  right: 0;\n  top: 0;\n"])));
 
 exports.CommunicationActionbar = CommunicationActionbar;
 
@@ -81,7 +83,7 @@ var AttachmentAction = _styledComponents["default"].div(_templateObject16 || (_t
 
 exports.AttachmentAction = AttachmentAction;
 
-var ConfirmWrapper = _styledComponents["default"].div(_templateObject17 || (_templateObject17 = _taggedTemplateLiteral(["\n  min-width: 300px;\n  border-radius: 2px;\n  box-shadow: 0 0 4px 0 rgba(0,0,0,0.20);\n  background-color: #ffffff;\n  \n  &.bg {\n    background: url(", ") no-repeat 0 0 / 101% 105%;\n    box-shadow: 0 6px 15px 0 rgba(0,0,0,0.15);\n  }\n"])), require("./praise-bg.png"));
+var ConfirmWrapper = _styledComponents["default"].div(_templateObject17 || (_templateObject17 = _taggedTemplateLiteral(["\n  min-width: 300px;\n  border-radius: 2px;\n  box-shadow: 0 0 4px 0 rgba(0,0,0,0.20);\n  background-color: #ffffff;\n  \n  &.bg {\n    background: url(", ") no-repeat 0 0 / 101% 105%;\n    box-shadow: 0 6px 15px 0 rgba(0,0,0,0.15);\n  }\n"])), _praiseBg["default"]);
 
 exports.ConfirmWrapper = ConfirmWrapper;
 

package/lib/components/create-okr-modal/fields/o-new-name.js

@@ -5,7 +5,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = _default;
+exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
@@ -52,7 +52,7 @@ var initOCheckResult = function initOCheckResult() {
   });
 };
 
-function _default(_ref) {
+function ONewName(_ref) {
   var okrName = _ref.okrName,
       setOkrName = _ref.setOkrName,
       container = _ref.container,
@@ -60,14 +60,15 @@ function _default(_ref) {
       setUser = _ref.setUser,
       onOInputFocusStateChange = _ref.onOInputFocusStateChange,
       setONameCheckResult = _ref.setONameCheckResult,
-      setIsInputContent = _ref.setIsInputContent;
+      _ref$setIsInputConten = _ref.setIsInputContent,
+      setIsInputContent = _ref$setIsInputConten === void 0 ? function () {} : _ref$setIsInputConten;
   var oCheckId = 0;
   var timerRef = (0, _react.useRef)();
   var okrNameIsEmpty = (0, _react.useRef)(!okrName);
   var oldONameRef = (0, _react.useRef)("");
   var formatUser = (0, _react.useMemo)(function () {
-    var medium = user.avatar ? user.avatar.Medium ? user.avatar.Medium : user.avatar.medium : undefined;
-    var color = user.avatar ? user.avatar.Color ? user.avatar.Color : user.avatar.color : undefined;
+    var medium = user.avatar && (user.avatar.Medium || user.avatar.medium);
+    var color = user.avatar && (user.avatar.Color || user.avatar.color);
     return {
       Medium: medium,
       Color: color,
@@ -84,14 +85,17 @@ function _default(_ref) {
       Small: user.UserAvatar.Small,
       Medium: user.UserAvatar.Medium
     };
-    setUser && setUser({
-      name: user.Name,
-      id: user.Id,
-      avatar: avatar
-    });
+
+    if (setUser) {
+      setUser({
+        name: user.Name,
+        id: user.Id,
+        avatar: avatar
+      });
+    }
   }, [setUser]);
   var getOAnalysisInfo = (0, _react.useCallback)(function () {
-    oCheckId++;
+    oCheckId += 1;
     var tempCheckId = oCheckId; // @ts-ignore
 
     return (0, _requestApi.getOAnalysisInfos)({
@@ -99,7 +103,7 @@ function _default(_ref) {
     }) // @ts-ignore
     .then(function (data) {
       if (tempCheckId !== oCheckId) {
-        return;
+        return null;
       }
 
       var result = (0, _constant.OCheckTarget)().map(function (item, index) {
@@ -121,6 +125,8 @@ function _default(_ref) {
       } else {
         setONameCheckResult(result);
       }
+
+      return null;
     })["catch"](function (err) {
       _toast["default"].Error(err);
     })["finally"](function () {
@@ -134,25 +140,26 @@ function _default(_ref) {
     if (!okrName) {
       setONameCheckResult(initOCheckResult());
       setIsInputContent(false);
-      return;
-    }
-
-    if (timerRef.current) {
+    } else if (timerRef.current) {
       clearTimeout(timerRef.current);
       timerRef.current = setTimeout(getOAnalysisInfo, 1000);
-      return;
+    } else {
+      timerRef.current = setTimeout(getOAnalysisInfo, 1000);
     }
 
-    timerRef.current = setTimeout(getOAnalysisInfo, 1000);
     return function () {
       clearTimeout(timerRef.current);
     };
   }, [okrName]);
   var handleInputFocus = (0, _react.useCallback)(function () {
-    onOInputFocusStateChange && onOInputFocusStateChange(true);
+    if (onOInputFocusStateChange) {
+      onOInputFocusStateChange(true);
+    }
   }, []);
   var handleInputBlur = (0, _react.useCallback)(function () {
-    onOInputFocusStateChange && onOInputFocusStateChange(false);
+    if (onOInputFocusStateChange) {
+      onOInputFocusStateChange(false);
+    }
   }, []);
   var handleOnKeyDown = (0, _react.useCallback)(function () {
     setIsInputContent(true);
@@ -195,4 +202,7 @@ function _default(_ref) {
     container: container,
     changeUser: changeUser
   }));
-}
+}
+
+var _default = ONewName;
+exports["default"] = _default;

package/lib/components/create-okr-modal/fields/okr-parent.js

@@ -118,11 +118,7 @@ function _default(_ref) {
             avatar: SuperiorUser.UserAvatar
           });
         } else {
-          setToUser({
-            name: Name,
-            userId: Id,
-            avatar: UserAvatar
-          });
+          setToUser({});
         }
       }
     });