Merge branch 'forge' of http://bdgit.educoder.net/Hjqreturn/educoder into forge

/Users/hs/edu/educoder/files/2020/02/bca730c34eddea885d094ed197524187_1582602737586

@@ -0,0 +1 @@
+react的工作流程：比如请求链接后，从路由 到 index.js 然后再到每个页面的js文件，是这样的吗？

/Users/hs/edu/educoder/files/2020/02/bca730c34eddea885d094ed197524187_1582616133869

@@ -0,0 +1 @@
+react的工作流程：比如请求链接后，从路由 到 index.js 然后再到每个页面的js文件，是这样的吗？

/Users/hs/edu/educoder/files/2020/02/bca730c34eddea885d094ed197524187_1582616220778

@@ -0,0 +1 @@
+react的工作流程：比如请求链接后，从路由 到 index.js 然后再到每个页面的js文件，是这样的吗？

app/services/gitea/pull_request/update_service.rb

@@ -10,7 +10,7 @@ class Gitea::PullRequest::UpdateService < Gitea::ClientService
   end
 
   def call
-    update(url, request_params)
+    put(url, request_params)
   end
 
   private

app/views/issues/_simple_issue_item.json.jbuilder

@@ -1,10 +1,10 @@
-json.name issue.subject
-json.created_at format_time(issue.created_on)
-json.updated_at format_time(issue.updated_on)
-json.assign_user_name issue.get_assign_user.try(:show_real_name)
-json.assign_user_login issue.get_assign_user.try(:login)
-json.issue_journal_size issue.get_journals_size
-journals = issue.only_reply_journals
+json.name issue.try(:subject)
+json.created_at format_time(issue.try(:created_on))
+json.updated_at format_time(issue.try(:updated_on))
+json.assign_user_name issue&.get_assign_user.try(:show_real_name)
+json.assign_user_login issue&.get_assign_user.try(:login)
+json.issue_journal_size issue&.get_journals_size
+journals = issue&.only_reply_journals
 
 json.issue_journals do
   json.array! journals.to_a.each do |j|

public/react/build/asset-manifest.json

@@ -244,12 +244,12 @@
   "./static/js/79.4f9f541f.chunk.js": "./static/js/79.4f9f541f.chunk.js",
   "./static/js/8.5fa33b25.chunk.js": "./static/js/8.5fa33b25.chunk.js",
   "./static/js/80.37349428.chunk.js": "./static/js/80.37349428.chunk.js",
-  "./static/js/81.66b876e0.chunk.js": "./static/js/81.66b876e0.chunk.js",
+  "./static/js/81.e75f830f.chunk.js": "./static/js/81.e75f830f.chunk.js",
   "./static/js/82.fb9f8518.chunk.js": "./static/js/82.fb9f8518.chunk.js",
   "./static/js/83.c4d82be9.chunk.js": "./static/js/83.c4d82be9.chunk.js",
   "./static/js/84.33e98b32.chunk.js": "./static/js/84.33e98b32.chunk.js",
-  "./static/js/85.332022b8.chunk.js": "./static/js/85.332022b8.chunk.js",
-  "./static/js/86.3efa95e7.chunk.js": "./static/js/86.3efa95e7.chunk.js",
+  "./static/js/85.d0d27aa3.chunk.js": "./static/js/85.d0d27aa3.chunk.js",
+  "./static/js/86.e636f3c7.chunk.js": "./static/js/86.e636f3c7.chunk.js",
   "./static/js/87.97d381ba.chunk.js": "./static/js/87.97d381ba.chunk.js",
   "./static/js/88.5b2fc6f4.chunk.js": "./static/js/88.5b2fc6f4.chunk.js",
   "./static/js/89.57c531e0.chunk.js": "./static/js/89.57c531e0.chunk.js",
@@ -265,7 +265,7 @@
   "./static/js/98.ce23d704.chunk.js": "./static/js/98.ce23d704.chunk.js",
   "./static/js/99.55287fde.chunk.js": "./static/js/99.55287fde.chunk.js",
   "main.css": "./static/css/main.c0718fb6.css",
-  "main.js": "./static/js/main.a2fce902.js",
+  "main.js": "./static/js/main.7e2dc849.js",
   "static/media/KaTeX_AMS-Regular.ttf": "static/media/KaTeX_AMS-Regular.aaf4eee9.ttf",
   "static/media/KaTeX_AMS-Regular.woff": "static/media/KaTeX_AMS-Regular.7f06b4e3.woff",
   "static/media/KaTeX_AMS-Regular.woff2": "static/media/KaTeX_AMS-Regular.e78e28b4.woff2",

