diff --git a/src/forge/Main/CoderDepotReadme.jsx b/src/forge/Main/CoderDepotReadme.jsx index b04c0dfe..1c54663d 100644 --- a/src/forge/Main/CoderDepotReadme.jsx +++ b/src/forge/Main/CoderDepotReadme.jsx @@ -1,5 +1,6 @@ import React, { useEffect, useState } from 'react'; import RenderHtml from '../../components/render-html'; +import { AlignCenter } from '../Component/layout'; import { Dropdown , Menu , Spin } from 'antd'; import { Link } from 'react-router-dom'; const $ = window.$; @@ -47,11 +48,16 @@ function CoderDepotReadme({ operate , history , readme , ChangeFile }){ } return(
-
- - - - README.md +
+ + + + + 目录 + + + README.md + { operate ? ChangeFile(readme && readme.path, false)}> diff --git a/src/forge/Main/Index.scss b/src/forge/Main/Index.scss index 3e50ddfb..5f5b9af3 100644 --- a/src/forge/Main/Index.scss +++ b/src/forge/Main/Index.scss @@ -344,4 +344,20 @@ .ant-dropdown-menu-item.active{ background-color: #e6f7ff; } +} +.catelogue{ + border:1px solid rgb(211, 211, 211); + font-size: 15px; + font-weight: normal; + border-radius: 5px; + margin-right: 10px; + padding:0px 10px; + height: 30px; + line-height: 30px; + color: #666!important; + display: flex; + align-items: center; + span{ + margin-top: 3px; + } } \ No newline at end of file diff --git a/src/forge/Main/IndexItem.js b/src/forge/Main/IndexItem.js index 4a1b126e..38d80aa6 100644 --- a/src/forge/Main/IndexItem.js +++ b/src/forge/Main/IndexItem.js @@ -35,7 +35,7 @@ class IndexItem extends Component {
- + {item.author.name}/{item.name} { !item.is_public && 私有 } diff --git a/src/forge/Main/list.css b/src/forge/Main/list.css index bdf93163..bcf71b5f 100644 --- a/src/forge/Main/list.css +++ b/src/forge/Main/list.css @@ -564,6 +564,10 @@ border-bottom: 1px solid #d9d9d9; border-radius: 4px 4px 0px 0px; } +.commonBox .commonBox-title.boxTitle{ + display: flex; + justify-content: space-between; +} .synchronism{ display: block; height: 26px; diff --git a/src/forge/Settings/Setting.js b/src/forge/Settings/Setting.js index cc4bcc03..e14c023b 100644 --- a/src/forge/Settings/Setting.js +++ b/src/forge/Settings/Setting.js @@ -29,7 +29,8 @@ class Setting extends Component { loading:true, project_units:['home',"activity","code"], divertVisible:false, - is_transfering:undefined + is_transfering:undefined, + projectName:undefined }; } @@ -76,6 +77,7 @@ class Setting extends Component { project_units:units }); this.setState({ + projectName:result.data.project_name, private_check: result.data.private, loading:false, project_units:units, @@ -170,10 +172,11 @@ class Setting extends Component { // 删除本仓库 deleteProject = () => { + const { projectsId , owner } = this.props.match.params; + const { projectName } = this.state; this.props.confirm({ - content: "删除后无法恢复,是否确认删除本仓库?", + content: 该操作无法撤销!且将会一并删除相关的易修、合并请求、工作流、里程碑、动态等数据。
是否确认删除 {owner}/{projectName}
, onOk: () => { - const { projectsId , owner } = this.props.match.params; const url = `/${owner}/${projectsId}.json`; axios .delete(url) @@ -270,7 +273,9 @@ class Setting extends Component { disabled={forked_from_project_id} > 将仓库设为私有 - { forked_from_project_id && (修改仓库的可见性,将会影响到该仓库下所有Fork仓库的可见性)} + + { forked_from_project_id ?`(修改仓库的可见性,将会影响到该仓库下所有Fork仓库的可见性)`:`(Fork仓库的可见性实时同步自源仓库,不支持直接修改)`} + )} diff --git a/src/forge/Team/Group/GroupForm.jsx b/src/forge/Team/Group/GroupForm.jsx index 48e02602..2eb8540f 100644 --- a/src/forge/Team/Group/GroupForm.jsx +++ b/src/forge/Team/Group/GroupForm.jsx @@ -202,7 +202,7 @@ export default Form.create()( [], 新建项目(成员可以在组织中新建项目。创建者将自动获得新建的项目的管理员权限), false, 20,onwers ? "hide":"" )} - {helper( + {/* {helper( '版本库权限:', "authorize", [], @@ -211,7 +211,7 @@ export default Form.create()( 写入权限(成员可以查看和推送提交到团队项目) 管理员权限(成员可以拉取和推送到团队项目同时可以添加协作者) , false, 20,onwers ? "hide":"" - )} + )} */} {/*

允许访问项目单元: