diff --git a/packages/client/src/components/admin-layout/Auth.tsx b/packages/client/src/components/admin-layout/Auth.tsx index ec6ca3f73..202c6b451 100644 --- a/packages/client/src/components/admin-layout/Auth.tsx +++ b/packages/client/src/components/admin-layout/Auth.tsx @@ -16,7 +16,7 @@ export const AuthContext = createContext(null); export const useCurrentUser = () => { const { currentUser } = useContext(AuthContext); return currentUser; -} +}; export function AuthProvider(props) { const service = useRequest('users:check', { @@ -30,7 +30,11 @@ export function AuthProvider(props) { } return ( - {service.loading ? : props.children} + {service.loading ? ( + + ) : ( + props.children + )} ); } diff --git a/packages/client/src/components/admin-layout/More.tsx b/packages/client/src/components/admin-layout/More.tsx index bdd6b32a4..963aacad8 100644 --- a/packages/client/src/components/admin-layout/More.tsx +++ b/packages/client/src/components/admin-layout/More.tsx @@ -25,7 +25,7 @@ const useOkAction = () => { async run() { console.log('system_settings.values', form.values); await resource.save(form.values); - await service.refresh(); + await service.mutate(form.values); }, }; }; diff --git a/packages/client/src/components/admin-layout/Permissions/MenuPermissionTable.tsx b/packages/client/src/components/admin-layout/Permissions/MenuPermissionTable.tsx index 9ecb22488..afd0d9d1e 100644 --- a/packages/client/src/components/admin-layout/Permissions/MenuPermissionTable.tsx +++ b/packages/client/src/components/admin-layout/Permissions/MenuPermissionTable.tsx @@ -44,7 +44,7 @@ export const MenuPermissionTable = observer((props) => { }, }); if (loading) { - return ; + return ; } return (
diff --git a/packages/client/src/components/admin-layout/SiteTitle.tsx b/packages/client/src/components/admin-layout/SiteTitle.tsx index 4c0024bdc..bcb10a001 100644 --- a/packages/client/src/components/admin-layout/SiteTitle.tsx +++ b/packages/client/src/components/admin-layout/SiteTitle.tsx @@ -25,7 +25,7 @@ export function SystemSettingsProvider(props) { ); return ( - {service.loading ? : props.children} + {service.loading ? : props.children} ); } diff --git a/packages/client/src/components/admin-layout/index.tsx b/packages/client/src/components/admin-layout/index.tsx index e6ee0cca6..32c6e0b90 100644 --- a/packages/client/src/components/admin-layout/index.tsx +++ b/packages/client/src/components/admin-layout/index.tsx @@ -76,7 +76,7 @@ function LayoutWithMenu(props: LayoutWithMenuProps) { const history = useHistory(); const { title } = useSystemSettings(); const [activeKey, setActiveKey] = useState(match.params.name); - const [, setPageTitle] = usePageTitleContext(); + const { setPageTitle } = usePageTitleContext(); const onSelect = (info) => { if (!info.schema) { setActiveKey(null); @@ -149,7 +149,7 @@ function Content({ activeKey }) { ); if (loading) { - return ; + return ; } return ; @@ -166,7 +166,7 @@ export function AdminLayout({ route, ...others }: any) { ); if (loading) { - return ; + return ; } const findProperties = (schema: Schema): Schema[] => { diff --git a/packages/client/src/components/admin-layout/style.less b/packages/client/src/components/admin-layout/style.less index 34a627d03..c12dad59e 100644 --- a/packages/client/src/components/admin-layout/style.less +++ b/packages/client/src/components/admin-layout/style.less @@ -33,6 +33,18 @@ // } // } +.nb-spin-center { + position: absolute; + top: 0; + left: 0; + width: 100%; + height: 100%; + display: flex; + align-items: center; + justify-content: center; + max-height: inherit !important; +} + .database-sider { background: #fafafa; padding-top: 16px; diff --git a/packages/client/src/components/route-schema-renderer/index.tsx b/packages/client/src/components/route-schema-renderer/index.tsx index cc1fe03bf..90dd48ea1 100644 --- a/packages/client/src/components/route-schema-renderer/index.tsx +++ b/packages/client/src/components/route-schema-renderer/index.tsx @@ -59,7 +59,7 @@ export function RouteSchemaRenderer({ route }) { ); const { title } = useSystemSettings(); if (loading) { - return ; + return ; } return (
diff --git a/packages/client/src/constate/PageTitle.ts b/packages/client/src/constate/PageTitle.ts index 77784ddae..99b4910f6 100644 --- a/packages/client/src/constate/PageTitle.ts +++ b/packages/client/src/constate/PageTitle.ts @@ -6,10 +6,13 @@ export interface PageTitleProviderProps { defaultPageTitle?: string; } -const [PageTitleProvider, usePageTitleContext] = constate(({ defaultPageTitle }: PageTitleProviderProps) => { - const { title } = useSystemSettings(); - const [pageTitle, setPageTitle] = useState(defaultPageTitle); - return [title ? `${pageTitle} - ${title}` : pageTitle, setPageTitle]; -}); +const [PageTitleProvider, usePageTitleContext] = constate( + ({ defaultPageTitle }: PageTitleProviderProps) => { + const { title } = useSystemSettings(); + const [pageTitle, setPageTitle] = useState(defaultPageTitle); + const documentTitle = title ? `${pageTitle} - ${title}` : pageTitle; + return { documentTitle, pageTitle, setPageTitle }; + }, +); export { PageTitleProvider, usePageTitleContext }; diff --git a/packages/client/src/demos/demo1.tsx b/packages/client/src/demos/demo1.tsx index 2a9811918..2ff13d323 100644 --- a/packages/client/src/demos/demo1.tsx +++ b/packages/client/src/demos/demo1.tsx @@ -46,7 +46,7 @@ const App = () => { }); if (loading) { - return + return } return ( diff --git a/packages/client/src/schemas/page/index.tsx b/packages/client/src/schemas/page/index.tsx index 86859f29c..985364c9d 100644 --- a/packages/client/src/schemas/page/index.tsx +++ b/packages/client/src/schemas/page/index.tsx @@ -6,11 +6,11 @@ import { Helmet } from 'react-helmet'; export const Page = observer((props) => { const { children, ...others } = props; - const [pageTitle] = usePageTitleContext(); + const { documentTitle, pageTitle } = usePageTitleContext(); return ( <> - {pageTitle} + {documentTitle}