merge 09065383c1

src/forge/Component/EAccount.scss

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

src/forge/Component/SearchUser.jsx

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

src/forge/Divert/Index.scss

@@ -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: "";
+  }
+}

src/forge/Merge/MergeSubmit.js

@@ -102,7 +102,7 @@ class MergeSubmit extends Component{
           <span className="f-wrap-alignCenter">
             <Link to={`/users/${item.login}`} className="show-user-link">
                 <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>
           </span>
         ),

src/forge/Settings/Setting.js

@@ -2,6 +2,7 @@ import React, { Component } from "react";
 import { Form, Input, Checkbox, Select , Spin } from "antd";
 import Title from '../Component/Title';
 import {WhiteBack} from '../Component/layout';
+import DivertModal from '../Divert/DivertModal';
 import axios from "axios";
 import "./setting.scss";
 const { TextArea } = Input;
@@ -193,16 +194,33 @@ class Setting extends Component {
     });
   };
 
+  // 转移仓库
+  DivertProject=()=>{
+    this.setState({
+      divertVisible:true
+    })
+  }
+   // 取消仓库转移
+  CancelDivertProject=()=>{
+    
+  }
+  // 确定转移仓库
+  onSuccess=()=>{
+
+  }
+
   render() {
     const { getFieldDecorator } = this.props.form;
     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 type = projectDetail && projectDetail.type;
     const forked_from_project_id = this.props && this.props.projectDetail && this.props.projectDetail.forked_from_project_id;
     return (
       <div>
+        <DivertModal repo={projectsId} visible={divertVisible} onSuccess={this.onSuccess} onCancel={()=>{this.setState({divertVisible:false})}}/>
         <Spin spinning={loading}>
           <WhiteBack>
             <Title>基本设置</Title>
@@ -297,6 +315,15 @@ class Setting extends Component {
           <WhiteBack className="dangerousBox mb20">
           <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>
                 <p className="font-bd font-16">删除本仓库</p>

src/forge/users/undo_events.js

@@ -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;