@nocobase/client 0.9.1-alpha.2 → 0.9.2-alpha.1

package/es/schema-component/hooks/useDesigner.js

@@ -1,14 +1,11 @@
 import { useFieldSchema } from '@formily/react';
 import { useComponent, useDesignable } from '.';
-
 var Def = function Def() {
   return null;
 };
-
 export var useDesigner = function useDesigner() {
   var _useDesignable = useDesignable(),
-      designable = _useDesignable.designable;
-
+    designable = _useDesignable.designable;
   var fieldSchema = useFieldSchema();
   var component = useComponent(fieldSchema['x-designer'], Def);
   return designable ? component : Def;

package/es/schema-component/hooks/useFieldComponentOptions.js

@@ -3,26 +3,33 @@ import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useCollection, useCollectionManager } from '../../collection-manager';
 export var useFieldComponentOptions = function useFieldComponentOptions() {
+  var _fieldSchema$xCompon;
   var _useCollectionManager = useCollectionManager(),
-      getCollectionJoinField = _useCollectionManager.getCollectionJoinField;
-
+    getCollectionJoinField = _useCollectionManager.getCollectionJoinField,
+    getCollection = _useCollectionManager.getCollection;
   var fieldSchema = useFieldSchema();
-
   var _useCollection = useCollection(),
-      getField = _useCollection.getField;
-
+    getField = _useCollection.getField;
   var collectionField = getField(fieldSchema['name']) || getCollectionJoinField(fieldSchema['x-collection-field']);
-
   var _useTranslation = useTranslation(),
-      t = _useTranslation.t;
-
+    t = _useTranslation.t;
+  var _ref = ((_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : _fieldSchema$xCompon.fieldNames) || {},
+    label = _ref.label;
   var fieldComponentOptions = useMemo(function () {
     if (!collectionField || !(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface)) {
       return;
     }
-
     if (!['o2o', 'oho', 'obo', 'o2m', 'linkTo', 'm2o', 'm2m'].includes(collectionField.interface)) return;
-
+    var collection = getCollection(collectionField.target);
+    if ((collection === null || collection === void 0 ? void 0 : collection.template) === 'file') {
+      return [{
+        label: t('Record picker'),
+        value: 'CollectionField'
+      }, {
+        label: t('Select'),
+        value: 'AssociationSelect'
+      }];
+    }
     switch (collectionField.interface) {
       case 'o2m':
         return [{
@@ -35,7 +42,6 @@ export var useFieldComponentOptions = function useFieldComponentOptions() {
           label: t('Select'),
           value: 'AssociationSelect'
         }];
-
       case 'm2o':
       case 'm2m':
       case 'linkTo':
@@ -46,7 +52,6 @@ export var useFieldComponentOptions = function useFieldComponentOptions() {
           label: t('Select'),
           value: 'AssociationSelect'
         }];
-
       default:
         return [{
           label: t('Record picker'),
@@ -59,6 +64,6 @@ export var useFieldComponentOptions = function useFieldComponentOptions() {
           value: 'AssociationSelect'
         }];
     }
-  }, [t, collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface]);
+  }, [t, collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface, label]);
   return fieldComponentOptions;
 };

package/es/schema-component/hooks/useFieldProps.js

@@ -1,9 +1,9 @@
+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) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+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 { useContext, useRef } from 'react';
 import { SchemaExpressionScopeContext, SchemaOptionsContext } from '@formily/react';
 export var useFieldProps = function useFieldProps(schema) {
@@ -15,6 +15,5 @@ export var useFieldProps = function useFieldProps(schema) {
     get scope() {
       return _objectSpread(_objectSpread({}, options.scope), scopeRef.current);
     }
-
   }));
 };

package/es/schema-component/hooks/useFieldTitle.js

