修改部分bug

forge
sylor_huang@126.com 5 years ago
parent c82e591f5e
commit 6a1bbfd351

@ -60,7 +60,7 @@
"./static/js/150.2d8568a9.chunk.js": "./static/js/150.2d8568a9.chunk.js", "./static/js/150.2d8568a9.chunk.js": "./static/js/150.2d8568a9.chunk.js",
"./static/js/151.3cbd58d9.chunk.js": "./static/js/151.3cbd58d9.chunk.js", "./static/js/151.3cbd58d9.chunk.js": "./static/js/151.3cbd58d9.chunk.js",
"./static/js/152.25096064.chunk.js": "./static/js/152.25096064.chunk.js", "./static/js/152.25096064.chunk.js": "./static/js/152.25096064.chunk.js",
"./static/js/153.c8ef749a.chunk.js": "./static/js/153.c8ef749a.chunk.js", "./static/js/153.0579404a.chunk.js": "./static/js/153.0579404a.chunk.js",
"./static/js/154.6661c864.chunk.js": "./static/js/154.6661c864.chunk.js", "./static/js/154.6661c864.chunk.js": "./static/js/154.6661c864.chunk.js",
"./static/js/155.3185ccd2.chunk.js": "./static/js/155.3185ccd2.chunk.js", "./static/js/155.3185ccd2.chunk.js": "./static/js/155.3185ccd2.chunk.js",
"./static/js/156.114acd0e.chunk.js": "./static/js/156.114acd0e.chunk.js", "./static/js/156.114acd0e.chunk.js": "./static/js/156.114acd0e.chunk.js",
@ -70,11 +70,11 @@
"./static/js/16.ec4dcede.chunk.js": "./static/js/16.ec4dcede.chunk.js", "./static/js/16.ec4dcede.chunk.js": "./static/js/16.ec4dcede.chunk.js",
"./static/js/160.cf5a19f0.chunk.js": "./static/js/160.cf5a19f0.chunk.js", "./static/js/160.cf5a19f0.chunk.js": "./static/js/160.cf5a19f0.chunk.js",
"./static/js/161.1a1a88fa.chunk.js": "./static/js/161.1a1a88fa.chunk.js", "./static/js/161.1a1a88fa.chunk.js": "./static/js/161.1a1a88fa.chunk.js",
"./static/js/162.5d02a03a.chunk.js": "./static/js/162.5d02a03a.chunk.js", "./static/js/162.4a3db237.chunk.js": "./static/js/162.4a3db237.chunk.js",
"./static/js/163.3b0f2188.chunk.js": "./static/js/163.3b0f2188.chunk.js", "./static/js/163.3b0f2188.chunk.js": "./static/js/163.3b0f2188.chunk.js",
"./static/js/164.43b6a90a.chunk.js": "./static/js/164.43b6a90a.chunk.js", "./static/js/164.29b4fe7a.chunk.js": "./static/js/164.29b4fe7a.chunk.js",
"./static/js/165.13f04d92.chunk.js": "./static/js/165.13f04d92.chunk.js", "./static/js/165.13f04d92.chunk.js": "./static/js/165.13f04d92.chunk.js",
"./static/js/166.02b8749c.chunk.js": "./static/js/166.02b8749c.chunk.js", "./static/js/166.1b56ef09.chunk.js": "./static/js/166.1b56ef09.chunk.js",
"./static/js/167.a991482c.chunk.js": "./static/js/167.a991482c.chunk.js", "./static/js/167.a991482c.chunk.js": "./static/js/167.a991482c.chunk.js",
"./static/js/168.e890d0c2.chunk.js": "./static/js/168.e890d0c2.chunk.js", "./static/js/168.e890d0c2.chunk.js": "./static/js/168.e890d0c2.chunk.js",
"./static/js/169.04ceadc5.chunk.js": "./static/js/169.04ceadc5.chunk.js", "./static/js/169.04ceadc5.chunk.js": "./static/js/169.04ceadc5.chunk.js",
@ -221,13 +221,13 @@
"./static/js/50.b8619ef3.chunk.js": "./static/js/50.b8619ef3.chunk.js", "./static/js/50.b8619ef3.chunk.js": "./static/js/50.b8619ef3.chunk.js",
"./static/js/51.4e4c388a.chunk.js": "./static/js/51.4e4c388a.chunk.js", "./static/js/51.4e4c388a.chunk.js": "./static/js/51.4e4c388a.chunk.js",
"./static/js/52.8b8e5e72.chunk.js": "./static/js/52.8b8e5e72.chunk.js", "./static/js/52.8b8e5e72.chunk.js": "./static/js/52.8b8e5e72.chunk.js",
"./static/js/53.5c110691.chunk.js": "./static/js/53.5c110691.chunk.js", "./static/js/53.91568a63.chunk.js": "./static/js/53.91568a63.chunk.js",
"./static/js/54.90cc8cd1.chunk.js": "./static/js/54.90cc8cd1.chunk.js", "./static/js/54.90cc8cd1.chunk.js": "./static/js/54.90cc8cd1.chunk.js",
"./static/js/55.b2b3350f.chunk.js": "./static/js/55.b2b3350f.chunk.js", "./static/js/55.b2b3350f.chunk.js": "./static/js/55.b2b3350f.chunk.js",
"./static/js/56.626808d5.chunk.js": "./static/js/56.626808d5.chunk.js", "./static/js/56.626808d5.chunk.js": "./static/js/56.626808d5.chunk.js",
"./static/js/57.02b743ad.chunk.js": "./static/js/57.02b743ad.chunk.js", "./static/js/57.02b743ad.chunk.js": "./static/js/57.02b743ad.chunk.js",
"./static/js/58.e28554c1.chunk.js": "./static/js/58.e28554c1.chunk.js", "./static/js/58.e28554c1.chunk.js": "./static/js/58.e28554c1.chunk.js",
"./static/js/59.12ea4ec4.chunk.js": "./static/js/59.12ea4ec4.chunk.js", "./static/js/59.efe01636.chunk.js": "./static/js/59.efe01636.chunk.js",
"./static/js/6.c1f79042.chunk.js": "./static/js/6.c1f79042.chunk.js", "./static/js/6.c1f79042.chunk.js": "./static/js/6.c1f79042.chunk.js",
"./static/js/60.d8f242f9.chunk.js": "./static/js/60.d8f242f9.chunk.js", "./static/js/60.d8f242f9.chunk.js": "./static/js/60.d8f242f9.chunk.js",
"./static/js/61.e224f9b4.chunk.js": "./static/js/61.e224f9b4.chunk.js", "./static/js/61.e224f9b4.chunk.js": "./static/js/61.e224f9b4.chunk.js",
@ -235,15 +235,15 @@
"./static/js/63.9173054f.chunk.js": "./static/js/63.9173054f.chunk.js", "./static/js/63.9173054f.chunk.js": "./static/js/63.9173054f.chunk.js",
"./static/js/64.13689266.chunk.js": "./static/js/64.13689266.chunk.js", "./static/js/64.13689266.chunk.js": "./static/js/64.13689266.chunk.js",
"./static/js/65.1d7f188b.chunk.js": "./static/js/65.1d7f188b.chunk.js", "./static/js/65.1d7f188b.chunk.js": "./static/js/65.1d7f188b.chunk.js",
"./static/js/66.85f59b6e.chunk.js": "./static/js/66.85f59b6e.chunk.js", "./static/js/66.be555ba2.chunk.js": "./static/js/66.be555ba2.chunk.js",
"./static/js/67.1a7c23f3.chunk.js": "./static/js/67.1a7c23f3.chunk.js", "./static/js/67.1a7c23f3.chunk.js": "./static/js/67.1a7c23f3.chunk.js",
"./static/js/68.8ee585ac.chunk.js": "./static/js/68.8ee585ac.chunk.js", "./static/js/68.8ee585ac.chunk.js": "./static/js/68.8ee585ac.chunk.js",
"./static/js/69.e2ef8b25.chunk.js": "./static/js/69.e2ef8b25.chunk.js", "./static/js/69.e2ef8b25.chunk.js": "./static/js/69.e2ef8b25.chunk.js",
"./static/js/7.770ff8da.chunk.js": "./static/js/7.770ff8da.chunk.js", "./static/js/7.770ff8da.chunk.js": "./static/js/7.770ff8da.chunk.js",
"./static/js/70.3383729d.chunk.js": "./static/js/70.3383729d.chunk.js", "./static/js/70.3383729d.chunk.js": "./static/js/70.3383729d.chunk.js",
"./static/js/71.79702eb4.chunk.js": "./static/js/71.79702eb4.chunk.js", "./static/js/71.79702eb4.chunk.js": "./static/js/71.79702eb4.chunk.js",
"./static/js/72.9e126148.chunk.js": "./static/js/72.9e126148.chunk.js", "./static/js/72.a6b7aea4.chunk.js": "./static/js/72.a6b7aea4.chunk.js",
"./static/js/73.30be8395.chunk.js": "./static/js/73.30be8395.chunk.js", "./static/js/73.d6726eb5.chunk.js": "./static/js/73.d6726eb5.chunk.js",
"./static/js/74.0c9dea9c.chunk.js": "./static/js/74.0c9dea9c.chunk.js", "./static/js/74.0c9dea9c.chunk.js": "./static/js/74.0c9dea9c.chunk.js",
"./static/js/75.df65888e.chunk.js": "./static/js/75.df65888e.chunk.js", "./static/js/75.df65888e.chunk.js": "./static/js/75.df65888e.chunk.js",
"./static/js/76.83b711d5.chunk.js": "./static/js/76.83b711d5.chunk.js", "./static/js/76.83b711d5.chunk.js": "./static/js/76.83b711d5.chunk.js",
@ -255,25 +255,25 @@
"./static/js/81.5ba1a813.chunk.js": "./static/js/81.5ba1a813.chunk.js", "./static/js/81.5ba1a813.chunk.js": "./static/js/81.5ba1a813.chunk.js",
"./static/js/82.3628e27a.chunk.js": "./static/js/82.3628e27a.chunk.js", "./static/js/82.3628e27a.chunk.js": "./static/js/82.3628e27a.chunk.js",
"./static/js/83.5140a660.chunk.js": "./static/js/83.5140a660.chunk.js", "./static/js/83.5140a660.chunk.js": "./static/js/83.5140a660.chunk.js",
"./static/js/84.daee2bba.chunk.js": "./static/js/84.daee2bba.chunk.js", "./static/js/84.72687a0e.chunk.js": "./static/js/84.72687a0e.chunk.js",
"./static/js/85.3a8dc8fb.chunk.js": "./static/js/85.3a8dc8fb.chunk.js", "./static/js/85.3a8dc8fb.chunk.js": "./static/js/85.3a8dc8fb.chunk.js",
"./static/js/86.00b6db75.chunk.js": "./static/js/86.00b6db75.chunk.js", "./static/js/86.00b6db75.chunk.js": "./static/js/86.00b6db75.chunk.js",
"./static/js/87.9a6684a6.chunk.js": "./static/js/87.9a6684a6.chunk.js", "./static/js/87.9a6684a6.chunk.js": "./static/js/87.9a6684a6.chunk.js",
"./static/js/88.d20bd270.chunk.js": "./static/js/88.d20bd270.chunk.js", "./static/js/88.d20bd270.chunk.js": "./static/js/88.d20bd270.chunk.js",
"./static/js/89.8249199e.chunk.js": "./static/js/89.8249199e.chunk.js", "./static/js/89.e8e3931d.chunk.js": "./static/js/89.e8e3931d.chunk.js",
"./static/js/9.a81e59fa.chunk.js": "./static/js/9.a81e59fa.chunk.js", "./static/js/9.a81e59fa.chunk.js": "./static/js/9.a81e59fa.chunk.js",
"./static/js/90.847ea88c.chunk.js": "./static/js/90.847ea88c.chunk.js", "./static/js/90.a33a0439.chunk.js": "./static/js/90.a33a0439.chunk.js",
"./static/js/91.486c5b6d.chunk.js": "./static/js/91.486c5b6d.chunk.js", "./static/js/91.35d08100.chunk.js": "./static/js/91.35d08100.chunk.js",
"./static/js/92.811d754b.chunk.js": "./static/js/92.811d754b.chunk.js", "./static/js/92.811d754b.chunk.js": "./static/js/92.811d754b.chunk.js",
"./static/js/93.9ca807cb.chunk.js": "./static/js/93.9ca807cb.chunk.js", "./static/js/93.9ca807cb.chunk.js": "./static/js/93.9ca807cb.chunk.js",
"./static/js/94.40a31b6b.chunk.js": "./static/js/94.40a31b6b.chunk.js", "./static/js/94.36dbd878.chunk.js": "./static/js/94.36dbd878.chunk.js",
"./static/js/95.0f6c972b.chunk.js": "./static/js/95.0f6c972b.chunk.js", "./static/js/95.0f6c972b.chunk.js": "./static/js/95.0f6c972b.chunk.js",
"./static/js/96.fe75753a.chunk.js": "./static/js/96.fe75753a.chunk.js", "./static/js/96.fe75753a.chunk.js": "./static/js/96.fe75753a.chunk.js",
"./static/js/97.3b4d4096.chunk.js": "./static/js/97.3b4d4096.chunk.js", "./static/js/97.3b4d4096.chunk.js": "./static/js/97.3b4d4096.chunk.js",
"./static/js/98.cc855f0c.chunk.js": "./static/js/98.cc855f0c.chunk.js", "./static/js/98.cc855f0c.chunk.js": "./static/js/98.cc855f0c.chunk.js",
"./static/js/99.a470bc24.chunk.js": "./static/js/99.a470bc24.chunk.js", "./static/js/99.a470bc24.chunk.js": "./static/js/99.a470bc24.chunk.js",
"main.css": "./static/css/main.c0718fb6.css", "main.css": "./static/css/main.c0718fb6.css",
"main.js": "./static/js/main.921cc38c.js", "main.js": "./static/js/main.8a8db6c5.js",
"static/media/KaTeX_AMS-Regular.ttf": "static/media/KaTeX_AMS-Regular.aaf4eee9.ttf", "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.woff": "static/media/KaTeX_AMS-Regular.7f06b4e3.woff",
"static/media/KaTeX_AMS-Regular.woff2": "static/media/KaTeX_AMS-Regular.e78e28b4.woff2", "static/media/KaTeX_AMS-Regular.woff2": "static/media/KaTeX_AMS-Regular.e78e28b4.woff2",

