Merge pull request 'issue' (#518) from durian/forgeplus-react:gitlink_server_issue into gitlink_server_issue

src/forge/Issues/Component/comments/list.jsx

@@ -118,7 +118,7 @@ function IssueCommentList(props){
         </Radio.Group>
       </div>
       {/* 添加评论 */}
-      {category !== 'operate' && <div className="pt5 pb25">
+      {category !== 'operate' && <div className="pt5 pb30">
         {login ? showEdit === 1 ? <EditComment {...props} cancelMd={cancelMd}/> : <div className="addComments">
           <img src={getImageUrl(image_url)} alt="" />
           <div style={{flex:1}}>
@@ -232,8 +232,8 @@ function IssueCommentList(props){
       {totalCount>limit && <div className='mt20 paginationIssueComment mb20'>
         <Pagination simple current={page} pageSize={limit} total={totalCount} onChange={(page)=>setPage(page)}/>
       </div>}
-      {/* 无数据 */}
-      {journals && !journals.length && <Nodata _html="暂无数据"/>}
+      {/* 无数据 新建第一条评论时暂无数据隐藏 用户未登录隐藏*/}
+      {journals && !journals.length && showEdit !== 1 && login && <Nodata _html="暂无数据"/>}
     </div>
   )
 }

src/forge/Main/tree/Index.jsx

@@ -73,7 +73,6 @@ function Index(props) {
       dataIndex: "name",
       key: 1,
       ellipsis: true,
-      width: "160px",
       className: "branchNameColumn",
       render: (txt, item) => {
         return (
@@ -112,7 +111,7 @@ function Index(props) {
       dataIndex: "commit_id",
       key: 4,
       ellipsis: true,
-      width: "300px",
+      width: "250px",
       render: (txt, item) => {
         return <div className="treecopy">
           <div className='treeCopyBox'>
@@ -130,6 +129,7 @@ function Index(props) {
       title: "分支类型",
       dataIndex: "default_branch",
       key: 5,
+      width: "150px",
       render: (txt, item) => {
         return isManager ? txt === item.name ? <a className='btn-83' style={{width: '93px'}}>默认分支</a> : <Select value={1} onChange={(value)=>{updateDefaultBranch(value, item)}}>
         <Select.Option value={0}>默认分支</Select.Option>

src/forge/New/Index.js

@@ -642,13 +642,13 @@ class Index extends Component {
                 {open_blockchain && projectsType === "deposit" && <div className='mt10 mb10'>
                   <p className='font-16'>确权</p>
                   <div className='mt5 mb5 color-grey3'><Checkbox checked={tokenConTri} onChange={(e)=>{this.setState({tokenConTri:e.target.checked})}}>加入贡献值激励确权机制</Checkbox></div>
-                  <Form.Item
+                  {tokenConTri && <Form.Item
                     className="flex1"
                     extra="Token指本项目的虚拟货币，决定用户在本仓库贡献度的比例，可以通过issue悬赏或在个人主页贡献确权页进行转移。创建项目时，每个项目的Token总量为10000，您可以分配您可获取的Token数量（未分配的Token将保留至项目Token余额）"
                   >
                     {getFieldDecorator('blockchain_init', {
                       rules: [{
-                        required: tokenConTri, message: '初始token值为一个不超过10000的正整数'
+                        required: true, message: '初始token值为一个不超过10000的正整数'
                       },
                       { validator: (rule,val,callback) =>{
                         if(!/^[1-9]+[0-9]*]*$/.test(val)){
@@ -662,7 +662,7 @@ class Index extends Component {
                     })(
                       <Input placeholder='请填写您（项目创建者）获取的初始Token值'/>
                     )}
-                  </Form.Item>
+                  </Form.Item>}
                 </div>}
 
                 <div className="mt20">