lyp
This commit is contained in:
parent
d5d4e1bae5
commit
8a9c5c7fba
@ -44,7 +44,7 @@ export default function ListProj() {
|
|||||||
config: {
|
config: {
|
||||||
params: {
|
params: {
|
||||||
page: currentPage,
|
page: currentPage,
|
||||||
rows: 20,
|
rows: 10,
|
||||||
keywords: keywords,
|
keywords: keywords,
|
||||||
projCategoryId: indexListContext.category,
|
projCategoryId: indexListContext.category,
|
||||||
status: indexListContext.status ? indexListContext.status : ''
|
status: indexListContext.status ? indexListContext.status : ''
|
||||||
@ -128,7 +128,7 @@ export default function ListProj() {
|
|||||||
{renderList()}
|
{renderList()}
|
||||||
</div>
|
</div>
|
||||||
<div className="page" >
|
<div className="page" >
|
||||||
<Pagination defaultCurrent={page} total={total} defaultPageSize={20} onChange={(page) => {
|
<Pagination defaultCurrent={page} total={total} defaultPageSize={10} onChange={(page) => {
|
||||||
reqData(page);
|
reqData(page);
|
||||||
// setPage(page);
|
// setPage(page);
|
||||||
}} />
|
}} />
|
||||||
|
@ -204,8 +204,8 @@ export default function Index() {
|
|||||||
} else if (location.pathname.includes('/proj-create')) {
|
} else if (location.pathname.includes('/proj-create')) {
|
||||||
setNow('创建项目')
|
setNow('创建项目')
|
||||||
setPathArray([{ title: <Link to={'/home'}>首页</Link> }, { title: '创建项目' }])
|
setPathArray([{ title: <Link to={'/home'}>首页</Link> }, { title: '创建项目' }])
|
||||||
// /config-mod-list /config-menu-list
|
// /config-mod-list /config-menu-list /config-mod-show
|
||||||
} else if (location.pathname.includes('/proj-edit')&& !location.pathname.includes('/config-mod-edit') && !location.pathname.includes('/step') && !location.pathname.includes('/config-loginpage')&& !location.pathname.includes('/config-mod-save')&& !location.pathname.includes('/config-mod-list')&& !location.pathname.includes('/config-menu-list')) {
|
} else if (location.pathname.includes('/proj-edit')&& !location.pathname.includes('/config-mod-show')&& !location.pathname.includes('/config-mod-edit') && !location.pathname.includes('/step') && !location.pathname.includes('/config-loginpage')&& !location.pathname.includes('/config-mod-save')&& !location.pathname.includes('/config-mod-list')&& !location.pathname.includes('/config-menu-list')) {
|
||||||
setNow('编辑项目')
|
setNow('编辑项目')
|
||||||
// setEditname(location.pathname)
|
// setEditname(location.pathname)
|
||||||
setPathArray([{ title: <Link to={'/home'}>首页</Link> }, { title: <Link to={'/proj-create'}>创建项目</Link> }, { title: '编辑项目' }])
|
setPathArray([{ title: <Link to={'/home'}>首页</Link> }, { title: <Link to={'/proj-create'}>创建项目</Link> }, { title: '编辑项目' }])
|
||||||
@ -251,6 +251,10 @@ export default function Index() {
|
|||||||
}else if (location.pathname.includes('/proj-edit/config-mod-edit')) {
|
}else if (location.pathname.includes('/proj-edit/config-mod-edit')) {
|
||||||
setNow('编辑菜单')
|
setNow('编辑菜单')
|
||||||
setPathArray([{ title: <Link to={'/home'}>首页</Link> }, { title: <Link to={'/proj-create'}>创建项目</Link> }, { title: <a onClick={() => { nav(-2) }}>编辑项目</a> },{ title: <a onClick={() => { nav(-1) }}>系统菜单管理</a> }, { title: '编辑菜单' }])
|
setPathArray([{ title: <Link to={'/home'}>首页</Link> }, { title: <Link to={'/proj-create'}>创建项目</Link> }, { title: <a onClick={() => { nav(-2) }}>编辑项目</a> },{ title: <a onClick={() => { nav(-1) }}>系统菜单管理</a> }, { title: '编辑菜单' }])
|
||||||
|
// /config-mod-edit /config-mod-show
|
||||||
|
}else if (location.pathname.includes('/proj-edit/config-mod-show')) {
|
||||||
|
setNow('查看菜单')
|
||||||
|
setPathArray([{ title: <Link to={'/home'}>首页</Link> }, { title: <Link to={'/proj-create'}>创建项目</Link> }, { title: <a onClick={() => { nav(-2) }}>编辑项目</a> },{ title: <a onClick={() => { nav(-1) }}>系统菜单管理</a> }, { title: '查看菜单' }])
|
||||||
// /config-mod-edit
|
// /config-mod-edit
|
||||||
}
|
}
|
||||||
}, [location.pathname])
|
}, [location.pathname])
|
||||||
|
@ -1,13 +1,13 @@
|
|||||||
import './proj-config-list-mod.css';
|
import './proj-config-list-mod.css';
|
||||||
import {
|
import {
|
||||||
Alert,
|
Alert,
|
||||||
Breadcrumb, Button,
|
Button,
|
||||||
message,
|
message,
|
||||||
Table, TableProps,
|
Table, TableProps,
|
||||||
} from "antd";
|
} from "antd";
|
||||||
import {Link, useNavigate, useParams} from "react-router-dom";
|
import { useNavigate, useParams } from "react-router-dom";
|
||||||
import { useEffect, useState } from "react";
|
import { useEffect, useState } from "react";
|
||||||
import {EditOutlined, PlusOutlined, DeleteOutlined, SearchOutlined} from "@ant-design/icons";
|
import { EditOutlined, PlusOutlined, DeleteOutlined } from "@ant-design/icons";
|
||||||
import { del, get } from "../../../util/AjaxUtils.ts";
|
import { del, get } from "../../../util/AjaxUtils.ts";
|
||||||
|
|
||||||
export const MAX_MOD_SIZE = 15;
|
export const MAX_MOD_SIZE = 15;
|
||||||
@ -96,7 +96,18 @@ export default function ProjConfigModList(props: PropType) {
|
|||||||
render: (_text, record) => {
|
render: (_text, record) => {
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
{
|
<Button type="primary" size="small"
|
||||||
|
style={{ marginRight: '5px' }}
|
||||||
|
onClick={() => {
|
||||||
|
if (props.isFree) {
|
||||||
|
nav(`/proj-edit/config-mod-fedit/${pathParams.projId}/${record.projModId}`)
|
||||||
|
} else {
|
||||||
|
nav(`/proj-edit/config-mod-edit/${pathParams.projId}/${record.projModId}`)
|
||||||
|
}
|
||||||
|
}}>
|
||||||
|
<EditOutlined />
|
||||||
|
</Button>
|
||||||
|
{/* {
|
||||||
modSize < maxSize ? (
|
modSize < maxSize ? (
|
||||||
<Button type="primary" size="small"
|
<Button type="primary" size="small"
|
||||||
style={{ marginRight: '5px' }}
|
style={{ marginRight: '5px' }}
|
||||||
@ -119,10 +130,10 @@ export default function ProjConfigModList(props: PropType) {
|
|||||||
nav(`/proj-edit/config-mod-show/${pathParams.projId}/${record.projModId}`)
|
nav(`/proj-edit/config-mod-show/${pathParams.projId}/${record.projModId}`)
|
||||||
}
|
}
|
||||||
}}>
|
}}>
|
||||||
<SearchOutlined/>
|
<EditOutlined />
|
||||||
</Button>
|
</Button>
|
||||||
)
|
)
|
||||||
}
|
} */}
|
||||||
|
|
||||||
<Button value="large" type="primary" size="small" danger
|
<Button value="large" type="primary" size="small" danger
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
import './proj-config-list-mod.css';
|
import './proj-config-list-mod.css';
|
||||||
import {
|
import {
|
||||||
Alert,
|
Alert,
|
||||||
Breadcrumb, Button, Col, Flex, Form, Input,
|
Button, Col, Flex, Form, Input,
|
||||||
message, Row,
|
message, Row,
|
||||||
} from "antd";
|
} from "antd";
|
||||||
import {Link, useNavigate, useParams} from "react-router-dom";
|
import { useNavigate, useParams } from "react-router-dom";
|
||||||
import { useEffect, useState } from "react";
|
import { useEffect, useState } from "react";
|
||||||
import ModField, { IModField } from "../../../components/modfield/ModField.tsx";
|
import ModField, { IModField } from "../../../components/modfield/ModField.tsx";
|
||||||
import { get } from "../../../util/AjaxUtils.ts";
|
import { get } from "../../../util/AjaxUtils.ts";
|
||||||
@ -32,7 +32,7 @@ export default function ProjConfigModShow(props: PropsType) {
|
|||||||
const minSize = props.isFree ? MIN_MOD_SIZE_FREE : MIN_MOD_SIZE;
|
const minSize = props.isFree ? MIN_MOD_SIZE_FREE : MIN_MOD_SIZE;
|
||||||
const maxSize = props.isFree ? MAX_MOD_SIZE_FREE : MAX_MOD_SIZE;
|
const maxSize = props.isFree ? MAX_MOD_SIZE_FREE : MAX_MOD_SIZE;
|
||||||
|
|
||||||
const height = window.innerHeight - 180;
|
const height = window.innerHeight - 210;
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
get<any>({
|
get<any>({
|
||||||
@ -55,7 +55,7 @@ export default function ProjConfigModShow(props: PropsType) {
|
|||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
{contextHolder}
|
{contextHolder}
|
||||||
<Breadcrumb
|
{/* <Breadcrumb
|
||||||
items={[
|
items={[
|
||||||
{title: <Link to={'/'}>首页</Link>},
|
{title: <Link to={'/'}>首页</Link>},
|
||||||
{title: <Link to={'/proj-create'}>创建项目</Link>},
|
{title: <Link to={'/proj-create'}>创建项目</Link>},
|
||||||
@ -75,8 +75,9 @@ export default function ProjConfigModShow(props: PropsType) {
|
|||||||
},
|
},
|
||||||
{title: '查看菜单'},
|
{title: '查看菜单'},
|
||||||
]}
|
]}
|
||||||
/>
|
/> */}
|
||||||
<div className="mod-edit-container" style={{height: `${height}px`}}>
|
<div className="mod-edit-container" style={{ height: `${height}px`, marginTop: '17px' }}>
|
||||||
|
<div style={{ height: `${height}px`, overflow: 'auto' }}>
|
||||||
<Alert message={`菜单指的是系统的功能,最少${minSize}个菜单,最多${maxSize}个菜单`} type="info" />
|
<Alert message={`菜单指的是系统的功能,最少${minSize}个菜单,最多${maxSize}个菜单`} type="info" />
|
||||||
<div className="mod-content" >
|
<div className="mod-content" >
|
||||||
<Form
|
<Form
|
||||||
@ -136,8 +137,9 @@ export default function ProjConfigModShow(props: PropsType) {
|
|||||||
<Form.Item wrapperCol={{ span: 24 }}>
|
<Form.Item wrapperCol={{ span: 24 }}>
|
||||||
<div style={{ paddingTop: '15px' }}>
|
<div style={{ paddingTop: '15px' }}>
|
||||||
<Flex align="center" justify="center" gap="large">
|
<Flex align="center" justify="center" gap="large">
|
||||||
<Button type="default" htmlType="button" onClick={() => {
|
<Button type="default" size='large' htmlType="button" onClick={() => {
|
||||||
nav(-1);
|
nav(-1);
|
||||||
|
|
||||||
}}>
|
}}>
|
||||||
返回
|
返回
|
||||||
</Button>
|
</Button>
|
||||||
@ -148,6 +150,7 @@ export default function ProjConfigModShow(props: PropsType) {
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
</>
|
</>
|
||||||
)
|
)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user