public/react/build/index.html

@@ -24,7 +24,7 @@
                 _host = 'https://ali-cdn.educoder.net/react/build/'
             }
             document.write('<script type="text/javascript" src="' + _host + 'js/js_min_all.js"><\/script>');
-            document.write('<script type="text/javascript" src="' + _host + 'static/js/main.a2fce902.js"><\/script>');
+            document.write('<script type="text/javascript" src="' + _host + 'static/js/main.7e2dc849.js"><\/script>');
          })()
       </script>
     <script>!function(){var t=location.href;"3007"===window.location.port?-1!=t.indexOf("/tasks/")?(document.write('<script type="text/javascript" src="https://newweb.educoder.net/assets/kindeditor/kindeditor.js"><\/script>'),document.write('<script type="text/javascript" src="/react/build/js/create_kindeditor.js?v=1.1.1"><\/script>'),document.write('<script type="text/javascript" src="https://newweb.educoder.net/javascripts/educoder/edu_application.js"><\/script>')):-1!=t.indexOf("/paths/")&&document.write('<script type="text/javascript" src="https://newweb.educoder.net/javascripts/educoder/edu_application.js"><\/script>'):-1!=t.indexOf("/tasks/")?(document.write('<script type="text/javascript" src="/assets/kindeditor/kindeditor.js"><\/script>'),document.write('<script type="text/javascript" src="/react/build/js/create_kindeditor.js?v=1.1.1"><\/script>'),document.write('<script type="text/javascript" src="/javascripts/educoder/edu_application.js"><\/script>')):-1!=t.indexOf("/paths/")&&document.write('<script type="text/javascript" src="/javascripts/educoder/edu_application.js"><\/script>')}()</script><script type="text/javascript" src="https://cdn.bootcss.com/quill/1.3.7/quill.core.min.js"></script></body></html>

public/react/build/static/js/85.d0d27aa3.chunk.js

