Gitlink
/
forgeplus-react
39
0
Fork 30
Code Issues Pull Requests Releases 1 Wiki Activity

update 标签 to 标记

This commit is contained in:
caishi 2021-09-16 16:26:51 +08:00
parent a5c3cd168e
commit 6cfb56e6ca
12 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/forge/Main/CoderRootTag.js
View File

@ -34,7 +34,7 @@ export default (( props, { projectDetail }) => {
<div className="div_table"> <div className="div_table">
<ul className="ul_thead"> <ul className="ul_thead">
<li> <li>
<span className="flex1">标签名</span> <span className="flex1">标记名</span>
<span>提交信息</span> <span>提交信息</span>
<span className="ul_tbody_forth">下载</span> <span className="ul_tbody_forth">下载</span>
</li> </li>

6
src/forge/Merge/merge.js
View File

@ -43,7 +43,7 @@ class merge extends Component {
//设置选择高亮 //设置选择高亮
openselect: 1, openselect: 1,
closeselect: undefined, closeselect: undefined,
issue_tag_ids: "标签", issue_tag_ids: "标记",
fixed_version_ids: "里程碑", fixed_version_ids: "里程碑",
assigned_to_ids: "审查人员", assigned_to_ids: "审查人员",
paix: "排序", paix: "排序",
@ -198,7 +198,7 @@ class merge extends Component {
}); });
this.setState({ this.setState({
status_type: type, status_type: type,
issue_tag_ids: "标签", issue_tag_ids: "标记",
fixed_version_ids: "里程碑", fixed_version_ids: "里程碑",
assigned_to_ids: "审查人员", assigned_to_ids: "审查人员",
paix: "排序", paix: "排序",
@ -321,7 +321,7 @@ class merge extends Component {
className="topWrapperSelect" className="topWrapperSelect"
overlay={this.renderMenu( overlay={this.renderMenu(
issue_chosen && issue_chosen.issue_tag, issue_chosen && issue_chosen.issue_tag,
"标签", "标记",
"issue_tag_id" "issue_tag_id"
)} )}
trigger={["click"]} trigger={["click"]}

6
src/forge/Merge/merge_form.js
View File

@ -301,7 +301,7 @@ class MergeForm extends Component {
initialValue: assigned_to_id, initialValue: assigned_to_id,
})( })(
<Select placeholder="未选择审查人员" showSearch> <Select placeholder="未选择审查人员" showSearch>
<Option key={0} value={""}>未选择审查人员</Option> {/* <Option key={0} value={""}>未选择审查人员</Option> */}
{this.renderSelect(members)} {this.renderSelect(members)}
</Select> </Select>
)} )}
@ -316,7 +316,7 @@ class MergeForm extends Component {
} }
showSearch showSearch
> >
<Option key={0} value={""}>{issue_versions && issue_versions.length > 0? "未选择里程碑": "请添加里程碑"}</Option> {/* <Option key={0} value={""}>{issue_versions && issue_versions.length > 0? "未选择里程碑": "请添加里程碑"}</Option> */}
{this.renderSelect(issue_versions)} {this.renderSelect(issue_versions)}
</Select> </Select>
)} )}
@ -331,7 +331,7 @@ class MergeForm extends Component {
} }
showSearch showSearch
> >
<Option key={0} value={""}>{issue_tags && issue_tags.length > 0 ? "未选择标记" : "请在仓库设置里添加标记"}</Option> {/* <Option key={0} value={""}>{issue_tags && issue_tags.length > 0 ? "未选择标记" : "请在仓库设置里添加标记"}</Option> */}
{this.renderSelect(issue_tags)} {this.renderSelect(issue_tags)}
</Select> </Select>
)} )}

6
src/forge/Order/MilepostDetail.js
View File

