Merge branch 'master' of Hepper/comment into master

lib/components/Editor/index.js

   }, {
     key: "handleSubmit",
     value: function handleSubmit() {
+      var _this2 = this;
+
       var maxLength = this.props.maxLength;
       var _state = this.state,
           value = _state.value,
           files.push("" + _constant.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: 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();
+          }
+        });
+      }
     }
   }, {
     key: "resetState",
   }, {
     key: "render",
     value: function render() {
-      var _this2 = this;
+      var _this3 = this;
 
       var _props = this.props,
           value = _props.value,
           _react2.default.createElement(TextArea, {
             value: inputValue,
             onChange: function onChange(e) {
-              return _this2.handleChange(e.target.value);
+              return _this3.handleChange(e.target.value);
             },
             rows: rows,
             placeholder: placeholder,
                     _react2.default.createElement(_Emoji2.default, {
                       onClick: this.handleClickEmoji,
                       ref: function ref(node) {
-                        _this2.emoji = node;
+                        _this3.emoji = node;
                       }
                     })
                   ),
                   autoAdjustOverflow: false,
                   overlayStyle: { zIndex: 999 },
                   onVisibleChange: closeUploadWhenBlur ? function (visible) {
-                    _this2.handleShowUpload(visible);
+                    _this3.handleShowUpload(visible);
                   } : null,
                   content: _react2.default.createElement(
                     "div",
                 },
                 imageToolIcon ? _react2.default.cloneElement(imageToolIcon, {
                   onClick: function onClick() {
-                    return _this2.handleShowUpload(true);
+                    return _this3.handleShowUpload(true);
                   }
                 }) : _react2.default.createElement(_icon2.default, {
                   type: "picture",
                   className: "comment-toolbar-icon",
                   style: { marginLeft: 10 },
                   onClick: function onClick() {
-                    return _this2.handleShowUpload(true);
+                    return _this3.handleShowUpload(true);
                   }
                 })
               ) : null
                 _button2.default,
                 {
                   onClick: function onClick() {
-                    return _this2.handleSubmit();
+                    return _this3.handleSubmit();
                   },
                   type: "primary",
                   loading: btnLoading,

lib/helper.js

     newContent = newContent.join("");
   }
   // 不包含在标签内的链接
-  var innerUrl = /((http(s)?:)?\/\/)?(www\.)?[-a-zA-Z0-9@:%._+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_+.~#?&//=]*)(?![^<>]*>|[^"]*?<\/a)/g;
+  var innerUrl = /((http(s)?:)?\/\/)?(www\.)?[-a-zA-Z0-9@:%._+~#=]{2,256}\.[com|net|org|cn|edu|top|gov]{2,6}\b([-a-zA-Z0-9@:%_+.~#?&//=]*)(?![^<>]*>|[^"]*?<\/a)/g;
   var data = htmlEncode(newContent).replace(_constant.REGEXP, function (a, b) {
     var src = a.slice(1, -1);
 

lib/index.js

           autoFocus: true
         }, this.props.editorProps, {
           fileList: this.state.fileList,
+          onSubmit: function onSubmit() {
+            console.log('-----------');
+          },
           handleChangeFileList: function handleChangeFileList(fileList) {
             _this2.setState({
               fileList: fileList

lib/index.js.map

-{"version":3,"sources":["../src/index.js"],"names":["Index","props","state","fileList","uid","name","status","response","url","editorProps","setState","React","Component","renderComment","config","id","Error","type","businessId","console","warn","API","ReactDOM","render","document","getElementById","window","process","env","NODE_ENV","businessUserId","userId","onCountChange","log","c"],"mappings":";;;;;;AAAA;;;;AACA;;;;AACA;;;;;;;;;;;;AACA;;IAEMA,K;;;AACJ,iBAAYC,KAAZ,EAAmB;AAAA;;AAAA,8GACXA,KADW;;AAEjB,UAAKC,KAAL,GAAa;AACXC,gBAAU,CACR;AACEC,aAAK,GADP;AAEEC,cAAM,SAFR;AAGEC,gBAAQ,MAHV;AAIEC,kBAAU,SAJZ,EAIuB;AACrBC,aACE;AANJ,OADQ;AADC,KAAb;AAFiB;AAclB;;;;6BAEQ;AAAA;;AACP,aACE;AAAC,qBAAD;AAAA;AACE,gCADF;AAEE,8BAFF;AAGE,8BAHF;AAIE;AAJF,WAKM,KAAKP,KALX;AAOE,sCAAC,WAAD;AACE,qBAAW,CADb;AAEE;AAFF,WAGM,KAAKA,KAAL,CAAWQ,WAHjB;AAIE,oBAAU,KAAKP,KAAL,CAAWC,QAJvB;AAKE,gCAAsB,wCAAY;AAChC,mBAAKO,QAAL,CAAc;AACZP;AADY,aAAd;AAGD;AATH;AAPF,OADF;AAqBD;;;;EAvCiBQ,gBAAMC,S;;AA0C1B;;;;;;;;;;AAQA,SAASC,aAAT,CAAuBC,MAAvB,EAA+B;AAC7B,MAAI,CAACA,OAAOC,EAAZ,EAAgB;AACd,UAAM,IAAIC,KAAJ,CAAU,gBAAV,CAAN;AACD;AACD,MAAI,CAACF,OAAOG,IAAZ,EAAkB;AAChB,UAAM,IAAID,KAAJ,CAAU,kBAAV,CAAN;AACD;AACD,MAAI,CAACF,OAAOI,UAAZ,EAAwB;AACtB;AACAJ,WAAOI,UAAP,GAAoB,MAApB;AACAC,YAAQC,IAAR,CAAa,+BAAb;AACD;AACD,MAAI,CAACN,OAAOO,GAAZ,EAAiB;AACf;AACAP,WAAOO,GAAP,GAAa,oCAAb;AACAF,YAAQC,IAAR,CACE,sDADF;AAGD;;AAEDE,qBAASC,MAAT,CAAgB,8BAAC,KAAD,EAAWT,MAAX,CAAhB,EAAuCU,SAASC,cAAT,CAAwBX,OAAOC,EAA/B,CAAvC;AACA;AACD;;AAEDW,OAAOb,aAAP,GAAuBA,aAAvB;;AAEA,IAAIc,QAAQC,GAAR,CAAYC,QAAZ,KAAyB,YAA7B,EAA2C;AACzChB,gBAAc;AACZE,QAAI,cADQ;AAEZE,UAAM,CAFM;AAGZC,gBAAY,MAHA;AAIZY,oBAAgB,CAJJ;AAKZC,YAAQ,KALI;AAMZC,mBAAe,0BAAK;AAClBb,cAAQc,GAAR,CAAYC,CAAZ;AACD,KARW;AASZzB,iBAAa;AACX;AACA;AAFW;AATD,GAAd;AAcD;;AAED;AACA;AACA;AACA;AACA;AACA","file":"index.js","sourcesContent":["import React from \"react\";\nimport ReactDOM from \"react-dom\";\nimport App, { Editor } from \"./App\";\n// import registerServiceWorker from \"./registerServiceWorker\";\n\nclass Index extends React.Component {\n  constructor(props) {\n    super(props);\n    this.state = {\n      fileList: [\n        {\n          uid: \"1\",\n          name: \"xxx.png\",\n          status: \"done\",\n          response: \"success\", // custom error message to show\n          url:\n            \"//links-comment.oss-cn-beijing.aliyuncs.com/comment/20190617/UCs7aXEjW.jpeg\"\n        }\n      ]\n    };\n  }\n\n  render() {\n    return (\n      <App\n        showAlertComment\n        showAlertReply\n        showAlertFavor\n        showError\n        {...this.props}\n      >\n        <Editor\n          maxUpload={9}\n          autoFocus\n          {...this.props.editorProps}\n          fileList={this.state.fileList}\n          handleChangeFileList={fileList => {\n            this.setState({\n              fileList\n            });\n          }}\n        />\n      </App>\n    );\n  }\n}\n\n/**\n * 渲染评论组件\n * @param {object} config 编辑器配置\n *  - {string} id 渲染评论的DOM的 ID\n *  - {number} type 评论的 type\n *  - {string} businessId 评论的 businessId\n *  - {string} API, API 前缀, 默认 http://api.links123.net/comment/v1\n */\nfunction renderComment(config) {\n  if (!config.id) {\n    throw new Error(\"id is required\");\n  }\n  if (!config.type) {\n    throw new Error(\"type is required\");\n  }\n  if (!config.businessId) {\n    // throw new Error(\"businessId is required\");\n    config.businessId = \"test\";\n    console.warn(\"没有传入 businessId 参数，默认使用: test\");\n  }\n  if (!config.API) {\n    // throw new Error(\"API is required\");\n    config.API = \"http://api.links123.net/comment/v1\";\n    console.warn(\n      \"没有传入 API 参数，默认使用: http://api.links123.net/comment/v1\"\n    );\n  }\n\n  ReactDOM.render(<Index {...config} />, document.getElementById(config.id));\n  // registerServiceWorker();\n}\n\nwindow.renderComment = renderComment;\n\nif (process.env.NODE_ENV !== \"production\") {\n  renderComment({\n    id: \"root-comment\",\n    type: 1,\n    businessId: \"test\",\n    businessUserId: 4,\n    userId: 71299,\n    onCountChange: c => {\n      console.log(c);\n    },\n    editorProps: {\n      // emojiPopoverPlacement: \"bottom\",\n      // uploadPopoverPlacement: \"top\"\n    }\n  });\n}\n\n// renderComment({\n//   id: \"root-comment\",\n//   type: 1,\n//   businessId: \"test\",\n//   API: 'http://api.links123.net/comment/v1',\n// });\n"]}
+{"version":3,"sources":["../src/index.js"],"names":["Index","props","state","fileList","uid","name","status","response","url","editorProps","console","log","setState","React","Component","renderComment","config","id","Error","type","businessId","warn","API","ReactDOM","render","document","getElementById","window","process","env","NODE_ENV","businessUserId","userId","onCountChange","c"],"mappings":";;;;;;AAAA;;;;AACA;;;;AACA;;;;;;;;;;;;AACA;;IAEMA,K;;;AACJ,iBAAYC,KAAZ,EAAmB;AAAA;;AAAA,8GACXA,KADW;;AAEjB,UAAKC,KAAL,GAAa;AACXC,gBAAU,CACR;AACEC,aAAK,GADP;AAEEC,cAAM,SAFR;AAGEC,gBAAQ,MAHV;AAIEC,kBAAU,SAJZ,EAIuB;AACrBC,aACE;AANJ,OADQ;AADC,KAAb;AAFiB;AAclB;;;;6BAEQ;AAAA;;AACP,aACE;AAAC,qBAAD;AAAA;AACE,gCADF;AAEE,8BAFF;AAGE,8BAHF;AAIE;AAJF,WAKM,KAAKP,KALX;AAOE,sCAAC,WAAD;AACE,qBAAW,CADb;AAEE;AAFF,WAGM,KAAKA,KAAL,CAAWQ,WAHjB;AAIE,oBAAU,KAAKP,KAAL,CAAWC,QAJvB;AAKE,oBACE,oBAAM;AACJO,oBAAQC,GAAR,CAAY,aAAZ;AACD,WARL;AAUE,gCAAsB,wCAAY;AAChC,mBAAKC,QAAL,CAAc;AACZT;AADY,aAAd;AAGD;AAdH;AAPF,OADF;AA0BD;;;;EA5CiBU,gBAAMC,S;;AA+C1B;;;;;;;;;;AAQA,SAASC,aAAT,CAAuBC,MAAvB,EAA+B;AAC7B,MAAI,CAACA,OAAOC,EAAZ,EAAgB;AACd,UAAM,IAAIC,KAAJ,CAAU,gBAAV,CAAN;AACD;AACD,MAAI,CAACF,OAAOG,IAAZ,EAAkB;AAChB,UAAM,IAAID,KAAJ,CAAU,kBAAV,CAAN;AACD;AACD,MAAI,CAACF,OAAOI,UAAZ,EAAwB;AACtB;AACAJ,WAAOI,UAAP,GAAoB,MAApB;AACAV,YAAQW,IAAR,CAAa,+BAAb;AACD;AACD,MAAI,CAACL,OAAOM,GAAZ,EAAiB;AACf;AACAN,WAAOM,GAAP,GAAa,oCAAb;AACAZ,YAAQW,IAAR,CACE,sDADF;AAGD;;AAEDE,qBAASC,MAAT,CAAgB,8BAAC,KAAD,EAAWR,MAAX,CAAhB,EAAuCS,SAASC,cAAT,CAAwBV,OAAOC,EAA/B,CAAvC;AACA;AACD;;AAEDU,OAAOZ,aAAP,GAAuBA,aAAvB;;AAEA,IAAIa,QAAQC,GAAR,CAAYC,QAAZ,KAAyB,YAA7B,EAA2C;AACzCf,gBAAc;AACZE,QAAI,cADQ;AAEZE,UAAM,CAFM;AAGZC,gBAAY,MAHA;AAIZW,oBAAgB,CAJJ;AAKZC,YAAQ,KALI;AAMZC,mBAAe,0BAAK;AAClBvB,cAAQC,GAAR,CAAYuB,CAAZ;AACD,KARW;AASZzB,iBAAa;AACX;AACA;AAFW;AATD,GAAd;AAcD;;AAED;AACA;AACA;AACA;AACA;AACA","file":"index.js","sourcesContent":["import React from \"react\";\nimport ReactDOM from \"react-dom\";\nimport App, { Editor } from \"./App\";\n// import registerServiceWorker from \"./registerServiceWorker\";\n\nclass Index extends React.Component {\n  constructor(props) {\n    super(props);\n    this.state = {\n      fileList: [\n        {\n          uid: \"1\",\n          name: \"xxx.png\",\n          status: \"done\",\n          response: \"success\", // custom error message to show\n          url:\n            \"//links-comment.oss-cn-beijing.aliyuncs.com/comment/20190617/UCs7aXEjW.jpeg\"\n        }\n      ]\n    };\n  }\n\n  render() {\n    return (\n      <App\n        showAlertComment\n        showAlertReply\n        showAlertFavor\n        showError\n        {...this.props}\n      >\n        <Editor\n          maxUpload={9}\n          autoFocus\n          {...this.props.editorProps}\n          fileList={this.state.fileList}\n          onSubmit={\n            () => {\n              console.log('-----------')\n            }\n          }\n          handleChangeFileList={fileList => {\n            this.setState({\n              fileList\n            });\n          }}\n        />\n      </App>\n    );\n  }\n}\n\n/**\n * 渲染评论组件\n * @param {object} config 编辑器配置\n *  - {string} id 渲染评论的DOM的 ID\n *  - {number} type 评论的 type\n *  - {string} businessId 评论的 businessId\n *  - {string} API, API 前缀, 默认 http://api.links123.net/comment/v1\n */\nfunction renderComment(config) {\n  if (!config.id) {\n    throw new Error(\"id is required\");\n  }\n  if (!config.type) {\n    throw new Error(\"type is required\");\n  }\n  if (!config.businessId) {\n    // throw new Error(\"businessId is required\");\n    config.businessId = \"test\";\n    console.warn(\"没有传入 businessId 参数，默认使用: test\");\n  }\n  if (!config.API) {\n    // throw new Error(\"API is required\");\n    config.API = \"http://api.links123.net/comment/v1\";\n    console.warn(\n      \"没有传入 API 参数，默认使用: http://api.links123.net/comment/v1\"\n    );\n  }\n\n  ReactDOM.render(<Index {...config} />, document.getElementById(config.id));\n  // registerServiceWorker();\n}\n\nwindow.renderComment = renderComment;\n\nif (process.env.NODE_ENV !== \"production\") {\n  renderComment({\n    id: \"root-comment\",\n    type: 1,\n    businessId: \"test\",\n    businessUserId: 4,\n    userId: 71299,\n    onCountChange: c => {\n      console.log(c);\n    },\n    editorProps: {\n      // emojiPopoverPlacement: \"bottom\",\n      // uploadPopoverPlacement: \"top\"\n    }\n  });\n}\n\n// renderComment({\n//   id: \"root-comment\",\n//   type: 1,\n//   businessId: \"test\",\n//   API: 'http://api.links123.net/comment/v1',\n// });\n"]}

lib/version.json

 {
     "name":       "comment",
-    "buildDate":  1561169930396,
+    "buildDate":  1561187082713,
     "version":    "1.0.4",
-    "numCommits": 151,
-    "hash":       "1d304ca",
+    "numCommits": 152,
+    "hash":       "7648f49",
     "dirty":      true
 }

src/components/Editor/index.js

         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() {

src/helper.js

     newContent = newContent.join("");
   }
   // 不包含在标签内的链接
-  const innerUrl = /((http(s)?:)?\/\/)?(www\.)?[-a-zA-Z0-9@:%._+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_+.~#?&//=]*)(?![^<>]*>|[^"]*?<\/a)/g;
+  const innerUrl = /((http(s)?:)?\/\/)?(www\.)?[-a-zA-Z0-9@:%._+~#=]{2,256}\.[com|net|org|cn|edu|top|gov]{2,6}\b([-a-zA-Z0-9@:%_+.~#?&//=]*)(?![^<>]*>|[^"]*?<\/a)/g;
   const data = htmlEncode(newContent)
     .replace(REGEXP, function(a, b) {
       const src = a.slice(1, -1);

src/index.js

           autoFocus
           {...this.props.editorProps}
           fileList={this.state.fileList}
+          onSubmit={() => {
+            console.log("-----------");
+          }}
           handleChangeFileList={fileList => {
             this.setState({
               fileList