@ -24,7 +24,7 @@
_host = 'https://ali-cdn.educoder.net/react/build/' _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 + 'js/js_min_all.js"><\/script>');
document.write('<script type="text/javascript" src="' + _host + 'static/js/main.921cc38c.js"><\/script>'); document.write('<script type="text/javascript" src="' + _host + 'static/js/main.8a8db6c5.js"><\/script>');
})() })()
</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> <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>

File diff suppressed because one or more lines are too long

@ -942,7 +942,7 @@ exports.push([module.i, ".trendsTop{padding-bottom:15px;border-bottom:1px solid
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__activity_css__ = __webpack_require__(3595); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__activity_css__ = __webpack_require__(3595);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__activity_css___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_2__activity_css__); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__activity_css___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_2__activity_css__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3_educoder__ = __webpack_require__(5); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_3_educoder__ = __webpack_require__(5);
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 ActivityItem=function(_Component){_inherits(ActivityItem,_Component);function ActivityItem(){_classCallCheck(this,ActivityItem);return _possibleConstructorReturn(this,(ActivityItem.__proto__||Object.getPrototypeOf(ActivityItem)).apply(this,arguments));}_createClass(ActivityItem,[{key:'render',value:function render(){var item=this.props.item;return __WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('div',{className:'activity_item'},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('div',{className:'flex1'},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('p',{className:'itemLine'},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement(__WEBPACK_IMPORTED_MODULE_1_react_router_dom__["b" /* Link */],{to:'',className:'color-blue font-16'},item.name),__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('span',{className:'activity_type'},item.trend_type)),__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('p',{className:'itemLine mt15'},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('img',{alt:'',src:Object(__WEBPACK_IMPORTED_MODULE_3_educoder__["M" /* getImageUrl */])('images/'+item.user_avatar),className:'createImage'}),__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('span',{className:'mr20'},item.user_name),__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('span',{className:'color-grey-9'},'\u521B\u5EFA\u4E8E',__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('span',{className:'ml2 color-grey-6'},item.created_at)))));}}]);return ActivityItem;}(__WEBPACK_IMPORTED_MODULE_0_react__["Component"]);/* harmony default export */ __webpack_exports__["a"] = (ActivityItem); 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 ActivityItem=function(_Component){_inherits(ActivityItem,_Component);function ActivityItem(){_classCallCheck(this,ActivityItem);return _possibleConstructorReturn(this,(ActivityItem.__proto__||Object.getPrototypeOf(ActivityItem)).apply(this,arguments));}_createClass(ActivityItem,[{key:'render',value:function render(){var item=this.props.item;return __WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('div',{className:'activity_item'},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('div',{className:'flex1'},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('p',{className:'itemLine'},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement(__WEBPACK_IMPORTED_MODULE_1_react_router_dom__["b" /* Link */],{to:'',className:'color-blue font-16'},item.name),__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('span',{className:'activity_type'},item.trend_type)),__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('p',{className:'itemLine mt15'},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('img',{alt:'',src:Object(__WEBPACK_IMPORTED_MODULE_3_educoder__["M" /* getImageUrl */])('images/'+item.user_avatar),className:'createImage'}),__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('span',{className:'mr20'},item.user_name),item.created_at&&__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('span',{className:'color-grey-9'},'\u521B\u5EFA\u4E8E',__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement('span',{className:'ml2 color-grey-6'},item.created_at)))));}}]);return ActivityItem;}(__WEBPACK_IMPORTED_MODULE_0_react__["Component"]);/* harmony default export */ __webpack_exports__["a"] = (ActivityItem);
/***/ }), /***/ }),