@ -40,7 +40,7 @@ class MilepostDetail extends Component {
issue_type: undefined, issue_type: undefined,
status_type: '1', status_type: '1',
//设置选择高亮 //设置选择高亮
issue_tag_ids: '标签', issue_tag_ids: '标记',
tracker_ids: '类型', tracker_ids: '类型',
author_ids: '发布人', author_ids: '发布人',
assigned_to_ids: '负责人', assigned_to_ids: '负责人',
@ -194,7 +194,7 @@ class MilepostDetail extends Component {
done_ratio : undefined, done_ratio : undefined,
status_id: undefined, status_id: undefined,
assigned_to_id: undefined, assigned_to_id: undefined,
issue_tag_ids: '标签', issue_tag_ids: '标记',
tracker_ids: '类型', tracker_ids: '类型',
author_ids: '发布人', author_ids: '发布人',
assigned_to_ids: '负责人', assigned_to_ids: '负责人',
@ -254,7 +254,7 @@ class MilepostDetail extends Component {
</ul> </ul>
<ul className="topWrapper_select"> <ul className="topWrapper_select">
<li> <li>
<Dropdown className="topWrapperSelect" overlay={this.renderMenu(issue_chosen && issue_chosen.issue_tag, '标签', 'issue_tag_id')} trigger={['click']} placement="bottomCenter"> <Dropdown className="topWrapperSelect" overlay={this.renderMenu(issue_chosen && issue_chosen.issue_tag, '标记', 'issue_tag_id')} trigger={['click']} placement="bottomCenter">
<span>{this.state.issue_tag_ids}<Icon type="caret-down" className="ml5" /></span> <span>{this.state.issue_tag_ids}<Icon type="caret-down" className="ml5" /></span>
</Dropdown> </Dropdown>
</li> </li>

2
src/forge/Order/Nav.js
View File

@ -7,7 +7,7 @@ class Nav extends Component{
const { projectsId , owner } = this.props.match.params; const { projectsId , owner } = this.props.match.params;
return( return(
<p className="topWrapper_nav"> <p className="topWrapper_nav">
<NavLink activeClassName="active" className="issue-type-button" to={`/${owner}/${projectsId}/issues/tags`}>标签</NavLink> <NavLink activeClassName="active" className="issue-type-button" to={`/${owner}/${projectsId}/issues/tags`}>标记</NavLink>
<NavLink activeClassName="active" className="issue-type-button" to={`/${owner}/${projectsId}/milestones`}>里程碑</NavLink> <NavLink activeClassName="active" className="issue-type-button" to={`/${owner}/${projectsId}/milestones`}>里程碑</NavLink>
</p> </p>
) )

4
src/forge/Order/Tags.js
View File

@ -324,11 +324,11 @@ class Tags extends Component {
data && data.issue_tags && data.issue_tags.length > 0 ? data && data.issue_tags && data.issue_tags.length > 0 ?
<div> <div>
<div className="topWrapper"> <div className="topWrapper">
<span>共{data && data.issue_tags_count}个标签</span> <span>共{data && data.issue_tags_count}个标记</span>
<ul className="topWrapper_select"> <ul className="topWrapper_select">
<li> <li>
<Dropdown className="topWrapperSelect" overlay={this.menu()} trigger={['click']} placement="bottomCenter"> <Dropdown className="topWrapperSelect" overlay={this.menu()} trigger={['click']} placement="bottomCenter">
<span>标签<Icon type="caret-down" className="ml5" /></span> <span>标记<Icon type="caret-down" className="ml5" /></span>
</Dropdown> </Dropdown>
</li> </li>
</ul> </ul>

8
src/forge/Order/order.js
View File

@ -39,7 +39,7 @@ class order extends Component {
search_count: undefined, search_count: undefined,
issue_type: undefined, issue_type: undefined,
status_type: "1", // 默认显示开启中的 status_type: "1", // 默认显示开启中的
issue_tag_ids: "标签", issue_tag_ids: "标记",
tracker_ids: "类型", tracker_ids: "类型",
author_ids: "发布人", author_ids: "发布人",
assigned_to_ids: "负责人", assigned_to_ids: "负责人",
@ -58,7 +58,7 @@ class order extends Component {
select_params: { select_params: {
assigned_to_id: undefined, // 负责人 assigned_to_id: undefined, // 负责人
author_id: undefined, // 发布人 author_id: undefined, // 发布人
issue_tag_id: undefined, // 标签 issue_tag_id: undefined, // 标记
tracker_id: undefined, //类型 tracker_id: undefined, //类型
done_ratio: undefined, // 完成度 done_ratio: undefined, // 完成度
status_id: undefined, // 优先级 status_id: undefined, // 优先级
@ -257,7 +257,7 @@ class order extends Component {
author_id: undefined, author_id: undefined,
assigned_to_id: undefined, assigned_to_id: undefined,
status_type: type, status_type: type,
issue_tag_ids: "标签", issue_tag_ids: "标记",
tracker_ids: "类型", tracker_ids: "类型",
author_ids: "发布人", author_ids: "发布人",
assigned_to_ids: "负责人", assigned_to_ids: "负责人",
@ -677,7 +677,7 @@ class order extends Component {
className="topWrapperSelect" className="topWrapperSelect"
overlay={this.renderMenu( overlay={this.renderMenu(
issue_chosen && issue_chosen.issue_tag, issue_chosen && issue_chosen.issue_tag,
"标签", "标记",
"issue_tag_id" "issue_tag_id"
)} )}
trigger={["click"]} trigger={["click"]}

2
src/forge/Settings/Setting.js
View File

@ -298,7 +298,6 @@ class Setting extends Component {
rules: [], rules: [],
})( })(
<Select> <Select>
<Option key={0} value={""}>未选择项目类别</Option>
{CategoryList} {CategoryList}
</Select> </Select>
)} )}
@ -308,7 +307,6 @@ class Setting extends Component {
rules: [], rules: [],
})( })(
<Select> <Select>
<Option key={0} value={""}>未选择项目语言</Option>
{LanguageList} {LanguageList}
</Select> </Select>
)} )}

4
src/forge/Settings/Webhooks/New.jsx
View File

@ -258,11 +258,11 @@ function New({ form , match , showNotification , history }) {
</span> */} </span> */}
<span> <span>
<Checkbox value="create">创建</Checkbox> <Checkbox value="create">创建</Checkbox>
<span>创建分支或标签</span> <span>创建分支或标记</span>
</span> </span>
<span> <span>
<Checkbox value="delete">删除</Checkbox> <Checkbox value="delete">删除</Checkbox>
<span>删除分支或标签</span> <span>删除分支或标记</span>
</span> </span>
</div> </div>
<p className="color-grey-3 mt10 mb10">合并请求事件</p> <p className="color-grey-3 mt10 mb10">合并请求事件</p>

