Merge branches 'dev_Ysm' and 'dev_aliyun_beta' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysm

dev_unstable^2
杨树明 5 years ago
commit 3a795d7d24

@ -35,6 +35,7 @@ const buildColumns = (that) => {
dataIndex: 'login', dataIndex: 'login',
key: 'login', key: 'login',
align:'center', align:'center',
width:"10%",
className:"color-grey-6", className:"color-grey-6",
render: (login, record) => { render: (login, record) => {
return <span className="color-dark overflowHidden1" style={{maxWidth: '160px'}} return <span className="color-dark overflowHidden1" style={{maxWidth: '160px'}}
@ -57,9 +58,10 @@ const buildColumns = (that) => {
dataIndex: 'student_id', dataIndex: 'student_id',
key: 'student_id', key: 'student_id',
align:'center', align:'center',
width:"10%",
className:"color-grey-6", className:"color-grey-6",
render: (student_id, record) => { render: (student_id, record) => {
return <span className="color-dark overflowHidden1 "title={student_id && student_id.length > 10 ? student_id : ''} return <span className="color-dark overflowHidden1 " title={student_id && student_id.length > 10 ? student_id : ''}
style={{maxWidth: '160px'}} >{student_id}</span> style={{maxWidth: '160px'}} >{student_id}</span>
} }
}]; }];
@ -69,7 +71,7 @@ const buildColumns = (that) => {
dataIndex: 'course_group_name', dataIndex: 'course_group_name',
key: 'course_group_name', key: 'course_group_name',
align:'center', align:'center',
width:"50%", width:"40%",
className:"color-grey-6" className:"color-grey-6"
}) })
} }

Loading…
Cancel
Save