diff --git a/.umirc.ts b/.umirc.ts index 9d584e3..347788d 100644 --- a/.umirc.ts +++ b/.umirc.ts @@ -17,10 +17,10 @@ export default defineConfig({ }, proxy: { '/api/': { - target: 'http://10.39.13.78:8002/', + target: 'http://10.39.13.78:8001/', // target: 'https://gcadmin-test.linyikj.com.cn', // target: 'http://guocaiservice.com', - // changeOrigin: true, + changeOrigin: true, pathRewrite: { '^': '' }, }, }, diff --git a/gencode.json b/gencode.json index 6cf117f..750b552 100644 --- a/gencode.json +++ b/gencode.json @@ -1,6 +1,6 @@ { - "url": "http://10.39.13.78:8002/api/docs/openapi", - "module": "Admin", + "url": "http://10.39.13.78:8001/api/docs/openapi", + "module": "Company", "outPath": "./src/gen/", "apis": { "firstLine": "import { MyResponseType } from '@/common';\nimport { request } from '@umijs/max';" diff --git a/src/common/components/MyModalPagination.tsx b/src/common/components/MyModalPagination.tsx new file mode 100644 index 0000000..2904de6 --- /dev/null +++ b/src/common/components/MyModalPagination.tsx @@ -0,0 +1,28 @@ +import { MyPaginationMetaType } from '@/common'; +import { Pagination } from 'antd'; + +export function MyModalPagination({ + meta, + setParams, +}: { + meta?: MyPaginationMetaType | null; + setParams?: ({ page, perPage }: { page: number; perPage: number }) => void; +}) { + console.log(meta, 'meta2222'); + if (!meta) return null; + return ( +
+ setParams?.({ page, perPage })} + size="small" + showTotal={(total) => `总共${total}条`} + showSizeChanger + showQuickJumper + /> +
+ ); +} diff --git a/src/common/libs/umi/layoutConfig.tsx b/src/common/libs/umi/layoutConfig.tsx index 67449f1..8c1cb91 100644 --- a/src/common/libs/umi/layoutConfig.tsx +++ b/src/common/libs/umi/layoutConfig.tsx @@ -1,25 +1,10 @@ import { MyIcons, MyIconsType, PermissionsType, useMyState } from '@/common'; import AvatarProps from '@/common/components/layout/AvatarProps'; -import { - BellOutlined, - SettingOutlined, - TabletOutlined, -} from '@ant-design/icons'; +import { SettingOutlined } from '@ant-design/icons'; import { Link, RuntimeConfig, history, useNavigate } from '@umijs/max'; -import { - AutoComplete, - Button, - Image, - Input, - Menu, - MenuProps, - Popover, - Space, -} from 'antd'; +import { AutoComplete, Button, Input, Menu, MenuProps, Space } from 'antd'; import { useState } from 'react'; import './allConfig.scss'; -import ImgCustomerWxApp from './customer_wx_app.jpg'; -import ImgEmployeeWxApp from './employee_wx_app.jpg'; // import Logo from './logo.png'; interface LevelKeysProps { key?: string; @@ -122,7 +107,7 @@ export const LayoutConfig: RuntimeConfig['layout'] = () => {
- + {/* 常用功能: {quickLinks.map((q) => ( { {q.label} ))} - + */}
- { > - - - - Apis.Permission.SysPermissions.Delete({ id: item.id }).then( - () => getData(), - ) - } - /> - - ), - }), ]} /> ); @@ -152,7 +53,7 @@ export default function Index({ title = '功能' }) { tabKey="system-permissions" tabLabel={title} > - + {loading ? : null} ); } diff --git a/src/pages/system/sys_roles/index.tsx b/src/pages/system/sys_roles/index.tsx index a2784b6..d73017d 100644 --- a/src/pages/system/sys_roles/index.tsx +++ b/src/pages/system/sys_roles/index.tsx @@ -1,4 +1,9 @@ -import { MyButtons, MyPageContainer, MyProTableProps } from '@/common'; +import { + MyButtons, + MyPageContainer, + MyProTableProps, + useCurrentPermissions, +} from '@/common'; import { flattenToMultiLevelFormatWithRowSpanAdvancedNew } from '@/common/utils/flattenIterative'; import { Apis } from '@/gen/Apis'; import { ProCard, ProTable } from '@ant-design/pro-components'; @@ -10,6 +15,7 @@ interface SelectedBuilding { name: string; } export default function Index({ title = '角色' }) { + const getCurrentPermissions = useCurrentPermissions(); const [selectedBuilding, setSelectedBuilding] = useState(null); const [selectedPermissionsIds, setSelectedPermissionsIds] = useState( @@ -19,7 +25,7 @@ export default function Index({ title = '角色' }) { const [dataTabsSource, setDataTabsSource] = useState([]); const [tabsKey, setTabsKey] = useState(''); const getSysPermissions = () => { - Apis.Permission.SysPermissions.List({ guard_name: 'Admin' }).then((res) => { + Apis.Permission.Roles.PermissionTree().then((res) => { setDataSource( flattenToMultiLevelFormatWithRowSpanAdvancedNew( res?.data[0]?.children || [], @@ -31,7 +37,7 @@ export default function Index({ title = '角色' }) { const onSave = () => { if (selectedPermissionsIds?.length && selectedBuilding?.id) { - Apis.Permission.SysRoles.SetPermissions({ + Apis.Permission.Roles.SetPermissions({ permissions_ids: selectedPermissionsIds, id: selectedBuilding?.id || 0, }).then(() => { @@ -52,7 +58,7 @@ export default function Index({ title = '角色' }) { name: selectedRole.name, }); } - Apis.Permission.SysRoles.GetPermissions({ + Apis.Permission.Roles.GetPermissions({ id: id ?? 0, }).then((res) => { setSelectedPermissionsIds(res?.data?.permissions_ids || []); @@ -60,15 +66,15 @@ export default function Index({ title = '角色' }) { }; const getSysRoles = () => { - Apis.Permission.SysRoles.List().then((res) => { + Apis.Permission.Roles.List().then((res) => { setDataTabsSource(res?.data || []); if (res?.data?.length) { - const firstRole = res.data[0]; + const firstRole = res?.data[0]; getPermissions(firstRole?.id || 0); // 初始化选中第一个角色 setSelectedBuilding({ - id: firstRole.id, - name: firstRole.name, + id: firstRole?.id, + name: firstRole?.name, }); } console.log(res, 'res'); @@ -77,7 +83,7 @@ export default function Index({ title = '角色' }) { const onSelect = () => { //删除角色 - Apis.Permission.SysRoles.Delete({ + Apis.Permission.Roles.Delete({ id: tabsKey, }).then(() => { getSysRoles(); @@ -88,6 +94,36 @@ export default function Index({ title = '角色' }) { getSysRoles(); getSysPermissions(); }, []); + + let toolBarRender = () => { + return getCurrentPermissions({ + add: getSysRoles()} title={title} />, + delete: ( + onSelect()} + // 如果当前选中角色是管理员，则禁用删除按钮 + disabled={selectedBuilding?.name === '管理员'} + /> + ), + save: ( + onSave()} + /> + ), + }); + }; + return ( - - getSysRoles()} title={title} /> - onSelect()} - // 如果当前选中角色是管理员，则禁用删除按钮 - disabled={selectedBuilding?.name === '管理员'} - /> - - onSave()} - /> - - } + extra={{toolBarRender()}} >
diff --git a/src/pages/system/sys_roles/modals/Create.tsx b/src/pages/system/sys_roles/modals/Create.tsx index 580f789..4fcb8b7 100644 --- a/src/pages/system/sys_roles/modals/Create.tsx +++ b/src/pages/system/sys_roles/modals/Create.tsx @@ -26,7 +26,7 @@ export default function Create(props: MyBetaModalFormProps) { } }} onFinish={async (values) => - Apis.Permission.SysRoles.Store(values) + Apis.Permission.Roles.Store(values) .then(() => { props.reload?.(); message.success(props.title + '成功');