Merge branch 'develop'

2021-06-25 18:21:48 +08:00 · 2021-06-25 18:21:48 +08:00 · 777dbd0f43
parent b44b6530e5 79996bd185
commit 777dbd0f43
17 changed files with 135 additions and 91 deletions
--- a/src/forge/Component/DrawerPanel.jsx
+++ b/src/forge/Component/DrawerPanel.jsx
@ -71,7 +71,7 @@ function DrawerPanel({visible,onClose,branch,owner,projectsId,history, name , li
    let dataref = event.node.props.dataRef;
    if(dataref.type==="file"){
      onClose();
-      history.push(`/projects/${owner}/${projectsId}/tree/${branch}/${dataref.path}`);
+      history.push(`/projects/${owner}/${projectsId}/tree/${branch.replaceAll("/","%2F")}/${dataref.path}`);
    }
  }

--- a/src/forge/DevOps/Dispose/List.jsx
+++ b/src/forge/DevOps/Dispose/List.jsx
@ -66,7 +66,7 @@ function List({ list, operate , projectsId , owner , showModal , deleteFunc }){
      ellipsis:true,
      render:(value,item)=>{
        return(
-          <Link to={`/projects/${owner}/${projectsId}/tree/${item.branch}/${value}`} className="color-blue">{value}</Link>
+          <Link to={`/projects/${owner}/${projectsId}/tree/${item.branch.replaceAll("/","%2F")}/${value}`} className="color-blue">{value}</Link>
        )
      }
    },
--- a/src/forge/Head/header.scss
+++ b/src/forge/Head/header.scss
@ -33,7 +33,7 @@
  li{
    height: 40px;
    line-height: 40px;
-    padding:0px;
+    padding:0px!important;
    cursor: default;
    &:hover{
      background-color: #fff;
--- a/src/forge/Main/CoderDepot.jsx
+++ b/src/forge/Main/CoderDepot.jsx
@ -50,7 +50,8 @@ function CoderDepot(props){

  const owner = props.match.params.owner;
  const projectsId = props.match.params.projectsId;
-  const branchName = props.match.params.branchName;
+  let branchName = props.match.params.branchName;
+  branchName = branchName && branchName.replaceAll("%2F",'/');
  const details = props.projectDetail;
  let pathname = props.history.location.pathname;

@ -75,8 +76,9 @@ function CoderDepot(props){

  useEffect(()=>{
    if (projectsId && owner && defaultBranch){
-      if(pathname.indexOf(`/projects/${owner}/${projectsId}`) > -1 && pathname.indexOf(`/tree/${branchName}/`) > -1) {
-        let url = pathname.split(`/tree/${branchName}/`)[1];
+      let b = branchName && branchName.replaceAll("/","%2F");
+      if(pathname.indexOf(`/projects/${owner}/${projectsId}`) > -1 && pathname.indexOf(`/tree/${b}/`) > -1) {
+        let url = pathname.split(`/tree/${b}/`)[1];
        setTreeValue(url);
        getFileInfo(url,branchName);
        setType("file");
@ -92,6 +94,7 @@ function CoderDepot(props){
  function getDirInfo(branch){
    setIsSpin(true);
    const url = `/${owner}/${projectsId}/entries.json`;
+
    axios.get(url, { 
      params: { ref: branch } 
    }).then((result) => {
@ -158,17 +161,20 @@ function CoderDepot(props){

  // 切换分支或者标签
  function changeBranch(value){
-    let url = `/projects/${owner}/${projectsId}${value && `/tree/${value}`}${treeValue ? `/${treeValue}`:""}`;
+    let url = `/projects/${owner}/${projectsId}${value && `/tree/${value.replaceAll("/","%2F")}`}${treeValue ? `/${treeValue}`:""}`;
    props.history.push(url);
  }
    
  // 文件相关的下拉项
-  const fileMenu =(
+  function fileMenu(){
+    let b = branchName || defaultBranch;
+    return (
    <Menu>
-      <Menu.Item><a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/${branchName || defaultBranch}/uploadfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>上传文件</a></Menu.Item>
-      <Menu.Item><a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/${branchName || defaultBranch}/newfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>新建文件</a></Menu.Item>
+      <Menu.Item><a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/${b.replaceAll("/","%2F")}/uploadfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>上传文件</a></Menu.Item>
+      <Menu.Item><a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/${b.replaceAll("/","%2F")}/newfile${treeValue === undefined ? "" : `/${treeValue}`}`)}>新建文件</a></Menu.Item>
    </Menu>
-  )
+    )
+  }

  function getPathUrl(array,index){
    if(array && array.length>0 && index){
@ -183,16 +189,18 @@ function CoderDepot(props){
  function returnMain(){
    setTreeValue(undefined);
    let branch = branchName || defaultBranch;
-    props.history.push(`/projects/${owner}/${projectsId}/tree/${branch}`);
+    props.history.push(`/projects/${owner}/${projectsId}/tree/${branch.replaceAll("/","%2F")}`);
  };
  // 子目录路径返回链接
  function returnUlr(url){
-    props.history.push(`/projects/${owner}/${projectsId}/tree${branchName?`/${branchName}`:""}/${url}`);
+    let enBranch = branchName && branchName.replaceAll("/","%2F");
+    props.history.push(`/projects/${owner}/${projectsId}/tree${enBranch?`/${enBranch}`:""}/${url}`);
  }
  // 点击跳转到子目录
  function goToSubRoot(path,type,filename){
+    let enBranch = branchName || defaultBranch;
    setType(type);
-    props.history.push(`/projects/${owner}/${projectsId}${`/tree/${branchName || defaultBranch}`}${path?`/${path}`:""}`);
+    props.history.push(`/projects/${owner}/${projectsId}${`/tree/${enBranch.replaceAll("/","%2F")}`}${path?`/${path}`:""}`);
  }

  function onEdit(readOnly){
@ -317,7 +325,7 @@ function CoderDepot(props){
                        <a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/issues/new`)} >+ 任务</a>
                      </div>
                      { fileOperate &&
-                        <Dropdown overlay={fileMenu} className="mr20" trigger={['click']}>
+                        <Dropdown overlay={fileMenu()} className="mr20" trigger={['click']}>
                          <Button type="default">文件 <i className="iconfont icon-sanjiaoxing-down ml3 font-14 color-grey-9"></i></Button>
                        </Dropdown>
                      }
--- a/src/forge/Main/CoderRootBranch.js
+++ b/src/forge/Main/CoderRootBranch.js
@ -32,7 +32,7 @@ export default ((props)=>{
              return(
                <li key={key}>
                  <div>
-                    <Link to={`/projects/${owner}/${projectsId}/tree/${item.name}`} className="color-blue font-15" style={{"maxWidth":"100px"}}>{item.name}</Link>
+                    <Link to={`/projects/${owner}/${projectsId}/tree/${item.name.replaceAll("/","%2F")}`} className="color-blue font-15" style={{"maxWidth":"100px"}}>{item.name}</Link>
                    <p className="f-wrap-alignCenter mt15">
                      <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.last_commit.sha}`)}`} className="mr5 commitKey" style={{marginLeft:0}}>{item.last_commit && truncateCommitId(item.last_commit.sha)}</Link>
                      <span className="color-grey-3 hide-1 messages leftPoint">{item.last_commit && item.last_commit.message}</span>
--- a/src/forge/Main/CoderRootCommit.js
+++ b/src/forge/Main/CoderRootCommit.js
@ -2,6 +2,7 @@ import React , { Component } from 'react';
 import { Spin , Pagination } from 'antd';
 import { getImageUrl } from 'educoder';
 import { truncateCommitId } from '../common/util';
+import { AlignTop } from '../Component/layout';
 import SelectBranch from '../Branch/Select';
 import Nodata from '../Nodata';

@ -132,10 +133,10 @@ class CoderRootCommit extends Component{
                  commitDatas && commitDatas.length > 0 && commitDatas.map((item,k)=>{
                    return(
                      <div key={k}>
-                        <p className="f-wrap-alignCenter">
-                          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitKey" style={{marginLeft:0}}>{truncateCommitId(`${item.sha}`)}</Link>
-                          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="flex1 ml20 font-16 color-grey-3">{item.message}</Link>
-                        </p>
+                        <AlignTop>
+                          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitKey" style={{marginLeft:0,marginTop:"3px"}}>{truncateCommitId(`${item.sha}`)}</Link>
+                          <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="commitDesc">{item.message}</Link>
+                        </AlignTop>
                        <p className="f-wrap-alignCenter mt15">
                          {
                            item.id ?
--- a/src/forge/Merge/MergeItem.js
+++ b/src/forge/Merge/MergeItem.js
@ -43,7 +43,7 @@ class MergeItem extends Component {
  };

  render() {
-    const { issues, project_name, project_author_name } = this.props;
+    const { issues, project_name, project_author_name , user_admin_or_member} = this.props;
    const { projectsId , owner } = this.props.match.params;
    const { current_user } = this.props;
    const renderList = () => {
@ -99,33 +99,43 @@ class MergeItem extends Component {
                    </span>
                    <span className="color-grey-8">{item.pr_time}</span>
                    <span className="ml15">
-                      <Tag className="pr-branch-tag">
-                        <Link
-                          to={`/projects/${item.is_original ? item.fork_project_user : owner}/${ item.is_original ? item.fork_project_identifier : projectsId }/tree/${item.pull_request_head}`}
-                          className="maxW200px hide-1 ver-middle"
-                        >
-                          {item.is_original
-                            ? item.fork_project_user
-                            : project_author_name}
-                          :{item.pull_request_head}
-                        </Link>
-                      </Tag>
-                      <span className="mr8 ver-middle">
-                        <i
-                          className={
-                            "iconfont icon-youjiang color-grey-c font-16"
-                          }
-                        ></i>
-                      </span>
-                      <Tag className="pr-branch-tag">
-                        <Link
-                          to={`/projects/${owner}/${projectsId}/tree/${item.pull_request_base}`}
-                          className="maxW200px hide-1 ver-middle"
-                        >
-                          {/* {item.is_fork ? item.pull_request_base : `${item.author_name}:${item.pull_request_base}`} */}
-                          {project_author_name}:{item.pull_request_base}
-                        </Link>
-                      </Tag>
+                      {
+                        item.pull_request_head &&
+                        <Tag className="pr-branch-tag">
+                          <Link
+                            to={`/projects/${item.is_original ? item.fork_project_user : owner}/${ item.is_original ? item.fork_project_identifier : projectsId }/tree/${item.pull_request_head.replaceAll("/","%2F")}`}
+                            className="maxW200px hide-1 ver-middle"
+                          >
+                            {item.is_original
+                              ? item.fork_project_user
+                              : project_author_name}
+                            :{item.pull_request_head}
+                          </Link>
+                        </Tag>
+                      }
+                      {
+                        item.pull_request_base && 
+                        <span className="mr8 ver-middle">
+                          <i
+                            className={
+                              "iconfont icon-youjiang color-grey-c font-16"
+                            }
+                          ></i>
+                        </span>
+                      }
+                      {
+                        item.pull_request_base && 
+                        <Tag className="pr-branch-tag">
+                          <Link
+                            to={`/projects/${owner}/${projectsId}/tree/${item.pull_request_base.replaceAll("/","%2F")}`}
+                            className="maxW200px hide-1 ver-middle"
+                          >
+                            {/* {item.is_fork ? item.pull_request_base : `${item.author_name}:${item.pull_request_base}`} */}
+                            {project_author_name}:{item.pull_request_base}
+                          </Link>
+                        </Tag>
+                      }
+                      
                    </span>
                  </AlignCenter>
                </p>
@ -167,7 +177,7 @@ class MergeItem extends Component {
                    ) : (
                      ""
                    )}
-                    {current_user && current_user.login ? (
+                    {user_admin_or_member ? (
                      <div
                        className="milepostleft"
                        style={{
--- a/src/forge/Merge/MessageCount.js
+++ b/src/forge/Merge/MessageCount.js
@ -41,6 +41,7 @@ class MessageCount extends Component {
      edit_spin: false,
      pr_status: undefined,
      pull_request:undefined,
+      conflict_files:[],

      copyVisible:false,
    };
@ -75,7 +76,8 @@ class MessageCount extends Component {
            data: result.data,
            SpinFlag: false,
            pr_status: result.data.pull_request && result.data.pull_request.status,
-            pull_request:result.data.pull_request
+            pull_request:result.data.pull_request,
+            conflict_files:result.data.conflict_files
          });
        } else {
          this.setState({ SpinFlag: false });
@ -263,13 +265,28 @@ class MessageCount extends Component {
      </div>
    )
  }
-  mergeabledDesc=(base,head)=>{
+  mergeabledDesc=(base,head,conflict_files)=>{
    return(
-      <ul id="descContent">
-        <li>git fetch origin</li>
-        <li>git checkout -b {`${base}`} origin/{`${base}`}</li>
-        <li>git merge {`${head}`}</li>
-      </ul>
+      <div>
+        <ul id="descContent">
+          <li>git fetch origin</li>
+          <li>git checkout -b {`${base}`} origin/{`${base}`}</li>
+          <li>git merge {`${head}`}</li>
+        </ul>
+        {
+          conflict_files && conflict_files.length>0 && 
+          <div>
+            <p className="mt10 font-16 pt10" style={{borderTop:"1px solid #f9d7d5"}}>如下文件有代码冲突：</p>
+            <p>
+              {
+                conflict_files.map((i,k)=>{
+                  return k>0 ? "，"+i : i
+                })
+              }
+            </p>
+          </div>
+        }
+      </div>
    )
  }

@ -284,7 +301,8 @@ class MessageCount extends Component {
      ismesrge,
      SpinFlag,
      copyVisible,
-      pull_request
+      pull_request,
+      conflict_files
    } = this.state;
    const { current_user, projectDetail } = this.props;
    const menu = (
@ -337,10 +355,10 @@ class MessageCount extends Component {
                      <div className="mt15">
                        <Tag className="pr-branch-tag">
                          <Link
-                            to={`/projects/${owner}/${data.pull_request.is_original?data.project_identifier:projectsId}/tree/${data.pull_request.head}`}
+                            to={`/projects/${owner}/${data.pull_request.is_original?data.project_identifier:projectsId}/tree/${data.pull_request.head && data.pull_request.head.replaceAll("/","%2F")}`}
                            className="ver-middle"
                          >
-                            {data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}:{data.pull_request.head}
+                            {data.pull_request.is_original ? data.pull_request.fork_project_user : data.issue.project_author_name}:{data.pull_request.head && data.pull_request.head.replaceAll("/","%2F")}
                          </Link>
                        </Tag>
                        <span className="mr8 ver-middle">
@ -495,7 +513,7 @@ class MessageCount extends Component {
                        <Alert
                          message={this.mergeabledMes()}
                          type="error"
-                          description={this.mergeabledDesc(pull_request.base,pull_request.head)}
+                          description={this.mergeabledDesc(pull_request.base,pull_request.head,conflict_files)}
                          showIcon
                        />
                      }
--- a/src/forge/Merge/merge.js
+++ b/src/forge/Merge/merge.js
@ -155,7 +155,7 @@ class merge extends Component {

  renderMenu = (array, name, id) => {
    return (
-      <Menu>
+      <Menu className="orderCondition">
        <Menu.Item key={"all"} onClick={(e) => this.getOption(e, id, name)}>
          {name}
        </Menu.Item>
@ -214,14 +214,9 @@ class merge extends Component {
    this.getIssueList();
  };

-  islogin() {
+  checkOperation() {
    const { projectsId,owner } = this.props.match.params;
-    if (this.props.checkIfLogin() === false) {
-      this.props.showLoginDialog();
-      return;
-    } else {
-      this.props.history.push(`/projects/${owner}/${projectsId}/pulls/new`);
-    }
+    this.props.history.push(`/projects/${owner}/${projectsId}/pulls/new`);
  }
  render() {
    const { projectsId , owner } = this.props.match.params;
@ -263,9 +258,12 @@ class merge extends Component {
              style={{ width: 300 }}
            />
          </div>
-          <a className="topWrapper_btn ml10" onClick={() => this.islogin()}>
-            +&nbsp;新建合并请求
-          </a>
+          {
+            data && data.user_admin_or_member &&
+            <a className="topWrapper_btn ml10" onClick={() => this.checkOperation()}>
+              +&nbsp;新建合并请求
+            </a>
+          }
        </div>
        <div className="f-wrap-between screenWrap">
          <div className="df">
@ -402,6 +400,7 @@ class merge extends Component {
                  project_author_name={data.project_author_name}
                  {...this.props}
                  {...this.state}
+                  user_admin_or_member={data && data.user_admin_or_member}
                ></OrderItem>
              </div>
            ):""}
--- a/src/forge/Newfile/UserSubmitComponent.js
+++ b/src/forge/Newfile/UserSubmitComponent.js
@ -59,7 +59,7 @@ class UserSubmitComponent extends Component {
        const url = `/${owner}/${projectsId}/create_file.json`;
        axios.post(url, {
          filepath: filename ? filename : path,
-          branch: branch,
+          branch: branch && branch.replaceAll("%2F","/"),
          new_branch: submitType === "1" ? values.branchname : undefined,
          content,
          message: values.desc,
@ -72,7 +72,7 @@ class UserSubmitComponent extends Component {
              const { getTopCount } = this.props;
              getTopCount && getTopCount(values.branchname);
            }
-            let url = `/projects/${owner}/${projectsId}${values.branchname ? `/tree/${values.branchname}`: (branch ? `/tree/${branch}` : "")}`;
+            let url = `/projects/${owner}/${projectsId}${values.branchname ? `/tree/${values.branchname.replaceAll('/',"%2F")}`: (branch ? `/tree/${branch.replaceAll('/',"%2F")}` : "")}`;
            this.props.history.push(url);
          }
        })
@ -93,12 +93,13 @@ class UserSubmitComponent extends Component {
    const { projectsId , owner } = this.props.match.params;
    const { submitType } = this.state;
    const url = `/${owner}/${projectsId}/update_file.json`;
+    let b = currentBranch || branch;
    this.props.form.validateFieldsAndScroll((err, values) => {
      if (!err) {
        axios
          .put(url, {
            filepath: detail.path,
-            branch: submitType === "1" ? undefined : (currentBranch || branch),
+            branch: submitType === "1" ? undefined : b.replaceAll('%2F',"/"),
            new_branch: submitType === "1" ? values.branchname : undefined,
            content: content,
            sha: detail.sha,
@ -107,7 +108,8 @@ class UserSubmitComponent extends Component {
          .then((result) => {
            this.setState({ isSpin: false });
            if (result.data && result.data.status === 1) {
-              let url = `/projects/${owner}/${projectsId}${(values.branchname ? `/tree/${values.branchname}` : ((currentBranch || branch) ? `/tree/${currentBranch || branch}`:""))}`;
+              let b = currentBranch || branch;
+              let url = `/projects/${owner}/${projectsId}${(values.branchname ? `/tree/${values.branchname.replaceAll('/',"%2F")}` : (b ? `/tree/${b.replaceAll('/',"%2F")}`:""))}`;
              this.props.history.push(url);
              this.props.showNotification("文件修改成功!");
            }
@ -130,6 +132,7 @@ class UserSubmitComponent extends Component {

    const { current_user, filepath, projectDetail , currentBranch } = this.props;
    const { editor_type } = this.props;
+    let b = currentBranch || branch;
    return (
      <div>
        <span className="df" style={{ alignItems: "center" }}>
@ -188,7 +191,7 @@ class UserSubmitComponent extends Component {
                >
                  <Radio value="0" className="mb10">
                    <i className="iconfont icon-banbenku font-16 mr5"></i>
-                    直接提交至<span className="color-orange">{currentBranch || branch}</span>分支
+                    直接提交至<span className="color-orange">{b.replaceAll('%2F',"/")}</span>分支
                  </Radio>
                  <Radio value="1">
                    <Icon type="pull-request" className="mr5" />
--- a/src/forge/Order/Detail.js
+++ b/src/forge/Order/Detail.js
@ -249,7 +249,7 @@ class Detail extends Component {
                      添加于 {data && data.created_at}
                    </span>
                    {data && data.user_permission ? (
-                      <span className="pull-right">
+                      <span className="pull-right 123123">
                        <a className="color-blue fr" onClick={this.copydetail}>
                          复制
                        </a>
--- a/src/forge/Order/Milepost.js
+++ b/src/forge/Order/Milepost.js
@ -153,7 +153,7 @@ class Milepost extends Component {
    const { data, limit, page, openselect, closeselect, spinings } = this.state;
    const { projectsId , owner } = this.props.match.params;
    const menu = (
-      <Menu onClick={this.arrayList}>
+      <Menu className="orderCondition" onClick={this.arrayList}>
        <Menu.Item key={'created_on'} value="desc">到期日从近到远</Menu.Item>
        <Menu.Item key={'created_on'} value="asc">到期日从远到近</Menu.Item>
        <Menu.Item key={'percent'} value="desc">完成度从低到高</Menu.Item>
--- a/src/forge/Order/MilepostDetail.js
+++ b/src/forge/Order/MilepostDetail.js
@ -162,7 +162,7 @@ class MilepostDetail extends Component {

  renderMenu = (array, name, id) => {
    return (
-      <Menu>
+      <Menu className="orderCondition">
        <Menu.Item key={"all"} onClick={(e) => this.getOption(e, id, name)}>{name}</Menu.Item>
        {
          array && array.length > 0 && array.map((item, key) => {
--- a/src/forge/Order/OrderItem.js
+++ b/src/forge/Order/OrderItem.js
@ -42,10 +42,9 @@ class OrderItem extends Component {
    })
  }
  render() {
-    const { item , checkbox , mile } = this.props;
+    const { item , checkbox , mile , user_admin_or_member } = this.props;
    const { projectsId , owner } = this.props.match.params;
-    const { current_user } = this.props
-
+    const { current_user } = this.props;
    return (
      item &&
      <div className="issueItem">
@ -91,7 +90,7 @@ class OrderItem extends Component {
            <div className="milepostleft">
              <Link to={`/projects/${owner}/${projectsId}/issues/${item.id}/detail`}><i className="iconfont icon-pinglun1 mr3 font-16"></i>{item.journals_count}</Link>
              {
-                current_user && current_user.login ?
+                user_admin_or_member ?
                <div id="hoverBox" style={{ display: this.state.orderid === item.id && this.state.isdisplay ? 'flex' : 'none' }}>
                  <div className="mr8 ml8 color-grey-9">
                    <Link to={`/projects/${owner}/${projectsId}/issues/${item.id}/updatedetail`} className="color-grey-9"><i className="iconfont icon-bianji3 font-14 mr5"></i></Link>
--- a/src/forge/Order/order.css
+++ b/src/forge/Order/order.css
@ -592,7 +592,7 @@ a.issue-type-button.active:hover {
 }

 /* 发布人、指派人数量过多时要出现滚动条 */
-.ant-dropdown-menu {
+.ant-dropdown-menu.orderCondition {
  max-height: 350px;
  overflow-y: auto;
 }
--- a/src/forge/Order/order.js
+++ b/src/forge/Order/order.js
@ -201,7 +201,7 @@ class order extends Component {

  renderMenu = (array, name, id, toGet) => {
    return (
-      <Menu>
+      <Menu className="orderCondition">
        <Menu.Item key={"all"} onClick={(e) => this.getOption(e, id, name, toGet)}>
          {name}
        </Menu.Item>
@ -347,17 +347,14 @@ class order extends Component {
    this.props.showLoginDialog();
  }
  renderNew =()=>{
-    const { projectsId , owner } = this.props.match.params;
-    if (this.props.checkIfLogin()) {
+    const { data } = this.state;
+    if(data && data.user_admin_or_member){
+      const { projectsId , owner } = this.props.match.params;
      return(
        <Link className="topWrapper_btn ml10" target="_blank" to={`/projects/${owner}/${projectsId}/issues/new`}>
          +&nbsp;创建易修
        </Link>
      )
-    }else{
-      return(
-        <a className="topWrapper_btn ml10" onClick={this.islogin}>+&nbsp;创建易修</a>
-      )
    }
  }

@ -828,6 +825,7 @@ class order extends Component {
                        {...this.props}
                        {...this.state}
                        deletedetail={this.deletedetail}
+                        user_admin_or_member={data && data.user_admin_or_member}
                      ></OrderItem>
                    )
                  })}
--- a/src/forge/css/index.scss
+++ b/src/forge/css/index.scss
@ -87,6 +87,14 @@ ul,ol,dl{
  flex-wrap: wrap;
  align-items: center;
 }
+.commitDesc{
+  flex:1;
+  margin-left:20px;
+  font-size:16px;
+  color:#333;
+  line-height:26px;
+  word-break: break-all;
+}

 .normalBox{
  border-radius: 4px;