This commit is contained in:
caishi 2021-04-25 17:38:47 +08:00 committed by caishi
parent 35ecf20e34
commit b7d22f1233
6 changed files with 45 additions and 19 deletions

View File

@ -3,4 +3,7 @@
} }
.ant-modal-wrap{ .ant-modal-wrap{
z-index: 1002; z-index: 1002;
.ant-form-explain{
position: absolute;
}
} }

View File

@ -47,7 +47,7 @@ export default ({ getUser })=>{
src={getImageUrl(`/${item && item.image_url}`)} src={getImageUrl(`/${item && item.image_url}`)}
alt="" alt=""
/> />
<span className="ml10" style={{ "vertical-align": "middle" }}> <span className="ml10" style={{ verticalAlign: "middle" }}>
{item.username} {item.username}
<span className="color-grey ml10">({item.login})</span> <span className="color-grey ml10">({item.login})</span>
</span> </span>

View File

@ -0,0 +1,12 @@
.diverModal{
.descUl{
background-color: #fffae6;
border-radius: 4px;
padding:10px 15px;
color: #efc16b;
border:1px solid #efc16b;
}
.ant-form-item-required::before{
content: "";
}
}

View File

@ -102,7 +102,7 @@ class MergeSubmit extends Component{
<span className="f-wrap-alignCenter"> <span className="f-wrap-alignCenter">
<Link to={`/users/${item.login}`} className="show-user-link"> <Link to={`/users/${item.login}`} className="show-user-link">
<img src={getImageUrl(`/${item.image_url}`)} alt="" width="28px" height="28px" className="mr3 radius"/> <img src={getImageUrl(`/${item.image_url}`)} alt="" width="28px" height="28px" className="mr3 radius"/>
<label className="hide-1" style={{maxWidth:"75px",'vertical-align':'middle'}}>{text}</label> <label className="hide-1" style={{maxWidth:"75px",verticalAlign:'middle'}}>{text}</label>
</Link> </Link>
</span> </span>
), ),

View File

@ -2,6 +2,7 @@ import React, { Component } from "react";
import { Form, Input, Checkbox, Select , Spin } from "antd"; import { Form, Input, Checkbox, Select , Spin } from "antd";
import Title from '../Component/Title'; import Title from '../Component/Title';
import {WhiteBack} from '../Component/layout'; import {WhiteBack} from '../Component/layout';
import DivertModal from '../Divert/DivertModal';
import axios from "axios"; import axios from "axios";
import "./setting.scss"; import "./setting.scss";
const { TextArea } = Input; const { TextArea } = Input;
@ -193,16 +194,33 @@ class Setting extends Component {
}); });
}; };
// 转移仓库
DivertProject=()=>{
this.setState({
divertVisible:true
})
}
// 取消仓库转移
CancelDivertProject=()=>{
}
// 确定转移仓库
onSuccess=()=>{
}
render() { render() {
const { getFieldDecorator } = this.props.form; const { getFieldDecorator } = this.props.form;
const { projectDetail } = this.props; const { projectDetail } = this.props;
const { projectsId } = this.props.match.params;
const { CategoryList, LanguageList, private_check ,loading } = this.state; const { CategoryList, LanguageList, private_check ,loading , divertVisible } = this.state;
let mirror = projectDetail && projectDetail.mirror; let mirror = projectDetail && projectDetail.mirror;
let type = projectDetail && projectDetail.type; let type = projectDetail && projectDetail.type;
const forked_from_project_id = this.props && this.props.projectDetail && this.props.projectDetail.forked_from_project_id; const forked_from_project_id = this.props && this.props.projectDetail && this.props.projectDetail.forked_from_project_id;
return ( return (
<div> <div>
<DivertModal repo={projectsId} visible={divertVisible} onSuccess={this.onSuccess} onCancel={()=>{this.setState({divertVisible:false})}}/>
<Spin spinning={loading}> <Spin spinning={loading}>
<WhiteBack> <WhiteBack>
<Title>基本设置</Title> <Title>基本设置</Title>
@ -297,6 +315,15 @@ class Setting extends Component {
<WhiteBack className="dangerousBox mb20"> <WhiteBack className="dangerousBox mb20">
<div> <div>
<div className="dangerousTitle">危险操作区</div> <div className="dangerousTitle">危险操作区</div>
<div className="flex-a-center padding15-10" style={{borderBottom:"1px solid #f9edbe"}}>
<div>
<p className="font-bd font-16">转移仓库</p>
<p className="mt10">
将此仓库转移给其他用户或组织
</p>
</div>
<a onClick={this.DivertProject} className="red_deleteBtn">转移</a>
</div>
<div className="flex-a-center padding15-10"> <div className="flex-a-center padding15-10">
<div> <div>
<p className="font-bd font-16">删除本仓库</p> <p className="font-bd font-16">删除本仓库</p>

View File

@ -1,16 +0,0 @@
import React, { Component } from "react";
import Nodata from "../Nodata";
class UndoEvents extends Component {
render() {
return (
<div className="pd20">
<div className="grid-item pb20 bbt">
<h3>待办事项</h3>
</div>
<Nodata _html={`暂时没有数据~`} />
</div>
);
}
}
export default UndoEvents;