diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 62861582..1454e120 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,7 +3,11 @@
-
+
+
+
+
+
@@ -27,95 +31,13 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -125,36 +47,36 @@
- 代码库
- href=
- img_fork
- branchDropdown
- subFileName
- shu
- nonemerge
- isedit
- getFieldDecorator
- issue_chosen
- renderMergeEdit
- renderSelect
- menu
- renderList
- editMergeForm
- order_line
- Form
- Form.I
item-list-right
form .ant-select
form .ant-cascader-picker, form .ant-select
.detailContent
.ant-spin-nested-loading
- 该合并请求可以进行自动合并操作
.newFooter
topmerge_btn
mergediv
index
prdetail
showNotification
+ copy_rep_content
+ CloneAddress
+ branchLastCommit
+ CoderRootDirectory
+ 该合并请求可以进行自动合并操作
+ entries
+ /branches
+ Detail
+ projects/:projectsId/c
+ branchList
+ getProjectRoot
+ changeBranch
+ detail
+ up
+ update
+ 新建文件
+ subFileType
+ coders
+ upda
任务
@@ -180,7 +102,6 @@
-
@@ -192,7 +113,6 @@
-
@@ -209,12 +129,15 @@
-
-
+
+
+
+
+
@@ -236,6 +159,11 @@
+
+
+
+
+
@@ -252,7 +180,7 @@
-
+
@@ -268,6 +196,7 @@
+
@@ -322,18 +251,17 @@
-
+
-
+
-
-
+
@@ -346,8 +274,8 @@
-
-
+
+
@@ -409,60 +337,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -477,16 +351,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -531,16 +395,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -707,16 +561,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -741,16 +585,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -758,16 +592,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -806,16 +630,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -826,7 +640,7 @@
-
+
@@ -838,7 +652,7 @@
-
+
@@ -847,8 +661,8 @@
-
-
+
+
@@ -881,5 +695,124 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/forge/Branch/CloneAddress.js b/src/forge/Branch/CloneAddress.js
index 35feffe4..7d3cec9e 100644
--- a/src/forge/Branch/CloneAddress.js
+++ b/src/forge/Branch/CloneAddress.js
@@ -24,16 +24,26 @@ class CloneAddress extends Component{
this.jsCopy()}>
-
{
- !downloadUrl &&
-
-
-
-
-
+ downloadUrl &&
+
+
+
+
+
+
+
}
-
+ {/**/}
+ {/*{*/}
+ {/*!downloadUrl &&*/}
+ {/**/}
+ {/**/}
+ {/**/}
+ {/**/}
+ {/**/}
+ {/*}*/}
+ {/**/}
)
}
diff --git a/src/forge/Main/CoderRootDirectory.js b/src/forge/Main/CoderRootDirectory.js
index 641aa3c8..a7f63915 100644
--- a/src/forge/Main/CoderRootDirectory.js
+++ b/src/forge/Main/CoderRootDirectory.js
@@ -83,7 +83,8 @@ class CoderRootDirectory extends Component{
this.renderData(result.data);
}
this.setState({
- rootData:result.data
+ rootData:result.data,
+ subFileType: "dir"
})
}
@@ -91,6 +92,7 @@ class CoderRootDirectory extends Component{
}
ChangeFile=(arr,readOnly)=>{
+ console.log("atrr", arr)
this.renderUrl(arr.name,arr.path,arr.type);
//点击直接跳转页面 加载一次路由
@@ -215,6 +217,7 @@ class CoderRootDirectory extends Component{
changeBranch=(value)=>{
const { branchList } = this.props;
+
let branchLastCommit = branchList && branchList.length >0 && branchList.filter(item=>item.name === value)[0];
this.setState({
branch:branchLastCommit && branchLastCommit.name,
diff --git a/src/forge/Main/Detail.js b/src/forge/Main/Detail.js
index 8a9ca5e5..438960c2 100644
--- a/src/forge/Main/Detail.js
+++ b/src/forge/Main/Detail.js
@@ -155,7 +155,8 @@ class Detail extends Component{
}
componentDidUpdate=(prevState)=>{
- if(prevState.match.params.projectsId !== this.props.match.params.projectsId){
+
+ if((prevState.match.params.projectsId !== this.props.match.params.projectsId) || (prevState.location.pathname.indexOf("newfile") !== -1)){
this.getDetail();
}
}
diff --git a/src/forge/New/Index.js b/src/forge/New/Index.js
index 690db894..da0b804d 100644
--- a/src/forge/New/Index.js
+++ b/src/forge/New/Index.js
@@ -118,7 +118,7 @@ class Index extends Component{
if(data && data.length > 0){
let _data = data;
if(name){
- _data = data.filter(item=>item.name.indexOf(name)>-1);
+ _data = data.filter(item=>item.name.toLowerCase().indexOf(name.toLowerCase())>-1);
}
let list = _data && _data.map((item) => (