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

package/lib/schema-settings/SchemaSettings.js

@@ -10,6 +10,7 @@ var _antd = require("@formily/antd");
 var _core = require("@formily/core");
 var _react = require("@formily/react");
 var _shared = require("@formily/shared");
+var _client = require("@nocobase/utils/client");
 var _antd2 = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _lodash = _interopRequireWildcard(require("lodash"));
@@ -19,6 +20,7 @@ var _reactI18next = require("react-i18next");
 var _2 = require("..");
 var _hooks = require("../block-provider/hooks");
 var _utils = require("../filter-provider/utils");
+var _useMenuItem4 = require("../hooks/useMenuItem");
 var _utilts = require("../schema-component/antd/association-filter/utilts");
 var _schemaTemplates = require("../schema-templates");
 var _BlockTemplate = require("../schema-templates/BlockTemplate");
@@ -46,13 +48,13 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 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); }); }; }
-function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 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; }
@@ -83,6 +85,7 @@ var SchemaSettingsProvider = function SchemaSettingsProvider(props) {
   }, children);
 };
 exports.SchemaSettingsProvider = SchemaSettingsProvider;
+var overlayClassName = (0, _classnames.default)('nb-schema-initializer-button-overlay', (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    .ant-dropdown-menu-item-group-list {\n      max-height: 40vh;\n      overflow: auto;\n    }\n  "]))));
 var SchemaSettings = function SchemaSettings(props) {
   var title = props.title,
     dn = props.dn,
@@ -91,28 +94,51 @@ var SchemaSettings = function SchemaSettings(props) {
     _useState2 = _slicedToArray(_useState, 2),
     visible = _useState2[0],
     setVisible = _useState2[1];
-  var DropdownMenu = /*#__PURE__*/_react2.default.createElement(_antd2.Dropdown, {
-    open: visible,
-    onOpenChange: function onOpenChange(visible) {
-      setVisible(visible);
-    },
-    overlay: /*#__PURE__*/_react2.default.createElement(_antd2.Menu, null, props.children),
-    overlayClassName: (0, _classnames.default)('nb-schema-initializer-button-overlay', (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n          .ant-dropdown-menu-item-group-list {\n            max-height: 40vh;\n            overflow: auto;\n          }\n        "]))))
-  }, typeof title === 'string' ? /*#__PURE__*/_react2.default.createElement("span", null, title) : title);
+  var _useMenuItem = (0, _useMenuItem4.useMenuItem)(),
+    Component = _useMenuItem.Component,
+    getMenuItems = _useMenuItem.getMenuItems;
+  var _useState3 = (0, _react2.useState)(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    shouldRender = _useState4[0],
+    setShouldRender = _useState4[1];
+  if (!shouldRender) {
+    return /*#__PURE__*/_react2.default.createElement("div", {
+      onMouseEnter: function onMouseEnter() {
+        setShouldRender(true);
+        setVisible(true);
+      }
+    }, typeof title === 'string' ? /*#__PURE__*/_react2.default.createElement("span", null, title) : title);
+  }
+  var dropdownMenu = function dropdownMenu() {
+    return /*#__PURE__*/_react2.default.createElement(_react2.default.Fragment, null, /*#__PURE__*/_react2.default.createElement(Component, null), /*#__PURE__*/_react2.default.createElement(_antd2.Dropdown, {
+      open: visible,
+      onOpenChange: function onOpenChange() {
+        setShouldRender(false);
+        setVisible(false);
+      },
+      menu: {
+        items: getMenuItems(function () {
+          return props.children;
+        })
+      },
+      overlayClassName: overlayClassName
+    }, typeof title === 'string' ? /*#__PURE__*/_react2.default.createElement("span", null, title) : title));
+  };
   if (dn) {
     return /*#__PURE__*/_react2.default.createElement(SchemaSettingsProvider, _objectSpread({
       visible: visible,
       setVisible: setVisible,
       dn: dn
-    }, others), DropdownMenu);
+    }, others), dropdownMenu());
   }
-  return DropdownMenu;
+  return dropdownMenu();
 };
 exports.SchemaSettings = SchemaSettings;
 SchemaSettings.Template = function Template(props) {
   var componentName = props.componentName,
     collectionName = props.collectionName,
-    resourceName = props.resourceName;
+    resourceName = props.resourceName,
+    needRender = props.needRender;
   var _useTranslation = (0, _reactI18next.useTranslation)(),
     t = _useTranslation.t;
   var _useCollectionManager = (0, _2.useCollectionManager)(),
@@ -129,7 +155,7 @@ SchemaSettings.Template = function Template(props) {
   var _useSchemaTemplateMan2 = (0, _schemaTemplates.useSchemaTemplateManager)(),
     saveAsTemplate = _useSchemaTemplateMan2.saveAsTemplate,
     copyTemplateSchema = _useSchemaTemplateMan2.copyTemplateSchema;
-  if (!collectionName) {
+  if (!collectionName && !needRender) {
     return null;
   }
   if (template) {
@@ -179,12 +205,14 @@ SchemaSettings.Template = function Template(props) {
   return /*#__PURE__*/_react2.default.createElement(SchemaSettings.Item, {
     onClick: function () {
       var _onClick3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-        var _getCollection, title, values, sdn, _yield$saveAsTemplate, key;
+        var _ref, title, values, sdn, _yield$saveAsTemplate, key;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               setVisible(false);
-              _getCollection = getCollection(collectionName), title = _getCollection.title;
+              _ref = collectionName ? getCollection(collectionName) : {
+                title: ''
+              }, title = _ref.title;
               _context3.next = 4;
               return (0, _antd.FormDialog)(t('Save as template'), function () {
                 return /*#__PURE__*/_react2.default.createElement(_antd.FormLayout, {
@@ -200,7 +228,7 @@ SchemaSettings.Template = function Template(props) {
                       name: {
                         title: t('Template name'),
                         required: true,
-                        default: "".concat(compile(title), "_").concat(t(componentName)),
+                        default: title ? "".concat(compile(title), "_").concat(t(componentName)) : t(componentName),
                         'x-decorator': 'FormItem',
                         'x-component': 'Input'
                       }
@@ -371,12 +399,12 @@ SchemaSettings.FormItemTemplate = function FormItemTemplate(props) {
   return /*#__PURE__*/_react2.default.createElement(SchemaSettings.Item, {
     onClick: function () {
       var _onClick5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-        var _getCollection2, title, gridSchema, values, sdn, _yield$saveAsTemplate2, key;
+        var _getCollection, title, gridSchema, values, sdn, _yield$saveAsTemplate2, key;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
               setVisible(false);
-              _getCollection2 = getCollection(collectionName), title = _getCollection2.title;
+              _getCollection = getCollection(collectionName), title = _getCollection.title;
               gridSchema = findGridSchema(fieldSchema);
               _context6.next = 5;
               return (0, _antd.FormDialog)(t('Save as template'), function () {
@@ -457,14 +485,17 @@ SchemaSettings.FormItemTemplate = function FormItemTemplate(props) {
   }, t('Save as block template'));
 };
 SchemaSettings.Item = function Item(props) {
+  var _useCollectMenuItems = (0, _useMenuItem4.useCollectMenuItems)(),
+    pushMenuItem = _useCollectMenuItems.pushMenuItem;
+  var _useCollectMenuItem = (0, _useMenuItem4.useCollectMenuItem)(),
+    collectMenuItem = _useCollectMenuItem.collectMenuItem;
   var eventKey = props.eventKey;
   var key = (0, _react2.useMemo)(function () {
     return (0, _shared.uid)();
   }, []);
-  return /*#__PURE__*/_react2.default.createElement(_antd2.Menu.Item, _objectSpread(_objectSpread({
+  var item = _objectSpread(_objectSpread({}, _lodash.default.omit(props, ['children'])), {}, {
     key: key,
-    eventKey: eventKey || key
-  }, props), {}, {
+    eventKey: eventKey || key,
     onClick: function onClick(info) {
       var _props$onClick;
       info.domEvent.preventDefault();
@@ -473,17 +504,67 @@ SchemaSettings.Item = function Item(props) {
     },
     style: {
       minWidth: 120
-    }
-  }), props.children || props.title);
+    },
+    label: props.children || props.title,
+    title: props.title
+  });
+  pushMenuItem === null || pushMenuItem === void 0 ? void 0 : pushMenuItem(item);
+  collectMenuItem === null || collectMenuItem === void 0 ? void 0 : collectMenuItem(item);
+  return null;
 };
-SchemaSettings.ItemGroup = function (props) {
-  return /*#__PURE__*/_react2.default.createElement(_antd2.Menu.ItemGroup, _objectSpread({}, props));
+SchemaSettings.ItemGroup = function ItemGroup(props) {
+  var _useMenuItem2 = (0, _useMenuItem4.useMenuItem)(),
+    Component = _useMenuItem2.Component,
+    getMenuItems = _useMenuItem2.getMenuItems;
+  var _useCollectMenuItems2 = (0, _useMenuItem4.useCollectMenuItems)(),
+    pushMenuItem = _useCollectMenuItems2.pushMenuItem;
+  var key = (0, _react2.useMemo)(function () {
+    return (0, _shared.uid)();
+  }, []);
+  var item = {
+    key: key,
+    type: 'group',
+    title: props.title,
+    label: props.title,
+    children: getMenuItems(function () {
+      return props.children;
+    })
+  };
+  pushMenuItem(item);
+  return /*#__PURE__*/_react2.default.createElement(Component, null);
 };
-SchemaSettings.SubMenu = function (props) {
-  return /*#__PURE__*/_react2.default.createElement(_antd2.Menu.SubMenu, _objectSpread({}, props));
+SchemaSettings.SubMenu = function SubMenu(props) {
+  var _useMenuItem3 = (0, _useMenuItem4.useMenuItem)(),
+    Component = _useMenuItem3.Component,
+    getMenuItems = _useMenuItem3.getMenuItems;
+  var _useCollectMenuItems3 = (0, _useMenuItem4.useCollectMenuItems)(),
+    pushMenuItem = _useCollectMenuItems3.pushMenuItem;
+  var key = (0, _react2.useMemo)(function () {
+    return (0, _shared.uid)();
+  }, []);
+  var item = {
+    key: key,
+    label: props.title,
+    title: props.title,
+    children: getMenuItems(function () {
+      return props.children;
+    })
+  };
+  pushMenuItem(item);
+  return /*#__PURE__*/_react2.default.createElement(Component, null);
 };
-SchemaSettings.Divider = function (props) {
-  return /*#__PURE__*/_react2.default.createElement(_antd2.Menu.Divider, _objectSpread({}, props));
+SchemaSettings.Divider = function Divider() {
+  var _useCollectMenuItems4 = (0, _useMenuItem4.useCollectMenuItems)(),
+    pushMenuItem = _useCollectMenuItems4.pushMenuItem;
+  var key = (0, _react2.useMemo)(function () {
+    return (0, _shared.uid)();
+  }, []);
+  var item = {
+    key: key,
+    type: 'divider'
+  };
+  pushMenuItem(item);
+  return null;
 };
 SchemaSettings.Remove = function Remove(props) {
   var confirm = props.confirm,
@@ -534,12 +615,18 @@ SchemaSettings.ConnectDataBlocks = function ConnectDataBlocks(props) {
   var _useTranslation4 = (0, _reactI18next.useTranslation)(),
     t = _useTranslation4.t;
   var collection = (0, _2.useCollection)();
+  var _useFilterBlock = (0, _2.useFilterBlock)(),
+    inProvider = _useFilterBlock.inProvider;
   var dataBlocks = (0, _utils.useSupportedBlocks)(type);
+  // eslint-disable-next-line prefer-const
   var _findFilterTargets = (0, _hooks.findFilterTargets)(fieldSchema),
     _findFilterTargets$ta = _findFilterTargets.targets,
     targets = _findFilterTargets$ta === void 0 ? [] : _findFilterTargets$ta,
     uid = _findFilterTargets.uid;
   var compile = (0, _2.useCompile)();
+  if (!inProvider) {
+    return null;
+  }
   var Content = dataBlocks.map(function (block) {
     var title = "".concat(compile(block.collection.title), " #").concat(block.uid.slice(0, 4));
     var onHover = function onHover() {
@@ -584,7 +671,7 @@ SchemaSettings.ConnectDataBlocks = function ConnectDataBlocks(props) {
           (0, _hooks.updateFilterTargets)(fieldSchema, targets);
           dn.emit('patch', {
             schema: (_schema = {}, _defineProperty(_schema, 'x-uid', uid), _defineProperty(_schema, 'x-filter-targets', targets), _schema)
-          });
+          }).catch(_client.error);
           dn.refresh();
         },
         onMouseEnter: onHover,
@@ -641,14 +728,14 @@ SchemaSettings.ConnectDataBlocks = function ConnectDataBlocks(props) {
   });
   return /*#__PURE__*/_react2.default.createElement(SchemaSettings.SubMenu, {
     title: t('Connect data blocks')
-  }, Content.length ? Content : /*#__PURE__*/_react2.default.createElement(_antd2.Empty, {
+  }, Content.length ? Content : /*#__PURE__*/_react2.default.createElement(SchemaSettings.Item, null, /*#__PURE__*/_react2.default.createElement(_antd2.Empty, {
     style: {
       width: 160,
       padding: '0 1em'
     },
     description: emptyDescription,
     image: _antd2.Empty.PRESENTED_IMAGE_SIMPLE
-  }));
+  })));
 };
 SchemaSettings.SelectItem = function SelectItem(props) {
   var title = props.title,
@@ -658,10 +745,10 @@ SchemaSettings.SelectItem = function SelectItem(props) {
     openOnHover = props.openOnHover,
     _onClick = props.onClick,
     others = _objectWithoutProperties(props, _excluded3);
-  var _useState3 = (0, _react2.useState)(false),
-    _useState4 = _slicedToArray(_useState3, 2),
-    open = _useState4[0],
-    setOpen = _useState4[1];
+  var _useState5 = (0, _react2.useState)(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    open = _useState6[0],
+    setOpen = _useState6[1];
   var onClick = function onClick() {
     setOpen(false);
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
@@ -684,6 +771,7 @@ SchemaSettings.SelectItem = function SelectItem(props) {
       justifyContent: 'space-between'
     }
   }, title, /*#__PURE__*/_react2.default.createElement(_antd2.Select, _objectSpread({
+    dropdownMatchSelectWidth: false,
     bordered: false,
     defaultValue: value,
     onChange: function onChange() {
@@ -724,10 +812,10 @@ SchemaSettings.SwitchItem = function SwitchItem(props) {
   var title = props.title,
     onChange = props.onChange,
     others = _objectWithoutProperties(props, _excluded5);
-  var _useState5 = (0, _react2.useState)(!!props.checked),
-    _useState6 = _slicedToArray(_useState5, 2),
-    checked = _useState6[0],
-    setChecked = _useState6[1];
+  var _useState7 = (0, _react2.useState)(!!props.checked),
+    _useState8 = _slicedToArray(_useState7, 2),
+    checked = _useState8[0],
+    setChecked = _useState8[1];
   return /*#__PURE__*/_react2.default.createElement(SchemaSettings.Item, _objectSpread(_objectSpread({}, others), {}, {
     onClick: function onClick() {
       onChange === null || onChange === void 0 ? void 0 : onChange(!checked);
@@ -750,12 +838,12 @@ SchemaSettings.SwitchItem = function SwitchItem(props) {
 SchemaSettings.PopupItem = function PopupItem(props) {
   var schema = props.schema,
     others = _objectWithoutProperties(props, _excluded6);
-  var _useState7 = (0, _react2.useState)(false),
-    _useState8 = _slicedToArray(_useState7, 2),
-    visible = _useState8[0],
-    setVisible = _useState8[1];
+  var _useState9 = (0, _react2.useState)(false),
+    _useState10 = _slicedToArray(_useState9, 2),
+    visible = _useState10[0],
+    setVisible = _useState10[1];
   var ctx = (0, _react2.useContext)(SchemaSettingsContext);
-  return /*#__PURE__*/_react2.default.createElement(_2.ActionContext.Provider, {
+  return /*#__PURE__*/_react2.default.createElement(_2.ActionContextProvider, {
     value: {
       visible: visible,
       setVisible: setVisible
@@ -781,14 +869,14 @@ SchemaSettings.ActionModalItem = /*#__PURE__*/_react2.default.memo(function (pro
     modalTip = props.modalTip,
     components = props.components,
     others = _objectWithoutProperties(props, _excluded7);
-  var _useState9 = (0, _react2.useState)(false),
-    _useState10 = _slicedToArray(_useState9, 2),
-    visible = _useState10[0],
-    setVisible = _useState10[1];
-  var _useState11 = (0, _react2.useState)(props.uid),
+  var _useState11 = (0, _react2.useState)(false),
     _useState12 = _slicedToArray(_useState11, 2),
-    schemaUid = _useState12[0],
-    setSchemaUid = _useState12[1];
+    visible = _useState12[0],
+    setVisible = _useState12[1];
+  var _useState13 = (0, _react2.useState)(props.uid),
+    _useState14 = _slicedToArray(_useState13, 2),
+    schemaUid = _useState14[0],
+    setSchemaUid = _useState14[1];
   var _useTranslation5 = (0, _reactI18next.useTranslation)(),
     t = _useTranslation5.t;
   var fieldSchema = (0, _react.useFieldSchema)();
@@ -807,7 +895,7 @@ SchemaSettings.ActionModalItem = /*#__PURE__*/_react2.default.memo(function (pro
     setVisible(false);
   };
   var submitHandler = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
       return _regeneratorRuntime().wrap(function _callee7$(_context7) {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
@@ -823,11 +911,11 @@ SchemaSettings.ActionModalItem = /*#__PURE__*/_react2.default.memo(function (pro
       }, _callee7);
     }));
     return function submitHandler() {
-      return _ref.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }();
   var openAssignedFieldValueHandler = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
       return _regeneratorRuntime().wrap(function _callee8$(_context8) {
         while (1) switch (_context8.prev = _context8.next) {
           case 0:
@@ -855,7 +943,7 @@ SchemaSettings.ActionModalItem = /*#__PURE__*/_react2.default.memo(function (pro
       }, _callee8);
     }));
     return function openAssignedFieldValueHandler() {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
   return /*#__PURE__*/_react2.default.createElement(_react2.default.Fragment, null, /*#__PURE__*/_react2.default.createElement(SchemaSettings.Item, _objectSpread(_objectSpread({}, others), {}, {
@@ -875,7 +963,7 @@ SchemaSettings.ActionModalItem = /*#__PURE__*/_react2.default.memo(function (pro
     title: compile(title)
   }, others), {}, {
     destroyOnClose: true,
-    visible: visible,
+    open: visible,
     onCancel: cancelHandler,
     footer: /*#__PURE__*/_react2.default.createElement(_antd2.Space, null, /*#__PURE__*/_react2.default.createElement(_antd2.Button, {
       onClick: cancelHandler
@@ -898,6 +986,7 @@ SchemaSettings.ActionModalItem = /*#__PURE__*/_react2.default.memo(function (pro
     schema: schema
   }))))), document.body));
 });
+SchemaSettings.ActionModalItem.displayName = 'SchemaSettings.ActionModalItem';
 SchemaSettings.ModalItem = function ModalItem(props) {
   var hidden = props.hidden,
     title = props.title,
@@ -1004,9 +1093,9 @@ SchemaSettings.BlockTitleItem = function BlockTitleItem() {
         }
       }
     },
-    onSubmit: function onSubmit(_ref3) {
+    onSubmit: function onSubmit(_ref4) {
       var _schema3;
-      var title = _ref3.title;
+      var title = _ref4.title;
       var componentProps = fieldSchema['x-component-props'] || {};
       componentProps.title = title;
       fieldSchema['x-component-props'] = componentProps;
@@ -1254,7 +1343,6 @@ SchemaSettings.EnableChildCollections = function EnableChildCollectionsItem(prop
       ArrayItems: _antd.ArrayItems,
       FormLayout: _antd.FormLayout
     },
-    width: 600,
     schema: {
       type: 'object',
       title: t('Enable child collections'),

package/lib/schema-settings/VariableInput/VariableInput.d.ts

@@ -10,5 +10,5 @@ declare type Props = {
     className?: string;
     style?: React.CSSProperties;
 };
-export declare const VariableInput: (props: Props) => JSX.Element;
+export declare const VariableInput: (props: Props) => React.JSX.Element;
 export {};

package/lib/schema-settings/VariableInput/VariableInput.js

@@ -20,7 +20,7 @@ var VariableInput = function VariableInput(props) {
   var compile = (0, _schemaComponent.useCompile)();
   var userVariable = (0, _useUserVariable.useUserVariable)({
     schema: schema,
-    level: 1
+    maxDepth: 1
   });
   var scope = (0, _react.useMemo)(function () {
     return [userVariable, compile({

package/lib/schema-settings/VariableInput/hooks/useDateVariable.d.ts

@@ -1,4 +1,15 @@
 export declare const useDateVariable: ({ operator, schema }: {
     operator: any;
     schema: any;
-}) => any;
+}) => {
+    label: string;
+    value: string;
+    key: string;
+    disabled: boolean;
+    children: {
+        key: string;
+        value: string;
+        label: string;
+        disabled: boolean;
+    }[];
+};