8
src/forge/Source/AddTag.jsx
View File

@ -21,7 +21,7 @@ function AddTag({form , visible , onCancel ,onOk}){
}; };
return( return(
<Modal <Modal
title={"新增标签"} title={"新增标记"}
closable={false} closable={false}
visible={visible} visible={visible}
onCancel={onCancel} onCancel={onCancel}
@ -32,11 +32,11 @@ function AddTag({form , visible , onCancel ,onOk}){
centered centered
> >
<Form {...layout}> <Form {...layout}>
<Form.Item label="标签名"> <Form.Item label="标记名">
{getFieldDecorator("tagName",{ {getFieldDecorator("tagName",{
rules:[{required:true,message:"请输入标签名"}] rules:[{required:true,message:"请输入标记名"}]
})( })(
<Input placeholder="请输入标签名" width="200px" autoComplete="off" /> <Input placeholder="请输入标记名" width="200px" autoComplete="off" />
)} )}
</Form.Item> </Form.Item>
</Form> </Form>

2
src/forge/Source/Index.jsx
View File

@ -141,7 +141,7 @@ function Index(props){
params:{id,tagName:tag} params:{id,tagName:tag}
}).then(result=>{ }).then(result=>{
if(result && result.data){ if(result && result.data){
props.showNotification("标签删除成功"); props.showNotification("标记删除成功");
setIsSpin(true); setIsSpin(true);
getData(); getData();
} }

2
src/forge/comments/comments.js
View File

@ -198,7 +198,7 @@ class comments extends Component {
</span> </span>
<span> <span>
{item.value && item.value.length > 0 ? ( {item.value && item.value.length > 0 ? (
item.detail === "标签" ? ( (item.detail === "标签" || item.detail === "标记") ? (
<span <span
className="issue-tag-show" className="issue-tag-show"
style={{ background: item.value[0].color }} style={{ background: item.value[0].color }}