Merge branch 'gitlink_server_issue' of http://106.75.45.236:3000/Gitlink/forgeplus-react into gitlink_server_issue

This commit is contained in:
谢思 2023-03-10 09:34:20 +08:00
commit 4b3a6d8fc8
3 changed files with 16 additions and 13 deletions

View File

@ -1,5 +1,5 @@
import React , { useEffect , useState , forwardRef , useRef } from 'react'; import React , { useEffect , useState , forwardRef , useRef } from 'react';
import { Spin , Form , InputNumber } from 'antd'; import { Spin , Form , InputNumber, message } from 'antd';
import { getImageUrl } from 'educoder'; import { getImageUrl } from 'educoder';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
import { Box , LongWidth } from '../../Component/layout'; import { Box , LongWidth } from '../../Component/layout';
@ -325,16 +325,22 @@ function Details(props){
if(!editFlag){ if(!editFlag){
setRewardFlag(false); setRewardFlag(false);
const value = e.target.value; const value = e.target.value;
if(value && value >= 0){ if(value<0){
saveForeach(undefined,undefined,undefined,undefined,undefined,undefined,undefined,undefined,value); message.info("请输入大于0的正整数");
}else{
setRewardAmount(rewardAmount); setRewardAmount(rewardAmount);
return;
}
setRewardAmount(e.target.value);
if((value && value >= 0) || !value){
saveForeach(undefined,undefined,undefined,undefined,undefined,undefined,undefined,undefined,value);
} }
} }
} }
function changeAmount(value){ function changeAmount(value){
if(editFlag && value > 0){ if(editFlag ){
setRewardAmount(value); setRewardAmount(value);
}else{
setRewardAmount(rewardAmount);
} }
} }
return( return(

View File

@ -96,9 +96,6 @@ function List(props){
// 使hook // 使hook
useUpdateEffect(handleAllDisabled, [aboutMe,keyword,category,limit]); useUpdateEffect(handleAllDisabled, [aboutMe,keyword,category,limit]);
// useEffect(()=>{
// Init(updateIds,page,names);
// },[aboutMe,keyword,category,limit])
function getDirection(id){ function getDirection(id){
if(!id) return undefined; if(!id) return undefined;
@ -185,8 +182,7 @@ function List(props){
setAllValue([]); setAllValue([]);
setValue(undefined); setValue(undefined);
setNames(undefined); setNames(undefined);
setValue(undefined); !value && Init();
Init();
// //
menuRef.current && menuRef.current.clearChoose(); menuRef.current && menuRef.current.clearChoose();
} }

View File

@ -205,10 +205,11 @@ function New(props){
function changeAmount(value){ function changeAmount(value){
if(value > 0){ if(value && value > 0){
setRewardAmount(value);
}
if(!value){
setRewardAmount(value); setRewardAmount(value);
}else{
setRewardAmount(rewardAmount);
} }
} }
return( return(