@nocobase/client 0.9.4-alpha.2 → 0.10.0-alpha.3

package/lib/route-switch/RouteSwitch.js

@@ -1,63 +1,96 @@
 "use strict";
 
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.RouteSwitch = RouteSwitch;
-var _react = _interopRequireDefault(require("react"));
+var _react = _interopRequireWildcard(require("react"));
 var _reactRouterDom = require("react-router-dom");
 var _context = require("./context");
 var _hooks = require("./hooks");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function RouteSwitch(props) {
   var _props$routes = props.routes,
-    routes = _props$routes === void 0 ? [] : _props$routes;
-  if (!routes.length) {
-    return null;
-  }
-  return /*#__PURE__*/_react.default.createElement(_reactRouterDom.Switch, null, routes.map(function (route, index) {
-    if (route.type == 'redirect') {
-      return /*#__PURE__*/_react.default.createElement(_reactRouterDom.Redirect, {
-        key: index,
-        to: route.to,
-        push: route.push,
-        from: route.from,
-        path: route.path,
-        exact: route.exact,
-        strict: route.strict
-      });
+    remoteRoutes = _props$routes === void 0 ? [] : _props$routes,
+    base = props.base;
+  /**
+   * 将 path 中的可选参数转换为多个路径
+   *
+   * @example
+   * generatePaths('/a/b/:c?/:d?')
+   * => ['/a/b', '/a/b/:c', '/a/b/:c/:d']
+   */
+  var generatePaths = (0, _react.useCallback)(function () {
+    var path = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+    if (path === '/') return [path];
+    var segments = path.split('/'); // 将路径按照 '/' 分段
+    if (segments[segments.length - 1] === '') {
+      segments.pop(); // 最后一个字符是 '/'，将其弹出
+    }
+
+    var lastOptionsIndex = undefined;
+    for (var i = segments.length - 1; i >= 0; i--) {
+      if (!segments[i].endsWith('?')) {
+        lastOptionsIndex = i; // 找到最后一个可选参数的位置
+        break;
+      }
     }
-    if (!route.path && Array.isArray(route.routes)) {
-      route.path = route.routes.map(function (r) {
-        return r.path;
-      });
+    if (lastOptionsIndex === undefined) return [path]; // 没有可选参数，直接返回原路径
+    var res = [];
+    for (var _i = lastOptionsIndex; _i < segments.length; _i++) {
+      res.push(segments.slice(0, _i + 1).join('/').replace(/\?/g, '').replace(/\(\.\+\)/g, ''));
     }
-    return /*#__PURE__*/_react.default.createElement(_reactRouterDom.Route, {
-      key: index,
-      path: route.path,
-      exact: route.exact,
-      strict: route.strict,
-      sensitive: route.sensitive,
-      render: function render(props) {
-        return /*#__PURE__*/_react.default.createElement(_context.RouteContext.Provider, {
-          value: route
-        }, /*#__PURE__*/_react.default.createElement(ComponentRenderer, _objectSpread(_objectSpread({}, props), {}, {
-          route: route
-        })));
+    return res;
+  }, []);
+  var getPathWithBase = (0, _react.useCallback)(function (path, base) {
+    if (!base || path === undefined || path.startsWith('/')) return path;
+    if (path === '') return base;
+    return "".concat(base.endsWith('/') ? base : base + '/').concat(path.startsWith('/') ? path.slice(1) : path);
+  }, []);
+  var getRoutes = (0, _react.useCallback)(function (routes, base) {
+    var res = routes.map(function (item) {
+      if (item.type === 'route' && item.routes) {
+        // layout
+        return {
+          element: /*#__PURE__*/_react.default.createElement(_context.RouteContext.Provider, {
+            value: item
+          }, /*#__PURE__*/_react.default.createElement(ComponentRenderer, {
+            component: item.component
+          })),
+          children: getRoutes(item.routes, getPathWithBase(item.path, base)).flat(Infinity)
+        };
+      } else if (item.type === 'route') {
+        // common route
+        return generatePaths(getPathWithBase(item.path, base)).map(function (path) {
+          return {
+            path: getPathWithBase(path, base),
+            caseSensitive: item.sensitive,
+            element: /*#__PURE__*/_react.default.createElement(_context.RouteContext.Provider, {
+              value: item
+            }, /*#__PURE__*/_react.default.createElement(ComponentRenderer, {
+              component: item.component
+            }))
+          };
+        });
+      } else if (item.type === 'redirect') {
+        // redirect route
+        return {
+          path: getPathWithBase(item.from, base),
+          element: /*#__PURE__*/_react.default.createElement(_reactRouterDom.Navigate, {
+            replace: !item.push,
+            to: getPathWithBase(item.to, base)
+          })
+        };
       }
     });
-  }));
+    return res.flat(Infinity);
+  }, [generatePaths, getPathWithBase]);
+  var routers = (0, _reactRouterDom.useRoutes)(getRoutes(remoteRoutes, base));
+  return routers;
 }
 function ComponentRenderer(props) {
-  var _props$route;
-  var Component = (0, _hooks.useRouteComponent)(props === null || props === void 0 ? void 0 : (_props$route = props.route) === null || _props$route === void 0 ? void 0 : _props$route.component);
-  return /*#__PURE__*/_react.default.createElement(Component, _objectSpread({}, props), /*#__PURE__*/_react.default.createElement(RouteSwitch, {
-    routes: props.route.routes
-  }));
+  var Component = (0, _hooks.useRouteComponent)(props === null || props === void 0 ? void 0 : props.component);
+  return /*#__PURE__*/_react.default.createElement(Component, null);
 }

package/lib/route-switch/RouteSwitchProvider.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from 'react';
 import { RouteSwitchProviderProps } from './types';
-export declare function RouteSwitchProvider(props: RouteSwitchProviderProps): JSX.Element;
-export declare function RemoteRouteSwitchProvider(props: RouteSwitchProviderProps): JSX.Element;
+export declare function RouteSwitchProvider(props: RouteSwitchProviderProps): React.JSX.Element;
+export declare function RemoteRouteSwitchProvider(props: RouteSwitchProviderProps): React.JSX.Element;

package/lib/route-switch/antd/admin-layout/index.d.ts

@@ -1,3 +1,5 @@
-export declare const InternalAdminLayout: (props: any) => JSX.Element;
-export declare const AdminLayout: (props: any) => JSX.Element;
+import React from 'react';
+export declare const InternalAdminLayout: (props: any) => React.JSX.Element;
+export declare const AdminProvider: (props: any) => React.JSX.Element;
+export declare const AdminLayout: (props: any) => React.JSX.Element;
 export default AdminLayout;

package/lib/route-switch/antd/admin-layout/index.js

@@ -4,15 +4,14 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.InternalAdminLayout = exports.AdminLayout = void 0;
+exports.default = exports.InternalAdminLayout = exports.AdminProvider = exports.AdminLayout = void 0;
 var _css = require("@emotion/css");
-var _ahooks = require("ahooks");
 var _antd = require("antd");
 var _react = _interopRequireWildcard(require("react"));
 var _reactRouterDom = require("react-router-dom");
 var _ = require("../../../");
 var _collectionManager = require("../../../collection-manager");
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10, _templateObject11;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9, _templateObject10;
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -64,53 +63,73 @@ var useMenuProps = function useMenuProps() {
 var MenuEditor = function MenuEditor(props) {
   var _useDocumentTitle = (0, _.useDocumentTitle)(),
     setTitle = _useDocumentTitle.setTitle;
-  var history = (0, _reactRouterDom.useHistory)();
-  var match = (0, _reactRouterDom.useRouteMatch)();
-  var defaultSelectedUid = match.params.name;
+  var navigate = (0, _reactRouterDom.useNavigate)();
+  var params = (0, _reactRouterDom.useParams)();
+  var defaultSelectedUid = params.name;
   var sideMenuRef = props.sideMenuRef;
   var ctx = (0, _.useACLRoleContext)();
-  var route = (0, _.useRoute)();
+  var _useState = (0, _react.useState)(null),
+    _useState2 = _slicedToArray(_useState, 2),
+    current = _useState2[0],
+    setCurrent = _useState2[1];
   var onSelect = function onSelect(_ref) {
     var item = _ref.item;
     var schema = item.props.schema;
     setTitle(schema.title);
-    history.push("/admin/".concat(schema['x-uid']));
+    setCurrent(schema);
+    navigate("/admin/".concat(schema['x-uid']));
   };
+  var adminSchemaUid = (0, _.useAdminSchemaUid)();
   var _useRequest = (0, _.useRequest)({
-      url: "/uiSchemas:getJsonSchema/".concat(route.uiSchemaUid)
+      url: "/uiSchemas:getJsonSchema/".concat(adminSchemaUid)
     }, {
-      refreshDeps: [route.uiSchemaUid],
+      refreshDeps: [adminSchemaUid],
       onSuccess: function onSuccess(data) {
         var schema = filterByACL(data === null || data === void 0 ? void 0 : data.data, ctx);
-        if (defaultSelectedUid) {
-          if (defaultSelectedUid.includes('/')) {
-            return;
-          }
-          var s = (0, _.findByUid)(schema, defaultSelectedUid);
-          if (s) {
-            setTitle(s.title);
-          } else {
-            var _s = (0, _.findMenuItem)(schema);
-            if (_s) {
-              history.push("/admin/".concat(_s['x-uid']));
-              setTitle(_s.title);
-            } else {
-              history.push("/admin/");
-            }
-          }
-        } else {
+        // url 为 `/admin` 的情况
+        if (params['*'] === 'admin') {
           var _s2 = (0, _.findMenuItem)(schema);
           if (_s2) {
-            history.push("/admin/".concat(_s2['x-uid']));
+            navigate("/admin/".concat(_s2['x-uid']));
             setTitle(_s2.title);
           } else {
-            history.push("/admin/");
+            navigate("/admin/");
+          }
+        }
+        // url 不为 `/admin/xxx` 的情况，不做处理
+        var paramsArr = params['*'].split('/');
+        if (paramsArr[0] !== 'admin' || paramsArr[1] !== defaultSelectedUid || paramsArr.length > 2) return;
+        // url 为 `admin/xxx` 的情况
+        var s = (0, _.findByUid)(schema, defaultSelectedUid);
+        if (s) {
+          setTitle(s.title);
+        } else {
+          var _s3 = (0, _.findMenuItem)(schema);
+          if (_s3) {
+            navigate("/admin/".concat(_s3['x-uid']));
+            setTitle(_s3.title);
+          } else {
+            navigate("/admin/");
           }
         }
       }
     }),
     data = _useRequest.data,
     loading = _useRequest.loading;
+  (0, _react.useEffect)(function () {
+    var _Object$values$shift, _current$root, _data$data;
+    var properties = ((_Object$values$shift = Object.values((current === null || current === void 0 ? void 0 : (_current$root = current.root) === null || _current$root === void 0 ? void 0 : _current$root.properties) || {}).shift()) === null || _Object$values$shift === void 0 ? void 0 : _Object$values$shift['properties']) || (data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : _data$data.properties);
+    if (properties && sideMenuRef.current) {
+      var pageType = Object.values(properties).find(function (item) {
+        return item['x-uid'] === params.name && item['x-component'] === 'Menu.Item';
+      });
+      if (pageType) {
+        sideMenuRef.current.style.display = 'none';
+      } else {
+        sideMenuRef.current.style.display = 'block';
+      }
+    }
+  }, [data === null || data === void 0 ? void 0 : data.data, params.name, sideMenuRef]);
   var schema = (0, _react.useMemo)(function () {
     var s = filterByACL(data === null || data === void 0 ? void 0 : data.data, ctx);
     if (s === null || s === void 0 ? void 0 : s['x-component-props']) {
@@ -137,20 +156,10 @@ var MenuEditor = function MenuEditor(props) {
 var InternalAdminLayout = function InternalAdminLayout(props) {
   var _result$data, _result$data$data, _result$data$data$log;
   var sideMenuRef = (0, _react.useRef)();
-  var _useState = (0, _react.useState)(0),
-    _useState2 = _slicedToArray(_useState, 2),
-    sideMenuWidth = _useState2[0],
-    setSideMenuWidth = _useState2[1];
-  (0, _ahooks.useMutationObserver)(function (value) {
-    var width = value[0].target.offsetWidth;
-    setSideMenuWidth(width);
-  }, sideMenuRef, {
-    childList: true,
-    attributes: true
-  });
   var result = (0, _.useSystemSettings)();
   var _useCollectionManager = (0, _collectionManager.useCollectionManager)(),
     service = _useCollectionManager.service;
+  var params = (0, _reactRouterDom.useParams)();
   return /*#__PURE__*/_react.default.createElement(_antd.Layout, null, /*#__PURE__*/_react.default.createElement(_antd.Layout.Header, {
     className: (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n          .ant-menu.ant-menu-dark .ant-menu-item-selected,\n          .ant-menu-submenu-popup.ant-menu-dark .ant-menu-item-selected {\n            background-color: rgba(255, 255, 255, 0.1);\n          }\n          .ant-menu-dark.ant-menu-horizontal > .ant-menu-item:hover {\n            background-color: rgba(255, 255, 255, 0.1);\n          }\n\n          position: fixed;\n          width: 100%;\n          height: 46px;\n          line-height: 46px;\n          padding: 0;\n          z-index: 100;\n        "])))
   }, /*#__PURE__*/_react.default.createElement("div", {
@@ -168,27 +177,23 @@ var InternalAdminLayout = function InternalAdminLayout(props) {
     sideMenuRef: sideMenuRef
   }))), /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _css.css)(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n              position: relative;\n              flex-shrink: 0;\n              height: 100%;\n              z-index: 10;\n            "])))
-  }, /*#__PURE__*/_react.default.createElement(_.PinnedPluginList, null), /*#__PURE__*/_react.default.createElement(_.CurrentUser, null)))), /*#__PURE__*/_react.default.createElement("div", {
-    style: {
-      '--side-menu-width': "".concat(sideMenuWidth, "px")
-    },
-    className: (0, _css.css)(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["\n          width: var(--side-menu-width);\n          overflow: hidden;\n          flex: 0 0 var(--side-menu-width);\n          max-width: var(--side-menu-width);\n          min-width: var(--side-menu-width);\n          pointer-events: none;\n          /* transition: background-color 0.3s ease 0s, min-width 0.3s ease 0s,\n            max-width 0.3s cubic-bezier(0.645, 0.045, 0.355, 1) 0s; */\n        "])))
-  }), /*#__PURE__*/_react.default.createElement(_antd.Layout.Sider, {
-    className: (0, _css.css)(_templateObject9 || (_templateObject9 = _taggedTemplateLiteral(["\n          height: 100%;\n          position: fixed;\n          padding-top: 46px;\n          left: 0;\n          top: 0;\n          background: rgba(0, 0, 0, 0);\n          z-index: 100;\n        "]))),
-    style: {
-      display: 'none'
-    },
+  }, /*#__PURE__*/_react.default.createElement(_.PinnedPluginList, null), /*#__PURE__*/_react.default.createElement(_.CurrentUser, null)))), params.name && /*#__PURE__*/_react.default.createElement(_antd.Layout.Sider, {
+    className: (0, _css.css)(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["\n            height: 100%;\n            /* position: fixed; */\n            position: relative;\n            left: 0;\n            top: 0;\n            background: rgba(0, 0, 0, 0);\n            z-index: 100;\n            .ant-layout-sider-children {\n              top: 46px;\n              position: fixed;\n              width: 200px;\n              height: calc(100vh - 46px);\n            }\n          "]))),
     theme: 'light',
     ref: sideMenuRef
   }), /*#__PURE__*/_react.default.createElement(_antd.Layout.Content, {
-    className: (0, _css.css)(_templateObject10 || (_templateObject10 = _taggedTemplateLiteral(["\n          display: flex;\n          flex-direction: column;\n          position: relative;\n          overflow-y: auto;\n          height: 100vh;\n          max-height: 100vh;\n          > div {\n            position: relative;\n            // z-index: 1;\n          }\n          .ant-layout-footer {\n            position: absolute;\n            bottom: 0;\n            text-align: center;\n            width: 100%;\n            z-index: 0;\n            padding: 0px 50px;\n          }\n        "])))
+    className: (0, _css.css)(_templateObject9 || (_templateObject9 = _taggedTemplateLiteral(["\n          display: flex;\n          flex-direction: column;\n          position: relative;\n          overflow-y: auto;\n          height: 100vh;\n          max-height: 100vh;\n          > div {\n            position: relative;\n            // z-index: 1;\n          }\n          .ant-layout-footer {\n            position: absolute;\n            bottom: 0;\n            text-align: center;\n            width: 100%;\n            z-index: 0;\n            padding: 0px 50px;\n          }\n        "])))
   }, /*#__PURE__*/_react.default.createElement("header", {
-    className: (0, _css.css)(_templateObject11 || (_templateObject11 = _taggedTemplateLiteral(["\n            flex-shrink: 0;\n            height: 46px;\n            line-height: 46px;\n            background: transparent;\n            pointer-events: none;\n          "])))
-  }), service.contentLoading ? /*#__PURE__*/_react.default.createElement(_antd.Spin, null) : props.children));
+    className: (0, _css.css)(_templateObject10 || (_templateObject10 = _taggedTemplateLiteral(["\n            flex-shrink: 0;\n            height: 46px;\n            line-height: 46px;\n            background: transparent;\n            pointer-events: none;\n          "])))
+  }), service.contentLoading ? /*#__PURE__*/_react.default.createElement(_antd.Spin, null) : /*#__PURE__*/_react.default.createElement(_reactRouterDom.Outlet, null)));
 };
 exports.InternalAdminLayout = InternalAdminLayout;
