Merge pull request 'issue - 易修、合并请求标题长度和显示样式' (#181) from caishi/forgeplus-react:pre_develop_dev into pre_develop_dev

This commit is contained in:
jasder 2021-10-18 11:46:58 +08:00
commit 14df994cd6
5 changed files with 8 additions and 10 deletions

View File

@ -64,7 +64,7 @@ class MergeItem extends Component {
<Link <Link
to={`/${owner}/${projectsId}/pulls/${item.pull_request_id}`} to={`/${owner}/${projectsId}/pulls/${item.pull_request_id}`}
className="hide-1 font-15 color-grey-3 fwb lineh-30 mr10" className="hide-1 font-15 color-grey-3 fwb lineh-30 mr10"
style={{ maxWidth: "300px" }} style={{ maxWidth: "600px" }}
> >
{item.name} {item.name}
</Link> </Link>

View File

@ -340,11 +340,11 @@ class MessageCount extends Component {
<div> <div>
<div className="main"> <div className="main">
<div> <div>
<div className="grid-item-top pb20 border-1f"> <div className="pb20 border-1f df">
<div> <div className="flex1">
<div className="ver-middle"> <div className="ver-middle">
<span className="mr10 ver-middle"> <span className="mr10 ver-middle">
<span className="font-18 fwb"> <span className="font-18 fwb" style={{wordBreak:"break-all"}}>
{data.issue.subject} {data.issue.subject}
</span> </span>
</span> </span>
@ -445,8 +445,7 @@ class MessageCount extends Component {
</span> </span>
</div> </div>
</div> </div>
<div className="ml10"> <div className="ml10 text-right">
<div className="mt15 text-right" style={{display:"flex",justifyContent:"flex-end"}}>
{operate && ( {operate && (
<Button <Button
type="green" type="green"
@ -469,7 +468,6 @@ class MessageCount extends Component {
</Button> </Button>
)} )}
</div> </div>
</div>
</div> </div>
{ {
data.issue.description ? data.issue.description ?

View File

@ -265,7 +265,7 @@ class MergeForm extends Component {
}, },
], ],
initialValue: title, initialValue: title,
})(<Input placeholder="标题" maxLength={50} />)} })(<Input placeholder="标题" maxLength={200} />)}
</Form.Item> </Form.Item>
<MDEditor <MDEditor
placeholder={"请输入合并请求的描述..."} placeholder={"请输入合并请求的描述..."}

View File

@ -233,7 +233,7 @@ class Detail extends Component {
: "合并请求"} : "合并请求"}
</span> </span>
<span className="font-16 fwb">{data && data.subject}</span> <span className="font-16 fwb" style={{wordBreak:"break-all"}}>{data && data.subject}</span>
</span> </span>
{data && data.priority && ( {data && data.priority && (

View File

@ -320,7 +320,7 @@ class order_form extends Component {
message: "请填写易修标题", message: "请填写易修标题",
}, },
] ]
})(<Input placeholder="标题" size="large" maxLength={80}/>)} })(<Input placeholder="标题" size="large" maxLength={200}/>)}
</Form.Item> </Form.Item>
<div className="quillContent"> <div className="quillContent">
<MDEditor <MDEditor