@ -86829,7 +86829,7 @@ var _createClass=function(){function defineProperties(target,props){for(var i=0;
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Branch_branch_css__ = __webpack_require__(2480); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Branch_branch_css__ = __webpack_require__(2480);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Branch_branch_css___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_1__Branch_branch_css__); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__Branch_branch_css___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_1__Branch_branch_css__);
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 NullData=function(_Component){_inherits(NullData,_Component);function NullData(){var _ref;var _temp,_this,_ret;_classCallCheck(this,NullData);for(var _len=arguments.length,args=Array(_len),_key=0;_key<_len;_key++){args[_key]=arguments[_key];}return _ret=(_temp=(_this=_possibleConstructorReturn(this,(_ref=NullData.__proto__||Object.getPrototypeOf(NullData)).call.apply(_ref,[this].concat(args))),_this),_this.jsCopy=function(){var e=document.getElementById("copy_rep_content_1");e.select();document.execCommand("Copy");_this.props.showNotification('复制成功');},_temp),_possibleConstructorReturn(_this,_ret);}// 点击按钮复制功能 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 NullData=function(_Component){_inherits(NullData,_Component);function NullData(){var _ref;var _temp,_this,_ret;_classCallCheck(this,NullData);for(var _len=arguments.length,args=Array(_len),_key=0;_key<_len;_key++){args[_key]=arguments[_key];}return _ret=(_temp=(_this=_possibleConstructorReturn(this,(_ref=NullData.__proto__||Object.getPrototypeOf(NullData)).call.apply(_ref,[this].concat(args))),_this),_this.jsCopy=function(){var e=document.getElementById("copy_rep_content_1");e.select();document.execCommand("Copy");_this.props.showNotification('复制成功');},_temp),_possibleConstructorReturn(_this,_ret);}// 点击按钮复制功能
_createClass(NullData,[{key:"render",value:function render(){var _this2=this;var http_url=this.props.http_url;return __WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("div",{className:"null_data_box"},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("h4",{className:"title"},"\u5FEB\u901F\u5E2E\u52A9"),__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("div",{className:"bottom"},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("div",{className:"item"},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("h3",{className:"item_title"},"\u514B\u9686\u5F53\u524D\u4ED3\u5E93",__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("small",null,"\u4E0D\u77E5\u9053\u5982\u4F55\u514B\u9686\uFF1F\u67E5\u770B",__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("a",{href:"https://git-scm.com/book/en/v2/Git-Basics-Getting-a-Git-Repository",target:"_blank"},"\u5E2E\u52A9"))),__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("div",{className:"gitAddressClone"},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("span",null,"HTTP"),__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("input",{type:"text",value:http_url,readOnly:true,id:"copy_rep_content_1"}),__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("span",{onClick:function onClick(){return _this2.jsCopy();}},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("i",{className:"iconfont icon-fuzhi"})))),__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("div",{className:"item"},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("h3",{className:"item_title"},"\u4ECE\u547D\u4EE4\u884C\u521B\u5EFA\u4E00\u4E2A\u65B0\u7684\u4ED3\u5E93"),__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("div",{className:"Markdown"},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("pre",null,__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("code",null,"touch README.md",__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("br",null),"git init",__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("br",null),"git add README.md",__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("br",null),"git commit -m \"first commit\"",__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("br",null),"git remote add origin",__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("span",{className:"clone-url"})," ",__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("br",null),"git push -u origin master")))),__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("div",{className:"item"},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("h3",{className:"item_title"},"\u4ECE\u547D\u4EE4\u884C\u63A8\u9001\u5DF2\u521B\u5EFA\u7684\u4ED3\u5E93"),__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("div",{className:"Markdown"},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("pre",null,__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("code",null,"git remote add origin",__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("span",{className:"clone-url"}),__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("br",null),"git push -u origin master"))))));}}]);return NullData;}(__WEBPACK_IMPORTED_MODULE_0_react__["Component"]);/* harmony default export */ __webpack_exports__["a"] = (NullData); _createClass(NullData,[{key:"render",value:function render(){var _this2=this;var http_url=this.props.http_url;return __WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("div",{className:"null_data_box"},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("h4",{className:"title"},"\u5FEB\u901F\u5E2E\u52A9"),__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("div",{className:"bottom"},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("div",{className:"item"},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("h3",{className:"item_title"},"\u514B\u9686\u5F53\u524D\u4ED3\u5E93",__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("small",null,"\u4E0D\u77E5\u9053\u5982\u4F55\u514B\u9686\uFF1F\u67E5\u770B",__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("a",{href:"https://git-scm.com/book/en/v2/Git-Basics-Getting-a-Git-Repository",target:"_blank"},"\u5E2E\u52A9"))),__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("div",{className:"gitAddressClone"},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("span",null,"HTTP"),__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("input",{type:"text",value:http_url,readOnly:true,id:"copy_rep_content_1"}),__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("span",{onClick:function onClick(){return _this2.jsCopy();}},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("i",{className:"iconfont icon-fuzhi"})))),__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("div",{className:"item"},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("h3",{className:"item_title"},"\u4ECE\u547D\u4EE4\u884C\u521B\u5EFA\u4E00\u4E2A\u65B0\u7684\u4ED3\u5E93"),__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("div",{className:"Markdown"},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("pre",null,__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("code",null,"touch README.md",__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("br",null),"git init",__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("br",null),"git add README.md",__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("br",null),"git commit -m \"first commit\"",__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("br",null),"git remote add origin\xA0",__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("span",{className:"clone-url"},http_url)," ",__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("br",null),"git push -u origin master")))),__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("div",{className:"item"},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("h3",{className:"item_title"},"\u4ECE\u547D\u4EE4\u884C\u63A8\u9001\u5DF2\u521B\u5EFA\u7684\u4ED3\u5E93"),__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("div",{className:"Markdown"},__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("pre",null,__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("code",null,"git remote add origin\xA0",__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("span",{className:"clone-url"},http_url),__WEBPACK_IMPORTED_MODULE_0_react___default.a.createElement("br",null),"git push -u origin master"))))));}}]);return NullData;}(__WEBPACK_IMPORTED_MODULE_0_react__["Component"]);/* harmony default export */ __webpack_exports__["a"] = (NullData);
/***/ }), /***/ }),

