diff --git a/public/css/edu-purge.css b/public/css/edu-purge.css index 065a7fd3..99c9f03a 100644 --- a/public/css/edu-purge.css +++ b/public/css/edu-purge.css @@ -3912,7 +3912,6 @@ html>body #ajax-indicator { text-align: center; height: 70px; box-sizing: border-box; - min-width: 780px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; diff --git a/src/AppConfig.js b/src/AppConfig.js index 2c34caa6..f897831f 100644 --- a/src/AppConfig.js +++ b/src/AppConfig.js @@ -25,7 +25,7 @@ if (isDev) { } debugType = window.location.search.indexOf('debug=t') !== -1 ? 'teacher' : window.location.search.indexOf('debug=s') !== -1 ? 'student' : - window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'student' + window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'admin' } window._debugType = debugType; export function initAxiosInterceptors(props) { diff --git a/src/forge/Head/Header.js b/src/forge/Head/Header.js index f9071162..9311a0ac 100644 --- a/src/forge/Head/Header.js +++ b/src/forge/Head/Header.js @@ -88,10 +88,11 @@ class NewHeader extends Component { }, 300) }} > - this.onGlobalSearch(value,item)} autoFocus={true} + style={{width:"190px"}} /> ) diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx index 3a85ff51..1c2249e9 100644 --- a/src/forge/Main/CoderDepot.jsx +++ b/src/forge/Main/CoderDepot.jsx @@ -239,9 +239,11 @@ function CoderDepot(props){ } }) } - let n = fileInfo && fileInfo.name; const mdFlag = n && n.substring(n.length-3,n.length) === ".md"; + + const { current_user } = props; + const fileOperate = type === "dir" && projectDetail && projectDetail.type !== 2 && (projectDetail.permission !=="Reporter" || (current_user && current_user.admin)); return( @@ -311,7 +313,7 @@ function CoderDepot(props){ } urlLink(`/projects/${owner}/${projectsId}/issues/new`)} >+ 任务 - { type === "dir" && projectDetail.type !== 2 && + { fileOperate &&