@@ -10248,11 +10248,7 @@ _this.deleteAttachment(file);return false;}};_this.deleteAttachment=function(fil
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3_react_router_dom__ = __webpack_require__(44);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_axios__ = __webpack_require__(15);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_axios___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_4_axios__);
-var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return call&&(typeof call==="object"||typeof call==="function")?call:self;}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);}subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:false,writable:true,configurable:true}});if(superClass)Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass;}var Attachment=function(_Component){_inherits(Attachment,_Component);function Attachment(props){_classCallCheck(this,Attachment);var _this=_possibleConstructorReturn(this,(Attachment.__proto__||Object.getPrototypeOf(Attachment)).call(this,props));_this.componentDidMount=function(){_this.getDetail();};_this.getDetail=function(){// this.setState({
-//   attachments: this.props.attachments,
-//   canDelete: this.props.canDelete
-// })
-};_this.deleteAttachment=function(id){console.log("delte_state",id);var url='/attachments/'+id+'.json';__WEBPACK_IMPORTED_MODULE_4_axios___default.a.delete(url,{}).then(function(response){if(response.data){if(response.data.status===0){_this.setState({Deleted:_this.state.Deleted.concat(id)});_this.props.showNotification("附件删除成功");}else{_this.props.showNotification(response.data.message);}}console.log("delte_state",_this.state);}).catch(function(error){console.log(error);});};_this.state={attachments:undefined,canDelete:false,Deleted:[]};return _this;}_createClass(Attachment,[{key:'render',value:function render(){var _this2=this;var Deleted=this.state.Deleted;var _props=this.props,attachments=_props.attachments,canDelete=_props.canDelete;return __WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement('div',null,attachments?__WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement('div',{className:'attachmentsList'},attachments.map(function(item,key){return __WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement('div',{key:key,style:{display:Deleted.length>0&&Deleted.indexOf(item.id)?"none":"block"},className:'mt10 attachment-list-div'},__WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement(__WEBPACK_IMPORTED_MODULE_3_react_router_dom__["b" /* Link */],{to:''+item.url,className:'attachment-list-a'},__WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement('i',{className:'iconfont icon-fujian mr8 paper-clip-color font-12'}),__WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement('span',null,item.title),__WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement('span',{className:'ml20'},item.filesize)),canDelete?__WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement(__WEBPACK_IMPORTED_MODULE_1_antd_lib_popconfirm___default.a,{placement:'bottom',title:'您确定要删除附件吗',okText:'\u662F',cancelText:'\u5426',onConfirm:function onConfirm(){return _this2.deleteAttachment(item.id);}},__WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement('span',{className:'attachment-list-delete fr'},__WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement('i',{className:'iconfont icon-lajitong mr10 color-grey-9 font-14'}))):"");})):"");}}]);return Attachment;}(__WEBPACK_IMPORTED_MODULE_2_react__["Component"]);/* harmony default export */ __webpack_exports__["a"] = (Attachment);
+var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return call&&(typeof call==="object"||typeof call==="function")?call:self;}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);}subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:false,writable:true,configurable:true}});if(superClass)Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass;}var Attachment=function(_Component){_inherits(Attachment,_Component);function Attachment(props){_classCallCheck(this,Attachment);var _this=_possibleConstructorReturn(this,(Attachment.__proto__||Object.getPrototypeOf(Attachment)).call(this,props));_this.componentDidMount=function(){_this.getDetail();};_this.getDetail=function(){_this.setState({attachments:_this.props.attachments,canDelete:_this.props.canDelete});};_this.deleteAttachment=function(id){var url='/attachments/'+id+'.json';__WEBPACK_IMPORTED_MODULE_4_axios___default.a.delete(url,{}).then(function(response){if(response.data){if(response.data.status===0){_this.setState({Deleted:_this.state.Deleted.concat(id)});_this.props.showNotification("附件删除成功");}else{_this.props.showNotification(response.data.message);}}}).catch(function(error){console.log(error);});};_this.state={attachments:undefined,canDelete:false,Deleted:[]};return _this;}_createClass(Attachment,[{key:'render',value:function render(){var _this2=this;var _state=this.state,Deleted=_state.Deleted,attachments=_state.attachments,canDelete=_state.canDelete;return __WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement('div',null,attachments?__WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement('div',{className:'attachmentsList'},attachments.map(function(item,key){return __WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement('div',{key:key,style:{display:Deleted.length>0&&Deleted.indexOf(item.id)!==-1?"none":"block"},className:'mt10 attachment-list-div'},__WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement(__WEBPACK_IMPORTED_MODULE_3_react_router_dom__["b" /* Link */],{to:''+item.url,className:'attachment-list-a'},__WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement('i',{className:'iconfont icon-fujian mr8 paper-clip-color font-12'}),__WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement('span',null,item.title),__WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement('span',{className:'ml20'},item.filesize)),canDelete?__WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement(__WEBPACK_IMPORTED_MODULE_1_antd_lib_popconfirm___default.a,{placement:'bottom',title:'您确定要删除附件吗',okText:'\u662F',cancelText:'\u5426',onConfirm:function onConfirm(){return _this2.deleteAttachment(item.id);}},__WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement('span',{className:'attachment-list-delete fr'},__WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement('i',{className:'iconfont icon-lajitong mr10 color-grey-9 font-14'}))):"");})):"");}}]);return Attachment;}(__WEBPACK_IMPORTED_MODULE_2_react__["Component"]);/* harmony default export */ __webpack_exports__["a"] = (Attachment);
 
 /***/ }),
 

public/react/build/static/js/86.e636f3c7.chunk.js