+var AdminProvider = function AdminProvider(props) {
+  return /*#__PURE__*/_react.default.createElement(_.CurrentAppInfoProvider, null, /*#__PURE__*/_react.default.createElement(_.CurrentUserProvider, null, /*#__PURE__*/_react.default.createElement(_.RemoteSchemaTemplateManagerProvider, null, /*#__PURE__*/_react.default.createElement(_.RemoteCollectionManagerProvider, null, /*#__PURE__*/_react.default.createElement(_.ACLRolesCheckProvider, null, props.children)))));
+};
+exports.AdminProvider = AdminProvider;
 var AdminLayout = function AdminLayout(props) {
-  return /*#__PURE__*/_react.default.createElement(_.CurrentAppInfoProvider, null, /*#__PURE__*/_react.default.createElement(_.CurrentUserProvider, null, /*#__PURE__*/_react.default.createElement(_.RemoteSchemaTemplateManagerProvider, null, /*#__PURE__*/_react.default.createElement(_.RemoteCollectionManagerProvider, null, /*#__PURE__*/_react.default.createElement(_.ACLRolesCheckProvider, null, /*#__PURE__*/_react.default.createElement(InternalAdminLayout, _objectSpread({}, props)))))));
+  return /*#__PURE__*/_react.default.createElement(AdminProvider, null, /*#__PURE__*/_react.default.createElement(InternalAdminLayout, _objectSpread({}, props)));
 };
 exports.AdminLayout = AdminLayout;
 var _default = AdminLayout;

