Nigel
/
forgeplus-react
forked from Gitlink/forgeplus-react
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

易修改为疑修

This commit is contained in:
caishi 2021-12-17 15:49:52 +08:00
parent 80e20a9cca
commit c3cc105468
14 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/forge/AboutUs/AboutUs.jsx
View File

@ -128,7 +128,7 @@ function AboutUs(){
<div className="feat_fun_img"><img src={fun2} /></div>
<div>
<p>一站式过程管理</p>
<div>支持易修、里程碑、&nbsp;&nbsp;&nbsp;<br />通知提醒、标签归档、Wiki文档、组织管理&nbsp;&nbsp;&nbsp;</div>
<div>支持疑修、里程碑、&nbsp;&nbsp;&nbsp;<br />通知提醒、标签归档、Wiki文档、组织管理&nbsp;&nbsp;&nbsp;</div>
</div>
</div>
</td>

6
src/forge/Activity/Activity.js
View File

@ -152,7 +152,7 @@ class Activity extends Component{
<p className="percent_red" style={{width:`${third_per}`}}></p>
<p className="percent_green" style={{width:`${fourth_per}`}}></p>
</div>
<span>{data && data.issues_count}易修</span>
<span>{data && data.issues_count}疑修</span>
</div>
</div>
<ul className="percentBox">
@ -166,11 +166,11 @@ class Activity extends Component{
</li>
<li>
<span className="red">{data && data.close_issues_count}</span>
<span className={type==="Issue"&& status==="delay" ?`change active`:"change"} onClick={()=>this.changeTrends("Issue","delay")}>已关闭的易修</span>
<span className={type==="Issue"&& status==="delay" ?`change active`:"change"} onClick={()=>this.changeTrends("Issue","delay")}>已关闭的疑修</span>
</li>
<li>
<span className="green">{data && data.open_issues_count}</span>
<span className={type==="Issue"&& status==="not_delay" ?`change active`:"change"} onClick={()=>this.changeTrends("Issue","not_delay")}>未处理的易修</span>
<span className={type==="Issue"&& status==="not_delay" ?`change active`:"change"} onClick={()=>this.changeTrends("Issue","not_delay")}>未处理的疑修</span>
</li>
</ul>
</div>

4
src/forge/Main/CoderDepot.jsx
View File

@ -455,10 +455,10 @@ function CoderDepot(props){
baseOperate &&
<CheckProfile {...props} sureFunc={()=>urlLink(`/${owner}/${projectsId}/compare/master...${branchName || defaultBranch}`)} >+ 合并请求</CheckProfile>
}
<a onClick={createIssue}>+ 易修</a>
<a onClick={createIssue}>+ 疑修</a>
{/* {
baseOper &&
<CheckProfile {...props} sureFunc={()=>urlLink(`/${owner}/${projectsId}/issues/new`)} >+ 易修</CheckProfile>
<CheckProfile {...props} sureFunc={()=>urlLink(`/${owner}/${projectsId}/issues/new`)} >+ 疑修</CheckProfile>
} */}
</div>
}

2
src/forge/Main/sub/DetailBanner.jsx
View File

@ -50,7 +50,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
<Link to={{ pathname: `/${owner}/${projectsId}/issues`, state }}>
<Tooltip placement="bottom">
<i className={"iconfont icon-yixiuicon1 color-grey-3 mr5 font-14"}></i>
<span>易修(Issue)</span>
<span>疑修(Issue)</span>
</Tooltip>
{projectDetail && projectDetail.issues_count ? <span className="num">{numFormat(projectDetail.issues_count)}</span> : ""}
</Link>

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

@ -246,9 +246,9 @@ class MilepostDetail extends Component {
}
{
current_user && current_user.login ?
<CheckProfile {...this.props} sureFunc={()=>{this.props.history.push(`/${owner}/${projectsId}/issues/${meilid}/new`)}} className="topWrapper_btn">创建易修</CheckProfile>
<CheckProfile {...this.props} sureFunc={()=>{this.props.history.push(`/${owner}/${projectsId}/issues/${meilid}/new`)}} className="topWrapper_btn">创建疑修</CheckProfile>
:
<a className="topWrapper_btn" onClick={showLoginDialog}>创建易修</a>
<a className="topWrapper_btn" onClick={showLoginDialog}>创建疑修</a>
}
</div>
</FlexAJ>

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

@ -102,7 +102,7 @@ class OrderItem extends Component {
<Popconfirm
placement="bottom"
overlayClassName={orderid === item.id && isdisplay ? "overlayBox" : "overlayBox hideOverlay" }
title={'您确定要删除当前易修吗？'}
title={'您确定要删除当前疑修吗？'}
okText="是"
cancelText="否"
onConfirm={() => this.deletedetail(item.id)}

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

@ -357,9 +357,9 @@ class order extends Component {
renderNew =()=>{
return(
// <CheckProfile {...this.props} className="topWrapper_btn ml10" sureoncFunc={()=>{createIssue()}}>
// +&nbsp;创建易修
// +&nbsp;创建疑修
// </CheckProfile>
<a className="topWrapper_btn ml10" onClick={this.createIssue}>+&nbsp;创建易修</a>
<a className="topWrapper_btn ml10" onClick={this.createIssue}>+&nbsp;创建疑修</a>
)
}
@ -557,7 +557,7 @@ class order extends Component {
<div className="topWrapper" style={{borderBottom:"none"}}>
<div className="target-detail-search">
<Search
placeholder="输入关键字搜索易修"
placeholder="输入关键字搜索疑修"
enterButton
onSearch={this.searchFunc}
style={{ width: 300 }}

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

@ -362,14 +362,14 @@ class order_form extends Component {
<div className="list-right">
<div className="pd20">
<h3 className="mb15">
{form_type === "edit" ? "编辑" :( form_type === "copy" ? "复制" : "新建")}易修
{form_type === "edit" ? "编辑" :( form_type === "copy" ? "复制" : "新建")}疑修
</h3>
<Form.Item>
{getFieldDecorator("subject", {
rules: [
{
required: true,
message: "请填写易修标题",
message: "请填写疑修标题",
},
]
})(<Input placeholder="标题" size="large" maxLength={200}/>)}

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

@ -12,7 +12,7 @@ const { Option } = Select;
const menu = [
{name:"主页",index:"home"},
{name:"代码库",index:"code"},
{name:"易修 (Issue)",index:"issues"},
{name:"疑修 (Issue)",index:"issues"},
{name:"合并请求 (PR)",index:"pulls"},
{name:"引擎 (Engine)",index:"devops"},
// {name:"资源库",index:"resources"},
@ -180,7 +180,7 @@ class Setting extends Component {
const { projectsId , owner } = this.props.match.params;
const { projectName } = this.state;
this.props.confirm({
content: <span style={{display:"block",textAlign:"left"}}>该操作无法撤销！且将会一并删除相关的易修、合并请求、工作流、里程碑、动态等数据。<br/>是否确认删除 <span style={{fontWeight:"bold"}}>{owner}/{projectName}({projectsId})</span>？</span>,
content: <span style={{display:"block",textAlign:"left"}}>该操作无法撤销！且将会一并删除相关的疑修、合并请求、工作流、里程碑、动态等数据。<br/>是否确认删除 <span style={{fontWeight:"bold"}}>{owner}/{projectName}({projectsId})</span>？</span>,
onOk: () => {
const url = `/${owner}/${projectsId}.json`;
axios.delete(url).then((result) => {

4
src/forge/claims/claims.js
View File

@ -253,7 +253,7 @@ class claims extends React.Component {
{
claimerdata&&claimerdata.length>0?(
<div>
<span>声明要关注/解决此易修的用户</span><span className="infoCount">{claimerdata.length}</span>
<span>声明要关注/解决此疑修的用户</span><span className="infoCount">{claimerdata.length}</span>
<div className="attrPerson" onMouseLeave={()=>this.setVisibleFunc(false)}>
{claimerdata.map((item,key)=>{
return(
@ -266,7 +266,7 @@ class claims extends React.Component {
})}
</div>
</div>):(
<div><span>声明要关注/解决此易修的用户</span> <span className="infoCount">0</span></div>
<div><span>声明要关注/解决此疑修的用户</span> <span className="infoCount">0</span></div>
)}
</div>

4
src/forge/users/Echart/Line.jsx
View File

@ -21,7 +21,7 @@ function Line({data}) {
trigger: 'axis'
},
legend: {
data: ['提交数', '易修数', '合并请求数'],
data: ['提交数', '疑修数', '合并请求数'],
right: 'center',
bottom: '4%',
},
@ -62,7 +62,7 @@ function Line({data}) {
data: d.commits_count
},
{
name: '易修数',
name: '疑修数',
type: 'line',
data: d.issues_count
},

2
src/home/SecondEdition.jsx
View File

@ -145,7 +145,7 @@ function SecondEdition({setValue}) {
</div>
<div className="osRightMain">
<p className="osRightTitle">一站式过程管理</p>
<p>提供<span>易修（Issue）、里程碑、通知提醒、标签归档</span>等多样化任务管理工具，支持各类开发任务的发布、指派与跟踪；</p>
<p>提供<span>疑修（Issue）、里程碑、通知提醒、标签归档</span>等多样化任务管理工具，支持各类开发任务的发布、指派与跟踪；</p>
<p>同时提供<span>在线Wiki文档、组织多粒度管理</span>等功能，为您搭建一站式的项目过程管理环境；</p>
<p><span>让您的团队协作更高效、过程更透明！</span></p>
</div>

2
src/modules/search/index.jsx
View File

@ -217,7 +217,7 @@ const GlobalSearch = ({ location, showNotification, history }) => {
}
</TabPane> */}
<TabPane tab={`易修（${totalType5}）`} key="5">
<TabPane tab={`疑修（${totalType5}）`} key="5">
<div className="search-content">
<p>{`找到${totalType5}条结果`}</p>
<ItemList

2
src/modules/tpm/TPMBanner.js
View File

@ -1062,7 +1062,7 @@ class TPMBanner extends Component {
</div> :
<div className="task-popup-content">
<p className="task-popup-text-center font-16 mt10 mb10">
尚未创建易修的实训，不能申请发布
尚未创建疑修的实训，不能申请发布
</p>
</div>
}