m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branches 'dev_aliyun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into develop

Browse Source
dev_oauth
杨树明 5 years ago
parent 4b91b90a64 16fec9e90e
commit 162c120d0d
17 changed files with 67 additions and 22 deletions
Show Stats Download Patch File Download Diff File

5
app/views/admins/video_applies/shared/_list.html.erb
Unescape View File

@ -6,7 +6,8 @@
<th width="8%">头像</th>
<th width="14%">姓名</th>
<th width="26%" class="text-left">视频名称</th>
<th width="26%" class="text-left">播放链接</th>
<th width="13%">视频大小</th>
<th width="13%" class="text-left">播放链接</th>
<th width="16%">时间</th>
<% if is_processed %>
<th width="16%">拒绝原因</th>
@ -29,9 +30,9 @@
</td>
<td><%= user.real_name %></td>
<td class="text-left"><%= link_to video.title, video.file_url, :target => "_blank" %></td>
<td><%= video.filesize&.to_s(:human_size) %></td>
<td class="text-left"><%= link_to "播放视频",video.file_url, target: "_blank" %></td>
<td><%= v.updated_at.strftime('%Y-%m-%d %H:%M') %></td>
<% if is_processed %>
<td class="text-secondary"><%= overflow_hidden_span v.reason %></td>
<td><span class="apply-status-<%= v.status %>"><%= t("admins_apply_status.status.#{v.status}") %></span></td>

7
public/react/src/modules/courses/busyWork/CommonWorkPost.js
Unescape View File

