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

update issue

This commit is contained in:
caishi 2021-08-02 15:32:51 +08:00
parent 47365c0bed
commit d67862156c
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,9 +42,10 @@ class NewMerge extends Component {
componentDidUpdate=(preProps)=>{ componentDidUpdate=(preProps)=>{
const { project } = this.props; const { project } = this.props;
const { pull } = this.state;
let oldProject = preProps.project; let oldProject = preProps.project;
if(project && oldProject && (oldProject.id !== project.id)){ if(project && oldProject && (oldProject.id !== project.id)){
this.compareProject(this.state.id,"master","master"); this.compareProject(this.state.id,pull,"master");
} }
} }
// 页面销毁取消监听 // 页面销毁取消监听
@ -78,7 +79,8 @@ class NewMerge extends Component {
this.set_default_pull(result.data.branches); this.set_default_pull(result.data.branches);
this.set_default_merge(result.data.merge_projects); this.set_default_merge(result.data.merge_projects);
} }
this.compareProject(result.data.id,"master","master"); const { pull } = this.state;
this.compareProject(result.data.id,pull||"master","master");
this.setState({isSpin: false}) this.setState({isSpin: false})
}) })
.catch((error) => { .catch((error) => {

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

@ -302,7 +302,7 @@ function New({ form , match , showNotification , history }) {
<Form.Item <Form.Item
label="分支过滤" label="分支过滤"
className="topLine" className="topLine"
help={'推送、创建，删除分支事件的分支白名单，使用 glob 模式匹配指定。若为空或 *，则将报告所有分支的事件。语法文档见github.com/gobwas/glob。示例：master,{master,release*}。'} help={<span>推送、创建，删除分支事件的分支白名单，使用 glob 模式匹配指定。若为空或 *，则将报告所有分支的事件。语法文档见<a href="github.com/gobwas/glob" target="_blank" className="hoverLine color-blue">github.com/gobwas/glob</a>。示例：master,{'{'}master,release*{'}'}。</span>}
colon={false} colon={false}
style={{marginTop:'15px'}} style={{marginTop:'15px'}}
> >