-
-
- );
+ return ""
}
}
diff --git a/src/college/College.js b/src/college/College.js
index 85d43fb7e..f7a3ab6c7 100644
--- a/src/college/College.js
+++ b/src/college/College.js
@@ -195,7 +195,7 @@ class College extends Component {
align: 'center',
className: "edu-txt-center font-14 maxnamewidth105",
render: (text, record) => (
- {
diff --git a/src/college/colleagecss/colleage.css b/src/college/colleagecss/colleage.css
index 9220b8acc..65f32322a 100644
--- a/src/college/colleagecss/colleage.css
+++ b/src/college/colleagecss/colleage.css
@@ -218,7 +218,7 @@ a:hover {
}
.color-blue {
- color: #4CACFF;
+ color: #2A61FF;
}
.color-huang {
diff --git a/src/common/DateUtil.js b/src/common/DateUtil.js
index 859182e18..8846d274c 100644
--- a/src/common/DateUtil.js
+++ b/src/common/DateUtil.js
@@ -1,4 +1,5 @@
import moment from "moment";
+import { number } from "prop-types";
// 处理整点 半点
// 取传入时间往后的第一个半点
@@ -97,3 +98,41 @@ export function formatDuring(mss){
}
return days + "天" + hours + "小时" + minutes + "分";
}
+
+/*
+ 返回：多久以前
+ backDate：以前的某个日期
+*/
+export function timeAgo(backDate) {
+ try {
+ moment(backDate);
+ } catch (e) {
+ return '刚刚';
+ }
+ if(typeof backDate ==='number'){
+ backDate=backDate*1000
+ }else{
+ backDate= moment(backDate);
+ }
+ let time = new Date() - backDate;
+ var days = Math.floor(time / (1000 * 60 * 60 * 24));
+ var hours = Math.floor((time % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
+ var minutes = Math.floor((time % (1000 * 60 * 60)) / (1000 * 60));
+ var seconds = Math.floor((time % (1000 * 60 * 60)) / 1000);
+ if (time <= 0) {
+ return "刚刚";
+ }
+ if (days) {
+ return days + "天前";
+ }
+ if (hours) {
+ return hours + "小时前";
+ }
+ if (minutes) {
+ return minutes + "分前";
+ }
+ if (seconds) {
+ return seconds + "秒前";
+ }
+ return "刚刚";
+}
\ No newline at end of file
diff --git a/src/common/TextUtil.js b/src/common/TextUtil.js
index 94e736314..d1aa0e9cd 100644
--- a/src/common/TextUtil.js
+++ b/src/common/TextUtil.js
@@ -69,7 +69,7 @@ export function appendFileSizeToUploadFile(item) {
}
export function appendFileSizeToUploadFileAll(fileList) {
return fileList.map(item => {
- if (item.name.indexOf(uploadNameSizeSeperator) == -1) {
+ if (item.name.indexOf(uploadNameSizeSeperator) === -1) {
return Object.assign({}, item, { name: `${item.name}${uploadNameSizeSeperator}${bytesToSize(item.size)}` })
}
return item
diff --git a/src/common/UrlTool.js b/src/common/UrlTool.js
index 07e141ebf..f1800a75d 100644
--- a/src/common/UrlTool.js
+++ b/src/common/UrlTool.js
@@ -18,6 +18,23 @@ export function getImageUrl(path) {
return `${path}`;
}
+export function numFormat(num, digits){
+ let d = digits || 1;
+ var si = [
+ { value: 1, symbol: "" },
+ { value: 1E3, symbol: "k" },
+ { value: 1E4, symbol: "W" }
+ ];
+ var rx = /\.0+$|(\.[0-9]*[1-9])0+$/;
+ var i;
+ for (i = si.length - 1; i > 0; i--) {
+ if (num >= si[i].value) {
+ break;
+ }
+ }
+ return (num / si[i].value).toFixed(d).replace(rx, "$1") + si[i].symbol;
+}
+
export function getImage(path) {
// https://www.educoder.net
// https://testbdweb.trustie.net
diff --git a/src/common/educoder.js b/src/common/educoder.js
index 1fc868930..1a063d823 100644
--- a/src/common/educoder.js
+++ b/src/common/educoder.js
@@ -3,7 +3,7 @@
// export { default as OrderStateUtil } from '../routes/Order/components/OrderStateUtil';
export {
- getUploadLogoActionUrl as getUploadLogoActionUrl,
+ getUploadLogoActionUrl as getUploadLogoActionUrl,numFormat as numFormat,
getImageUrl as getImageUrl,getImage as getImage, getmyUrl as getmyUrl, getRandomNumber as getRandomNumber, getUrl as getUrl, publicSearchs as publicSearchs, getRandomcode as getRandomcode, getUrlmys as getUrlmys, getUrl2 as getUrl2, setImagesUrl as setImagesUrl
, getUploadActionUrl as getUploadActionUrl, getUploadActionUrltwo as getUploadActionUrltwo, getUploadActionUrlthree as getUploadActionUrlthree, getUploadActionUrlOfAuth as getUploadActionUrlOfAuth
, getTaskUrlById as getTaskUrlById, TEST_HOST, htmlEncode as htmlEncode, getupload_git_file as getupload_git_file, getcdnImageUrl as getcdnImageUrl
@@ -27,7 +27,7 @@ export {
markdownToHTML, uploadNameSizeSeperator, appendFileSizeToUploadFile, appendFileSizeToUploadFileAll, isImageExtension,
downloadFile, sortDirections, validateLength, mdJSONParse, exportMdtoHtml
} from './TextUtil'
-export { handleDateString, getNextHalfHourOfMoment, formatDuring, formatSeconds } from './DateUtil'
+export { handleDateString, getNextHalfHourOfMoment, formatDuring, formatSeconds ,timeAgo} from './DateUtil'
export { configShareForIndex, configShareForPaths, configShareForShixuns, configShareForCourses, configShareForCustom } from './util/ShareUtil'
diff --git a/src/components/render-html.jsx b/src/components/render-html.jsx
index 3601ea323..b24fc092a 100644
--- a/src/components/render-html.jsx
+++ b/src/components/render-html.jsx
@@ -46,18 +46,18 @@ export default ({
let id = decodeURIComponent(u.split("#")[1]);
let ele = document.getElementById(id);
if(ele){
- window.scrollTo(0, ele.offsetTop + 220);
+ window.scrollTo(0, ele.offsetTop + 120);
}
}
}
- },[url])
+ },[url,html])
const el = useRef();
function onAncherHandler(e) {
- let target = e.target
+ let target = e.target;
if (target.tagName.toUpperCase() === 'A') {
- let ancher = target.getAttribute('href')
- if (ancher.startsWith('#')) {
+ let ancher = target.getAttribute('href');
+ if (ancher && ancher.startsWith('#')) {
e.preventDefault()
let viewEl = document.getElementById(ancher.replace('#', ''))
if (viewEl) {
diff --git a/src/context/TPIContextProvider.js b/src/context/TPIContextProvider.js
index 22b247272..f3ea3e0fd 100644
--- a/src/context/TPIContextProvider.js
+++ b/src/context/TPIContextProvider.js
@@ -435,11 +435,11 @@ class TPIContextProvider extends Component {
image_url: "avatars/User/1"
login: "innov"
name: "Coder"
- user_url: "/users/innov"
+ user_url: "/innov"
*/
let user = resData.user;
user.username = resData.user.name;
- user.user_url = `/users/${resData.user.login}`;
+ user.user_url = `/${resData.user.login}`;
// user.image_url = resData.image_url;
user.is_teacher = resData.is_teacher;
resData.user = user;
diff --git a/src/forge/About/Index.jsx b/src/forge/About/Index.jsx
index ce3599667..b36b815cf 100644
--- a/src/forge/About/Index.jsx
+++ b/src/forge/About/Index.jsx
@@ -69,7 +69,7 @@ function Index(props){
暂无简介~
+ 暂无概览~
}
{attachments && attachments.length > 0 &&
- {item.name} + {item.name} {item.trend_type}
: // 如果是合并请求- {item.name} + {item.name} {item.trend_type}
}
-
+
{item.user_name}
diff --git a/src/forge/Branch/CloneAddress.js b/src/forge/Branch/CloneAddress.js
index 89cd3f4e0..c2e6dd746 100644
--- a/src/forge/Branch/CloneAddress.js
+++ b/src/forge/Branch/CloneAddress.js
@@ -1,39 +1,27 @@
-import React, { Component } from 'react';
-import { Dropdown, Icon, Tooltip } from 'antd';
-import "./branch.css";
+import React, { useState } from 'react';
+import { Menu } from 'antd';
+import "./branch.scss";
+import CopyTool from '../Component/CopyTool';
-class CloneAddress extends Component {
- // 点击按钮复制功能
- jsCopy = () => {
- var e = document.getElementById("copy_rep_content");
- e.select();
- document.execCommand("Copy");
- }
-
- render() {
- const { http_url, downloadUrl } = this.props;
- return (
-
- {/*
- this.jsCopy()}>
-
- {
- downloadUrl &&
-
-
-
-
-
- }
+function CloneAddress({http_url , ssh_url , zip_url , tar_url}) {
+ const [ key , setKey ] = useState("HTTP");
+ return (
+ setFlag(!flag)} overlayClassName="branch-tagBox-list">
+
+
)
})
\ No newline at end of file
diff --git a/src/forge/Branch/SelectOverlay.jsx b/src/forge/Branch/SelectOverlay.jsx
new file mode 100644
index 000000000..bb1774daa
--- /dev/null
+++ b/src/forge/Branch/SelectOverlay.jsx
@@ -0,0 +1,84 @@
+import React , { useState , useEffect } from 'react';
+import { Input , Spin , Menu } from 'antd';
+import { getBranch , getTag } from '../GetData/getData';
+
+function SelectOverlay({ changeBranch , tagflag , branchList , projectsId , owner }) {
+ const [ inputValue , setInputValue] = useState(undefined);
+ const [ nav , setNav ] = useState(0);
+ const [ isSpin , setIsSpin ] = useState(true);
+
+ const [ data , setData ] = useState(undefined);
+ const [ datas , setDatas ] = useState(undefined);
+ const [ keys ,setKeys] = useState("branch");
+
+ useEffect(()=>{
+ if(branchList){
+ setData(branchList);
+ setDatas(branchList);
+ setIsSpin(false);
+ }
+ },[branchList])
+
+ async function getBranchs(id,owner){
+ let result = await getBranch(id,owner);
+ setData(result);
+ setDatas(result);
+ setIsSpin(false);
+ }
+ async function getTags(id,owner){
+ let result = await getTag(id,owner);
+ setData(result);
+ setDatas(result);
+ setIsSpin(false);
+ }
+ function chooseitem(value){
+ changeBranch(value);
+ }
+ function changeInputValue(e){
+ setInputValue(e.target.value);
+ let filter = e.target.value ? data && data.length>0 && data.filter(item=>item.name.indexOf(e.target.value)>-1) : data;
+ setDatas(filter);
+ }
+
+ function changeNav(e){
+ setKeys(e.key);
+ setIsSpin(true);
+ if(e.key === "branch"){
+ getBranchs(projectsId,owner);
+ }else{
+ getTags(projectsId,owner);
+ }
+ }
+
+ return(
+
)
diff --git a/src/forge/Component/Component.scss b/src/forge/Component/Component.scss
index 12a899d89..30a62005c 100644
--- a/src/forge/Component/Component.scss
+++ b/src/forge/Component/Component.scss
@@ -113,7 +113,14 @@ li.ant-menu-item{
z-index: 10000;
}
.laterest{
- color: #05690d;
+ background-color: #EF3131;
+ color: #fff;
+ font-size: 12px;
+ margin-left: 10px;
+ padding:0px 5px;
+ border-radius: 2px;
+ height: 18px;
+ line-height: 18px;
}
@media screen and (max-width: 1800px){
@@ -155,41 +162,280 @@ li.ant-menu-item{
margin:0px 20px!important;
}
}
-
+.hoverA{
+ display:flex;
+ align-items: center;
+ max-width: 78px;
+ &:hover a{
+ color:#2A61FF !important ;
+ }
+}
.menuPanels{
- width: 240px;
- height: 180px;
+ width: 295px;
+ .leftline{
+ position: relative;
+ color: #666;
+ height: 16px;
+ margin-left: 14px;
+ font-size: 12px;
+ &::before{
+ position: absolute;
+ left: -7px;
+ top:3px;
+ height: 12px;
+ width: 1px;
+ background-color: #999;
+ content: "";
+ }
+ }
+ .ant-btn{
+ height: 36px;
+ line-height: 34px;
+ width: 83px;
+ text-align: center;
+ padding:0px ;
+ font-weight: 500;
+ font-size: 14px;
+ &.currentBtn{
+ cursor: default;
+ color: #333;
+ &:hover{
+ color: #333;
+ border-color: #d0d0d0;
+ }
+ }
+ }
+ .ant-btn-default{
+ color: #333;
+ border-color: #d0d0d0;
+ &:hover{
+ background: #F3F4F6;
+ }
+ }
+ .ant-btn{
+ width: 102px;
+ height: 32px;
+ line-height: 30px;
+ }
+ .ant-btn-primary{
+ color: #fff;
+ background-color: #466AFF;
+ border:none;
+ &:hover{
+ background-color: rgba(70,106,255,0.85);
+ }
+ }
+ .focusPanelHeadInfo{
+ padding:14px 16px;
+ border-bottom: 1px solid #eee;
+ }
.ant-popover-content,.ant-popover-inner{
height: 100%;
width: 100%;
}
+ .ant-popover-inner-content{
+ padding:0px;
+ }
}
.halfs{
margin-top: 24px;
padding:24px 0px 0px 0px;
border-top: 1px solid #e8e8e8;
- .attrPerson{
- padding-bottom: 24px;
- }
+}
+.aboutSubTitle{
+ display: flex;
+ align-items: center;
+}
+.menuMaininfos{
+ padding:10px 16px 14px;
+ border-bottom: 1px solid #eee;
}
.menuinfos{
- padding:15px 0px;
+ padding:10px 20px 16px;
&>a{
display: flex;
flex-direction: column;
align-items: center;
- border-right: 1px solid #eee;
flex: 1;
& >span:first-child{
- font-size: 18px;
- font-weight: 400;
+ font-size: 16px;
+ font-weight: 500;
color: #333;
+ line-height: 22px;
}
& >span:last-child{
color: #666;
- }
- &:last-child{
- border-right: none;
+ font-weight: 400;
+ line-height: 20px;
+ margin-top: 6px;
}
}
-}
\ No newline at end of file
+}
+
+/*-------------------个人主页：右侧提示区域--------------------------*/
+.-task-sidebar {
+ position: fixed;
+ width: 40px;
+ right: 0;
+ bottom: 80px;
+ z-index: 10;
+}
+
+@media screen and (max-width: 1920px){
+ .-task-sidebar{
+ right:220px;
+ }
+}
+@media screen and (max-width: 1750px){
+ .-task-sidebar{
+ right:160px;
+ }
+}
+@media screen and (max-width: 1650px){
+ .-task-sidebar{
+ right:115px;
+ }
+}
+@media screen and (max-width: 1550px){
+ .-task-sidebar{
+ right:90px;
+ }
+}
+@media screen and (max-width: 1450px){
+ .-task-sidebar{
+ right:45px;
+ }
+}
+@media screen and (max-width: 1200px){
+ .-task-sidebar{
+ right:0px;
+ display: none;
+ }
+}
+.-task-sidebar>div {
+ height: 40px;
+ line-height: 40px;
+ box-sizing: border-box;
+ width: 40px;
+ color: #999;
+ font-size: 20px;
+ text-align: center;
+ margin-bottom: 20px;
+ border-radius: 50%;
+ background: #FFFFFF;
+ box-shadow: 0px 0px 10px 1px #F1F1F1;
+}
+
+.-task-sidebar>div i {
+ color: #999;
+}
+
+.-task-sidebar>div:hover i {
+ color: #fff !important;
+}
+.-task-sidebar>div:hover{
+ background: #1890FF;
+ box-shadow: 0px 0px 10px 2px #B6D0FC;
+}
+.helpBox{
+ width: 260px;
+ z-index: 103;
+ &.shareContent{
+ width: 200px;
+ }
+ .ant-popover-inner-content{
+ padding:0px;
+ }
+ p.titlecontent{
+ font-size: 18px;
+ color: #333;
+ line-height: 20px;
+ padding:15px 20px;
+ }
+ .faqUl{
+ padding:0px 20px 10px;
+ max-height: 230px;
+ overflow-y: auto;
+ li{
+ background: #F5F5F5;
+ border-radius: 20px;
+ padding:0px 20px;
+ color: #333;
+ height: 34px;
+ line-height: 34px;
+ margin-bottom: 10px;
+ a{
+ display: block;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
+ }
+ &:hover{
+ background-color: #D1E9FF;
+ a{
+ color: #333!important;
+ }
+ }
+ }
+ }
+ .shareUl{
+ padding:10px 0px;
+ display: flex;
+ align-items: center;
+ .titlecontent{
+ margin-right: 20px;
+ }
+ li > i{
+ font-size: 32px!important;
+ }
+ }
+}
+
+
+
+.-task-desc {
+ background: #494949;
+ width: 90px;
+ line-height: 36px;
+ text-align: center;
+ position: absolute;
+ color: #fff;
+ font-size: 13px;
+ z-index: 999999;
+ opacity: 0;
+}
+
+.-task-desc div {
+ position: absolute;
+ top: 10px;
+ right: -7px;
+ height: 13px;
+}
+
+.-task-desc div img {
+ float: left
+}
+
+.-task-sidebar .scan_ewm {
+ position: absolute !important;
+ right: 45px !important;
+ bottom: 0px !important;
+ background-color: #494949 !important;
+ -webkit-box-sizing: border-box !important;
+ box-sizing: border-box !important;
+ font-size: 14px !important;
+ line-height: 16px !important;
+ display: none;
+ height: 213px !important;
+}
+
+.trangle_right {
+ position: absolute;
+ right: -5px;
+ bottom: 15px;
+ width: 0;
+ height: 0px;
+ border-top: 6px solid transparent;
+ border-left: 5px solid #494949;
+ border-bottom: 6px solid transparent
+}
diff --git a/src/forge/Component/Contributors.jsx b/src/forge/Component/Contributors.jsx
index 1e26354a5..e88acc056 100644
--- a/src/forge/Component/Contributors.jsx
+++ b/src/forge/Component/Contributors.jsx
@@ -1,13 +1,13 @@
import React, { useEffect, useState } from 'react';
import { AlignCenter , FlexAJ } from '../Component/layout';
import { Link } from 'react-router-dom';
-import { Popover , Spin } from 'antd';
+import { Popover , Spin , Button } from 'antd';
import { getImageUrl } from 'educoder';
import './Component.scss';
import { getUser } from '../GetData/getData';
import axios from 'axios';
-function Contributors({contributors,owner,projectsId}){
+function Contributors({contributors,owner,projectsId,currentLogin}){
const [ menuList ,setMenuList ]= useState([]);
const [ list , setList ]= useState(undefined);
const [ total , setTotal ]= useState(0);
@@ -46,46 +46,60 @@ function Contributors({contributors,owner,projectsId}){
}
}
+ function renderOrganize(list) {
+ let str = "";
+ list.map(i=>{
+ str = str+i.name + "、";
+ })
+ return str && str.substr(0,str.length - 1);
+ }
+
function setMenusFunc(data){
if(data){
let ele = (
版本库地址已变更，请基于新地址提交代码
*/} - { - http_url && HTTP - } - -
+
+ )
}
export default CloneAddress;
\ No newline at end of file
diff --git a/src/forge/Branch/Select.jsx b/src/forge/Branch/Select.jsx
index f33a716fb..601b94e8b 100644
--- a/src/forge/Branch/Select.jsx
+++ b/src/forge/Branch/Select.jsx
@@ -1,116 +1,36 @@
import React , { useState , useEffect } from 'react';
-import { Popover , Input , Spin } from 'antd';
-import './branch.css';
+import { Popover , Dropdown , Input , Spin } from 'antd';
+import './branch.scss';
import { getBranch , getTag } from '../GetData/getData';
+import SelectOverlay from './SelectOverlay';
export default (({ projectsId , branch , owner , changeBranch , branchList , tagflag = true })=>{
const [ showValue , setShowValue ] = useState(branch);
- const [ inputValue , setInputValue] = useState(undefined);
- const [ nav , setNav ] = useState(0);
- const [ isSpin , setIsSpin ] = useState(true);
- const [ flag , setFlag ] = useState(false);
-
- const [ data , setData ] = useState(undefined);
- const [ datas , setDatas ] = useState(undefined);
useEffect(()=>{
setShowValue(branch);
},[branch])
- useEffect(()=>{
- document.body.addEventListener('click', e => {
- let name = e.target.className;
- let turn = name === "ant-input OptionsInput" || name === "navli active"|| name === "navli" || name === "padding10 bor-bottom-greyE";
- if(turn){
- return;
- }else{
- setFlag(false);
- }
- })
- })
-
- useEffect(()=>{
- if(branchList){
- setData(branchList);
- setDatas(branchList);
- setIsSpin(false);
- }
- },[branchList])
-
-
- async function getBranchs(id,owner){
- let result = await getBranch(id,owner);
- setData(result);
- setDatas(result);
- setIsSpin(false);
- }
- async function getTags(id,owner){
- let result = await getTag(id,owner);
- setData(result);
- setDatas(result);
- setIsSpin(false);
- }
-
- function changeInputValue(e){
- setInputValue(e.target.value);
- let filter = e.target.value ? data && data.length>0 && data.filter(item=>item.name.indexOf(e.target.value)>-1) : data;
- setDatas(filter);
- }
-
- function changeNav(nav){
- setNav(nav);
- setIsSpin(true);
- if(nav === 0){
- getBranchs(projectsId,owner);
- }else{
- getTags(projectsId,owner);
- }
- }
- function chooseitem(value){
- // setShowValue(value);
- changeBranch(value);
- }
-
-
const menu = (
-
+
+
- )
- }
+
+
+
+
-
-
-
+
-
-
- -
-
- changeNav(0)}>分支列表 - { tagflag &&
- changeNav(1)}>标签列表 } -
-
- {
- datas && datas.length>0 ?
- datas.map((item,key)=>{
- return(
-
- chooseitem(item.name)}>{item.name} - ) - }): -
暂无{inputValue}{nav === 0 ?"分支":"标签"}~
- } -
{/* {nav === 0 ?"分支":"标签"} */}
-
+
{showValue}
-
-
+
+
-
+
+
+
+ )
+}
+export default SelectOverlay;
\ No newline at end of file
diff --git a/src/forge/Branch/branch.css b/src/forge/Branch/branch.css
deleted file mode 100644
index 962b01970..000000000
--- a/src/forge/Branch/branch.css
+++ /dev/null
@@ -1,84 +0,0 @@
-.branchDropdown{
- border:1px solid #eee;
- border-radius: 4px;
- display: flex;
- justify-content: center;
- height: 40px;
- line-height: 40px;
- min-width: 220px;
-}
-.branchDropdown .ant-dropdown-trigger{
- width: 100%;
- padding:0px 15px;
- display: flex;
- justify-content: space-between;
- align-items: center;
- cursor: pointer;
-}
-.branchOptions{
- width: 220px;
- box-shadow: 0px 0px 3px 1px rgba(134, 134, 134, 0.4);
- border-radius: 3px;
- background: #fff;
- max-height: 300px;
-}
-.OptionsUl{
- max-height: 220px;
- overflow-y: auto;
-}
-.OptionsUl li{
- height: 35px;
- line-height: 35px;
- cursor: pointer;
- padding:0px 10px;
-}
-.OptionsUl li:hover{
- background-color: #F0F0F0;
-}
-.OptionsUl li a{
- display: block;
-}
-.OptionsInput{
- height: 32px;
- padding-left: 4px;
- line-height: 32px;
- width: 100%;
-}
-.branch-tagBox{
- border:1px solid #eee;
- border-radius: 3px;
- height: 40px;
- display: flex;
- align-items: center;
- cursor: pointer;
- min-width: 140px;
-}
-.branch-tagBox-list .ant-popover-arrow{
- display: none;
-}
-.branch-tagBox-list.ant-popover.ant-popover-placement-bottom{
- padding-top:0px;
-}
-.branch-tagBox .ant-dropdown-link{
- display: block;
- flex:1;
-}
-.branch-tagBox-list .ant-popover-inner-content{
- padding:0px;
-}
-.navUl{
- display: flex;
- justify-content: space-between;
- align-items: center;
- margin-top: 5px;
-}
-.navUl li{
- cursor: pointer;
-}
-.navUl li.active{
- color:#5091FF;
-}
-.listTips{
- padding:20px 0px;
- text-align: center;
-}
\ No newline at end of file
diff --git a/src/forge/Branch/branch.scss b/src/forge/Branch/branch.scss
new file mode 100644
index 000000000..b0f8ca2c9
--- /dev/null
+++ b/src/forge/Branch/branch.scss
@@ -0,0 +1,121 @@
+.branchDropdown{
+ border:1px solid #eee;
+ border-radius: 4px;
+ display: flex;
+ justify-content: center;
+ height: 40px;
+ line-height: 40px;
+ min-width: 220px;
+}
+.branchDropdown .ant-dropdown-trigger{
+ width: 100%;
+ padding:0px 15px;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ cursor: pointer;
+}
+.branchOptions{
+ width: 220px;
+ box-shadow: 0px 0px 3px 1px rgba(134, 134, 134, 0.4);
+ border-radius: 3px;
+ background: #fff;
+ max-height: 300px;
+}
+.OptionsUl{
+ max-height: 220px;
+ overflow-y: auto;
+}
+.OptionsUl li{
+ height: 30px;
+ line-height: 30px;
+ cursor: pointer;
+ padding:0px 20px;
+ margin:5px 0px;
+}
+.OptionsUl li:hover{
+ background-color: #F0F0F0;
+}
+.OptionsUl li a{
+ display: block;
+}
+.OptionsInput{
+ height: 32px;
+ padding-left: 4px;
+ line-height: 32px;
+ width: 100%;
+}
+.branch-tagBox{
+ border:1px solid #D0D0D0;
+ border-radius: 3px;
+ height: 32px;
+ display: flex;
+ align-items: center;
+ cursor: pointer;
+ min-width: 104px;
+}
+.branch-tagBox:hover{
+ background-color: #F3F4F6;
+}
+.branch-tagBox-list{
+ background: #FFFFFF;
+ box-shadow: 0px 4px 8px 2px rgba(212, 212, 212, 0.5);
+ border-radius: 4px;
+ .ant-popover-arrow{
+ display: none;
+ }
+ &.ant-popover.ant-popover-placement-bottom{
+ padding-top:0px;
+ }
+ .branch-tagBox .ant-dropdown-link{
+ display: block;
+ flex:1;
+ max-width: 105px;
+ }
+ .ant-popover-inner-content{
+ padding:0px;
+ }
+}
+.overlayBranch{
+ width: 325px;
+ .navUl{
+ margin-top: 8px;
+ height: 30px;
+ line-height: 30px;
+ li{
+ height: 30px;
+ line-height: 30px;
+ padding:0px 5px;
+ margin-left: 20px!important;
+ }
+ }
+}
+.listTips{
+ padding:20px 0px;
+ text-align: center;
+}
+
+.urlMenu{
+ line-height: 30px;
+ margin-bottom: 10px;
+ padding:15px 20px 0px 20px;
+ border-bottom: none;
+ li.ant-menu-item{
+ height: 30px;
+ line-height: 30px;
+ padding:0px 5px;
+ margin-right: 20px!important;
+ &.ant-menu-item-selected,&.ant-menu-item-active{
+ color: #333;
+ }
+ &.ant-menu-item-selected{
+ border-color:#1890ff!important;
+ }
+ &.ant-menu-item-active{
+ border-color:transparent ;
+ }
+ }
+}
+.copytool{
+ margin:0px 10px;
+}
\ No newline at end of file
diff --git a/src/forge/Component/AddGroup.jsx b/src/forge/Component/AddGroup.jsx
index 656175d5f..feff6f372 100644
--- a/src/forge/Component/AddGroup.jsx
+++ b/src/forge/Component/AddGroup.jsx
@@ -55,6 +55,7 @@ function AddGroup({organizeId,getGroupID}){
function addCollaborator(){
getGroupID && getGroupID(id);
+ setID(undefined);
}
return(
diff --git a/src/forge/Component/AddMember.jsx b/src/forge/Component/AddMember.jsx
index 0548e52da..f927850c8 100644
--- a/src/forge/Component/AddMember.jsx
+++ b/src/forge/Component/AddMember.jsx
@@ -4,7 +4,7 @@ import axios from 'axios';
import { getImageUrl } from 'educoder';
const { Option } = AutoComplete;
-function AddMember({getID,login}){
+function AddMember({getID,login,showNotification}){
const [ id , setID ] = useState(undefined);
const [ source , setSource ] = useState(undefined);
const [ searchKey , setSearchKey ] = useState(undefined);
@@ -45,7 +45,7 @@ function AddMember({getID,login}){
src={getImageUrl(`/${item && item.image_url}`)}
alt=""
/>
-
+
{item.username}
({item.login})
@@ -66,7 +66,12 @@ function AddMember({getID,login}){
};
function addCollaborator(){
- getID && getID(id);
+ if(source && source.length>0){
+ getID && getID(id);
+ setSearchKey(undefined);
+ }else{
+ showNotification("请选择存在的用户!");
+ }
}
return(
diff --git a/src/forge/Component/Cards.jsx b/src/forge/Component/Cards.jsx
index 498b375c1..f9a3d52e9 100644
--- a/src/forge/Component/Cards.jsx
+++ b/src/forge/Component/Cards.jsx
@@ -3,7 +3,7 @@ import { getImageUrl } from 'educoder';
import { Link } from 'react-router-dom';
import './Component.scss';
-function Cards({img , title, desc , rightBtn , src}){
+function Cards({img , title, desc , rightBtn , src , bottomInfos}){
return(
+ }
+ placeholder={`请输入分支${tagflag ? "或标签" :""}名称搜索`}
+ autocomplete="off" className="OptionsInput"
+ value={inputValue}
+ onChange={changeInputValue}
+ />
+
+
+ -
+ {
+ datas && datas.length>0 ?
+ datas.map((item,key)=>{
+ return(
+
- chooseitem(item.name)}>{item.name} + ) + }): +
暂无{inputValue}{nav === 0 ?"分支":"标签"}~
+ } +
{img &&})
}
@@ -15,6 +15,7 @@ function Cards({img , title, desc , rightBtn , src}){
{desc}
+ {bottomInfos}
- {renderArray(data.organizations)}
+ })
+
+ 所在地址:{data.location}
- }
+
+
+
+ {data.projects_count}
+ 项目数
+
+
+ {data.followers_count}
+ 粉丝数
+
+
+ {data.following_count}
+ 关注数
+
+
+
+ {data.name}
+ { data.location && {data.location} }
+ {
+ data.organizations && data.organizations.length>0&&
+
- :""
- }
- {
- data.location && + 所属组织：{renderOrganize(data.organizations)} +
+ }
+ {
+ currentLogin && (currentLogin === data.login)
+ ?
+
+ :
+ data.is_watch ?
+
+ :
+
+ }
+
)
setMenu(ele);
@@ -135,17 +149,17 @@ function Contributors({contributors,owner,projectsId}){
return(
-
- 贡献者{ contributors && contributors.total_count > 0 && {contributors.total_count}}
- 全部
-
+
+ 贡献者
+ { contributors && contributors.total_count > 0 && {contributors.total_count}}
+
+ {
+ openSearch ?
+
+ )
+};
diff --git a/src/forge/Component/LanguagePower.jsx b/src/forge/Component/LanguagePower.jsx
index 3197309c4..8d3e361b5 100644
--- a/src/forge/Component/LanguagePower.jsx
+++ b/src/forge/Component/LanguagePower.jsx
@@ -25,7 +25,7 @@ function LanguagePower({languages}){
}
return(
setVisibleFunc(false)}>
{
total > 0 ?
list.map((item,key)=>{
return(
-
+
})
setVisibleFunc(true,item.login,key)}/>
diff --git a/src/forge/Component/CopyTool.jsx b/src/forge/Component/CopyTool.jsx
new file mode 100644
index 000000000..36ed1d8c1
--- /dev/null
+++ b/src/forge/Component/CopyTool.jsx
@@ -0,0 +1,51 @@
+import React, { useState, useCallback, memo } from 'react';
+import { Tooltip } from 'antd';
+
+CopyTool.defaultProps = {
+ beforeText: '复制链接', //浮动过去显示的文字
+ afterText: '复制成功', //点击后显示的文字
+ className: '', //传给svg的class
+ inputId: 'copyText', //要复制的文本的ID
+ timeOut:true, //复制后将浮动的文字改为beforeText
+};
+
+
+function CopyTool({ beforeText, afterText, className , inputId , timeOut }) {
+ const [title, setTitle] = useState(() => {
+ return beforeText;
+ });
+
+ // 复制链接
+ const copyUrl = useCallback(() => {
+ const copyEle = document.querySelector(`#${inputId}`); // 获取要复制的节点
+ if (!copyEle) {
+ console.error("您的CopyTool未设置正确的inputId");
+ return;
+ }
+ copyEle.select(); // 执行选中元素
+ if (document.execCommand('copy')) {
+ document.execCommand('copy');
+ }
+ document.getSelection().removeAllRanges();
+
+ setTitle(afterText);
+ if(timeOut){
+ setTimeout(function(){
+ setTitle(beforeText);
+ },1500)
+ }
+ }, []);
+
+ return (
+ { setTitle(beforeText) }}
+ >
+
+
+ );
+}
+
+
+export default memo(CopyTool);
\ No newline at end of file
diff --git a/src/forge/Component/DeleteModal/Index.jsx b/src/forge/Component/DeleteModal/Index.jsx
new file mode 100644
index 000000000..c3c136899
--- /dev/null
+++ b/src/forge/Component/DeleteModal/Index.jsx
@@ -0,0 +1,33 @@
+import React from 'react';
+import { AlignCenter } from '../layout';
+import { Button } from 'antd';
+import Modals from '../PublicModal/Index';
+
+function DeleteBox({
+ visible ,
+ onCancel ,
+ onSuccess ,
+ title ,
+ subTitle,
+ content
+}) {
+ return(
+
+
+
+
+ }
+ onCancel={onCancel}
+ visible={visible}
+ >
+
+ {content}
+
+
+ )
+}
+export default DeleteBox;
\ No newline at end of file
diff --git a/src/forge/Component/DrawerPanel.jsx b/src/forge/Component/DrawerPanel.jsx
index 8070f3fa3..fa99e6c6f 100644
--- a/src/forge/Component/DrawerPanel.jsx
+++ b/src/forge/Component/DrawerPanel.jsx
@@ -4,6 +4,12 @@ import './Component.scss';
import axios from 'axios';
const { TreeNode , DirectoryTree } = Tree;
+function turnbar(str){
+ if(str && str.length>0 && str.indexOf("/")>-1){
+ return str.replaceAll('/','%2F');
+ }
+ return str;
+}
function DrawerPanel({visible,onClose,branch,owner,projectsId,history, name , list}){
const [ treeData , setTreeData ] = useState(undefined);
const [ isSpin , setIsSpin ] = useState(true);
@@ -71,7 +77,8 @@ function DrawerPanel({visible,onClose,branch,owner,projectsId,history, name , li
let dataref = event.node.props.dataRef;
if(dataref.type==="file"){
onClose();
- history.push(`/projects/${owner}/${projectsId}/tree/${branch}/${dataref.path}`);
+ let value = turnbar(branch);
+ history.push(`/${owner}/${projectsId}/tree/${value}/${dataref.path}`);
}
}
diff --git a/src/forge/Component/EAccount.scss b/src/forge/Component/EAccount.scss
index 6f0bb97f9..6fe44ab3a 100644
--- a/src/forge/Component/EAccount.scss
+++ b/src/forge/Component/EAccount.scss
@@ -1,9 +1,6 @@
.ant-modal-mask{
- z-index: 10000;
+ z-index: 1031;
}
.ant-modal-wrap{
- z-index: 10001;
- .ant-form-explain{
- position: absolute;
- }
+ z-index: 1032;
}
\ No newline at end of file
diff --git a/src/forge/Component/HeadSearch.jsx b/src/forge/Component/HeadSearch.jsx
new file mode 100644
index 000000000..fb7c9f25a
--- /dev/null
+++ b/src/forge/Component/HeadSearch.jsx
@@ -0,0 +1,41 @@
+import React, { useState } from "react";
+import { Input ,notification} from "antd";
+
+const { Search } = Input;
+export default ({history}) => {
+ const [openSearch, setOpenSearch] = useState(false);
+
+ function onGlobalSearch(value) {
+ history.push('/search?value=' + value);
+ // window.location.href = `search?value=` + value;
+ // history.push({
+ // pathname:'/search',
+ // state:value
+ // })
+ }
+ return (
+ {subTitle}
+ {
+ setTimeout(() => {
+ setOpenSearch(false)
+ }, 500)
+ }}
+ >
+
+ :
+ {
+ setOpenSearch(true)
+ }} />
+ }
+
-
+ {children}
+
+ )
+}
+export default Modals;
\ No newline at end of file
diff --git a/src/forge/Component/PublicModal/Index.scss b/src/forge/Component/PublicModal/Index.scss
new file mode 100644
index 000000000..1a0fbf31a
--- /dev/null
+++ b/src/forge/Component/PublicModal/Index.scss
@@ -0,0 +1,75 @@
+.deleteBox{
+ z-index: 1033;
+ .ant-modal-close-x{
+ font-size: 17px!important;
+ }
+ .ant-modal-header{
+ background-color: #f8f8f8;
+ padding:10px 30px;
+ .ant-modal-title{
+ text-align: left;
+ font-size: 16px;
+ font-weight: bold;
+ }
+ }
+ .ant-modal-close{
+ top:0px !important;
+ font-size: 24px !important;
+ }
+ .ant-modal-body{
+ padding:30px 50px;
+ p{
+ font-size: 14px;
+ line-height: 26px;
+ color:#666;
+ word-break: break-all;
+ }
+ .desc{
+ .descMain{
+ align-items: center;
+ justify-content: center;
+ font-size: 20px;
+ margin-bottom: 10px;
+ i.red{
+ color:#DF0002;
+ }
+ }
+ }
+ }
+ .ant-modal-footer{
+ border-top: none;
+ text-align: center;
+ padding-bottom: 40px;
+ button,a{
+ width: 96px;
+ height: 32px;
+ margin:0px 20px;
+ font-weight: 400;
+ font-size: 14px;
+ &.ant-btn{
+ border-color: #D0D0D0;
+ color: #666;
+ &:hover,&:active,&:focus{
+ background: #f3f4f6;
+ }
+ }
+ &.ant-btn-danger{
+ background-color: #fff;
+ color: #DF0002;
+ border-color: #D0D0D0;
+ &:hover,&:active,&:focus{
+ border-color: #DF0002;
+ background-color: #fff;
+ }
+ }
+ &.ant-btn.ant-btn-primary{
+ background-color: #466AFF;
+ color: #fff;
+ border-color: #466AFF;
+ &:hover,&:focus,&:active{
+ background-color: rgba(70,106,255,0.85);
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/forge/Component/Releases.jsx b/src/forge/Component/Releases.jsx
index 3dc8cf024..6d4d0acf4 100644
--- a/src/forge/Component/Releases.jsx
+++ b/src/forge/Component/Releases.jsx
@@ -1,38 +1,34 @@
import React from 'react';
-import { AlignCenter , AlignTop , FlexAJ } from '../Component/layout';
+import { AlignTop } from '../Component/layout';
import { Link } from 'react-router-dom';
-function Releases({owner,projectsId,releaseVersions}){
+function Releases({owner,projectsId,releaseVersions , baseOperate , projectType}){
return(
+
+ )
+}
+export default SiderBarShareModal;
\ No newline at end of file
diff --git a/src/forge/Component/Sort.jsx b/src/forge/Component/Sort.jsx
index 58f8a5d2f..a15f04da9 100644
--- a/src/forge/Component/Sort.jsx
+++ b/src/forge/Component/Sort.jsx
@@ -2,9 +2,9 @@ import React from 'react';
import {Popover} from 'antd';
import './Component.scss';
-export default (({menu , children})=>{
+export default (({menu , children, overlayClassName})=>{
return(
-
+
{children}
)
diff --git a/src/forge/Component/User.jsx b/src/forge/Component/User.jsx
index 4d22c77bf..bc652dcfb 100644
--- a/src/forge/Component/User.jsx
+++ b/src/forge/Component/User.jsx
@@ -20,7 +20,7 @@ export default ({ url , name , column , id , login })=>{
`;
return(
id?
-
+
![]()
{ url && 
}
{name}
diff --git a/src/forge/Component/layout.jsx b/src/forge/Component/layout.jsx
index 57b20c1e1..adaf4dbf3 100644
--- a/src/forge/Component/layout.jsx
+++ b/src/forge/Component/layout.jsx
@@ -28,6 +28,11 @@ export const AlignTop = styled.div`{
display:flex;
align-items: flex-start;
}`
+export const AlignAJBottom = styled.div`{
+ display:flex;
+ justify-content: space-between;
+ align-items: flex-end;
+}`
// 左右结构
export const Box = styled.div`{
display:flex;
diff --git a/src/forge/DevOps/About.jsx b/src/forge/DevOps/About.jsx
index b9524d548..31ced2204 100644
--- a/src/forge/DevOps/About.jsx
+++ b/src/forge/DevOps/About.jsx
@@ -149,7 +149,7 @@ function About(props, ref) {
axios.post(url).then(result=>{
setIsSpining(false);
if(result && result.data.status === 0){
- props.history.push(`/projects/${owner}/${projectsId}/devops/dispose`);
+ props.history.push(`/${owner}/${projectsId}/devops`);
// 需要将顶部的open_devops修改
let { changeOpenDevops } = props;
changeOpenDevops && changeOpenDevops(true);
diff --git a/src/forge/DevOps/Dispose.jsx b/src/forge/DevOps/Dispose.jsx
index 2211dbb59..1e08cdab0 100644
--- a/src/forge/DevOps/Dispose.jsx
+++ b/src/forge/DevOps/Dispose.jsx
@@ -96,7 +96,7 @@ function Dispose(props){
setVisible(false);
if(result && result.data){
props.showNotification("流水线新增成功，请进行工作流配置！");
- props.history.push(`/projects/${owner}/${projectsId}/devops/dispose/${result.data.id}`);
+ props.history.push(`/${owner}/${projectsId}/devops/${result.data.id}`);
}else{
props.showNotification("流水线新增失败，请稍后再试！");
}
@@ -134,12 +134,12 @@ function Dispose(props){
// 模板管理
function toModalManage(){
- props.history.push(`/projects/${owner}/${projectsId}/devops/mould`);
+ props.history.push(`/${owner}/${projectsId}/devops/mould`);
}
// 参数管理
function toparameter(){
- props.history.push(`/projects/${owner}/${projectsId}/devops/params`);
+ props.history.push(`/${owner}/${projectsId}/devops/params`);
}
const operate = current_user && (permission && permission !== "Reporter");
diff --git a/src/forge/DevOps/Dispose/List.jsx b/src/forge/DevOps/Dispose/List.jsx
index 72a267853..297c5556d 100644
--- a/src/forge/DevOps/Dispose/List.jsx
+++ b/src/forge/DevOps/Dispose/List.jsx
@@ -10,6 +10,12 @@ import { Link } from 'react-router-dom';
// killed:"已撤销",
// pending:"准备中"
// }
+function turnbar(str){
+ if(str && str.length>0 && str.indexOf("/")>-1){
+ return str.replaceAll('/','%2F');
+ }
+ return str;
+}
function renderTableStatus(status) {
switch (status) {
case "running":
@@ -65,8 +71,9 @@ function List({ list, operate , projectsId , owner , showModal , deleteFunc }){
width:"15%",
ellipsis:true,
render:(value,item)=>{
+ let v = turnbar(item.branch);
return(
- {value}
+ {value}
)
}
},
@@ -110,7 +117,7 @@ function List({ list, operate , projectsId , owner , showModal , deleteFunc }){
return(
{ operate ?
-
+
编辑 :""
}
{ operate ?
@@ -118,7 +125,7 @@ function List({ list, operate , projectsId , owner , showModal , deleteFunc }){
删除
:""
}
- 查看运行记录
+ 查看运行记录
)
}
diff --git a/src/forge/DevOps/Dispose/PipelineName.jsx b/src/forge/DevOps/Dispose/PipelineName.jsx
index 3cf7f96ab..4acaa2068 100644
--- a/src/forge/DevOps/Dispose/PipelineName.jsx
+++ b/src/forge/DevOps/Dispose/PipelineName.jsx
@@ -42,7 +42,7 @@ function PipelineName({visible,onCancel,onOk,value ,branchList}){
开发语言
+开发语言
{
array && array.map((item,key)=>{
diff --git a/src/forge/Component/MemberCards.jsx b/src/forge/Component/MemberCards.jsx
index 393ddbb17..48d90e136 100644
--- a/src/forge/Component/MemberCards.jsx
+++ b/src/forge/Component/MemberCards.jsx
@@ -45,15 +45,15 @@ const Div = styled.div`{
export default (({ user , img, name, time, focusStatus, is_current_user, login , successFunc }) => {
return (
+
+
+ :
+
-
+
diff --git a/src/forge/Component/Monaco.jsx b/src/forge/Component/Monaco.jsx
new file mode 100644
index 000000000..aa70d8031
--- /dev/null
+++ b/src/forge/Component/Monaco.jsx
@@ -0,0 +1,62 @@
+import React, {useEffect, useRef, useState} from 'react';
+import * as monaco from 'monaco-editor/esm/vs/editor/editor.api.js';
+import './Component.scss';
+
+function Monaco(props) {
+ const {
+ style = { // dom节点样式
+ height: '400px',
+ },
+ value = '', // 代码文本
+ onChange = () => { // 改变的事件
+ },
+ fontSize = 14, // 代码字体大小
+ monacoOptions = {
+ scrollBeyondLastLine: false,
+ lineNumbers: "off",
+ wordWrap: true,
+ overviewRulerBorder: true,
+ lineHeight: 24,
+ readOnly:true
+ }, // monaco 自定义属性
+ language = 'html', // 语言 支持 js ts sql css json html等
+ } = props;
+ const editOrRef = useRef();
+ const ThisEditor = useRef();
+ useEffect(() => {
+ ThisEditor.current = monaco.editor.create(editOrRef.current, {
+ value: value || '',
+ language,
+ theme: "vs-grey",
+ fontSize: fontSize + 'px',
+ minimap: { // 关闭代码缩略图
+ enabled: false,
+ },
+ ...monacoOptions,
+ });
+
+ ThisEditor.current.onDidChangeModelContent((e) => {
+ let newValue = ThisEditor.current.getValue();
+ onChange(newValue);
+ });
+ return () => {
+ ThisEditor.current.dispose();
+ ThisEditor.current = undefined; // 清除编辑器对象
+ }
+ }, []);
+ useEffect(() => {
+ if (ThisEditor.current) {
+ ThisEditor.current.updateOptions({
+ fontSize: fontSize + 'px',
+ })
+ }
+ }, [fontSize]);
+
+ return (
+
- {name}
+ {name}
{
is_current_user ?
:
-
+
}
+
+
+ );
+}
+
+export default Monaco;
\ No newline at end of file
diff --git a/src/forge/Component/ProfileModal/Index.jsx b/src/forge/Component/ProfileModal/Index.jsx
new file mode 100644
index 000000000..7cead761b
--- /dev/null
+++ b/src/forge/Component/ProfileModal/Index.jsx
@@ -0,0 +1,72 @@
+import React , { useEffect , useState } from 'react';
+import Modals from '../PublicModal/Index';
+import { Button } from 'antd';
+import axios from 'axios';
+
+import ProfileImg from './images/profile.png';
+import './Index.scss';
+
+function ProfileModal({visible,onCancel,history}) {
+ const [ modalVis , setModalVis ] = useState(visible);
+ const [ addMemberCheck , setAddMemberCheck ] = useState(false);
+
+ useEffect(()=>{
+ axios.interceptors.response.use((response) => {
+ if (response && (response.data.status === 411 || response.data.status === 412)) {
+ setModalVis(true);
+ if(response.data.status === 412){
+ setAddMemberCheck(true);
+ }
+ }
+ return response;
+ }, (error) => {
+ });
+ },[])
+
+ useEffect(()=>{
+ setModalVis(visible);
+ },[visible])
+
+ function onOk(){
+ onCancel();
+ setModalVis(false);
+ setTimeout(function(){
+ window.open(`/settings/profile`,"_blank");
+ },200)
+ }
+
+ function onNo() {
+ onCancel();
+ setModalVis(false);
+ }
+
+ return(
+
+
+
+
+ }
+ >
+
+ 
+ {
+ addMemberCheck ?
+
+
+ )
+}
+export default ProfileModal;
\ No newline at end of file
diff --git a/src/forge/Component/ProfileModal/Index.scss b/src/forge/Component/ProfileModal/Index.scss
new file mode 100644
index 000000000..cf13121ed
--- /dev/null
+++ b/src/forge/Component/ProfileModal/Index.scss
@@ -0,0 +1,18 @@
+.contents{
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ margin:10px auto 0px;
+ img{
+ margin-right: 13px;
+ width: 44px;
+ }
+ p{
+ line-height: 29px;
+ max-width: 327px;
+ font-size: 16px!important;
+ }
+}
+.font-44{
+ font-size: 44px!important;
+}
\ No newline at end of file
diff --git a/src/forge/Component/ProfileModal/Profile.jsx b/src/forge/Component/ProfileModal/Profile.jsx
new file mode 100644
index 000000000..e63c1286d
--- /dev/null
+++ b/src/forge/Component/ProfileModal/Profile.jsx
@@ -0,0 +1,17 @@
+import React from 'react';
+
+function Profile({children,sureFunc,showCompeleteDialog , completeProfile, className}) {
+
+ function checkProfile() {
+ if(!completeProfile){
+ showCompeleteDialog && showCompeleteDialog();
+ }else{
+ sureFunc();
+ }
+ }
+
+ return(
+ {children}
+ )
+}
+export default Profile;
\ No newline at end of file
diff --git a/src/forge/Component/ProfileModal/images/profile.png b/src/forge/Component/ProfileModal/images/profile.png
new file mode 100644
index 000000000..6dbed21fc
Binary files /dev/null and b/src/forge/Component/ProfileModal/images/profile.png differ
diff --git a/src/forge/Component/PublicModal/Index.jsx b/src/forge/Component/PublicModal/Index.jsx
new file mode 100644
index 000000000..c12e12b18
--- /dev/null
+++ b/src/forge/Component/PublicModal/Index.jsx
@@ -0,0 +1,20 @@
+import React from 'react';
+import { Modal } from 'antd';
+import './Index.scss';
+
+function Modals({title,children,btn,onCancel,visible}) {
+ return(
+ 目标用户个人资料不完整，需提醒目标用户补充资料后以进行后续操作
+ : +您目前的个人资料不完整，需要补充资料以进行后续操作。是否前往补充个人信息？
+ } +
-
- 发行版
- { releaseVersions && releaseVersions.total_count > 0 && {releaseVersions.total_count}}
-
- { releaseVersions && releaseVersions.total_count > 0 ?
- 全部
- :
- 新建
- }
-
+
+ 发行版
+ { releaseVersions && releaseVersions.total_count > 0 && {releaseVersions.total_count}}
+
{
releaseVersions && releaseVersions.total_count>0 ?
releaseVersions.list.map((item,key)=>{
return(
key === 0 &&
-
)
})
- :""
+ :
+
diff --git a/src/forge/Component/SearchUser.jsx b/src/forge/Component/SearchUser.jsx
index 0203d24f5..79d23fb65 100644
--- a/src/forge/Component/SearchUser.jsx
+++ b/src/forge/Component/SearchUser.jsx
@@ -1,45 +1,49 @@
-import React , { useState } from 'react';
+import React , { useState , useEffect } from 'react';
import { AutoComplete } from 'antd';
import { getImageUrl } from "educoder";
import axios from 'axios';
const Option = AutoComplete.Option;
-export default ({ getUser })=>{
+export default ({ getUser , placeholder, width ,value })=>{
+ const [ source , setSource ] = useState(undefined);
const [ searchKey , setSearchKey ] = useState(undefined);
- const [ userDataSource , setUserDataSource ] = useState(undefined);
+
+ useEffect(()=>{
+ if(!value){
+ setSearchKey(undefined);
+ }
+ },[value])
+
+ useEffect(()=>{
+ getUserList();
+ },[searchKey])
function getUserList(e){
const url = `/users/list.json`;
axios.get(url, {
params: {
- search: e,
+ search: searchKey,
},
- })
- .then((result) => {
+ }).then((result) => {
if (result) {
- setUserDataSource(result.data.users);
+ sourceOptions(result.data.users);
}
})
.catch((error) => {
console.log(error);
});
};
-
- function changeInputUser(value){
- setSearchKey(value);
- getUserList(value);
- }
- function selectInputUser(id, option){
- setSearchKey(option.props.value);
- getUserList(option.props.value);
- getUser && getUser(id);
- }
- const source =
- userDataSource && userDataSource.map((item, key) => {
+ function sourceOptions(userDataSource){
+ const s = userDataSource && userDataSource.map((item, key) => {
return (
-
);
});
+ setSource(s);
+ }
+
+ function changeInputUser(e){
+ setSearchKey(e);
+ };
+
+ // 选择用户
+ function selectInputUser(e, option){
+ setSearchKey(option.props.name);
+ getUser(option.props.login);
+ };
+
return(
- - {item.name} + {item.name} 最新
-{item.created_at}
+{item.created_at}
+ 您暂未发布任何版本{baseOperate && projectType !==2 && 创建新版本}
+
}
+ trigger.parentNode}
+ dataSource={source}
+ value={searchKey}
+ style={{ width: width || 300 }}
+ onChange={changeInputUser}
+ onSelect={selectInputUser}
+ placeholder={placeholder || "搜索需要添加的用户..."}
+ allowClear
+ />
+
)
}
\ No newline at end of file
diff --git a/src/forge/Component/SiderBar.js b/src/forge/Component/SiderBar.js
new file mode 100644
index 000000000..3d6b8acf8
--- /dev/null
+++ b/src/forge/Component/SiderBar.js
@@ -0,0 +1,91 @@
+import React, { useEffect, useState } from 'react';
+import { Popover , Tooltip } from 'antd';
+import './Component.scss';
+import axios from 'axios';
+import ShareModal from './SiderBarShareModal';
+
+const $ = window.$;
+
+$(window).scroll(function () {
+ if ($(".gotop").length > 0) {
+ if ($(document).scrollTop() > 0) {
+ $(".-task-sidebar .gotop").show();
+ $(".gotop").click(function () {
+ $("html,body").scrollTop(0);
+ });
+ }
+ if ($(document).scrollTop() === 0) {
+ $(".-task-sidebar .gotop").hide();
+ }
+ }
+});
+
+function SiderBar() {
+ const [ data , setData ] = useState([]);
+ const [ visible , setVisible ] = useState(false);
+
+ useEffect(()=>{
+ getFAQ();
+ },[])
+
+ function getFAQ(){
+ const url = `/faqs.json`;
+ axios.get(url).then(result=>{
+ if(result && result.data){
+ setData(result.data);
+ }
+ }).catch(error=>{})
+ }
+ function content(list){
+ return
+
+ }
+
+ function shareContent(){
+ return 帮助
+-
+ {
+ list && list.map((i,k)=>{
+ return(
+
- {i.question} + ) + }) + } +
+
+ }
+ return (
+ -
+
- setVisible(true)}> +
分享到
+
+ setVisible(false)}/>
+ {
+ data && data.length > 0 && (data[0] && data[0].question) ?
+
+
+ :""
+ }
+ {/*
+
+
+
+ )
+}
+
+export default SiderBar;
diff --git a/src/forge/Component/SiderBarShareModal.jsx b/src/forge/Component/SiderBarShareModal.jsx
new file mode 100644
index 000000000..aa8db379e
--- /dev/null
+++ b/src/forge/Component/SiderBarShareModal.jsx
@@ -0,0 +1,27 @@
+import React from 'react';
+import { Modal } from 'antd';
+import QRCode from 'qrcode.react';
+
+function SiderBarShareModal({visible,urlValue,onCancel}) {
+ return(
+
+
+
+
+
+
*/}
+
+
+
+
+ {urlValue &&
+ 打开微信“扫一扫”,点击右上角菜单，即可将网页分享至朋友圈
+
触发条件:
-