Nigel
/
forgeplus-react
forked from Gitlink/forgeplus-react
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

代码库样式整改

This commit is contained in:
caishi 2021-08-12 11:45:56 +08:00
parent 3294d99516
commit d13d94e9cf
34 changed files with 850 additions and 449 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/css/edu-common.css
View File

@ -114,14 +114,6 @@ a:visited {
color: #898989; color: #898989;
} }
a:hover {
color: #FF7500;
}
a:hover.fa {
color: #FF7500;
}
input, input,
textarea, textarea,
select { select {

4
public/css/edu-main.css
View File

@ -97,10 +97,6 @@ a:visited {
color: #05101a; color: #05101a;
} }
a:hover {
color: #459be5;
}
ol, ol,
ul, ul,
li { li {

23
public/css/edu-purge.css
View File

@ -1364,7 +1364,7 @@ a:visited {
} }
a:hover { a:hover {
color: #459be5; color: #2A61FF!important;
} }
ol, ol,
@ -1473,7 +1473,7 @@ a.edu-txt-w80,
/*隐藏*/ /*隐藏*/
.none { .none {
display: none display: none!important;
} }
.block { .block {
@ -2471,19 +2471,16 @@ a.hoverLine:hover{
a.color-grey-name:hover, a.color-grey-name:hover,
a.color-dark:hover, a.color-dark:hover,
a.color-grey-6:hover, a.color-grey-6:hover,
a.color-grey-3:hover { a.color-grey-3:hover,a.color-ooo:hover {
color: #4cacff !important; color: #2A61FF !important;
}
a.color-grey-9:hover,
a.color-grey-8:hover,
a.color-grey-c:hover {
color: #111C24 !important;
} }
/*蓝色*/ /*蓝色*/
.color-blue { .color-blue {
color: #4CACFF !important; color: #2A61FF !important;
}
.color-blue-file {
color: #0054CC!important;
} }
/* 绿色 */ /* 绿色 */
.color-green-file{ .color-green-file{
@ -2494,10 +2491,6 @@ a.color-grey-c:hover {
color: #4CACFF !important; color: #4CACFF !important;
} }
a.color-blue:hover,
a.color-blue_4C:hover {
color: #459BE6 !important;
}
/*橙色*/ /*橙色*/
.color-orange { .color-orange {

202
public/css/iconfont.css
View File

@ -1,8 +1,8 @@
@font-face { @font-face {
font-family: "iconfont"; /* Project id 2340181 */ font-family: "iconfont"; /* Project id 2340181 */
src: url('iconfont.woff2?t=1627870211301') format('woff2'), src: url('iconfont.woff2?t=1628649437297') format('woff2'),
url('iconfont.woff?t=1627870211301') format('woff'), url('iconfont.woff?t=1628649437297') format('woff'),
url('iconfont.ttf?t=1627870211301') format('truetype'); url('iconfont.ttf?t=1628649437297') format('truetype');
} }
.iconfont { .iconfont {
@ -13,6 +13,150 @@
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.icon-dianzan_icon:before {
content: "\e8ba";
}
.icon-quxiaoguanzhu:before {
content: "\e8bb";
}
.icon-xieyiicon:before {
content: "\e8a6";
}
.icon-daimakuicon:before {
content: "\e8a9";
}
.icon-zhuyeicon:before {
content: "\e884";
}
.icon-biaoqianicon:before {
content: "\e882";
}
.icon-a-bianji:before {
content: "\e883";
}
.icon-cangkushezhiicon:before {
content: "\e885";
}
.icon-fuzhiicon:before {
content: "\e886";
}
.icon-lianjieicon:before {
content: "\e887";
}
.icon-hebingqingqiuicon:before {
content: "\e888";
}
.icon-lichengbeiicon:before {
content: "\e889";
}
.icon-gongzuoliuicon:before {
content: "\e88a";
}
.icon-dongtaiicon:before {
content: "\e88b";
}
.icon-morendianzan_icon:before {
content: "\e88e";
}
.icon-neicunicon:before {
content: "\e891";
}
.icon-muluicon:before {
content: "\e894";
}
.icon-tianjia1:before {
content: "\e896";
}
.icon-a-shezhi:before {
content: "\e899";
}
.icon-wenjian5:before {
content: "\e89a";
}
.icon-tijiaoicon:before {
content: "\e89e";
}
.icon-morenguanzhu_ICON:before {
content: "\e89f";
}
.icon-wenjianjia3:before {
content: "\e8a2";
}
.icon-xialaanniu1:before {
content: "\e8a4";
}
.icon-zishuwenjian_icon:before {
content: "\e8b0";
}
.icon-zuohuaicon:before {
content: "\e8b5";
}
.icon-master_icon:before {
content: "\e8b6";
}
.icon-morenfuke_icon:before {
content: "\e8b7";
}
.icon-a-wikiicon:before {
content: "\e8b8";
}
.icon-yixiuicon:before {
content: "\e8b9";
}
.icon-suofang:before {
content: "\e87f";
}
.icon-fangdaicon:before {
content: "\e881";
}
.icon-sousuo_icon1:before {
content: "\e873";
}
.icon-huanying_icon:before {
content: "\e878";
}
.icon-wenjianjia2:before {
content: "\e879";
}
.icon-shanchuicon1:before {
content: "\e87a";
}
.icon-qingqiuicon:before { .icon-qingqiuicon:before {
content: "\e871"; content: "\e871";
} }
@ -49,10 +193,6 @@
content: "\e898"; content: "\e898";
} }
.icon-xialaanniu_icon:before {
content: "\e89a";
}
.icon-weixuanzhongqingqiuicon:before { .icon-weixuanzhongqingqiuicon:before {
content: "\e89b"; content: "\e89b";
} }
@ -61,10 +201,6 @@
content: "\e8a1"; content: "\e8a1";
} }
.icon-xuanzhongxiangyingicon:before {
content: "\e8a2";
}
.icon-xuanzhongfenzhiicon:before { .icon-xuanzhongfenzhiicon:before {
content: "\e8a3"; content: "\e8a3";
} }
@ -81,18 +217,6 @@
content: "\e8af"; content: "\e8af";
} }
.icon-xinzengmulu_xuantingicon:before {
content: "\e884";
}
.icon-xinzengyemian_morenicon:before {
content: "\e885";
}
.icon-zhankai_morenicon:before {
content: "\e889";
}
.icon-shanchu_tc_icon:before { .icon-shanchu_tc_icon:before {
content: "\e88c"; content: "\e88c";
} }
@ -101,10 +225,6 @@
content: "\e88d"; content: "\e88d";
} }
.icon-xinzengyemian_shubiaodianjiicon:before {
content: "\e88e";
}
.icon-daorumoban_icon:before { .icon-daorumoban_icon:before {
content: "\e86f"; content: "\e86f";
} }
@ -117,10 +237,6 @@
content: "\e872"; content: "\e872";
} }
.icon-chenggong1:before {
content: "\e873";
}
.icon-gengduo_icon:before { .icon-gengduo_icon:before {
content: "\e874"; content: "\e874";
} }
@ -137,18 +253,6 @@
content: "\e877"; content: "\e877";
} }
.icon-a-lajitong_icon3x:before {
content: "\e878";
}
.icon-shouqi_morenicon:before {
content: "\e879";
}
.icon-huanying_icon:before {
content: "\e87a";
}
.icon-sousuo_shanchuicon:before { .icon-sousuo_shanchuicon:before {
content: "\e87b"; content: "\e87b";
} }
@ -161,22 +265,10 @@
content: "\e87e"; content: "\e87e";
} }
.icon-wenjianjia_icon:before {
content: "\e87f";
}
.icon-xialaanniu:before { .icon-xialaanniu:before {
content: "\e880"; content: "\e880";
} }
.icon-xinzengmulu_morenicon:before {
content: "\e882";
}
.icon-xinzengmulu_shubiaodianjiicon:before {
content: "\e883";
}
.icon-erciqueren_icon:before { .icon-erciqueren_icon:before {
content: "\e867"; content: "\e867";
} }

2
public/css/iconfont.js
View File

File diff suppressed because one or more lines are too long

343
public/css/iconfont.json
View File

