diff --git a/src/forge/Order/Detail.js b/src/forge/Order/Detail.js index 61964f21c..4453a7b5c 100644 --- a/src/forge/Order/Detail.js +++ b/src/forge/Order/Detail.js @@ -345,7 +345,7 @@ class Detail extends Component {
- 分类: + 类型: {data && data.tracker ? data.tracker : "--"}
diff --git a/src/forge/Order/order.css b/src/forge/Order/order.css index c35a18274..40adc855b 100644 --- a/src/forge/Order/order.css +++ b/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; } diff --git a/src/forge/Order/order_form.js b/src/forge/Order/order_form.js index e1ae9a671..e3a2eb912 100644 --- a/src/forge/Order/order_form.js +++ b/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, diff --git a/src/forge/Upload/Index.js b/src/forge/Upload/Index.js index 713803aa3..203242110 100644 --- a/src/forge/Upload/Index.js +++ b/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') { - let fileList = info.fileList; - this.setState({ fileList: appendFileSizeToUploadFileAll(fileList) }); - this.fileIdList(fileList); + const file = info.file; + if(file && file.type){ + if (info.file.status === 'uploading' || info.file.status === 'done' || info.file.status === 'removed') { + 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) { diff --git a/src/forge/Upload/attachment.js b/src/forge/Upload/attachment.js index 9918363df..677b48ee8 100644 --- a/src/forge/Upload/attachment.js +++ b/src/forge/Upload/attachment.js @@ -138,6 +138,7 @@ class Attachment extends Component { to={`${item.url}`} target="_blank" className="attachment-list-a" + download > {item.title} diff --git a/src/modules/403/Shixunauthority.js b/src/modules/403/Shixunauthority.js index 00509cb8f..ede7d0996 100644 --- a/src/modules/403/Shixunauthority.js +++ b/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 (
您尚未被授权访问此页面,请先获取相关权限
您可尝试 {(!current_user || !current_user.login) && ( -您可尝试登录或
+您可尝试登录或
)} - 返回首页,也可以通过 + 返回首页,也可以通过 QQ向我们反馈 diff --git a/src/modules/404/Shixunnopage.js b/src/modules/404/Shixunnopage.js index 47aa850c4..6ce753e1d 100644 --- a/src/modules/404/Shixunnopage.js +++ b/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 (