From d4c6015d5f0d52fc332e0252db6e1f2b44553782 Mon Sep 17 00:00:00 2001 From: JackySoft Date: Thu, 22 Aug 2024 21:37:59 +0800 Subject: [PATCH] =?UTF-8?q?feat:=201.=E7=BC=96=E8=BE=91=E5=99=A8=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E3=80=822.=E4=BF=AE=E6=94=B9=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E9=A1=B5=E9=9D=A2=E6=A0=87=E9=A2=98=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E3=80=823.=E8=AE=BF=E9=97=AE=E7=AB=AF=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=9C=AA=E5=8F=91=E5=B8=83=E6=8F=90=E7=A4=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/admin/.env.development | 4 +- packages/admin/src/pages/500.tsx | 22 ++++++++ packages/admin/src/pages/page/index.tsx | 50 ++++++++++--------- packages/admin/src/router/index.tsx | 4 ++ packages/editor/src/api/pageMember.ts | 4 -- .../layout/components/Header/CreatePage.tsx | 3 +- .../layout/components/Menu/Pages/PageList.tsx | 6 +-- .../src/pages/admin/menu/CreateMenu.tsx | 14 +++--- packages/editor/src/pages/home/PageList.tsx | 2 +- 9 files changed, 68 insertions(+), 41 deletions(-) create mode 100644 packages/admin/src/pages/500.tsx diff --git a/packages/admin/.env.development b/packages/admin/.env.development index 4abaaaa..420db61 100644 --- a/packages/admin/.env.development +++ b/packages/admin/.env.development @@ -1,5 +1,5 @@ # 接口地址 -VITE_BASE_API=http://localhost:5000/api -# VITE_BASE_API=http://mars-api.marsview.cc/api +# VITE_BASE_API=http://localhost:5000/api +VITE_BASE_API=http://mars-api.marsview.cc/api # 后台访问地址 VITE_ADMIN_URL=http://admin.marsview.cc \ No newline at end of file diff --git a/packages/admin/src/pages/500.tsx b/packages/admin/src/pages/500.tsx new file mode 100644 index 0000000..0e664da --- /dev/null +++ b/packages/admin/src/pages/500.tsx @@ -0,0 +1,22 @@ +import { Button, Result } from 'antd'; +import { useNavigate } from 'react-router-dom'; +function NotFound() { + const navigate = useNavigate(); + const handleClick = () => { + navigate('/'); + }; + return ( + + 回首页 + + } + /> + ); +} + +export default NotFound; diff --git a/packages/admin/src/pages/page/index.tsx b/packages/admin/src/pages/page/index.tsx index c7ff9a9..46d2bfd 100644 --- a/packages/admin/src/pages/page/index.tsx +++ b/packages/admin/src/pages/page/index.tsx @@ -14,30 +14,34 @@ export default function () { const navitate = useNavigate(); useEffect(() => { if (id) { - getPageDetail(env as string, Number(id)).then((res: any) => { - if (!res.id) { - return navitate('/404'); - } - let pageData: any = {}; - try { - pageData = JSON.parse(res.page_data || '{}'); - } catch (error) { - console.error(error); - console.info('【json数据】', res.page_data); - message.error('页面数据格式错误，请检查'); - } - savePageInfo({ - pageId: res.id, - pageName: res.name, - remark: res.remark, - is_public: res.is_public, - stg_publish_id: res.stg_publish_id, - pre_publish_id: res.pre_publish_id, - prd_publish_id: res.prd_publish_id, - ...pageData, + getPageDetail(env as string, Number(id)) + .then((res: any) => { + if (!res.id) { + return navitate('/404'); + } + let pageData: any = {}; + try { + pageData = JSON.parse(res.page_data || '{}'); + } catch (error) { + console.error(error); + console.info('【json数据】', res.page_data); + message.error('页面数据格式错误，请检查'); + } + savePageInfo({ + pageId: res.id, + pageName: res.name, + remark: res.remark, + is_public: res.is_public, + stg_publish_id: res.stg_publish_id, + pre_publish_id: res.pre_publish_id, + prd_publish_id: res.prd_publish_id, + ...pageData, + }); + setTheme(pageData.config.props.theme || '#1677ff'); + }) + .catch(() => { + navitate('/500'); }); - setTheme(pageData.config.props.theme || '#1677ff'); - }); } }, [id]); return ( diff --git a/packages/admin/src/router/index.tsx b/packages/admin/src/router/index.tsx index 8a341d5..b97d2bc 100644 --- a/packages/admin/src/router/index.tsx +++ b/packages/admin/src/router/index.tsx @@ -48,6 +48,10 @@ export const router = [ path: '/403', element: lazyLoad(React.lazy(() => import('@/pages/403'))), }, + { + path: '/500', + element: lazyLoad(React.lazy(() => import('@/pages/500'))), + }, ]; export default createBrowserRouter(router); diff --git a/packages/editor/src/api/pageMember.ts b/packages/editor/src/api/pageMember.ts index c1f38eb..04f13aa 100644 --- a/packages/editor/src/api/pageMember.ts +++ b/packages/editor/src/api/pageMember.ts @@ -36,8 +36,4 @@ export default { deletePageMember(params: DelParams) { return request.post('/page/role/delete', params); }, - // 获取当前用户页面列表 - getPageList() { - return request.post('/page/user/pages', {}, { showLoading: false }); - }, }; diff --git a/packages/editor/src/layout/components/Header/CreatePage.tsx b/packages/editor/src/layout/components/Header/CreatePage.tsx index 1065139..1377836 100644 --- a/packages/editor/src/layout/components/Header/CreatePage.tsx +++ b/packages/editor/src/layout/components/Header/CreatePage.tsx @@ -8,6 +8,7 @@ import { PageItem } from '@/api/pageMember'; */ export interface IModalProp { + title: string; createRef: MutableRefObject<{ open: (record: PageItem) => void } | undefined>; update?: () => void; } @@ -66,7 +67,7 @@ const CreatePage = (props: IModalProp) => { }; return ( { {/* 创建和修改页面 */} { getMyPagesList(1); diff --git a/packages/editor/src/pages/admin/menu/CreateMenu.tsx b/packages/editor/src/pages/admin/menu/CreateMenu.tsx index 396a242..d3a7360 100644 --- a/packages/editor/src/pages/admin/menu/CreateMenu.tsx +++ b/packages/editor/src/pages/admin/menu/CreateMenu.tsx @@ -6,8 +6,8 @@ import { InfoCircleOutlined } from '@ant-design/icons'; import { message } from '@/utils/AntdGlobal'; import { IAction, IModalProp } from '@/pages/types'; import { Menu } from '@/api/types'; -import { getMenuList, addMenu, updateMenu } from '@/api'; -import api, { PageItem } from '@/api/pageMember'; +import { getMenuList, addMenu, updateMenu, getPageList } from '@/api'; +import { PageItem } from '@/api/pageMember'; import { arrayToTree } from '@/utils/util'; import CreatePage from '@/layout/components/Header/CreatePage'; @@ -33,7 +33,7 @@ export default function CreateMenu(props: IModalProp) { setLoading(true); // 获取菜单列表 await getMenus(); - await getPageList(); + await getMyPageList(); setLoading(false); if (data && project_id) { form.setFieldsValue({ ...data, project_id: parseInt(project_id), code: data.code?.split('_')[2] || '' }); @@ -51,8 +51,8 @@ export default function CreateMenu(props: IModalProp) { }; // 获取用户页面列表 - const getPageList = async () => { - const res = await api.getPageList(); + const getMyPageList = async () => { + const res = await getPageList({ pageNum: 1, pageSize: 50 }); setPageList(res.list); }; @@ -199,7 +199,7 @@ export default function CreateMenu(props: IModalProp) { {pageList.map((item) => { return ( - {item.name + '( ' + item.remark + ' )'} + {item.name} ); })} @@ -223,7 +223,7 @@ export default function CreateMenu(props: IModalProp) { {/* 创建和修改页面 */} - getPageList()} /> + getMyPageList()} /> ); } diff --git a/packages/editor/src/pages/home/PageList.tsx b/packages/editor/src/pages/home/PageList.tsx index f8c2c69..88823f4 100644 --- a/packages/editor/src/pages/home/PageList.tsx +++ b/packages/editor/src/pages/home/PageList.tsx @@ -215,7 +215,7 @@ export default function Index() { )} {/* 新建页面 */} - getList(1, pageSize)} /> + getList(1, pageSize)} /> );