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

package/es/schema-initializer/buttons/TableColumnInitializers.js

@@ -9,7 +9,7 @@ import { useTranslation } from 'react-i18next';
 import { SchemaInitializer } from '../SchemaInitializer';
 import { itemsMerge, useAssociatedTableColumnInitializerFields, useTableColumnInitializerFields, useInheritsTableColumnInitializerFields } from '../utils';
 import { useCompile } from '../../schema-component';
-import { useFieldSchema } from '@formily/react';
+import { useField, useFieldSchema } from '@formily/react';
 // 表格列配置
 export var TableColumnInitializers = function TableColumnInitializers(props) {
   var _props$items = props.items,
@@ -18,6 +18,7 @@ export var TableColumnInitializers = function TableColumnInitializers(props) {
     action = _props$action === void 0 ? true : _props$action;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
+  var field = useField();
   var fieldSchema = useFieldSchema();
   var associatedFields = useAssociatedTableColumnInitializerFields();
   var inheritFields = useInheritsTableColumnInitializerFields();
@@ -42,7 +43,7 @@ export var TableColumnInitializers = function TableColumnInitializers(props) {
       });
     });
   }
-  if ((associatedFields === null || associatedFields === void 0 ? void 0 : associatedFields.length) > 0 && !isSubTable) {
+  if ((associatedFields === null || associatedFields === void 0 ? void 0 : associatedFields.length) > 0 && field.readPretty) {
     fieldItems.push({
       type: 'divider'
     }, {

package/es/schema-initializer/components/CreateRecordAction.js

@@ -15,8 +15,8 @@ function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(
 import { DownOutlined, PlusOutlined } from '@ant-design/icons';
 import { css } from '@emotion/css';
 import { RecursionField, observer, useField, useFieldSchema } from '@formily/react';
-import { Button, Dropdown, Menu } from 'antd';
-import React, { useEffect, useState } from 'react';
+import { Button, Dropdown } from 'antd';
+import React, { useEffect, useMemo, useState } from 'react';
 import { useDesignable } from '../../';
 import { useACLRolesCheck, useRecordPkValue } from '../../acl/ACLProvider';
 import { CollectionProvider, useCollection, useCollectionManager } from '../../collection-manager';
@@ -124,36 +124,46 @@ export var CreateAction = observer(function (props) {
   var _useCollectionManager = useCollectionManager(),
     getChildrenCollections = _useCollectionManager.getChildrenCollections;
   var totalChildCollections = getChildrenCollections(collection.name);
-  var inheritsCollections = enableChildren.map(function (k) {
-    if (!k) {
-      return;
-    }
-    var childCollection = totalChildCollections.find(function (j) {
-      return j.name === k.collection;
-    });
-    if (!childCollection) {
-      return;
-    }
-    return _objectSpread(_objectSpread({}, childCollection), {}, {
-      title: k.title || childCollection.title
+  var inheritsCollections = useMemo(function () {
+    return enableChildren.map(function (k) {
+      if (!k) {
+        return;
+      }
+      var childCollection = totalChildCollections.find(function (j) {
+        return j.name === k.collection;
+      });
+      if (!childCollection) {
+        return;
+      }
+      return _objectSpread(_objectSpread({}, childCollection), {}, {
+        title: k.title || childCollection.title
+      });
+    }).filter(function (v) {
+      return v && actionAclCheck("".concat(v.name, ":create"));
     });
-  }).filter(function (v) {
-    return v && actionAclCheck("".concat(v.name, ":create"));
-  });
+  }, [enableChildren, totalChildCollections]);
   var linkageRules = (fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-linkage-rules']) || [];
   var values = useRecord();
   var compile = useCompile();
   var _useDesignable = useDesignable(),
     designable = _useDesignable.designable;
   var icon = props.icon || /*#__PURE__*/React.createElement(PlusOutlined, null);
-  var menu = /*#__PURE__*/React.createElement(Menu, null, inheritsCollections.map(function (option) {
-    return /*#__PURE__*/React.createElement(Menu.Item, {
-      key: option.name,
-      onClick: function onClick(info) {
-        _onClick === null || _onClick === void 0 ? void 0 : _onClick(option.name);
-      }
-    }, compile(option.title));
-  }));
+  var menuItems = useMemo(function () {
+    return inheritsCollections.map(function (option) {
+      return {
+        key: option.name,
+        label: compile(option.title),
+        onClick: function onClick() {
+          return _onClick === null || _onClick === void 0 ? void 0 : _onClick(option.name);
+        }
+      };
+    });
+  }, [inheritsCollections, _onClick]);
+  var menu = useMemo(function () {
+    return {
+      items: menuItems
+    };
+  }, [menuItems]);
   useEffect(function () {
     field.linkageProperty = {};
     linkageRules.filter(function (k) {
@@ -178,12 +188,12 @@ export var CreateAction = observer(function (props) {
         loading: false
       })];
     },
-    overlay: menu,
+    menu: menu,
     onClick: function onClick(info) {
       _onClick === null || _onClick === void 0 ? void 0 : _onClick(collection.name);
     }
   }, icon, props.children) : /*#__PURE__*/React.createElement(Dropdown, {
-    overlay: menu
+    menu: menu
   }, /*#__PURE__*/React.createElement(Button, {
     icon: icon,
     type: componentType

package/es/schema-initializer/components/assigned-field/AssignedField.js

@@ -93,6 +93,7 @@ export var AssignedField = function AssignedField(props) {
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
   var compile = useCompile();
+  var collection = useCollection();
   var field = useField();
   var fieldSchema = useFieldSchema();
   var isDynamicValue = DYNAMIC_RECORD_REG.test(field.value) || DYNAMIC_USER_REG.test(field.value) || DYNAMIC_TIME_REG.test(field.value);
@@ -128,7 +129,7 @@ export var AssignedField = function AssignedField(props) {
   var _useCollection = useCollection(),
     getField = _useCollection.getField;
   var collectionField = getField(fieldSchema.name);
-  var fields = useCollectionFilterOptions(collectionField === null || collectionField === void 0 ? void 0 : collectionField.collectionName);
+  var fields = useCollectionFilterOptions(collection === null || collection === void 0 ? void 0 : collection.name);
   var userFields = useCollectionFilterOptions('users');
   var dateTimeFields = ['createdAt', 'datetime', 'time', 'updatedAt'];
   useEffect(function () {

package/es/schema-initializer/items/CalendarBlockInitializer.js

@@ -7,10 +7,10 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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); }
-import React, { useContext } from 'react';
-import { FormDialog, FormLayout } from '@formily/antd';
 import { FormOutlined } from '@ant-design/icons';
+import { FormDialog, FormLayout } from '@formily/antd';
 import { SchemaOptionsContext } from '@formily/react';
+import React, { useContext } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useCollectionManager } from '../../collection-manager';
 import { SchemaComponent, SchemaComponentOptions } from '../../schema-component';

package/es/schema-initializer/utils.d.ts

@@ -125,7 +125,6 @@ export declare const useCollectionDataSourceItems: (componentName: any) => {
     title: React.FunctionComponentElement<{
         value: any;
         onChange: any;
-        setSelected: any;
     }>;
     children: ({
         type: string;

package/es/schema-initializer/utils.js

@@ -14,10 +14,6 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
 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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-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 _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 _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."); }
 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); }
@@ -29,9 +25,11 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 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); }
 import { Schema, useFieldSchema, useForm } from '@formily/react';
 import { uid } from '@formily/shared';
-import React, { useContext, useMemo, useState } from 'react';
+import { error } from '@nocobase/utils/client';
+import _ from 'lodash';
+import React, { useCallback, useContext, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
-import { BlockRequestContext } from '../';
+import { BlockRequestContext, SchemaInitializerButtonContext } from '../';
 import { useCollection, useCollectionManager } from '../collection-manager';
 import { isAssocField } from '../filter-provider/utils';
 import { useActionContext, useDesignable } from '../schema-component';
@@ -220,6 +218,10 @@ export var useInheritsTableColumnInitializerFields = function useInheritsTableCo
     getInheritCollections = _useCollectionManager3.getInheritCollections,
     getCollection = _useCollectionManager3.getCollection,
     getParentCollectionFields = _useCollectionManager3.getParentCollectionFields;
+  var fieldSchema = useFieldSchema();
+  var isSubTable = fieldSchema['x-component'] === 'AssociationField.SubTable';
+  var form = useForm();
+  var isReadPretty = isSubTable ? form.readPretty : true;
   var inherits = getInheritCollections(name);
   return inherits === null || inherits === void 0 ? void 0 : inherits.map(function (v) {
     var fields = getParentCollectionFields(v, name);
@@ -227,18 +229,30 @@ export var useInheritsTableColumnInitializerFields = function useInheritsTableCo
     return _defineProperty({}, targetCollection === null || targetCollection === void 0 ? void 0 : targetCollection.title, fields === null || fields === void 0 ? void 0 : fields.filter(function (field) {
       return field === null || field === void 0 ? void 0 : field.interface;
     }).map(function (k) {
-      var _k$uiSchema;
+      var _getCollection2, _k$uiSchema, _k$uiSchema2;
       var interfaceConfig = getInterface(k.interface);
+      var isFileCollection = (k === null || k === void 0 ? void 0 : k.target) && ((_getCollection2 = getCollection(k === null || k === void 0 ? void 0 : k.target)) === null || _getCollection2 === void 0 ? void 0 : _getCollection2.template) === 'file';
       var schema = {
         name: "".concat(k.name),
         'x-component': 'CollectionField',
-        'x-read-pretty': true,
+        'x-read-pretty': isReadPretty || ((_k$uiSchema = k.uiSchema) === null || _k$uiSchema === void 0 ? void 0 : _k$uiSchema['x-read-pretty']),
         'x-collection-field': "".concat(name, ".").concat(k.name),
-        'x-component-props': {}
+        'x-component-props': isFileCollection ? {
+          fieldNames: {
+            label: 'preview',
+            value: 'id'
+          }
+        } : {},
+        'x-decorator': isSubTable ? quickEditField.includes(k.interface) || isFileCollection ? 'QuickEdit' : 'FormItem' : null,
+        'x-decorator-props': {
+          labelStyle: {
+            display: 'none'
+          }
+        }
       };
       return {
         type: 'item',
-        title: (k === null || k === void 0 ? void 0 : (_k$uiSchema = k.uiSchema) === null || _k$uiSchema === void 0 ? void 0 : _k$uiSchema.title) || k.name,
+        title: (k === null || k === void 0 ? void 0 : (_k$uiSchema2 = k.uiSchema) === null || _k$uiSchema2 === void 0 ? void 0 : _k$uiSchema2.title) || k.name,
         component: 'TableCollectionFieldInitializer',
         find: findTableColumn,
         remove: removeTableColumn,
@@ -859,28 +873,26 @@ export var useCollectionDataSourceItems = function useCollectionDataSourceItems(
     getCollectionFields = _useCollectionManager12.getCollectionFields;
   var _useSchemaTemplateMan2 = useSchemaTemplateManager(),
     getTemplatesByCollection = _useSchemaTemplateMan2.getTemplatesByCollection;
-  var _useState = useState([]),
-    _useState2 = _slicedToArray(_useState, 2),
-    selected = _useState2[0],
-    setSelected = _useState2[1];
-  var _useState3 = useState(null),
-    _useState4 = _slicedToArray(_useState3, 2),
-    value = _useState4[0],
-    onChange = _useState4[1];
+  var _useContext = useContext(SchemaInitializerButtonContext),
+    searchValue = _useContext.searchValue,
+    setSearchValue = _useContext.setSearchValue;
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  var onChange = useCallback(_.debounce(setSearchValue, 300), [setSearchValue]);
+  if (!setSearchValue) {
+    error('useCollectionDataSourceItems: please use in SchemaInitializerButtonContext and provide setSearchValue');
+    return [];
+  }
   var clearKeywords = function clearKeywords() {
-    setSelected([]);
-    onChange(null);
+    setSearchValue('');
   };
   return [{
     key: 'tableBlock',
     type: 'itemGroup',
     title: /*#__PURE__*/React.createElement(SelectCollection, {
-      value: value,
-      onChange: onChange,
-      setSelected: setSelected
+      value: searchValue,
+      onChange: onChange
     }),
     children: collections === null || collections === void 0 ? void 0 : (_collections$filter = collections.filter(function (item) {
-      var b = !value || selected.includes(item.name);
       if (item.inherit) {
         return false;
       }
@@ -894,7 +906,10 @@ export var useCollectionDataSourceItems = function useCollectionDataSourceItems(
       } else if (item.template === 'file' && ['Kanban', 'FormItem', 'Calendar'].includes(componentName)) {
         return false;
       } else {
-        return b && !((item === null || item === void 0 ? void 0 : item.isThrough) && (item === null || item === void 0 ? void 0 : item.autoCreate));
+        if (!item.title) {
+          return false;
+        }
+        return item.title.toUpperCase().includes(searchValue.toUpperCase()) && !((item === null || item === void 0 ? void 0 : item.isThrough) && (item === null || item === void 0 ? void 0 : item.autoCreate));
       }
     })) === null || _collections$filter === void 0 ? void 0 : _collections$filter.map(function (item, index) {
       var templates = getTemplatesByCollection(item.name).filter(function (template) {

package/es/schema-settings/SchemaSettings.js

@@ -16,13 +16,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; }
@@ -36,7 +36,7 @@ import { createForm } from '@formily/core';
 import { SchemaOptionsContext, useField, useFieldSchema, useForm } from '@formily/react';
 import { uid } from '@formily/shared';
 import { error } from '@nocobase/utils/client';
-import { Alert, Button, Cascader, Dropdown, Empty, Menu, Modal, Select, Space, Switch } from 'antd';
+import { Alert, Button, Cascader, Dropdown, Empty, Modal, Select, Space, Switch } from 'antd';
 import classNames from 'classnames';
 import _, { cloneDeep } from 'lodash';
 import React, { createContext, useCallback, useContext, useMemo, useState } from 'react';
@@ -45,6 +45,7 @@ import { useTranslation } from 'react-i18next';
 import { APIClientProvider, ActionContextProvider, CollectionManagerContext, FormProvider, RemoteSchemaComponent, SchemaComponent, SchemaComponentContext, SchemaComponentOptions, createDesignable, findFormBlock, useAPIClient, useCollection, useCollectionManager, useCompile, useDesignable, useFilterBlock, useLinkageCollectionFilterOptions } from '..';
 import { findFilterTargets, updateFilterTargets } from '../block-provider/hooks';
 import { isSameCollection, useSupportedBlocks } from '../filter-provider/utils';
+import { useCollectMenuItem, useCollectMenuItems, useMenuItem } from '../hooks/useMenuItem';
 import { getTargetKey } from '../schema-component/antd/association-filter/utilts';
 import { useSchemaTemplateManager } from '../schema-templates';
 import { useBlockTemplateContext } from '../schema-templates/BlockTemplate';
@@ -73,6 +74,7 @@ export var SchemaSettingsProvider = function SchemaSettingsProvider(props) {
     }, others)
   }, children);
 };
+var overlayClassName = classNames('nb-schema-initializer-button-overlay', css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    .ant-dropdown-menu-item-group-list {\n      max-height: 40vh;\n      overflow: auto;\n    }\n  "]))));
 export var SchemaSettings = function SchemaSettings(props) {
   var title = props.title,
     dn = props.dn,
@@ -81,22 +83,44 @@ export var SchemaSettings = function SchemaSettings(props) {
     _useState2 = _slicedToArray(_useState, 2),
     visible = _useState2[0],
     setVisible = _useState2[1];
-  var DropdownMenu = /*#__PURE__*/React.createElement(Dropdown, {
-    open: visible,
-    onOpenChange: function onOpenChange(visible) {
-      setVisible(visible);
-    },
-    overlay: /*#__PURE__*/React.createElement(Menu, null, props.children),
-    overlayClassName: classNames('nb-schema-initializer-button-overlay', css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n          .ant-dropdown-menu-item-group-list {\n            max-height: 40vh;\n            overflow: auto;\n          }\n        "]))))
-  }, typeof title === 'string' ? /*#__PURE__*/React.createElement("span", null, title) : title);
+  var _useMenuItem = useMenuItem(),
+    Component = _useMenuItem.Component,
+    getMenuItems = _useMenuItem.getMenuItems;
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    shouldRender = _useState4[0],
+    setShouldRender = _useState4[1];
+  if (!shouldRender) {
+    return /*#__PURE__*/React.createElement("div", {
+      onMouseEnter: function onMouseEnter() {
+        setShouldRender(true);
+        setVisible(true);
+      }
+    }, typeof title === 'string' ? /*#__PURE__*/React.createElement("span", null, title) : title);
+  }
+  var dropdownMenu = function dropdownMenu() {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Component, null), /*#__PURE__*/React.createElement(Dropdown, {
+      open: visible,
+      onOpenChange: function onOpenChange() {
+        setShouldRender(false);
+        setVisible(false);
+      },
+      menu: {
+        items: getMenuItems(function () {
+          return props.children;
+        })
+      },
+      overlayClassName: overlayClassName
+    }, typeof title === 'string' ? /*#__PURE__*/React.createElement("span", null, title) : title));
+  };
   if (dn) {
     return /*#__PURE__*/React.createElement(SchemaSettingsProvider, _objectSpread({
       visible: visible,
       setVisible: setVisible,
       dn: dn
-    }, others), DropdownMenu);
+    }, others), dropdownMenu());
   }
-  return DropdownMenu;
+  return dropdownMenu();
 };
 SchemaSettings.Template = function Template(props) {
   var componentName = props.componentName,
@@ -449,14 +473,17 @@ SchemaSettings.FormItemTemplate = function FormItemTemplate(props) {
   }, t('Save as block template'));
 };
 SchemaSettings.Item = function Item(props) {
+  var _useCollectMenuItems = useCollectMenuItems(),
+    pushMenuItem = _useCollectMenuItems.pushMenuItem;
+  var _useCollectMenuItem = useCollectMenuItem(),
+    collectMenuItem = _useCollectMenuItem.collectMenuItem;
   var eventKey = props.eventKey;
   var key = useMemo(function () {
     return uid();
   }, []);
-  return /*#__PURE__*/React.createElement(Menu.Item, _objectSpread(_objectSpread({
+  var item = _objectSpread(_objectSpread({}, _.omit(props, ['children'])), {}, {
     key: key,
-    eventKey: eventKey || key
-  }, props), {}, {
+    eventKey: eventKey || key,
     onClick: function onClick(info) {
       var _props$onClick;
       info.domEvent.preventDefault();
@@ -465,17 +492,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__*/React.createElement(Menu.ItemGroup, _objectSpread({}, props));
+SchemaSettings.ItemGroup = function ItemGroup(props) {
+  var _useMenuItem2 = useMenuItem(),
+    Component = _useMenuItem2.Component,
+    getMenuItems = _useMenuItem2.getMenuItems;
+  var _useCollectMenuItems2 = useCollectMenuItems(),
+    pushMenuItem = _useCollectMenuItems2.pushMenuItem;
+  var key = useMemo(function () {
+    return uid();
+  }, []);
+  var item = {
+    key: key,
+    type: 'group',
+    title: props.title,
+    label: props.title,
+    children: getMenuItems(function () {
+      return props.children;
+    })
+  };
+  pushMenuItem(item);
+  return /*#__PURE__*/React.createElement(Component, null);
 };
-SchemaSettings.SubMenu = function (props) {
-  return /*#__PURE__*/React.createElement(Menu.SubMenu, _objectSpread({}, props));
+SchemaSettings.SubMenu = function SubMenu(props) {
+  var _useMenuItem3 = useMenuItem(),
+    Component = _useMenuItem3.Component,
+    getMenuItems = _useMenuItem3.getMenuItems;
+  var _useCollectMenuItems3 = useCollectMenuItems(),
+    pushMenuItem = _useCollectMenuItems3.pushMenuItem;
+  var key = useMemo(function () {
+    return uid();
+  }, []);
+  var item = {
+    key: key,
+    label: props.title,
+    title: props.title,
+    children: getMenuItems(function () {
+      return props.children;
+    })
+  };
+  pushMenuItem(item);
+  return /*#__PURE__*/React.createElement(Component, null);
 };
-SchemaSettings.Divider = function (props) {
-  return /*#__PURE__*/React.createElement(Menu.Divider, _objectSpread({}, props));
+SchemaSettings.Divider = function Divider() {
+  var _useCollectMenuItems4 = useCollectMenuItems(),
+    pushMenuItem = _useCollectMenuItems4.pushMenuItem;
+  var key = useMemo(function () {
+    return uid();
+  }, []);
+  var item = {
+    key: key,
+    type: 'divider'
+  };
+  pushMenuItem(item);
+  return null;
 };
 SchemaSettings.Remove = function Remove(props) {
   var confirm = props.confirm,
@@ -529,6 +606,7 @@ SchemaSettings.ConnectDataBlocks = function ConnectDataBlocks(props) {
   var _useFilterBlock = useFilterBlock(),
     inProvider = _useFilterBlock.inProvider;
   var dataBlocks = useSupportedBlocks(type);
+  // eslint-disable-next-line prefer-const
   var _findFilterTargets = findFilterTargets(fieldSchema),
     _findFilterTargets$ta = _findFilterTargets.targets,
     targets = _findFilterTargets$ta === void 0 ? [] : _findFilterTargets$ta,
@@ -638,14 +716,14 @@ SchemaSettings.ConnectDataBlocks = function ConnectDataBlocks(props) {
   });
   return /*#__PURE__*/React.createElement(SchemaSettings.SubMenu, {
     title: t('Connect data blocks')
-  }, Content.length ? Content : /*#__PURE__*/React.createElement(Empty, {
+  }, Content.length ? Content : /*#__PURE__*/React.createElement(SchemaSettings.Item, null, /*#__PURE__*/React.createElement(Empty, {
     style: {
       width: 160,
       padding: '0 1em'
     },
     description: emptyDescription,
     image: Empty.PRESENTED_IMAGE_SIMPLE
-  }));
+  })));
 };
 SchemaSettings.SelectItem = function SelectItem(props) {
   var title = props.title,
@@ -655,10 +733,10 @@ SchemaSettings.SelectItem = function SelectItem(props) {
     openOnHover = props.openOnHover,
     _onClick = props.onClick,
     others = _objectWithoutProperties(props, _excluded3);
-  var _useState3 = useState(false),
-    _useState4 = _slicedToArray(_useState3, 2),
-    open = _useState4[0],
-    setOpen = _useState4[1];
+  var _useState5 = 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++) {
@@ -722,10 +800,10 @@ SchemaSettings.SwitchItem = function SwitchItem(props) {
   var title = props.title,
     onChange = props.onChange,
     others = _objectWithoutProperties(props, _excluded5);
-  var _useState5 = useState(!!props.checked),
-    _useState6 = _slicedToArray(_useState5, 2),
-    checked = _useState6[0],
-    setChecked = _useState6[1];
+  var _useState7 = useState(!!props.checked),
+    _useState8 = _slicedToArray(_useState7, 2),
+    checked = _useState8[0],
+    setChecked = _useState8[1];
   return /*#__PURE__*/React.createElement(SchemaSettings.Item, _objectSpread(_objectSpread({}, others), {}, {
     onClick: function onClick() {
       onChange === null || onChange === void 0 ? void 0 : onChange(!checked);
@@ -748,10 +826,10 @@ SchemaSettings.SwitchItem = function SwitchItem(props) {
 SchemaSettings.PopupItem = function PopupItem(props) {
   var schema = props.schema,
     others = _objectWithoutProperties(props, _excluded6);
-  var _useState7 = useState(false),
-    _useState8 = _slicedToArray(_useState7, 2),
-    visible = _useState8[0],
-    setVisible = _useState8[1];
+  var _useState9 = useState(false),
+    _useState10 = _slicedToArray(_useState9, 2),
+    visible = _useState10[0],
+    setVisible = _useState10[1];
   var ctx = useContext(SchemaSettingsContext);
   return /*#__PURE__*/React.createElement(ActionContextProvider, {
     value: {
@@ -779,14 +857,14 @@ SchemaSettings.ActionModalItem = /*#__PURE__*/React.memo(function (props) {
     modalTip = props.modalTip,
     components = props.components,
     others = _objectWithoutProperties(props, _excluded7);
-  var _useState9 = useState(false),
-    _useState10 = _slicedToArray(_useState9, 2),
-    visible = _useState10[0],
-    setVisible = _useState10[1];
-  var _useState11 = useState(props.uid),
+  var _useState11 = useState(false),
     _useState12 = _slicedToArray(_useState11, 2),
-    schemaUid = _useState12[0],
-    setSchemaUid = _useState12[1];
+    visible = _useState12[0],
+    setVisible = _useState12[1];
+  var _useState13 = useState(props.uid),
+    _useState14 = _slicedToArray(_useState13, 2),
+    schemaUid = _useState14[0],
+    setSchemaUid = _useState14[1];
   var _useTranslation5 = useTranslation(),
     t = _useTranslation5.t;
   var fieldSchema = useFieldSchema();
@@ -873,7 +951,7 @@ SchemaSettings.ActionModalItem = /*#__PURE__*/React.memo(function (props) {
     title: compile(title)
   }, others), {}, {
     destroyOnClose: true,
-    visible: visible,
+    open: visible,
     onCancel: cancelHandler,
     footer: /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Button, {
       onClick: cancelHandler
@@ -1252,7 +1330,6 @@ SchemaSettings.EnableChildCollections = function EnableChildCollectionsItem(prop
       ArrayItems: ArrayItems,
       FormLayout: FormLayout
     },
-    width: 600,
     schema: {
       type: 'object',
       title: t('Enable child collections'),

package/es/schema-settings/VariableInput/hooks/useFormVariable.d.ts

@@ -0,0 +1,19 @@
+import { Schema } from '@formily/react';
+export declare const useFormVariable: ({ blockForm, rootCollection, operator, schema, level, }: {
+    blockForm?: any;
+    rootCollection: string;
+    operator?: any;
+    schema: Schema;
+    level?: number;
+}) => {
+    label: string;
+    value: string;
+    key: string;
+    children: any[];
+    isLeaf: boolean;
+    field: {
+        target: string;
+    };
+    depth: number;
+    loadChildren: (option: any) => Promise<void>;
+};