@@ -10248,11 +10248,7 @@ _this.deleteAttachment(file);return false;}};_this.deleteAttachment=function(fil
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3_react_router_dom__ = __webpack_require__(44);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_axios__ = __webpack_require__(15);
 /* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_axios___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_4_axios__);
-var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return call&&(typeof call==="object"||typeof call==="function")?call:self;}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);}subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:false,writable:true,configurable:true}});if(superClass)Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass;}var Attachment=function(_Component){_inherits(Attachment,_Component);function Attachment(props){_classCallCheck(this,Attachment);var _this=_possibleConstructorReturn(this,(Attachment.__proto__||Object.getPrototypeOf(Attachment)).call(this,props));_this.componentDidMount=function(){_this.getDetail();};_this.getDetail=function(){// this.setState({
-//   attachments: this.props.attachments,
-//   canDelete: this.props.canDelete
-// })
-};_this.deleteAttachment=function(id){console.log("delte_state",id);var url='/attachments/'+id+'.json';__WEBPACK_IMPORTED_MODULE_4_axios___default.a.delete(url,{}).then(function(response){if(response.data){if(response.data.status===0){_this.setState({Deleted:_this.state.Deleted.concat(id)});_this.props.showNotification("附件删除成功");}else{_this.props.showNotification(response.data.message);}}console.log("delte_state",_this.state);}).catch(function(error){console.log(error);});};_this.state={attachments:undefined,canDelete:false,Deleted:[]};return _this;}_createClass(Attachment,[{key:'render',value:function render(){var _this2=this;var Deleted=this.state.Deleted;var _props=this.props,attachments=_props.attachments,canDelete=_props.canDelete;return __WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement('div',null,attachments?__WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement('div',{className:'attachmentsList'},attachments.map(function(item,key){return __WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement('div',{key:key,style:{display:Deleted.length>0&&Deleted.indexOf(item.id)?"none":"block"},className:'mt10 attachment-list-div'},__WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement(__WEBPACK_IMPORTED_MODULE_3_react_router_dom__["b" /* Link */],{to:''+item.url,className:'attachment-list-a'},__WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement('i',{className:'iconfont icon-fujian mr8 paper-clip-color font-12'}),__WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement('span',null,item.title),__WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement('span',{className:'ml20'},item.filesize)),canDelete?__WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement(__WEBPACK_IMPORTED_MODULE_1_antd_lib_popconfirm___default.a,{placement:'bottom',title:'您确定要删除附件吗',okText:'\u662F',cancelText:'\u5426',onConfirm:function onConfirm(){return _this2.deleteAttachment(item.id);}},__WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement('span',{className:'attachment-list-delete fr'},__WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement('i',{className:'iconfont icon-lajitong mr10 color-grey-9 font-14'}))):"");})):"");}}]);return Attachment;}(__WEBPACK_IMPORTED_MODULE_2_react__["Component"]);/* harmony default export */ __webpack_exports__["a"] = (Attachment);
+var _createClass=function(){function defineProperties(target,props){for(var i=0;i<props.length;i++){var descriptor=props[i];descriptor.enumerable=descriptor.enumerable||false;descriptor.configurable=true;if("value"in descriptor)descriptor.writable=true;Object.defineProperty(target,descriptor.key,descriptor);}}return function(Constructor,protoProps,staticProps){if(protoProps)defineProperties(Constructor.prototype,protoProps);if(staticProps)defineProperties(Constructor,staticProps);return Constructor;};}();function _classCallCheck(instance,Constructor){if(!(instance instanceof Constructor)){throw new TypeError("Cannot call a class as a function");}}function _possibleConstructorReturn(self,call){if(!self){throw new ReferenceError("this hasn't been initialised - super() hasn't been called");}return call&&(typeof call==="object"||typeof call==="function")?call:self;}function _inherits(subClass,superClass){if(typeof superClass!=="function"&&superClass!==null){throw new TypeError("Super expression must either be null or a function, not "+typeof superClass);}subClass.prototype=Object.create(superClass&&superClass.prototype,{constructor:{value:subClass,enumerable:false,writable:true,configurable:true}});if(superClass)Object.setPrototypeOf?Object.setPrototypeOf(subClass,superClass):subClass.__proto__=superClass;}var Attachment=function(_Component){_inherits(Attachment,_Component);function Attachment(props){_classCallCheck(this,Attachment);var _this=_possibleConstructorReturn(this,(Attachment.__proto__||Object.getPrototypeOf(Attachment)).call(this,props));_this.componentDidMount=function(){_this.getDetail();};_this.getDetail=function(){_this.setState({attachments:_this.props.attachments,canDelete:_this.props.canDelete});};_this.deleteAttachment=function(id){var url='/attachments/'+id+'.json';__WEBPACK_IMPORTED_MODULE_4_axios___default.a.delete(url,{}).then(function(response){if(response.data){if(response.data.status===0){_this.setState({Deleted:_this.state.Deleted.concat(id)});_this.props.showNotification("附件删除成功");}else{_this.props.showNotification(response.data.message);}}}).catch(function(error){console.log(error);});};_this.state={attachments:undefined,canDelete:false,Deleted:[]};return _this;}_createClass(Attachment,[{key:'render',value:function render(){var _this2=this;var _state=this.state,Deleted=_state.Deleted,attachments=_state.attachments,canDelete=_state.canDelete;return __WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement('div',null,attachments?__WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement('div',{className:'attachmentsList'},attachments.map(function(item,key){return __WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement('div',{key:key,style:{display:Deleted.length>0&&Deleted.indexOf(item.id)!==-1?"none":"block"},className:'mt10 attachment-list-div'},__WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement(__WEBPACK_IMPORTED_MODULE_3_react_router_dom__["b" /* Link */],{to:''+item.url,className:'attachment-list-a'},__WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement('i',{className:'iconfont icon-fujian mr8 paper-clip-color font-12'}),__WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement('span',null,item.title),__WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement('span',{className:'ml20'},item.filesize)),canDelete?__WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement(__WEBPACK_IMPORTED_MODULE_1_antd_lib_popconfirm___default.a,{placement:'bottom',title:'您确定要删除附件吗',okText:'\u662F',cancelText:'\u5426',onConfirm:function onConfirm(){return _this2.deleteAttachment(item.id);}},__WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement('span',{className:'attachment-list-delete fr'},__WEBPACK_IMPORTED_MODULE_2_react___default.a.createElement('i',{className:'iconfont icon-lajitong mr10 color-grey-9 font-14'}))):"");})):"");}}]);return Attachment;}(__WEBPACK_IMPORTED_MODULE_2_react__["Component"]);/* harmony default export */ __webpack_exports__["a"] = (Attachment);
 
 /***/ }),
 

