Merge branch 'master' of Hepper/comment into master

lib/App.js

@@ -356,7 +356,7 @@ var App = function (_Component) {
         if (_this5.props.showAlertComment) {
           _message3.default.success(_reactIntlUniversal2.default.get("message.success"));
         }
-        if ((0, _helper.isFunction)(cb)) cb();
+        if ((0, _helper.isFunction)(cb)) cb(response.data);
         // 将数据写入到 list 中
         // 临时插入
         // 等到获取数据之后，删除临时数据
@@ -397,8 +397,11 @@ var App = function (_Component) {
         var res = list.filter(function (item) {
           return item.id !== commentId;
         });
+        var deletedItem = list.find(function (item) {
+          return item.id === commentId;
+        });
         _this6.setState({ list: res, total: total - 1 });
-        _this6.props.onDelete(_constant.COMMENT_TYPE.COMMENT);
+        _this6.props.onDelete(_constant.COMMENT_TYPE.COMMENT, deletedItem);
         _this6.props.onCountChange(total - 1);
       }).catch(this.errorHandler).finally(function () {
         _this6.handleChangeLoading("sDeleteComment", false);
@@ -428,7 +431,7 @@ var App = function (_Component) {
         if (_this7.props.showAlertReply) {
           _message3.default.success(_reactIntlUniversal2.default.get("message.replySuccess"));
         }
-        if ((0, _helper.isFunction)(cb)) cb();
+        if ((0, _helper.isFunction)(cb)) cb(response.data);
         // 将数据写入到 list 中
         // 临时插入
         // 等到获取数据之后，删除临时数据
@@ -466,18 +469,22 @@ var App = function (_Component) {
         method: "delete",
         withCredentials: true
       }).then(function () {
+        var deletedItem = null;
         var list = _this8.state.list.map(function (item) {
           if (item.id === commentId) {
             var replies = item.replies.filter(function (item) {
               return item.id !== replyId;
             });
+            deletedItem = item.replies.find(function (item) {
+              return item.id === replyId;
+            });
             item.replies = replies;
             item.reply_count -= 1;
           }
           return item;
         });
         _this8.setState({ list: list });
-        _this8.props.onDelete(_constant.COMMENT_TYPE.REPLY);
+        _this8.props.onDelete(_constant.COMMENT_TYPE.REPLY, deletedItem);
       }).catch(this.errorHandler).finally(function () {
         _this8.handleChangeLoading("sDeleteReply", false);
       });

lib/components/CommentInput/index.js

@@ -83,8 +83,8 @@ var CommentInput = function (_Component) {
           comment_id: commentId,
           content: value,
           business_user_id: userId
-        }, function () {
-          return callback && callback();
+        }, function (data) {
+          return callback && callback(data);
         });
       } else if (action === "replyToReply") {
         this.props.app.sCreateReply({
@@ -92,8 +92,8 @@ var CommentInput = function (_Component) {
           content: value,
           reply_id: replyId,
           business_user_id: userId
-        }, function () {
-          return callback && callback();
+        }, function (data) {
+          return callback && callback(data);
         });
       }
     }

lib/components/ContentItem/index.js

@@ -118,6 +118,7 @@ var CommentItem = function (_Component) {
     _this.showPreviewer = _this.showPreviewer.bind(_this);
     _this.hidePreviewer = _this.hidePreviewer.bind(_this);
     _this.handleVisibleChange = _this.handleVisibleChange.bind(_this);
+    _this.handleUserAvaClick = _this.handleUserAvaClick.bind(_this);
     return _this;
   }
 
@@ -148,6 +149,16 @@ var CommentItem = function (_Component) {
         popoverVisible: visible
       });
     }
