diff --git a/packages/core/client/src/acl/ACLShortcut.tsx b/packages/core/client/src/acl/ACLShortcut.tsx
index afd31b5c5..3be892b94 100644
--- a/packages/core/client/src/acl/ACLShortcut.tsx
+++ b/packages/core/client/src/acl/ACLShortcut.tsx
@@ -1,31 +1,10 @@
-import { LockOutlined } from '@ant-design/icons';
import { ISchema } from '@formily/react';
import { uid } from '@formily/shared';
import { Card } from 'antd';
-import React, { useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { useHistory } from 'react-router-dom';
-import { PluginManager } from '../plugin-manager';
-import { ActionContextProvider, SchemaComponent } from '../schema-component';
+import React from 'react';
+import { SchemaComponent } from '../schema-component';
import * as components from './Configuration';
-const schema: ISchema = {
- type: 'object',
- properties: {
- [uid()]: {
- 'x-component': 'Action.Drawer',
- type: 'void',
- title: '{{t("Roles & Permissions")}}',
- properties: {
- hello1: {
- type: 'void',
- 'x-component': 'RoleTable',
- },
- },
- },
- },
-};
-
const schema2: ISchema = {
type: 'object',
properties: {
@@ -42,34 +21,3 @@ export const ACLPane = () => {
);
};
-
-export const ACLShortcut = () => {
- const { t } = useTranslation();
- const history = useHistory();
- return (
- }
- title={t('Roles & Permissions')}
- onClick={() => {
- history.push('/admin/settings/acl/roles');
- }}
- />
- );
-};
-
-export const ACLShortcut2 = () => {
- const [visible, setVisible] = useState(false);
- const { t } = useTranslation();
- return (
-
- }
- title={t('Roles & Permissions')}
- onClick={() => {
- setVisible(true);
- }}
- />
-
-
- );
-};
diff --git a/packages/core/client/src/application/demos/demo2/index.tsx b/packages/core/client/src/application/demos/demo2/index.tsx
index 91688b295..589316e36 100644
--- a/packages/core/client/src/application/demos/demo2/index.tsx
+++ b/packages/core/client/src/application/demos/demo2/index.tsx
@@ -1,17 +1,14 @@
import {
- ACLShortcut,
AdminLayout,
AntdConfigProvider,
AntdSchemaComponentProvider,
APIClientProvider,
AuthLayout,
CollectionManagerProvider,
- CollectionManagerShortcut,
compose,
DesignableSwitch,
DocumentTitleProvider,
i18n,
- PluginManagerProvider,
RouteSchemaComponent,
RouteSwitch,
RouteSwitchProvider,
@@ -20,7 +17,6 @@ import {
SigninPage,
SignupPage,
SystemSettingsProvider,
- SystemSettingsShortcut,
useRequest,
} from '@nocobase/client';
import { Spin } from 'antd';
@@ -36,10 +32,7 @@ const providers = [
[I18nextProvider, { i18n }],
[AntdConfigProvider, { remoteLocale: true }],
SystemSettingsProvider,
- [
- PluginManagerProvider,
- { components: { ACLShortcut, DesignableSwitch, CollectionManagerShortcut, SystemSettingsShortcut } },
- ],
+ [{ components: { DesignableSwitch } }],
[SchemaComponentProvider, { components: { Link, NavLink } }],
CollectionManagerProvider,
AntdSchemaComponentProvider,
diff --git a/packages/core/client/src/collection-manager/CollectionManagerShortcut.tsx b/packages/core/client/src/collection-manager/CollectionManagerShortcut.tsx
index b7aafd3b6..325c51130 100644
--- a/packages/core/client/src/collection-manager/CollectionManagerShortcut.tsx
+++ b/packages/core/client/src/collection-manager/CollectionManagerShortcut.tsx
@@ -1,33 +1,28 @@
-import { DatabaseOutlined } from '@ant-design/icons';
import { ISchema } from '@formily/react';
import { uid } from '@formily/shared';
-import { Card } from 'antd';
-import React, { useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { useHistory } from 'react-router-dom';
-import { PluginManager } from '../plugin-manager';
-import { ActionContextProvider, SchemaComponent } from '../schema-component';
+import React from 'react';
+import { SchemaComponent } from '../schema-component';
import {
+ AddCategory,
+ AddCategoryAction,
+ AddCollection,
+ AddCollectionAction,
AddCollectionField,
AddFieldAction,
ConfigurationTable,
- EditFieldAction,
- EditCollectionField,
- OverridingFieldAction,
- OverridingCollectionField,
- ViewCollectionField,
- ViewFieldAction,
- AddCollection,
- AddCollectionAction,
- AddCategoryAction,
- AddCategory,
- EditCollection,
- EditCollectionAction,
ConfigurationTabs,
EditCategory,
EditCategoryAction,
+ EditCollection,
+ EditCollectionAction,
+ EditCollectionField,
+ EditFieldAction,
+ OverridingCollectionField,
+ OverridingFieldAction,
SyncFieldsAction,
SyncFieldsActionCom,
+ ViewCollectionField,
+ ViewFieldAction,
} from './Configuration';
import { CollectionCategroriesProvider } from './CollectionManagerProvider';
@@ -90,48 +85,3 @@ export const CollectionManagerPane = () => {
//
);
};
-
-export const CollectionManagerShortcut = () => {
- const { t } = useTranslation();
- const history = useHistory();
- return (
- }
- title={t('Collections & Fields')}
- onClick={() => {
- history.push('/admin/settings/collection-manager/collections');
- }}
- />
- );
-};
-
-export const CollectionManagerShortcut2 = () => {
- const [visible, setVisible] = useState(false);
- const { t } = useTranslation();
- return (
-
- }
- title={t('Collections & Fields')}
- onClick={() => {
- setVisible(true);
- }}
- />
-
-
- );
-};
diff --git a/packages/core/client/src/plugin-manager/PluginManager.tsx b/packages/core/client/src/plugin-manager/PluginManager.tsx
deleted file mode 100644
index 262e26191..000000000
--- a/packages/core/client/src/plugin-manager/PluginManager.tsx
+++ /dev/null
@@ -1,157 +0,0 @@
-import { SettingOutlined } from '@ant-design/icons';
-import { css } from '@emotion/css';
-import { ConfigProvider, Menu, MenuItemProps, Tooltip } from 'antd';
-import cls from 'classnames';
-import { get } from 'lodash';
-import React, { createContext, useContext } from 'react';
-import { useTranslation } from 'react-i18next';
-import { useHistory } from 'react-router-dom';
-import { useACLRoleContext } from '../acl/ACLProvider';
-import { PluginManagerContext } from './context';
-
-export const usePrefixCls = (
- tag?: string,
- props?: {
- prefixCls?: string;
- },
-) => {
- const { getPrefixCls } = useContext(ConfigProvider.ConfigContext);
- return getPrefixCls(tag, props?.prefixCls);
-};
-
-type PluginManagerType = {
- Toolbar?: React.FC & {
- Item?: React.FC;
- };
-};
-
-export const PluginManager: PluginManagerType = () => null;
-
-const ToolbarItemContext = createContext(null);
-
-interface ToolbarProps {
- items?: ToolbarItemProps[];
-}
-
-interface ToolbarItemProps {
- component: string;
- pin?: boolean;
-}
-
-const splitItems = (items: ToolbarItemProps[]) => {
- const pinned = [];
- const unpinned = [];
- for (const item of items) {
- if (item.pin) {
- pinned.push(item);
- } else {
- unpinned.push(item);
- }
- }
- return [pinned, unpinned];
-};
-
-PluginManager.Toolbar = (props: ToolbarProps) => {
- const { components } = useContext(PluginManagerContext);
- const { items = [] } = props;
- const [pinned, unpinned] = splitItems(items);
- const { t } = useTranslation();
- const history = useHistory();
- return (
-
-
-
- {subtitle}
-
- );
-
- const titleComponent = (
-
-
{title}
- {subtitleComponent}
-