@ -11621,7 +11621,7 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_21_reactcss___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_21_reactcss__); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_21_reactcss___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_21_reactcss__);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_22_axios__ = __webpack_require__(15); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_22_axios__ = __webpack_require__(15);
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_22_axios___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_22_axios__); /* harmony import */ var __WEBPACK_IMPORTED_MODULE_22_axios___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_22_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 Tags=function(_Component){_inherits(Tags,_Component);function Tags(props){_classCallCheck(this,Tags);var _this=_possibleConstructorReturn(this,(Tags.__proto__||Object.getPrototypeOf(Tags)).call(this,props));_this.componentDidMount=function(){_this.getList();};_this.getList=function(page,order_name,order_type){var projectsId=_this.props.match.params.projectsId;var limit=_this.state.limit;var url='/projects/'+projectsId+'/issue_tags.json';__WEBPACK_IMPORTED_MODULE_22_axios___default.a.get(url,{params:{page:page,limit:limit,order_name:order_name,order_type:order_type}}).then(function(result){if(result){_this.setState({data:result.data});}}).catch(function(error){console.log(error);});};_this.createtagpost=function(){_this.props.form.validateFieldsAndScroll(function(err,values){if(!err){var projectsId=_this.props.match.params.projectsId;var url='/projects/'+projectsId+'/issue_tags';__WEBPACK_IMPORTED_MODULE_22_axios___default.a.post(url,Object.assign({},values,{project_id:projectsId,color:_this.state.textcolor})).then(function(result){if(result){_this.props.form.setFieldsValue({name:"",description:""});_this.setState({color:{r:'241',g:'112',b:'19',a:'1'},textcolor:'#F17013'});_this.getList();}}).catch(function(error){console.log(error);});}});};_this.ChangePage=function(page){_this.setState({page:page});_this.getList(page);};_this.arrayList=function(e){_this.setState({order_name:e.key,order_type:e.item.props.value});_this.getList(1,e.key,e.item.props.value);};_this.handleClick=function(){_this.setState({displayColorPicker:!_this.state.displayColorPicker});};_this.handleClose=function(){_this.setState({displayColorPicker:false});};_this.handleChange=function(color){_this.setState({color:color.rgb,textcolor:color.hex,newcolor:color.hex});};_this.newshow=function(){_this.setState({display:'block'});};_this.newclose=function(){_this.setState({display:'none'});};_this.handleok=function(){_this.updatetag();};_this.updatetag=function(){var projectsId=_this.props.match.params.projectsId;var id=_this.state.id;var url='/projects/'+projectsId+'/issue_tags/'+id+'.json';var name=_this.state.name;var description=_this.state.description;var modalcolor=_this.state.newcolor;__WEBPACK_IMPORTED_MODULE_22_axios___default.a.put(url,{project_id:projectsId,id:id,name:name,description:description,color:modalcolor}).then(function(result){if(result){_this.setState({isShow:false});_this.getList();}}).catch(function(error){console.log(error);});};_this.deletetag=function(id){var projectsId=_this.props.match.params.projectsId;var url='/projects/'+projectsId+'/issue_tags/'+id+'.json';__WEBPACK_IMPORTED_MODULE_22_axios___default.a.delete(url,{data:{project_id:projectsId,id:id}}).then(function(result){if(result){_this.getList();}}).catch(function(error){console.log(error);});};_this.handleCancel=function(){_this.setState({isShow:false});};_this.changmodelname=function(e){_this.setState({name:e.target.value});};_this.changdescription=function(e){_this.setState({description:e.target.value});};_this.editshow=function(arr){_this.setState({isShow:true,newcolor:arr.color,name:arr.name,description:arr.description,id:arr.id});};_this.state={data:undefined,limit:15,page:1,order_name:undefined,order_type:undefined,//新建标签区域是否显示 none 隐藏 block 显示 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 Tags=function(_Component){_inherits(Tags,_Component);function Tags(props){_classCallCheck(this,Tags);var _this=_possibleConstructorReturn(this,(Tags.__proto__||Object.getPrototypeOf(Tags)).call(this,props));_this.componentDidMount=function(){_this.getList();};_this.getList=function(page,order_name,order_type){var projectsId=_this.props.match.params.projectsId;var limit=_this.state.limit;var url='/projects/'+projectsId+'/issue_tags.json';__WEBPACK_IMPORTED_MODULE_22_axios___default.a.get(url,{params:{page:page,limit:limit,order_name:order_name,order_type:order_type}}).then(function(result){if(result){_this.setState({data:result.data});}}).catch(function(error){console.log(error);});};_this.createtagpost=function(){_this.props.form.validateFieldsAndScroll(function(err,values){if(!err){var projectsId=_this.props.match.params.projectsId;var url='/projects/'+projectsId+'/issue_tags';__WEBPACK_IMPORTED_MODULE_22_axios___default.a.post(url,Object.assign({},values,{project_id:projectsId,color:_this.state.textcolor})).then(function(result){if(result){_this.props.form.setFieldsValue({name:"",description:""});_this.setState({color:{r:'241',g:'112',b:'19',a:'1'},textcolor:'#F17013',display:'none'});_this.getList();}}).catch(function(error){console.log(error);});}});};_this.ChangePage=function(page){_this.setState({page:page});_this.getList(page);};_this.arrayList=function(e){_this.setState({order_name:e.key,order_type:e.item.props.value});_this.getList(1,e.key,e.item.props.value);};_this.handleClick=function(){_this.setState({displayColorPicker:!_this.state.displayColorPicker});};_this.handleClose=function(){_this.setState({displayColorPicker:false});};_this.handleChange=function(color){_this.setState({color:color.rgb,textcolor:color.hex,newcolor:color.hex});};_this.newshow=function(){_this.setState({display:'block'});};_this.newclose=function(){_this.setState({display:'none'});};_this.handleok=function(){_this.updatetag();};_this.updatetag=function(){var projectsId=_this.props.match.params.projectsId;var id=_this.state.id;var url='/projects/'+projectsId+'/issue_tags/'+id+'.json';var name=_this.state.name;var description=_this.state.description;var modalcolor=_this.state.newcolor;__WEBPACK_IMPORTED_MODULE_22_axios___default.a.put(url,{project_id:projectsId,id:id,name:name,description:description,color:modalcolor}).then(function(result){if(result){_this.setState({isShow:false});_this.getList();}}).catch(function(error){console.log(error);});};_this.deletetag=function(id){var projectsId=_this.props.match.params.projectsId;var url='/projects/'+projectsId+'/issue_tags/'+id+'.json';__WEBPACK_IMPORTED_MODULE_22_axios___default.a.delete(url,{data:{project_id:projectsId,id:id}}).then(function(result){if(result){_this.getList();}}).catch(function(error){console.log(error);});};_this.handleCancel=function(){_this.setState({isShow:false});};_this.changmodelname=function(e){_this.setState({name:e.target.value});};_this.changdescription=function(e){_this.setState({description:e.target.value});};_this.editshow=function(arr){_this.setState({isShow:true,newcolor:arr.color,name:arr.name,description:arr.description,id:arr.id});};_this.state={data:undefined,limit:15,page:1,order_name:undefined,order_type:undefined,//新建标签区域是否显示 none 隐藏 block 显示
display:'none',//调色盘颜色 display:'none',//调色盘颜色
displayColorPicker:false,color:{r:'241',g:'112',b:'19',a:'1'},textcolor:'#F17013',isShow:false,newcolor:'',name:'',description:'',id:'',modelname:''};return _this;}// 排序 displayColorPicker:false,color:{r:'241',g:'112',b:'19',a:'1'},textcolor:'#F17013',isShow:false,newcolor:'',name:'',description:'',id:'',modelname:''};return _this;}// 排序
//控制新建标签页是否显示 //控制新建标签页是否显示

@ -86,7 +86,7 @@
/******/ if (__webpack_require__.nc) { /******/ if (__webpack_require__.nc) {
/******/ script.setAttribute("nonce", __webpack_require__.nc); /******/ script.setAttribute("nonce", __webpack_require__.nc);
/******/ } /******/ }
/******/ script.src = __webpack_require__.p + "./static/js/" + ({}[chunkId]||chunkId) + "." + {"0":"3499dbdb","1":"ba3dba4f","2":"e76a0be2","3":"de444263","4":"0958c04a","5":"cd01e110","6":"c1f79042","7":"770ff8da","8":"a7a7f0a8","9":"a81e59fa","10":"c31bfdb0","11":"c18648a5","12":"6f96b71b","13":"33b5f814","14":"3129051e","15":"777d35a0","16":"ec4dcede","17":"eaa7969b","18":"7e6684c8","19":"7c4f80e8","20":"c414c0cd","21":"2f814f4e","22":"4c8bb333","23":"aebb159d","24":"22ef380a","25":"77a31c58","26":"8629bf8a","27":"d9b546ab","28":"d40ce852","29":"4131983c","30":"bc14daba","31":"42d39ddd","32":"fedb209c","33":"100ad33d","34":"4291681f","35":"32a9f338","36":"cc9fadd2","37":"f93f5966","38":"c76fe557","39":"a01f0a61","40":"c50d2381","41":"ec606539","42":"7b2def1b","43":"7976cb68","44":"78e0c1d6","45":"3436b289","46":"c33d233d","47":"17d47062","48":"24657b0c","49":"e46d5cc5","50":"b8619ef3","51":"4e4c388a","52":"8b8e5e72","53":"5c110691","54":"90cc8cd1","55":"b2b3350f","56":"626808d5","57":"02b743ad","58":"e28554c1","59":"12ea4ec4","60":"d8f242f9","61":"e224f9b4","62":"6820bcac","63":"9173054f","64":"13689266","65":"1d7f188b","66":"85f59b6e","67":"1a7c23f3","68":"8ee585ac","69":"e2ef8b25","70":"3383729d","71":"79702eb4","72":"9e126148","73":"30be8395","74":"0c9dea9c","75":"df65888e","76":"83b711d5","77":"f8e2311e","78":"07c4d87a","79":"71c1aaec","80":"ea6ef0c8","81":"5ba1a813","82":"3628e27a","83":"5140a660","84":"daee2bba","85":"3a8dc8fb","86":"00b6db75","87":"9a6684a6","88":"d20bd270","89":"8249199e","90":"847ea88c","91":"486c5b6d","92":"811d754b","93":"9ca807cb","94":"40a31b6b","95":"0f6c972b","96":"fe75753a","97":"3b4d4096","98":"cc855f0c","99":"a470bc24","100":"04603361","101":"f017f44e","102":"3fd09fe5","103":"7ac9c928","104":"57b33ca6","105":"425915af","106":"5a7f1794","107":"e90e0fb8","108":"a761ed62","109":"7c4e13dd","110":"cf85c660","111":"b123ff38","112":"7277a9f5","113":"70b65335","114":"8df5b49f","115":"bf16e172","116":"baeee89f","117":"cc05f636","118":"857c2217","119":"07904e71","120":"bf90dce4","121":"a49174bd","122":"17b804b2","123":"995606e5","124":"13b7722f","125":"cd60d55a","126":"cdbe58e2","127":"88517989","128":"bde9db79","129":"1af889c1","130":"dad6a32f","131":"52e9efd9","132":"6189ed52","133":"cd8230a4","134":"d3ca6526","135":"c7708f2c","136":"1f0535b3","137":"c2b3fdce","138":"714743e3","139":"c9131191","140":"f300f141","141":"148aa7ee","142":"87d7a1ae","143":"c7359bf6","144":"ab25100c","145":"9e977cc1","146":"e623a54e","147":"114cf540","148":"32825ae6","149":"8f818a63","150":"2d8568a9","151":"3cbd58d9","152":"25096064","153":"c8ef749a","154":"6661c864","155":"3185ccd2","156":"114acd0e","157":"01fef202","158":"bfe089a5","159":"456c280b","160":"cf5a19f0","161":"1a1a88fa","162":"5d02a03a","163":"3b0f2188","164":"43b6a90a","165":"13f04d92","166":"02b8749c","167":"a991482c","168":"e890d0c2","169":"04ceadc5","170":"f52e6f5d","171":"4b98ee6a","172":"6b0207aa","173":"2709a7bb","174":"9c9c4f81","175":"1c50cd8c","176":"6ccf4497","177":"5c7bfa2d","178":"7c69aa3a","179":"d9a714d5","180":"abba8537","181":"b3f1bcbc","182":"2ed4f280","183":"b34ed057","184":"c7d63100","185":"9c6c47a4","186":"ddb826e1","187":"24d4cbd0","188":"c0498792","189":"8cfa165e","190":"ae0f7daa","191":"d911f73d","192":"14c7d860","193":"28c25d4a","194":"996d34c8","195":"4ab7e4b1","196":"589ce802","197":"4459eb3a","198":"3f1fe6b4","199":"cdc117e7","200":"aedf4681","201":"67de5466","202":"8dd9f7bd","203":"319c605d","204":"2149b491","205":"424a329b","206":"547aeeb8","207":"b05232b2","208":"0f479a47","209":"77c8bcf8","210":"2fb25a6f","211":"d11d4a8e","212":"ad235f49","213":"e56234a5","214":"c24d9bbe","215":"3f681e33","216":"8e1da5ad","217":"3cf5ac1f","218":"01790dac","219":"8f881b85","220":"476d3205","221":"e07afe2c","222":"2dd41e75","223":"133697da","224":"87ac7213","225":"60513ed2","226":"f24ef2b5","227":"c95f4494","228":"a3590254","229":"b06fc465","230":"1466387c","231":"e729eb6c","232":"ada6d07a","233":"53ed68fe","234":"b7b097d6","235":"5b4a016d","236":"e66dee6e","237":"5e3e8f76","238":"9ce1b135","239":"d22322bb","240":"035fb15e","241":"ec5be75d","242":"3234f588","243":"b191f470","244":"f056cbd6","245":"bd0e380e","246":"d2f9e8b1","247":"6987bd76","248":"24cc4b10","249":"f79eeb77","250":"6645f8b5","251":"419ffe18","252":"ffc4dcb6","253":"ebbeb4bd","254":"863c48fc","255":"7fee5b41","256":"cf5ef9a6","257":"d4fdfb46","258":"94dc05e4","259":"cc34b705","260":"a2449e25","261":"4869bc3c","262":"b49c1dfe","263":"7754f522","264":"cc552723","265":"32511fba","266":"0a917fe9","267":"1810bd59","268":"ed711356","269":"97095b2d","270":"c5795190","271":"b5f939a0","272":"6cd7ccc1"}[chunkId] + ".chunk.js"; /******/ script.src = __webpack_require__.p + "./static/js/" + ({}[chunkId]||chunkId) + "." + {"0":"3499dbdb","1":"ba3dba4f","2":"e76a0be2","3":"de444263","4":"0958c04a","5":"cd01e110","6":"c1f79042","7":"770ff8da","8":"a7a7f0a8","9":"a81e59fa","10":"c31bfdb0","11":"c18648a5","12":"6f96b71b","13":"33b5f814","14":"3129051e","15":"777d35a0","16":"ec4dcede","17":"eaa7969b","18":"7e6684c8","19":"7c4f80e8","20":"c414c0cd","21":"2f814f4e","22":"4c8bb333","23":"aebb159d","24":"22ef380a","25":"77a31c58","26":"8629bf8a","27":"d9b546ab","28":"d40ce852","29":"4131983c","30":"bc14daba","31":"42d39ddd","32":"fedb209c","33":"100ad33d","34":"4291681f","35":"32a9f338","36":"cc9fadd2","37":"f93f5966","38":"c76fe557","39":"a01f0a61","40":"c50d2381","41":"ec606539","42":"7b2def1b","43":"7976cb68","44":"78e0c1d6","45":"3436b289","46":"c33d233d","47":"17d47062","48":"24657b0c","49":"e46d5cc5","50":"b8619ef3","51":"4e4c388a","52":"8b8e5e72","53":"91568a63","54":"90cc8cd1","55":"b2b3350f","56":"626808d5","57":"02b743ad","58":"e28554c1","59":"efe01636","60":"d8f242f9","61":"e224f9b4","62":"6820bcac","63":"9173054f","64":"13689266","65":"1d7f188b","66":"be555ba2","67":"1a7c23f3","68":"8ee585ac","69":"e2ef8b25","70":"3383729d","71":"79702eb4","72":"a6b7aea4","73":"d6726eb5","74":"0c9dea9c","75":"df65888e","76":"83b711d5","77":"f8e2311e","78":"07c4d87a","79":"71c1aaec","80":"ea6ef0c8","81":"5ba1a813","82":"3628e27a","83":"5140a660","84":"72687a0e","85":"3a8dc8fb","86":"00b6db75","87":"9a6684a6","88":"d20bd270","89":"e8e3931d","90":"a33a0439","91":"35d08100","92":"811d754b","93":"9ca807cb","94":"36dbd878","95":"0f6c972b","96":"fe75753a","97":"3b4d4096","98":"cc855f0c","99":"a470bc24","100":"04603361","101":"f017f44e","102":"3fd09fe5","103":"7ac9c928","104":"57b33ca6","105":"425915af","106":"5a7f1794","107":"e90e0fb8","108":"a761ed62","109":"7c4e13dd","110":"cf85c660","111":"b123ff38","112":"7277a9f5","113":"70b65335","114":"8df5b49f","115":"bf16e172","116":"baeee89f","117":"cc05f636","118":"857c2217","119":"07904e71","120":"bf90dce4","121":"a49174bd","122":"17b804b2","123":"995606e5","124":"13b7722f","125":"cd60d55a","126":"cdbe58e2","127":"88517989","128":"bde9db79","129":"1af889c1","130":"dad6a32f","131":"52e9efd9","132":"6189ed52","133":"cd8230a4","134":"d3ca6526","135":"c7708f2c","136":"1f0535b3","137":"c2b3fdce","138":"714743e3","139":"c9131191","140":"f300f141","141":"148aa7ee","142":"87d7a1ae","143":"c7359bf6","144":"ab25100c","145":"9e977cc1","146":"e623a54e","147":"114cf540","148":"32825ae6","149":"8f818a63","150":"2d8568a9","151":"3cbd58d9","152":"25096064","153":"0579404a","154":"6661c864","155":"3185ccd2","156":"114acd0e","157":"01fef202","158":"bfe089a5","159":"456c280b","160":"cf5a19f0","161":"1a1a88fa","162":"4a3db237","163":"3b0f2188","164":"29b4fe7a","165":"13f04d92","166":"1b56ef09","167":"a991482c","168":"e890d0c2","169":"04ceadc5","170":"f52e6f5d","171":"4b98ee6a","172":"6b0207aa","173":"2709a7bb","174":"9c9c4f81","175":"1c50cd8c","176":"6ccf4497","177":"5c7bfa2d","178":"7c69aa3a","179":"d9a714d5","180":"abba8537","181":"b3f1bcbc","182":"2ed4f280","183":"b34ed057","184":"c7d63100","185":"9c6c47a4","186":"ddb826e1","187":"24d4cbd0","188":"c0498792","189":"8cfa165e","190":"ae0f7daa","191":"d911f73d","192":"14c7d860","193":"28c25d4a","194":"996d34c8","195":"4ab7e4b1","196":"589ce802","197":"4459eb3a","198":"3f1fe6b4","199":"cdc117e7","200":"aedf4681","201":"67de5466","202":"8dd9f7bd","203":"319c605d","204":"2149b491","205":"424a329b","206":"547aeeb8","207":"b05232b2","208":"0f479a47","209":"77c8bcf8","210":"2fb25a6f","211":"d11d4a8e","212":"ad235f49","213":"e56234a5","214":"c24d9bbe","215":"3f681e33","216":"8e1da5ad","217":"3cf5ac1f","218":"01790dac","219":"8f881b85","220":"476d3205","221":"e07afe2c","222":"2dd41e75","223":"133697da","224":"87ac7213","225":"60513ed2","226":"f24ef2b5","227":"c95f4494","228":"a3590254","229":"b06fc465","230":"1466387c","231":"e729eb6c","232":"ada6d07a","233":"53ed68fe","234":"b7b097d6","235":"5b4a016d","236":"e66dee6e","237":"5e3e8f76","238":"9ce1b135","239":"d22322bb","240":"035fb15e","241":"ec5be75d","242":"3234f588","243":"b191f470","244":"f056cbd6","245":"bd0e380e","246":"d2f9e8b1","247":"6987bd76","248":"24cc4b10","249":"f79eeb77","250":"6645f8b5","251":"419ffe18","252":"ffc4dcb6","253":"ebbeb4bd","254":"863c48fc","255":"7fee5b41","256":"cf5ef9a6","257":"d4fdfb46","258":"94dc05e4","259":"cc34b705","260":"a2449e25","261":"4869bc3c","262":"b49c1dfe","263":"7754f522","264":"cc552723","265":"32511fba","266":"0a917fe9","267":"1810bd59","268":"ed711356","269":"97095b2d","270":"c5795190","271":"b5f939a0","272":"6cd7ccc1"}[chunkId] + ".chunk.js";
/******/ var timeout = setTimeout(onScriptComplete, 120000); /******/ var timeout = setTimeout(onScriptComplete, 120000);
/******/ script.onerror = script.onload = onScriptComplete; /******/ script.onerror = script.onload = onScriptComplete;
/******/ function onScriptComplete() { /******/ function onScriptComplete() {

@ -25,7 +25,8 @@ class MergeDetail extends Component{
titledisplay:'none', titledisplay:'none',
countvalue:'', countvalue:'',
//是否需要编辑 //是否需要编辑
isedit:'block' isedit:'block',
showFiles: true
} }
} }
@ -76,6 +77,9 @@ class MergeDetail extends Component{
issue_id:data.id, issue_id:data.id,
}).then(result=>{ }).then(result=>{
if(result){ if(result){
this.setState({
showFiles: false
})
this.getjournalslist(); this.getjournalslist();
} }
}).catch(error=>{ }).catch(error=>{
@ -153,10 +157,15 @@ class MergeDetail extends Component{
}) })
} }
// 判断是否重新上传文件
changeIsComplete=(flag)=>{
this.setState({
showFiles:flag
})
}
render(){ render(){
const { projectsId,mergeid} = this.props.match.params; const { projectsId,mergeid} = this.props.match.params;
const { data,journalsdata } = this.state; const { data,journalsdata, showFiles } = this.state;
const { getFieldDecorator } = this.props.form; const { getFieldDecorator } = this.props.form;
const url = this.props.history.location.pathname; const url = this.props.history.location.pathname;
const renderList =()=>{ const renderList =()=>{
@ -272,7 +281,7 @@ class MergeDetail extends Component{
<TextArea placeholder="添加一个可选的扩展描述。。。" style={{height:"200px"}}/> <TextArea placeholder="添加一个可选的扩展描述。。。" style={{height:"200px"}}/>
)} )}
</Form.Item> </Form.Item>
<UploadComponent load={this.UploadFunc}></UploadComponent> <UploadComponent load={this.UploadFunc} isComplete={showFiles} changeIsComplete={this.changeIsComplete}></UploadComponent>
<p className="clearfix mt15"> <p className="clearfix mt15">
<a className="topWrapper_btn fr" type="submit" onClick={this.addjournals}>评论</a> <a className="topWrapper_btn fr" type="submit" onClick={this.addjournals}>评论</a>
<a className="Closeor_btn fr" type="submit" onClick={()=>this.closedetail(data&&data.issue_status==="关闭"?2:5)}>{data&&data.issue_status==="关闭"?"开启":"关闭"}</a> <a className="Closeor_btn fr" type="submit" onClick={()=>this.closedetail(data&&data.issue_status==="关闭"?2:5)}>{data&&data.issue_status==="关闭"?"开启":"关闭"}</a>

@ -235,6 +235,13 @@ class MessageCount extends Component{
} }
} }
// 判断是否重新上传文件
changeIsComplete=(flag)=>{
this.setState({
showFiles:flag
})
}
// 翻页 // 翻页
ChangePage=(page)=>{ ChangePage=(page)=>{
@ -396,7 +403,7 @@ class MessageCount extends Component{
<TextArea placeholder="添加评论..." style={{height: "200px"}}/> <TextArea placeholder="添加评论..." style={{height: "200px"}}/>
)} )}
</Form.Item> </Form.Item>
<UploadComponent load={this.UploadFunc} isComplete={showFiles}></UploadComponent> <UploadComponent load={this.UploadFunc} isComplete={showFiles} changeIsComplete={this.changeIsComplete}></UploadComponent>
<p className="clearfix mt15"> <p className="clearfix mt15">
<a className="topWrapper_btn fr" type="submit" onClick={this.addjournals}>评论</a> <a className="topWrapper_btn fr" type="submit" onClick={this.addjournals}>评论</a>
<a className="Closeor_btn fr" type="submit" <a className="Closeor_btn fr" type="submit"