+  }, {
+    key: "handleUserAvaClick",
+    value: function handleUserAvaClick() {
+      var user_id = this.props.user_id;
+      var userAvaClick = this.props.app.userAvaClick;
+
+      if (userAvaClick) {
+        userAvaClick(user_id);
+      }
+    }
   }, {
     key: "renderTextWithReply",
     value: function renderTextWithReply(text, content) {
@@ -187,7 +198,6 @@ var CommentItem = function (_Component) {
           user_id = _props.user_id;
       var _props$app = this.props.app,
           locale = _props$app.locale,
-          userAvaClick = _props$app.userAvaClick,
           showHoverCard = _props$app.showHoverCard;
       var showInput = this.state.showInput;
 
@@ -240,18 +250,14 @@ var CommentItem = function (_Component) {
               style: {
                 backgroundImage: "url(" + (content.user_avatar || _avatar2.default) + ")"
               },
-              onClick: function onClick() {
-                return userAvaClick(user_id);
-              }
+              onClick: this.handleUserAvaClick
             })
           ) : _react2.default.createElement("div", {
             className: "comment-item-avatar",
             style: {
               backgroundImage: "url(" + (content.user_avatar || _avatar2.default) + ")"
             },
-            onClick: function onClick() {
-              userAvaClick(user_id);
-            }
+            onClick: this.handleUserAvaClick
           })
         ),
         _react2.default.createElement(
@@ -263,9 +269,7 @@ var CommentItem = function (_Component) {
             _react2.default.createElement(
               "strong",
               {
-                onClick: function onClick() {
-                  return userAvaClick(user_id);
-                },
+                onClick: this.handleUserAvaClick,
                 style: { cursor: "pointer" }
               },
               content.user_name || _reactIntlUniversal2.default.get("comment.tourist")

lib/components/Editor/Upload.css

@@ -7,3 +7,8 @@
   margin-top: 8px;
   color: #666;
 }
+
+.upload-img-preview .ant-modal-close {
+  top: -10px;
+  right: -15px;
+}

lib/components/Editor/Upload.js

@@ -200,6 +200,7 @@ var App = function (_React$Component) {
         _react2.default.createElement(
           _modal2.default,
           {
+            className: "upload-img-preview",
             visible: previewVisible,
             footer: null,
             onCancel: this.handleCancel

lib/components/Editor/index.js

@@ -247,19 +247,19 @@ var Editor = function (_React$Component) {
       if (this.props.beforeSubmit) {
         Promise.resolve(this.props.beforeSubmit({ text: value, files: files })).then(function (res) {
           if (!(res === false)) {
-            _this2.props.onSubmit({ text: value, files: files }, function () {
+            _this2.props.onSubmit({ text: value, files: files }, function (res) {
               _this2.resetState();
               if (_this2.props.onCommentSuccess) {
-                _this2.props.onCommentSuccess();
+                _this2.props.onCommentSuccess(res);
               }
             });
           }
         });
       } else {
-        this.props.onSubmit({ text: value, files: files }, function () {
+        this.props.onSubmit({ text: value, files: files }, function (res) {
           _this2.resetState();
           if (_this2.props.onCommentSuccess) {
-            _this2.props.onCommentSuccess();
+            _this2.props.onCommentSuccess(res);
           }
         });
       }

lib/index.js

@@ -111,7 +111,7 @@ if (process.env.NODE_ENV !== "production") {
     type: 1,
     businessId: "test",
     businessUserId: 4,
-    userId: 71299,
+    userId: 71748,
     currentUser: {
       user_id: 71748
     },
@@ -158,7 +158,14 @@ if (process.env.NODE_ENV !== "production") {
     onCountChange: function onCountChange(c) {
       console.log(c);
     },
-    editorProps: {}
+    onDelete: function onDelete(type, data) {
+      console.log(type, data);
+    },
+    editorProps: {
+      onCommentSuccess: function onCommentSuccess(data) {
+        console.log(data);
+      }
+    }
   });
 }
 

lib/version.json

@@ -1,8 +1,8 @@
 {
     "name":       "comment",
-    "buildDate":  1562073871881,
+    "buildDate":  1562985105668,
     "version":    "1.0.4",
-    "numCommits": 158,
-    "hash":       "1b15efb",
+    "numCommits": 161,
+    "hash":       "a7dfeba",
     "dirty":      true
 }

src/App.js

@@ -277,8 +277,9 @@ class App extends Component {
       .then(() => {
         const { list, total } = this.state;
         const res = list.filter(item => item.id !== commentId);
+        const deletedItem = list.find(item => item.id === commentId);
         this.setState({ list: res, total: total - 1 });
-        this.props.onDelete(COMMENT_TYPE.COMMENT);
+        this.props.onDelete(COMMENT_TYPE.COMMENT, deletedItem);
         this.props.onCountChange(total - 1);
       })
       .catch(this.errorHandler)
@@ -341,16 +342,18 @@ class App extends Component {
       withCredentials: true
     })
       .then(() => {
+        let deletedItem = null;
         const list = this.state.list.map(item => {
           if (item.id === commentId) {
             const replies = item.replies.filter(item => item.id !== replyId);
+            deletedItem = item.replies.find(item => item.id === replyId);
             item.replies = replies;
             item.reply_count -= 1;
           }
           return item;
         });
         this.setState({ list });
-        this.props.onDelete(COMMENT_TYPE.REPLY);
+        this.props.onDelete(COMMENT_TYPE.REPLY, deletedItem);
       })
       .catch(this.errorHandler)
       .finally(() => {

src/components/CommentInput/index.js

@@ -36,15 +36,14 @@ class CommentInput extends Component {
         cb
       );
     } else if (action === "reply") {
-      console.log("[[[", callback);
-      // this.props.app.sCreateReply(
-      //   {
-      //     comment_id: commentId,
-      //     content: value,
-      //     business_user_id: userId
-      //   },
-      //   (data) => callback && callback(data)
-      // );
+      this.props.app.sCreateReply(
+        {
+          comment_id: commentId,
+          content: value,
+          business_user_id: userId
+        },
+        data => callback && callback(data)
+      );
     } else if (action === "replyToReply") {
       this.props.app.sCreateReply(
         {

src/components/ContentItem/index.js

@@ -36,6 +36,7 @@ class CommentItem extends Component {
     this.showPreviewer = this.showPreviewer.bind(this);
     this.hidePreviewer = this.hidePreviewer.bind(this);
     this.handleVisibleChange = this.handleVisibleChange.bind(this);
+    this.handleUserAvaClick = this.handleUserAvaClick.bind(this);
   }
 
   showPreviewer(index) {
@@ -61,13 +62,13 @@ class CommentItem extends Component {
     });
   }
 
-  handleUserAvaClick = () => {
+  handleUserAvaClick() {
     const { user_id } = this.props;
     const { userAvaClick } = this.props.app;
     if (userAvaClick) {
       userAvaClick(user_id);
     }
-  };
+  }
 
   renderTextWithReply(text, content) {
     let newText = text;

src/index.js

@@ -76,7 +76,7 @@ if (process.env.NODE_ENV !== "production") {
     type: 1,
     businessId: "test",
     businessUserId: 4,
-    userId: 71299,
+    userId: 71748,
     currentUser: {
       user_id: 71748
     },
@@ -123,6 +123,9 @@ if (process.env.NODE_ENV !== "production") {
     onCountChange: c => {
       console.log(c);
     },
+    onDelete: (type, data) => {
+      console.log(type, data);
+    },
     editorProps: {
       onCommentSuccess: data => {
         console.log(data);