From 786702815f9cc2081459d6e9b7561042e5c5ede2 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 22 May 2020 13:54:12 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=BA=93=E6=A0=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E5=A2=9E=E5=8A=A0commit=E4=BF=A1=E6=81=AF=E7=9A=84?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/forge/Main/CoderRootDirectory.js |  8 +++++++-
 src/forge/Main/list.css              |  2 ++
 src/forge/Version/New.jsx            | 11 +++++++++--
 src/forge/Version/version.css        | 17 ++++++++++++++++-
 4 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/forge/Main/CoderRootDirectory.js b/src/forge/Main/CoderRootDirectory.js
index 1de890c7..f65ff7b2 100644
--- a/src/forge/Main/CoderRootDirectory.js
+++ b/src/forge/Main/CoderRootDirectory.js
@@ -283,12 +283,18 @@ class CoderRootDirectory extends Component{
     const columns = [
       {
         dataIndex: 'name',
-        width:"100%",
+        width:"40%",
         render: (text,item) => (
           <a onClick={()=>this.goToSubRoot(item.path)}>
             <i className={ item.type === "file" ? "iconfont icon-wenjia font-15 color-green-file mr5":"iconfont icon-wenjian1 color-green-file font-15 mr5"}></i>{text}
           </a>
         ),
+      },{
+        dataIndex:"commit",
+        width:"60%",
+        render:(text,item)=>(
+          item && item.message ? <span>{item.message}</span> :""
+        )
       }
     ];
     const title = () =>{
diff --git a/src/forge/Main/list.css b/src/forge/Main/list.css
index 6d031530..6093f923 100644
--- a/src/forge/Main/list.css
+++ b/src/forge/Main/list.css
@@ -352,6 +352,8 @@
 }
 .branch-wrapper a > span{
   position: relative;
+  min-height: 20px;
+  display: block;
 }
 .branch-wrapper a.active > span::after{
   position: absolute;
diff --git a/src/forge/Version/New.jsx b/src/forge/Version/New.jsx
index 62a15851..95047b95 100644
--- a/src/forge/Version/New.jsx
+++ b/src/forge/Version/New.jsx
@@ -1,6 +1,6 @@
 import React , { useState, useEffect } from 'react';
-import { AutoComplete } from 'antd';
 import styled from 'styled-components';
+import { AutoComplete } from 'antd';
 
 import './version.css';
 
@@ -26,7 +26,14 @@ export default ()=>{
         <p className="font-16 color-grey-3 mb15">创建发行版</p>
         <div>
           <SelectDiv>
-            <AutoComplete placeholder="标记一个标签"></AutoComplete>
+            <div className="tagComplete">
+              <i className="iconfont icon-biaoqian3 font-14 color-grey-8"></i>
+              <AutoComplete 
+                placeholder="标记一个版本"
+                
+              ></AutoComplete>
+              <i className="iconfont icon-jiantou9 color-grey-8 font-14 ml5"></i>
+            </div>
             <span>@</span>
           </SelectDiv>
           <p className="font-13 color-grey-8">选择一个已经存在的标签，或者在发布时新建一个标签</p>    
diff --git a/src/forge/Version/version.css b/src/forge/Version/version.css
index d0b2bfcc..38fb9312 100644
--- a/src/forge/Version/version.css
+++ b/src/forge/Version/version.css
@@ -169,7 +169,7 @@
 .ver-middle{
     vertical-align: middle;
 }
-
+/* new */
 .versionForm{
   flex:1;
   padding-right: 30px;
@@ -185,4 +185,19 @@
   background-color: #F1F8FF;
   margin-bottom: 22px;
   color: #333;
+}
+.tagComplete{
+  border:1px solid #d9d9d9;
+  padding:0px 10px;
+  border-radius: 4px;
+  display: flex;
+  align-items: center;
+  width: 240px;
+}
+.tagComplete .ant-select{
+  flex: 1;
+}
+.tagComplete .ant-select-auto-complete.ant-select .ant-input{
+  border:none!important;
+  background-color: #fff!important;
 }
\ No newline at end of file