Tenlion/system-copyright-react
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lyp

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/list/ListProj.tsx
View File

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

36
src/route/proj/ProjEdit.tsx
View File

@ -1,4 +1,4 @@
import './proj-edit.css';1 import './proj-edit.css'; 1
// import {Link, useNavigate, useParams} from "react-router-dom"; // import {Link, useNavigate, useParams} from "react-router-dom";
import { useNavigate, useParams } from "react-router-dom"; import { useNavigate, useParams } from "react-router-dom";
import { Button, FloatButton, message, Modal } from "antd"; import { Button, FloatButton, message, Modal } from "antd";
@ -29,6 +29,9 @@ type ProjModType = {
} }
export default function ProjEdit() { export default function ProjEdit() {
// 模块数量
const [projModCount, setprojModCount] = useState(0)
const height = window.innerHeight - 180; const height = window.innerHeight - 180;
const nav = useNavigate(); const nav = useNavigate();
const pathParams = useParams(); const pathParams = useParams();
@ -57,8 +60,8 @@ export default function ProjEdit() {
// const height = window.innerHeight - 240; // const height = window.innerHeight - 240;
const renderEditStep = (data:any, isEdited: boolean, isGenerateSuccess: boolean) => { const renderEditStep = (data: any, isEdited: boolean, isGenerateSuccess: boolean) => {
console.log('嘻嘻',data); console.log('嘻嘻', data);
// projIntroduction // projIntroduction
const editStepArray: IProjEdit[] = []; const editStepArray: IProjEdit[] = [];
editStepArray.push( editStepArray.push(
@ -67,7 +70,7 @@ export default function ProjEdit() {
desc: '完善代码、样式类型和详细介绍等内容', desc: '完善代码、样式类型和详细介绍等内容',
step: 1, step: 1,
btnName: !isGenerateSuccess ? '设置' : '查看', btnName: !isGenerateSuccess ? '设置' : '查看',
status: data.projIntroduction?EditStepEnum.EDITED:EditStepEnum.UN_EDIT, status: data.projIntroduction ? EditStepEnum.EDITED : EditStepEnum.UN_EDIT,
handleEdit() { handleEdit() {
if (!isGenerateSuccess) { if (!isGenerateSuccess) {
nav(`/proj-edit/step1/${pathParams.projId}`) nav(`/proj-edit/step1/${pathParams.projId}`)
@ -81,7 +84,7 @@ export default function ProjEdit() {
desc: '完善项目简介、编程语言、版本、公司等内容', desc: '完善项目简介、编程语言、版本、公司等内容',
step: 2, step: 2,
btnName: !isGenerateSuccess ? '设置' : '查看', btnName: !isGenerateSuccess ? '设置' : '查看',
status: data.apply.projDevCompleteDate?EditStepEnum.EDITED:EditStepEnum.UN_EDIT, status: data.apply.projDevCompleteDate ? EditStepEnum.EDITED : EditStepEnum.UN_EDIT,
handleEdit() { handleEdit() {
// if (generateStatus != GenerateStatus.SUCCESS) { // if (generateStatus != GenerateStatus.SUCCESS) {
if (!isGenerateSuccess) { if (!isGenerateSuccess) {
@ -96,7 +99,7 @@ export default function ProjEdit() {
desc: '请完善软件功能特点', desc: '请完善软件功能特点',
step: 3, step: 3,
btnName: !isGenerateSuccess ? '设置' : '查看', btnName: !isGenerateSuccess ? '设置' : '查看',
status: data.apply.envHardDev?EditStepEnum.EDITED:EditStepEnum.UN_EDIT, status: data.apply.envHardDev ? EditStepEnum.EDITED : EditStepEnum.UN_EDIT,
handleEdit() { handleEdit() {
if (!isGenerateSuccess) { if (!isGenerateSuccess) {
nav(`/proj-edit/step3/${pathParams.projId}`) nav(`/proj-edit/step3/${pathParams.projId}`)
@ -111,7 +114,7 @@ export default function ProjEdit() {
step: 1, step: 1,
btnName: !isGenerateSuccess ? '设置' : '查看', btnName: !isGenerateSuccess ? '设置' : '查看',
// 状态判断lyp // 状态判断lyp
status: data.loginpage.loginpageId?EditStepEnum.EDITED:EditStepEnum.UN_EDIT, status: data.loginpage.loginpageId ? EditStepEnum.EDITED : EditStepEnum.UN_EDIT,
handleEdit() { handleEdit() {
if (!isGenerateSuccess) { if (!isGenerateSuccess) {
nav(`/proj-edit/config-loginpage/${pathParams.projId}`) nav(`/proj-edit/config-loginpage/${pathParams.projId}`)
@ -223,19 +226,20 @@ export default function ProjEdit() {
messageApi: messageApi, messageApi: messageApi,
url: `/api/proj/get/${pathParams.projId}`, url: `/api/proj/get/${pathParams.projId}`,
onSuccess({ data }) { onSuccess({ data }) {
console.log('状态判断',data); console.log('状态判断', data);
// const isEdited = data.editSteps[0].editStatus == EditStepEnum.EDITED // const isEdited = data.editSteps[0].editStatus == EditStepEnum.EDITED
// && data.editSteps[1].editStatus == EditStepEnum.EDITED // && data.editSteps[1].editStatus == EditStepEnum.EDITED
// && data.editSteps[2].editStatus == EditStepEnum.EDITED // && data.editSteps[2].editStatus == EditStepEnum.EDITED
// && data.editSteps[3].editStatus == EditStepEnum.EDITED // && data.editSteps[3].editStatus == EditStepEnum.EDITED
// && data.editSteps[4].editStatus == EditStepEnum.EDITED // && data.editSteps[4].editStatus == EditStepEnum.EDITED
// && data.editSteps[5].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); // 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 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); renderEditStep(data, isEdited, isGenerateSuccess);
renderSetting(data, isConfig, isGenerateSuccess); renderSetting(data, isConfig, isGenerateSuccess);
setCanGenerate(isGenerate); setCanGenerate(isGenerate);
@ -260,7 +264,7 @@ export default function ProjEdit() {
}, []) }, [])
return ( return (
<div className='proj-edit-box' style={{height: `${height}px`,overflow:'auto'}}> <div className='proj-edit-box' style={{ height: `${height}px`, overflow: 'auto' }}>
{contextHolder} {contextHolder}
{/* <Breadcrumb {/* <Breadcrumb
items={[ items={[
@ -334,7 +338,7 @@ export default function ProjEdit() {
status={EditStepEnum.UN_EDIT} status={EditStepEnum.UN_EDIT}
canBtnClick={canGenerate} canBtnClick={canGenerate}
handleEdit={() => { handleEdit={() => {
setIsGenerateModalOpen(true); setIsGenerateModalOpen(true);
// setTimeout(() => { // setTimeout(() => {
// window.location.reload(); // window.location.reload();
// }, 1000) // }, 1000)
@ -376,7 +380,7 @@ export default function ProjEdit() {
{ {
generateStatus == GenerateStatus.SUCCESS ? ( generateStatus == GenerateStatus.SUCCESS ? (
<CardProjResult title="生成成功" <CardProjResult title="生成成功"
isSuccess={true} isSuccess={true}
/> />
) : <></> ) : <></>
} }
@ -434,11 +438,11 @@ export default function ProjEdit() {
<div className="btn-container"> <div className="btn-container">
<Button size="large" style={{ <Button size="large" style={{
width: '200px', width: '200px',
height:'40px', height: '40px',
fontSize: '16px', fontSize: '16px',
backgroundColor: '#e9e7e7', backgroundColor: '#e9e7e7',
color: '#A0A0A0', color: '#A0A0A0',
border:'none', border: 'none',
}} onClick={() => { }} onClick={() => {
nav(-1); nav(-1);
}}>返回</Button> }}>返回</Button>