Merge branch 'pre_develop_dev' of https://git.trustie.net/Gitlink/forgeplus-react into feature_notification
This commit is contained in:
commit
ff1ffc120f
|
|
@ -27,7 +27,7 @@ function Releases({owner,projectsId,releaseVersions , baseOperate , projectType}
|
|||
})
|
||||
:
|
||||
<div className="mt8">
|
||||
您暂未发布任何版本{baseOperate && projectType !==2 && <Link className="color-blue ml20" to={`/projects/${owner}/${projectsId}/releases/new`}>创建新版本</Link>}
|
||||
您暂未发布任何版本{baseOperate && projectType !==2 && <Link className="color-blue ml20" to={`/${owner}/${projectsId}/releases/new`}>创建新版本</Link>}
|
||||
</div>
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -329,7 +329,7 @@ class MergeForm extends Component {
|
|||
placeholder={
|
||||
issue_tags && issue_tags.length > 0
|
||||
? "未选择标签"
|
||||
: "请在仓库设置里添加标签"
|
||||
: "请在仓库设置里添加标记"
|
||||
}
|
||||
showSearch
|
||||
>
|
||||
|
|
|
|||
|
|
@ -219,7 +219,7 @@ class Index extends Component {
|
|||
user_id:owners_id
|
||||
}).then((result) => {
|
||||
if (result && result.data.id) {
|
||||
projectsType && projectsType !== "mirror" && this.props.showNotification(`托管项目创建成功!`);
|
||||
projectsType && projectsType !== "mirror" && this.props.showNotification(`项目创建成功!`);
|
||||
this.props.history.push(`/${result.data.login}/${result.data.identifier}`);
|
||||
}
|
||||
this.setState({
|
||||
|
|
@ -351,7 +351,7 @@ class Index extends Component {
|
|||
required: true, message: '请填写镜像版本库地址'
|
||||
}],
|
||||
})(
|
||||
<Input placeholder="输入需要同步到本项目的镜像版本库地址" onChange={this.ChangeAddr} />
|
||||
<Input placeholder="请输入需要导入到本项目的仓库地址" onChange={this.ChangeAddr} />
|
||||
)}
|
||||
</Form.Item>
|
||||
<p className="formTip color-orange">示例：https://github.com/facebook/reack.git</p>
|
||||
|
|
@ -386,7 +386,7 @@ class Index extends Component {
|
|||
{getFieldDecorator('password', {
|
||||
rules: [],
|
||||
})(
|
||||
<Input.Password placeholder="请输入对应平台的登录用户名" autocomplete='new-password' style={{width:"240px"}}/>
|
||||
<Input.Password placeholder="请输入对应平台的登录密码" autocomplete='new-password' style={{width:"240px"}}/>
|
||||
)}
|
||||
</Form.Item>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -442,13 +442,13 @@ class order_form extends Component {
|
|||
</Select>
|
||||
)}
|
||||
</Form.Item>
|
||||
<Form.Item label="标签">
|
||||
<Form.Item label="标记">
|
||||
{getFieldDecorator("issue_tag_ids", {rules: []})(
|
||||
<Select>
|
||||
<Option value={""}>
|
||||
{issue_chosen && issue_chosen.issue_tag.length > 0
|
||||
? "未选择标签"
|
||||
: "请在仓库设置里添加标签"}
|
||||
? "未选择标记"
|
||||
: "请在仓库设置里添加标记"}
|
||||
</Option>
|
||||
{this.renderSelect(issue_chosen && issue_chosen.issue_tag)}
|
||||
</Select>
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ class Index extends Component {
|
|||
<p>
|
||||
<Link to={`/${owner}/${projectsId}/settings/labels`} className="w-100">
|
||||
<i className="iconfont icon-biaoqian3 font-18 mr10 color-grey-6"></i>
|
||||
项目标签
|
||||
项目标记
|
||||
</Link>
|
||||
</p>
|
||||
</li>
|
||||
|
|
|
|||
|
|
@ -348,7 +348,7 @@ class NewTags extends Component {
|
|||
</a>
|
||||
<Popconfirm
|
||||
placement="bottom"
|
||||
title={"删除标签会将其从所有引用中删除。继续？"}
|
||||
title={"删除标记会将其从所有引用中删除，是否继续？"}
|
||||
okText="是"
|
||||
cancelText="否"
|
||||
onConfirm={() => this.deletetag(item.id)}
|
||||
|
|
@ -383,7 +383,7 @@ class NewTags extends Component {
|
|||
return (
|
||||
<div>
|
||||
<div className="topWrapper" style={{borderBottom:"1px solid #eee"}}>
|
||||
<span>共{data && data.issue_tags_count}个标签</span>
|
||||
<span>共{data && data.issue_tags_count}个标记</span>
|
||||
<ul className="topWrapper_select">
|
||||
<li>
|
||||
<Dropdown
|
||||
|
|
@ -393,7 +393,7 @@ class NewTags extends Component {
|
|||
placement="bottomCenter"
|
||||
>
|
||||
<span>
|
||||
标签
|
||||
标记
|
||||
<Icon type="caret-down" className="ml5" />
|
||||
</span>
|
||||
</Dropdown>
|
||||
|
|
@ -423,11 +423,11 @@ class NewTags extends Component {
|
|||
className="flex-a-center baseForm bbr"
|
||||
style={{ "justify-content": "space-between" }}
|
||||
>
|
||||
<span className="font-18 text-black">项目标签</span>
|
||||
<span className="font-18 text-black">项目标记</span>
|
||||
{data && data.user_admin_or_member ? (
|
||||
<Button type="primary" ghost onClick={this.newshow}>
|
||||
<Icon type="plus"></Icon>
|
||||
创建标签
|
||||
创建标记
|
||||
</Button>
|
||||
) : (
|
||||
""
|
||||
|
|
@ -442,7 +442,7 @@ class NewTags extends Component {
|
|||
rules: [
|
||||
{
|
||||
required: true,
|
||||
message: "请填写标签名字",
|
||||
message: "请填写标记名字",
|
||||
},
|
||||
],
|
||||
})(<Input placeholder="名称，10字以内" maxLength="10" />)}
|
||||
|
|
@ -481,7 +481,7 @@ class NewTags extends Component {
|
|||
onClick={this.createtagpost}
|
||||
className="fr"
|
||||
>
|
||||
创建标签
|
||||
创建标记
|
||||
</Button>
|
||||
{/* <a onClick={this.createtagpost} className="topWrapper_btn fr" >创建标签</a> */}
|
||||
<a onClick={this.newclose} className="a_btn cancel_btn fr">
|
||||
|
|
@ -497,7 +497,7 @@ class NewTags extends Component {
|
|||
</div>
|
||||
</div>
|
||||
<Modal
|
||||
title="编辑标签"
|
||||
title="编辑标记"
|
||||
onCancel={this.handleCancel}
|
||||
visible={this.state.isShow}
|
||||
onOk={this.handleok}
|
||||
|
|
|
|||
Loading…
Reference in New Issue