this.setVisibleFunc(false)}
>
{claimerData.map((item, key) => {
From f0e74326ace43c45a209646cc5caae979ad8ef49 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 17 Mar 2023 10:46:14 +0800
Subject: [PATCH 3/6] file type is submodule , but submodule_git_url is null
---
src/forge/Main/CoderDepotCatalogue.jsx | 22 ++++++++++++++++------
1 file changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/forge/Main/CoderDepotCatalogue.jsx b/src/forge/Main/CoderDepotCatalogue.jsx
index 375266ce0..c292ee733 100644
--- a/src/forge/Main/CoderDepotCatalogue.jsx
+++ b/src/forge/Main/CoderDepotCatalogue.jsx
@@ -29,12 +29,22 @@ function CoderDepotCatalogue({item , goToSubRoot , owner , projectsId , platform
{item.name}
:
(item.type === "submodule" ?
-
-
- {item.name}
-
- @{truncateCommitId(item.sha)}
-
+ (
+ item.submodule_git_url ?
+
+
+ {item.name}
+
+ @
+ {truncateCommitId(item.sha)}
+
+ :
+
+ {item.name}
+ @
+ {truncateCommitId(item.sha)}
+
+ )
:
goToSubRoot(item.path,item.type,item.name)}>
{item.name}
From 4aa09a5d862eff9281bfd74f34a452aeb6c06b64 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 17 Mar 2023 13:49:52 +0800
Subject: [PATCH 4/6] =?UTF-8?q?issue=202616=20issue=E4=BF=9D=E5=AD=98?=
=?UTF-8?q?=E6=8F=90=E7=A4=BA=E9=99=84=E4=BB=B6id=E4=B8=8D=E5=AD=98?=
=?UTF-8?q?=E5=9C=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/Component/Contributors.jsx | 7 ++++++-
src/forge/Issues/Component/newPanel.jsx | 14 ++++++++------
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/forge/Component/Contributors.jsx b/src/forge/Component/Contributors.jsx
index 04ee3648b..304d8a16e 100644
--- a/src/forge/Component/Contributors.jsx
+++ b/src/forge/Component/Contributors.jsx
@@ -174,11 +174,16 @@ function Contributors({owner,projectsId,currentLogin}){
{
list && list.length>0 && list.map((item,key)=>{
return(
+ item.id ?
-
+
})
setVisibleFunc(true,item.login,key)}/>
+ :
+
+ setVisibleFunc(true,item.login,key)}/>
+
)
})
}
diff --git a/src/forge/Issues/Component/newPanel.jsx b/src/forge/Issues/Component/newPanel.jsx
index 0094be5a0..56964aed4 100644
--- a/src/forge/Issues/Component/newPanel.jsx
+++ b/src/forge/Issues/Component/newPanel.jsx
@@ -1,4 +1,4 @@
-import React , { forwardRef , useState } from 'react';
+import React , { forwardRef , useState , useRef } from 'react';
import { Form , Input , Button } from 'antd';
import MDEditor from "../../../modules/tpm/challengesnew/tpm-md-editor";
import Upload from "../../Upload/Index";
@@ -7,7 +7,6 @@ import UploadImg from '../Img/UploadImg.png';
function NewPanel(props,ref){
const [ description , setDescription ] = useState("");
- const [ fileList , setFileList] = useState(undefined);
const [ attachments , setAttachments ] = useState([]);
const [ receivers_login , setReceiversLogin ] = useState(undefined);
@@ -15,6 +14,8 @@ function NewPanel(props,ref){
const { form: { getFieldDecorator, validateFields , setFieldsValue } } = props;
+ const fileList = useRef(undefined);
+
useState(()=>{
title && setTimeout(()=>{
setFieldsValue({subject:title});
@@ -33,16 +34,17 @@ function NewPanel(props,ref){
arr = files.map(i=>{return i.id});
}
list = arr && arr.length>0 ? f.concat(arr) : f ;
- setFileList(list);
+ fileList.current = list;
};
function deleteLoad(id){
let arr = [];
- let list = files
+ let list = files;
if(list && list.length>0 ){
arr = list.filter(i=>i.id !== id);
}
- setFileList(arr.map(i=>{return i.id}));
+ let idArr = arr.map(i=>{return i.id});
+ fileList.current = idArr;
}
function changeAtWhoLoginList(loginList){
@@ -54,7 +56,7 @@ function NewPanel(props,ref){
function sureFunc(){
validateFields((error,values)=>{
if (!error) {
- createFunc(values,fileList,receivers_login,description);
+ createFunc(values,fileList.current,receivers_login,description);
}
})
}
From 201ece7558f0a88024bb37ac62a4dee2a1e36d0b Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 17 Mar 2023 16:02:25 +0800
Subject: [PATCH 5/6] fault
---
src/forge/Issues/Component/newPanel.jsx | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/forge/Issues/Component/newPanel.jsx b/src/forge/Issues/Component/newPanel.jsx
index 56964aed4..2b65b4687 100644
--- a/src/forge/Issues/Component/newPanel.jsx
+++ b/src/forge/Issues/Component/newPanel.jsx
@@ -1,4 +1,4 @@
-import React , { forwardRef , useState , useRef } from 'react';
+import React , { forwardRef , useState } from 'react';
import { Form , Input , Button } from 'antd';
import MDEditor from "../../../modules/tpm/challengesnew/tpm-md-editor";
import Upload from "../../Upload/Index";
@@ -7,6 +7,7 @@ import UploadImg from '../Img/UploadImg.png';
function NewPanel(props,ref){
const [ description , setDescription ] = useState("");
+ const [ fileList , setFileList] = useState(undefined);
const [ attachments , setAttachments ] = useState([]);
const [ receivers_login , setReceiversLogin ] = useState(undefined);
@@ -14,8 +15,6 @@ function NewPanel(props,ref){
const { form: { getFieldDecorator, validateFields , setFieldsValue } } = props;
- const fileList = useRef(undefined);
-
useState(()=>{
title && setTimeout(()=>{
setFieldsValue({subject:title});
@@ -34,7 +33,7 @@ function NewPanel(props,ref){
arr = files.map(i=>{return i.id});
}
list = arr && arr.length>0 ? f.concat(arr) : f ;
- fileList.current = list;
+ setFileList(list);
};
function deleteLoad(id){
@@ -43,8 +42,8 @@ function NewPanel(props,ref){
if(list && list.length>0 ){
arr = list.filter(i=>i.id !== id);
}
- let idArr = arr.map(i=>{return i.id});
- fileList.current = idArr;
+ console.log('删除后:',arr);
+ setFileList(arr.map(i=>{return i.id}));
}
function changeAtWhoLoginList(loginList){
@@ -56,7 +55,8 @@ function NewPanel(props,ref){
function sureFunc(){
validateFields((error,values)=>{
if (!error) {
- createFunc(values,fileList.current,receivers_login,description);
+ console.log('保存时:',fileList);
+ createFunc(values,fileList,receivers_login,description);
}
})
}
From caf1195d057152283f1e63b933f045dd1a8413c2 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 17 Mar 2023 16:30:19 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E9=99=84=E4=BB=B6=E7=BB=84=E4=BB=B6-?=
=?UTF-8?q?=E5=88=A0=E9=99=A4=E5=88=9A=E4=B8=8A=E4=BC=A0=E7=9A=84=E6=96=87?=
=?UTF-8?q?=E4=BB=B6=EF=BC=8C=E6=B2=A1=E6=9C=89=E5=8F=8A=E6=97=B6=E6=9B=B4?=
=?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/forge/Issues/Component/newPanel.jsx | 2 --
src/forge/Upload/Index.js | 3 ++-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/forge/Issues/Component/newPanel.jsx b/src/forge/Issues/Component/newPanel.jsx
index 2b65b4687..78298cd7c 100644
--- a/src/forge/Issues/Component/newPanel.jsx
+++ b/src/forge/Issues/Component/newPanel.jsx
@@ -42,7 +42,6 @@ function NewPanel(props,ref){
if(list && list.length>0 ){
arr = list.filter(i=>i.id !== id);
}
- console.log('删除后:',arr);
setFileList(arr.map(i=>{return i.id}));
}
@@ -55,7 +54,6 @@ function NewPanel(props,ref){
function sureFunc(){
validateFields((error,values)=>{
if (!error) {
- console.log('保存时:',fileList);
createFunc(values,fileList,receivers_login,description);
}
})
diff --git a/src/forge/Upload/Index.js b/src/forge/Upload/Index.js
index 616c90141..4c254405b 100644
--- a/src/forge/Upload/Index.js
+++ b/src/forge/Upload/Index.js
@@ -59,8 +59,9 @@ class Index extends Component {
return {
fileList: newFileList,
};
+ },()=>{
+ this.fileIdList(this.state.fileList);
});
- this.fileIdList(this.state.fileList);
} else {
this.props.showNotification(response.data.message)
}