Merge branch 'master' of Hepper/comment into master

lib/components/ContentItem/AvatarHoverCard.js

@@ -53,8 +53,10 @@ var AvatarHoverCard = function (_Component) {
   _createClass(AvatarHoverCard, [{
     key: "componentDidMount",
     value: function componentDidMount() {
+      var isLogin = this.props.currentUser.user_id > 0;
       this.props.getUserInfo({
-        id: this.props.user_id
+        id: this.props.user_id,
+        noCheckFollowed: !isLogin
       });
     }
   }, {
@@ -134,7 +136,7 @@ var AvatarHoverCard = function (_Component) {
             )
           )
         ),
-        currentUser.user_id !== user_id && _react2.default.createElement(
+        currentUser.user_id > 0 && currentUser.user_id !== user_id && _react2.default.createElement(
           _row2.default,
           { type: "flex", className: "rowBtn" },
           followed ? _react2.default.createElement(

lib/components/ContentItem/index.css

@@ -24,7 +24,7 @@
   background-size: cover;
   cursor: pointer;
 }
-.comment-item-name{
+.comment-item-name {
   font-size: 16px;
 }
 .comment-item-content {
@@ -135,7 +135,7 @@
   }
   .comment-item-name {
     font-size: 14px;
-  } 
+  }
   .comment-item-content {
     font-size: 14px;
     margin: 4px 0;

lib/components/Editor/Upload.css

@@ -14,7 +14,7 @@
 }
 
 .ant-upload-list-item {
-  padding: 0!important;
+  padding: 0 !important;
 }
 .ant-popover-inner-content {
   position: relative;

lib/components/Editor/index.js

@@ -338,7 +338,7 @@ var Editor = function (_React$Component) {
                   trigger: "click",
                   placement: emojiPopoverPlacement,
                   autoAdjustOverflow: false,
-                  overlayStyle: { zIndex: 999 },
+                  overlayStyle: { zIndex: 9999 },
                   content: _react2.default.createElement(
                     "div",
                     {
@@ -365,7 +365,7 @@ var Editor = function (_React$Component) {
                   , placement: uploadPopoverPlacement,
                   overlayClassName: uploadOverlayClassName,
                   autoAdjustOverflow: false,
-                  overlayStyle: { zIndex: 999 },
+                  overlayStyle: { zIndex: 9999 },
                   onVisibleChange: closeUploadWhenBlur ? function (visible) {
                     _this3.handleShowUpload(visible);
                   } : null,

lib/version.json

@@ -1,8 +1,8 @@
 {
     "name":       "comment",
-    "buildDate":  1563502412201,
+    "buildDate":  1563590515482,
     "version":    "1.0.4",
-    "numCommits": 168,
-    "hash":       "778cc0a",
-    "dirty":      false
+    "numCommits": 169,
+    "hash":       "d78b943",
+    "dirty":      true
 }

src/components/ContentItem/AvatarHoverCard.js

@@ -12,8 +12,10 @@ class AvatarHoverCard extends Component {
   }
 
   componentDidMount() {
+    const isLogin = this.props.currentUser.user_id > 0;
     this.props.getUserInfo({
-      id: this.props.user_id
+      id: this.props.user_id,
+      noCheckFollowed: !isLogin
     });
   }
 
@@ -71,7 +73,7 @@ class AvatarHoverCard extends Component {
             </div>
           </Col>
         </Row>
-        {currentUser.user_id !== user_id && (
+        {currentUser.user_id > 0 && currentUser.user_id !== user_id && (
           <Row type="flex" className="rowBtn">
             {followed ? (
               <div

src/components/Editor/index.js

@@ -236,7 +236,7 @@ class Editor extends React.Component {
                   trigger="click"
                   placement={emojiPopoverPlacement}
                   autoAdjustOverflow={false}
-                  overlayStyle={{ zIndex: 999 }}
+                  overlayStyle={{ zIndex: 9999 }}
                   content={
                     <div
                       style={{ width: 240, height: 205 }}
@@ -266,7 +266,7 @@ class Editor extends React.Component {
                   placement={uploadPopoverPlacement}
                   overlayClassName={uploadOverlayClassName}
                   autoAdjustOverflow={false}
-                  overlayStyle={{ zIndex: 999 }}
+                  overlayStyle={{ zIndex: 9999 }}
                   onVisibleChange={
                     closeUploadWhenBlur
                       ? visible => {