From 4ffb2acc9c168c02a39577acc35e534054ea8320 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Tue, 30 Nov 2021 13:57:05 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=A0=87=E8=AE=B0-?= =?UTF-8?q?=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/AppConfig.js | 2 +- src/forge/Settings/new_tags.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/AppConfig.js b/src/AppConfig.js index 30eb7e9aa..665e85f0f 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/Settings/new_tags.js b/src/forge/Settings/new_tags.js index 1c91a0ac9..3e62a5f8a 100644 --- a/src/forge/Settings/new_tags.js +++ b/src/forge/Settings/new_tags.js @@ -507,8 +507,8 @@ class NewTags extends Component { >
Date: Tue, 30 Nov 2021 14:07:22 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=AD=97=E6=AE=B5-=E9=9D=9E=E6=88=90=E5=91=98=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E4=BF=AE=E6=94=B9=E7=BC=96=E8=BE=91=E6=98=93=E4=BF=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Order/OrderItem.js | 2 +- src/forge/Order/order.js | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/forge/Order/OrderItem.js b/src/forge/Order/OrderItem.js index c80feafa7..55126e3a1 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) && user_admin_or_member && checkbox} + {(current_user && current_user.login) && checkbox}

{item.name} diff --git a/src/forge/Order/order.js b/src/forge/Order/order.js index 97491f94f..aa1ba594a 100644 --- a/src/forge/Order/order.js +++ b/src/forge/Order/order.js @@ -578,7 +578,7 @@ class order extends Component {

{ - ((current_user && current_user.login) && (data && data.user_admin_or_member)) ? + ((current_user && current_user.login) && (data && data.user_operate_issue)) ? : "" } @@ -823,14 +823,14 @@ class order extends Component { : ""} + checkbox={current_user &&(data && data.user_operate_issue) ? : ""} search_count={search_count} page={select_params.page} limit={select_params.limit} {...this.props} {...this.state} deletedetail={this.deletedetail} - user_admin_or_member={data && data.user_admin_or_member} + user_admin_or_member={data && data.user_operate_issue} > ) })} From 36a58c0fe3cacf96ba60d738c29c9300a3325857 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Tue, 30 Nov 2021 14:16:42 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=90=88=E5=B9=B6=E8=AF=B7=E6=B1=82-?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Merge/merge.js | 2 +- src/forge/users/GeneralView/ConcentrateBox.jsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/forge/Merge/merge.js b/src/forge/Merge/merge.js index 8a0eaedea..b55f596b9 100644 --- a/src/forge/Merge/merge.js +++ b/src/forge/Merge/merge.js @@ -414,7 +414,7 @@ class merge extends Component { ) : ( "" )} - { data && data.issues && data.issues.length === 0 ? :""} + { data && data.issues && data.issues.length === 0 ? :""}
diff --git a/src/forge/users/GeneralView/ConcentrateBox.jsx b/src/forge/users/GeneralView/ConcentrateBox.jsx index b3812b965..001b598dc 100644 --- a/src/forge/users/GeneralView/ConcentrateBox.jsx +++ b/src/forge/users/GeneralView/ConcentrateBox.jsx @@ -9,7 +9,7 @@ function ConcentrateBox({ visible , onCancel , onSure , username , choosed , his const [ page , setPage ]= useState(1); const [ total , setTotal ]= useState(0); const [ pageSize , setPageSize ] = useState(false); - const [ search , setSearch ] = useState(undefined); + const [ search , setSearch ] = useState(""); const [ list , setList ]= useState([]); const [ value , setValue ]= useState([]); @@ -24,7 +24,7 @@ function ConcentrateBox({ visible , onCancel , onSure , username , choosed , his setIsSpin(true); getProjectList(); }else{ - setSearch(undefined); + setSearch(""); setCopyAllList([]); setCopyList([]); setList([]); From e591de00fd3c2a786ced0c068f25fa8a05cb9f65 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Tue, 30 Nov 2021 15:22:23 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Head/AddProjectModal.jsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/forge/Head/AddProjectModal.jsx b/src/forge/Head/AddProjectModal.jsx index 3dcb2d953..3fd88fec2 100644 --- a/src/forge/Head/AddProjectModal.jsx +++ b/src/forge/Head/AddProjectModal.jsx @@ -17,6 +17,7 @@ function AddProjectModal(props){ function onOk() { validateFields((error,values)=>{ + console.log(error) if(!error){ const url = `/applied_projects.json`; Axios.post(url,{ @@ -40,6 +41,7 @@ function AddProjectModal(props){ callback("请输入6位数的邀请码"); } } + callback(); } return( From 7295a71bc521fd4e57d32426dab9c9c69b62d931 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Tue, 30 Nov 2021 15:27:11 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E6=A0=87=E8=AE=B0=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Settings/new_tags.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/forge/Settings/new_tags.js b/src/forge/Settings/new_tags.js index 3e62a5f8a..5c882f9cc 100644 --- a/src/forge/Settings/new_tags.js +++ b/src/forge/Settings/new_tags.js @@ -310,7 +310,7 @@ class NewTags extends Component { const columns = [ { title: "颜色代码", - width: "20%", + width: "25%", dataIndex: "color", render: (text, item) => ( From b802fd2fbd9ca266d4472e7d35f63b8c9eebd928 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Tue, 30 Nov 2021 15:37:28 +0800 Subject: [PATCH 6/8] merge+update --- src/forge/Order/order_form.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/forge/Order/order_form.js b/src/forge/Order/order_form.js index 19a0eaeb0..e5c0522de 100644 --- a/src/forge/Order/order_form.js +++ b/src/forge/Order/order_form.js @@ -49,6 +49,8 @@ class order_form extends Component { this.getSelectList(); //如果是复制issue则需要将原内容中的@谁录入 @列表中 (在tpm-md-editor.js中其实有处理，但是当用户点击【复制】按钮之后迅速创建issue会有延迟导致@失效) if (this.state.form_type === "copy"){ + const { projectsId , owner } = this.props.match.params; + const { description } = this.state; let allUser = undefined; axios.get(`/${owner}/${projectsId}/members.json`).then(response=>{ if (response.data.total_count !== 0) { From 33e1b7e400abdd322c1b7a57ec1d53f742bb7b75 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Tue, 30 Nov 2021 16:58:48 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E5=90=88=E5=B9=B6=E8=AF=B7=E6=B1=82-?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Merge/merge.js | 2 +- src/forge/Merge/no_data.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/forge/Merge/merge.js b/src/forge/Merge/merge.js index b55f596b9..0f6f1ac81 100644 --- a/src/forge/Merge/merge.js +++ b/src/forge/Merge/merge.js @@ -414,7 +414,7 @@ class merge extends Component { ) : ( "" )} - { data && data.issues && data.issues.length === 0 ? :""} + { data && data.issues && data.issues.length === 0 ? :""}
diff --git a/src/forge/Merge/no_data.js b/src/forge/Merge/no_data.js index 78a622685..76258f8ca 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 , user_admin_or_member} = this.props; + const { _html, projectsId , owner , user_admin_or_developer} = this.props; return(
@@ -12,7 +12,7 @@ class Nodata extends Component{

欢迎使用合并请求！

- 合并请求可以帮助您与他人协作编写代码。{ user_admin_or_member && 在使用之前，请先创建一个 合并请求 } + 合并请求可以帮助您与他人协作编写代码。{ user_admin_or_developer && 在使用之前，请先创建一个 合并请求 }
From d4f0d21608551e82c827ae0723046aeb293aa31f Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Tue, 30 Nov 2021 17:55:29 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=88=90=E5=91=98-?= =?UTF-8?q?=E5=88=A0=E4=BA=86=E5=90=8E=E4=B8=8D=E8=83=BD=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=88=90=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/forge/Component/AddMember.jsx | 3 ++- src/forge/Settings/Collaborator.js | 5 +++-- src/forge/Settings/CollaboratorMember.jsx | 9 +++++---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/forge/Component/AddMember.jsx b/src/forge/Component/AddMember.jsx index f927850c8..f453be054 100644 --- a/src/forge/Component/AddMember.jsx +++ b/src/forge/Component/AddMember.jsx @@ -66,9 +66,10 @@ function AddMember({getID,login,showNotification}){ }; function addCollaborator(){ - if(source && source.length>0){ + if(source && source.length>0&&searchKey){ getID && getID(id); setSearchKey(undefined); + setID(undefined) }else{ showNotification("请选择存在的用户!"); } diff --git a/src/forge/Settings/Collaborator.js b/src/forge/Settings/Collaborator.js index 0a50cae10..cca2520ae 100644 --- a/src/forge/Settings/Collaborator.js +++ b/src/forge/Settings/Collaborator.js @@ -8,15 +8,16 @@ import Group from './CollaboratorGroup'; function Collaborator(props){ const [ nav , setNav] = useState("1"); const [ newId , setNewId] = useState(undefined); + const [ newIdFlag , setNewIdFlag ] = useState(false); const [ addOperation , setAddOperation] = useState(true); const [ newGroupId , setNewGroupId] = useState(undefined); const {projectsId ,owner} = props.match.params; - const author = props && props.projectDetail && props.projectDetail.author; function getID(id){ setNewId(id); + setNewIdFlag(!newIdFlag); } function getGroupID(id){ setNewGroupId(id); @@ -47,7 +48,7 @@ function Collaborator(props){
{ nav === "1" ? - + : } diff --git a/src/forge/Settings/CollaboratorMember.jsx b/src/forge/Settings/CollaboratorMember.jsx index 447e3b262..0f407bf21 100644 --- a/src/forge/Settings/CollaboratorMember.jsx +++ b/src/forge/Settings/CollaboratorMember.jsx @@ -1,4 +1,4 @@ -import React, { useEffect, useState } from 'react'; +import React, { useEffect, useState , useImperativeHandle , forwardRef } from 'react'; import { Dropdown, Menu, Icon , Input , Spin , Table , Tooltip , Pagination , Popconfirm } from "antd"; import axios from 'axios'; import NoneData from "../Nodata"; @@ -12,7 +12,7 @@ const MENU_LIST = [ {id: "Developer",name: "开发者"}, {id: "Reporter",name: "报告者"} ]; -function CollaboratorMember({projectsId,owner,project_id,author,showNotification,newId}){ +function CollaboratorMember({projectsId,owner,project_id,author,showNotification,newId,flag}){ const [ roleName , setRoleName ] = useState(undefined); const [ search , setSearch ] = useState(undefined); const [ page , setPage ] = useState(1); @@ -20,11 +20,12 @@ function CollaboratorMember({projectsId,owner,project_id,author,showNotification const [ role , setRole ] = useState(undefined); const [ listData , setListData ] = useState(undefined); const [ total , setTotal ] = useState(0); + useEffect(()=>{ if(newId){ addCollaborator(newId); } - },[newId]) + },[flag]) // 增加协作者 function addCollaborator(id){ if(id){ @@ -276,4 +277,4 @@ function CollaboratorMember({projectsId,owner,project_id,author,showNotification ) } -export default CollaboratorMember; \ No newline at end of file +export default forwardRef(CollaboratorMember); \ No newline at end of file