Merge branch 'master' of Hepper/comment into master

lib/components/Editor/index.js

@@ -206,6 +206,7 @@ var Editor = function (_React$Component) {
         }
         return item;
       });
+      this.props.handleChangeFileList(fileList);
       this.setState({ fileMap: fileMap, fileList: fileList });
     }
 
@@ -218,8 +219,6 @@ var Editor = function (_React$Component) {
   }, {
     key: "handleSubmit",
     value: function handleSubmit() {
-      var _this2 = this;
-
       var maxLength = this.props.maxLength;
       var _state = this.state,
           value = _state.value,
@@ -244,25 +243,27 @@ var Editor = function (_React$Component) {
           files.push("" + _constant.OSS_LINK + fileMap[item.uid]);
         });
       }
-      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.resetState();
-              if (_this2.props.onCommentSuccess) {
-                _this2.props.onCommentSuccess();
-              }
-            });
-          }
-        });
-      } else {
-        this.props.onSubmit({ text: value, files: files }, function () {
-          _this2.resetState();
-          if (_this2.props.onCommentSuccess) {
-            _this2.props.onCommentSuccess();
-          }
-        });
-      }
+      // if (this.props.beforeSubmit) {
+      //   Promise.resolve(this.props.beforeSubmit({ text: value, files })).then(
+      //     res => {
+      //       if (!(res === false)) {
+      //         this.props.onSubmit({ text: value, files }, () => {
+      //           this.resetState();
+      //           if (this.props.onCommentSuccess) {
+      //             this.props.onCommentSuccess();
+      //           }
+      //         });
+      //       }
+      //     }
+      //   );
+      // } else {
+      //   this.props.onSubmit({ text: value, files }, () => {
+      //     this.resetState();
+      //     if (this.props.onCommentSuccess) {
+      //       this.props.onCommentSuccess();
+      //     }
+      //   });
+      // }
     }
   }, {
     key: "resetState",
@@ -277,7 +278,7 @@ var Editor = function (_React$Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this3 = this;
+      var _this2 = this;
 
       var _props = this.props,
           value = _props.value,
@@ -320,7 +321,7 @@ var Editor = function (_React$Component) {
           _react2.default.createElement(TextArea, {
             value: inputValue,
             onChange: function onChange(e) {
-              return _this3.handleChange(e.target.value);
+              return _this2.handleChange(e.target.value);
             },
             rows: rows,
             placeholder: placeholder,
@@ -348,7 +349,7 @@ var Editor = function (_React$Component) {
                     _react2.default.createElement(_Emoji2.default, {
                       onClick: this.handleClickEmoji,
                       ref: function ref(node) {
-                        _this3.emoji = node;
+                        _this2.emoji = node;
                       }
                     })
                   ),
@@ -367,7 +368,7 @@ var Editor = function (_React$Component) {
                   autoAdjustOverflow: false,
                   overlayStyle: { zIndex: 999 },
                   onVisibleChange: closeUploadWhenBlur ? function (visible) {
-                    _this3.handleShowUpload(visible);
+                    _this2.handleShowUpload(visible);
                   } : null,
                   content: _react2.default.createElement(
                     "div",
@@ -408,14 +409,14 @@ var Editor = function (_React$Component) {
                 },
                 imageToolIcon ? _react2.default.cloneElement(imageToolIcon, {
                   onClick: function onClick() {
-                    return _this3.handleShowUpload(true);
+                    return _this2.handleShowUpload(true);
                   }
                 }) : _react2.default.createElement(_icon2.default, {
                   type: "picture",
                   className: "comment-toolbar-icon",
                   style: { marginLeft: 10 },
                   onClick: function onClick() {
-                    return _this3.handleShowUpload(true);
+                    return _this2.handleShowUpload(true);
                   }
                 })
               ) : null
@@ -429,7 +430,7 @@ var Editor = function (_React$Component) {
                 _button2.default,
                 {
                   onClick: function onClick() {
-                    return _this3.handleSubmit();
+                    return _this2.handleSubmit();
                   },
                   type: "primary",
                   loading: btnLoading,

lib/version.json

@@ -1,8 +1,8 @@
 {
     "name":       "comment",
-    "buildDate":  1561033676404,
+    "buildDate":  1561169930396,
     "version":    "1.0.4",
-    "numCommits": 149,
-    "hash":       "955d349",
+    "numCommits": 151,
+    "hash":       "1d304ca",
     "dirty":      true
 }

src/components/Editor/index.js

@@ -113,6 +113,7 @@ class Editor extends React.Component {
       }
       return item;
     });
+    this.props.handleChangeFileList(fileList);
     this.setState({ fileMap, fileList });
   }
 
@@ -142,27 +143,27 @@ class Editor extends React.Component {
         files.push(`${OSS_LINK}${fileMap[item.uid]}`);
       });
     }
-    if (this.props.beforeSubmit) {
-      Promise.resolve(this.props.beforeSubmit({ text: value, files })).then(
-        res => {
-          if (!(res === false)) {
-            this.props.onSubmit({ text: value, files }, () => {
-              this.resetState();
-              if (this.props.onCommentSuccess) {
-                this.props.onCommentSuccess();
-              }
-            });
-          }
-        }
-      );
-    } else {
-      this.props.onSubmit({ text: value, files }, () => {
-        this.resetState();
-        if (this.props.onCommentSuccess) {
-          this.props.onCommentSuccess();
-        }
-      });
-    }
+    // if (this.props.beforeSubmit) {
+    //   Promise.resolve(this.props.beforeSubmit({ text: value, files })).then(
+    //     res => {
+    //       if (!(res === false)) {
+    //         this.props.onSubmit({ text: value, files }, () => {
+    //           this.resetState();
+    //           if (this.props.onCommentSuccess) {
+    //             this.props.onCommentSuccess();
+    //           }
+    //         });
+    //       }
+    //     }
+    //   );
+    // } else {
+    //   this.props.onSubmit({ text: value, files }, () => {
+    //     this.resetState();
+    //     if (this.props.onCommentSuccess) {
+    //       this.props.onCommentSuccess();
+    //     }
+    //   });
+    // }
   }
 
   resetState() {