Merge branch 'master' of Hepper/comment into master

src/App.js

@@ -246,7 +246,7 @@ class App extends Component {
         if (this.props.showAlertComment) {
           message.success(intl.get("message.success"));
         }
-        if (isFunction(cb)) cb();
+        if (isFunction(cb)) cb(response.data);
         // 将数据写入到 list 中
         // 临时插入
         // 等到获取数据之后，删除临时数据
@@ -305,7 +305,7 @@ class App extends Component {
         if (this.props.showAlertReply) {
           message.success(intl.get("message.replySuccess"));
         }
-        if (isFunction(cb)) cb();
+        if (isFunction(cb)) cb(response.data);
         // 将数据写入到 list 中
         // 临时插入
         // 等到获取数据之后，删除临时数据

src/components/CommentInput/index.js

@@ -36,14 +36,15 @@ class CommentInput extends Component {
         cb
       );
     } else if (action === "reply") {
-      this.props.app.sCreateReply(
-        {
-          comment_id: commentId,
-          content: value,
-          business_user_id: userId
-        },
-        () => callback && callback()
-      );
+      console.log("[[[", callback);
+      // 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(
         {
@@ -52,7 +53,7 @@ class CommentInput extends Component {
           reply_id: replyId,
           business_user_id: userId
         },
-        () => callback && callback()
+        data => callback && callback(data)
       );
     }
   }

src/components/ContentItem/index.js

@@ -61,6 +61,14 @@ class CommentItem extends Component {
     });
   }
 
+  handleUserAvaClick = () => {
+    const { user_id } = this.props;
+    const { userAvaClick } = this.props.app;
+    if (userAvaClick) {
+      userAvaClick(user_id);
+    }
+  };
+
   renderTextWithReply(text, content) {
     let newText = text;
     const { reply } = content;
@@ -94,7 +102,7 @@ class CommentItem extends Component {
       user_id
     } = this.props;
 
-    const { locale, userAvaClick, showHoverCard } = this.props.app;
+    const { locale, showHoverCard } = this.props.app;
     const { showInput } = this.state;
 
     let newContent = content.content;
@@ -147,7 +155,7 @@ class CommentItem extends Component {
                 style={{
                   backgroundImage: `url(${content.user_avatar || avatar})`
                 }}
-                onClick={() => userAvaClick(user_id)}
+                onClick={this.handleUserAvaClick}
               />
             </Popover>
           ) : (
@@ -156,9 +164,7 @@ class CommentItem extends Component {
               style={{
                 backgroundImage: `url(${content.user_avatar || avatar})`
               }}
-              onClick={() => {
-                userAvaClick(user_id);
-              }}
+              onClick={this.handleUserAvaClick}
             />
           )}
         </div>
@@ -168,7 +174,7 @@ class CommentItem extends Component {
               {content.user_name || "暂无昵称"}
             </a> */}
             <strong
-              onClick={() => userAvaClick(user_id)}
+              onClick={this.handleUserAvaClick}
               style={{ cursor: "pointer" }}
             >
               {content.user_name || intl.get("comment.tourist")}

src/components/Editor/Upload.css

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

src/components/Editor/Upload.js

@@ -124,6 +124,7 @@ class App extends React.Component {
           {fileList.length >= maxUpload ? null : uploadButton}
         </Upload>
         <Modal
+          className="upload-img-preview"
           visible={previewVisible}
           footer={null}
           onCancel={this.handleCancel}

src/components/Editor/index.js

@@ -147,20 +147,20 @@ class Editor extends React.Component {
       Promise.resolve(this.props.beforeSubmit({ text: value, files })).then(
         res => {
           if (!(res === false)) {
-            this.props.onSubmit({ text: value, files }, () => {
+            this.props.onSubmit({ text: value, files }, res => {
               this.resetState();
               if (this.props.onCommentSuccess) {
-                this.props.onCommentSuccess();
+                this.props.onCommentSuccess(res);
               }
             });
           }
         }
       );
     } else {
-      this.props.onSubmit({ text: value, files }, () => {
+      this.props.onSubmit({ text: value, files }, res => {
         this.resetState();
         if (this.props.onCommentSuccess) {
-          this.props.onCommentSuccess();
+          this.props.onCommentSuccess(res);
         }
       });
     }

src/index.js

@@ -123,7 +123,11 @@ if (process.env.NODE_ENV !== "production") {
     onCountChange: c => {
       console.log(c);
     },
-    editorProps: {}
+    editorProps: {
+      onCommentSuccess: data => {
+        console.log(data);
+      }
+    }
   });
 }