@@ -4,22 +4,17 @@ import { useCompile } from "./useCompile";
 import { useCollection, useCollectionManager } from "../../collection-manager";
 export var useFieldTitle = function useFieldTitle() {
   var _collectionField$uiSc2;
-
   var field = useField();
   var fieldSchema = useFieldSchema();
-
   var _useCollection = useCollection(),
-      getField = _useCollection.getField;
-
+    getField = _useCollection.getField;
   var _useCollectionManager = useCollectionManager(),
-      getCollectionJoinField = _useCollectionManager.getCollectionJoinField;
-
+    getCollectionJoinField = _useCollectionManager.getCollectionJoinField;
   var collectionField = getField(fieldSchema['name']) || getCollectionJoinField(fieldSchema['x-collection-field']);
   var compile = useCompile();
   useEffect(function () {
     if (!(field === null || field === void 0 ? void 0 : field.title)) {
       var _collectionField$uiSc;
-
       field.title = compile(collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc = collectionField.uiSchema) === null || _collectionField$uiSc === void 0 ? void 0 : _collectionField$uiSc.title);
     }
   }, [collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc2 = collectionField.uiSchema) === null || _collectionField$uiSc2 === void 0 ? void 0 : _collectionField$uiSc2.title]);

package/es/schema-component/hooks/useProps.js

@@ -1,14 +1,10 @@
 var _excluded = ["useProps"];
-
 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; }
-
 import { merge } from '@formily/shared';
 export var useProps = function useProps(props, options) {
   var useProps = props.useProps,
-      props1 = _objectWithoutProperties(props, _excluded);
-
+    props1 = _objectWithoutProperties(props, _excluded);
   var props2 = typeof useProps === 'function' ? useProps() : {};
   return merge(props1 || {}, props2, options);
 };

package/es/schema-component/hooks/useTableSize.d.ts

@@ -0,0 +1,5 @@
+export declare const useTableSize: () => {
+    height: number;
+    width: number;
+    tableSizeRefCallback: (instance: HTMLDivElement) => void;
+};

package/es/schema-component/hooks/useTableSize.js

@@ -0,0 +1,42 @@
+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; }
+import { useEventListener } from 'ahooks';
+import { useCallback, useRef, useState } from 'react';
+export var useTableSize = function useTableSize() {
+  var _useState = useState(0),
+    _useState2 = _slicedToArray(_useState, 2),
+    height = _useState2[0],
+    setTableHeight = _useState2[1];
+  var _useState3 = useState(0),
+    _useState4 = _slicedToArray(_useState3, 2),
+    width = _useState4[0],
+    setTableWidth = _useState4[1];
+  var elementRef = useRef();
+  var calcTableSize = useCallback(function () {
+    var _elementRef$current$q, _elementRef$current$q2, _elementRef$current$q3;
+    if (!elementRef.current) return;
+    var clientRect = elementRef.current.getBoundingClientRect();
+    var tableHeight = Math.ceil((clientRect === null || clientRect === void 0 ? void 0 : clientRect.height) || 0);
+    var headerHeight = ((_elementRef$current$q = elementRef.current.querySelector('.ant-table-header')) === null || _elementRef$current$q === void 0 ? void 0 : _elementRef$current$q.getBoundingClientRect().height) || 0;
+    var tableContentRect = (_elementRef$current$q2 = elementRef.current.querySelector('.ant-table')) === null || _elementRef$current$q2 === void 0 ? void 0 : _elementRef$current$q2.getBoundingClientRect();
+    if (!tableContentRect) return;
+    var paginationRect = (_elementRef$current$q3 = elementRef.current.querySelector('.ant-table-pagination')) === null || _elementRef$current$q3 === void 0 ? void 0 : _elementRef$current$q3.getBoundingClientRect();
+    var paginationHeight = paginationRect ? paginationRect.y - tableContentRect.height - tableContentRect.y + paginationRect.height : 0;
+    setTableWidth(clientRect.width);
+    setTableHeight(tableHeight - headerHeight - paginationHeight);
+  }, []);
+  var tableSizeRefCallback = function tableSizeRefCallback(ref) {
+    elementRef.current = ref;
+    calcTableSize();
+  };
+  useEventListener('resize', calcTableSize);
+  return {
+    height: height,
+    width: width,
+    tableSizeRefCallback: tableSizeRefCallback
+  };
+};

