Merge branch 'gitlink_server' of https://git.trustie.net/Gitlink/forgeplus-react into gitlink_server

src/forge/Main/CoderDepot.jsx

@@ -528,7 +528,7 @@ function CoderDepot(props){
                           <i onClick={()=>setOpenModal(true)} className="iconfont icon-a-shezhi color-grey-9 font-15"></i>
                         }
                       </FlexAJ>
-                      {desc && <p className="font-14 color-grey-3 mb15 task-hide-2" style={{lineHeight:"24px",WebkitLineClamp:"4",textAlign:"justify",wordBreak:"break-all"}}>{desc}</p>}
+                      {desc && <p className="font-14 color-grey-3 mb15 task-hide-2" style={{lineHeight:"24px",WebkitLineClamp:"4",textAlign:"justify",wordBreak:"break-all"}} title={desc}>{desc}</p>}
                       {
                         website &&
                         <div className="color-grey-6 df pinfos mb5">

src/forge/Main/sub/UpdateDescModal.jsx

@@ -46,14 +46,14 @@ function UpdateDescModal({form , visible , onCancel , onOk,desc,website,lesson_u
           {getFieldDecorator("website",{
             rules:[]
           })(
-            <Input placeholder="website链接"/>
+            <Input placeholder="website链接" maxLength={200}/>
           )}
         </Form.Item>
         <Form.Item label="实践课程">
           {getFieldDecorator("lesson_url",{
             rules:[]
           })(
-            <Input placeholder="实践课程链接" />
+            <Input placeholder="实践课程链接" maxLength={200}/>
           )}
         </Form.Item>
       </Form>

src/forge/Main/version/version.js

@@ -6,9 +6,11 @@ import {truncateCommitId} from '../../common/util';
 import Empty from './Empty';
 import './version.scss';
 import axios from 'axios';
+import { Popconfirm } from 'antd'
 import Tree from '../img/tree-black.png';
 import RenderHtml from '../../../components/render-html';
 import User from "../../Component/User";
+import DeleteBox from "../../Component/DeleteModal/Index";
 
 function version(props) {
   const [ data , setData ] = useState(undefined);
@@ -73,7 +75,17 @@ function version(props) {
             <Link to={`/${owner}/${projectsId}/tree/${item.tag_name}`} className="task-hide color-blue hover font-18">{item.name}</Link>
             <span>
             {data && data.user_admin_permission && type !== 2 && <Link to={{pathname:`/${owner}/${projectsId}/releases/${item.version_id}/update`,state:{"stable":item.draft==="稳定"}}} className="ml15"><i className="iconfont icon-a-bianji1 font-16 color-grey-6"></i></Link>}
-            {data && data.user_admin_permission && type !== 2 && <i className ="iconfont icon-shanchuicon1 font-16 ml15" onClick={()=>{deleteRelease(item.version_id)}}></i>}
+            {data && data.user_admin_permission && type !== 2 && 
+            <Popconfirm
+                      placement="bottom" 
+                      title={'您确定要删除当前易修吗？'} 
+                      okText="是" 
+                      cancelText="否" 
+                      onConfirm={() =>{deleteRelease(item.version_id)}}
+            >
+              <i className ="iconfont icon-shanchuicon1 font-16 ml15"></i>
+              </Popconfirm>
+              }
             </span>
           </div>
           <span className="color-grey-3 mb15 version-user">

src/forge/users/Echart/Pie.jsx

@@ -14,7 +14,7 @@ function Pie({data}) {
     var huan_val = document.getElementById("Pie");
     var chart = echarts.init(huan_val);
     let option = {
-      color: ["#f8e367", "#5ea6ff", "#ff9e48", "#99dfff"],
+      color: ["#ff9e48", "#5ea6ff", "#f8e367", "#99dfff"],
       title: {
         show:false
       },
@@ -51,9 +51,9 @@ function Pie({data}) {
             show: false
           },
           data: [
-            {value: d.developer && d.developer.count, name: '开发者'},
-            {value: d.manager && d.manager.count, name: '管理员'},
             {value: d.owner && d.owner.count, name: '创建者'},
+            {value: d.manager && d.manager.count, name: '管理员'},
+            {value: d.developer && d.developer.count, name: '开发者'},
             {value: d.reporter && d.reporter.count, name: '报告者'}
           ]
         }

src/forge/users/Statistics/Index.jsx

@@ -186,7 +186,7 @@ function Index(props) {
           />
         </FlexAJ>
         <div className="echartBox">
-          <p>根据你在项目开发过程中的工作，对你在项目中扮演的角色进行定位，包括：创建者、管理者、开发者、测试者、文档工作者等。</p>
+          <p>根据你在项目开发过程中的工作，对你在项目中扮演的角色进行定位，包括：创建者、管理员、开发者、报告者。</p>
           <Pie data={pieData}/>
         </div>
       </div>