package/lib/route-switch/antd/auth-layout/index.d.ts

@@ -1,2 +1,2 @@
-/// <reference types="react" />
-export declare function AuthLayout(props: any): JSX.Element;
+import React from 'react';
+export declare function AuthLayout(props: any): React.JSX.Element;

package/lib/route-switch/antd/auth-layout/index.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.AuthLayout = AuthLayout;
 var _css = require("@emotion/css");
 var _react = _interopRequireDefault(require("react"));
+var _reactRouterDom = require("react-router-dom");
 var _poweredBy = require("../../../powered-by");
 var _systemSettings = require("../../../system-settings");
 var _templateObject;
@@ -21,7 +22,7 @@ function AuthLayout(props) {
       margin: '0 auto',
       paddingTop: '20vh'
     }
-  }, /*#__PURE__*/_react.default.createElement("h1", null, data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : _data$data.title), props.children, /*#__PURE__*/_react.default.createElement("div", {
+  }, /*#__PURE__*/_react.default.createElement("h1", null, data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : _data$data.title), /*#__PURE__*/_react.default.createElement(_reactRouterDom.Outlet, null), /*#__PURE__*/_react.default.createElement("div", {
     className: (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n          position: absolute;\n          bottom: 24px;\n          width: 100%;\n          left: 0;\n          text-align: center;\n        "])))
   }, /*#__PURE__*/_react.default.createElement(_poweredBy.PoweredBy, null)));
 }

