Merge branch 'release/v1.2.4' of npm/comment into master

lib/App.js

@@ -433,7 +433,7 @@ var App = function (_Component) {
         _this6.setState({ list: list, total: total + 1 });
         _this6.props.onCountChange(total + 1);
       }).catch(function (error) {
-        _this6.props.onCommentFail(error.response.status);
+        _this6.props.onCommentFail(error.response.status, error.response.data);
         _this6.errorHandler(error);
       }).finally(function () {
         _this6.handleChangeLoading("sCreateComment", false);
@@ -508,7 +508,10 @@ var App = function (_Component) {
         });
         _this8.props.onUpdateComment("comment");
         _this8.setState({ list: list });
-      }).catch(this.errorHandler).finally(function () {
+      }).catch(function (error) {
+        _this8.props.onCommentFail(error.response.status, error.response.data);
+        _this8.errorHandler(error);
+      }).finally(function () {
         _this8.handleChangeLoading("sUpdateComment", false);
       });
     }
@@ -551,7 +554,7 @@ var App = function (_Component) {
         });
         _this9.setState({ list: list });
       }).catch(function (error) {
-        _this9.props.onCommentFail(error.response.status);
+        _this9.props.onCommentFail(error.response.status, error.response.data);
         _this9.errorHandler(error);
       }).finally(function () {
         _this9.handleChangeLoading("sCreateReply", false);
@@ -627,7 +630,10 @@ var App = function (_Component) {
           _this11.sGetReply({ commentId: commentId, page: i });
         }
         _this11.props.onUpdateComment("reply");
-      }).catch(this.errorHandler).finally(function () {
+      }).catch(function (error) {
+        _this11.props.onCommentFail(error.response.status, error.response.data);
+        _this11.errorHandler(error);
+      }).finally(function () {
         _this11.handleChangeLoading("sUpdateReply", false);
       });
     }

lib/index.js

@@ -125,9 +125,9 @@ if (process.env.NODE_ENV !== "production") {
     type: 3,
     businessId: "5ea8320dedd68200018e733d",
     businessUserId: 4,
-    userId: 58297,
+    userId: 45,
     currentUser: {
-      user_id: 58297
+      user_id: 45
     },
     userAvaHoverData: {
       71763: {
@@ -181,8 +181,8 @@ if (process.env.NODE_ENV !== "production") {
     onDelete: function onDelete(type, data) {
       console.log(type, data);
     },
-    onCommentFail: function onCommentFail(data) {
-      console.log("onCommentFail", data);
+    onCommentFail: function onCommentFail(status, data) {
+      console.log("onCommentFail", status, data);
     },
     onUpdateComment: function onUpdateComment(type, data) {
       console.log("onUpdateComment", type);

lib/version.json

@@ -1,8 +1,8 @@
 {
     "name":       "comment",
-    "buildDate":  1604757339795,
-    "version":    "1.0.4",
-    "numCommits": 219,
-    "hash":       "1e52141",
-    "dirty":      false
+    "buildDate":  1604847384031,
+    "version":    "1.2.4",
+    "numCommits": 225,
+    "hash":       "1377102",
+    "dirty":      true
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "comment",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "main": "lib/App.js",
   "description": "通用评论",
   "keywords": [

src/App.js

@@ -60,9 +60,9 @@ class App extends Component {
     this.axios = axios;
     this.axios.defaults.withCredentials = true;
     if (this.props.token) {
-      this.axios.defaults.headers.common[
-        "Authorization"
-      ] = `Bearer ${this.props.token}`;
+      this.axios.defaults.headers.common["Authorization"] = `Bearer ${
+        this.props.token
+      }`;
     }
   }
 
@@ -137,8 +137,8 @@ class App extends Component {
       action: content.replies
         ? "comment"
         : content.reply
-        ? "replyToReply"
-        : "reply",
+          ? "replyToReply"
+          : "reply",
       replyId,
       commentId,
       userId,
@@ -311,7 +311,7 @@ class App extends Component {
         this.props.onCountChange(total + 1);
       })
       .catch(error => {
-        this.props.onCommentFail(error.response.status);
+        this.props.onCommentFail(error.response.status, error.response.data);
         this.errorHandler(error);
       })
       .finally(() => {
@@ -370,7 +370,10 @@ class App extends Component {
         this.props.onUpdateComment("comment");
         this.setState({ list });
       })
-      .catch(this.errorHandler)
+      .catch(error => {
+        this.props.onCommentFail(error.response.status, error.response.data);
+        this.errorHandler(error);
+      })
       .finally(() => {
         this.handleChangeLoading("sUpdateComment", false);
       });
@@ -411,7 +414,7 @@ class App extends Component {
         this.setState({ list });
       })
       .catch(error => {
-        this.props.onCommentFail(error.response.status);
+        this.props.onCommentFail(error.response.status, error.response.data);
         this.errorHandler(error);
       })
       .finally(() => {
@@ -472,7 +475,10 @@ class App extends Component {
         }
         this.props.onUpdateComment("reply");
       })
-      .catch(this.errorHandler)
+      .catch(error => {
+        this.props.onCommentFail(error.response.status, error.response.data);
+        this.errorHandler(error);
+      })
       .finally(() => {
         this.handleChangeLoading("sUpdateReply", false);
       });

src/index.js

@@ -90,9 +90,9 @@ if (process.env.NODE_ENV !== "production") {
     type: 3,
     businessId: "5ea8320dedd68200018e733d",
     businessUserId: 4,
-    userId: 58297,
+    userId: 45,
     currentUser: {
-      user_id: 58297
+      user_id: 45
     },
     userAvaHoverData: {
       71763: {
@@ -146,8 +146,8 @@ if (process.env.NODE_ENV !== "production") {
     onDelete: (type, data) => {
       console.log(type, data);
     },
-    onCommentFail: data => {
-      console.log("onCommentFail", data);
+    onCommentFail: (status, data) => {
+      console.log("onCommentFail", status, data);
     },
     onUpdateComment: (type, data) => {
       console.log("onUpdateComment", type);