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

fix(acl): change route.uiSchemaUid to useAdminSchemaUid

Browse Source
This commit is contained in:
chenos 2023-06-21 16:37:56 +08:00
parent 6a589543f9
commit daa48302df
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/core/client/src/acl/Configuration/MenuItemsProvider.tsx
View File

@ -1,7 +1,7 @@
import { Spin } from 'antd';
import React, { createContext, useContext } from 'react';
import { useRequest, useAPIClient } from '../../api-client';
import { useRoute } from '../../route-switch';
import { useRequest } from '../../api-client';
import { useSystemSettings } from '../../system-settings';
const MenuItemsContext = createContext(null);
@ -27,10 +27,15 @@ export const useMenuItems = () => {
return useContext(MenuItemsContext);
};
const useAdminSchemaUid = () => {
const ctx = useSystemSettings();
return ctx?.data?.data?.options?.adminSchemaUid;
};
export const MenuItemsProvider = (props) => {
const route = useRoute();
const adminSchemaUid = useAdminSchemaUid();
const options = {
url: `uiSchemas:getProperties/${route.uiSchemaUid}`,
url: `uiSchemas:getProperties/${adminSchemaUid}`,
};
const service = useRequest(options);
if (service.loading) {

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

@ -16,7 +16,6 @@ import {
useACLRoleContext,
useDocumentTitle,
useRequest,
useRoute,
useSystemSettings,
} from '../../../';
import { useCollectionManager } from '../../../collection-manager';
@ -67,7 +66,6 @@ const MenuEditor = (props) => {
const defaultSelectedUid = params.name;
const { sideMenuRef } = props;
const ctx = useACLRoleContext();
const route = useRoute();
const [current, setCurrent] = useState(null);
const onSelect = ({ item }) => {
const schema = item.props.schema;

2
packages/plugins/mobile-client/src/client/router/Application.tsx
View File

@ -3,7 +3,6 @@ import {
ActionContextProvider,
AdminProvider,
RemoteSchemaComponent,
useRoute,
useSystemSettings,
useViewport,
} from '@nocobase/client';
@ -79,7 +78,6 @@ const useMobileSchemaUid = () => {
};
const MApplication: React.FC = (props) => {
const route = useRoute();
const mobileSchemaUid = useMobileSchemaUid();
console.log('mobileSchemaUid', mobileSchemaUid);
const params = useParams<{ name: string }>();