This commit is contained in:
xixi 2024-05-22 18:08:16 +08:00
parent 8a9c5c7fba
commit 2bb1064a7c
2 changed files with 31 additions and 31 deletions

View File

@ -54,8 +54,7 @@ export default function ListProj() {
setIsLoading(true);
},
onSuccess({ data }) {
// console.log('看看结果', data);
console.log('看看结果', data);
setPage(data.page);
setTotal(data.total);
setProjs(data.rows);
@ -94,18 +93,14 @@ export default function ListProj() {
const renderCategory = () => {
}
useEffect(() => {
if (indexListContext.categorys) {
reqData(page);
renderCategory();
}
}, [indexListContext.status, indexListContext.categoryChangeCount, indexListContext.category, keywords, page])
useEffect(() => {
}, [indexListContext.status])
// const renderStatus = () => {
// if (indexListContext.status == 'ALL') {
// return <Tag color="blue">项目:全部项目</Tag>
@ -128,6 +123,7 @@ export default function ListProj() {
{renderList()}
</div>
<div className="page" >
{/* defaultCurrent: 默认当前页数 total:数据总数 */}
<Pagination defaultCurrent={page} total={total} defaultPageSize={10} onChange={(page) => {
reqData(page);
// setPage(page);

View File

@ -29,6 +29,9 @@ type ProjModType = {
}
export default function ProjEdit() {
// 模块数量
const [projModCount, setprojModCount] = useState(0)
const height = window.innerHeight - 180;
const nav = useNavigate();
const pathParams = useParams();
@ -230,12 +233,13 @@ export default function ProjEdit() {
// && data.editSteps[3].editStatus == EditStepEnum.EDITED
// && data.editSteps[4].editStatus == EditStepEnum.EDITED
// && data.editSteps[5].editStatus == EditStepEnum.EDITED;
setprojModCount(data.projModCount)
const isEdited = Boolean(data.projIntroduction) == true && Boolean(data.apply.projDevCompleteDate) == true && Boolean(data.apply.envHardDev) == true && Boolean(data.loginpage.loginpageId) == true
// console.log('isEdited',isEdited);
const isConfig = data.loginpage.loginpageId && data.projModCount > MIN_MOD_SIZE;
const isConfig = data.loginpage.loginpageId && data.projModCount >= MIN_MOD_SIZE;
const isGenerate = isEdited && isConfig;
const isGenerateSuccess: boolean = data.generate.generateStatus == GenerateStatus.SUCCESS;
const isGenerateSuccess: boolean = data.generate.generateStatus == GenerateStatus.SUCCESS || data.generate.generateStatus == GenerateStatus.GENERATING;
renderEditStep(data, isEdited, isGenerateSuccess);
renderSetting(data, isConfig, isGenerateSuccess);
setCanGenerate(isGenerate);