package/es/schema-initializer/SchemaInitializer.js

@@ -1,32 +1,21 @@
+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); }
 var _templateObject;
-
 var _excluded = ["title", "insert", "wrap", "items", "insertPosition", "dropdown", "component", "style", "icon", "onSuccess"],
-    _excluded2 = ["eventKey", "items", "children", "icon", "onClick"];
-
+  _excluded2 = ["eventKey", "items", "children", "icon", "onClick"];
 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) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _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 = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
+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 _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; }
-
 import { css } from '@emotion/css';
 import { observer } from '@formily/react';
 import { Button, Dropdown, Menu, Switch } from 'antd';
@@ -35,11 +24,9 @@ import React, { createContext, useContext, useState } from 'react';
 import { Icon } from '../icon';
 import { useCompile, useDesignable } from '../schema-component/hooks';
 import './style.less';
-
 var defaultWrap = function defaultWrap(s) {
   return s;
 };
-
 export var SchemaInitializerItemContext = /*#__PURE__*/createContext(null);
 export var SchemaInitializerButtonContext = /*#__PURE__*/createContext({});
 export var SchemaInitializer = function SchemaInitializer() {
@@ -48,32 +35,28 @@ export var SchemaInitializer = function SchemaInitializer() {
 var menuItemGroupCss = 'nb-menu-item-group';
 SchemaInitializer.Button = observer(function (props) {
   var title = props.title,
-      insert = props.insert,
-      _props$wrap = props.wrap,
-      wrap = _props$wrap === void 0 ? defaultWrap : _props$wrap,
-      _props$items = props.items,
-      items = _props$items === void 0 ? [] : _props$items,
-      _props$insertPosition = props.insertPosition,
-      insertPosition = _props$insertPosition === void 0 ? 'beforeEnd' : _props$insertPosition,
-      dropdown = props.dropdown,
-      component = props.component,
-      style = props.style,
-      icon = props.icon,
-      onSuccess = props.onSuccess,
-      others = _objectWithoutProperties(props, _excluded);
-
+    insert = props.insert,
+    _props$wrap = props.wrap,
+    wrap = _props$wrap === void 0 ? defaultWrap : _props$wrap,
+    _props$items = props.items,
+    items = _props$items === void 0 ? [] : _props$items,
+    _props$insertPosition = props.insertPosition,
+    insertPosition = _props$insertPosition === void 0 ? 'beforeEnd' : _props$insertPosition,
+    dropdown = props.dropdown,
+    component = props.component,
+    style = props.style,
+    icon = props.icon,
+    onSuccess = props.onSuccess,
+    others = _objectWithoutProperties(props, _excluded);
   var compile = useCompile();
-
   var _useDesignable = useDesignable(),
-      insertAdjacent = _useDesignable.insertAdjacent,
-      findComponent = _useDesignable.findComponent,
-      designable = _useDesignable.designable;
-
+    insertAdjacent = _useDesignable.insertAdjacent,
+    findComponent = _useDesignable.findComponent,
+    designable = _useDesignable.designable;
   var _useState = useState(false),
-      _useState2 = _slicedToArray(_useState, 2),
-      visible = _useState2[0],
-      setVisible = _useState2[1];
-
+    _useState2 = _slicedToArray(_useState, 2),
+    visible = _useState2[0],
+    setVisible = _useState2[1];
   var insertSchema = function insertSchema(schema) {
     if (props.insert) {
       props.insert(wrap(schema));
@@ -83,15 +66,16 @@ SchemaInitializer.Button = observer(function (props) {
       });
     }
   };
-
   var renderItems = function renderItems(items) {
-    return items === null || items === void 0 ? void 0 : items.map(function (item, indexA) {
+    var _items$filter;
+    return (_items$filter = items.filter(function (v) {
+      return v && ((v === null || v === void 0 ? void 0 : v.visible) ? v.visible() : true);
+    })) === null || _items$filter === void 0 ? void 0 : _items$filter.map(function (item, indexA) {
       if (item.type === 'divider') {
         return /*#__PURE__*/React.createElement(Menu.Divider, {
           key: item.key || "item-".concat(indexA)
         });
       }
-
       if (item.type === 'item' && item.component) {
         var Component = findComponent(item.component);
         item.key = "".concat(item.key || item.title, "-").concat(indexA);
@@ -110,19 +94,15 @@ SchemaInitializer.Button = observer(function (props) {
           insert: insertSchema
         })));
       }
-
       if (item.type === 'itemGroup') {
         var _item$children;
-
         return !!((_item$children = item.children) === null || _item$children === void 0 ? void 0 : _item$children.length) && /*#__PURE__*/React.createElement(Menu.ItemGroup, {
           key: item.key || "item-group-".concat(indexA),
           title: compile(item.title)
         }, renderItems(item.children));
       }
-
       if (item.type === 'subMenu') {
         var _item$children2;
-
         return !!((_item$children2 = item.children) === null || _item$children2 === void 0 ? void 0 : _item$children2.length) && /*#__PURE__*/React.createElement(Menu.SubMenu, {
           key: item.key || "item-group-".concat(indexA),
           title: compile(item.title),
@@ -131,18 +111,15 @@ SchemaInitializer.Button = observer(function (props) {
       }
     });
   };
-
   var menu = /*#__PURE__*/React.createElement(Menu, {
     style: {
       maxHeight: '60vh',
       overflowY: 'auto'
     }
   }, renderItems(items));
-
   if (!designable && props.designable !== true) {
     return null;
   }
-
   return /*#__PURE__*/React.createElement(SchemaInitializerButtonContext.Provider, {
     value: {
       visible: visible,
@@ -170,38 +147,33 @@ SchemaInitializer.Button = observer(function (props) {
     })
   }), compile(props.children || props.title))));
 });
-
 SchemaInitializer.Item = function (props) {
   var _useContext = useContext(SchemaInitializerItemContext),
-      index = _useContext.index,
-      info = _useContext.info;
-
+    index = _useContext.index,
+    info = _useContext.info;
   var compile = useCompile();
-
   var eventKey = props.eventKey,
-      _props$items2 = props.items,
-      items = _props$items2 === void 0 ? [] : _props$items2,
-      _props$children = props.children,
-      children = _props$children === void 0 ? info === null || info === void 0 ? void 0 : info.title : _props$children,
-      icon = props.icon,
-      _onClick = props.onClick,
-      others = _objectWithoutProperties(props, _excluded2);
-
+    _props$items2 = props.items,
+    items = _props$items2 === void 0 ? [] : _props$items2,
+    _props$children = props.children,
+    children = _props$children === void 0 ? info === null || info === void 0 ? void 0 : info.title : _props$children,
+    icon = props.icon,
+    _onClick = props.onClick,
+    others = _objectWithoutProperties(props, _excluded2);
   if ((items === null || items === void 0 ? void 0 : items.length) > 0) {
     var renderMenuItem = function renderMenuItem(items) {
       if (!(items === null || items === void 0 ? void 0 : items.length)) {
         return null;
       }
-
       return items.map(function (item, indexA) {
         if (item.type === 'divider') {
           return /*#__PURE__*/React.createElement(Menu.Divider, {
             key: "divider-".concat(indexA)
           });
         }
-
         if (item.type === 'itemGroup') {
-          return /*#__PURE__*/React.createElement(Menu.ItemGroup // @ts-ignore
+          return /*#__PURE__*/React.createElement(Menu.ItemGroup
+          // @ts-ignore
           , {
             // @ts-ignore
             eventKey: item.key || "item-group-".concat(indexA),
@@ -210,9 +182,9 @@ SchemaInitializer.Item = function (props) {
             className: menuItemGroupCss
           }, renderMenuItem(item.children));
         }
-
         if (item.type === 'subMenu') {
-          return /*#__PURE__*/React.createElement(Menu.SubMenu // @ts-ignore
+          return /*#__PURE__*/React.createElement(Menu.SubMenu
+          // @ts-ignore
           , {
             // @ts-ignore
             eventKey: item.key || "sub-menu-".concat(indexA),
@@ -220,15 +192,12 @@ SchemaInitializer.Item = function (props) {
             title: compile(item.title)
           }, renderMenuItem(item.children));
         }
-
         return /*#__PURE__*/React.createElement(Menu.Item, {
           eventKey: item.key,
           key: item.key,
           onClick: function onClick(info) {
             var _item$clearKeywords;
-
             item === null || item === void 0 ? void 0 : (_item$clearKeywords = item.clearKeywords) === null || _item$clearKeywords === void 0 ? void 0 : _item$clearKeywords.call(item);
-
             if (item.onClick) {
               item.onClick(_objectSpread(_objectSpread({}, info), {}, {
                 item: item
@@ -242,8 +211,8 @@ SchemaInitializer.Item = function (props) {
         }, compile(item.title));
       });
     };
-
-    return /*#__PURE__*/React.createElement(Menu.SubMenu // @ts-ignore
+    return /*#__PURE__*/React.createElement(Menu.SubMenu
+    // @ts-ignore
     , {
       // @ts-ignore
       eventKey: eventKey ? "".concat(eventKey, "-").concat(index) : info.key,
@@ -254,8 +223,8 @@ SchemaInitializer.Item = function (props) {
       }) : icon
     }, renderMenuItem(items));
   }
-
-  return /*#__PURE__*/React.createElement(Menu.Item // {...others}
+  return /*#__PURE__*/React.createElement(Menu.Item
+  // {...others}
   , {
     // {...others}
     key: info.key,
@@ -265,20 +234,16 @@ SchemaInitializer.Item = function (props) {
     }) : icon,
     onClick: function onClick(opts) {
       var _info$clearKeywords;
-
       info === null || info === void 0 ? void 0 : (_info$clearKeywords = info.clearKeywords) === null || _info$clearKeywords === void 0 ? void 0 : _info$clearKeywords.call(info);
-
       _onClick(_objectSpread(_objectSpread({}, opts), {}, {
         item: info
       }));
     }
   }, compile(children));
 };
-
 SchemaInitializer.itemWrap = function (component) {
   return component;
 };
-
 SchemaInitializer.SwitchItem = function (props) {
   return /*#__PURE__*/React.createElement(SchemaInitializer.Item, {
     onClick: props.onClick

package/es/schema-initializer/SchemaInitializerProvider.js

@@ -1,28 +1,26 @@
+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) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+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 { useFieldSchema } from '@formily/react';
 import { isPlainObj } from '@formily/shared';
+import get from 'lodash/get';
 import React, { createContext, useContext } from 'react';
 import { SchemaComponentOptions } from '../schema-component';
-import get from 'lodash/get';
+import { SchemaInitializer } from './SchemaInitializer';
 import * as globals from './buttons';
 import * as initializerComponents from './components';
 import * as items from './items';
-import { SchemaInitializer } from './SchemaInitializer';
 export var SchemaInitializerContext = /*#__PURE__*/createContext({});
 export var useSchemaInitializer = function useSchemaInitializer(name) {
   var props = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var fieldSchema = useFieldSchema();
   var initializers = useContext(SchemaInitializerContext);
-
   var _render = function render(component, props) {
     return component && /*#__PURE__*/React.createElement(component, props);
   };
-
   if (!name) {
     return {
       exists: false,
@@ -31,11 +29,8 @@ export var useSchemaInitializer = function useSchemaInitializer(name) {
       }
     };
   }
-
   var initializer = get(initializers, name || (fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-initializer']));
-
   var initializerProps = _objectSpread(_objectSpread({}, props), fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-initializer-props']);
-
   if (!initializer) {
     return {
       exists: false,
@@ -44,7 +39,6 @@ export var useSchemaInitializer = function useSchemaInitializer(name) {
       }
     };
   }
-
   if (isPlainObj(initializer)) {
     return {
       exists: true,
@@ -54,7 +48,6 @@ export var useSchemaInitializer = function useSchemaInitializer(name) {
       }
     };
   }
-
   return {
     exists: true,
     render: function render(props) {
@@ -65,10 +58,11 @@ export var useSchemaInitializer = function useSchemaInitializer(name) {
 export var SchemaInitializerPluginContext = /*#__PURE__*/createContext(null);
 export var SchemaInitializerProvider = function SchemaInitializerProvider(props) {
   var initializers = props.initializers,
-      components = props.components,
-      children = props.children;
+    components = props.components,
+    children = props.children;
+  var parentInitializers = useContext(SchemaInitializerContext);
   return /*#__PURE__*/React.createElement(SchemaInitializerContext.Provider, {
-    value: _objectSpread(_objectSpread({}, globals), initializers)
+    value: _objectSpread(_objectSpread(_objectSpread({}, globals), parentInitializers), initializers)
   }, /*#__PURE__*/React.createElement(SchemaComponentOptions, {
     components: _objectSpread(_objectSpread(_objectSpread({}, items), components), initializerComponents)
   }, children));

package/es/schema-initializer/SelectCollection.js

@@ -4,15 +4,12 @@ import { useTranslation } from 'react-i18next';
 import { useCollectionManager } from '../collection-manager';
 export var SelectCollection = function SelectCollection(_ref) {
   var value = _ref.value,
-      _onChange = _ref.onChange,
-      setSelected = _ref.setSelected;
-
+    _onChange = _ref.onChange,
+    setSelected = _ref.setSelected;
   var _useTranslation = useTranslation(),
-      t = _useTranslation.t;
-
+    t = _useTranslation.t;
   var _useCollectionManager = useCollectionManager(),
-      collections = _useCollectionManager.collections;
-
+    collections = _useCollectionManager.collections;
   return /*#__PURE__*/React.createElement("div", {
     style: {
       width: 210
@@ -30,13 +27,11 @@ export var SelectCollection = function SelectCollection(_ref) {
         if (!collection.title) {
           return;
         }
-
         return collection.title.toUpperCase().includes(e.target.value.toUpperCase());
       }).map(function (item) {
         return item.name;
       });
       setSelected(names);
-
       _onChange(e.target.value);
     }
   }), /*#__PURE__*/React.createElement(Divider, {

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

@@ -1,5 +1,5 @@
-import { gridRowColWrap } from '../utils'; // 页面里添加区块
-
+import { gridRowColWrap } from '../utils';
+// 页面里添加区块
 export var BlockInitializers = {
   title: '{{t("Add block")}}',
   icon: 'PlusOutlined',
@@ -33,6 +33,26 @@ export var BlockInitializers = {
       type: 'item',
       title: '{{t("Kanban")}}',
       component: 'KanbanBlockInitializer'
+    }, {
+      key: 'Gantt',
+      type: 'item',
+      title: '{{t("Gantt")}}',
+      component: 'GanttBlockInitializer'
+    }]
+  }, {
+    key: 'filterBlocks',
+    type: 'itemGroup',
+    title: '{{t("Filter blocks")}}',
+    children: [{
+      key: 'filterForm',
+      type: 'item',
+      title: '{{t("Form")}}',
+      component: 'FilterFormBlockInitializer'
+    }, {
+      key: 'filterCollapse',
+      type: 'item',
+      title: '{{t("Collapse")}}',
+      component: 'FilterCollapseBlockInitializer'
     }]
   }, {
     key: 'media',

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

@@ -5,10 +5,9 @@ import { SchemaInitializer } from '../SchemaInitializer';
 import { gridRowColWrap, useAssociatedFormItemInitializerFields, useCustomBulkEditFormItemInitializerFields } from '../utils';
 export var BulkEditFormItemInitializers = function BulkEditFormItemInitializers(props) {
   var _useTranslation = useTranslation(),
-      t = _useTranslation.t;
-
+    t = _useTranslation.t;
   var insertPosition = props.insertPosition,
-      component = props.component;
+    component = props.component;
   var associationFields = useAssociatedFormItemInitializerFields({
     readPretty: true,
     block: 'Form'