package/lib/route-switch/antd/route-schema-component/index.d.ts

@@ -1,2 +1,2 @@
-/// <reference types="react" />
-export declare function RouteSchemaComponent(props: any): JSX.Element;
+import React from 'react';
+export declare function RouteSchemaComponent(props: any): React.JSX.Element;

package/lib/route-switch/antd/route-schema-component/index.js

@@ -9,9 +9,9 @@ var _reactRouterDom = require("react-router-dom");
 var _ = require("../../../");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function RouteSchemaComponent(props) {
-  var match = (0, _reactRouterDom.useRouteMatch)();
+  var params = (0, _reactRouterDom.useParams)();
   return /*#__PURE__*/_react.default.createElement(_.RemoteSchemaComponent, {
     onlyRenderProperties: true,
-    uid: match.params.name
+    uid: params.name
   });
 }

package/lib/route-switch/context.d.ts

@@ -5,3 +5,7 @@ export declare const RouteSwitchContext: import("react").Context<{
     routes: any[];
 }>;
 export declare const RouteContext: import("react").Context<RouteProps>;
+export declare const useRouteSwitchContext: () => {
+    components: {};
+    routes: any[];
+};

package/lib/route-switch/context.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.RouteSwitchContext = exports.RouteContext = void 0;
+exports.useRouteSwitchContext = exports.RouteSwitchContext = exports.RouteContext = void 0;
 var _react = require("react");
 var RouteSwitchContext = /*#__PURE__*/(0, _react.createContext)({
   components: {},
@@ -11,4 +11,8 @@ var RouteSwitchContext = /*#__PURE__*/(0, _react.createContext)({
 });
 exports.RouteSwitchContext = RouteSwitchContext;
 var RouteContext = /*#__PURE__*/(0, _react.createContext)(null);
-exports.RouteContext = RouteContext;
+exports.RouteContext = RouteContext;
+var useRouteSwitchContext = function useRouteSwitchContext() {
+  return (0, _react.useContext)(RouteSwitchContext);
+};
+exports.useRouteSwitchContext = useRouteSwitchContext;

package/lib/route-switch/types.d.ts

@@ -2,17 +2,13 @@ export interface RedirectProps {
     type: 'redirect';
     to: any;
     path?: string;
-    exact?: boolean;
-    strict?: boolean;
     push?: boolean;
     from?: string;
     [key: string]: any;
 }
 export interface RouteProps {
     type: 'route';
-    path?: string | string[];
-    exact?: boolean;
-    strict?: boolean;
+    path?: string;
     sensitive?: boolean;
     component?: any;
     routes?: RouteProps[];
@@ -27,4 +23,5 @@ export declare type RouteRedirectProps = RedirectProps | RouteProps;
 export interface RouteSwitchProps {
     routes?: RouteRedirectProps[];
     components?: any;
+    base?: string;
 }

package/lib/schema-component/antd/AntdSchemaComponentProvider.d.ts

@@ -1 +1,2 @@
-export declare const AntdSchemaComponentProvider: (props: any) => JSX.Element;
+import React from 'react';
+export declare const AntdSchemaComponentProvider: (props: any) => React.JSX.Element;

package/lib/schema-component/antd/action/Action.Container.js

@@ -33,6 +33,8 @@ var ActionContainer = (0, _react.observer)(function (props) {
   return /*#__PURE__*/_react2.default.createElement(_Action3.ActionPage, _objectSpread({
     footerNodeName: 'Action.Container.Footer'
   }, props));
+}, {
+  displayName: 'ActionContainer'
 });
 exports.ActionContainer = ActionContainer;
 ActionContainer.Footer = (0, _react.observer)(function () {
@@ -43,6 +45,8 @@ ActionContainer.Footer = (0, _react.observer)(function () {
     schema: schema,
     onlyRenderProperties: true
   });
+}, {
+  displayName: 'ActionContainer.Footer'
 });
 var _default = ActionContainer;
 exports.default = _default;

package/lib/schema-component/antd/action/Action.Designer.d.ts

@@ -1 +1,2 @@
-export declare const ActionDesigner: (props: any) => JSX.Element;
+import React from 'react';
+export declare const ActionDesigner: (props: any) => React.JSX.Element;