From af8a5058b84e5319d7954b838d9ae5a4863a58b9 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Tue, 30 Nov 2021 09:15:33 +0800 Subject: [PATCH 1/4] devops --- src/forge/DevOps/About.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/forge/DevOps/About.jsx b/src/forge/DevOps/About.jsx index e23a82c3e..ec0a7f6d5 100644 --- a/src/forge/DevOps/About.jsx +++ b/src/forge/DevOps/About.jsx @@ -171,7 +171,7 @@ function About(props, ref) {
DevOps开启功能暂未对项目创建者以外的角色开放，可以联系项目创建者进行开启，开启后便可查看构建信息。
:"" } - 了解什么是引擎？ + 了解什么是DevOps？ 如何使用引擎（Engine）功能？ From f4055e50e2b4ad69bbc80036d8f740f040297f77 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Tue, 30 Nov 2021 09:48:35 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83devops-?= =?UTF-8?q?=E7=AB=8B=E5=8D=B3=E6=BF=80=E6=B4=BB=E8=B7=B3=E8=BD=AC=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/DevOps/Index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/forge/DevOps/Index.jsx b/src/forge/DevOps/Index.jsx index 3302f603a..0bad039e6 100644 --- a/src/forge/DevOps/Index.jsx +++ b/src/forge/DevOps/Index.jsx @@ -66,7 +66,7 @@ export default ((props)=>{ {/* 原本的两种合为一个 */} {return( p.location.state.open_devops?:)} + (p) =>{return( p.location && p.location.state && p.location.state.open_devops?:)} } > From ff9beb0949d252e3b84bbf28789f7ec6c3e9fcc2 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Tue, 30 Nov 2021 11:11:25 +0800 Subject: [PATCH 3/4] =?UTF-8?q?issue-=E4=BF=AE=E6=94=B9=E2=80=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/AppConfig.js | 2 +- src/forge/Merge/no_data.js | 4 ++-- src/forge/Order/Detail.js | 2 +- src/forge/Order/OrderItem.js | 2 +- src/forge/Order/order.js | 2 +- src/forge/users/GeneralView/ConcentrateBox.jsx | 4 +++- src/forge/users/GeneralView/ConcentrateProject.jsx | 3 ++- 7 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/AppConfig.js b/src/AppConfig.js index 665e85f0f..30eb7e9aa 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/Merge/no_data.js b/src/forge/Merge/no_data.js index d5e4ca89b..78a622685 100644 --- a/src/forge/Merge/no_data.js +++ b/src/forge/Merge/no_data.js @@ -2,7 +2,7 @@ import React , { Component } from 'react'; import { Link } from "react-router-dom"; class Nodata extends Component{ render(){ - const { _html, projectsId , owner } = this.props; + const { _html, projectsId , owner , user_admin_or_member} = this.props; return(
@@ -12,7 +12,7 @@ class Nodata extends Component{

欢迎使用合并请求！

- 合并请求可以帮助您与他人协作编写代码。在使用之前，请先创建一个 合并请求 + 合并请求可以帮助您与他人协作编写代码。{ user_admin_or_member && 在使用之前，请先创建一个 合并请求 }
diff --git a/src/forge/Order/Detail.js b/src/forge/Order/Detail.js index 4d1b47cfc..9736086c8 100644 --- a/src/forge/Order/Detail.js +++ b/src/forge/Order/Detail.js @@ -252,7 +252,7 @@ class Detail extends Component { 添加于 {data && data.created_at} {data && data.user_permission ? ( - + 复制 diff --git a/src/forge/Order/OrderItem.js b/src/forge/Order/OrderItem.js index b3b02ba45..c80feafa7 100644 --- a/src/forge/Order/OrderItem.js +++ b/src/forge/Order/OrderItem.js @@ -49,7 +49,7 @@ class OrderItem extends Component { return ( item &&
- {current_user && current_user.login && checkbox} + {(current_user && current_user.login) && user_admin_or_member && checkbox}

{item.name} diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js index 5b4458f1d..97491f94f 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 785739842..b3812b965 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 48875221b..d3f99e53c 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 && From 98ed1794cf0a83cf682c2a58612e28f6269427a1 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Tue, 30 Nov 2021 11:28:02 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Main/CoderDepot.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx index f104d7111..db68d22a1 100644 --- a/src/forge/Main/CoderDepot.jsx +++ b/src/forge/Main/CoderDepot.jsx @@ -197,7 +197,7 @@ function CoderDepot(props){ let ele = document.getElementById("ptxt"); if(ele){ let h = ele.offsetHeight; - if( h > 35 ) setHideBtn(true); + if( h > 36 ) setHideBtn(true); } } },[projectDetail,lastCommit])