Merge branch 'master' of Hepper/comment into master

lib/App.js

@@ -430,7 +430,10 @@ var App = function (_Component) {
         }));
         _this6.setState({ list: list, total: total + 1 });
         _this6.props.onCountChange(total + 1);
-      }).catch(this.errorHandler).finally(function () {
+      }).catch(function (error) {
+        _this6.props.onCommentFail(error.response.status);
+        _this6.errorHandler(error);
+      }).finally(function () {
         _this6.handleChangeLoading("sCreateComment", false);
       });
     }
@@ -545,7 +548,10 @@ var App = function (_Component) {
           return item;
         });
         _this9.setState({ list: list });
-      }).catch(this.errorHandler).finally(function () {
+      }).catch(function (error) {
+        _this9.props.onCommentFail(error.response.status);
+        _this9.errorHandler(error);
+      }).finally(function () {
         _this9.handleChangeLoading("sCreateReply", false);
       });
     }
@@ -790,7 +796,8 @@ App.propTypes = {
   onDelete: _propTypes2.default.func,
   onUpdateComment: _propTypes2.default.func,
   locales: _propTypes2.default.string, //  传入的语言环境， en-US/zh-CN
-  onCountChange: _propTypes2.default.func // 评论数量变更时的回调
+  onCountChange: _propTypes2.default.func, // 评论数量变更时的回调
+  onCommentFail: _propTypes2.default.func // 评论失败时的回调
 };
 
 App.defaultProps = {
@@ -812,7 +819,8 @@ App.defaultProps = {
   onDelete: function onDelete() {},
   onUpdateComment: function onUpdateComment() {},
   onBeforeUpdateComment: function onBeforeUpdateComment() {},
-  onCountChange: function onCountChange() {}
+  onCountChange: function onCountChange() {},
+  onCommentFail: function onCommentFail() {}
 };
 
 exports.Editor = _Editor2.default;

lib/components/Editor/Upload.css

@@ -26,7 +26,9 @@
   align-items: center;
   justify-content: center;
 }
-
+.ant-upload-list-picture-card {
+  float: none!important;
+}
 .upload-close-icon {
   position: absolute;
   background: url("../../assert/close.png");

lib/components/Editor/index.js

@@ -429,7 +429,7 @@ var Editor = function (_React$Component) {
       var disabledSubmit = this.checkDisabledSubmit();
       var inputValue = value || this.state.value;
       var uploadFileList = fileList || this.state.fileList;
-      var isLogin = app.currentUser && app.currentUser.user_id > 0;
+      var isLogin = app.currentUser && (app.currentUser.user_id > 0 || app.currentUser.id > 0);
       return _react2.default.createElement(
         "div",
         { className: "comment-editor-container", onPaste: this.handlePaste },
@@ -646,6 +646,7 @@ Editor.defaultProps = {
   btnDisabled: false,
   showError: true,
   maxLength: 5000,
+  app: {},
   handleChangeFileList: function handleChangeFileList() {}
 };
 

lib/index.js

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

lib/version.json

@@ -1,8 +1,8 @@
 {
     "name":       "comment",
-    "buildDate":  1565244799639,
+    "buildDate":  1565745352505,
     "version":    "1.0.4",
-    "numCommits": 182,
-    "hash":       "59ff040",
-    "dirty":      false
+    "numCommits": 184,
+    "hash":       "865439d",
+    "dirty":      true
 }

src/components/Editor/Upload.css

@@ -26,7 +26,9 @@
   align-items: center;
   justify-content: center;
 }
-
+.ant-upload-list-picture-card {
+  float: none !important;
+}
 .upload-close-icon {
   position: absolute;
   background: url("../../assert/close.png");

src/components/Editor/index.js

@@ -322,7 +322,9 @@ class Editor extends React.Component {
     const disabledSubmit = this.checkDisabledSubmit();
     const inputValue = value || this.state.value;
     const uploadFileList = fileList || this.state.fileList;
-    const isLogin = app.currentUser && app.currentUser.user_id > 0;
+    const isLogin =
+      app.currentUser &&
+      (app.currentUser.user_id > 0 || app.currentUser.id > 0);
     return (
       <div className="comment-editor-container" onPaste={this.handlePaste}>
         {isLogin ? (
@@ -521,6 +523,7 @@ Editor.defaultProps = {
   btnDisabled: false,
   showError: true,
   maxLength: 5000,
+  app: {},
   handleChangeFileList: () => {}
 };