Merge pull request '合并最新代码' (#354) from gitlink_server into pre_gitlink_server

src/forge/Order/Detail.js

@@ -345,7 +345,7 @@ class Detail extends Component {
                 </span>
               </p>
               <p className="grid-item-left pb15">
-                <span className="issue_detail_info">分类:</span>
+                <span className="issue_detail_info">类型:</span>
                 <span>{data && data.tracker ? data.tracker : "--"}</span>
               </p>
               <p className="grid-item-left pb15">

src/forge/Order/order.css

@@ -573,6 +573,9 @@ a.issue-type-button.active:hover {
 .attachment-list-a {
   color: rgba(0, 0, 0, 0.65) !important;
 }
+.attachment-list-a>span{
+  word-break: break-all;
+}
 .btp1 {
   border-top: 1px solid #f4f4f4;
 }

src/forge/Order/order_form.js

@@ -81,10 +81,10 @@ class order_form extends Component {
       if (result) {
         let data ={
           branch_name: result.data.branch_name,
-          issue_tag_ids: [
+          issue_tag_ids: 
             result.data.issue_tags && result.data.issue_tags[0].id ? 
-              String(result.data.issue_tags[0].id) : "",
+              String(result.data.issue_tags[0].id) : ""
-          ],
+          ,
           fixed_version_id: result.data.fixed_version_id ? String(result.data.fixed_version_id) : "",
           tracker_id: result.data.tracker_id ? String(result.data.tracker_id) : "",
           issue_type: result.data.issue_type,

src/forge/Upload/Index.js

@@ -61,10 +61,13 @@ class Index extends Component {
   handleChange = (info) => {
     const { changeIsComplete } = this.props;
     changeIsComplete && changeIsComplete(true);
-    if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
+    const file = info.file;
-      let fileList = info.fileList;
+    if(file && file.type){
-      this.setState({ fileList: appendFileSizeToUploadFileAll(fileList) });
+      if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') {
-      this.fileIdList(fileList);
+        let fileList = info.fileList;
+        this.setState({ fileList: appendFileSizeToUploadFileAll(fileList) });
+        this.fileIdList(fileList);
+      }
     }
   }
 
@@ -77,6 +80,11 @@ class Index extends Component {
   }
 
   beforeUpload = (file) => {
+    console.log(file);
+    if(file && !file.type){
+      this.props.showNotification(`暂不支持此格式文件的上传!`);
+      return;
+    }
     const { size } = this.props;
     const isLt100M = file.size / 1024 / 1024 < size;
     if (!isLt100M) {

src/forge/Upload/attachment.js

@@ -138,6 +138,7 @@ class Attachment extends Component {
                         to={`${item.url}`}
                         target="_blank"
                         className="attachment-list-a"
+                        download
                       >
                         <i className="iconfont icon-fujian mr8 paper-clip-color font-12"></i>
                         <span>{item.title}</span>

src/modules/403/Shixunauthority.js

@@ -4,7 +4,7 @@ import { SnackbarHOC, getImageUrl } from 'educoder';
 
 class Shixunauthority extends Component {
     render() {
-        const { current_user } = this.props;
+        const { current_user , mygetHelmetapi } = this.props;
         return (
             <div className="newMain newTable clearfix">
                     <div className="edu-txt-center mt60 mb60">
@@ -14,10 +14,9 @@ class Shixunauthority extends Component {
                             <p>您尚未被授权访问此页面，请先获取相关权限</p>
                                 您可尝试
                                 {(!current_user || !current_user.login) && (
-                                    <p style={{display:"inline"}}>您可尝试<a href="//testforgeplus.trustie.net/login" className="color-blue">登录</a>或</p>
+                                    <p style={{display:"inline"}}>您可尝试<a href={`/login`} className="color-blue">登录</a>或</p>
                                 )}
-                                <a href="/"
+                                <a href="/" className="color-blue">返回首页</a>，也可以通过
-                                                className="color-blue">返回首页</a>，也可以通过
                                 <a target="_blank"
                                    href="https://qm.qq.com/cgi-bin/qm/qr?k=YVGUhY7uK8ovpyd7tG_lHe2qGZ63LOij&jump_from=webapi"
                                    className="color-blue">QQ</a>向我们反馈

src/modules/404/Shixunnopage.js

@@ -4,7 +4,7 @@ import { SnackbarHOC, getImageUrl } from 'educoder';
 
 class http500 extends Component {
     render() {
-        const { current_user } = this.props;
+        const { current_user , mygetHelmetapi } = this.props;
         return (
             <div className="newMain newTable clearfix">
                     <div className=" edu-txt-center mt60">
@@ -14,10 +14,9 @@ class http500 extends Component {
                                 <p>你访问的页面不存在</p>
                                 您可尝试
                                 {(!current_user || !current_user.login) && (
-                                    <p style={{display:"inline"}}>您可尝试<a href="//testforgeplus.trustie.net/login" className="color-blue">登录</a>或</p>
+                                    <p style={{display:"inline"}}>您可尝试<a href={`/login`} className="color-blue">登录</a>或</p>
                                 )}
-                                <a href="/"
+                                <a href="/" className="color-blue">返回首页</a>
-                                                className="color-blue">返回首页</a>
                                 ，也可通过
                                 <a target="_blank"
                                    href="https://qm.qq.com/cgi-bin/qm/qr?k=YVGUhY7uK8ovpyd7tG_lHe2qGZ63LOij&jump_from=webapi"