diff --git a/src/components/list/ListProj.tsx b/src/components/list/ListProj.tsx index c008137..3989ab6 100644 --- a/src/components/list/ListProj.tsx +++ b/src/components/list/ListProj.tsx @@ -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 项目:全部项目 @@ -128,7 +123,8 @@ export default function ListProj() { {renderList()}
- { + {/* defaultCurrent: 默认当前页数 total:数据总数 */} + { reqData(page); // setPage(page); }} /> diff --git a/src/route/proj/ProjEdit.tsx b/src/route/proj/ProjEdit.tsx index ff90746..21fbd20 100644 --- a/src/route/proj/ProjEdit.tsx +++ b/src/route/proj/ProjEdit.tsx @@ -1,4 +1,4 @@ -import './proj-edit.css';1 +import './proj-edit.css'; 1 // import {Link, useNavigate, useParams} from "react-router-dom"; import { useNavigate, useParams } from "react-router-dom"; import { Button, FloatButton, message, Modal } from "antd"; @@ -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(); @@ -53,12 +56,12 @@ export default function ProjEdit() { projMods: [], }); // 判断状态 - + // const height = window.innerHeight - 240; - const renderEditStep = (data:any, isEdited: boolean, isGenerateSuccess: boolean) => { - console.log('嘻嘻',data); + const renderEditStep = (data: any, isEdited: boolean, isGenerateSuccess: boolean) => { + console.log('嘻嘻', data); // projIntroduction const editStepArray: IProjEdit[] = []; editStepArray.push( @@ -67,7 +70,7 @@ export default function ProjEdit() { desc: '完善代码、样式类型和详细介绍等内容', step: 1, btnName: !isGenerateSuccess ? '设置' : '查看', - status: data.projIntroduction?EditStepEnum.EDITED:EditStepEnum.UN_EDIT, + status: data.projIntroduction ? EditStepEnum.EDITED : EditStepEnum.UN_EDIT, handleEdit() { if (!isGenerateSuccess) { nav(`/proj-edit/step1/${pathParams.projId}`) @@ -81,7 +84,7 @@ export default function ProjEdit() { desc: '完善项目简介、编程语言、版本、公司等内容', step: 2, btnName: !isGenerateSuccess ? '设置' : '查看', - status: data.apply.projDevCompleteDate?EditStepEnum.EDITED:EditStepEnum.UN_EDIT, + status: data.apply.projDevCompleteDate ? EditStepEnum.EDITED : EditStepEnum.UN_EDIT, handleEdit() { // if (generateStatus != GenerateStatus.SUCCESS) { if (!isGenerateSuccess) { @@ -96,7 +99,7 @@ export default function ProjEdit() { desc: '请完善软件功能特点', step: 3, btnName: !isGenerateSuccess ? '设置' : '查看', - status: data.apply.envHardDev?EditStepEnum.EDITED:EditStepEnum.UN_EDIT, + status: data.apply.envHardDev ? EditStepEnum.EDITED : EditStepEnum.UN_EDIT, handleEdit() { if (!isGenerateSuccess) { nav(`/proj-edit/step3/${pathParams.projId}`) @@ -111,7 +114,7 @@ export default function ProjEdit() { step: 1, btnName: !isGenerateSuccess ? '设置' : '查看', // 状态判断lyp - status: data.loginpage.loginpageId?EditStepEnum.EDITED:EditStepEnum.UN_EDIT, + status: data.loginpage.loginpageId ? EditStepEnum.EDITED : EditStepEnum.UN_EDIT, handleEdit() { if (!isGenerateSuccess) { nav(`/proj-edit/config-loginpage/${pathParams.projId}`) @@ -184,7 +187,7 @@ export default function ProjEdit() { // } // } // }, - { + { title: '系统菜单管理', desc: '请对系统菜单进行设置', step: 2, @@ -197,7 +200,7 @@ export default function ProjEdit() { nav(`/proj-edit/config-mod-list-show/${pathParams.projId}`) } } - + }, { title: '菜单顺序', @@ -223,19 +226,20 @@ export default function ProjEdit() { messageApi: messageApi, url: `/api/proj/get/${pathParams.projId}`, onSuccess({ data }) { - console.log('状态判断',data); + console.log('状态判断', data); // const isEdited = data.editSteps[0].editStatus == EditStepEnum.EDITED // && data.editSteps[1].editStatus == EditStepEnum.EDITED // && data.editSteps[2].editStatus == EditStepEnum.EDITED // && data.editSteps[3].editStatus == EditStepEnum.EDITED // && data.editSteps[4].editStatus == EditStepEnum.EDITED // && data.editSteps[5].editStatus == EditStepEnum.EDITED; - const isEdited = Boolean(data.projIntroduction) == true && Boolean(data.apply.projDevCompleteDate) == true && Boolean(data.apply.envHardDev) == true && Boolean(data.loginpage.loginpageId) == true + 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); @@ -254,13 +258,13 @@ export default function ProjEdit() { } }) } - + useEffect(() => { renderData(); }, []) return ( -
+
{contextHolder} {/* { - setIsGenerateModalOpen(true); + setIsGenerateModalOpen(true); // setTimeout(() => { // window.location.reload(); // }, 1000) @@ -376,7 +380,7 @@ export default function ProjEdit() { { generateStatus == GenerateStatus.SUCCESS ? ( ) : <> } @@ -434,11 +438,11 @@ export default function ProjEdit() {
@@ -499,7 +503,7 @@ export default function ProjEdit() { onCancel={() => { setAiHelperModalOpen(false); // console.log(123); - + // renderData() }} >