Merge branch 'master' of Hepper/comment into master

lib/components/ContentItem/AvatarHoverCard.js

@@ -53,7 +53,7 @@ var AvatarHoverCard = function (_Component) {
   _createClass(AvatarHoverCard, [{
     key: "componentDidMount",
     value: function componentDidMount() {
-      var isLogin = this.props.currentUser.user_id > 0;
+      var isLogin = this.props.currentUser.user_id > 0 || this.props.currentUser.id > 0;
       this.props.getUserInfo({
         id: this.props.user_id,
         noCheckFollowed: !isLogin

lib/components/ContentItem/index.js

@@ -225,7 +225,7 @@ var CommentItem = function (_Component) {
         }
       }
       var IconColor = content.favor_count > 0 ? "#71C135" : "#4a90e2";
-
+      var showDivider = content.reply_count || showEdit && app.userId === content.user_id || app.userId === content.user_id;
       return _react2.default.createElement(
         "div",
         { className: "comment-item-box" },
@@ -381,7 +381,7 @@ var CommentItem = function (_Component) {
               },
               _react2.default.createElement("i", { className: "comment-item-delete" })
             ),
-            _react2.default.createElement("span", { className: "comment-item-divider" }),
+            showDivider && _react2.default.createElement("span", { className: "comment-item-divider" }),
             _react2.default.createElement(
               "div",
               {

lib/components/Editor/Upload.js

@@ -157,7 +157,6 @@ var App = function (_React$Component) {
 
       var file = info.file;
 
-      console.log(file);
       info.onProgress({ percent: 10 });
       var reader = new FileReader();
       reader.readAsDataURL(info.file);

lib/components/Editor/index.js

@@ -144,11 +144,15 @@ var Editor = function (_React$Component) {
   _createClass(Editor, [{
     key: "componentDidMount",
     value: function componentDidMount() {
-      if (this.props.app.currentUser && this.props.app.currentUser.user_id > 0) {
-        this.props.app.sOssSts();
+      var _props = this.props,
+          app = _props.app,
+          onRef = _props.onRef;
+
+      if (app.currentUser && (app.currentUser.user_id > 0 || app.currentUser.id > 0)) {
+        app.sOssSts();
       }
-      if ((0, _helper.isFunction)(this.props.onRef)) {
-        this.props.onRef(this);
+      if ((0, _helper.isFunction)(onRef)) {
+        onRef(this);
       }
     }
   }, {
@@ -373,10 +377,10 @@ var Editor = function (_React$Component) {
   }, {
     key: "checkDisabledSubmit",
     value: function checkDisabledSubmit() {
-      var _props = this.props,
-          btnDisabled = _props.btnDisabled,
-          value = _props.value,
-          fileList = _props.fileList;
+      var _props2 = this.props,
+          btnDisabled = _props2.btnDisabled,
+          value = _props2.value,
+          fileList = _props2.fileList;
 
       if (btnDisabled) {
         return true;
@@ -400,24 +404,24 @@ var Editor = function (_React$Component) {
     value: function render() {
       var _this4 = this;
 
-      var _props2 = this.props,
-          value = _props2.value,
-          rows = _props2.rows,
-          showEmoji = _props2.showEmoji,
-          showUpload = _props2.showUpload,
-          multiple = _props2.multiple,
-          emojiPopoverPlacement = _props2.emojiPopoverPlacement,
-          uploadPopoverPlacement = _props2.uploadPopoverPlacement,
-          uploadOverlayClassName = _props2.uploadOverlayClassName,
-          fileList = _props2.fileList,
-          maxUpload = _props2.maxUpload,
-          btnLoading = _props2.btnLoading,
-          button = _props2.button,
-          emojiToolIcon = _props2.emojiToolIcon,
-          imageToolIcon = _props2.imageToolIcon,
-          maxLength = _props2.maxLength,
-          autoFocus = _props2.autoFocus,
-          app = _props2.app;
+      var _props3 = this.props,
+          value = _props3.value,
+          rows = _props3.rows,
+          showEmoji = _props3.showEmoji,
+          showUpload = _props3.showUpload,
+          multiple = _props3.multiple,
+          emojiPopoverPlacement = _props3.emojiPopoverPlacement,
+          uploadPopoverPlacement = _props3.uploadPopoverPlacement,
+          uploadOverlayClassName = _props3.uploadOverlayClassName,
+          fileList = _props3.fileList,
+          maxUpload = _props3.maxUpload,
+          btnLoading = _props3.btnLoading,
+          button = _props3.button,
+          emojiToolIcon = _props3.emojiToolIcon,
+          imageToolIcon = _props3.imageToolIcon,
+          maxLength = _props3.maxLength,
+          autoFocus = _props3.autoFocus,
+          app = _props3.app;
 
       var placeholder = this.props.placeholder || _reactIntlUniversal2.default.get("editor.placeholder");
       var btnSubmitText = this.props.btnSubmitText || _reactIntlUniversal2.default.get("editor.SubmitBtn");

lib/version.json

@@ -1,8 +1,8 @@
 {
     "name":       "comment",
-    "buildDate":  1565080180929,
+    "buildDate":  1565244799639,
     "version":    "1.0.4",
-    "numCommits": 181,
-    "hash":       "d2c0f01",
+    "numCommits": 182,
+    "hash":       "59ff040",
     "dirty":      false
 }

src/App.js

@@ -310,7 +310,10 @@ class App extends Component {
         this.setState({ list, total: total + 1 });
         this.props.onCountChange(total + 1);
       })
-      .catch(this.errorHandler)
+      .catch(error => {
+        this.props.onCommentFail(error.response.status);
+        this.errorHandler(error);
+      })
       .finally(() => {
         this.handleChangeLoading("sCreateComment", false);
       });
@@ -407,7 +410,10 @@ class App extends Component {
         });
         this.setState({ list });
       })
-      .catch(this.errorHandler)
+      .catch(error => {
+        this.props.onCommentFail(error.response.status);
+        this.errorHandler(error);
+      })
       .finally(() => {
         this.handleChangeLoading("sCreateReply", false);
       });
@@ -640,7 +646,8 @@ App.propTypes = {
   onDelete: PropTypes.func,
   onUpdateComment: PropTypes.func,
   locales: PropTypes.string, //  传入的语言环境， en-US/zh-CN
-  onCountChange: PropTypes.func // 评论数量变更时的回调
+  onCountChange: PropTypes.func, // 评论数量变更时的回调
+  onCommentFail: PropTypes.func // 评论失败时的回调
 };
 
 App.defaultProps = {
@@ -665,7 +672,8 @@ App.defaultProps = {
   onDelete: () => {},
   onUpdateComment: () => {},
   onBeforeUpdateComment: () => {},
-  onCountChange: () => {}
+  onCountChange: () => {},
+  onCommentFail: () => {}
 };
 
 export { Editor, RenderText };

src/components/ContentItem/AvatarHoverCard.js

@@ -12,7 +12,8 @@ class AvatarHoverCard extends Component {
   }
 
   componentDidMount() {
-    const isLogin = this.props.currentUser.user_id > 0;
+    const isLogin =
+      this.props.currentUser.user_id > 0 || this.props.currentUser.id > 0;
     this.props.getUserInfo({
       id: this.props.user_id,
       noCheckFollowed: !isLogin

src/components/ContentItem/index.js

@@ -130,7 +130,10 @@ class CommentItem extends Component {
       }
     }
     const IconColor = content.favor_count > 0 ? "#71C135" : "#4a90e2";
-
+    const showDivider =
+      content.reply_count ||
+      (showEdit && app.userId === content.user_id) ||
+      app.userId === content.user_id;
     return (
       <div className="comment-item-box">
         <div className="comment-item-left">
@@ -296,7 +299,7 @@ class CommentItem extends Component {
                 <i className="comment-item-delete" />
               </Popconfirm>
             )}
-            <span className="comment-item-divider" />
+            {showDivider && <span className="comment-item-divider" />}
             <div
               className="comment-item-bottom-right"
               onClick={() => {

src/components/Editor/Upload.js

@@ -88,7 +88,6 @@ class App extends React.Component {
 
   customRequest(info) {
     const { file } = info;
-    console.log(file);
     info.onProgress({ percent: 10 });
     let reader = new FileReader();
     reader.readAsDataURL(info.file);

src/components/Editor/index.js

@@ -72,11 +72,15 @@ class Editor extends React.Component {
   }
 
   componentDidMount() {
-    if (this.props.app.currentUser && this.props.app.currentUser.user_id > 0) {
-      this.props.app.sOssSts();
+    const { app, onRef } = this.props;
+    if (
+      app.currentUser &&
+      (app.currentUser.user_id > 0 || app.currentUser.id > 0)
+    ) {
+      app.sOssSts();
     }
-    if (isFunction(this.props.onRef)) {
-      this.props.onRef(this);
+    if (isFunction(onRef)) {
+      onRef(this);
     }
   }
 

src/index.js

@@ -147,6 +147,9 @@ if (process.env.NODE_ENV !== "production") {
     onDelete: (type, data) => {
       console.log(type, data);
     },
+    onCommentFail: data => {
+      console.log("onCommentFail", data);
+    },
     onUpdateComment: (type, data) => {
       console.log("onUpdateComment", type);
     },