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

package/lib/pm/Card.js

@@ -5,19 +5,19 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.PluginCard = exports.BuiltInPluginCard = void 0;
-var _react = _interopRequireWildcard(require("react"));
-var _apiClient = require("../api-client");
-var _antd = require("antd");
+var _icons = require("@ant-design/icons");
 var _css = require("@emotion/css");
+var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
-var _reactRouterDom = require("react-router-dom");
+var _react = _interopRequireWildcard(require("react"));
 var _reactI18next = require("react-i18next");
-var _icons = require("@ant-design/icons");
+var _reactRouterDom = require("react-router-dom");
+var _apiClient = require("../api-client");
 var _util = require("../schema-component/antd/markdown/util");
 var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6;
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }

package/lib/pm/PluginManagerLink.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.SettingsCenterDropdown = exports.PluginManagerLink = void 0;
 var _icons = require("@ant-design/icons");
 var _antd = require("antd");
+var _lodash = _interopRequireDefault(require("lodash"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactI18next = require("react-i18next");
 var _reactRouterDom = require("react-router-dom");
@@ -14,6 +15,7 @@ var _schemaComponent = require("../schema-component");
 var _index = require("./index");
 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 _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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -45,7 +47,7 @@ var PluginManagerLink = function PluginManagerLink() {
   }));
 };
 exports.PluginManagerLink = PluginManagerLink;