@ -409,7 +409,7 @@ class CommonWorkPost extends Component{
}
}).then((result)=>{
if(result.status===200){
if(result){
this.setState({
page: result.data.members.length == 0 ? page - 1 : page,
members: page != 1 && search == this.state.lastSearch ? this.state.members.concat(result.data.members) : result.data.members,
@ -426,7 +426,10 @@ class CommonWorkPost extends Component{
contentViewScroll=(e)=>{
//滑动到底判断
if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){
let newscrollTop=parseInt(e.currentTarget.scrollTop);
let allclientHeight=e.currentTarget.clientHeight+newscrollTop;
if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1){
// console.log("到达底部");
let{ search,page,limit }=this.state;

4
public/react/src/modules/courses/coursesPublic/PathModal.js
Unescape View File

@ -123,8 +123,10 @@ class PathModal extends Component{
contentViewScrolledit=(e)=>{
//滑动到底判断
const {shixunmodallist} = this.state;
let newscrollTop=parseInt(e.currentTarget.scrollTop);
let allclientHeight=e.currentTarget.clientHeight+newscrollTop;
if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){
if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1){
if(shixunmodallist.subject_list.length===0){
return;

4
public/react/src/modules/courses/coursesPublic/SelectResource.js
Unescape View File

@ -101,9 +101,11 @@ class Selectresource extends Component{
}
contentViewScroll=(e)=>{
let {page,searchtype}=this.state;
let newscrollTop=parseInt(e.currentTarget.scrollTop);
let allclientHeight=e.currentTarget.clientHeight+newscrollTop;
//滑动到底判断
if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){
if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1){
let newpage=page+1;
let url
if(searchtype==="getallfiles"){

5
public/react/src/modules/courses/coursesPublic/ShixunModal.js
Unescape View File

@ -102,7 +102,10 @@ class ShixunModal extends Component{
contentViewScrolledit=(e)=>{
const {shixunmodallist}=this.state;
//滑动到底判断
if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight) {
let newscrollTop=parseInt(e.currentTarget.scrollTop);
let allclientHeight=e.currentTarget.clientHeight+newscrollTop;
if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1) {
if (shixunmodallist.shixun_list.length === 0) {
return;

4
public/react/src/modules/courses/coursesPublic/modal/ShixunModal2.js
Unescape View File

@ -41,8 +41,10 @@ class ShixunModal extends Component{
contentViewScrolledit=(e)=>{
//滑动到底判断
let newscrollTop=parseInt(e.currentTarget.scrollTop)
let allclientHeight=e.currentTarget.clientHeight+newscrollTop
if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){
if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1){
let {Searchvalue,type,page}=this.state;
let newpage=page+1

5
public/react/src/modules/courses/exercise/Ecerciseallbackagain.js
Unescape View File

@ -53,7 +53,10 @@ class Ecerciseallbackagain extends Component{
contentViewScroll=(e)=>{
//滑动到底判断
if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){
let newscrollTop=parseInt(e.currentTarget.scrollTop);
let allclientHeight=e.currentTarget.clientHeight+newscrollTop;
if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1){
let {page,limit,datalist}=this.state;
let newpage=page+1;
let newdata=datalist;

9
public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
Unescape View File

@ -47,7 +47,7 @@ class GraduationTasksSubmitedit extends Component{
let url = "/graduation_works/"+workId+"/edit.json";
axios.get(url).then((result)=>{
if(result.status===200){
if(result){
console.log(result.data.description);
this.setState({
@ -246,7 +246,7 @@ class GraduationTasksSubmitedit extends Component{
limit:limit
}).then((result)=>{
if(result.status===200){
if(result){
if(types===1){
if(result.data.members.length>0) {
result.data.members.map((item, key) => {
@ -279,7 +279,10 @@ class GraduationTasksSubmitedit extends Component{
contentViewScroll=(e)=>{
//滑动到底判断
if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){
let newscrollTop=parseInt(e.currentTarget.scrollTop);
let allclientHeight=e.currentTarget.clientHeight+newscrollTop;
if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1){
// console.log("到达底部");
let{ search,page,limit,workslist}=this.state;

5
public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
Unescape View File

@ -270,7 +270,10 @@ class GraduationTasksSubmitnew extends Component{
contentViewScroll=(e)=>{
//滑动到底判断
if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){
let newscrollTop=parseInt(e.currentTarget.scrollTop);
let allclientHeight=e.currentTarget.clientHeight+newscrollTop;
if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1){
// console.log("到达底部");
let{ search,page,limit }=this.state;

5
public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
Unescape View File

@ -86,7 +86,10 @@ class ShixunWorkModal extends Component{
contentViewScroll=(e)=>{
//滑动到底判断
if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){
let newscrollTop=parseInt(e.currentTarget.scrollTop);
let allclientHeight=e.currentTarget.clientHeight+newscrollTop;
if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1){
let {page,limit,group_list}=this.state;
let newpage=page+1;
let newgroup_list=group_list;

4
public/react/src/modules/message/js/MessagChat.js
Unescape View File

@ -83,9 +83,11 @@ class MessagChat extends Component{
}
// 滑动刷新
contentViewScrolledit=(e)=>{
let newscrollTop=parseInt(e.currentTarget.scrollTop);
let allclientHeight=e.currentTarget.clientHeight+newscrollTop;
//滑动到底判断
if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){
if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1){
// console.log("滑动到底判断");
let {page}=this.state;
let newpage=page+1

5
public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js
Unescape View File

@ -299,7 +299,10 @@ class DetailCardsEditAndAdd extends Component{
contentViewScrolladd=(e)=>{
const {ChooseShixunList}=this.state;
//滑动到底判断
if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){
let newscrollTop=parseInt(e.currentTarget.scrollTop);
let allclientHeight=e.currentTarget.clientHeight+newscrollTop;
if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1){
if(ChooseShixunList.shixun_list.length===0){
return

5
public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js
Unescape View File

@ -339,7 +339,10 @@ class DetailCardsEditAndEdit extends Component{
contentViewScrolledit=(e)=>{
//滑动到底判断
const {ChooseShixunList}=this.state;
if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){
let newscrollTop=parseInt(e.currentTarget.scrollTop);
let allclientHeight=e.currentTarget.clientHeight+newscrollTop;
if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1){
if(ChooseShixunList.shixun_list.length===0){
return

5
public/react/src/modules/paths/PathDetail/addCollaborators.js
Unescape View File

@ -127,7 +127,10 @@ class addCollaborators extends Component{
contentViewScroll=(e)=>{
//滑动到底判断
if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){
let newscrollTop=parseInt(e.currentTarget.scrollTop);
let allclientHeight=e.currentTarget.clientHeight+newscrollTop;
if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1){
// console.log("到达底部");
let id=this.props.match.params.pathId;

7
public/react/src/modules/tpm/TPMRepositoryComponent.js
Unescape View File

@ -37,6 +37,7 @@ class TPMRepositoryComponent extends Component {
setContentWidth100 = (flag) => {
const newFileContent = flag === false ? '' : this.state.fileContent
this.setState({
// isCodeFile
isContentWidth100: flag,
fileContent: newFileContent
})
@ -145,12 +146,18 @@ class TPMRepositoryComponent extends Component {
// this.props.setLoadingContent(false)
const trees = response.data.trees
const treeIsFileMap = {}
if (!trees || !Array.isArray(trees)) {
// this.props.showSnackbar('无法找到对应的资源，请变更地址或联系管理员！')
// return;
} else {
trees.forEach(item => {
treeIsFileMap[item.name] = item.type == 'blob'
})
}
if(response.status === 200){
this.setState({
treeIsFileMap,
...response.data,
repositoryLoading: false
});

4
public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js
Unescape View File

@ -372,8 +372,10 @@ class Collaborators extends Component {
contentViewScrolledit=(e)=>{
//滑动到底判断
let newscrollTop=parseInt(e.currentTarget.scrollTop);
let allclientHeight=e.currentTarget.clientHeight+newscrollTop;
if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){
if(e.currentTarget.scrollHeight-allclientHeight===0||e.currentTarget.scrollHeight-allclientHeight===1){
let {page,collaboratorList,user_name,school_name,Searchadmin} = this.state;
let newpage=page+1;
let newSearchadmin=Searchadmin

6
public/react/src/modules/tpm/shixunchild/Repository/RepositoryAddFile.js
Unescape View File

@ -89,10 +89,10 @@ class RepositoryAddFile extends Component {
}
checkPath= (rule, value, callback) =>{
if (value == "/" ) {
callback('请输入正确的文件路径');
}else if(!value){
if(!value){
callback('文件名不能为空');
}else if (value == "/" || value.indexOf('.') == -1 ) {
callback('请输入正确的文件路径，如：src/HelloWord.java');
}else{
callback();
}

Write Preview
Loading…
Cancel
Save