anph
/
forgeplus-react
forked from Gitlink/forgeplus-react
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge

This commit is contained in:
caishi 2023-05-31 14:57:43 +08:00
parent 96696f828d 710f018296
commit 8e9f8ac108
3 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/forge/Head/Header.js
View File

@ -311,22 +311,7 @@ class NewHeader extends Component {
{
settings.navbar && settings.navbar.map((item, key) => {
var new_link = item.link;
// var user_login = current_user && current_user.login;
var is_hidden = item.hidden;
// if (new_link && (new_link.indexOf("courses") > -1 || new_link.indexOf("contests") > -1)) {
// if (user_login) {
// if (new_link.indexOf("courses") > -1) {
// new_link = new_link.replace(/courses/g, user_login + "/courses")
// } else if (new_link.indexOf("contests") > -1) {
// new_link = new_link.replace(/contests/g, user_login + "/contests")
// }
// } else {
// is_hidden = true
// }
// }
// if (user_login && (new_link && new_link.indexOf("homes") > -1)) {
// new_link = new_link.replace(/homes/g, user_login + "/user_activities")
// }
var waiLian = (new_link && str.filter(item=>new_link.indexOf(item)>-1) );
var wl = waiLian && waiLian.length>0;
return (

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

@ -398,7 +398,7 @@ class Index extends Component {
<Input placeholder="请输入需要导入到本项目的仓库地址" onBlur={this.ChangeAddr} />
)}
</Form.Item>
<p className="formTip color-orange">示例：https://github.com/facebook/reack.git</p>
<p className="formTip color-orange">示例：https://github.com/Stability-AI/StableStudio.git</p>
</React.Fragment>
}
{

34
src/glcc/apply/taskApply.jsx
View File

@ -11,6 +11,17 @@ function TaskApply(props) {
{id: 2, name: "中"},
{id: 3, name: "高"}
]
// 奖金
const rewardList = [
{id: 12000},
{id: 11000},
{id: 10000},
{id: 9000},
{id: 8000},
{id: 7000},
{id: 6000},
{id: 0},
]
return(
<div className="taskApplyForm">
@ -40,16 +51,19 @@ function TaskApply(props) {
{helper('课题奖金',
'',
`taskReward${taskKey}`,
[{ required: true, message: "请输入课题奖金" },
{pattern: /^[1-9]+[0-9]*]*$/, message: "请输入正整数" },
{ validator: (rule,val,callback) =>{
if(val>=6000 && val<=12000){
callback();
}else{
callback("区间为6000-12000元");
}
}}],
<Input placeholder="请输入课题奖金" disabled = {disabled} className={disabled? "disabledInput":""}/>
[{ required: true, message: "请选择课题奖金" },
// {pattern: /^[1-9]+[0-9]*]*$/, message: "请输入正整数" },
// { validator: (rule,val,callback) =>{
// if(val>=6000 && val<=12000){
// callback();
// }else{
// callback("区间为6000-12000元");
// }
// }}
],
<Select placeholder="请根据课题难度选择奖金" disabled = {disabled} className={disabled? "disabledInput":""}>
{rewardList && rewardList.map(item=> {return <Option value={item.id} key={item.id}>{item.id}</Option>})}
</Select>
)}
{helper('导师姓名',
'',