-var getBookmarkTabs = function getBookmarkTabs(data) {
+var getBookmarkTabs = _lodash.default.memoize(function (data) {
   var bookmarkTabs = [];
   data.forEach(function (plugin) {
     var tabs = plugin.tabs;
@@ -56,7 +58,7 @@ var getBookmarkTabs = function getBookmarkTabs(data) {
     });
   });
   return bookmarkTabs;
-};
+});
 var SettingsCenterDropdown = function SettingsCenterDropdown() {
   var _useACLRoleContext = (0, _ACLProvider.useACLRoleContext)(),
     _useACLRoleContext$sn = _useACLRoleContext.snippets,
@@ -72,14 +74,8 @@ var SettingsCenterDropdown = function SettingsCenterDropdown() {
   var itemData = (0, _react.useContext)(_index.SettingsCenterContext);
   var pluginsTabs = (0, _index.getPluginsTabs)(itemData, snippets);
   var bookmarkTabs = getBookmarkTabs(pluginsTabs);
-  return /*#__PURE__*/_react.default.createElement(_schemaComponent.ActionContextProvider, {
-    value: {
-      visible: visible,
-      setVisible: setVisible
-    }
-  }, /*#__PURE__*/_react.default.createElement(_antd.Dropdown, {
-    placement: "bottom",
-    menu: {
+  var menu = (0, _react.useMemo)(function () {
+    return {
       items: [].concat(_toConsumableArray(bookmarkTabs.map(function (tab) {
         return {
           key: "/admin/settings/".concat(tab.path),
@@ -95,7 +91,16 @@ var SettingsCenterDropdown = function SettingsCenterDropdown() {
         var key = _ref.key;
         navigate(key);
       }
+    };
+  }, [bookmarkTabs]);
+  return /*#__PURE__*/_react.default.createElement(_schemaComponent.ActionContextProvider, {
+    value: {
+      visible: visible,
+      setVisible: setVisible
     }
+  }, /*#__PURE__*/_react.default.createElement(_antd.Dropdown, {
+    placement: "bottom",
+    menu: menu
   }, /*#__PURE__*/_react.default.createElement(_antd.Button, {
     icon: /*#__PURE__*/_react.default.createElement(_icons.SettingOutlined, null)
   })));

package/lib/pm/index.d.ts

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import React from 'react';
 export interface TData {
     data: IPluginData[];
@@ -29,7 +30,7 @@ export interface AllowedActions {
     destroy: number[];
 }
 export declare const SettingsCenterContext: React.Context<any>;
-export declare const getPluginsTabs: (items: any, snippets: any) => any[];
+export declare const getPluginsTabs: ((items: any, snippets: any) => any[]) & _.MemoizedFunction;
 export declare const SettingsCenterProvider: (props: any) => React.JSX.Element;
 export declare const PMProvider: (props: any) => React.JSX.Element;
 export default PMProvider;

package/lib/pm/index.js

@@ -10,9 +10,10 @@ var _exportNames = {
   PMProvider: true
 };
 exports.getPluginsTabs = exports.default = exports.SettingsCenterProvider = exports.SettingsCenterContext = exports.PMProvider = void 0;
+var _proLayout = require("@ant-design/pro-layout");
 var _css = require("@emotion/css");
 var _antd = require("antd");
-var _lodash = require("lodash");
+var _lodash = _interopRequireWildcard(require("lodash"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactI18next = require("react-i18next");
 var _reactRouterDom = require("react-router-dom");
@@ -135,24 +136,29 @@ var PluginList = function PluginList(props) {
       });
     }
   }, []);
-  return snippets.includes('pm') ? /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_antd.PageHeader, {
+  return snippets.includes('pm') ? /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement(_proLayout.PageHeader, {
+    style: {
+      backgroundColor: 'white',
+      paddingBottom: 0
+    },
     ghost: false,
     title: t('Plugin manager'),
     footer: /*#__PURE__*/_react.default.createElement(_antd.Tabs, {
       activeKey: tabName,
       onChange: function onChange(activeKey) {
         navigate("/admin/pm/list/".concat(activeKey));
-      }
-    }, /*#__PURE__*/_react.default.createElement(_antd.Tabs.TabPane, {
-      tab: t('Local'),
-      key: 'local'
-    }), /*#__PURE__*/_react.default.createElement(_antd.Tabs.TabPane, {
-      tab: t('Built-in'),
-      key: 'built-in'
-    }), /*#__PURE__*/_react.default.createElement(_antd.Tabs.TabPane, {
-      tab: t('Marketplace'),
-      key: 'marketplace'
-    }))
+      },
+      items: [{
+        key: 'local',
+        label: t('Local')
+      }, {
+        key: 'built-in',
+        label: t('Built-in')
+      }, {
+        key: 'marketplace',
+        label: t('Marketplace')
+      }]
+    })
   }), /*#__PURE__*/_react.default.createElement("div", {
     className: 'm24',
     style: {
@@ -217,7 +223,7 @@ var settings = {
     }
   }
 };
-var getPluginsTabs = function getPluginsTabs(items, snippets) {
+var getPluginsTabs = _lodash.default.memoize(function (items, snippets) {
   var pluginsTabs = Object.keys(items).map(function (plugin) {
     var tabsObj = items[plugin].tabs;
     var tabs = (0, _lodash.sortBy)(Object.keys(tabsObj).map(function (tab) {
@@ -240,7 +246,7 @@ var getPluginsTabs = function getPluginsTabs(items, snippets) {
   return (0, _lodash.sortBy)(pluginsTabs, function (o) {
     return !o.isAllow;
   });
-};
+});
 exports.getPluginsTabs = getPluginsTabs;
 var SettingsCenter = function SettingsCenter(props) {
   var _activePlugin$tabs$fi, _items$pluginName2, _items$pluginName2$ta, _items$pluginName2$ta2, _items$pluginName3, _plugin$tabs;
@@ -316,20 +322,28 @@ var SettingsCenter = function SettingsCenter(props) {
       navigate("/admin/settings/".concat(e.key, "/").concat(tabKey));
     },
     items: menuItems
-  })), /*#__PURE__*/_react.default.createElement(_antd.Layout.Content, null, aclPluginTabCheck && /*#__PURE__*/_react.default.createElement(_antd.PageHeader, {
+  })), /*#__PURE__*/_react.default.createElement(_antd.Layout.Content, null, aclPluginTabCheck && /*#__PURE__*/_react.default.createElement(_proLayout.PageHeader, {
+    style: {
+      backgroundColor: 'white',
+      paddingBottom: 0
+    },
     ghost: false,
     title: compile((_items$pluginName3 = items[pluginName]) === null || _items$pluginName3 === void 0 ? void 0 : _items$pluginName3.title),
     footer: /*#__PURE__*/_react.default.createElement(_antd.Tabs, {
       activeKey: tabName,
       onChange: function onChange(activeKey) {
         navigate("/admin/settings/".concat(pluginName, "/").concat(activeKey));
-      }
-    }, (_plugin$tabs = plugin.tabs) === null || _plugin$tabs === void 0 ? void 0 : _plugin$tabs.map(function (tab) {
-      return tab.isAllow && /*#__PURE__*/_react.default.createElement(_antd.Tabs.TabPane, {
-        tab: compile(tab === null || tab === void 0 ? void 0 : tab.title),
-        key: tab.key
-      });
-    }))
+      },
+      items: (_plugin$tabs = plugin.tabs) === null || _plugin$tabs === void 0 ? void 0 : _plugin$tabs.map(function (tab) {
+        if (!tab.isAllow) {
+          return null;
+        }
+        return {
+          label: compile(tab === null || tab === void 0 ? void 0 : tab.title),
+          key: tab.key
+        };
+      })
+    })
   }), /*#__PURE__*/_react.default.createElement("div", {
     className: 'm24',
     style: {

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

@@ -68,7 +68,6 @@ var MenuEditor = function MenuEditor(props) {
   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],
@@ -80,10 +79,11 @@ var MenuEditor = function MenuEditor(props) {
     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);
         // url 为 `/admin` 的情况

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

@@ -57,7 +57,7 @@ var MenuGroup = function MenuGroup(props) {
   if (!['customize:popup', 'customize:update', 'customize:save', 'customize:table:request', 'customize:form:request'].includes(actionType)) {
     return /*#__PURE__*/_react2.default.createElement(_react2.default.Fragment, null, props.children);
   }
-  return /*#__PURE__*/_react2.default.createElement(_antd.Menu.ItemGroup, {
+  return /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.ItemGroup, {
     title: "".concat(t('Customize'), " > ").concat(actionTitles[actionType])
   }, props.children);
 };
@@ -71,9 +71,7 @@ var ActionDesigner = function ActionDesigner(props) {
   var _useCollection = (0, _collectionManager.useCollection)(),
     name = _useCollection.name;
   var _useCollectionManager = (0, _collectionManager.useCollectionManager)(),
-    getChildrenCollections = _useCollectionManager.getChildrenCollections,
-    getCollection = _useCollectionManager.getCollection,
-    getCollectionField = _useCollectionManager.getCollectionField;
+    getChildrenCollections = _useCollectionManager.getChildrenCollections;
   var _useDesignable = (0, _.useDesignable)(),
     dn = _useDesignable.dn;
   var _useTranslation2 = (0, _reactI18next.useTranslation)(),

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

@@ -52,7 +52,7 @@ var ActionDrawer = (0, _react.observer)(function (props) {
     width: openSizeWidthMap.get(openSize),
     title: field.title
   }, others), drawerProps), modalProps), {}, {
-    style: _objectSpread(_objectSpread({}, drawerProps === null || drawerProps === void 0 ? void 0 : drawerProps.style), others === null || others === void 0 ? void 0 : others.style),
+    rootStyle: _objectSpread(_objectSpread({}, drawerProps === null || drawerProps === void 0 ? void 0 : drawerProps.style), others === null || others === void 0 ? void 0 : others.style),
     destroyOnClose: true,
     open: visible,
     onClose: function onClose() {

package/lib/schema-component/antd/association-field/SubTable.js

@@ -42,7 +42,7 @@ var SubTable = (0, _react.observer)(function (props) {
   return /*#__PURE__*/_react2.default.createElement("div", {
     className: (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n          .ant-table-footer {\n            padding: 0 !important;\n          }\n          .ant-formily-item-error-help {\n            display: none;\n          }\n          .ant-description-textarea {\n            line-height: 34px;\n          }\n          .ant-table-cell .ant-formily-item-error-help {\n            display: block;\n            position: absolute;\n            font-size: 12px;\n            top: 100%;\n            background: #fff;\n            width: 100%;\n            margin-top: 3px;\n            padding: 3px;\n            z-index: 1;\n            border-radius: 3px;\n            box-shadow: 0 0 10px #eee;\n            animation: none;\n            transform: translateY(0);\n            opacity: 1;\n          }\n        "])))
   }, /*#__PURE__*/_react2.default.createElement(_Table.Table, {
-    className: (0, _css.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n            .ant-select-selector {\n              /* min-height: 31px; */\n            }\n            .ant-formily-item.ant-formily-item-feedback-layout-loose {\n              margin-bottom: 0px !important;\n            }\n            .ant-formily-editable {\n              vertical-align: sub;\n            }\n            .ant-table table {\n            }\n            td:not(.ant-table-selection-column) {\n              padding: 0 !important;\n            }\n          "]))),
+    className: (0, _css.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n            .ant-select-selector {\n              /* min-height: 31px; */\n            }\n            .ant-formily-item.ant-formily-item-feedback-layout-loose {\n              margin-bottom: 0px !important;\n            }\n            .ant-formily-editable {\n              vertical-align: sub;\n            }\n            .ant-table table {\n            }\n            td:not(.ant-table-selection-column) {\n              padding: 5px !important;\n            }\n          "]))),
     bordered: true,
     size: 'small',
     field: field,

package/lib/schema-component/antd/calendar/DeleteEvent.js

@@ -103,7 +103,7 @@ var DeleteEvent = (0, _react.observer)(function () {
     t = _useTranslation.t;
   return /*#__PURE__*/(0, _reactDom.createPortal)( /*#__PURE__*/_react2.default.createElement(_antd.Modal, {
     title: cron ? t('Delete events') : null,
-    visible: visible,
+    open: visible,
     onCancel: function onCancel() {
       return setVisible(false);
     },

package/lib/schema-component/antd/cascader/Cascader.js

@@ -83,7 +83,7 @@ var Cascader = (0, _react.connect)(function (props) {
     }));
   };
   var handelDropDownVisible = function handelDropDownVisible(value) {
-    if (value && !field.dataSource) {
+    if (value && !field.dataSource.length) {
       run();
     }
   };

package/lib/schema-component/antd/form-item/FormItem.js

@@ -95,6 +95,7 @@ FormItem.Designer = function Designer() {
     getField = _useCollection.getField;
   var _useFormBlockContext = (0, _FormBlockProvider.useFormBlockContext)(),
     form = _useFormBlockContext.form;
+  var ctx = (0, _BlockProvider.useBlockRequestContext)();
   var field = (0, _react.useField)();
   var fieldSchema = (0, _react.useFieldSchema)();
   var _useTranslation = (0, _reactI18next.useTranslation)(),
@@ -411,12 +412,15 @@ FormItem.Designer = function Designer() {
       properties: {
         filter: {
           default: defaultFilter,
-          // title: '数据范围',
           enum: dataSource,
           'x-component': 'Filter',
           'x-component-props': {
             dynamicComponent: function dynamicComponent(props) {
-              return (0, _FilterDynamicComponent.FilterDynamicComponent)(_objectSpread({}, props));
+              return (0, _FilterDynamicComponent.FilterDynamicComponent)(_objectSpread(_objectSpread({}, props), {}, {
+                form: form,
+                collectionField: collectionField,
+                rootCollection: ctx.props.collection || ctx.props.resource
+              }));
             }
           }
         }
@@ -428,7 +432,6 @@ FormItem.Designer = function Designer() {
       filter = (0, _filter.removeNullCondition)(filter);
       _lodash.default.set(field.componentProps, 'service.params.filter', filter);
       fieldSchema['x-component-props'] = field.componentProps;
-      field.componentProps = field.componentProps;
       dn.emit('patch', {
         schema: (_schema5 = {}, _defineProperty(_schema5, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema5, 'x-component-props', field.componentProps), _schema5)
       });
@@ -790,6 +793,10 @@ FormItem.Designer = function Designer() {
 function isFileCollection(collection) {
   return (collection === null || collection === void 0 ? void 0 : collection.template) === 'file';
 }
+function extractFirstPart(path) {
+  var firstDotIndex = path.indexOf('.');
+  return firstDotIndex !== -1 ? path.slice(0, firstDotIndex) : path;
+}
 FormItem.FilterFormDesigner = _FormItem.FilterFormDesigner;
 function getFieldDefaultValue(fieldSchema, collectionField) {
   var _fieldSchema$default, _collectionField$uiSc5;

package/lib/schema-component/antd/grid-card/GridCard.Designer.js

@@ -4,30 +4,29 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.GridCardDesigner = void 0;
-var _react = require("@formily/react");
-var _react2 = _interopRequireWildcard(require("react"));
 var _antd = require("@formily/antd");
+var _react = require("@formily/react");
 var _antd2 = require("antd");
 var _lodash = _interopRequireDefault(require("lodash"));
+var _react2 = _interopRequireWildcard(require("react"));
 var _reactI18next = require("react-i18next");
 var _collectionManager = require("../../../collection-manager");
 var _schemaSettings = require("../../../schema-settings");
 var _schemaTemplates = require("../../../schema-templates");
+var _core = require("../../core");
 var _hooks = require("../../hooks");
 var _filter = require("../filter");
 var _FilterDynamicComponent = require("../table-v2/FilterDynamicComponent");
-var _core = require("../../core");
 var _options = require("./options");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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 _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); }
-_antd2.Slider;
 var columnCountMarks = [1, 2, 3, 4, 6, 8, 12, 24].reduce(function (obj, cur) {
   obj[cur] = cur;
   return obj;

package/lib/schema-component/antd/index.less

@@ -42,7 +42,5 @@
 }
 
 html body {
-  --adm-font-family: -apple-system, BlinkMacSystemFont, Segoe UI, PingFang SC, Hiragino Sans GB,
-  Microsoft YaHei, Helvetica Neue, Helvetica, Arial, sans-serif, Apple Color Emoji, Segoe UI Emoji,
-  Segoe UI Symbol;
+  --adm-font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji";
 }