@ -5,6 +5,258 @@
"css_prefix_text": "icon-", "css_prefix_text": "icon-",
"description": "", "description": "",
"glyphs": [ "glyphs": [
{
"icon_id": "23492900",
"name": "点赞_icon",
"font_class": "dianzan_icon",
"unicode": "e8ba",
"unicode_decimal": 59578
},
{
"icon_id": "23492901",
"name": "取消关注",
"font_class": "quxiaoguanzhu",
"unicode": "e8bb",
"unicode_decimal": 59579
},
{
"icon_id": "23473801",
"name": "协议icon",
"font_class": "xieyiicon",
"unicode": "e8a6",
"unicode_decimal": 59558
},
{
"icon_id": "23473151",
"name": "代码库icon",
"font_class": "daimakuicon",
"unicode": "e8a9",
"unicode_decimal": 59561
},
{
"icon_id": "23473104",
"name": "主页icon",
"font_class": "zhuyeicon",
"unicode": "e884",
"unicode_decimal": 59524
},
{
"icon_id": "23472253",
"name": "标签icon",
"font_class": "biaoqianicon",
"unicode": "e882",
"unicode_decimal": 59522
},
{
"icon_id": "23472254",
"name": "编 辑",
"font_class": "a-bianji",
"unicode": "e883",
"unicode_decimal": 59523
},
{
"icon_id": "23472256",
"name": "仓库设置icon",
"font_class": "cangkushezhiicon",
"unicode": "e885",
"unicode_decimal": 59525
},
{
"icon_id": "23472257",
"name": "复制icon",
"font_class": "fuzhiicon",
"unicode": "e886",
"unicode_decimal": 59526
},
{
"icon_id": "23472258",
"name": "链接icon",
"font_class": "lianjieicon",
"unicode": "e887",
"unicode_decimal": 59527
},
{
"icon_id": "23472259",
"name": "合并请求icon",
"font_class": "hebingqingqiuicon",
"unicode": "e888",
"unicode_decimal": 59528
},
{
"icon_id": "23472260",
"name": "里程碑icon",
"font_class": "lichengbeiicon",
"unicode": "e889",
"unicode_decimal": 59529
},
{
"icon_id": "23472261",
"name": "工作流icon",
"font_class": "gongzuoliuicon",
"unicode": "e88a",
"unicode_decimal": 59530
},
{
"icon_id": "23472262",
"name": "动态icon",
"font_class": "dongtaiicon",
"unicode": "e88b",
"unicode_decimal": 59531
},
{
"icon_id": "23472263",
"name": "默认点赞_icon",
"font_class": "morendianzan_icon",
"unicode": "e88e",
"unicode_decimal": 59534
},
{
"icon_id": "23472264",
"name": "内存icon",
"font_class": "neicunicon",
"unicode": "e891",
"unicode_decimal": 59537
},
{
"icon_id": "23472265",
"name": "目录icon",
"font_class": "muluicon",
"unicode": "e894",
"unicode_decimal": 59540
},
{
"icon_id": "23472266",
"name": "添加",
"font_class": "tianjia1",
"unicode": "e896",
"unicode_decimal": 59542
},
{
"icon_id": "23472267",
"name": "设 置",
"font_class": "a-shezhi",
"unicode": "e899",
"unicode_decimal": 59545
},
{
"icon_id": "23472268",
"name": "文件",
"font_class": "wenjian5",
"unicode": "e89a",
"unicode_decimal": 59546
},
{
"icon_id": "23472269",
"name": "提交icon",
"font_class": "tijiaoicon",
"unicode": "e89e",
"unicode_decimal": 59550
},
{
"icon_id": "23472270",
"name": "默认关注_ICON",
"font_class": "morenguanzhu_ICON",
"unicode": "e89f",
"unicode_decimal": 59551
},
{
"icon_id": "23472271",
"name": "文件夹",
"font_class": "wenjianjia3",
"unicode": "e8a2",
"unicode_decimal": 59554
},
{
"icon_id": "23472272",
"name": "下拉按钮",
"font_class": "xialaanniu1",
"unicode": "e8a4",
"unicode_decimal": 59556
},
{
"icon_id": "23472275",
"name": "自述文件_icon",
"font_class": "zishuwenjian_icon",
"unicode": "e8b0",
"unicode_decimal": 59568
},
{
"icon_id": "23472276",
"name": "左滑icon",
"font_class": "zuohuaicon",
"unicode": "e8b5",
"unicode_decimal": 59573
},
{
"icon_id": "23472277",
"name": "master_icon",
"font_class": "master_icon",
"unicode": "e8b6",
"unicode_decimal": 59574
},
{
"icon_id": "23472278",
"name": "默认复刻_icon",
"font_class": "morenfuke_icon",
"unicode": "e8b7",
"unicode_decimal": 59575
},
{
"icon_id": "23472279",
"name": "wiki icon",
"font_class": "a-wikiicon",
"unicode": "e8b8",
"unicode_decimal": 59576
},
{
"icon_id": "23472280",
"name": "易修icon",
"font_class": "yixiuicon",
"unicode": "e8b9",
"unicode_decimal": 59577
},
{
"icon_id": "23436350",
"name": "缩放",
"font_class": "suofang",
"unicode": "e87f",
"unicode_decimal": 59519
},
{
"icon_id": "23436351",
"name": "放大icon",
"font_class": "fangdaicon",
"unicode": "e881",
"unicode_decimal": 59521
},
{
"icon_id": "23384231",
"name": "搜索_icon",
"font_class": "sousuo_icon1",
"unicode": "e873",
"unicode_decimal": 59507
},
{
"icon_id": "23384232",
"name": "欢迎_icon",
"font_class": "huanying_icon",
"unicode": "e878",
"unicode_decimal": 59512
},
{
"icon_id": "23384233",
"name": "文件夹",
"font_class": "wenjianjia2",
"unicode": "e879",
"unicode_decimal": 59513
},
{
"icon_id": "23384234",
"name": "删除icon",
"font_class": "shanchuicon1",
"unicode": "e87a",
"unicode_decimal": 59514
},
{ {
"icon_id": "23261798", "icon_id": "23261798",
"name": "请求icon", "name": "请求icon",
@ -68,13 +320,6 @@
"unicode": "e898", "unicode": "e898",
"unicode_decimal": 59544 "unicode_decimal": 59544
}, },
{
"icon_id": "23144154",
"name": "下拉按钮_icon",
"font_class": "xialaanniu_icon",
"unicode": "e89a",
"unicode_decimal": 59546
},
{ {
"icon_id": "23144155", "icon_id": "23144155",
"name": "未选中请求icon", "name": "未选中请求icon",
@ -89,13 +334,6 @@
"unicode": "e8a1", "unicode": "e8a1",
"unicode_decimal": 59553 "unicode_decimal": 59553
}, },
{
"icon_id": "23144159",
"name": "选中响应icon",
"font_class": "xuanzhongxiangyingicon",
"unicode": "e8a2",
"unicode_decimal": 59554
},
{ {
"icon_id": "23144160", "icon_id": "23144160",
"name": "选中分支icon", "name": "选中分支icon",
@ -124,27 +362,6 @@
"unicode": "e8af", "unicode": "e8af",
"unicode_decimal": 59567 "unicode_decimal": 59567
}, },
{
"icon_id": "23046282",
"name": "新增目录_悬停icon",
"font_class": "xinzengmulu_xuantingicon",
"unicode": "e884",
"unicode_decimal": 59524
},
{
"icon_id": "23046283",
"name": "新增页面_默认icon",
"font_class": "xinzengyemian_morenicon",
"unicode": "e885",
"unicode_decimal": 59525
},
{
"icon_id": "23046287",
"name": "展开_默认icon",
"font_class": "zhankai_morenicon",
"unicode": "e889",
"unicode_decimal": 59529
},
{ {
"icon_id": "23046290", "icon_id": "23046290",
"name": "shanchu_tc_icon", "name": "shanchu_tc_icon",
@ -159,13 +376,6 @@
"unicode": "e88d", "unicode": "e88d",
"unicode_decimal": 59533 "unicode_decimal": 59533
}, },
{
"icon_id": "23046311",
"name": "新增页面_鼠标点击icon",
"font_class": "xinzengyemian_shubiaodianjiicon",
"unicode": "e88e",
"unicode_decimal": 59534
},
{ {
"icon_id": "23046244", "icon_id": "23046244",
"name": "导入模版_icon", "name": "导入模版_icon",
@ -187,13 +397,6 @@
"unicode": "e872", "unicode": "e872",
"unicode_decimal": 59506 "unicode_decimal": 59506
}, },
{
"icon_id": "23046254",
"name": "成功",
"font_class": "chenggong1",
"unicode": "e873",
"unicode_decimal": 59507
},
{ {
"icon_id": "23046255", "icon_id": "23046255",
"name": "更多_icon", "name": "更多_icon",
@ -222,27 +425,6 @@
"unicode": "e877", "unicode": "e877",
"unicode_decimal": 59511 "unicode_decimal": 59511
}, },
{
"icon_id": "23046269",
"name": "垃圾桶_icon@3x",
"font_class": "a-lajitong_icon3x",
"unicode": "e878",
"unicode_decimal": 59512
},
{
"icon_id": "23046270",
"name": "收起_默认icon",
"font_class": "shouqi_morenicon",
"unicode": "e879",
"unicode_decimal": 59513
},
{
"icon_id": "23046271",
"name": "欢迎_icon",
"font_class": "huanying_icon",
"unicode": "e87a",
"unicode_decimal": 59514
},
{ {
"icon_id": "23046273", "icon_id": "23046273",
"name": "搜索_删除icon", "name": "搜索_删除icon",
@ -264,13 +446,6 @@
"unicode": "e87e", "unicode": "e87e",
"unicode_decimal": 59518 "unicode_decimal": 59518
}, },
{
"icon_id": "23046277",
"name": "文件夹_icon",
"font_class": "wenjianjia_icon",
"unicode": "e87f",
"unicode_decimal": 59519
},
{ {
"icon_id": "23046278", "icon_id": "23046278",
"name": "下拉按钮", "name": "下拉按钮",
@ -278,20 +453,6 @@
"unicode": "e880", "unicode": "e880",
"unicode_decimal": 59520 "unicode_decimal": 59520
}, },
{
"icon_id": "23046280",
"name": "新增目录_默认icon",
"font_class": "xinzengmulu_morenicon",
"unicode": "e882",
"unicode_decimal": 59522
},
{
"icon_id": "23046281",
"name": "新增目录_鼠标点击icon",
"font_class": "xinzengmulu_shubiaodianjiicon",
"unicode": "e883",
"unicode_decimal": 59523
},
{ {
"icon_id": "22906287", "icon_id": "22906287",
"name": "二次确认_icon", "name": "二次确认_icon",

BIN
public/css/iconfont.ttf
View File

Binary file not shown.

BIN
public/css/iconfont.woff
View File

Binary file not shown.

BIN
public/css/iconfont.woff2
View File

Binary file not shown.

2
src/college/colleagecss/colleage.css
View File

@ -218,7 +218,7 @@ a:hover {
} }
.color-blue { .color-blue {
color: #4CACFF; color: #2A61FF;
} }
.color-huang { .color-huang {

17
src/common/UrlTool.js
View File

@ -18,6 +18,23 @@ export function getImageUrl(path) {
return `${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) { export function getImage(path) {
// https://www.educoder.net // https://www.educoder.net
// https://testbdweb.trustie.net // https://testbdweb.trustie.net

2
src/common/educoder.js
View File

@ -3,7 +3,7 @@
// export { default as OrderStateUtil } from '../routes/Order/components/OrderStateUtil'; // export { default as OrderStateUtil } from '../routes/Order/components/OrderStateUtil';
export { 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 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 , 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 , getTaskUrlById as getTaskUrlById, TEST_HOST, htmlEncode as htmlEncode, getupload_git_file as getupload_git_file, getcdnImageUrl as getcdnImageUrl

106
src/forge/Branch/Select.jsx
View File

@ -1,116 +1,36 @@
import React , { useState , useEffect } from 'react'; import React , { useState , useEffect } from 'react';
import { Popover , Input , Spin } from 'antd'; import { Popover , Dropdown , Input , Spin } from 'antd';
import './branch.scss'; import './branch.scss';
import { getBranch , getTag } from '../GetData/getData'; import { getBranch , getTag } from '../GetData/getData';
import SelectOverlay from './SelectOverlay';
export default (({ projectsId , branch , owner , changeBranch , branchList , tagflag = true })=>{ export default (({ projectsId , branch , owner , changeBranch , branchList , tagflag = true })=>{
const [ showValue , setShowValue ] = useState(branch); 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(()=>{ useEffect(()=>{
setShowValue(branch); setShowValue(branch);
},[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 = ( const menu = (
<div> <SelectOverlay
<div className="padding10 bor-bottom-greyE"> changeBranch={changeBranch}
<Input tagflag={tagflag}
placeholder="请输入分支或标签名称搜索" projectsId={projectsId}
autocomplete="off" className="OptionsInput" value={inputValue} owner={owner}
onChange={changeInputValue} style={{width:"220px"}} branchList={branchList}
/> />
<ul className="navUl">
<li className={nav === 0?"navli active":"navli"} onClick={()=>changeNav(0)}><i className="iconfont icon-fenzhi1 font-14 mr3"></i>分支列表</li>
{ tagflag && <li className={nav === 1?"navli active":"navli"} onClick={()=>changeNav(1)}><i className="iconfont icon-biaoqian3 font-14 mr3"></i>标签列表</li> }
</ul>
</div>
<Spin spinning={isSpin}>
<ul className="OptionsUl" id="ul-btn">
{
datas && datas.length>0 ?
datas.map((item,key)=>{
return(
<li key={key} onClick={()=>chooseitem(item.name)}><a className="task-hide ulALink">{item.name}</a></li>
)
}):
<p className="listTips">暂无{inputValue}{nav === 0 ?"分支":"标签"}~</p>
}
</ul>
</Spin>
</div>
); );
return( return(
<Popover placement='bottomLeft' visible={flag} content={menu} onClick={()=>setFlag(!flag)} overlayClassName="branch-tagBox-list"> <Dropdown placement='bottomLeft' overlay={menu} overlayClassName="branch-tagBox-list" trigger={['click']} >
<div className="branch-tagBox"> <div className="branch-tagBox">
{/* {nav === 0 ?"分支":"标签"} */} {/* {nav === 0 ?"分支":"标签"} */}
<span className="color-grey-9 mr3 ml8"><i className="iconfont icon-fenzhi2 font-18"></i></span> <span className="color-grey-9 mr3 ml8"><i className="iconfont icon-fenzhi2 font-18"></i></span>
<a className="ant-dropdown-link"> <a className="ant-dropdown-link task-hide">
{showValue} {showValue}
</a> </a>
<i className="showtag iconfont icon-xiajiantou font-14 color-grey-9 mr8" /> <i className="showtag iconfont icon-sanjiaoxing-down font-15 color-grey-9 mr5 ml5 mt1" />
</div> </div>
</Popover> </Dropdown>
) )
}) })

84
src/forge/Branch/SelectOverlay.jsx Normal file
View File

@ -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(
<div className="overlayBranch">
<div className="padding15" style={{paddingBottom:"0px"}}>
<Input
prefix={<i className="iconfont icon-sousuo_icon1 font-14"></i>}
placeholder="请输入分支或标签名称搜索"
autocomplete="off" className="OptionsInput"
value={inputValue}
onChange={changeInputValue}
/>
</div>
<Menu mode="horizontal" className="navUl" selectedKeys={[keys]} onClick={changeNav}>
<Menu.Item key={"branch"}>分支</Menu.Item>
{ tagflag && <Menu.Item key={"tag"}>标签</Menu.Item> }
</Menu>
<Spin spinning={isSpin}>
<ul className="OptionsUl" id="ul-btn">
{
datas && datas.length>0 ?
datas.map((item,key)=>{
return(
<li key={key} onClick={()=>chooseitem(item.name)}><a className="task-hide ulALink">{item.name}</a></li>
)
}):
<p className="listTips">暂无{inputValue}{nav === 0 ?"分支":"标签"}~</p>
}
</ul>
</Spin>
</div>
)
}
export default SelectOverlay;

66
src/forge/Branch/branch.scss
View File

@ -27,10 +27,11 @@
overflow-y: auto; overflow-y: auto;
} }
.OptionsUl li{ .OptionsUl li{
height: 35px; height: 30px;
line-height: 35px; line-height: 30px;
cursor: pointer; cursor: pointer;
padding:0px 10px; padding:0px 20px;
margin:5px 0px;
} }
.OptionsUl li:hover{ .OptionsUl li:hover{
background-color: #F0F0F0; background-color: #F0F0F0;
@ -45,38 +46,49 @@
width: 100%; width: 100%;
} }
.branch-tagBox{ .branch-tagBox{
border:1px solid #eee; border:1px solid #D0D0D0;
border-radius: 3px; border-radius: 3px;
height: 40px; height: 40px;
display: flex; display: flex;
align-items: center; align-items: center;
cursor: pointer; cursor: pointer;
min-width: 140px; min-width: 104px;
} }
.branch-tagBox-list .ant-popover-arrow{ .branch-tagBox:hover{
display: none; background-color: #F3F4F6;
} }
.branch-tagBox-list.ant-popover.ant-popover-placement-bottom{ .branch-tagBox-list{
padding-top:0px; 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;
}
} }
.branch-tagBox .ant-dropdown-link{ .overlayBranch{
display: block; width: 325px;
flex:1; .navUl{
} margin-top: 8px;
.branch-tagBox-list .ant-popover-inner-content{ height: 30px;
padding:0px; line-height: 30px;
} li{
.navUl{ height: 30px;
display: flex; line-height: 30px;
justify-content: space-between; padding:0px 5px;
align-items: center; margin-left: 20px!important;
margin-top: 5px; }
} }
.navUl li{
cursor: pointer;
}
.navUl li.active{
color:#5091FF;
} }
.listTips{ .listTips{
padding:20px 0px; padding:20px 0px;

6
src/forge/Component/Contributors.jsx
View File

@ -136,8 +136,10 @@ function Contributors({contributors,owner,projectsId}){
return( return(
<div className="halfs"> <div className="halfs">
<FlexAJ> <FlexAJ>
<AlignCenter><span className="font-16 color-grey-6">贡献者</span>{ contributors && contributors.total_count > 0 && <span className="infoCount">{contributors.total_count}</span>}</AlignCenter> <AlignCenter>
<Link className="font-12 color-grey-9" to={`/projects/${owner}/${projectsId}/contribute`}>全部</Link> <Link to={`/projects/${owner}/${projectsId}/contribute`} className="font-16 color-ooo">贡献者</Link>
{ contributors && contributors.total_count > 0 && <span className="infoCount">{contributors.total_count}</span>}
</AlignCenter>
</FlexAJ> </FlexAJ>
<div className="attrPerson" onMouseLeave={()=>setVisibleFunc(false)}> <div className="attrPerson" onMouseLeave={()=>setVisibleFunc(false)}>
{ {

15
src/forge/Component/Releases.jsx
View File

@ -7,14 +7,12 @@ function Releases({owner,projectsId,releaseVersions , baseOperate , projectType}
return( return(
<div> <div>
<FlexAJ> <FlexAJ>
<AlignCenter><span className="font-16 color-grey-6">发行版</span> <AlignCenter><Link to={`/projects/${owner}/${projectsId}/releases`} className="font-16 color-ooo">发行版</Link>
{ releaseVersions && releaseVersions.total_count > 0 && <span className="infoCount">{releaseVersions.total_count}</span>} { releaseVersions && releaseVersions.total_count > 0 && <span className="infoCount">{releaseVersions.total_count}</span>}
</AlignCenter> </AlignCenter>
{ (releaseVersions && releaseVersions.total_count > 0) || projectType ===2 ? {/* {
<Link className="font-12 color-grey-9" to={`/projects/${owner}/${projectsId}/releases`}>全部</Link> baseOperate && projectType !==2 && <Link className="font-12 color-blue" to={`/projects/${owner}/${projectsId}/releases/new`}>新建</Link>
: } */}
baseOperate && <Link className="font-12 color-blue" to={`/projects/${owner}/${projectsId}/releases/new`}>新建</Link>
}
</FlexAJ> </FlexAJ>
{ {
releaseVersions && releaseVersions.total_count>0 ? releaseVersions && releaseVersions.total_count>0 ?
@ -32,7 +30,10 @@ function Releases({owner,projectsId,releaseVersions , baseOperate , projectType}
</AlignTop> </AlignTop>
) )
}) })
:"" :
<div className="mt8">
您暂未发布任何版本{baseOperate && projectType !==2 && <Link className="color-blue ml20" to={`/projects/${owner}/${projectsId}/releases/new`}>创建新版本</Link>}
</div>
} }
</div> </div>

46
src/forge/Main/CoderDepot.jsx
View File

@ -345,34 +345,31 @@ function CoderDepot(props){
} }
</div> </div>
<AlignCenter className="mr20"> <AlignCenter className="mr20">
<Link to={`/projects/${owner}/${projectsId}/branchs`} className="color-grey-9"> <Link to={`/projects/${owner}/${projectsId}/branchs`} className="depotNum">
<i className="iconfont icon-fenzhi2 font-18 color-grey-9 mr3"></i> <i className="iconfont icon-master_icon font-14 mr3"></i>
<span className="color-grey-6 mr3">{projectDetail && projectDetail.branches && projectDetail.branches.total_count}个</span>分支 <span className="mr3">分支</span>
<span>{projectDetail && projectDetail.branches && projectDetail.branches.total_count}</span>
</Link> </Link>
</AlignCenter> </AlignCenter>
<AlignCenter className="mr20"> <AlignCenter className="mr20">
<Link to={`/projects/${owner}/${projectsId}/tag`} className="color-grey-9"> <Link to={`/projects/${owner}/${projectsId}/tag`} className="depotNum">
<i className="iconfont icon-biaoqian3 font-16 color-grey-9 mr3"></i> <i className="iconfont icon-biaoqianicon font-14 mr3"></i>
<span className="color-grey-6 mr3">{projectDetail && projectDetail.tags && projectDetail.tags.total_count}个</span>标签 <span className="mr3">标签</span>
<span>{projectDetail && projectDetail.tags && projectDetail.tags.total_count}</span>
</Link> </Link>
</AlignCenter> </AlignCenter>
</AlignCenter> </AlignCenter>
<AlignCenter> <AlignCenter>
{ {
baseOperate && ((projectDetail.type !== 2 && pullsFlag) || issuesFlag )&& baseOperate && projectDetail.type !== 2 && pullsFlag &&
<div className="mr20 addOptionBtn"> <Button onClick={()=>urlLink(`/projects/${owner}/${projectsId}/pulls/new`)} className="mr10">+ 合并请求</Button>
{ }
projectDetail.type !== 2 && pullsFlag && {
<a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/pulls/new`)} >+ 合并请求</a> baseOperate && issuesFlag &&
} <Button onClick={()=>urlLink(`/projects/${owner}/${projectsId}/issues/new`)} className="mr10">+ 任务</Button>
{
issuesFlag &&
<a onClick={()=>urlLink(`/projects/${owner}/${projectsId}/issues/new`)} >+ 任务</a>
}
</div>
} }
{ fileOperate && { fileOperate &&
<Dropdown overlay={fileMenu()} className="mr20" trigger={['click']}> <Dropdown overlay={fileMenu()} className="mr10" trigger={['click']}>
<Button type="default">文件 <i className="iconfont icon-sanjiaoxing-down ml3 font-14 color-grey-9"></i></Button> <Button type="default">文件 <i className="iconfont icon-sanjiaoxing-down ml3 font-14 color-grey-9"></i></Button>
</Dropdown> </Dropdown>
} }
@ -394,10 +391,13 @@ function CoderDepot(props){
</div> </div>
{ hideBtn && <span className="ellipsis" onClick={()=>changeHide(hide)}><i className="iconfont icon-shenglvehao"></i></span> } { hideBtn && <span className="ellipsis" onClick={()=>changeHide(hide)}><i className="iconfont icon-shenglvehao"></i></span> }
<span className="ml12 color-grey-9 mt3">{lastCommit && lastCommit.time_from_now}</span> <span className="ml12 color-grey-9 mt1">{lastCommit && lastCommit.time_from_now}</span>
{ commitCount ? <Link to={`/projects/${owner}/${projectsId}/commits/branch/${turnbar(branchName || defaultBranch)}`} className="ml12 color-grey-9"> {
<i className="iconfont icon-tijiao mr3 font-17 color-grey-9"></i>{commitCount}次提交 commitCount ?
</Link>:"" } <Link to={`/projects/${owner}/${projectsId}/commits/branch/${turnbar(branchName || defaultBranch)}`} className="ml12 color-grey-9" style={{height:"30px",lineHeight:"30px"}}>
<i className="iconfont icon-tijiao mr3 font-17"></i>{commitCount}次提交
</Link>:""
}
</div> </div>
} }
<ul className="listtablebody"> <ul className="listtablebody">
@ -483,7 +483,7 @@ function CoderDepot(props){
inviteCode && inviteCode &&
<div> <div>
<Divider /> <Divider />
<Invite code={inviteCode} className={"detailsCode"}/> <Invite code={inviteCode}/>
</div> </div>
} }
{ {

6
src/forge/Main/CoderDepotCatalogue.jsx
View File

@ -4,8 +4,8 @@ import { truncateCommitId } from '../common/util';
const typeIco = { const typeIco = {
"submodule":"icon-file-submodule font-17", "submodule":"icon-file-submodule font-17",
"file":'icon-wenjia font-15', "file":'icon-wenjian5 font-15',
"dir":"icon-wenjianjia1 font-15" "dir":"icon-wenjianjia3 font-15"
} }
function CoderDepotCatalogue({item , goToSubRoot , owner , projectsId }){ function CoderDepotCatalogue({item , goToSubRoot , owner , projectsId }){
@ -13,7 +13,7 @@ function CoderDepotCatalogue({item , goToSubRoot , owner , projectsId }){
<li> <li>
<span> <span>
<a onClick={()=>goToSubRoot(item.path,item.type,item.name)} className={item.type === "submodule" && "submoduleStyle"}> <a onClick={()=>goToSubRoot(item.path,item.type,item.name)} className={item.type === "submodule" && "submoduleStyle"}>
<i className={`iconfont ${typeIco[`${item.type}`]} color-green-file mr5`}></i>{item.name} <i className={`iconfont ${typeIco[`${item.type}`]} color-blue-file mr5`}></i>{item.name}
</a> </a>
</span> </span>
<span title="init project"> <span title="init project">

21
src/forge/Main/CoderDepotReadme.jsx
View File

@ -3,6 +3,8 @@ import RenderHtml from '../../components/render-html';
import { AlignCenter } from '../Component/layout'; import { AlignCenter } from '../Component/layout';
import { Dropdown , Menu , Spin } from 'antd'; import { Dropdown , Menu , Spin } from 'antd';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
import ReadmeCatelogue from './sub/ReadmeCatelogue';
const $ = window.$; const $ = window.$;
function CoderDepotReadme({ operate , history , readme , ChangeFile }){ function CoderDepotReadme({ operate , history , readme , ChangeFile }){
@ -23,34 +25,25 @@ function CoderDepotReadme({ operate , history , readme , ChangeFile }){
const anchor = el.id; const anchor = el.id;
const level = el.tagName.replace("H", ""); const level = el.tagName.replace("H", "");
const href = `#${anchor}`; const href = `#${anchor}`;
return { href:`${path}${href}`,text:el.textContent , level:level } return { href:`${href}`,text:el.textContent , level:level }
}); });
setMenuList(items); setMenuList(items);
},[content]) },[content])
function menu(){ function menu(){
if(menuList && menuList.length > 0){ if(menuList && menuList.length > 0){
let hash = history.location.hash;
return( return(
<Menu className="menuslist"> <ReadmeCatelogue menuList={menuList}/>
{
menuList.map((item,key)=>{
return(
<Menu.Item key={item.id} className={decodeURI(hash).indexOf(item.text)>-1 ?"active":""}><Link to={`${item.href}`} style={{paddingLeft:`${item.level *10}px`}} title={item.text}>{item.text}</Link></Menu.Item>
)
})
}
</Menu>
) )
}else{ }else{
return <Spin /> return <Spin />
} }
} }
return( return(
<div className="commonBox" id="readme"> <div className="commonBox readBox" id="readme">
<div className="commonBox-title boxTitle"> <div className="commonBox-title boxTitle">
<AlignCenter> <AlignCenter>
<Dropdown overlay={menu()}> <Dropdown overlay={menu()} trigger={['click']} overlayClassName="menuslist">
<span className="catelogue"> <span className="catelogue">
<i className="iconfont icon-zhangjie1 font-14 mr5"></i> <i className="iconfont icon-zhangjie1 font-14 mr5"></i>
<span>目录</span> <span>目录</span>
@ -61,7 +54,7 @@ function CoderDepotReadme({ operate , history , readme , ChangeFile }){
{ {
operate ? operate ?
<a className="ml20 pull-right" onClick={() =>ChangeFile(readme && readme.path, false)}> <a className="ml20 pull-right" onClick={() =>ChangeFile(readme && readme.path, false)}>
<i className="iconfont icon-bianji6 font-16 color-blue"></i> <i className="iconfont icon-a-bianji font-17 color-grey-6"></i>
</a> </a>
:"" :""
} }

2
src/forge/Main/CoderRootBranch.js
View File

@ -4,7 +4,7 @@ import { Dropdown , Menu , Icon , Tooltip , Spin } from 'antd';
import { truncateCommitId } from '../common/util'; import { truncateCommitId } from '../common/util';
import { getBranch } from '../GetData/getData'; import { getBranch } from '../GetData/getData';
import Nodata from '../Nodata'; import Nodata from '../Nodata';
import './list.css'; import './list.scss';
function turnbar(str){ function turnbar(str){
if(str && str.length>0 && str.indexOf("/")>-1){ if(str && str.length>0 && str.indexOf("/")>-1){

2
src/forge/Main/CoderRootFileDetail.js
View File

@ -1,6 +1,6 @@
import React, { Component } from "react"; import React, { Component } from "react";
import { Popconfirm , Select } from "antd"; import { Popconfirm , Select } from "antd";
import "./list.css"; import "./list.scss";
import axios from "axios"; import axios from "axios";
import Meditor from "../Newfile/m_editor"; import Meditor from "../Newfile/m_editor";
import RenderHtml from "../../components/render-html"; import RenderHtml from "../../components/render-html";

39
src/forge/Main/Detail.js
View File

@ -1,10 +1,11 @@
import React, { Component } from 'react'; import React, { Component } from 'react';
import { Spin, Tooltip , Button } from 'antd'; import { Spin, Tooltip, Button } from 'antd';
import { Link, Route, Switch } from 'react-router-dom'; import { Link, Route, Switch } from 'react-router-dom';
import { Content , AlignTop } from '../Component/layout'; import { Content , AlignTop } from '../Component/layout';
import DetailBanner from './sub/DetailBanner'; import DetailBanner from './sub/DetailBanner';
import { numFormat } from 'educoder';
import '../css/index.scss' import '../css/index.scss'
import './list.css'; import './list.scss';
import Loadable from 'react-loadable'; import Loadable from 'react-loadable';
import Loading from '../../Loading'; import Loading from '../../Loading';
@ -434,7 +435,7 @@ class Detail extends Component {
<div> <div>
<div className="detailHeader-wrapper"> <div className="detailHeader-wrapper">
<div className="normal"> <div className="normal">
<AlignTop style={{padding:"20px 0px 10px",justifyContent:"space-between"}}> <AlignTop style={{padding:"25px 0px 10px",justifyContent:"space-between"}}>
<div> <div>
<AlignTop> <AlignTop>
<div className="projectallName"> <div className="projectallName">
@ -454,7 +455,7 @@ class Detail extends Component {
} }
{ {
projectDetail && projectDetail.type && projectDetail.type !== 0 ? projectDetail && projectDetail.type && projectDetail.type !== 0 ?
<span className="color-grey-9">镜像自 <a className="color-grey-6" target="_blank" href={projectDetail.mirror_url}>{projectDetail.mirror_url}</a></span> <span className="color-grey-9">镜像自 <a className="color-blue hoverLine" target="_blank" href={projectDetail.mirror_url}>{projectDetail.mirror_url}</a></span>
:"" :""
} }
</div> </div>
@ -465,56 +466,56 @@ class Detail extends Component {
<span className="df"> <span className="df">
{ {
((current_user && current_user.admin) || isManager) && (projectDetail && projectDetail.type && projectDetail.type === 2) ? ((current_user && current_user.admin) || isManager) && (projectDetail && projectDetail.type && projectDetail.type === 2) ?
<a className="synchronism ml30" onClick={this.synchronismMirror}>同步镜像</a> : "" <a size="middle" className="synchronism ml30" onClick={this.synchronismMirror}>同步镜像</a> : ""
} }
<Button className="detail_tag_btn"> <span className="detail_tag_btn">
<a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={() => this.focusFunc(watched)}> <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={() => this.focusFunc(watched)}>
<i className={watched ? "iconfont icon-shixing color-orange font-16 mr3":"iconfont icon-kongxing color-grey-9 font-16 mr3"}></i> <i className={watched ? "iconfont icon-quxiaoguanzhu color-blue font-14 mr3":"iconfont icon-morenguanzhu_ICON color-grey-9 font-14 mr3"}></i>
<span>{watched ? '取消关注' : '关注'}</span> <span>{watched ? '取消关注' : '关注'}</span>
</a> </a>
{ {
watchers_count > 0 ? watchers_count > 0 ?
platform ? platform ?
<Link className="detail_tag_btn_count" style={{color:`${watched?"#2878FF":"#666"}`}} to={platform?{ pathname: `/projects/${owner}/${projectsId}/watchers`, state }:""}> <Link className="detail_tag_btn_count" to={platform?{ pathname: `/projects/${owner}/${projectsId}/watchers`, state }:""}>
{watchers_count} {numFormat(watchers_count)}
</Link> </Link>
: :
<span className="detail_tag_btn_count">{watchers_count}</span> <span className="detail_tag_btn_count">{watchers_count}</span>
:"" :""
} }
</Button> </span>
<Button className="detail_tag_btn"> <span className="detail_tag_btn">
<a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={() => this.pariseFunc(praised)}> <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={() => this.pariseFunc(praised)}>
<i className={praised ? "iconfont icon-weibiaoti105 color-orange font-14 mr3":"iconfont icon-guanzhu color-grey-9 font-14 mr3"}></i> <i className={praised ? "iconfont icon-dianzan_icon color-blue font-14 mr3":"iconfont icon-guanzhu color-grey-9 font-14 mr3"}></i>
<span>{praised ? '取消点赞' : '点赞'}</span> <span>{praised ? '取消点赞' : '点赞'}</span>
</a> </a>
{ {
praises_count > 0 ? praises_count > 0 ?
platform ? platform ?
<Link className="detail_tag_btn_count" style={{color:`${praised?"#2878FF":"#666"}`}} to={{ pathname: `/projects/${owner}/${projectsId}/stargazers`, state }}> <Link className="detail_tag_btn_count" to={{ pathname: `/projects/${owner}/${projectsId}/stargazers`, state }}>
{praises_count} {numFormat(praises_count)}
</Link>: </Link>:
<span className="detail_tag_btn_count">{praises_count}</span> <span className="detail_tag_btn_count">{praises_count}</span>
:"" :""
} }
</Button> </span>
<Button className="detail_tag_btn" loading={forkSpin}> <span className="detail_tag_btn" loading={forkSpin}>
<Tooltip title="复刻是fork的中文名，即复制代码仓库" placement="bottom"> <Tooltip title="复刻是fork的中文名，即复制代码仓库" placement="bottom">
<a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={this.forkFunc}> <a className="detail_tag_btn_name" style={{cursor:platform?"pointer":"default"}} onClick={this.forkFunc}>
<i className="iconfont icon-fork color-grey-9 mr3"></i>复刻 <i className="iconfont icon-fork color-grey-9 mr3 font-16"></i>复刻
</a> </a>
</Tooltip> </Tooltip>
{ {
forked_count > 0 ? forked_count > 0 ?
platform ? platform ?
<Link className="detail_tag_btn_count" to={{ pathname: `/projects/${owner}/${projectsId}/fork_users`, state }}> <Link className="detail_tag_btn_count" to={{ pathname: `/projects/${owner}/${projectsId}/fork_users`, state }}>
{forked_count} {numFormat(forked_count)}
</Link> </Link>
: :
<span className="detail_tag_btn_count">{forked_count}</span> <span className="detail_tag_btn_count">{forked_count}</span>
:"" :""
} }
</Button> </span>
</span> </span>
} }
</div> </div>

2
src/forge/Main/Index.js
View File

@ -6,7 +6,7 @@ import { getImageUrl } from 'educoder';
import "slick-carousel/slick/slick.css"; import "slick-carousel/slick/slick.css";
import "slick-carousel/slick/slick-theme.css"; import "slick-carousel/slick/slick-theme.css";
import '../css/index.scss' import '../css/index.scss'
import './list.css'; import './list.scss';
import './Index.scss'; import './Index.scss';
import ListItem from './IndexItem' import ListItem from './IndexItem'
import axios from 'axios'; import axios from 'axios';

52
src/forge/Main/Index.scss
View File

@ -129,13 +129,14 @@
} }
.infoCount{ .infoCount{
display: inline-block; display: inline-block;
padding:0px 5px; width: 24px;
height: 16px; text-align: center;
line-height: 16px; height: 24px;
background-color: #eee; line-height: 24px;
color:#999; background-color:rgba(153, 153, 153, 0.13);;
color:#666;
border-radius: 12px; border-radius: 12px;
margin-left: 10px; margin-left: 6px;
font-size: 12px; font-size: 12px;
} }
.attrPerson{ .attrPerson{
@ -195,16 +196,14 @@
} }
.listtable{ .listtable{
margin-top: 20px; margin-top: 20px;
border:1px solid #d9d9d9;
border-radius: 4px;
.listtablehead{ .listtablehead{
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: flex-start; align-items: flex-start;
border-bottom: 1px solid #d9d9d9; border-bottom: 1px solid #d9d9d9;
padding:7px 20px; padding:13px 20px;
border-radius: 4px 4px 0px 0px; border-radius: 4px 4px 0px 0px;
background-color: #FAFBFC; border: 1px solid rgba(42, 97, 255, 0.23);
.ellipsistxt{ .ellipsistxt{
margin-top: 6px; margin-top: 6px;
#ptxt{ #ptxt{
@ -239,20 +238,25 @@
margin-left: 8px; margin-left: 8px;
cursor: pointer; cursor: pointer;
border-radius: 2px; border-radius: 2px;
background-color: #c1c1c1; height: 16px;
background: rgba(153, 153, 153, 0.2);
border-radius: 2px;
padding:0px 4px; padding:0px 4px;
height: 14px; height: 14px;
line-height: 14px; line-height: 14px;
margin-top: 9px; margin-top: 9px;
i{ i{
font-size: 15px!important; font-size: 15px!important;
color: #fff; color: #333;
height: 14px; height: 14px;
line-height: 14px; line-height: 14px;
} }
} }
} }
.listtablebody{ .listtablebody{
border-radius:0px 0px 4px 4px ;
border: 1px solid #D0D0D0;
border-top: none;
li.listtablepath{ li.listtablepath{
a{color: #40a9ff;} a{color: #40a9ff;}
p{ p{
@ -260,12 +264,15 @@
} }
} }
& > li{ & > li{
height: 42px; height: 44px;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: center; align-items: center;
border-bottom: 1px solid #d9d9d9; border-bottom: 1px solid #d9d9d9;
padding:0px 20px 0px 24px; padding:0px 20px 0px 24px;
&:hover{
background-color: #F3F4F6;
}
& > span:first-child{ & > span:first-child{
width: 30%; width: 30%;
overflow: hidden; overflow: hidden;
@ -327,25 +334,6 @@
} }
} }
.menuslist{
max-height: 200px;
overflow-y: auto;
padding:10px 15px;
border-radius: 4px;
.ant-dropdown-menu-item{
border-radius: 8px;
text-align: left!important;
a{
width: 350px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
}
.ant-dropdown-menu-item.active{
background-color: #e6f7ff;
}
}
.catelogue{ .catelogue{
border:1px solid rgb(211, 211, 211); border:1px solid rgb(211, 211, 211);
font-size: 15px; font-size: 15px;

2
src/forge/Main/IndexItem.js
View File

@ -5,7 +5,7 @@ import { AlignCenter } from '../Component/layout';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
import '../css/index.scss'; import '../css/index.scss';
import Nodata from '../Nodata'; import Nodata from '../Nodata';
import './list.css'; import './list.scss';
import img_parise from '../Images/parise.png'; import img_parise from '../Images/parise.png';
class IndexItem extends Component { class IndexItem extends Component {

84
src/forge/Main/list.css → src/forge/Main/list.scss
View File

@ -218,9 +218,9 @@
} }
/* -----------详情------------ */ /* -----------详情------------ */
.detailHeader-wrapper{ .detailHeader-wrapper{
background-color:#FAFBFC; background-color:#FBFCFF;
/* background: url(../Images/forgeBanner.jpg) no-repeat center; */ border-bottom:1px solid #e2e2e2;
/* background-size:cover; */ /* box-shadow: 0px 2px 11px 0px#D0D0D0; */
} }
.headerMenu-wrapper{ .headerMenu-wrapper{
font-size: 16px; font-size: 16px;
@ -232,7 +232,7 @@
text-align: center; text-align: center;
height: 40px; height: 40px;
line-height: 28px; line-height: 28px;
margin-right: 40px; padding:0px 20px;
} }
.headerMenu-wrapper li a{ .headerMenu-wrapper li a{
color: #666; color: #666;
@ -241,34 +241,44 @@
margin-right: 8px; margin-right: 8px;
} }
.headerMenu-wrapper li a > span.num{ .headerMenu-wrapper li a > span.num{
height: 28px; line-height: 24px;
line-height: 29px; margin-left: 5px;
margin-left: 8px; margin-top: 2px;
font-size: 12px; font-size: 12px;
color: #2878FF;
float: right; float: right;
color: #666!important;
background-color: rgba(153, 153, 153, 0.13);;
border-radius: 50%;
width: 24px;
height: 24px;
}
.headerMenu-wrapper li.active a,.headerMenu-wrapper li.active a i{
color: #2A61FF!important;
} }
.headerMenu-wrapper li.active::after{ .headerMenu-wrapper li.active::after{
position: absolute; position: absolute;
bottom:0px; bottom:0px;
height:2px; height:2px;
background-color: #5091FF; background-color: #2A61FF;
content:''; content:'';
left: 0px; left: 0px;
width:100%; width:100%;
} }
.detail_tag_btn{ .detail_tag_btn{
height:26px; height:34px;
line-height: 26px; line-height: 32px;
border-radius:5px; border-radius:5px;
border:1px solid #f1f1f1; border:1px solid #D0D0D0;
display: flex; display: flex;
align-items: center; align-items: center;
margin-left: 30px; margin-left: 30px;
padding:0px; padding:0px;
background-color: transparent; background-color:#FAFBFC;
box-shadow: none; box-shadow: none;
} }
.detail_tag_btn:hover{
background-color: #F3F4F6;
}
.ant-tooltip { .ant-tooltip {
max-width: fit-content!important; max-width: fit-content!important;
} }
@ -280,11 +290,12 @@
margin-right: 10px; margin-right: 10px;
} }
.detail_tag_btn_count{ .detail_tag_btn_count{
padding:0px 10px; width: 42px;
text-align: center;
background: #fff; background: #fff;
border-radius: 0px 4px 4px 0px; border-radius: 0px 4px 4px 0px;
font-size: 12px;
height:100%; height:100%;
border-left: 1px solid #D0D0D0;
} }
.files-md{ .files-md{
padding:20px; padding:20px;
@ -499,7 +510,7 @@
} }
.addFile a{ .addFile a{
display: block; display: block;
background-color: rgb(76, 172, 255,0.8); background-color: rgba(76, 172, 255,0.8);
color: #fff; color: #fff;
cursor: pointer; cursor: pointer;
height: 32px; height: 32px;
@ -514,7 +525,7 @@
border-left: 1px solid rgba(247, 247, 247, 0.3); border-left: 1px solid rgba(247, 247, 247, 0.3);
} }
.addFile a:active{ .addFile a:active{
background-color: rgb(76, 172, 255,1); background-color: rgba(76, 172, 255,1);
} }
@ -567,14 +578,28 @@
border-bottom: 1px solid #d9d9d9; border-bottom: 1px solid #d9d9d9;
border-radius: 4px 4px 0px 0px; border-radius: 4px 4px 0px 0px;
} }
.readBox{
border:none;
&.commonBox .commonBox-info{
border:1px solid #D0D0D0;
border-top: none;
border-radius: 0px 0px 4px 4px;
padding:20px 38px;
}
}
.commonBox .commonBox-title.boxTitle{ .commonBox .commonBox-title.boxTitle{
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
height: 65px;
line-height: 65px;
background: #FAFCFF;
border-radius: 4px 4px 0px 0px;
border: 1px solid rgba(42, 97, 255, 0.23);
} }
.synchronism{ .synchronism{
display: block; display: block;
height: 26px; height: 34px;
line-height: 26px; line-height: 34px;
padding:0px 15px; padding:0px 15px;
color: #fff!important; color: #fff!important;
background-color: #28BD6C; background-color: #28BD6C;
@ -583,10 +608,16 @@
.files_info{ .files_info{
cursor: pointer; cursor: pointer;
} }
.commonBox .commonBox-info{ .commonBox {
padding:20px 15px; .commonBox-info{
padding:20px 15px;
}
}
.commonBox-title-read{
vertical-align: middle;
color: #666;
font-size: 14px;
} }
.commonBox-title-read{vertical-align: middle;color: #666;}
@media screen and (max-width: 370px){ @media screen and (max-width: 370px){
.p-r-tags,.p-r-btn{ .p-r-tags,.p-r-btn{
@ -733,3 +764,12 @@ a.color-grey-ccc:hover{
display: flex; display: flex;
justify-content: center; justify-content: center;
} }
.depotNum{
color: #666!important;
span:last-child{
color: #333;
}
&:hover span:last-child{
color: #2A61FF;
}
}

27
src/forge/Main/sub/DetailBanner.jsx
View File

@ -1,6 +1,7 @@
import React, { useEffect, useState } from 'react'; import React, { useEffect, useState } from 'react';
import { Skeleton , Tooltip} from 'antd'; import { Skeleton , Tooltip} from 'antd';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
import { numFormat } from 'educoder';
function DetailBanner({ history,list , owner , projectsId , isManager , url , pathname , state , urlFlag , projectDetail , platform ,open_devops }){ function DetailBanner({ history,list , owner , projectsId , isManager , url , pathname , state , urlFlag , projectDetail , platform ,open_devops }){
const [ menuName , setMenuName ] = useState(undefined); const [ menuName , setMenuName ] = useState(undefined);
@ -29,7 +30,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
item.menu_name === "home" && item.menu_name === "home" &&
<li className={pathname==="about" ? "active" : ""}> <li className={pathname==="about" ? "active" : ""}>
<Link to={{ pathname: `/projects/${owner}/${projectsId}/about`, state }}> <Link to={{ pathname: `/projects/${owner}/${projectsId}/about`, state }}>
<i className={(pathname==="" || urlFlag) ? "iconfont icon-zhuye1 color-grey-3 mr5 font-14":"iconfont icon-zhuye1 color-grey-6 font-14 mr5"}></i> <i className={(pathname==="" || urlFlag) ? "iconfont icon-zhuyeicon color-grey-3 mr5 font-14":"iconfont icon-zhuyeicon color-grey-6 font-14 mr5"}></i>
<span>主页</span> <span>主页</span>
</Link> </Link>
</li> </li>
@ -38,7 +39,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
item.menu_name === "code" && item.menu_name === "code" &&
<li className={(pathname==="" || urlFlag) ? "active" : ""}> <li className={(pathname==="" || urlFlag) ? "active" : ""}>
<Link to={{ pathname: `/projects/${owner}/${projectsId}`, state }}> <Link to={{ pathname: `/projects/${owner}/${projectsId}`, state }}>
<i className={(pathname==="" || urlFlag) ? "iconfont icon-daimaku color-grey-3 mr5 font-14":"iconfont icon-daimaku color-grey-6 font-14 mr5"}></i> <i className={(pathname==="" || urlFlag) ? "iconfont icon-daimakuicon color-grey-3 mr5 font-14":"iconfont icon-daimakuicon color-grey-6 font-14 mr5"}></i>
<span>代码库</span> <span>代码库</span>
</Link> </Link>
</li> </li>
@ -48,9 +49,9 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
<li className={pathname==="issues" ? "active" : ""}> <li className={pathname==="issues" ? "active" : ""}>
<Tooltip title="易修是Issue的中文名，即问题列表" placement="bottom"> <Tooltip title="易修是Issue的中文名，即问题列表" placement="bottom">
<Link to={{ pathname: `/projects/${owner}/${projectsId}/issues`, state }}> <Link to={{ pathname: `/projects/${owner}/${projectsId}/issues`, state }}>
<i className={pathname==="issues" ? "iconfont icon-renwu color-grey-3 mr5 font-14":"iconfont icon-renwu color-grey-6 font-14 mr5"}></i> <i className={pathname==="issues" ? "iconfont icon-yixiuicon color-grey-3 mr5 font-14":"iconfont icon-yixiuicon color-grey-6 font-14 mr5"}></i>
<span>易修</span> <span>易修</span>
{projectDetail && projectDetail.issues_count ? <span className="num">{projectDetail.issues_count}</span> : ""} {projectDetail && projectDetail.issues_count ? <span className="num">{numFormat(projectDetail.issues_count)}</span> : ""}
</Link> </Link>
</Tooltip> </Tooltip>
</li> </li>
@ -59,9 +60,9 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
item.menu_name === "pulls" && projectDetail && parseInt(projectDetail.type) !== 2 && platform ? item.menu_name === "pulls" && projectDetail && parseInt(projectDetail.type) !== 2 && platform ?
<li className={pathname==="pulls" ? "active" : ""}> <li className={pathname==="pulls" ? "active" : ""}>
<Link to={{ pathname: `/projects/${owner}/${projectsId}/pulls`, state }}> <Link to={{ pathname: `/projects/${owner}/${projectsId}/pulls`, state }}>
<i className={pathname==="pulls" ? "iconfont icon-hebingqingqiu1 color-grey-3 mr5 font-14":"iconfont icon-hebingqingqiu1 color-grey-6 font-14 mr5"}></i> <i className={pathname==="pulls" ? "iconfont icon-hebingqingqiuicon color-grey-3 mr5 font-14":"iconfont icon-hebingqingqiuicon color-grey-6 font-14 mr5"}></i>
<span>合并请求</span> <span>合并请求</span>
{projectDetail && projectDetail.pull_requests_count ? <span className="num">{projectDetail.pull_requests_count}</span> : ""} {projectDetail && projectDetail.pull_requests_count ? <span className="num">{numFormat(projectDetail.pull_requests_count)}</span> : ""}
</Link> </Link>
</li>:"" </li>:""
} }
@ -69,8 +70,8 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
item.menu_name === "devops" && platform ? item.menu_name === "devops" && platform ?
<li className={pathname==="devops" ? "active" : ""}> <li className={pathname==="devops" ? "active" : ""}>
<Link to={{ pathname: `/projects/${owner}/${projectsId}/devops${open_devops ? `/dispose`:""}`, state }}> <Link to={{ pathname: `/projects/${owner}/${projectsId}/devops${open_devops ? `/dispose`:""}`, state }}>
<i className="iconfont icon-gongzuoliu font-13 mr8"></i>工作流(beta版) <i className="iconfont icon-gongzuoliuicon font-13 mr8"></i>工作流(beta版)
{projectDetail && projectDetail.ops_count ? <span>{projectDetail.ops_count}</span> : ""} {projectDetail && projectDetail.ops_count ? <span>{numFormat(projectDetail.ops_count)}</span> : ""}
</Link> </Link>
</li> </li>
:"" :""
@ -81,7 +82,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
<Link to={{ pathname: `/projects/${owner}/${projectsId}/source`, state }}> <Link to={{ pathname: `/projects/${owner}/${projectsId}/source`, state }}>
<i className={pathname==="source" ? "iconfont icon-ziyuanpaihanghetuijian color-grey-3 mr5 font-14":"iconfont icon-ziyuanpaihanghetuijian color-grey-6 font-14 mr5"}></i> <i className={pathname==="source" ? "iconfont icon-ziyuanpaihanghetuijian color-grey-3 mr5 font-14":"iconfont icon-ziyuanpaihanghetuijian color-grey-6 font-14 mr5"}></i>
<span>资源库</span> <span>资源库</span>
{projectDetail && projectDetail.source_count ? <span className="num">{projectDetail.source_count}</span> :""} {projectDetail && projectDetail.source_count ? <span className="num">{numFormat(projectDetail.source_count)}</span> :""}
</Link> </Link>
</li> </li>
} }
@ -89,9 +90,9 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
item.menu_name === "versions" && item.menu_name === "versions" &&
<li className={pathname==="milestones" ? "active" : ""}> <li className={pathname==="milestones" ? "active" : ""}>
<Link to={{ pathname: `/projects/${owner}/${projectsId}/milestones`, state }}> <Link to={{ pathname: `/projects/${owner}/${projectsId}/milestones`, state }}>
<i className={pathname==="milestones" ? "iconfont icon-lichengbei color-grey-3 mr5 font-14":"iconfont icon-lichengbei color-grey-6 font-14 mr5"}></i> <i className={pathname==="milestones" ? "iconfont icon-lichengbeiicon color-grey-3 mr5 font-14":"iconfont icon-lichengbeiicon color-grey-6 font-14 mr5"}></i>
<span>里程碑</span> <span>里程碑</span>
{projectDetail && projectDetail.versions_count ? <span className="num">{projectDetail.versions_count}</span> :""} {projectDetail && projectDetail.versions_count ? <span className="num">{numFormat(projectDetail.versions_count)}</span> :""}
</Link> </Link>
</li> </li>
} }
@ -99,7 +100,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
item.menu_name === "activity" && item.menu_name === "activity" &&
<li className={pathname==="activity" ? "active" : ""}> <li className={pathname==="activity" ? "active" : ""}>
<Link to={{ pathname: `/projects/${owner}/${projectsId}/activity`, state }}> <Link to={{ pathname: `/projects/${owner}/${projectsId}/activity`, state }}>
<i className={pathname==="activity" ? "iconfont icon-tongzhi color-grey-3 mr5 font-14":"iconfont icon-tongzhi color-grey-6 font-14 mr5"}></i> <i className={pathname==="activity" ? "iconfont icon-dongtaiicon color-grey-3 mr5 font-14":"iconfont icon-dongtaiicon color-grey-6 font-14 mr5"}></i>
<span>动态</span> <span>动态</span>
</Link> </Link>
</li> </li>
@ -108,7 +109,7 @@ function DetailBanner({ history,list , owner , projectsId , isManager , url , pa
item.menu_name === "setting" && item.menu_name === "setting" &&
<li className={pathname === "setting" ? "active" : ""}> <li className={pathname === "setting" ? "active" : ""}>
<Link to={`/projects/${owner}/${projectsId}/setting`}> <Link to={`/projects/${owner}/${projectsId}/setting`}>
<i className={url && url.indexOf("/setting") > 0 ? "iconfont icon-cangku color-grey-3 mr5 font-14":"iconfont icon-cangku color-grey-6 font-14 mr5"}></i> <i className={url && url.indexOf("/setting") > 0 ? "iconfont icon-cangkushezhiicon color-grey-3 mr5 font-14":"iconfont icon-cangkushezhiicon color-grey-6 font-14 mr5"}></i>
<span>仓库设置</span> <span>仓库设置</span>
</Link> </Link>
</li> </li>

2
src/forge/Main/sub/Invite.jsx
View File

@ -15,7 +15,7 @@ function Invite({code,className}) {
} }
return( return(
<div className={className}> <div className={className}>
<span className="font-16 color-grey-6">邀请码</span> <span className="font-16 color-ooo">邀请码</span>
<div> <div>
<span id="devitecode">{code}</span> <span id="devitecode">{code}</span>
<Tooltip title={<p className="edu-txt-center">可以通过邀请码邀请成员加入项目<br/>点击复制邀请码。</p>} placement={"bottom"}> <Tooltip title={<p className="edu-txt-center">可以通过邀请码邀请成员加入项目<br/>点击复制邀请码。</p>} placement={"bottom"}>

57
src/forge/Main/sub/ReadmeCatelogue.jsx Normal file
View File

@ -0,0 +1,57 @@
import React , {useState } from 'react';
import { Anchor , Input } from 'antd';
import './sub.scss';
const { Link } = Anchor;
const { Search } = Input;
function ReadmeCatelogue({ menuList }) {
const [ goHref , setGoHref ] = useState("");
const [ value , setValue ] = useState("");
const [ menu , setMenu] = useState(menuList);
function onChange(link){
setGoHref(link);
};
function changeValue(e) {
setValue(e.target.value);
if(e.target.value){
let m = menu.filter(i=>i.text.indexOf(e.target.value)>-1);
setMenu(m);
}else{
setMenu(menuList);
}
}
return(
<div>
<div className="searchBox">
<Input
placeholder={"请输入关键字"}
value={value}
onChange={changeValue}
prefix={<i className="iconfont icon-sousuo_icon1 font-14"></i>}/>
</div>
{
menu && menu.length>0?
<div className="anchorBox">
<Anchor affix={false} onChange={onChange}>
{
menu.map((item,key)=>{
return(
<div style={{paddingLeft:`${item.level *10}px`}} className={goHref===item.href?"items active":"items"}>
<Link href={`${item.href}`} title={item.text} />
</div>
)
})
}
</Anchor>
</div>
:""
}
</div>
)
}
export default ReadmeCatelogue;

46
src/forge/Main/sub/sub.scss
View File

@ -24,7 +24,47 @@
} }
} }
.detailsCode{ .menuslist{
display: flex; z-index: 100;
justify-content: space-between; width: 297px;
background: #FFFFFF;
box-shadow: 0px 4px 8px 2px rgba(212, 212, 212, 0.5);
border-radius: 4px;
.searchBox{
padding:15px;
border-bottom: 1px solid #eee;
}
.anchorBox{
max-height: 255px;
overflow-y: auto;
}
.ant-anchor-wrapper{
margin-left: 0px;
padding:5px 15px;
.items{
border-radius: 4px;
margin-bottom: 5px;
cursor: pointer;
.ant-anchor-link-title{
color: #333333!important;
}
&:hover{
background-color: #F3F4F6;
}
&.active{
background-color: #2A61FF;
.ant-anchor-link-title{
color: #fff!important;
}
}
}
.ant-anchor-link{
padding:0px;
height: 30px;
line-height: 30px;
}
.ant-anchor-ink::before{
background-color: #fff;
}
}
} }

12
src/forge/Team/Setting/TeamSettingCommon.jsx
View File

@ -1,5 +1,5 @@
import React, { forwardRef , useCallback , useEffect, useState } from 'react'; import React, { forwardRef , useCallback , useEffect, useState } from 'react';
import { Form , Input , Radio ,Checkbox , Divider , Button } from 'antd'; import { Form , Input , Radio ,Checkbox , Divider , Button , InputNumber } from 'antd';
import { WhiteBack , FlexAJ } from '../../Component/layout'; import { WhiteBack , FlexAJ } from '../../Component/layout';
import Title from '../../Component/Title'; import Title from '../../Component/Title';
import styled from 'styled-components'; import styled from 'styled-components';
@ -31,7 +31,8 @@ export default Form.create()(
useEffect(()=>{ useEffect(()=>{
if(organizeDetail){ if(organizeDetail){
setFieldsValue({ setFieldsValue({
...organizeDetail ...organizeDetail,
max_repo_creation:organizeDetail.max_repo_creation===-1 ? "":organizeDetail.max_repo_creation
}) })
setImage(organizeDetail.avatar_url); setImage(organizeDetail.avatar_url);
setDescNum(organizeDetail.description ? organizeDetail.description.length : 0); setDescNum(organizeDetail.description ? organizeDetail.description.length : 0);
@ -39,10 +40,10 @@ export default Form.create()(
},[organizeDetail]) },[organizeDetail])
const helper = useCallback( const helper = useCallback(
(label, name, rules, widget , isRequired , flag ) => ( (label, name, rules, widget , isRequired , flag , help ) => (
<div> <div>
<span className={isRequired?"required":""}>{label}</span> <span className={isRequired?"required":""}>{label}</span>
<Form.Item> <Form.Item help={help}>
{getFieldDecorator(name, { rules, validateFirst: true , valuePropName:flag ? "checked":"value" })(widget)} {getFieldDecorator(name, { rules, validateFirst: true , valuePropName:flag ? "checked":"value" })(widget)}
</Form.Item> </Form.Item>
</div> </div>
@ -175,7 +176,8 @@ export default Form.create()(
'最大仓库数：', '最大仓库数：',
"max_repo_creation", "max_repo_creation",
[], [],
<Input value="-1" style={{width:"350px"}}/> <InputNumber value="-1" style={{width:"350px"}}/>,false,false,
"当输入栏为空时，默认数量无限制"
)} )}
<p>选择头像:</p> <p>选择头像:</p>
<UploadImage url={getImageUrl(`/${image}`)} getImage={getImage}/> <UploadImage url={getImageUrl(`/${image}`)} getImage={getImage}/>

5
src/forge/css/index.scss
View File

@ -11,7 +11,10 @@ ul,ol,dl{
font-size: 22px; font-size: 22px;
font-weight: normal; font-weight: normal;
line-height: 30px; line-height: 30px;
max-width: 850px; max-width: 700px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
.projectN{ .projectN{
word-break: break-all; word-break: break-all;
} }

10
src/modules/tpm/challengesnew/tpm-md-editor.js
View File

@ -8,7 +8,7 @@ import './css/TPMchallengesnew.css';
import 'codemirror/lib/codemirror.css'; import 'codemirror/lib/codemirror.css';
const $ = window.$ const $ = window.$
const mdIcons = ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "link", "|", "inline-latex", "latex", '|', "image", "table", '|', "line-break", "watch", "clear"]; const mdIcons = ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "link", "|", "inline-latex", "latex", '|', "image", "table", '|', "line-break", "watch", "clear","fullScreen"];
const NULL_CH = '▁'; const NULL_CH = '▁';
@ -134,6 +134,7 @@ export default ({ mdID, onChange, onCMBeforeChange, onCMBlur, error = false, cla
}, },
toolbarIconsClass: { toolbarIconsClass: {
"line-break": "fa-minus", "line-break": "fa-minus",
"fullScreen":"iconfont icon-fangdaicon font-14"
}, },
toolbarCustomIcons: { toolbarCustomIcons: {
"inline-latex": "<a title='行内公式' class='latex' ><i name='inline-latex' class='fa iconfont icon-hangneigongshi font-14'></i></a>", "inline-latex": "<a title='行内公式' class='latex' ><i name='inline-latex' class='fa iconfont icon-hangneigongshi font-14'></i></a>",
@ -150,6 +151,10 @@ export default ({ mdID, onChange, onCMBeforeChange, onCMBlur, error = false, cla
} }
cm.replaceSelection(NULL_CH) cm.replaceSelection(NULL_CH)
}, },
"fullScreen":function(cm,icon,cursor,selection){
icon.addClass("none");
console.log(cm,icon)
},
"inline-latex": function (cm, icon, cursor, selection) { "inline-latex": function (cm, icon, cursor, selection) {
cm.replaceSelection("$$" + selection + "$$"); cm.replaceSelection("$$" + selection + "$$");
cm.setCursor(cursor.line, cursor.ch + 2); cm.setCursor(cursor.line, cursor.ch + 2);
@ -164,7 +169,8 @@ export default ({ mdID, onChange, onCMBeforeChange, onCMBlur, error = false, cla
lang: { lang: {
toolbar: { toolbar: {
"latex": "多行公式", "latex": "多行公式",
"line-break": "换行" "line-break": "换行",
"fullScreen":"开启全屏"
} }
}, },
onload: function () { onload: function () {