@jiangood/open-admin 3.1.11 → 3.1.12

package/src/layouts/admin/TabLayout.jsx

@@ -1,24 +1,39 @@
 import React from "react";
-import {history, PageFrame, UrlUtils, EventBus} from "../../framework";
+import {history, PageFrame, EventBus, matchRoute, setPageTitle} from "../../framework";
 import {AdminTabs} from "./AdminTabs";
 
-function getLabel(pathname, search, pathMenuMap) {
-    if (pathname === '/') return '首页';
-    const params = UrlUtils.getParams(search);
-    if (params._label) return params._label;
+function getPathname(url) {
+    const qIndex = url.indexOf('?');
+    return qIndex === -1 ? url : url.substring(0, qIndex);
+}
+
+/** 移除已弃用的 _label 参数，避免旧 URL 产生重复 Tab；其余 query 原样保留 */
+function normalizeUrl(url) {
+    const qIndex = url.indexOf('?');
+    if (qIndex === -1) return url;
+    const params = new URLSearchParams(url.substring(qIndex));
+    if (!params.has('_label')) return url;
+    params.delete('_label');
+    const search = params.toString();
+    return search ? `${url.substring(0, qIndex)}?${search}` : url.substring(0, qIndex);
+}
+
+function getLabel(pathname, pathMenuMap) {
+    if (pathname === '/' || pathname === '/index') return '首页';
+    const route = matchRoute(pathname);
+    // 页面显式声明的标题优先；未声明时回退到后端菜单名
+    if (route?.meta?.title) return route.meta.title;
     const menu = pathMenuMap[pathname];
     if (menu) return menu.name;
+    if (!route) return '页面不存在';
     return '未命名';
 }
 
 export class TabLayout extends React.Component {
     constructor(props) {
         super(props);
-        const initUrl = history.location.pathname + history.location.search;
-        const qIndex = initUrl.indexOf('?');
-        const initPathname = qIndex === -1 ? initUrl : initUrl.substring(0, qIndex);
-        const initSearch = qIndex === -1 ? '' : initUrl.substring(qIndex);
-        const initLabel = getLabel(initPathname, initSearch, props.pathMenuMap);
+        const initUrl = normalizeUrl(history.location.pathname + history.location.search);
+        const initLabel = getLabel(getPathname(initUrl), props.pathMenuMap);
         this.state = {
             tabs: [{key: initUrl, label: initLabel, refreshKey: 0}],
             activeKey: initUrl,
@@ -29,13 +44,11 @@ export class TabLayout extends React.Component {
     unlisten = null;
     unsubscribeClosePage = null;
 
-    openTab = (url) => {
-        const qIndex = url.indexOf('?');
-        const pathname = qIndex === -1 ? url : url.substring(0, qIndex);
-        const search = qIndex === -1 ? '' : url.substring(qIndex);
+    openTab = (rawUrl) => {
+        const url = normalizeUrl(rawUrl);
         this.setState(prev => ({
             tabs: prev.tabs.some(t => t.key === url) ? prev.tabs
-                : [...prev.tabs, {key: url, label: getLabel(pathname, search, this.props.pathMenuMap), refreshKey: 0}],
+                : [...prev.tabs, {key: url, label: getLabel(getPathname(url), this.props.pathMenuMap), refreshKey: 0}],
             activeKey: url,
         }));
     };
@@ -64,6 +77,13 @@ export class TabLayout extends React.Component {
         this.closeTab(url);
     };
 
+    /** 浏览器标题跟随当前激活标签 */
+    syncDocumentTitle() {
+        const {tabs, activeKey} = this.state;
+        const active = tabs.find(t => t.key === activeKey);
+        setPageTitle(active && active.label !== '未命名' ? active.label : undefined);
+    }
+
     handleCloseOthers = (key) => {
         this.setState(prev => ({tabs: prev.tabs.filter(t => t.key === key)}));
         if (key !== this.activeKey) {
@@ -81,6 +101,7 @@ export class TabLayout extends React.Component {
             this.openTab(location.pathname + location.search);
         });
         this.unsubscribeClosePage = EventBus.on('closePage', this.handleClosePageEvent);
+        this.syncDocumentTitle();
     }
 
     componentDidUpdate(prevProps) {
@@ -89,16 +110,14 @@ export class TabLayout extends React.Component {
         if (this.props.pathMenuMap !== prevProps.pathMenuMap) {
             this.refreshTabLabels();
         }
+        this.syncDocumentTitle();
     }
 
     refreshTabLabels() {
         this.setState(prev => {
             let changed = false;
             const tabs = prev.tabs.map(t => {
-                const qIndex = t.key.indexOf('?');
-                const pathname = qIndex === -1 ? t.key : t.key.substring(0, qIndex);
-                const search = qIndex === -1 ? '' : t.key.substring(qIndex);
-                const label = getLabel(pathname, search, this.props.pathMenuMap);
+                const label = getLabel(getPathname(t.key), this.props.pathMenuMap);
                 if (label === t.label) return t;
                 changed = true;
                 return {...t, label};

package/src/layouts/admin/index.jsx

@@ -56,7 +56,7 @@ export default class AdminLayout extends React.Component {
             this.setState({layoutMode: getLayoutMode()});
         })
 
-        // 系统配置保存后刷新标题、水印等站点信息
+        // 参数设置保存后刷新标题、水印等站点信息
         this.unsubscribeSiteInfo = EventBus.on('siteInfoChange', () => {
             this.setState({siteInfo: GlobalData.getSiteInfo()});
         })
@@ -180,7 +180,7 @@ export default class AdminLayout extends React.Component {
         if (!menu) return;
         const {path} = menu;
         this.setState({currentMenuKey: key});
-        PageUtils.open(path, menu.name);
+        PageUtils.open(path);
     }
 
     getActiveTopMenu() {
@@ -242,7 +242,7 @@ return <Layout className='main-layout'>
                     {this.renderTopMenu()}
                     {this.state.headerLeftArticles.map(a => (
                         <button key={a.code} type="button" className='item'
-                                onClick={() => PageUtils.open('/article/' + a.code, a.title)}>{a.title}</button>
+                                onClick={() => PageUtils.open('/article/' + a.code)}>{a.title}</button>
                     ))}
                     {this.props.showOrgSwitcher?.({
                         activeTopMenu: this.getActiveTopMenu(),
@@ -283,7 +283,7 @@ return <Layout className='main-layout'>
         const {siteInfo, loginInfo, layoutMode} = this.state
         // 即使菜单为空也直接显示页面内容，不要一直显示 Skeleton
         const contentNode = layoutMode === 'single'
-            ? <SinglePageLayout/>
+            ? <SinglePageLayout pathMenuMap={this.state.pathMenuMap}/>
             : <TabLayout pathMenuMap={this.state.pathMenuMap}/>;
         if (siteInfo.waterMark === true) {
             return <Watermark content={[loginInfo.name, loginInfo.account]}>

package/src/layouts/index.tsx

@@ -3,8 +3,8 @@ import {App, ConfigProvider, Modal} from "antd";
 import zhCN from 'antd/locale/zh_CN';
 import dayjs from 'dayjs';
 import 'dayjs/locale/zh-cn';
-import {ErrorBoundary, GlobalData, HttpClient, LOGIN_EXPIRED_REASON_CONCURRENT_LOGIN, PageFrame, PageLoading, PageUtils, history, getThemeConfig, getThemeMode, setThemeColors, setMessageApi, EventBus} from "../framework";
-import type {LoginExpiredPayload, ThemeColors} from "../framework";
+import {ErrorBoundary, GlobalData, HttpClient, LOGIN_EXPIRED_REASON_CONCURRENT_LOGIN, LOGIN_PATH, PageFrame, PageLoading, PageUtils, history, getThemeConfig, getThemeMode, setThemeColors, setMessageApi, EventBus, matchRoute, refreshDocumentTitle, setPageTitle, warnDeprecatedPageLabel, applyServerUiDefaults} from "../framework";
+import type {LoginExpiredPayload, PageLayout, ThemeColors} from "../framework";
 
 import AdminLayout from "./admin"
 
@@ -59,6 +59,7 @@ export class Layouts extends React.Component<LayoutsProps> {
     unsubscribeLoginExpired: (() => void) | null = null;
     unsubscribeLogoutSuccess: (() => void) | null = null;
     unsubscribeTheme: (() => void) | null = null;
+    unsubscribeSiteInfo: (() => void) | null = null;
     /** 本次登录失效弹窗的原因。同步字段（非 state）：同一次失效会并发上报多个 401，setState 异步可能读到旧值 */
     private loginExpiredReason: string = '';
 
@@ -94,22 +95,42 @@ export class Layouts extends React.Component<LayoutsProps> {
         this.setState({loginExpiredVisible: false});
     };
 
-    getPageType(pathname): 'public' | 'standalone' | 'protected' {
-        if (pathname === '/' || pathname === '/index') return 'protected';
-        if (pathname.startsWith('/public/')) return 'public';
-        if (pathname.startsWith('/standalone/')) return 'standalone';
-        return 'protected';
+    /**
+     * 解析页面登录与布局要求：
+     * 优先使用页面文件导出的 pageMeta；未匹配的路由按目录约定兜底
+     */
+    getPageMeta(pathname: string): {requiresAuth: boolean; layout: PageLayout} {
+        const meta = matchRoute(pathname)?.meta;
+        const isLogin = pathname === LOGIN_PATH;
+        const inPublicDir = pathname.startsWith('/public/');
+        const inStandaloneDir = pathname.startsWith('/standalone/');
+        const requiresAuth = meta?.requiresAuth ?? (isLogin ? false : !inPublicDir);
+        const layout = requiresAuth
+            ? (meta?.layout ?? (inStandaloneDir || isLogin ? 'blank' : 'admin'))
+            : 'blank';
+        return {requiresAuth, layout};
+    }
+
+    /** 公共/standalone 页用 pageMeta.title；admin 页由 TabLayout / SinglePageLayout 设置 */
+    syncDocumentTitle() {
+        const {pathname, search} = this.state.location;
+        if (search && new URLSearchParams(search).has('_label')) {
+            warnDeprecatedPageLabel();
+        }
+        if (this.getPageMeta(pathname).layout === 'blank') {
+            setPageTitle(matchRoute(pathname)?.meta?.title);
+        }
     }
 
     loadData() {
         const {siteInfoLoaded, loginChecked} = this.state;
-        const pageType = this.getPageType(this.state.location.pathname);
+        const {requiresAuth} = this.getPageMeta(this.state.location.pathname);
 
         if (!siteInfoLoaded) {
             this.loadSiteInfo();
         }
 
-        if ((pageType === 'protected' || pageType === 'standalone') && !loginChecked) {
+        if (requiresAuth && !loginChecked) {
             this.loadLoginInfo();
         }
     }
@@ -117,6 +138,8 @@ export class Layouts extends React.Component<LayoutsProps> {
     loadSiteInfo() {
         HttpClient.get("/admin/public/site-info", null, {toastError: false}).then(data => {
             GlobalData.setSiteInfo(data.data);
+            // 参数设置的默认主题/页签模式需在后台布局首次渲染前生效，避免闪一下默认样式
+            applyServerUiDefaults(data.data?.config);
             this.setState({siteInfoLoaded: true});
         }).catch(() => {
             console.error('[Layout] 加载站点信息失败');
@@ -131,7 +154,7 @@ export class Layouts extends React.Component<LayoutsProps> {
 
             if (data.data.needUpdatePwd) {
                 this.setState({loginChecked: true});
-                history.push('/standalone/forceUpdatePwd');
+                history.push('/standalone/force-update-pwd');
                 return;
             }
 
@@ -154,12 +177,22 @@ export class Layouts extends React.Component<LayoutsProps> {
                 themeVersion: prevState.themeVersion + 1,
             }));
         });
+        this.unsubscribeSiteInfo = EventBus.on('siteInfoChange', () => {
+            // 参数设置保存后，未自定义用户即时跟随新的默认主题/页签模式
+            applyServerUiDefaults(GlobalData.getSiteInfo().config);
+            refreshDocumentTitle();
+        });
+        this.syncDocumentTitle();
         this.loadData();
     }
 
     componentDidUpdate(prevProps: LayoutsProps, prevState: typeof this.state) {
         if (this.state.location !== prevState.location) {
             this.loadData();
+            this.syncDocumentTitle();
+        }
+        if (!prevState.siteInfoLoaded && this.state.siteInfoLoaded) {
+            refreshDocumentTitle();
         }
     }
 
@@ -176,6 +209,9 @@ export class Layouts extends React.Component<LayoutsProps> {
         if (this.unsubscribeTheme) {
             this.unsubscribeTheme();
         }
+        if (this.unsubscribeSiteInfo) {
+            this.unsubscribeSiteInfo();
+        }
     }
 
     /**
@@ -194,15 +230,16 @@ export class Layouts extends React.Component<LayoutsProps> {
         const {location, siteInfoLoaded, loginChecked} = this.state;
         const {pathname, search} = location;
         const ready = siteInfoLoaded && loginChecked;
-        const pageType = this.getPageType(pathname);
-        const showPageFrame = pageType === 'public' || (pageType === 'standalone' && ready);
+        const {requiresAuth, layout} = this.getPageMeta(pathname);
+        // 公共页直接渲染；standalone 页需登录后渲染；admin 页交给后台布局
+        const showPageFrame = !requiresAuth || (layout === 'blank' && ready);
 
         return (
             <ErrorBoundary minimal>
                 <ConfigProvider {...baseConfigProps} theme={getThemeConfig()}>
                     <App component={false}>
                         <MessageBridge/>
-                        {this.renderContent(showPageFrame, ready, pathname, search)}
+                        {this.renderContent(showPageFrame, ready, layout, pathname, search)}
                         {this.renderLoginExpiredModal()}
                     </App>
                 </ConfigProvider>
@@ -210,11 +247,11 @@ export class Layouts extends React.Component<LayoutsProps> {
         );
     }
 
-    renderContent(showPageFrame: boolean, ready: boolean, pathname: string, search: string) {
+    renderContent(showPageFrame: boolean, ready: boolean, layout: PageLayout, pathname: string, search: string) {
         if (showPageFrame) {
             return <PageFrame url={pathname + search}/>;
         }
-        if (ready) {
+        if (ready && layout === 'admin') {
             return <AdminLayout headerExtra={this.props.headerExtra} showOrgSwitcher={this.props.showOrgSwitcher} loginInfo={GlobalData.getLoginInfo()}/>;
         }
         return <PageLoading messages={[

package/src/pages/404.jsx

@@ -2,6 +2,10 @@ import React from "react";
 import {Result} from "antd";
 import {Page} from "../framework";
 
+export const pageMeta = {
+    title: '页面不存在',
+};
+
 export default class NotFound extends React.Component {
 
     render() {

package/src/pages/article/$code.jsx

@@ -2,6 +2,10 @@ import React from "react";
 import {HttpClient, Page, UrlUtils} from "../../framework";
 import "./article.less";
 
+export const pageMeta = {
+    title: '文章详情',
+};
+
 export default class ArticlePage extends React.Component {
 
     state = {
@@ -12,7 +16,7 @@ export default class ArticlePage extends React.Component {
     componentDidMount() {
         const code = this.props.params?.code
         if (code) {
-            HttpClient.get('admin/article/getByCode', {code}, {toastError: false}).then(rs => {
+            HttpClient.get('admin/article/get-by-code', {code}, {toastError: false}).then(rs => {
                 this.setState({article: rs.data, loading: false})
             }).catch(() => {
                 this.setState({loading: false})

package/src/pages/login.jsx

@@ -0,0 +1,157 @@
+import React from 'react';
+import {Button, Form, Input} from 'antd';
+import {LockOutlined, SafetyCertificateOutlined, UserOutlined, WarningOutlined} from '@ant-design/icons';
+import {EventBus, HttpClient, GlobalData, getMessageApi, history} from "../framework";
+
+import "./login.less"
+
+export const pageMeta = {
+    requiresAuth: false,
+    layout: 'blank',
+    title: '登录',
+};
+
+function getRedirect(query) {
+    let redirect = query?.redirect;
+    if (!redirect) {
+        redirect = '/'
+    }
+    return redirect;
+}
+
+function postLogin(values, query, success, error) {
+    HttpClient.post('/admin/auth/login', values, null, {toastError: false}).then(rs => {
+        EventBus.emit('loginSuccess')
+        history.push(getRedirect(query))
+        success?.(rs)
+    }).catch(e => {
+        console.error('[Login] 登录失败:', e);
+        getMessageApi().error(HttpClient.errToMsg(e))
+        error?.(e)
+    })
+}
+
+function encodePassword(pwd) {
+    const chars = [];
+    for (let i = 0; i < pwd.length; i++)
+        chars.push(pwd.codePointAt(i) + i + 2);
+    return btoa(String.fromCodePoint(...chars));
+}
+
+export default class LoginPage extends React.Component {
+
+    state = {
+        logging: false,
+        siteInfo: {},
+        /* logo.png 缺失或加载失败时，回退到矢量标记，避免首屏出现破损图 */
+        logoError: false
+    }
+
+    componentDidMount() {
+        const siteInfo = GlobalData.getSiteInfo()
+        if (siteInfo?.title) {
+            this.setState({siteInfo})
+            return
+        }
+        // localStorage 中无站点信息，从服务端重新加载
+        HttpClient.get('/admin/public/site-info', null, {toastError: false}).then(rs => {
+            GlobalData.setSiteInfo(rs.data)
+            this.setState({siteInfo: rs.data})
+        }).catch(() => {
+            console.error('[Login] 加载站点信息失败');
+            getMessageApi().error('加载站点信息失败，请刷新页面重试')
+        })
+    }
+
+    submit = values => {
+        this.setState({logging: true})
+        try {
+            values.password = encodePassword(values.password)
+        } catch (e) {
+            console.error('[Login] 密码编码失败:', e);
+            this.setState({logging: false})
+            getMessageApi().error('密码含不支持字符，请联系管理员重置')
+            return
+        }
+        postLogin(values, this.props.location?.query, () => {
+            this.setState({logging: false})
+        }, () => {
+            this.setState({logging: false})
+        })
+    }
+
+    render() {
+        const pageStyle = {
+            backgroundImage: `url("./login_bg.jpg")`
+        }
+
+        return (
+            <section className='login-page' style={pageStyle}>
+                <div className="login-content">
+                    {this.renderBrand()}
+                    {this.getForm()}
+                    {this.renderFormBottom()}
+                </div>
+            </section>
+        );
+    }
+
+    renderBrand() {
+        const {siteInfo = {}, logoError} = this.state
+        return (
+            <div className="login-brand">
+                <span className="login-brand-logo">
+                    {logoError
+                        ? <SafetyCertificateOutlined/>
+                        : <img src="./logo.png" alt="" onError={() => this.setState({logoError: true})}/>}
+                </span>
+                {siteInfo.title && <h1>{siteInfo.title}</h1>}
+            </div>
+        )
+    }
+
+    getForm = () => {
+        const form = (
+            <Form
+                name="normal_login"
+                className="login-form"
+                initialValues={{remember: true}}
+                onFinish={this.submit}
+                requiredMark={false}
+                colon={false}
+            >
+                <Form.Item name="username" rules={[{required: true, message: '请输入用户名!'}]}>
+                    <Input size='large' prefix={<UserOutlined/>} placeholder="用户名" autoComplete="username"/>
+                </Form.Item>
+                <Form.Item name="password" rules={[{required: true, message: '请输入密码!'}]}>
+                    <Input.Password autoComplete="current-password" prefix={<LockOutlined/>} placeholder="密码"
+                           size='large'
+                    />
+                </Form.Item>
+
+                <Form.Item className="login-submit">
+                    <Button loading={this.state.logging} type="primary" htmlType="submit"
+                            block size='large'>
+                        登录
+                    </Button>
+                </Form.Item>
+            </Form>
+        );
+
+        if (this.props.formRender) {
+            return this.props.formRender(form);
+        }
+        return form;
+    };
+
+    renderFormBottom() {
+        const siteInfo = this.state.siteInfo || {};
+        if (siteInfo.loginBoxBottomTip) {
+            return (
+                <div className="login-bottom-tip">
+                    <WarningOutlined/> {siteInfo.loginBoxBottomTip}
+                </div>
+            )
+        }
+    }
+}

package/src/pages/{public/login.less → login.less}

@@ -128,6 +128,9 @@
     height: 46px;
     padding: 0 14px;
     border-radius: var(--login-field-radius);
+    /* antd v6 给内部 input 声明了 `color: inherit`，文字色由容器决定。
+       容器必须显式给浅色，否则会继承 antd 浅色主题的 colorText（黑字压在深色玻璃上不可读） */
+    color: var(--login-text);
     background-color: var(--login-field-bg);
     border: 1px solid var(--login-hairline);
     box-shadow: none;
@@ -154,10 +157,22 @@
     /* 密码可见性切换按钮 */
     .ant-input-suffix {
       color: rgba(255, 255, 255, 0.55);
+
+      /* antd 给密码图标单独着色（colorIcon），不跟随 .ant-input-suffix，需显式覆盖 */
+      .ant-input-password-icon {
+        color: inherit;
+
+        &:hover {
+          color: var(--login-text);
+        }
+      }
     }
   }
 
-  .ant-input {
+  /* antd v6 的 `> input.ant-input { color: inherit }` 特异性为 0,2,1，
+     会压过 .login-form .ant-input（0,2,0）；这里提升特异性后显式上色，
+     避免 antd 调整内部选择器时文字色再次失效 */
+  .login-page & .ant-input {
     color: var(--login-text);
     font-size: 15px;
     background: transparent;

package/src/pages/public/login.jsx

@@ -1,151 +1,17 @@
-import React from 'react';
-import {Button, Form, Input} from 'antd';
-import {LockOutlined, SafetyCertificateOutlined, UserOutlined, WarningOutlined} from '@ant-design/icons';
-import {EventBus, HttpClient, GlobalData, getMessageApi, history} from "../../framework";
-
-import "./login.less"
-
-function getRedirect(query) {
-    let redirect = query?.redirect;
-    if (!redirect) {
-        redirect = '/'
-    }
-    return redirect;
-}
-
-function postLogin(values, query, success, error) {
-    HttpClient.post('/admin/auth/login', values, null, {toastError: false}).then(rs => {
-        EventBus.emit('loginSuccess')
-        history.push(getRedirect(query))
-        success?.(rs)
-    }).catch(e => {
-        console.error('[Login] 登录失败:', e);
-        getMessageApi().error(HttpClient.errToMsg(e))
-        error?.(e)
-    })
-}
-
-function encodePassword(pwd) {
-    const chars = [];
-    for (let i = 0; i < pwd.length; i++)
-        chars.push(pwd.codePointAt(i) + i + 2);
-    return btoa(String.fromCodePoint(...chars));
-}
-
-export default class LoginPage extends React.Component {
-
-    state = {
-        logging: false,
-        siteInfo: {},
-        /* logo.png 缺失或加载失败时，回退到矢量标记，避免首屏出现破损图 */
-        logoError: false
-    }
-
+import React from "react";
+import {history, LOGIN_PATH} from "../../framework";
+
+/**
+ * 旧版登录地址兼容：/public/login?redirect=... → /login?redirect=...
+ * 保留一个版本后删除
+ */
+export default class LegacyLoginRedirect extends React.Component {
     componentDidMount() {
-        const siteInfo = GlobalData.getSiteInfo()
-        if (siteInfo?.title) {
-            this.setState({siteInfo})
-            return
-        }
-        // localStorage 中无站点信息，从服务端重新加载
-        HttpClient.get('/admin/public/site-info', null, {toastError: false}).then(rs => {
-            GlobalData.setSiteInfo(rs.data)
-            this.setState({siteInfo: rs.data})
-        }).catch(() => {
-            console.error('[Login] 加载站点信息失败');
-            getMessageApi().error('加载站点信息失败，请刷新页面重试')
-        })
-    }
-
-    submit = values => {
-        this.setState({logging: true})
-        try {
-            values.password = encodePassword(values.password)
-        } catch (e) {
-            console.error('[Login] 密码编码失败:', e);
-            this.setState({logging: false})
-            getMessageApi().error('密码含不支持字符，请联系管理员重置')
-            return
-        }
-        postLogin(values, this.props.location?.query, () => {
-            this.setState({logging: false})
-        }, () => {
-            this.setState({logging: false})
-        })
+        const search = this.props.location?.search || '';
+        history.replace(LOGIN_PATH + search);
     }
 
     render() {
-        const pageStyle = {
-            backgroundImage: `url("./login_bg.jpg")`
-        }
-
-        return (
-            <section className='login-page' style={pageStyle}>
-                <div className="login-content">
-                    {this.renderBrand()}
-                    {this.getForm()}
-                    {this.renderFormBottom()}
-                </div>
-            </section>
-        );
-    }
-
-    renderBrand() {
-        const {siteInfo = {}, logoError} = this.state
-        return (
-            <div className="login-brand">
-                <span className="login-brand-logo">
-                    {logoError
-                        ? <SafetyCertificateOutlined/>
-                        : <img src="./logo.png" alt="" onError={() => this.setState({logoError: true})}/>}
-                </span>
-                {siteInfo.title && <h1>{siteInfo.title}</h1>}
-            </div>
-        )
-    }
-
-    getForm = () => {
-        const form = (
-            <Form
-                name="normal_login"
-                className="login-form"
-                initialValues={{remember: true}}
-                onFinish={this.submit}
-                requiredMark={false}
-                colon={false}
-            >
-                <Form.Item name="username" rules={[{required: true, message: '请输入用户名!'}]}>
-                    <Input size='large' prefix={<UserOutlined/>} placeholder="用户名" autoComplete="username"/>
-                </Form.Item>
-                <Form.Item name="password" rules={[{required: true, message: '请输入密码!'}]}>
-                    <Input.Password autoComplete="current-password" prefix={<LockOutlined/>} placeholder="密码"
-                           size='large'
-                    />
-                </Form.Item>
-
-                <Form.Item className="login-submit">
-                    <Button loading={this.state.logging} type="primary" htmlType="submit"
-                            block size='large'>
-                        登录
-                    </Button>
-                </Form.Item>
-            </Form>
-        );
-
-        if (this.props.formRender) {
-            return this.props.formRender(form);
-        }
-        return form;
-    };
-
-    renderFormBottom() {
-        const siteInfo = this.state.siteInfo || {};
-        if (siteInfo.loginBoxBottomTip) {
-            return (
-                <div className="login-bottom-tip">
-                    <WarningOutlined/> {siteInfo.loginBoxBottomTip}
-                </div>
-            )
-        }
+        return null;
     }
 }