From 174c4daf47c16f60f4f7fb34a0994637386b9500 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sun, 8 Mar 2020 01:37:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=89=88=E6=9C=AC=E5=BA=93?=
=?UTF-8?q?=E4=BD=93=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../tpm/shixunchild/Repository/Repository.js | 4 +--
.../Repository/RepositoryAddFile.js | 8 ++---
.../RepositoryAddFileupload_file.js | 30 ++++++++++---------
3 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/public/react/src/modules/tpm/shixunchild/Repository/Repository.js b/public/react/src/modules/tpm/shixunchild/Repository/Repository.js
index 8eb3d691c..ddf40dd91 100644
--- a/public/react/src/modules/tpm/shixunchild/Repository/Repository.js
+++ b/public/react/src/modules/tpm/shixunchild/Repository/Repository.js
@@ -362,11 +362,11 @@ class Repository extends Component {
{commits===undefined?"":commits[0].time}
</acronym> ：{commits===undefined?"":commits[0].title}
</span>
- <a href={`/shixuns/${match.params.shixunId}/${this.props.secret_repository_tab ? 'secret_repository' : 'repository'}/${match.params.shixunId}/commits`}
+ <Link to={`/shixuns/${match.params.shixunId}/${this.props.secret_repository_tab ? 'secret_repository' : 'repository'}/${match.params.shixunId}/commits`}
className="color-grey-8 fr font-16 mt3">
<i className="iconfont icon-tijiaojilu font-18 fl mr5"></i>
<span className="fl color-grey-8 ">提交记录</span>
- </a>
+ </Link>
</div>}
diff --git a/public/react/src/modules/tpm/shixunchild/Repository/RepositoryAddFile.js b/public/react/src/modules/tpm/shixunchild/Repository/RepositoryAddFile.js
index eda2e5ff6..757f1222d 100644
--- a/public/react/src/modules/tpm/shixunchild/Repository/RepositoryAddFile.js
+++ b/public/react/src/modules/tpm/shixunchild/Repository/RepositoryAddFile.js
@@ -233,17 +233,17 @@ class RepositoryAddFile extends Component {
</p>
- <div className={"mt20"}>
- <Form.Item>
+ <div className={" mb50"}>
+ <Form.Item label="文件名称或文件路径">
{getFieldDecorator('path', {
rules: [{
- required: true, message: '请输入提交信息',
+ required: true, message: '请输入文件名称或文件路径',
},{
whitespace: true, message: '请勿输入空格'
}],
})(
<span>
- <span> </span><span><Input value={this.state.path} placeholder="文件名称或文件路径" className="fl" style={{ width: 200 }} size="large" onInput={(e)=>this.setinput(e)}/></span><span className={" ml10 fl"}>
+ <span> </span><span><Input value={this.state.path} placeholder="请输入文件名称或文件路径" className="fl" style={{ width: 240 }} size="large" onInput={(e)=>this.setinput(e)}/></span><span className={" ml10 fl"}>
提示：1.输入文件名可以创建一个新文件；2.输入新文件夹名/新文件名可以创建新文件夹和新文件。（如：step1/HelloWorld.java）</span>
</span>
)}
diff --git a/public/react/src/modules/tpm/shixunchild/Repository/RepositoryAddFileupload_file.js b/public/react/src/modules/tpm/shixunchild/Repository/RepositoryAddFileupload_file.js
index eb0557472..59486230a 100644
--- a/public/react/src/modules/tpm/shixunchild/Repository/RepositoryAddFileupload_file.js
+++ b/public/react/src/modules/tpm/shixunchild/Repository/RepositoryAddFileupload_file.js
@@ -266,23 +266,14 @@ class RepositoryAddFileupload_files extends Component {
<div className={"font-20 color-black"}>上传文件</div>
</p>
- <Form.Item label="提交信息">
- {getFieldDecorator('message', {
- rules: [{
- required: true, message: '请输入提交信息',
- },{
- whitespace: true, message: '请勿输入空格'
- }],
- })(
- <Input placeholder="必填，描述主要修改内容（相当于Git Commit message的Header）" onInput={this.FormInput} className="winput-300-35 fl"/>
- )}
- </Form.Item>
+ <div>
+ <p className="ant-form-item-label">
+ <div className={"color888 font-16"}>当前目录：{this.state.filspath===""?"/":"/"+this.state.filspath} <span className={"color-blue pointer"} onClick={this.Selectfiledirectory}>选择文件目录</span></div>
+ </p>
+ </div>
- <p className="ant-form-item-label">
- <div className={"color888 font-16"}>当前目录：{this.state.filspath===""?"/":"/"+this.state.filspath} <span className={"color-blue pointer"} onClick={this.Selectfiledirectory}>选择文件目录</span></div>
- </p>
{/*<div className="mt10 mb25 repoCMWrapper filecode">*/}
@@ -308,7 +299,18 @@ class RepositoryAddFileupload_files extends Component {
{/* <textarea className="winput-100-130 fl"></textarea>*/}
{/* )}*/}
{/*</Form.Item>*/}
+ <Form.Item label="提交信息">
+ {getFieldDecorator('message', {
+ rules: [{
+ required: true, message: '请输入提交信息',
+ },{
+ whitespace: true, message: '请勿输入空格'
+ }],
+ })(
+ <Input placeholder="必填，描述主要修改内容（相当于Git Commit message的Header）" onInput={this.FormInput} className="winput-300-35 fl"/>
+ )}
+ </Form.Item>
</div>
</Form>
</div>