diff --git a/src/forge/Main/CoderDepot.jsx b/src/forge/Main/CoderDepot.jsx index db68d22a..11521dc0 100644 --- a/src/forge/Main/CoderDepot.jsx +++ b/src/forge/Main/CoderDepot.jsx @@ -528,7 +528,7 @@ function CoderDepot(props){ setOpenModal(true)} className="iconfont icon-a-shezhi color-grey-9 font-15"> } - {desc &&

{desc}

} + {desc &&

{desc}

} { website &&
diff --git a/src/forge/Main/sub/UpdateDescModal.jsx b/src/forge/Main/sub/UpdateDescModal.jsx index b0291f34..902f2f15 100644 --- a/src/forge/Main/sub/UpdateDescModal.jsx +++ b/src/forge/Main/sub/UpdateDescModal.jsx @@ -46,14 +46,14 @@ function UpdateDescModal({form , visible , onCancel , onOk,desc,website,lesson_u {getFieldDecorator("website",{ rules:[] })( - + )} {getFieldDecorator("lesson_url",{ rules:[] })( - + )} diff --git a/src/forge/Main/version/version.js b/src/forge/Main/version/version.js index 2896899f..0f570aff 100644 --- a/src/forge/Main/version/version.js +++ b/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) { {item.name} {data && data.user_admin_permission && type !== 2 && } - {data && data.user_admin_permission && type !== 2 && {deleteRelease(item.version_id)}}>} + {data && data.user_admin_permission && type !== 2 && + {deleteRelease(item.version_id)}} + > + + + }
diff --git a/src/forge/users/Echart/Pie.jsx b/src/forge/users/Echart/Pie.jsx index d5489b98..db23234c 100644 --- a/src/forge/users/Echart/Pie.jsx +++ b/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: '报告者'} ] } diff --git a/src/forge/users/Statistics/Index.jsx b/src/forge/users/Statistics/Index.jsx index 91118a67..64986c52 100644 --- a/src/forge/users/Statistics/Index.jsx +++ b/src/forge/users/Statistics/Index.jsx @@ -186,7 +186,7 @@ function Index(props) { />
-

根据你在项目开发过程中的工作,对你在项目中扮演的角色进行定位,包括:创建者、管理者、开发者、测试者、文档工作者等。

+

根据你在项目开发过程中的工作,对你在项目中扮演的角色进行定位,包括:创建者、管理员、开发者、报告者。