public/react/build/static/js/main.7e2dc849.js

@@ -86,7 +86,7 @@
 /******/ 		if (__webpack_require__.nc) {
 /******/ 			script.setAttribute("nonce", __webpack_require__.nc);
 /******/ 		}
-/******/ 		script.src = __webpack_require__.p + "./static/js/" + ({}[chunkId]||chunkId) + "." + {"0":"51d8d0bc","1":"0a4023b0","2":"a894b01c","3":"5ac2911f","4":"e3780e86","5":"264a4b70","6":"787ddb4b","7":"d129ae9c","8":"5fa33b25","9":"04d96dd5","10":"5fe60b5a","11":"303cd284","12":"b85cd434","13":"77250f95","14":"3a0c289a","15":"00b6096b","16":"035c222c","17":"c2754f2e","18":"3af4084b","19":"af9daf75","20":"ff4ac27e","21":"3327cee5","22":"cbb59928","23":"42950c65","24":"9da7a54c","25":"7a519900","26":"9809b729","27":"44964dcd","28":"484eb589","29":"4a302735","30":"c66ce0f0","31":"64a7d6a5","32":"fedb209c","33":"100ad33d","34":"b3d6feec","35":"32a9f338","36":"cc9fadd2","37":"f93f5966","38":"c40c2acc","39":"826b6e1a","40":"4fd9ed5d","41":"55d1bf94","42":"549541f4","43":"40ae720b","44":"fa0986e7","45":"1c73b755","46":"293a5480","47":"bcf71327","48":"7873d656","49":"276e6d48","50":"c954248e","51":"e18c5a88","52":"74582eb4","53":"568bb800","54":"af99b5a1","55":"75fbda32","56":"11d439c7","57":"24f4f7b1","58":"16006510","59":"88e2d954","60":"d28dc4a2","61":"7294eaf8","62":"5aefc728","63":"24a5bd0c","64":"f1c8a563","65":"194c2ee5","66":"813070eb","67":"30c6b74d","68":"2b29f74d","69":"b8de7bf7","70":"c926d444","71":"493115c2","72":"a55fe14d","73":"9a11f4a4","74":"693a39cf","75":"3c44b72a","76":"66dffca1","77":"cbff4cc0","78":"b47261de","79":"4f9f541f","80":"37349428","81":"66b876e0","82":"fb9f8518","83":"c4d82be9","84":"33e98b32","85":"332022b8","86":"3efa95e7","87":"97d381ba","88":"5b2fc6f4","89":"57c531e0","90":"e0fe9125","91":"38797b46","92":"ba0cfe29","93":"4120e5a2","94":"6322c494","95":"52e005de","96":"10a92a75","97":"ed3f3caa","98":"ce23d704","99":"55287fde","100":"f333fdef","101":"2214614c","102":"6b348936","103":"6043a7a2","104":"a764a705","105":"e70bb3d8","106":"50304d2f","107":"775b5e35","108":"1c880d79","109":"63f14e5e","110":"3cd26dd7","111":"9f2966bf","112":"dbe44410","113":"ee3fa14a","114":"ebcc7e24","115":"8414a332","116":"551f0783","117":"fadfdf2a","118":"4ed4400e","119":"98e58e5b","120":"7ffaeb5b","121":"c3f89466","122":"e6575b99","123":"e3ecc971","124":"6f941411","125":"2c70912c","126":"86e08ef2","127":"227f9cfa","128":"d6c0b10b","129":"9d902a52","130":"168d9f4f","131":"2580ccfc","132":"02bdbb28","133":"f321aeb6","134":"ba3b0dfc","135":"f92cb4a1","136":"44fcab0f","137":"5fb2df39","138":"a96609ce","139":"0e58d447","140":"f124a8dd","141":"d8a98a69","142":"772c9654","143":"7b4debf1","144":"feaea0a3","145":"9e963e45","146":"9a2daea8","147":"de76afe6","148":"3af4065c","149":"02f95966","150":"14855afe","151":"0e8b040e","152":"2987a5b5","153":"eeaa7ae2","154":"2acdbaaa","155":"d2c528d7","156":"2f0916aa","157":"c1235ccf","158":"4360b2a2","159":"e4dc6dc3","160":"52cf3963","161":"b9532cdc","162":"128f0756","163":"56808745","164":"c70f67fd","165":"9b49c913","166":"3dc75285","167":"d024ccb3","168":"475938fd","169":"7367bd95","170":"e767f78e","171":"59ef9d12","172":"b052a4b1","173":"d68f731b","174":"7332e0c4","175":"1beef2c9","176":"f34d84c2","177":"a42ff2a8","178":"82cb20ec","179":"f7f4b278","180":"bd84f3b1","181":"49af9abd","182":"3d1cab33","183":"ee715cc5","184":"4ff6bd54","185":"bb7b21dc","186":"ed1b6272","187":"da597496","188":"02ba1827","189":"0e1c92fc","190":"38109fe5","191":"efbef646","192":"6764c7a7","193":"3405d9d8","194":"0eb2a107","195":"75a58d07","196":"4dc74574","197":"5c45dd9c","198":"b993a866","199":"d27c5703","200":"766dac01","201":"689111b8","202":"8165867c","203":"d1787ce6","204":"6be9f226","205":"20379c5c","206":"dd3d13e5","207":"06d668af","208":"19593414","209":"edb6fc09","210":"b8efd0eb","211":"76d4aeba","212":"afc87aea","213":"ca1b8303","214":"bcbacd17","215":"26fa7791","216":"36fc70d2","217":"0c5d30e3","218":"d8176606","219":"9a07cd63","220":"002bb25f","221":"fc72df00","222":"085f8242","223":"0b4adc84","224":"5830a030","225":"d134d8a1","226":"6ac0882e","227":"1fd5ae32","228":"0c7e61de","229":"d79dcdfd","230":"3be85721","231":"7585b071","232":"be20e1e6","233":"c7067480","234":"52face5a","235":"4e1f0d76","236":"17cda784","237":"f94cd3ea","238":"d1cd89ac","239":"33e907ee","240":"15358e2e","241":"5ae57d31","242":"de767a56","243":"05319ff1","244":"29d294e0","245":"c78fe8b6","246":"97d3b5c8","247":"f83ca4f9","248":"b9c31e8f","249":"d431d947","250":"0d162c98","251":"fcc8bc84","252":"5725a502","253":"2e81508e","254":"fa91d652","255":"73db99fb","256":"9504e114","257":"a7e33e4b","258":"2166d62f","259":"6c60a86d","260":"932403ea","261":"ee1537b3","262":"741b2d21","263":"7e3c179d","264":"093cda2f"}[chunkId] + ".chunk.js";
+/******/ 		script.src = __webpack_require__.p + "./static/js/" + ({}[chunkId]||chunkId) + "." + {"0":"51d8d0bc","1":"0a4023b0","2":"a894b01c","3":"5ac2911f","4":"e3780e86","5":"264a4b70","6":"787ddb4b","7":"d129ae9c","8":"5fa33b25","9":"04d96dd5","10":"5fe60b5a","11":"303cd284","12":"b85cd434","13":"77250f95","14":"3a0c289a","15":"00b6096b","16":"035c222c","17":"c2754f2e","18":"3af4084b","19":"af9daf75","20":"ff4ac27e","21":"3327cee5","22":"cbb59928","23":"42950c65","24":"9da7a54c","25":"7a519900","26":"9809b729","27":"44964dcd","28":"484eb589","29":"4a302735","30":"c66ce0f0","31":"64a7d6a5","32":"fedb209c","33":"100ad33d","34":"b3d6feec","35":"32a9f338","36":"cc9fadd2","37":"f93f5966","38":"c40c2acc","39":"826b6e1a","40":"4fd9ed5d","41":"55d1bf94","42":"549541f4","43":"40ae720b","44":"fa0986e7","45":"1c73b755","46":"293a5480","47":"bcf71327","48":"7873d656","49":"276e6d48","50":"c954248e","51":"e18c5a88","52":"74582eb4","53":"568bb800","54":"af99b5a1","55":"75fbda32","56":"11d439c7","57":"24f4f7b1","58":"16006510","59":"88e2d954","60":"d28dc4a2","61":"7294eaf8","62":"5aefc728","63":"24a5bd0c","64":"f1c8a563","65":"194c2ee5","66":"813070eb","67":"30c6b74d","68":"2b29f74d","69":"b8de7bf7","70":"c926d444","71":"493115c2","72":"a55fe14d","73":"9a11f4a4","74":"693a39cf","75":"3c44b72a","76":"66dffca1","77":"cbff4cc0","78":"b47261de","79":"4f9f541f","80":"37349428","81":"e75f830f","82":"fb9f8518","83":"c4d82be9","84":"33e98b32","85":"d0d27aa3","86":"e636f3c7","87":"97d381ba","88":"5b2fc6f4","89":"57c531e0","90":"e0fe9125","91":"38797b46","92":"ba0cfe29","93":"4120e5a2","94":"6322c494","95":"52e005de","96":"10a92a75","97":"ed3f3caa","98":"ce23d704","99":"55287fde","100":"f333fdef","101":"2214614c","102":"6b348936","103":"6043a7a2","104":"a764a705","105":"e70bb3d8","106":"50304d2f","107":"775b5e35","108":"1c880d79","109":"63f14e5e","110":"3cd26dd7","111":"9f2966bf","112":"dbe44410","113":"ee3fa14a","114":"ebcc7e24","115":"8414a332","116":"551f0783","117":"fadfdf2a","118":"4ed4400e","119":"98e58e5b","120":"7ffaeb5b","121":"c3f89466","122":"e6575b99","123":"e3ecc971","124":"6f941411","125":"2c70912c","126":"86e08ef2","127":"227f9cfa","128":"d6c0b10b","129":"9d902a52","130":"168d9f4f","131":"2580ccfc","132":"02bdbb28","133":"f321aeb6","134":"ba3b0dfc","135":"f92cb4a1","136":"44fcab0f","137":"5fb2df39","138":"a96609ce","139":"0e58d447","140":"f124a8dd","141":"d8a98a69","142":"772c9654","143":"7b4debf1","144":"feaea0a3","145":"9e963e45","146":"9a2daea8","147":"de76afe6","148":"3af4065c","149":"02f95966","150":"14855afe","151":"0e8b040e","152":"2987a5b5","153":"eeaa7ae2","154":"2acdbaaa","155":"d2c528d7","156":"2f0916aa","157":"c1235ccf","158":"4360b2a2","159":"e4dc6dc3","160":"52cf3963","161":"b9532cdc","162":"128f0756","163":"56808745","164":"c70f67fd","165":"9b49c913","166":"3dc75285","167":"d024ccb3","168":"475938fd","169":"7367bd95","170":"e767f78e","171":"59ef9d12","172":"b052a4b1","173":"d68f731b","174":"7332e0c4","175":"1beef2c9","176":"f34d84c2","177":"a42ff2a8","178":"82cb20ec","179":"f7f4b278","180":"bd84f3b1","181":"49af9abd","182":"3d1cab33","183":"ee715cc5","184":"4ff6bd54","185":"bb7b21dc","186":"ed1b6272","187":"da597496","188":"02ba1827","189":"0e1c92fc","190":"38109fe5","191":"efbef646","192":"6764c7a7","193":"3405d9d8","194":"0eb2a107","195":"75a58d07","196":"4dc74574","197":"5c45dd9c","198":"b993a866","199":"d27c5703","200":"766dac01","201":"689111b8","202":"8165867c","203":"d1787ce6","204":"6be9f226","205":"20379c5c","206":"dd3d13e5","207":"06d668af","208":"19593414","209":"edb6fc09","210":"b8efd0eb","211":"76d4aeba","212":"afc87aea","213":"ca1b8303","214":"bcbacd17","215":"26fa7791","216":"36fc70d2","217":"0c5d30e3","218":"d8176606","219":"9a07cd63","220":"002bb25f","221":"fc72df00","222":"085f8242","223":"0b4adc84","224":"5830a030","225":"d134d8a1","226":"6ac0882e","227":"1fd5ae32","228":"0c7e61de","229":"d79dcdfd","230":"3be85721","231":"7585b071","232":"be20e1e6","233":"c7067480","234":"52face5a","235":"4e1f0d76","236":"17cda784","237":"f94cd3ea","238":"d1cd89ac","239":"33e907ee","240":"15358e2e","241":"5ae57d31","242":"de767a56","243":"05319ff1","244":"29d294e0","245":"c78fe8b6","246":"97d3b5c8","247":"f83ca4f9","248":"b9c31e8f","249":"d431d947","250":"0d162c98","251":"fcc8bc84","252":"5725a502","253":"2e81508e","254":"fa91d652","255":"73db99fb","256":"9504e114","257":"a7e33e4b","258":"2166d62f","259":"6c60a86d","260":"932403ea","261":"ee1537b3","262":"741b2d21","263":"7e3c179d","264":"093cda2f"}[chunkId] + ".chunk.js";
 /******/ 		var timeout = setTimeout(onScriptComplete, 120000);
 /******/ 		script.onerror = script.onload = onScriptComplete;
 /******/ 		function onScriptComplete() {

public/react/src/forge/Order/Detail.js

@@ -32,6 +32,7 @@ class Detail extends Component{
       page:1,
       search_count:undefined,
       isSpin:false,
+      showFiles: true
     }
   }
   