@ -278,10 +278,10 @@ class NewMerge extends Component{
{getFieldDecorator('body', { {getFieldDecorator('body', {
rules: [], rules: [],
})( })(
<TextArea placeholder="添加一个可选的扩展描述。。。" style={{height:"300px"}}/> <TextArea placeholder="合并请求的描述。。。" style={{height:"300px"}}/>
)} )}
</Form.Item> </Form.Item>
<UploadComponent load={this.UploadFunc}></UploadComponent> <UploadComponent load={this.UploadFunc} isComplete={true} ></UploadComponent>
<p className="clearfix mt15"> <p className="clearfix mt15">
<a className="topWrapper_btn fr" type="submit" onClick={this.submit}>创建合并请求</a> <a className="topWrapper_btn fr" type="submit" onClick={this.submit}>创建合并请求</a>
</p> </p>

@ -201,7 +201,7 @@ class UpdateMerge extends Component{
<TextArea placeholder="请输入工单的描述..." style={{height:"300px"}} onChange={this.changmodelcount}/> <TextArea placeholder="请输入工单的描述..." style={{height:"300px"}} onChange={this.changmodelcount}/>
)} )}
</Form.Item> </Form.Item>
<UploadComponent load={this.UploadFunc} showNotification={this.props.showNotification}></UploadComponent> <UploadComponent load={this.UploadFunc} showNotification={this.props.showNotification} isComplete={true} ></UploadComponent>
{ {
get_attachments ? get_attachments ?
<Attachments attachments={get_attachments} showNotification={this.props.showNotification} canDelete={true}/> <Attachments attachments={get_attachments} showNotification={this.props.showNotification} canDelete={true}/>

@ -213,7 +213,7 @@ class CopyDetail extends Component{
)} )}
</Form.Item> </Form.Item>
<UploadComponent load={this.UploadFunc} <UploadComponent load={this.UploadFunc}
showNotification={this.props.showNotification}></UploadComponent> showNotification={this.props.showNotification} isComplete={true} ></UploadComponent>
{ {
get_attachments ? get_attachments ?
<Attachments attachments={get_attachments} showNotification={this.props.showNotification} <Attachments attachments={get_attachments} showNotification={this.props.showNotification}

Loading…
Cancel
Save