ruiling/tachybase_todo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: ui routes

Browse Source
This commit is contained in:
chenos 2022-03-09 16:11:22 +08:00
parent 3cd0ea3d01
commit ac4ce800bc
3 changed files with 21 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/client/src/route-switch/antd/admin-layout/index.tsx
View File

@ -91,19 +91,17 @@ const InternalAdminLayout = (props: any) => {
</Layout.Header>
<Layout>
<Layout.Sider style={{ display: 'none' }} theme={'light'} ref={sideMenuRef}></Layout.Sider>
<Layout.Content style={{ minHeight: 'calc(100vh - 46px)' }}>
<RemoteSchemaComponent onlyRenderProperties uid={match.params.name} />
</Layout.Content>
<Layout.Content style={{ minHeight: 'calc(100vh - 46px)' }}>{props.children}</Layout.Content>
</Layout>
</Layout>
);
};
export const AdminLayout = () => {
export const AdminLayout = (props) => {
return (
<RemoteCollectionManagerProvider>
<CurrentUserProvider>
<InternalAdminLayout />
<InternalAdminLayout {...props} />
</CurrentUserProvider>
</RemoteCollectionManagerProvider>
);

7
packages/client/src/route-switch/antd/route-schema-component/index.tsx
View File

@ -1,7 +1,8 @@
import React from 'react';
import { RemoteSchemaComponent, useRoute } from '../../../';
import { useRouteMatch } from 'react-router-dom';
import { RemoteSchemaComponent } from '../../../';
export function RouteSchemaComponent(props: any) {
const route = useRoute();
return <RemoteSchemaComponent uid={route.uiSchemaUid} />;
const match = useRouteMatch<any>();
return <RemoteSchemaComponent onlyRenderProperties uid={match.params.name} />;
}

97
packages/plugin-ui-routes-storage/src/index.ts
View File

@ -28,93 +28,24 @@ export class UiRoutesStoragePlugin extends Plugin {
onSelect: '{{ onSelect }}',
sideMenuRefScopeKey: 'sideMenuRef',
},
properties: {
// item3: {
// type: 'void',
// title: 'SubMenu u3',
// 'x-component': 'Menu.SubMenu',
// 'x-component-props': {},
// properties: {
// item6: {
// type: 'void',
// title: 'SubMenu u6',
// 'x-component': 'Menu.SubMenu',
// 'x-component-props': {},
// properties: {
// item7: {
// type: 'void',
// title: 'Menu Item u7',
// 'x-component': 'Menu.Item',
// 'x-component-props': {},
// properties: {
// page1: {
// type: 'void',
// 'x-component': 'Page',
// 'x-async': true,
// properties: {
// grid1: {
// type: 'void',
// 'x-component': 'Grid',
// 'x-item-initializer': 'BlockInitializer',
// properties: {},
// },
// },
// },
// },
// },
// item8: {
// type: 'void',
// title: 'Menu Item u8',
// 'x-component': 'Menu.Item',
// 'x-component-props': {},
// },
// },
// },
// item4: {
// type: 'void',
// title: 'Menu Item u4',
// 'x-component': 'Menu.Item',
// 'x-component-props': {},
// },
// item5: {
// type: 'void',
// title: 'Menu Item u5',
// 'x-component': 'Menu.Item',
// 'x-component-props': {},
// },
// },
// },
// item1: {
// type: 'void',
// title: 'Menu Item u1',
// 'x-component': 'Menu.Item',
// 'x-component-props': {},
// },
// item2: {
// type: 'void',
// title: 'Menu Item u2',
// 'x-component': 'Menu.Item',
// 'x-component-props': {},
// },
// item9: {
// type: 'void',
// title: 'SubMenu u9',
// 'x-component': 'Menu.SubMenu',
// 'x-component-props': {},
// properties: {
// item10: {
// type: 'void',
// title: 'Menu Item u10',
// 'x-component': 'Menu.Item',
// 'x-component-props': {},
// },
// },
// },
},
properties: {},
},
path: '/admin/:name(.+)?',
component: 'AdminLayout',
title: 'NocoBase Admin',
routes: [
// test...
{
type: 'route',
path: '/admin/workflow',
component: 'WorkflowPage',
},
{
type: 'route',
path: '/admin/:name(.+)?',
component: 'RouteSchemaComponent',
},
],
},
{
type: 'route',