diff --git a/src/AppConfig.js b/src/AppConfig.js index 665e85f0..30eb7e9a 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 || 'admin' + window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'student' } window._debugType = debugType; export function initAxiosInterceptors(props) { diff --git a/src/forge/DevOps/About.jsx b/src/forge/DevOps/About.jsx index e23a82c3..ec0a7f6d 100644 --- a/src/forge/DevOps/About.jsx +++ b/src/forge/DevOps/About.jsx @@ -171,7 +171,7 @@ function About(props, ref) {
{item.name} diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js index 5b4458f1..97491f94 100644 --- a/src/forge/Order/order.js +++ b/src/forge/Order/order.js @@ -348,7 +348,7 @@ class order extends Component { const { data } = this.state; const { projectsId , owner } = this.props.match.params; if(data && data.user_admin_or_member){ - window.open(`/${owner}/${projectsId}/issues/new`,'_blank'); + this.props.history.push(`/${owner}/${projectsId}/issues/new`,'_blank'); }else{ this.props.showLoginDialog(`/${owner}/${projectsId}/issues/new`); } diff --git a/src/forge/users/GeneralView/ConcentrateBox.jsx b/src/forge/users/GeneralView/ConcentrateBox.jsx index 78573984..b3812b96 100644 --- a/src/forge/users/GeneralView/ConcentrateBox.jsx +++ b/src/forge/users/GeneralView/ConcentrateBox.jsx @@ -1,7 +1,6 @@ import React, { useEffect, useState } from 'react'; import { Modal , Checkbox , Spin , Input } from 'antd'; import Axios from 'axios'; -import { Link } from 'react-router-dom'; import CheckProfile from '../../Component/ProfileModal/Profile'; const { Search } = Input; @@ -113,6 +112,9 @@ function ConcentrateBox({ visible , onCancel , onSure , username , choosed , his // 搜索 function onSearch(params) { + if(params === search && params === ""){ + return; + } setCopyAllList(list); value && value.length > 0 ? saveList(value) : setCopyList([]); setPage(1); diff --git a/src/forge/users/GeneralView/ConcentrateProject.jsx b/src/forge/users/GeneralView/ConcentrateProject.jsx index 48875221..d3f99e53 100644 --- a/src/forge/users/GeneralView/ConcentrateProject.jsx +++ b/src/forge/users/GeneralView/ConcentrateProject.jsx @@ -4,7 +4,7 @@ import { Link } from 'react-router-dom'; import axios from 'axios'; import Box from './ConcentrateBox'; -function ConcentrateProject({userLogin,current,showCompeleteDialog,completeProfile}) { +function ConcentrateProject({userLogin,current,showCompeleteDialog,completeProfile,history}) { const [ list , setList ] = useState(undefined); const [ visible , setVisible ] = useState(false); const [ value , setValue ] = useState([]); @@ -53,6 +53,7 @@ function ConcentrateProject({userLogin,current,showCompeleteDialog,completeProfi choosed={value} completeProfile={completeProfile} showCompeleteDialog={showCompeleteDialog} + history={history} /> { list && list.length>0 &&