@@ -75,17 +76,24 @@ class Detail extends Component{
     addjournals=()=>{
       this.props.form.validateFieldsAndScroll((err, values) => {
         if(!err){
-          const { data } = this.state;
+          const { data, page, limit, fileList } = this.state;
           const url = `/issues/${data.id}/journals.json`;
-          const { fileList } = this.state;
           axios.post(url,{
             ...values,
             issue_id:data.id,
             attachment_ids:fileList
           }).then(result=>{
             if(result){
-              this.getjournalslist();
+              this.props.form.setFieldsValue({
+                content: "",
+                attachments_ids: undefined
+              });
+              this.setState({
+                showFiles: false
+              })
+              this.getjournalslist(page, limit);
               this.props.showNotification("评论成功！");
+              // this.UploadFunc(undefined)
             }
           }).catch(error=>{
             console.log(error);
@@ -107,8 +115,10 @@ class Detail extends Component{
           this.setState({
             journalsdata:result.data,
             search_count:result.data.journals_count,
-            isSpin:false
-          })  
+            isSpin:false,
+            fileList:undefined,
+            showFiles: true
+          })
         }
       }).catch(error=>{
         console.log(error);
@@ -268,7 +278,7 @@ class Detail extends Component{
 
   render(){
     const { projectsId,orderId} = this.props.match.params;
-    const { data,journalsdata, page, limit, search_count, isSpin, isedit } = this.state;
+    const { data,journalsdata, page, limit, search_count, isSpin, isedit, showFiles } = this.state;
     const { getFieldDecorator } = this.props.form;
     const { current_user } = this.props;
     const Paginations = (
@@ -287,7 +297,7 @@ class Detail extends Component{
          <div className="tagList">{
           journalsdata.issue_journals.map((item,key)=>{
                return(
-                 <li>
+                 <li key={key}>
                 <div className="df">
                   <Link to={``}><img className="user_img" src={getImageUrl(`images/${item.user_picture && item.user_picture}`)} alt=""/></Link>
                   <div className="detail_context" >
@@ -425,7 +435,7 @@ class Detail extends Component{
                     <TextArea placeholder="添加评论..." style={{height: "200px"}}/>
                   )}
                 </Form.Item>
-                <UploadComponent load={this.UploadFunc}></UploadComponent>
+                <UploadComponent load={this.UploadFunc} isComplete={showFiles}></UploadComponent>
                 <p className="clearfix mt15">
                   <a className="topWrapper_btn fr" type="submit" onClick={this.addjournals}>评论</a>
                   <a className="Closeor_btn fr" type="submit"

public/react/src/forge/Upload/attachment.js

@@ -17,14 +17,13 @@ class Attachment extends Component{
   }
 
   getDetail=()=>{
-    // this.setState({
-    //   attachments: this.props.attachments,
-    //   canDelete: this.props.canDelete
-    // })
+    this.setState({
+      attachments: this.props.attachments,
+      canDelete: this.props.canDelete
+    })
   }
 
   deleteAttachment = (id) => {
-    console.log("delte_state",id)
     const url = `/attachments/${id}.json`
     axios.delete(url, {
     }).then((response) => {
@@ -38,15 +37,13 @@ class Attachment extends Component{
           this.props.showNotification(response.data.message)
         }
       }
-      console.log("delte_state", this.state)
     }).catch(function (error) {
       console.log(error);
     });
   }
 
   render(){
-    const {  Deleted } = this.state;
-    const { attachments, canDelete } = this.props;
+    const {  Deleted, attachments, canDelete } = this.state;
     return(
       <div>
         {
@@ -55,7 +52,7 @@ class Attachment extends Component{
               {
                 attachments.map((item,key)=>{
                   return(
-                    <div key= {key} style={{display: (Deleted.length > 0 && Deleted.indexOf(item.id)) ? "none" : "block"}} className="mt10 attachment-list-div" >
+                    <div key= {key} style={{display: (Deleted.length > 0 && Deleted.indexOf(item.id) !== -1) ? "none" : "block"}} className="mt10 attachment-list-div" >
                       <Link to={`${item.url}`} className="attachment-list-a">
                         <i className="iconfont icon-fujian mr8 paper-clip-color font-12"></i>
                         <span>{item.title}</span>