-
-
- 仓库仅可以转移到您已经加入的组织中，不可以转移到未加入的组织中 +
- 仓库仅可以转移到您具有管理权限的组织中
- 涉及到仓库改名操作，请提前做好仓库备份并且在转移后对本地仓库的remote进行修改
- 转移仓库到组织后，你和组织创建者/管理员同时拥有对该仓库的管理操作
-
@@ -419,7 +447,7 @@ function CoderDepot(props){
: ""
}
{
- (dirInfo && dirInfo.length === 0) && (fileInfo && fileInfo.length === 0) ?
- @@ -65,6 +65,15 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa :"" } + {/* { + item.menu_name === "wiki" && +
- + + + Wiki + + + } */} { item.menu_name === "devops" && platform ?
-
diff --git a/src/forge/Merge/MergeItem.js b/src/forge/Merge/MergeItem.js
index 5c08a61f..f21cc3f5 100644
--- a/src/forge/Merge/MergeItem.js
+++ b/src/forge/Merge/MergeItem.js
@@ -49,7 +49,7 @@ class MergeItem extends Component {
};
render() {
- const { issues, project_name, project_author_name , user_admin_or_member} = this.props;
+ const { issues, project_name, project_author_name , user_admin_or_developer} = this.props;
const { projectsId , owner } = this.props.match.params;
const { current_user } = this.props;
const renderList = () => {
@@ -183,7 +183,7 @@ class MergeItem extends Component {
) : (
""
)}
- {user_admin_or_member ? (
+ {user_admin_or_developer && item.pull_request_status === 0 ? (
{ - data && data.user_admin_or_member && + data && data.user_admin_or_developer && this.checkOperation()}> + 新建合并请求 @@ -391,7 +387,7 @@ class merge extends Component {
- + ), diff --git a/src/forge/Merge/merge.js b/src/forge/Merge/merge.js index c0c7e5ce..2b72cbee 100644 --- a/src/forge/Merge/merge.js +++ b/src/forge/Merge/merge.js @@ -4,7 +4,7 @@ import "./merge.css"; import "../Order/order.css"; import "../Order/index.scss"; import NoneData from "./no_data"; -import OrderItem from "./MergeItem"; +import MergeItem from "./MergeItem"; import './Index.scss'; import axios from "axios"; @@ -159,14 +159,10 @@ class merge extends Component {
this.getOption(e, id, name)}> {name} - {array && - array.length > 0 && - array.map((item, key) => { + {array && array.length > 0 && array.map((item, key) => { return ( -this.getOption(e, id, item.name)} - > + ((!item.permission) || (item.permission && item.permission !== "Reporter")) && + this.getOption(e, id, item.name)}> {item.name} ); @@ -259,7 +255,7 @@ class merge extends Component { />{data && data.search_count && data.search_count > 0 ? ( -):""} {search_count > select_params.limit ? ( diff --git a/src/forge/Merge/merge_form.js b/src/forge/Merge/merge_form.js index 1c75a9f9..3481cc8f 100644 --- a/src/forge/Merge/merge_form.js +++ b/src/forge/Merge/merge_form.js @@ -264,7 +264,7 @@ class MergeForm extends Component { }, ], initialValue: title, - })()} + })()}+ user_admin_or_developer={data && data.user_admin_or_developer} + > )} - - + {/*- ---必须审查代码 ---合并后删除提交分支 ---合并后关闭提到的任务 -+ {getFieldDecorator("checkbox-group")( + */} diff --git a/src/forge/New/Index.js b/src/forge/New/Index.js index b38b4396..7a314f67 100644 --- a/src/forge/New/Index.js +++ b/src/forge/New/Index.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; import { Link } from 'react-router-dom'; -import { Input , Form , Select , Checkbox , Button , Spin , AutoComplete } from 'antd'; +import { Input , Form , Select , Checkbox , Button , Spin , AutoComplete, Modal } from 'antd'; import { Base64 } from 'js-base64'; import '../css/index.scss'; @@ -62,6 +62,8 @@ class Index extends Component { this.getGitignore(); // 获取开源许可证 this.getLicenses(); + //判断是否为删除新建项目失败后返回，并执行对应逻辑 + this.isDeleteProjectBack(); } componentDidUpdate=(prevPros)=>{ if(prevPros && this.props && !this.props.checkIfLogin()){ @@ -73,6 +75,7 @@ class Index extends Component { getOwner=()=>{ const { OIdentifier } = this.props.match.params; const { user_id } = this.props && this.props.current_user; + const url = `/owners.json`; axios.get(url).then(result=>{ if(result && result.data){ @@ -81,16 +84,13 @@ class Index extends Component { OwnerList: owner, }) if(OIdentifier){ - owner = owner.filter(item=>item.name === OIdentifier); - this.props.form.setFieldsValue({ - user_id:OIdentifier - }) + owner = owner.filter(item=>item.login === OIdentifier); }else if(user_id){ owner = owner.filter(item=>item.id === user_id); - this.props.form.setFieldsValue({ - user_id:owner && owner[0].name - }) } + this.props.form.setFieldsValue({ + user_id:owner && owner[0].name + }) owner && this.setState({ owners_id:owner[0].id, owners_name:owner[0].name @@ -148,6 +148,31 @@ class Index extends Component { }).catch((error) => { }) } + isDeleteProjectBack = () => { + let mirror_status = this.props.history.location.mirror_status; + if (mirror_status === 2 && sessionStorage.newProjectValue) { + Modal.warning({ + title: '警告', + content: '镜像项目创建失败！请按操作规范重新创建项目！', + }); + let newProjectValue = JSON.parse(sessionStorage.newProjectValue); + if (newProjectValue) { + this.setState({ + project_language_id: newProjectValue.project_language_id, + project_category_id: newProjectValue.project_category_id, + license_id: newProjectValue.license_id, + ignore_id: newProjectValue.ignore_id + }); + delete newProjectValue.project_language_id; + delete newProjectValue.project_category_id; + delete newProjectValue.license_id; + delete newProjectValue.ignore_id; + this.props.form.setFieldsValue(newProjectValue); + } + + } + } + // 设置option setOptionsList = (data, _head, name) => { if (data && data.length > 0) { @@ -176,6 +201,8 @@ class Index extends Component { const { project_language_id, project_category_id, license_id, ignore_id , owners_id , owners_name } = this.state; const decoderPass = Base64.encode(values.password); const url = (projectsType && projectsType === "mirror") ? "/projects/migrate.json" : "/projects.json"; + // 新建项目的时候，暂存数据，如果失败，返回的时候可以重新赋值 + sessionStorage.newProjectValue=JSON.stringify({...values,project_language_id,project_category_id,license_id,ignore_id}); axios.post(url, { ...values, auth_password:decoderPass, @@ -185,14 +212,12 @@ class Index extends Component { ignore_id, user_id:owners_id }).then((result) => { - if (result) { - if (result.data.id) { - this.setState({ - isSpin: false - }) - this.props.showNotification(`${projectsType && projectsType === "mirror" ? "镜像" : "托管"}项目创建成功!`); - this.props.history.push(`/projects/${result.data.login}/${result.data.identifier}`); - } + if (result && result.data.id) { + this.setState({ + isSpin: false + }) + projectsType && projectsType !== "mirror" && this.props.showNotification(`托管项目创建成功!`); + this.props.history.push(`/projects/${result.data.login}/${result.data.identifier}`); } }).catch((error) => { this.setState({ @@ -342,7 +367,9 @@ class Index extends Component { { projectsType && projectsType === "mirror" &&+ + )} +++必须审查代码 +++合并后删除提交分支 +++合并后关闭提到的任务 +- 需要授权验证
++ 需要授权验证 + 如果源项目为公有仓库，禁止填写用户名密码。如果源项目为私有仓库，则必须填写正确的用户名和密码!
{ mirrorCheck &&diff --git a/src/forge/Notice/Index.jsx b/src/forge/Notice/Index.jsx index 94c63804..c93ec8f2 100644 --- a/src/forge/Notice/Index.jsx +++ b/src/forge/Notice/Index.jsx @@ -22,6 +22,7 @@ function Index(props){ const username = props.match.params.username; const pathname = props.history.location.pathname; const user = props.user; + const undo_messages = props.undo_messages; const [ menu , setMenu ] = useState("notify"); const [ messagesCount , setMessagesCount ] = useState(0); @@ -72,7 +73,7 @@ function Index(props){ if(type==="apply"){ setApplyCount(applyCount-count); }else if(type==="undo"){ - setTransferCount(applyCount-count); + setTransferCount(transferCount-count); }else{ setMessagesCount(0); c = messagesCount; diff --git a/src/forge/Notice/Notify.jsx b/src/forge/Notice/Notify.jsx index 761366d3..b3d338de 100644 --- a/src/forge/Notice/Notify.jsx +++ b/src/forge/Notice/Notify.jsx @@ -14,8 +14,24 @@ function Notify(props){ const [ isSpin , setIsSpin ] = useState(true); useEffect(()=>{ - props && props.deleteEvent("notify",0); - },[]) + if(username){ + getList(); + } + },[username,page]) + + function getList(){ + const url = `/users/${username}/applied_messages.json`; + Axios.get(url,{ + params:{ + page,per_page:limit + } + }).then(result=>{ + if(result){ + setList(result.data.applied_messages); + setTotal(result.data.total_count); + } + }).catch(error=>{}) + } useEffect(()=>{ if(username){ diff --git a/src/forge/Notice/UndoEvent.jsx b/src/forge/Notice/UndoEvent.jsx index c8c579dc..6d13e706 100644 --- a/src/forge/Notice/UndoEvent.jsx +++ b/src/forge/Notice/UndoEvent.jsx @@ -14,6 +14,7 @@ function UndoEvent(props){ const [ total , setTotal ] = useState(0); const [ isSpin , setIsSpin ] = useState(true); + useEffect(()=>{ if(username){ setIsSpin(true); @@ -69,15 +70,14 @@ function UndoEvent(props){ list.map((i,k)=>{ return(- -
+
@@ -113,7 +113,7 @@ class NewMilepost extends Component { required: true, message: '请输入描述内容' }], })( - + )} diff --git a/src/forge/Order/order_form.js b/src/forge/Order/order_form.js index 45433631..b6f065b2 100644 --- a/src/forge/Order/order_form.js +++ b/src/forge/Order/order_form.js @@ -92,10 +92,10 @@ class order_form extends Component { const url = `/${owner}/${projectsId}/issues/new.json`; axios.get(url).then((result) => { - if (result) { + if (result && result.data) { this.setState({ issue_chosen: result.data.issue_chosen, - branches: result.data.branches, + branches: result.data.issue_chosen.branches, isSpin:false }); diff --git a/src/forge/Settings/Branch.js b/src/forge/Settings/Branch.js index d0a235d8..d345f0fc 100644 --- a/src/forge/Settings/Branch.js +++ b/src/forge/Settings/Branch.js @@ -23,6 +23,7 @@ export default ((props)=>{ const [ page , setPage ] = useState(1); let defaultBranch = props.defaultBranch; + useEffect(()=>{ if(defaultBranch){ setBranch(defaultBranch); @@ -76,6 +77,8 @@ export default ((props)=>{ .then((result) => { if (result) { props.showNotification(`分支设置成功！`); + const { getDetail } = props; + getDetail && getDetail(); } }) .catch((error) => { @@ -95,7 +98,7 @@ export default ((props)=>{ return({i.user && i.user.name} {i.time_ago}
- 请求将仓库【{i.project && i.project.name}】 - 转移给【{i.owner && i.owner.name}】，是否接受？
+请求将仓库转移给【{i.owner && i.owner.name}】,是否接受？
{ i.status === "common" && @@ -93,7 +93,7 @@ function UndoEvent(props){ i.status === "canceled" && 对方已取消转移 } { - i.status === "accepted" && 已接受 + i.status === "accept" && 已接受 } { i.status === "refused" && 已拒绝 diff --git a/src/forge/Order/Milepost.js b/src/forge/Order/Milepost.js index d87bfe0b..ede2d314 100644 --- a/src/forge/Order/Milepost.js +++ b/src/forge/Order/Milepost.js @@ -154,10 +154,10 @@ class Milepost extends Component { const { projectsId , owner } = this.props.match.params; const menu = ( diff --git a/src/forge/Order/UpdateMilepost.js b/src/forge/Order/UpdateMilepost.js index 49a2b8d3..88a73033 100644 --- a/src/forge/Order/UpdateMilepost.js +++ b/src/forge/Order/UpdateMilepost.js @@ -180,8 +180,8 @@ class UpdateMilepost extends Component {onTypeChange(e.target.value)} value={type}> - - + + diff --git a/src/forge/Order/newMilepost.js b/src/forge/Order/newMilepost.js index 5d7b090f..b9513212 100644 --- a/src/forge/Order/newMilepost.js +++ b/src/forge/Order/newMilepost.js @@ -102,7 +102,7 @@ class NewMilepost extends Component { required: true, message: '请输入标题' }], })( - + )} - diff --git a/src/forge/Settings/CollaboratorGroup.jsx b/src/forge/Settings/CollaboratorGroup.jsx index c6ab6ffb..4836d3e6 100644 --- a/src/forge/Settings/CollaboratorGroup.jsx +++ b/src/forge/Settings/CollaboratorGroup.jsx @@ -10,7 +10,7 @@ const roles = { read: "报告者", }; const limit = 15; -function CollaboratorGroup({ newGroupId, owner, projectsId }) { +function CollaboratorGroup({ newGroupId, owner, projectsId , setAddOperation }) { const [list, setList] = useState(undefined); const [isSpin, setIsSpin] = useState(true); const [page, setPage] = useState(1); @@ -34,6 +34,7 @@ function CollaboratorGroup({ newGroupId, owner, projectsId }) { setList(result.data.teams); setTotal(result.data.total_count); setIsSpin(false); + setAddOperation(result.data.can_add); } }) .catch((error) => {}); @@ -47,16 +48,15 @@ function CollaboratorGroup({ newGroupId, owner, projectsId }) { // 添加团队 function addGroup(id) { const url = `/${owner}/${projectsId}/teams.json`; - axios - .post(url, { - team_id: id, - }) - .then((result) => { - if (result && result.data) { - getData(); - } - }) - .catch((error) => {}); + axios.post(url, { + team_id: id, + }) + .then((result) => { + if (result && result.data) { + getData(); + } + }) + .catch((error) => {}); } // 删除团队 @@ -77,7 +77,11 @@ function CollaboratorGroup({ newGroupId, owner, projectsId }) { title: "团队名", dataIndex: "name", render: (value, item) => { - return {value}; + if(item.is_admin || item.is_member){ + return {value}; + }else{ + return {value}; + } }, }, { diff --git a/src/forge/Settings/CollaboratorMember.jsx b/src/forge/Settings/CollaboratorMember.jsx index 86459d87..1104a864 100644 --- a/src/forge/Settings/CollaboratorMember.jsx +++ b/src/forge/Settings/CollaboratorMember.jsx @@ -58,8 +58,12 @@ function CollaboratorMember({projectsId,owner,project_id,author,showNotification }) .then((result) => { if (result) { - setListData(result.data.members); - setTotal(result.data.total_count); + if(page > 1 && ( listData && listData.length === 1)){ + setPage(page-1); + }else{ + setListData(result.data.members); + setTotal(result.data.total_count); + } setIsSpin(false); } }) diff --git a/src/forge/Settings/ManageWebNew.jsx b/src/forge/Settings/ManageWebNew.jsx index f58d5cc7..64c52e17 100644 --- a/src/forge/Settings/ManageWebNew.jsx +++ b/src/forge/Settings/ManageWebNew.jsx @@ -80,7 +80,7 @@ export default Form.create()( [], )} -分支设置 +<span className="font-18">分支设置</span> @@ -44,7 +49,7 @@ function Collaborator(props){ nav === "1" ?默认分支
diff --git a/src/forge/Settings/Collaborator.js b/src/forge/Settings/Collaborator.js index 0b94eee5..0a50cae1 100644 --- a/src/forge/Settings/Collaborator.js +++ b/src/forge/Settings/Collaborator.js @@ -1,4 +1,4 @@ -import React, { useState } from "react"; +import React, { useState , useRef } from "react"; import {WhiteBack} from '../Component/layout'; import AddMember from '../Component/AddMember'; import AddGroup from '../Component/AddGroup'; @@ -8,9 +8,11 @@ import Group from './CollaboratorGroup'; function Collaborator(props){ const [ nav , setNav] = useState("1"); const [ newId , setNewId] = useState(undefined); + const [ addOperation , setAddOperation] = useState(true); const [ newGroupId , setNewGroupId] = useState(undefined); const {projectsId ,owner} = props.match.params; + const author = props && props.projectDetail && props.projectDetail.author; function getID(id){ @@ -19,6 +21,7 @@ function Collaborator(props){ function getGroupID(id){ setNewGroupId(id); } + return (@@ -27,15 +30,17 @@ function Collaborator(props){ author && author.type === "Organization" ? {setNav("1");setNewId(undefined)}}>协作者管理 - {setNav("2");setNewId(undefined)}}>团队管理 + {setNav("2");setNewId(undefined);setNewGroupId(undefined)}}>团队管理 : 协作者管理 } { - nav === "1" ? + nav === "1" && - : + } + { + (nav !== "1" && addOperation) && } : - + } 推送、创建，删除分支事件白名单，支持匹配符。如果为空或者 *，所有分支的事件均被触发。
+
语法参见 github.com/gobwas/glob 。示例： Master, ${'{master,release*}'}。推送、创建，删除分支事件白名单，支持匹配符。如果为空或者 *，所有分支的事件均被触发。
{helper( "", "active", diff --git a/src/forge/Settings/Setting.js b/src/forge/Settings/Setting.js index 5b4f07c2..034bd071 100644 --- a/src/forge/Settings/Setting.js +++ b/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; @@ -12,6 +13,7 @@ const menu = [ {name:"代码库",index:"code"}, {name:"易修 (Issue)",index:"issues"}, {name:"合并请求",index:"pulls"}, + // {name:"Wiki",index:"wiki"}, {name:"工作流(beta版)",index:"devops"}, // {name:"资源库",index:"resources"}, {name:"里程碑",index:"versions"}, @@ -28,7 +30,8 @@ class Setting extends Component { project_units:['home',"activity","code"], divertVisible:false, is_transfering:undefined, - projectName:undefined + projectName:undefined, + permission:undefined }; } @@ -78,7 +81,9 @@ class Setting extends Component { projectName:result.data.project_name, private_check: result.data.private, loading:false, - project_units:units + project_units:units, + is_transfering:result.data.is_transfering, + permission:result.data.permission }); } }) @@ -192,16 +197,57 @@ class Setting extends Component { }); }; + // 转移仓库 + DivertProject=()=>{ + this.setState({ + divertVisible:true + }) + } + // 取消仓库转移 + CancelDivertProject=()=>{ + this.props.confirm({ + content: "是否确认取消将此项目转移给他人？", + onOk: () => { + const { projectsId , owner } = this.props.match.params; + const url = `/${owner}/${projectsId}/applied_transfer_projects/cancel.json`; + axios.post(url).then(result=>{ + if(result && result.data){ + this.setState({ + is_transfering:false + }) + } + }).catch(error=>{}) + }, + }); + + } + // 确定转移仓库 + onSuccess=()=>{ + this.setState({ + is_transfering:true, + divertVisible:false + }) + } + render() { const { getFieldDecorator } = this.props.form; const { projectDetail } = this.props; + const { projectsId , owner } = this.props.match.params; - const { CategoryList, LanguageList, private_check ,loading } = 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; + + const { CategoryList, LanguageList, private_check ,loading , divertVisible , permission , is_transfering } = this.state; return (
语法参见 github.com/gobwas/glob 。示例： Master, ${'{master,release*}'}。+); diff --git a/src/forge/Settings/Webhooks/New.jsx b/src/forge/Settings/Webhooks/New.jsx new file mode 100644 index 00000000..0dedaa83 --- /dev/null +++ b/src/forge/Settings/Webhooks/New.jsx @@ -0,0 +1,337 @@ +import React , { forwardRef, useEffect, useState } from 'react'; +import { Form , Input , Button , Select , Radio , Checkbox } from 'antd'; +import { Banner } from '../../Component/layout'; +import { Link } from 'react-router-dom'; +import axios from 'axios'; +import PushHistory from './sub/PushHistory'; +import DeleteBox from '../../Component/DeleteModal/Index'; +import './Index.scss'; + +// ,"issue_assign","issue_label","issue_milestone","issue_comment","issue_only","fork", +//"pull_request_milestone","pull_request_sync","pull_request_comment","repository","pull_request_label" +const eventArray = [ + "create","delete","push","pull_request_assign","pull_request_review","pull_request_only" +] +function New({ form , match , showNotification , history }) { + const [ httpValue , setHttpValue ] = useState("POST"); + const [ posthttpValue , setPostHttpValue ] = useState("json"); + const [ condition , setCondition ] = useState("push"); + const [ event , setEvent ] = useState(["push"]); + const [ visible , setVisible ] = useState(false); + const [ data , setData ] = useState(undefined); + const [ eventFlag , setEventFlag ] = useState(false); + + const { getFieldDecorator, validateFields , setFieldsValue } = form; + const { id , owner , projectsId } = match.params; + + function compareArray(params) { + if(params && params.length > 0){ + if(params.length === 1 && params[0] === "push"){ + setEvent(['push']); + return "push"; + }else if(params.length === eventArray.length){ + setEvent(eventArray); + return "all"; + }else{ + setEvent([]); + return "forevent"; + } + } + } + + useEffect(()=>{ + if(id){ + Init(); + }else{ + let e = compareArray(event); + setCondition(e); + setFieldsValue({ + url:"", + secret:"", + http_method:httpValue, + content_type:posthttpValue, + eventCondition:condition, + event:event, + branch_filter:"*", + active:true + }) + } + },[id]) + + function Init() { + const url = `/${owner}/${projectsId}/webhooks/${id}/edit.json`; + axios.get(url).then(result=>{ + if(result){ + let e = compareArray(result.data.events); + setFieldsValue({ + ...result.data, + eventCondition:e, + active:result.data.is_active + }) + setData(result.data); + setHttpValue(result.data.http_method); + setCondition(e); + setEvent(result.data.events); + } + }).catch(error=>{}) + } + + function changeHTTP(value) { + setHttpValue(value); + } + + function changeCondition(e) { + setCondition(e.target.value); + if(e.target.value === "push"){ + setEvent(["push"]) + }else if(e.target.value === "all"){ + setEvent(eventArray) + }else{ + setEvent([]) + } + } + + function submit() { + validateFields((error,values)=>{ + if(!error){ + if(values.eventCondition === "forevent" && event.length === 0){ + setEventFlag(true); + return; + } + let e = values.eventCondition === "push" ? ['push'] : values.eventCondition === "all" ? eventArray : event; + + if(id){ + // 编辑 + const url = `/${owner}/${projectsId}/webhooks/${id}.json`; + axios.patch(url,{ + webhook:{ + ...values, + events:e + } + }).then(result=>{ + if(result){ + showNotification("webhook更新成功！"); + history.push(`/projects/${owner}/${projectsId}/setting/webhooks`); + } + }).catch(error=>{}) + }else{ + // 保存 + const url = `/${owner}/${projectsId}/webhooks.json`; + axios.post(url,{ + webhook:{ + ...values, + events:e + } + }).then(result=>{ + if(result && result.data && result.data.id){ + showNotification("webhook新建成功！"); + history.push(`/projects/${owner}/${projectsId}/setting/webhooks`); + } + }).catch(error=>{}) + } + + } + }) + } + + function checkAddr(rule, value, callback) { + let reg = /(http|ftp|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-\.,@?^=%&:/~\+#]*[\w\-\@?^=%&/~\+#])?/; + if(!value){ + callback(); + } + if (!reg.test(value)){ + callback("请输入有效的URL"); + } + callback(); + } + + function deleteFunc() { + if(id){ + setVisible(true); + } + } + + function onSuccess() { + if(id){ + const url = `/${owner}/${projectsId}/webhooks/${id}.json`; + axios.delete(url).then(result=>{ + if(result){ + showNotification("webhook删除成功！"); + history.push(`/projects/${owner}/${projectsId}/setting/webhooks`); + } + }).catch(error=>{}) + } + } + + const radioStyle = { + display: 'block', + height: '30px', + lineHeight: '30px', + }; + + return( +{this.setState({divertVisible:false})}} + /> 基本设置 @@ -293,23 +339,41 @@ class Setting extends Component { {/* 镜像设置部分，暂无接口，先不显示 */} {/**/} - - + + :"" + }++ ) +} +export default Form.create()(forwardRef(New)); \ No newline at end of file diff --git a/src/forge/Settings/new_tags.js b/src/forge/Settings/new_tags.js index d0affbc8..bc763f9c 100644 --- a/src/forge/Settings/new_tags.js +++ b/src/forge/Settings/new_tags.js @@ -445,7 +445,7 @@ class NewTags extends Component { message: "请填写标签名字", }, ], - })()} + })()}setVisible(false)} + onSuccess={onSuccess} + title="删除Webhook" + content="您确定要删除此Webhook吗？" + subTitle={`删除后未来事件将不会推送至此Webhook地址：${data && data.url}`} + /> + + Webhooks + + {id ? "更新" : "添加"}Webhook + +++ { id &&当webhook被触发时，我们将向以下URL发送通知，包括已选择事件的详细信息。更多信息可查阅webhooks指南。
+ +} + @@ -507,8 +507,8 @@ class NewTags extends Component { > { + setFieldsValue({ + authorize:"read", + includes_all_project:0 + }) + },[]) + useEffect(() => { if (GroupDetail) { setOnwers(GroupDetail.authorize === "owner"); + setAuth(GroupDetail.authorize); setCheckBox(GroupDetail.can_create_org_project) setSwtichBox(GroupDetail.units) setFieldsValue({ - ...GroupDetail + ...GroupDetail, + includes_all_project:GroupDetail.includes_all_project ? 1 :0 }) setDescNum(GroupDetail.description ? GroupDetail.description.length : 0); } @@ -50,6 +61,7 @@ export default Form.create()( setSwtichBoxPull(switch_checked("pulls")) setSwtichBoxIssue(switch_checked("issues")) setSwtichBoxRelease(switch_checked("releases")) + setSwtichBoxWiki(switch_checked("wiki")) } }, [switch_box]) @@ -68,11 +80,13 @@ export default Form.create()( setIsSpin(true) validateFields((error, values) => { if (!error) { - values.unit_types = switch_box + // values.unit_types = switch_box + values.unit_types = ['code','pulls','issues','releases','wiki']; if (groupId) { // 表示编辑，否则为新建 const url = `/organizations/${OIdentifier}/teams/${groupId}.json`; axios.put(url, { - ...values + ...values, + includes_all_project:values.includes_all_project === 1?true:false }).then(result => { if (result && result.data) { showNotification("基本设置更新成功！"); @@ -82,7 +96,8 @@ export default Form.create()( } else { const url = `/organizations/${OIdentifier}/teams.json`; axios.post(url, { - ...values + ...values, + includes_all_project:values.includes_all_project === 1?true:false }).then(result => { if (result && result.data) { showNotification("团队创建成功！"); @@ -132,6 +147,11 @@ export default Form.create()( setSwtichBoxRelease(checked) } + function switch_wiki_types(checked, event) { + switch_unit_types(checked, "wiki"); + setSwtichBoxWiki(checked); + } + function cancelEdit(){ if(groupId){ history.push(`/organize/${OIdentifier}/group/${groupId}`); @@ -140,6 +160,9 @@ export default Form.create()( } } + function changeAuth(params) { + setAuth(params.target.value) + } function checkname(rule, value, callback){ if(!value){ @@ -192,8 +215,8 @@ export default Form.create()( "includes_all_project", [],diff --git a/src/forge/Team/Index.scss b/src/forge/Team/Index.scss index a046f99d..11237973 100644 --- a/src/forge/Team/Index.scss +++ b/src/forge/Team/Index.scss @@ -368,5 +368,5 @@ } } .hide{ - display: hidden; + display: none; } \ No newline at end of file diff --git a/src/forge/Team/List.jsx b/src/forge/Team/List.jsx index b43fb75d..8cf96587 100644 --- a/src/forge/Team/List.jsx +++ b/src/forge/Team/List.jsx @@ -75,7 +75,7 @@ function List(props){- , false, 0,onwers ? "hide":"" )} {helper( @@ -202,37 +225,42 @@ export default Form.create()( [],指定项目(团队成员将只能访问添加到团队的项目。 选择此项 将不会 自动删除已经添加的项目) -所有项目(团队可以访问所有项目。选择此选项将 添加所有现有的 项目到指定团队) +指定项目(团队成员将只能访问添加到团队的项目。 选择此项 将不会 自动删除已经添加的项目) +所有项目(团队可以访问所有项目。选择此选项将 添加所有现有的 项目到指定团队) 新建项目(成员可以在组织中新建项目。创建者将自动获得新建的项目的管理员权限) , false, 20,onwers ? "hide":"" )} - {/* {helper( + {helper( '版本库权限：', "authorize", [], -+ 读取权限(成员可以查看和克隆团队项目) 写入权限(成员可以查看和推送提交到团队项目) 管理员权限(成员可以拉取和推送到团队项目同时可以添加协作者) 允许访问项目单元：
-- -- 代码库(查看源码、文件、提交和分支) - - -- 任务(组织 bug 报告、任务和里程碑) - - -- 合并请求(启用合并请求和代码评审) - - - */} + {/*- 版本发布(跟踪项目版本和下载) - +*/} -允许访问项目单元：
++ ++ 代码库(查看源码、文件、提交和分支) + + ++ 任务(组织 bug 报告、任务和里程碑) + + ++ 合并请求(启用合并请求和代码评审) + + ++ 版本发布(跟踪项目版本和下载) + + ++ wiki(编辑此仓库的相关文档说明) + cancelEdit()}>取消 +cancelEdit()}>取消 - { organizeDetail && organizeDetail.is_admin ? + { organizeDetail && organizeDetail.can_create_project ?
+ 新建项目 diff --git a/src/forge/Team/RightBox.jsx b/src/forge/Team/RightBox.jsx index 0603a454..daa339f2 100644 --- a/src/forge/Team/RightBox.jsx +++ b/src/forge/Team/RightBox.jsx @@ -97,7 +97,12 @@ function RightBox({ OIdentifier , history , admin }) { return(-{item.name} + { + (item.is_admin || item.is_member) ? +{item.name} + : +{item.name} + }{item.num_users}名成员 {item.num_projects}个仓库 diff --git a/src/forge/Team/Setting/TeamSettingCommon.jsx b/src/forge/Team/Setting/TeamSettingCommon.jsx index 5be03db0..e52361ad 100644 --- a/src/forge/Team/Setting/TeamSettingCommon.jsx +++ b/src/forge/Team/Setting/TeamSettingCommon.jsx @@ -168,7 +168,7 @@ export default Form.create()( '权限：', "repo_admin_change_team_access", [], - 仓库管理员可以添加或移除团队的访问权限 ,false,true +项目管理员可以添加或移除团队的访问权限 ,false,true )}{helper( diff --git a/src/forge/Team/TeamGroupItems.jsx b/src/forge/Team/TeamGroupItems.jsx index e96a310d..f3f5b876 100644 --- a/src/forge/Team/TeamGroupItems.jsx +++ b/src/forge/Team/TeamGroupItems.jsx @@ -75,7 +75,12 @@ function TeamGroupItems({organizeDetail,limit, count , history}){ return( - {item.nickname} + { + (item.is_admin || item.is_member) ? + {item.nickname} + : + {item.nickname} + } { item.is_admin && item.authorize!=="owner" &&
disMissGroup(item.id)}>解散团队 } { item.is_member &&} diff --git a/src/forge/Version/version.js b/src/forge/Version/version.js index 99223e1d..6f81b77c 100644 --- a/src/forge/Version/version.js +++ b/src/forge/Version/version.js @@ -58,6 +58,9 @@ class version extends Component { renderList = (releases) => { const { projectsId , owner } = this.props.match.params; + const { isManager , isDeveloper } = this.props; + const type = this.props.projectDetail && this.props.projectDetail.type; + if (releases && releases.length > 0) { return ( releases.map((item, key) => { @@ -74,7 +77,10 @@ class version extends Component { {item.name} - （编辑） + { + (isManager || isDeveloper) && type !==2 && + （编辑） + } this.showBody(key,item.bodyshow)}> @@ -100,14 +106,14 @@ class version extends Component { render() { const { projectsId ,owner } = this.props.match.params; - const { data , releases , isSpin } = this.state - + const { data , releases , isSpin } = this.state; + const type = this.props.projectDetail && this.props.projectDetail.type; return (版本发布 { - data && data.user_permission ? + data && data.user_permission && type !== 2 ? + 发布新版 : '' } diff --git a/src/forge/Wiki/EditWiki.jsx b/src/forge/Wiki/EditWiki.jsx new file mode 100644 index 00000000..ae30b446 --- /dev/null +++ b/src/forge/Wiki/EditWiki.jsx @@ -0,0 +1,223 @@ +import React, { useEffect, useCallback, useState } from 'react'; +import { Button, Checkbox, Form, Icon, Radio, Input, message } from 'antd'; +import MDEditor from "../../modules/tpm/challengesnew/tpm-md-editor"; +import DelModal from './components/ModalFun'; +import { weekModal, monthModal } from './components/config'; +import { getWiki, wikiPages, addWiki, updateWiki } from './api'; +import './Index.scss'; + + +export default Form.create()(({ form, history, showNotification, projectDetail, match, project }) => { + // const permission = projectDetail && projectDetail.permission !== "Reporter"; + const permission = projectDetail && projectDetail.permission && projectDetail.permission !== "Reporter"; + + const { getFieldDecorator, validateFields, setFieldsValue } = form; + const [fileArrInit, setFileArrInit] = useState(null); + let projectsId = match.params.projectsId; + let owner = match.params.owner; + + let wikiName = history.location.pathname.split('/').pop(); + if (wikiName === 'add') { + wikiName = ''; + } + + const [content, setContent] = useState(undefined); + const [modal, setModal] = useState(false); + const [modalType, setModalType] = useState(); + + + useEffect(() => { + wikiName && project && getWiki({ + owner, + repo: projectsId, + pagename: wikiName, + projectId: project.id + }).then(res => { + if (res && res.data) { + setContent(res.data.md_content); + setFieldsValue({ + name: res.data.name, + content: res.data.md_content, + }); + } + }); + }, [owner, wikiName]); + + // 加载wiki列表 + useEffect(() => { + project && wikiPages({ + owner: owner, + repo: projectsId, + projectId: project.id + }).then(res => { + if (res && res.message === "200" && Array.isArray(res.data)) { + setFileArrInit(res.data); + } else { + setFileArrInit([]); + } + }); + }, [project]); + + const helper = useCallback( + (label, name, rules, widget, initialValue, rightComponent) => ( ++ {current_user && user && user.login === current_user.login ? ( ++ {getFieldDecorator(name, { rules, initialValue, validateFirst: true, })(widget)} + {rightComponent} + + ), []); + + + function onContentChange(value) { + setContent(value); + setFieldsValue({ + content: value + }); + }; + + // 保存wiki文件，包括新增和修改 + function saveFile() { + validateFields((err, values) => { + if (!err) { + let regEn = /[\[\]`\/:*?''<>|%-+_]/g; + if (regEn.test(values.name)) { + message.error('文件名不能有特殊字符'); + return; + } + if (wikiName) { + updateWiki({ + owner, + repo: projectsId, + projectId: project.id, + pagename: wikiName, + ...values, + commit_message: '', + }).then(res => dealRes(res)); + } else { + if (Array.isArray(fileArrInit)) { + for (const item of fileArrInit) { + if (item.name === values.name) { + message.error('不能与已有文件标题相同'); + return false; + } + } + } + addWiki({ + owner, + repo: projectsId, + projectId: project.id, + pagename: values.name, + ...values, + commit_message: '', + }).then(res => dealRes(res)); + } + } + }) + } + + function dealRes(res) { + if (res && res.message === "200") { + showNotification("操作成功"); + goBack(); + } else if (res && res.message === "500") { + message.error('请检查格式是否正确或文件名是否重复'); + } else { + showNotification(res.message || "操作失败"); + } + } + + function goBack() { + history.push(`/projects/${owner}/${projectsId}/wiki`); + } + + function changeModal(e) { + setModal(e.target.checked); + if (!e.target.checked) { + setModalType(); + } + } + + function changeModalType(e) { + let value = e.target.value; + if (!content) { + setModalContent(value); + return; + } + DelModal({ + title: '添加模版', + contentTitle: `您确定要添加“${value}”模板吗`, + content: `此操作会将“${value}”模板替换编辑栏内所有内容，请确认以防文件的丢失`, + okText: '确认添加', + onOk: () => { + setModalType(value); + setModal(true); + setModalContent(value); + } + }); + } + + function setModalContent(value) { + if (value === '周报') { + setContent(weekModal); + setFieldsValue({ + content: weekModal + }); + } else if (value === '月报') { + setContent(monthModal); + setFieldsValue({ + content: monthModal + }); + } + } + + + return ( +++ + ) +}) \ No newline at end of file diff --git a/src/forge/Wiki/Index.jsx b/src/forge/Wiki/Index.jsx new file mode 100644 index 00000000..c27879b2 --- /dev/null +++ b/src/forge/Wiki/Index.jsx @@ -0,0 +1,283 @@ +import React, { useEffect, useCallback, useState } from 'react'; +import { Button, Dropdown, Icon, Input, Menu, Tooltip, Select, Upload, message, Spin } from 'antd'; +import { getImageUrl, timeAgo } from 'educoder'; +import cookie from 'react-cookies'; +import CopyTool from '../Component/CopyTool'; +import DelModal from './components/ModalFun'; +import Welcome from './Welcome'; +import { wikiPages, getWiki, deleteWiki } from './api'; +import { httpUrl, TokenKey } from './fetch'; +import './Index.scss'; +import { isArray } from 'lodash'; +const Search = Input.Search; +const InputGroup = Input.Group; +const { Option } = Select; + +export default (props) => { + const { match, history, showNotification, project, projectDetail } = props; + const permission = projectDetail && projectDetail.permission && projectDetail.permission !== "Reporter"; + + let projectsId = match.params.projectsId; + let owner = match.params.owner; + + const [fileArrInit, setFileArrInit] = useState(null); + const [checkItem, setCheckItem] = useState({}); + const [itemDetail, setItemDetail] = useState({}); + + const [fileArr, setFileArr] = useState([]); + const [reload, setReload] = useState(); + + const [urlType, setUrlType] = useState('HTTPS'); + + // 加载wiki列表 + useEffect(() => { + project && wikiPages({ + owner: owner, + repo: projectsId, + projectId: project.id + }).then(res => { + if (res && res.message === "200" && isArray(res.data)) { + setFileArr(res.data); + setFileArrInit(res.data); + if (res.data.length) { + setCheckItem(res.data[0]); + }; + } else { + setFileArr([]); + setFileArrInit([]); + } + }); + }, [project, reload]) + + // 加载单个wiki详情，参数尽量用驼峰，此处由于后端太麻烦所以不标准 + useEffect(() => { + project && checkItem.name && getWiki({ + owner: owner, + repo: projectsId, + pagename: checkItem.name, + projectId: project.id + }).then(res => { + if (res && res.message === "200") { + setItemDetail(res.data); + } else { + showNotification("加载失败") + } + }); + }, [project, checkItem]); + + function changeSearchValue(e) { + let value = e.target.value; + let newFileArr = []; + for (const item of fileArrInit) { + if (item.name.indexOf(value) > -1) { + newFileArr.push(item); + } + } + setFileArr(newFileArr); + } + + // 删除wiki模态框 + function deleteFileModal(e, item) { + e.stopPropagation(); + DelModal({ + title: '删除页面', + contentTitle: `您确定要删除“${item.name}”此页面吗？`, + content: '此操作将删除该页面，请进行确认以防文件的丢失', + onOk: () => { + deleteWiki({ + owner: owner, + repo: projectsId, + pagename: item.name, + projectId: project.id + }).then(res => { + if (res && res.message === "200") { + message.success('删除成功'); + setReload(Math.random()); + } else { + message.error('删除失败'); + } + }); + } + }); + } + + + function goUser(login) { + window.location.href = `/users/${login}`; + } + + function addFile() { + history.push(`/projects/${owner}/${projectsId}/wiki/add`); + } + + function goEdit() { + history.push(`/projects/${owner}/${projectsId}/wiki/edit/${encodeURI(checkItem.name)}`); + } + + function preview() { + window.open(`/projects/${owner}/${projectsId}/wiki/preview/${encodeURI(project.name)}/${project.id}`); + } + + // 支持 Markdown，Html，Pdf格式文件 + const menu = ( + + ); + + function downloadWiki(type) { + window.open(`${httpUrl}/api/wikiExport/wikiExport-wrapper?repoName=${projectsId}&owner=${owner}&type=${type}&projectName=${project.name}&projectId=${project.id}`); + } + + function beforeUpload(file) { + if (!['md', 'txt'].includes(file.name.split('.').pop())) { + message.error('只能上传md、txt文件'); + return false; + } + + let regEn = /[\[\]`\/:*?''<>|%-+_]/g; + if (regEn.test(file.name)) { + message.error('文件名不能有特殊字符'); + return; + } + + for (const item of fileArrInit) { + if (item.name === file.name) { + message.error('不能上传与已有文件相同文件名的文件'); + return false; + } + } + const isLt100M = file.size / 1024 / 1024 < 100; + if (!isLt100M) { + showNotification(`文件大小必须小于${100}MB!`); + } + return isLt100M; + } + + const uploadProps = { + name: 'multipartFile', + withCredentials: true, + action: `${httpUrl}/api/wikiExport/uploadWiki/${owner}/${projectsId}/${project && project.id}`, //?token=${sessionStorage.taskToken} + showUploadList: false, + headers: { + Authorization: cookie.load(TokenKey) || sessionStorage.taskToken, + }, + beforeUpload: beforeUpload, + onChange(info) { + if (info.file.status === 'uploading') { + console.log(info.file, info.fileList); + } + if (info.file.status === 'done') { + if (info.file.response.message === '200') { + message.success(`${info.file.name} 上传成功`); + setReload(Math.random()); + } else if (info.file.response.message === '500') { + let data = JSON.parse(info.file.response.data); + message.error(data && data.message ? data.message : '文件上传失败'); + } else { + message.error('文件上传失败'); + } + } else if (info.file.status === 'error') { + message.error(`${info.file.name} 上传失败`); + } + }, + }; + + return ( + < Spin spinning={!fileArrInit} className="opacitySpin"> + {fileArrInit && fileArrInit.length ? ++ Wiki+ +编辑页面 + ++ + {permission && } +标题
+ {helper( + "", + "name", + [ + { required: true, message: "请输入标题" }, + // { pattern: /[^`\[\]\/:*?''<>|%-+_]/g, message: '不允许部分特殊字符' } + ], + + )} + ++ + ++ {getFieldDecorator('content', { + rules: [{ required: true, message: "请输入wiki内容" }], + validateFirst: true + })()} + 添加模版 + ++ + +周报 +月报 +++ : ++ + + { + permission ? + + : "Wiki文档" + } + ++ ++ { + permission && +++ + } ++ + ++ + + + +++++ +++ + + {checkItem.wiki_clone_link &&+ + { + fileArr.map(item => { + return ++ }) + } +{ setCheckItem(item) }}> +++ + {item.name} ++ {permission && { deleteFileModal(e, item) }}>} ++ + + } + ++ ++++ + +++ {permission && } +{checkItem.name}
+ { checkItem.commit && goUser(checkItem.commit.author.name) }}> + {itemDetail.image_url &&} + {itemDetail.userName} + + 上次修改于{checkItem.commit && timeAgo(checkItem.commit.author.when)} +
+ } + + ) +} diff --git a/src/forge/Wiki/Index.scss b/src/forge/Wiki/Index.scss new file mode 100644 index 00000000..e40de299 --- /dev/null +++ b/src/forge/Wiki/Index.scss @@ -0,0 +1,381 @@ +$wikiColor: #466aff; +$primaryBtnHover: #6482ff; +body { + width: 100% !important; +} +.ant-spin-nested-loading > div > .ant-spin.opacitySpin{ + max-height: 100vh; + background: rgba(255,255,255,1); +} +.wiki-main { + width: 1200px; + min-height: 400px; + margin: 20px auto; + + .ant-btn-primary { + background-color: $wikiColor; + border-color: $wikiColor; + &:hover, + &:focus, + &:active { + background-color: $primaryBtnHover; + } + } + + .ant-btn-default:hover, + .ant-btn-default:active, + .ant-btn-default:focus { + background: #f3f4f6; + color: #333; + border-color: #d0d0d0; + } + + .wiki-head { + display: flex; + justify-content: space-between; + align-items: center; + padding: 0 20px; + height: 64px; + background: #fafcff; + box-shadow: 0px 1px 4px 0px rgba(0, 0, 0, 0.13); + border-radius: 4px; + border-bottom-left-radius: 0; + .ant-btn .anticon { + margin: 0 -3px 0 0; + } + } + + .head-title { + font-size: 20px; + color: #05101a; + line-height: 30px; + font-weight: 500; + + .anticon-right { + color: #666; + font-size: 0.9rem; + } + } + + .back-wiki { + color: $wikiColor; + cursor: pointer; + &:hover { + color: $primaryBtnHover; + } + } + + .head-log-middle { + width: 3rem; + height: 3rem; + margin-right: 0.35rem; + border-radius: 50%; + } + + .head-log-small { + width: 1.25rem; + height: 1.25rem; + margin-right: 0.35rem; + border-radius: 50%; + } + + .user-box { + font-size: 12px; + font-family: "PingFangSC-Medium"; + color: $wikiColor; + cursor: pointer; + &:hover { + color: $primaryBtnHover; + } + .head-log-small { + position: relative; + top: -2px; + } + } + + .time-ago { + font-size: 12px; + color: #333; + letter-spacing: 0; + line-height: 17px; + font-weight: 400; + font-family: "PingFangSC-Regular"; + } + + .has-error .ant-form-explain, + .has-error .ant-form-split { + position: absolute; + } + .wiki-nav { + max-height: 60vh; + .wiki-search { + padding: 0 14px; + .ant-input { + padding-left: 30px; + } + .ant-input-suffix { + left: 26px; + right: auto; + } + &:hover .ant-input, + &:focus .ant-input { + border-color: $wikiColor !important; + } + } + } + + .wiki-nav-parent { + width: 260px; + flex: none; + } + + .ant-form-item-children .ant-input:hover { + border-color: $wikiColor !important; + } + + .ant-checkbox-checked .ant-checkbox-inner { + background-color: $wikiColor; + border-color: $wikiColor; + } + .ant-radio-checked .ant-radio-inner, + .ant-radio-checked::after { + border-color: $wikiColor; + } + + .ant-radio-inner::after { + background-color: $wikiColor; + } + + .ant-radio-group { + display: block; + margin: 10px 0 0 30px; + } + + .ant-radio-wrapper:hover .ant-radio, + .ant-radio:hover .ant-radio-inner, + .ant-radio-input:focus + .ant-radio-inner { + border-color: $wikiColor; + } +} + +#wikiUrl:focus { + border-right: 1px solid #d9d9d9 !important; +} + +.wiki-body { + display: flex; +} + +.wiki-content { + flex: auto; + width: 75%; +} + +.wiki-content-detail { + padding: 0 20px; + word-break: break-all; +} + +.ant-input-group.ant-input-group-compact.copy-url { + display: flex; + margin-top: 20px; + .ant-select-selection__rendered { + margin: 0 14px 0 5px; + width: 3rem; + font-size: 12px; + } + .ant-select-arrow { + right: 4px; + } + .ant-input { + font-size: 12px; + font-family: "PingFangSC-Regular"; + color: #666; + letter-spacing: 0; + font-weight: 400; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + word-break: break-all; + } + + .copy-wiki { + display: inline-flex; + align-items: center; + justify-content: center; + padding: 0 5px; + background: #fff; + font-size: 1rem !important; + border: 1px solid #d9d9d9; + border-left: 0; + color: $wikiColor; + cursor: pointer; + } +} + +.wiki-url-type { + .ant-select-dropdown-menu-item { + font-size: 12px; + } +} + +.wiki-nav { + min-height: 300px; + padding: 20px 0; + background: #ffffff; + border: 1px solid rgba(153, 153, 153, 0.22); + overflow-y: scroll; + flex: none; + color: #333; +} + +.wiki-nav-title { + display: flex; + justify-content: space-between; + align-items: center; + height: 50px; + padding: 0 10px 0 10px; + font-size: 14px; + letter-spacing: 0; + font-weight: 400; + font-family: "PingFangSC-Regular"; + border-bottom: 1px solid #eee; + line-height: 16px; + cursor: pointer; + + .delete-title-icon { + display: none; + } + + &:hover { + background-color: #fbfbfb; + .delete-title-icon { + display: inline-block; + } + } +} + +.wiki-nav-title-parent { + padding: 0 14px; + &:hover { + background: #fbfbfb; + } +} + +.wiki-nav-title.active { + color: $wikiColor; +} + +.wiki-content-head { + margin: 20px 0 20px 20px; + padding: 0 20px 20px 0; + display: flex; + justify-content: space-between; + align-items: center; + border-bottom: 1px solid #eee; +} + +.wiki-content-head-left { + width: 90%; +} + +.nav-title-left { + display: inline-flex; + max-width: 90%; + svg { + margin-right: 0.5rem; + flex: none; + } + .nav-title-left-text { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + } +} + +.wiki-detail-title { + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; +} +// 预览页面样式文件 +.wiki-preview { + overflow-y: scroll; + height: 100%; + .wiki-body { + width: 90%; + } + .ant-btn-primary { + background-color: $wikiColor; + border-color: $wikiColor; + &:hover, + &:focus, + &:active { + background-color: $primaryBtnHover; + } + } + .preview-head { + display: flex; + justify-content: space-between; + align-items: center; + padding: 0 12rem 0 2rem; + width: 100%; + height: 80px; + background: rgb(39, 47, 76); + color: #fff; + } + + .preview-head-left { + display: inline-flex; + align-items: center; + font-size: 24px; + cursor: pointer; + + .icon-wendangyulan_icon { + font-size: 24px !important; + font-weight: 700; + } + } + + .preview-head-right { + display: flex; + + .copy-url { + margin-top: 0; + } + .copy-desc { + width: 6rem; + padding-top: 1px; + } + } + + .wiki-nav-title { + padding: 0 10px 0 40px; + } + .wiki-nav-title.active { + background-color: #f3f4f6; + } + + .wiki-content-head { + padding: 10px 20px 10px 20px; + } + + .wiki-nav { + padding: 20px 0; + width: 20vw; + border-bottom: 0; + height: 80vh; + } + .wiki-content-detail { + padding: 0 40px; + img { + max-width: 100%; + } + } + + .ant-btn:hover { + background: #f3f4f6; + color: #333; + border-color: #d0d0d0; + } +} diff --git a/src/forge/Wiki/Preview.jsx b/src/forge/Wiki/Preview.jsx new file mode 100644 index 00000000..e7c6a623 --- /dev/null +++ b/src/forge/Wiki/Preview.jsx @@ -0,0 +1,146 @@ +import React, { useEffect, useCallback, useState } from 'react'; +import { Input, Button, Select, Dropdown, Icon, Menu, message } from 'antd'; +import CopyTool from '../Component/CopyTool'; +import { wikiPages, getWiki, } from './api'; +import { httpUrl } from './fetch'; +import './Index.scss'; +const InputGroup = Input.Group; +const { Option } = Select; + +export default (props) => { + + const { match, history, showNotification, project, projectDetail } = props; + const permission = projectDetail && projectDetail.permission && projectDetail.permission !== "Reporter"; + + let projectsId = match.params.projectsId; + let owner = match.params.owner; + + let projectName = match.params.projectName; + let projectId = match.params.projectId; + + console.log('projectName:'); + console.log(projectName); + + const [checkItem, setCheckItem] = useState({}); + const [itemDetail, setItemDetail] = useState({}); + + const [fileArr, setFileArr] = useState([]); + const [urlType, setUrlType] = useState('HTTPS'); + + useEffect(() => { + projectsId && wikiPages({ + owner: owner, + repo: projectsId, + projectId: projectId, + }).then(res => { + if (res && res.message === "200") { + setFileArr(res.data); + if (res.data.length) { + setCheckItem(res.data[0]); + }; + } else { + showNotification("加载失败") + } + }); + }, [project]) + + + useEffect(() => { + projectsId && checkItem.name && getWiki({ + owner: owner, + repo: projectsId, + pagename: checkItem.name, + projectId: projectId, + }).then(res => { + if (res && res.message === "200") { + setItemDetail(res.data); + } else { + showNotification("加载失败") + } + }); + }, [project, checkItem]); + + function goEdit() { + history.push(`/projects/${owner}/${projectsId}/wiki/edit/${checkItem.name}`); + } + + function goBack() { + history.push(`/projects/${owner}/${projectsId}/wiki`); + } + + // 支持 Markdown，Html，Pdf格式文件 + const menu = ( + + ); + + function downloadWiki(type) { + window.open(`${httpUrl}/api/wikiExport/wikiExport-wrapper?repoName=${projectsId}&owner=${owner}&type=${type}&projectName=${projectName}&projectId=${projectId}`); + } + + + return ( + ++ ) +} \ No newline at end of file diff --git a/src/forge/Wiki/Welcome/index.jsx b/src/forge/Wiki/Welcome/index.jsx new file mode 100644 index 00000000..78cd34e4 --- /dev/null +++ b/src/forge/Wiki/Welcome/index.jsx @@ -0,0 +1,50 @@ +import React from 'react'; +import { Button } from 'antd'; +// import { addWiki } from '../api'; +import './index.scss'; + +export default ({ project, isManager, history, showNotification, match, reloadList }) => { + + let projectsId = match.params.projectsId; + let owner = match.params.owner; + + // function addFile() { + // addWiki({ + // owner, + // repo: projectsId, + // pagename: 'Home', + // name: 'Home', + // content: 'Welcome to the wiki!', + // commit_message: '', + // }).then(res => { + // if (res.message === "200") { + // reloadList(Math.random()); + // showNotification("创建成功"); + // } else { + // showNotification("创建失败"); + // } + // }); + // } + + function addFile() { + history.push(`/projects/${owner}/${projectsId}/wiki/add`); + } + + return ( +++ + ++ + {projectName} +++ 克隆地址 + { + checkItem.wiki_clone_link &&++ + + + } + ++ + + +++ + ++ { + fileArr.map(item => { + return+ +{ setCheckItem(item) }}> + + + {item.name} + ++ }) + } + +++++ + +{checkItem.name}
+ {permission && } ++ ++ ) +} \ No newline at end of file diff --git a/src/forge/Wiki/Welcome/index.scss b/src/forge/Wiki/Welcome/index.scss new file mode 100644 index 00000000..b931fa62 --- /dev/null +++ b/src/forge/Wiki/Welcome/index.scss @@ -0,0 +1,55 @@ +.welcome-main { + display: flex; + flex-flow: column nowrap; + justify-content: center; + align-items: center; + width: 1200px; + min-height: 400px; + padding: 20px; + margin: 20px auto; + background: rgba(250, 252, 255, 1); + font-family: "PingFangSC-Medium"; + border-radius: 4px; + border: 1px solid rgba(42, 97, 255, 0.23); + + .icon-huanying_icon { + font-size: 48px !important; + font-weight: 700; + } + + .welcome-title { + display: inline-flex; + align-items: center; + margin: 10px 0; + font-size: 26px; + color: #333333; + font-weight: 500; + } + + .wiki-title { + display: inline-block; + max-width: 20em; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + + .welcome-content { + font-size: 14px; + color: #333333; + font-weight: 400; + } + + .wiki-line { + margin: 50px 0 40px; + width: 400px; + height: 1px; + background: #eeeeee; + } + + .welcome-des { + font-size: 16px; + color: #333333; + font-weight: 500; + } +} diff --git a/src/forge/Wiki/api.js b/src/forge/Wiki/api.js new file mode 100644 index 00000000..35338322 --- /dev/null +++ b/src/forge/Wiki/api.js @@ -0,0 +1,48 @@ +import fetch from './fetch'; +// import { notification } from 'antd'; + +// 获取wiki列表 +export function wikiPages(params) { + return fetch({ + url: '/api/wiki/wikiPages', + method: 'get', + params + }); +} + +// 获取单个wiki +export function getWiki(params) { + return fetch({ + url: '/api/wiki/getWiki', + method: 'get', + params + }); +} + +//新增wiki +export function addWiki(data) { + return fetch({ + url: '/api/wiki/createWiki', + method: 'post', + data: data + }); +} + +//更新wiki +export function updateWiki(data) { + return fetch({ + url: '/api/wiki/updateWiki', + method: 'PUT', + data: data + }); +} + +//删除wiki +export function deleteWiki(data) { + return fetch({ + url: '/api/wiki/deleteWiki', + method: 'DELETE', + data, + }); +} + diff --git a/src/forge/Wiki/components/FolderTree/index.js b/src/forge/Wiki/components/FolderTree/index.js new file mode 100644 index 00000000..bbcdb390 --- /dev/null +++ b/src/forge/Wiki/components/FolderTree/index.js @@ -0,0 +1,244 @@ +import * as React from 'react'; +import classNames from 'classnames'; +import { Icon, Tree } from 'antd'; +import omit from 'omit.js'; +import debounce from 'lodash/debounce'; +import { conductExpandParent, convertTreeToEntities } from 'rc-tree/lib/util'; +import { polyfill } from 'react-lifecycles-compat'; +import { ConfigConsumer } from '../../../../../node_modules/antd/lib/config-provider'; +import { + calcRangeKeys, + getFullKeyList, + convertDirectoryKeysToNodes, + getFullKeyListByTreeData, +} from '../../../../../node_modules/antd/lib/tree/util'; + +import { FolderSvg, FolderExpandSvg, FileSvg } from '../../Svg'; +import './index.scss'; + + +function getIcon(props) { + // console.log(props); + // console.log(props.expanded); + const { isLeaf, expanded ,selected} = props; + if (isLeaf) { + return欢迎使用 + + {project && project.name} + + Wiki
+Wiki主要是您项目的产品设计、文档描述、注释等等
+ + + { + isManager ? + :该项目暂时没有创建Wiki
+ } +; + } + return expanded ? : + // return +} + +class DirectoryTree extends React.Component { + static defaultProps = { + showIcon: true, + expandAction: 'click', + }; + + static getDerivedStateFromProps(nextProps) { + const newState = {}; + if ('expandedKeys' in nextProps) { + newState.expandedKeys = nextProps.expandedKeys; + } + if ('selectedKeys' in nextProps) { + newState.selectedKeys = nextProps.selectedKeys; + } + return newState; + } + + // state: DirectoryTreeState; + + // tree: Tree; + + // onDebounceExpand: (event: React.MouseEvent , node: AntTreeNode) => void; + + // Shift click usage + // lastSelectedKey?: string; + + // cachedSelectedKeys?: string[]; + + constructor(props) { + super(props); + + const { + defaultExpandAll, + defaultExpandParent, + expandedKeys, + defaultExpandedKeys, + children, + } = props; + const { keyEntities } = convertTreeToEntities(children); + + // Selected keys + this.state = { + selectedKeys: props.selectedKeys || props.defaultSelectedKeys || [], + }; + + // Expanded keys + if (defaultExpandAll) { + if (props.treeData) { + this.state.expandedKeys = getFullKeyListByTreeData(props.treeData); + } else { + this.state.expandedKeys = getFullKeyList(props.children); + } + } else if (defaultExpandParent) { + this.state.expandedKeys = conductExpandParent( + expandedKeys || defaultExpandedKeys, + keyEntities, + ); + } else { + this.state.expandedKeys = expandedKeys || defaultExpandedKeys; + } + + this.onDebounceExpand = debounce(this.expandFolderNode, 200, { + leading: true, + }); + } + + onExpand = (expandedKeys, info) => { + const { onExpand } = this.props; + + this.setUncontrolledState({ expandedKeys }); + + // Call origin function + if (onExpand) { + return onExpand(expandedKeys, info); + } + + return undefined; + }; + + onClick = (event, node) => { + const { onClick, expandAction } = this.props; + + // Expand the tree + if (expandAction === 'click') { + this.onDebounceExpand(event, node); + } + + if (onClick) { + onClick(event, node); + } + }; + + onDoubleClick = (event, node) => { + const { onDoubleClick, expandAction } = this.props; + + // Expand the tree + if (expandAction === 'doubleClick') { + this.onDebounceExpand(event, node); + } + + if (onDoubleClick) { + onDoubleClick(event, node); + } + }; + + onSelect = (keys, event) => { + const { onSelect, multiple, children } = this.props; + const { expandedKeys = [] } = this.state; + const { node, nativeEvent } = event; + const { eventKey = '' } = node.props; + + const newState = {}; + + // We need wrap this event since some value is not same + const newEvent = { + ...event, + selected: true, // Directory selected always true + }; + + // Windows / Mac single pick + const ctrlPick = nativeEvent.ctrlKey || nativeEvent.metaKey; + const shiftPick = nativeEvent.shiftKey; + + // Generate new selected keys + let newSelectedKeys; + if (multiple && ctrlPick) { + // Control click + newSelectedKeys = keys; + this.lastSelectedKey = eventKey; + this.cachedSelectedKeys = newSelectedKeys; + newEvent.selectedNodes = convertDirectoryKeysToNodes(children, newSelectedKeys); + } else if (multiple && shiftPick) { + // Shift click + newSelectedKeys = Array.from( + new Set([ + ...(this.cachedSelectedKeys || []), + ...calcRangeKeys(children, expandedKeys, eventKey, this.lastSelectedKey), + ]), + ); + newEvent.selectedNodes = convertDirectoryKeysToNodes(children, newSelectedKeys); + } else { + // Single click + newSelectedKeys = [eventKey]; + this.lastSelectedKey = eventKey; + this.cachedSelectedKeys = newSelectedKeys; + newEvent.selectedNodes = [event.node]; + } + newState.selectedKeys = newSelectedKeys; + + if (onSelect) { + onSelect(newSelectedKeys, newEvent); + } + + this.setUncontrolledState(newState); + }; + + setTreeRef = (node) => { + this.tree = node; + }; + + expandFolderNode = (event, node) => { + const { isLeaf } = node.props; + + if (isLeaf || event.shiftKey || event.metaKey || event.ctrlKey) { + return; + } + + // Get internal rc-tree + const internalTree = this.tree.tree; + + // Call internal rc-tree expand function + // https://github.com/ant-design/ant-design/issues/12567 + internalTree.onNodeExpand(event, node); + }; + + setUncontrolledState = (state) => { + const newState = omit(state, Object.keys(this.props)); + if (Object.keys(newState).length) { + this.setState(newState); + } + }; + + renderDirectoryTree = ({ getPrefixCls }) => { + const { prefixCls: customizePrefixCls, className, ...props } = this.props; + const { expandedKeys, selectedKeys } = this.state; + + const prefixCls = getPrefixCls('tree', customizePrefixCls); + const connectClassName = classNames(`${prefixCls}-directory`, className); + + return ( + + ); + }; + + render() { + return {this.renderDirectoryTree} ; + } +} + +polyfill(DirectoryTree); + +export default DirectoryTree; diff --git a/src/forge/Wiki/components/FolderTree/index.scss b/src/forge/Wiki/components/FolderTree/index.scss new file mode 100644 index 00000000..f74cfaf9 --- /dev/null +++ b/src/forge/Wiki/components/FolderTree/index.scss @@ -0,0 +1,61 @@ +.hide-file-icon.ant-tree.ant-tree-directory { + li span.ant-tree-switcher { + display: none !important; + } + + // li[role="treeitem"]:hover > span.ant-tree-switcher, + // li.ant-tree-treenode-selected > span.ant-tree-switcher { + // z-index: 1000; + // display: inline-block !important; + // } + + .ant-tree-node-content-wrapper{ + display: inline-flex; + width: 100%; + } + + .tree-title-icon{ + display: none; + } + + .ant-tree-node-content-wrapper:hover .tree-title-icon{ + transition: all 0.3s; + display: inline-block; + } + + &.ant-tree.ant-tree-directory + > li.ant-tree-treenode-selected + > span.ant-tree-node-content-wrapper::before, + &.ant-tree.ant-tree-directory + .ant-tree-child-tree + > li.ant-tree-treenode-selected + > span.ant-tree-node-content-wrapper::before { + background: #fff; + margin-top: -3px; + } + + &.ant-tree.ant-tree-directory > li span.ant-tree-node-content-wrapper::before, + &.ant-tree.ant-tree-directory + .ant-tree-child-tree + > li + span.ant-tree-node-content-wrapper::before { + margin-top: -3px; + } + + > li span.ant-tree-node-content-wrapper.ant-tree-node-selected, + .ant-tree-child-tree + > li + span.ant-tree-node-content-wrapper.ant-tree-node-selected { + color: #2a61ff; + } + + + + .ant-tree-title{ + display: inline-flex; + justify-content:space-between; + flex: auto; + } +} + + diff --git a/src/forge/Wiki/components/Login/index.jsx b/src/forge/Wiki/components/Login/index.jsx new file mode 100644 index 00000000..abfa5295 --- /dev/null +++ b/src/forge/Wiki/components/Login/index.jsx @@ -0,0 +1,40 @@ +import React, { useState } from 'react'; +import * as ReactDOM from 'react-dom'; +import LoginDialog from '../../../../modules/login/LoginDialog'; + +// 使用函数调用登录组件 +export default function Login(props) { + const div = document.createElement('div'); + document.body.appendChild(div); + + function destroy() { + const unmountResult = ReactDOM.unmountComponentAtNode(div); + if (unmountResult && div.parentNode) { + div.parentNode.removeChild(div); + } + } + + function render() { + setTimeout(() => { + ReactDOM.render( ++ , + div, + ); + }); + } + + render(); +} + +function MyLoginDialog({afterClose}) { + const [isRender, setIsRender] = useState(true); + return ( + {setIsRender(false);afterClose()}} + /> + ) +} + + diff --git a/src/forge/Wiki/components/ModalFun/index.jsx b/src/forge/Wiki/components/ModalFun/index.jsx new file mode 100644 index 00000000..d9a62e8f --- /dev/null +++ b/src/forge/Wiki/components/ModalFun/index.jsx @@ -0,0 +1,117 @@ +/* eslint-disable react/jsx-no-duplicate-props */ +import React, { useState } from 'react'; +import * as ReactDOM from 'react-dom'; +import { Modal, Button } from 'antd'; +import './index.scss'; + +InitModal.defaultProps = { + okText: '确认', //确定按钮的文字 + cancelText: '取消', //取消按钮的文字 + className: '', // + inputId: 'copyText', //要复制的文本的ID +}; + +// 使用函数调用删除组件 +export default function DelModal(props) { + renderModal({ ...props, type: 'delete' }) +} + +// 使用函数调用选择模态框组件 +export function Confirm(props) { + renderModal({ ...props, type: 'confirm' }) +} + +function renderModal(props) { + const { type, afterClose } = props; + const div = document.createElement('div'); + document.body.appendChild(div); + + function destroy() { + afterClose && afterClose(); + const unmountResult = ReactDOM.unmountComponentAtNode(div); + if (unmountResult && div.parentNode) { + div.parentNode.removeChild(div); + } + } + + function modalType(type) { + if (type === 'delete') { + return + + {props.contentTitle} + } + /> + } else if (type === 'confirm') { + return + } else { + return + } + } + + function render() { + setTimeout(() => { + ReactDOM.render( + modalType(type), + div, + ); + }); + } + render(); +} + +// 选择模态框组件 +function InitModal({ + onCancel, + onOk, + title, + contentTitle, + content, + okText, + cancelText, + afterClose, + className, +}) { + + const [visible, setVisible] = useState(true); + + function onCancelModal() { + setVisible(false); + onCancel && onCancel() + } + + function onSuccess() { + setVisible(false); + onOk && onOk(); + } + + return ( + + {cancelText} + , + , + ]} + > + + ) +} diff --git a/src/forge/Wiki/components/ModalFun/index.scss b/src/forge/Wiki/components/ModalFun/index.scss new file mode 100644 index 00000000..24f7b021 --- /dev/null +++ b/src/forge/Wiki/components/ModalFun/index.scss @@ -0,0 +1,63 @@ +.myself-modal { + .ant-modal-header { + padding: 9px 24px; + background: #f8f8f8; + border-bottom: 1px solid #eee; + } + .ant-modal-title { + text-align: left; + } + .ant-modal-close { + top: 0px !important; + } + .ant-modal-close-x { + font-size: 24px; + } + .ant-modal-body { + text-align: center; + } + .content-title { + display: flex; + justify-content: center; + align-items: center; + margin: 2rem 0 1rem !important; + font-size: 16px; + color: #333; + letter-spacing: 0; + line-height: 29px; + font-weight: 400; + } + .red-circle { + align-self: flex-start; + color: #ca0002; + font-size: 1.5rem !important; + } + .content-descibe { + font-size: 14px; + color: #666; + line-height: 33px; + font-weight: 400; + } + .ant-modal-footer { + padding: 2rem 0; + text-align: center; + border: 0; + .ant-btn { + width: 6rem; + } + } + .foot-submit { + margin-left: 3rem; + color: #df0002; + &:hover { + border-color: #df0002; + } + } + .ant-btn-default:hover, + .ant-btn-default:active, + .ant-btn-default:focus { + background: #f3f4f6; + color: #333; + border-color: #d0d0d0; + } +} \ No newline at end of file diff --git a/src/forge/Wiki/components/config.js b/src/forge/Wiki/components/config.js new file mode 100644 index 00000000..bda41339 --- /dev/null +++ b/src/forge/Wiki/components/config.js @@ -0,0 +1,29 @@ +import { httpUrl } from '../fetch'; + +export const editorConfig = { + placeholder: '请输入', + uploadImgServer: httpUrl + '/busiAttachments/upload', + uploadFileName: 'file', + uploadImgHeaders: { + 'X-Requested-With': 'XMLHttpRequest' + }, + excludeMenus: [ + 'list', + 'todo', + 'emoticon', + 'video' + ], + uploadImgHooks: { + // 图片上传并返回了结果，想要自己把图片插入到编辑器中 + customInsert: function (insertImgFn, result) { + // insertImgFn 可把图片插入到编辑器，传入图片 src ，执行函数即可 + if (result && result.data && result.data.id) { + insertImgFn(`${httpUrl}/busiAttachments/view/${result.data.id}`); + } + } + }, +} + + +export const weekModal="| 工作项目 | 本周工作计划 | 本周完成情况 |下周计划 | 待协同事项 |\n| ------------ | ------------ | ------------ | ------------ | ------------ |\n| | | | | |\n| | | | | |\n| | | | | |\n| | | | | |\n\n 备注:"; +export const monthModal="|工作项目 | 工作内容 | 项目进度情况 | 问题列表及解决方案| 下月工作计划 | 遗留未解决的问题 |\n| ------------ | ------------ | ------------ | ------------ | ------------ | ------------ |\n| | | | | | |\n| | | | | | |\n| | | | | | |\n| | | | | | |\n\n 月度总结："; diff --git a/src/forge/Wiki/fetch.js b/src/forge/Wiki/fetch.js new file mode 100644 index 00000000..9f0e6901 --- /dev/null +++ b/src/forge/Wiki/fetch.js @@ -0,0 +1,106 @@ +import { notification ,message} from 'antd'; +import axios from 'axios'; +import cookie from 'react-cookies'; +import Login from './components/Login'; + +let actionUrl = ''; +if (window.location.href.indexOf('localhost') > -1) { + // actionUrl = 'http://117.50.100.12:8008'; + // actionUrl = 'http://192.168.31.74:8081'; + actionUrl = "https://test-search.trustie.net"; +} else if(window.location.href.indexOf('testforgeplus')>-1){ + actionUrl = "https://test-search.trustie.net"; + // actionUrl = 'https://testforgeplus.trustie.net'; + axios.defaults.withCredentials = true; +}else if (window.location.href.indexOf('forgeplus') > -1) { + actionUrl = "https://wiki-api.trustie.net"; + axios.defaults.withCredentials = true; +} + +export const httpUrl = actionUrl; +export const TokenKey = 'autologin_trustie'; + +// 创建axios实例 +const service = axios.create({ + baseURL: httpUrl, + timeout: 10000, // 请求超时时间 +}); + +// request拦截器 +service.interceptors.request.use(config => { + if (cookie.load(TokenKey)) { + console.log(cookie.load(TokenKey)); + config.headers['Authorization'] = cookie.load(TokenKey); // 让每个请求携带自定义token 请根据实际情况自行修改 + } + if (window.location.port === "3007") { + // 模拟token为登录用户 + const taskToken = sessionStorage.taskToken; + if (config.url.indexOf('?') === -1) { + config.url = `${config.url}?token=${taskToken}`; + } else { + config.url = `${config.url}&token=${taskToken}`; + } + } + return config; +}, error => { + // Do something with request error + console.log(error); // for debug + // Promise.reject(error); +}); +// respone拦截器 +service.interceptors.response.use( + response => { + const res = response||{}; + if (res.status === 400) { + message.error(res.data.message || '操作失败'); + return Promise.reject('error'); + } + if (res.status === 401) { + message.error(res.data.message || '登录信息已过期'); + return Promise.reject('error'); + } + if (res.status === 403) { + message.error(res.data.message || '无权限！'); + return Promise.reject('error'); + } + if (res.status === 40001) { + notification.open({ + message: "提示", + description: '账户或密码错误！', + }); + return Promise.reject('error'); + } + if (response.status !== 200 && res.status !== 200) { + notification.open({ + message: "提示", + description: res.message, + }); + } else { + return response.data; + } + }, + error => { + console.log(error); + let res = error.response||{}; + if (res.status === 400) { + message.error(res.data.message || '操作失败'); + return Promise.reject('error'); + } + if (res.status === 401) { + message.error(res.data.message || '登录信息已过期'); + Login(); + return Promise.reject('error'); + } + if (res.status === 403) { + message.error(res.data.message || '无权限！'); + return Promise.reject('error'); + } + notification.open({ + message: "提示", + description: error.message, + }); + return Promise.reject(error); + } +); + +export default service; diff --git a/src/forge/users/Index.scss b/src/forge/users/Index.scss index b087fa2f..3595aa84 100644 --- a/src/forge/users/Index.scss +++ b/src/forge/users/Index.scss @@ -105,6 +105,7 @@ $flex:flex; word-break: break-all; text-align: justify; font-size: 16px; + text-align: center; } .focusBox,.infoBox{ width: 100%!important; diff --git a/src/forge/users/Infos.js b/src/forge/users/Infos.js index a588cb8b..abff899d 100644 --- a/src/forge/users/Infos.js +++ b/src/forge/users/Infos.js @@ -194,7 +194,7 @@ class Infos extends Component { render() { const { current_user } = this.props; const { username } = this.props.match.params; - const { user, isSpin, route_type , undo_events , menuKey } = this.state; + const { user, isSpin, route_type , undo_events , menuKey , project_type } = this.state; return (+ {contentTitle &&+{contentTitle}
} +{content}
+@@ -276,6 +276,97 @@ class Infos extends Component { } ++ ):""} + +++- +
+this.undo_link()}> + + + 待办事项 + + + {user.undo_events} + +
+++ { + current_user && current_user.login && current_user.login === username && +-
+
- this.change_project_type(undefined)}> + + 项目类型 + + +
- this.change_project_type("common")}>
+
+ 开源托管项目 + + {user && user.common_projects_count} + +
+
+ - this.change_project_type("mirror")}>
+
+ 开源镜像项目 + + {user && user.mirror_projects_count} + +
+
+ - this.change_project_type("sync_mirror")}>
+
+ 镜像托管项目 + + {user && user.sync_mirror_projects_count} + +
+
+
++ } +-
+
- + + DevOps工作流 + + +
- this.change_devops_type("CIService")}>
+
+ CI服务 +
+
+ {/* - this.change_devops_type("CDService")}>
+
+ CD服务 + + {user && user.common_projects_count} + +
+ */}
+
+++- +
+this.organize_link()} > + + + 组织 + + + {user && user.user_org_count} + +
+{ !route_type && menuKey && diff --git a/src/forge/users/Team.jsx b/src/forge/users/Team.jsx index 9378106e..bf401d2c 100644 --- a/src/forge/users/Team.jsx +++ b/src/forge/users/Team.jsx @@ -5,6 +5,7 @@ import Search from '../Component/Search'; import Item from './Team-item'; import Nodata from '../Nodata'; import axios from 'axios'; +import { Link } from 'react-router-dom'; const limit = 15; function Team(props){ @@ -14,7 +15,7 @@ function Team(props){ const [ sort_direction , setSort_direction ] = useState("asc"); const [ sort_by ,setSort_by ] = useState("created_at"); const [ search ,setSearch ] = useState(undefined); - + const { checkIfLogin , showLoginDialog } = props; const { username } = props.match.params; useEffect(()=>{ if(username){ @@ -47,14 +48,6 @@ function Team(props){ ) - function newFunc() { - const { checkIfLogin , showLoginDialog } = props; - if(checkIfLogin()){ - props.history.push(`/organize/new`); - }else{ - showLoginDialog && showLoginDialog(); - } - } return(@@ -62,7 +55,10 @@ function Team(props){setSearch(e.target.value)} placeholder="请输入组织名称关键字进行搜索" onSearch={onSearch}/> - 新建组织 + { + checkIfLogin() && + 新建组织 + }
排序 diff --git a/src/forge/users/undo_events.js b/src/forge/users/undo_events.js deleted file mode 100644 index cea2792a..00000000 --- a/src/forge/users/undo_events.js +++ /dev/null @@ -1,16 +0,0 @@ -import React, { Component } from "react"; -import Nodata from "../Nodata"; -class UndoEvents extends Component { - - render() { - return ( --- ); - } -} -export default UndoEvents; diff --git a/src/index.css b/src/index.css index 658577e5..e58df61f 100644 --- a/src/index.css +++ b/src/index.css @@ -41,9 +41,6 @@ z-index: 1000 !important; } -.markdown-body p { - margin: 0 !important -} .markdown-body img{ cursor: pointer; }--待办事项
-- - -
-
{
- menuName.map((item,key)=>{
+ Array.isArray(menuName)&& menuName.map((item,key)=>{
return(
-