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

package/es/schema-initializer/utils.js

@@ -1,43 +1,41 @@
 var _excluded = ["formItemInitializers", "actionInitializers", "collection", "association", "resource", "template"],
-    _excluded2 = ["formItemInitializers", "actionInitializers", "collection", "resource", "association", "action", "template"],
-    _excluded3 = ["formItemInitializers", "actionInitializers", "collection", "association", "resource", "template"],
-    _excluded4 = ["collection", "resource", "rowKey", "tableActionInitializers", "tableColumnInitializers", "tableActionColumnInitializers", "tableBlockProvider", "disableTemplate"],
-    _excluded5 = ["collection", "resource", "rowKey"],
-    _excluded6 = ["collection", "resource", "fieldNames"],
-    _excluded7 = ["collection", "resource", "groupField"];
-
+  _excluded2 = ["formItemInitializers", "actionInitializers", "collection", "resource", "association", "action", "template"],
+  _excluded3 = ["formItemInitializers", "actionInitializers", "collection", "resource", "association", "action", "template"],
+  _excluded4 = ["formItemInitializers", "actionInitializers", "collection", "association", "resource", "template"],
+  _excluded5 = ["collection", "resource", "rowKey", "tableActionInitializers", "tableColumnInitializers", "tableActionColumnInitializers", "tableBlockProvider", "disableTemplate", "TableBlockDesigner", "blockType", "pageSize"],
+  _excluded6 = ["collection", "resource", "rowKey"],
+  _excluded7 = ["collection", "resource", "fieldNames"],
+  _excluded8 = ["collection", "resource", "fieldNames"],
+  _excluded9 = ["collection", "resource", "groupField"];
+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 _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 _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 _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 _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 _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); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(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 _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 { Schema, useFieldSchema, useForm } from '@formily/react';
 import { uid } from '@formily/shared';
 import React, { useContext, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { BlockRequestContext } from '../';
 import { useCollection, useCollectionManager } from '../collection-manager';
+import { isAssocField } from '../filter-provider/utils';
 import { useActionContext, useDesignable } from '../schema-component';
 import { useSchemaTemplateManager } from '../schema-templates';
 import { SelectCollection } from './SelectCollection';
-export var itemsMerge = function itemsMerge(items1, items2) {
+export var itemsMerge = function itemsMerge(items1) {
   return items1;
 };
 export var gridRowColWrap = function gridRowColWrap(schema) {
@@ -66,7 +64,6 @@ export var useRemoveGridFormItem = function useRemoveGridFormItem() {
   var form = useForm();
   return function (schema, cb) {
     var _form$values;
-
     cb(schema, {
       removeParentsIfNoChildren: true,
       breakRemoveOn: {
@@ -82,36 +79,30 @@ export var findTableColumn = function findTableColumn(schema, key, action) {
     if (s[key] === action) {
       return s;
     }
-
     var c = s.reduceProperties(function (buf, s) {
       if (s[key] === action) {
         return s;
       }
-
       return buf;
     });
-
     if (c) {
       return c;
     }
-
     return buf;
   });
 };
 export var useTableColumnInitializerFields = function useTableColumnInitializerFields() {
   var _useCollection = useCollection(),
-      name = _useCollection.name,
-      _useCollection$curren = _useCollection.currentFields,
-      currentFields = _useCollection$curren === void 0 ? [] : _useCollection$curren;
-
+    name = _useCollection.name,
+    _useCollection$curren = _useCollection.currentFields,
+    currentFields = _useCollection$curren === void 0 ? [] : _useCollection$curren;
   var _useCollectionManager = useCollectionManager(),
-      getInterface = _useCollectionManager.getInterface;
-
+    getInterface = _useCollectionManager.getInterface,
+    getCollection = _useCollectionManager.getCollection;
   return currentFields.filter(function (field) {
-    return (field === null || field === void 0 ? void 0 : field.interface) && (field === null || field === void 0 ? void 0 : field.interface) !== 'subTable' && !(field === null || field === void 0 ? void 0 : field.isForeignKey);
+    return (field === null || field === void 0 ? void 0 : field.interface) && (field === null || field === void 0 ? void 0 : field.interface) !== 'subTable' && !(field === null || field === void 0 ? void 0 : field.isForeignKey) && !(field === null || field === void 0 ? void 0 : field.treeChildren);
   }).map(function (field) {
     var _field$uiSchema;
-
     var interfaceConfig = getInterface(field.interface);
     var schema = {
       name: field.name,
@@ -119,8 +110,8 @@ export var useTableColumnInitializerFields = function useTableColumnInitializerF
       'x-component': 'CollectionField',
       'x-read-pretty': true,
       'x-component-props': {}
-    }; // interfaceConfig?.schemaInitialize?.(schema, { field, readPretty: true, block: 'Table' });
-
+    };
+    // interfaceConfig?.schemaInitialize?.(schema, { field, readPretty: true, block: 'Table' });
     return {
       type: 'item',
       title: (field === null || field === void 0 ? void 0 : (_field$uiSchema = field.uiSchema) === null || _field$uiSchema === void 0 ? void 0 : _field$uiSchema.title) || field.name,
@@ -129,11 +120,11 @@ export var useTableColumnInitializerFields = function useTableColumnInitializerF
       remove: removeTableColumn,
       schemaInitialize: function schemaInitialize(s) {
         var _interfaceConfig$sche;
-
         interfaceConfig === null || interfaceConfig === void 0 ? void 0 : (_interfaceConfig$sche = interfaceConfig.schemaInitialize) === null || _interfaceConfig$sche === void 0 ? void 0 : _interfaceConfig$sche.call(interfaceConfig, s, {
           field: field,
           readPretty: true,
-          block: 'Table'
+          block: 'Table',
+          targetCollection: getCollection(field.target)
         });
       },
       field: field,
@@ -143,29 +134,28 @@ export var useTableColumnInitializerFields = function useTableColumnInitializerF
 };
 export var useAssociatedTableColumnInitializerFields = function useAssociatedTableColumnInitializerFields() {
   var _fields$filter;
-
   var _useCollection2 = useCollection(),
-      name = _useCollection2.name,
-      fields = _useCollection2.fields;
-
+    name = _useCollection2.name,
+    fields = _useCollection2.fields;
   var _useCollectionManager2 = useCollectionManager(),
-      getInterface = _useCollectionManager2.getInterface,
-      getCollectionFields = _useCollectionManager2.getCollectionFields;
-
+    getInterface = _useCollectionManager2.getInterface,
+    getCollectionFields = _useCollectionManager2.getCollectionFields,
+    getCollection = _useCollectionManager2.getCollection;
   var groups = fields === null || fields === void 0 ? void 0 : (_fields$filter = fields.filter(function (field) {
     return ['o2o', 'oho', 'obo', 'm2o'].includes(field.interface);
   })) === null || _fields$filter === void 0 ? void 0 : _fields$filter.map(function (field) {
     var _subFields$filter, _field$uiSchema2;
-
     var subFields = getCollectionFields(field.target);
-    var items = subFields // ?.filter((subField) => subField?.interface && !['o2o', 'oho', 'obo', 'o2m', 'm2o', 'subTable', 'linkTo'].includes(subField?.interface))
-    === null || subFields // ?.filter((subField) => subField?.interface && !['o2o', 'oho', 'obo', 'o2m', 'm2o', 'subTable', 'linkTo'].includes(subField?.interface))
-    === void 0 ? void 0 : (_subFields$filter = subFields // ?.filter((subField) => subField?.interface && !['o2o', 'oho', 'obo', 'o2m', 'm2o', 'subTable', 'linkTo'].includes(subField?.interface))
+    var items = subFields
+    // ?.filter((subField) => subField?.interface && !['o2o', 'oho', 'obo', 'o2m', 'm2o', 'subTable', 'linkTo'].includes(subField?.interface))
+    === null || subFields
+    // ?.filter((subField) => subField?.interface && !['o2o', 'oho', 'obo', 'o2m', 'm2o', 'subTable', 'linkTo'].includes(subField?.interface))
+    === void 0 ? void 0 : (_subFields$filter = subFields
+    // ?.filter((subField) => subField?.interface && !['o2o', 'oho', 'obo', 'o2m', 'm2o', 'subTable', 'linkTo'].includes(subField?.interface))
     .filter(function (subField) {
-      return (subField === null || subField === void 0 ? void 0 : subField.interface) && !['subTable'].includes(subField === null || subField === void 0 ? void 0 : subField.interface);
+      return (subField === null || subField === void 0 ? void 0 : subField.interface) && !['subTable'].includes(subField === null || subField === void 0 ? void 0 : subField.interface) && !(subField === null || subField === void 0 ? void 0 : subField.treeChildren);
     })) === null || _subFields$filter === void 0 ? void 0 : _subFields$filter.map(function (subField) {
       var _subField$uiSchema;
-
       var interfaceConfig = getInterface(subField.interface);
       var schema = {
         // type: 'string',
@@ -184,11 +174,11 @@ export var useAssociatedTableColumnInitializerFields = function useAssociatedTab
         remove: removeTableColumn,
         schemaInitialize: function schemaInitialize(s) {
           var _interfaceConfig$sche2;
-
           interfaceConfig === null || interfaceConfig === void 0 ? void 0 : (_interfaceConfig$sche2 = interfaceConfig.schemaInitialize) === null || _interfaceConfig$sche2 === void 0 ? void 0 : _interfaceConfig$sche2.call(interfaceConfig, s, {
             field: subField,
             readPretty: true,
-            block: 'Table'
+            block: 'Table',
+            targetCollection: getCollection(field.target)
           });
         },
         field: subField,
@@ -205,14 +195,12 @@ export var useAssociatedTableColumnInitializerFields = function useAssociatedTab
 };
 export var useInheritsTableColumnInitializerFields = function useInheritsTableColumnInitializerFields() {
   var _useCollection3 = useCollection(),
-      name = _useCollection3.name;
-
+    name = _useCollection3.name;
   var _useCollectionManager3 = useCollectionManager(),
-      getInterface = _useCollectionManager3.getInterface,
-      getInheritCollections = _useCollectionManager3.getInheritCollections,
-      getCollection = _useCollectionManager3.getCollection,
-      getParentCollectionFields = _useCollectionManager3.getParentCollectionFields;
-
+    getInterface = _useCollectionManager3.getInterface,
+    getInheritCollections = _useCollectionManager3.getInheritCollections,
+    getCollection = _useCollectionManager3.getCollection,
+    getParentCollectionFields = _useCollectionManager3.getParentCollectionFields;
   var inherits = getInheritCollections(name);
   return inherits === null || inherits === void 0 ? void 0 : inherits.map(function (v) {
     var fields = getParentCollectionFields(v, name);
@@ -221,7 +209,6 @@ export var useInheritsTableColumnInitializerFields = function useInheritsTableCo
       return field === null || field === void 0 ? void 0 : field.interface;
     }).map(function (k) {
       var _k$uiSchema;
-
       var interfaceConfig = getInterface(k.interface);
       var schema = {
         name: "".concat(k.name),
@@ -238,11 +225,11 @@ export var useInheritsTableColumnInitializerFields = function useInheritsTableCo
         remove: removeTableColumn,
         schemaInitialize: function schemaInitialize(s) {
           var _interfaceConfig$sche3;
-
           interfaceConfig === null || interfaceConfig === void 0 ? void 0 : (_interfaceConfig$sche3 = interfaceConfig.schemaInitialize) === null || _interfaceConfig$sche3 === void 0 ? void 0 : _interfaceConfig$sche3.call(interfaceConfig, s, {
             field: k,
             readPretty: true,
-            block: 'Table'
+            block: 'Table',
+            targetCollection: getCollection(k === null || k === void 0 ? void 0 : k.target)
           });
         },
         field: k,
@@ -252,46 +239,42 @@ export var useInheritsTableColumnInitializerFields = function useInheritsTableCo
   });
 };
 export var useFormItemInitializerFields = function useFormItemInitializerFields(options) {
-  var _actionCtx$fieldSchem, _currentFields$filter;
-
+  var _currentFields$filter;
   var _useCollection4 = useCollection(),
-      name = _useCollection4.name,
-      currentFields = _useCollection4.currentFields;
-
+    name = _useCollection4.name,
+    currentFields = _useCollection4.currentFields,
+    template = _useCollection4.template;
   var _useCollectionManager4 = useCollectionManager(),
-      getInterface = _useCollectionManager4.getInterface;
-
+    getInterface = _useCollectionManager4.getInterface,
+    getCollection = _useCollectionManager4.getCollection;
   var form = useForm();
-
   var _ref2 = options || {},
-      _ref2$readPretty = _ref2.readPretty,
-      readPretty = _ref2$readPretty === void 0 ? form.readPretty : _ref2$readPretty,
-      _ref2$block = _ref2.block,
-      block = _ref2$block === void 0 ? 'Form' : _ref2$block;
-
-  var actionCtx = useActionContext();
-  var action = actionCtx === null || actionCtx === void 0 ? void 0 : (_actionCtx$fieldSchem = actionCtx.fieldSchema) === null || _actionCtx$fieldSchem === void 0 ? void 0 : _actionCtx$fieldSchem['x-action'];
-
+    _ref2$readPretty = _ref2.readPretty,
+    readPretty = _ref2$readPretty === void 0 ? form.readPretty : _ref2$readPretty,
+    _ref2$block = _ref2.block,
+    block = _ref2$block === void 0 ? 'Form' : _ref2$block;
   var _useActionContext = useActionContext(),
-      snapshot = _useActionContext.snapshot;
-
+    snapshot = _useActionContext.snapshot,
+    fieldSchema = _useActionContext.fieldSchema;
+  var action = fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-action'];
   return currentFields === null || currentFields === void 0 ? void 0 : (_currentFields$filter = currentFields.filter(function (field) {
-    return (field === null || field === void 0 ? void 0 : field.interface) && !(field === null || field === void 0 ? void 0 : field.isForeignKey);
+    return (field === null || field === void 0 ? void 0 : field.interface) && !(field === null || field === void 0 ? void 0 : field.isForeignKey) && !(field === null || field === void 0 ? void 0 : field.treeChildren);
   })) === null || _currentFields$filter === void 0 ? void 0 : _currentFields$filter.map(function (field) {
     var _field$uiSchema3, _field$uiSchema4;
-
     var interfaceConfig = getInterface(field.interface);
+    var targetCollection = getCollection(field.target);
+    var component = field.interface === 'o2m' && (targetCollection === null || targetCollection === void 0 ? void 0 : targetCollection.template) !== 'file' && !snapshot ? 'TableField' : 'CollectionField';
     var schema = {
       type: 'string',
       name: field.name,
       'x-designer': 'FormItem.Designer',
-      'x-component': field.interface === 'o2m' && !snapshot ? 'TableField' : 'CollectionField',
+      'x-component': component,
       'x-decorator': 'FormItem',
       'x-collection-field': "".concat(name, ".").concat(field.name),
       'x-component-props': {},
       'x-read-pretty': field === null || field === void 0 ? void 0 : (_field$uiSchema3 = field.uiSchema) === null || _field$uiSchema3 === void 0 ? void 0 : _field$uiSchema3['x-read-pretty']
-    }; // interfaceConfig?.schemaInitialize?.(schema, { field, block: 'Form', readPretty: form.readPretty });
-
+    };
+    // interfaceConfig?.schemaInitialize?.(schema, { field, block: 'Form', readPretty: form.readPretty });
     var resultItem = {
       type: 'item',
       title: (field === null || field === void 0 ? void 0 : (_field$uiSchema4 = field.uiSchema) === null || _field$uiSchema4 === void 0 ? void 0 : _field$uiSchema4.title) || field.name,
@@ -299,58 +282,120 @@ export var useFormItemInitializerFields = function useFormItemInitializerFields(
       remove: removeGridFormItem,
       schemaInitialize: function schemaInitialize(s) {
         var _interfaceConfig$sche4;
-
         interfaceConfig === null || interfaceConfig === void 0 ? void 0 : (_interfaceConfig$sche4 = interfaceConfig.schemaInitialize) === null || _interfaceConfig$sche4 === void 0 ? void 0 : _interfaceConfig$sche4.call(interfaceConfig, s, {
           field: field,
           block: block,
           readPretty: readPretty,
-          action: action
+          action: action,
+          targetCollection: targetCollection
         });
       },
       schema: schema
     };
-
     if (block == 'Kanban') {
       resultItem['find'] = function (schema, key, action) {
         var s = findSchema(schema, 'x-component', block);
         return findSchema(s, key, action);
       };
     }
-
     return resultItem;
   });
 };
-export var useAssociatedFormItemInitializerFields = function useAssociatedFormItemInitializerFields(options) {
-  var _fields$filter2;
-
+// 筛选表单相关
+export var useFilterFormItemInitializerFields = function useFilterFormItemInitializerFields(options) {
+  var _currentFields$filter2;
   var _useCollection5 = useCollection(),
-      name = _useCollection5.name,
-      fields = _useCollection5.fields;
-
+    name = _useCollection5.name,
+    currentFields = _useCollection5.currentFields;
   var _useCollectionManager5 = useCollectionManager(),
-      getInterface = _useCollectionManager5.getInterface,
-      getCollectionFields = _useCollectionManager5.getCollectionFields;
-
+    getInterface = _useCollectionManager5.getInterface,
+    getCollection = _useCollectionManager5.getCollection;
   var form = useForm();
-
   var _ref3 = options || {},
-      _ref3$readPretty = _ref3.readPretty,
-      readPretty = _ref3$readPretty === void 0 ? form.readPretty : _ref3$readPretty,
-      _ref3$block = _ref3.block,
-      block = _ref3$block === void 0 ? 'Form' : _ref3$block;
-
+    _ref3$readPretty = _ref3.readPretty,
+    readPretty = _ref3$readPretty === void 0 ? form.readPretty : _ref3$readPretty,
+    _ref3$block = _ref3.block,
+    block = _ref3$block === void 0 ? 'FilterForm' : _ref3$block;
+  var _useActionContext2 = useActionContext(),
+    snapshot = _useActionContext2.snapshot,
+    fieldSchema = _useActionContext2.fieldSchema;
+  var action = fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-action'];
+  return currentFields === null || currentFields === void 0 ? void 0 : (_currentFields$filter2 = currentFields.filter(function (field) {
+    var _getInterface;
+    return (field === null || field === void 0 ? void 0 : field.interface) && !(field === null || field === void 0 ? void 0 : field.isForeignKey) && ((_getInterface = getInterface(field.interface)) === null || _getInterface === void 0 ? void 0 : _getInterface.filterable);
+  })) === null || _currentFields$filter2 === void 0 ? void 0 : _currentFields$filter2.map(function (field) {
+    var _field$uiSchema6;
+    var interfaceConfig = getInterface(field.interface);
+    var targetCollection = getCollection(field.target);
+    var component = field.interface === 'o2m' && (targetCollection === null || targetCollection === void 0 ? void 0 : targetCollection.template) !== 'file' && !snapshot ? 'TableField' : 'CollectionField';
+    var schema = {
+      type: 'string',
+      name: field.name,
+      required: false,
+      'x-designer': 'FormItem.FilterFormDesigner',
+      'x-component': component,
+      'x-decorator': 'FormItem',
+      'x-collection-field': "".concat(name, ".").concat(field.name),
+      'x-component-props': {}
+    };
+    if (isAssocField(field)) {
+      var _field$uiSchema5;
+      schema = {
+        type: 'string',
+        name: field.name,
+        required: false,
+        'x-designer': 'AssociationSelect.FilterDesigner',
+        'x-component': 'AssociationSelect',
+        'x-decorator': 'FormItem',
+        'x-collection-field': "".concat(name, ".").concat(field.name),
+        'x-component-props': (_field$uiSchema5 = field.uiSchema) === null || _field$uiSchema5 === void 0 ? void 0 : _field$uiSchema5['x-component-props']
+      };
+    }
+    var resultItem = {
+      type: 'item',
+      title: (field === null || field === void 0 ? void 0 : (_field$uiSchema6 = field.uiSchema) === null || _field$uiSchema6 === void 0 ? void 0 : _field$uiSchema6.title) || field.name,
+      component: 'CollectionFieldInitializer',
+      remove: removeGridFormItem,
+      schemaInitialize: function schemaInitialize(s) {
+        var _interfaceConfig$sche5;
+        interfaceConfig === null || interfaceConfig === void 0 ? void 0 : (_interfaceConfig$sche5 = interfaceConfig.schemaInitialize) === null || _interfaceConfig$sche5 === void 0 ? void 0 : _interfaceConfig$sche5.call(interfaceConfig, s, {
+          field: field,
+          block: block,
+          readPretty: readPretty,
+          action: action,
+          targetCollection: targetCollection
+        });
+      },
+      schema: schema
+    };
+    return resultItem;
+  });
+};
+export var useAssociatedFormItemInitializerFields = function useAssociatedFormItemInitializerFields(options) {
+  var _fields$filter2;
+  var _useCollection6 = useCollection(),
+    name = _useCollection6.name,
+    fields = _useCollection6.fields;
+  var _useCollectionManager6 = useCollectionManager(),
+    getInterface = _useCollectionManager6.getInterface,
+    getCollectionFields = _useCollectionManager6.getCollectionFields,
+    getCollection = _useCollectionManager6.getCollection;
+  var form = useForm();
+  var _ref4 = options || {},
+    _ref4$readPretty = _ref4.readPretty,
+    readPretty = _ref4$readPretty === void 0 ? form.readPretty : _ref4$readPretty,
+    _ref4$block = _ref4.block,
+    block = _ref4$block === void 0 ? 'Form' : _ref4$block;
   var interfaces = block === 'Form' ? ['m2o'] : ['o2o', 'oho', 'obo', 'm2o'];
   var groups = fields === null || fields === void 0 ? void 0 : (_fields$filter2 = fields.filter(function (field) {
     return interfaces.includes(field.interface);
   })) === null || _fields$filter2 === void 0 ? void 0 : _fields$filter2.map(function (field) {
-    var _subFields$filter2, _field$uiSchema5;
-
+    var _subFields$filter2, _field$uiSchema7;
     var subFields = getCollectionFields(field.target);
     var items = subFields === null || subFields === void 0 ? void 0 : (_subFields$filter2 = subFields.filter(function (subField) {
-      return (subField === null || subField === void 0 ? void 0 : subField.interface) && !['subTable'].includes(subField === null || subField === void 0 ? void 0 : subField.interface);
+      return (subField === null || subField === void 0 ? void 0 : subField.interface) && !['subTable'].includes(subField === null || subField === void 0 ? void 0 : subField.interface) && !subField.treeChildren;
     })) === null || _subFields$filter2 === void 0 ? void 0 : _subFields$filter2.map(function (subField) {
       var _subField$uiSchema2;
-
       var interfaceConfig = getInterface(subField.interface);
       var schema = {
         type: 'string',
@@ -370,12 +415,12 @@ export var useAssociatedFormItemInitializerFields = function useAssociatedFormIt
         component: 'CollectionFieldInitializer',
         remove: removeGridFormItem,
         schemaInitialize: function schemaInitialize(s) {
-          var _interfaceConfig$sche5;
-
-          interfaceConfig === null || interfaceConfig === void 0 ? void 0 : (_interfaceConfig$sche5 = interfaceConfig.schemaInitialize) === null || _interfaceConfig$sche5 === void 0 ? void 0 : _interfaceConfig$sche5.call(interfaceConfig, s, {
+          var _interfaceConfig$sche6;
+          interfaceConfig === null || interfaceConfig === void 0 ? void 0 : (_interfaceConfig$sche6 = interfaceConfig.schemaInitialize) === null || _interfaceConfig$sche6 === void 0 ? void 0 : _interfaceConfig$sche6.call(interfaceConfig, s, {
             field: subField,
             block: block,
-            readPretty: readPretty
+            readPretty: readPretty,
+            targetCollection: getCollection(field.target)
           });
         },
         schema: schema
@@ -383,69 +428,177 @@ export var useAssociatedFormItemInitializerFields = function useAssociatedFormIt
     });
     return {
       type: 'subMenu',
-      title: (_field$uiSchema5 = field.uiSchema) === null || _field$uiSchema5 === void 0 ? void 0 : _field$uiSchema5.title,
+      title: (_field$uiSchema7 = field.uiSchema) === null || _field$uiSchema7 === void 0 ? void 0 : _field$uiSchema7.title,
       children: items
     };
   });
   return groups;
 };
+var getItem = function getItem(field, schemaName, collectionName, getCollectionFields, processedCollections) {
+  var _field$uiSchema9;
+  if (field.interface === 'm2o') {
+    var _field$uiSchema8;
+    if (processedCollections.includes(field.target)) return null;
+    var subFields = getCollectionFields(field.target);
+    return {
+      type: 'subMenu',
+      title: (_field$uiSchema8 = field.uiSchema) === null || _field$uiSchema8 === void 0 ? void 0 : _field$uiSchema8.title,
+      children: subFields.map(function (subField) {
+        return getItem(subField, "".concat(schemaName, ".").concat(subField.name), collectionName, getCollectionFields, [].concat(_toConsumableArray(processedCollections), [field.target]));
+      }).filter(Boolean)
+    };
+  }
+  if (isAssocField(field)) return null;
+  var schema = {
+    type: 'string',
+    name: schemaName,
+    'x-designer': 'FormItem.FilterFormDesigner',
+    'x-designer-props': {
+      // 在 useOperatorList 中使用，用于获取对应的操作符列表
+      interface: field.interface
+    },
+    'x-component': 'CollectionField',
+    'x-read-pretty': false,
+    'x-decorator': 'FormItem',
+    'x-collection-field': "".concat(collectionName, ".").concat(schemaName)
+  };
+  return {
+    type: 'item',
+    title: ((_field$uiSchema9 = field.uiSchema) === null || _field$uiSchema9 === void 0 ? void 0 : _field$uiSchema9.title) || field.name,
+    component: 'CollectionFieldInitializer',
+    remove: removeGridFormItem,
+    schema: schema
+  };
+};
+// 筛选表单相关
+export var useFilterAssociatedFormItemInitializerFields = function useFilterAssociatedFormItemInitializerFields() {
+  var _fields$filter3;
+  var _useCollection7 = useCollection(),
+    name = _useCollection7.name,
+    fields = _useCollection7.fields;
+  var _useCollectionManager7 = useCollectionManager(),
+    getCollectionFields = _useCollectionManager7.getCollectionFields;
+  var interfaces = ['m2o'];
+  var groups = fields === null || fields === void 0 ? void 0 : (_fields$filter3 = fields.filter(function (field) {
+    return interfaces.includes(field.interface);
+  })) === null || _fields$filter3 === void 0 ? void 0 : _fields$filter3.map(function (field) {
+    return getItem(field, field.name, name, getCollectionFields, []);
+  });
+  return groups;
+};
 export var useInheritsFormItemInitializerFields = function useInheritsFormItemInitializerFields(options) {
-  var _useCollection6 = useCollection(),
-      name = _useCollection6.name;
-
-  var _useCollectionManager6 = useCollectionManager(),
-      getInterface = _useCollectionManager6.getInterface,
-      getInheritCollections = _useCollectionManager6.getInheritCollections,
-      getCollection = _useCollectionManager6.getCollection,
-      getParentCollectionFields = _useCollectionManager6.getParentCollectionFields;
-
+  var _useCollection8 = useCollection(),
+    name = _useCollection8.name,
+    template = _useCollection8.template;
+  var _useCollectionManager8 = useCollectionManager(),
+    getInterface = _useCollectionManager8.getInterface,
+    getInheritCollections = _useCollectionManager8.getInheritCollections,
+    getCollection = _useCollectionManager8.getCollection,
+    getParentCollectionFields = _useCollectionManager8.getParentCollectionFields;
   var inherits = getInheritCollections(name);
-
-  var _useActionContext2 = useActionContext(),
-      snapshot = _useActionContext2.snapshot;
-
+  var _useActionContext3 = useActionContext(),
+    snapshot = _useActionContext3.snapshot;
   return inherits === null || inherits === void 0 ? void 0 : inherits.map(function (v) {
-    var _fields$filter3;
-
+    var _fields$filter4;
     var fields = getParentCollectionFields(v, name);
     var form = useForm();
-
-    var _ref4 = options || {},
-        _ref4$readPretty = _ref4.readPretty,
-        readPretty = _ref4$readPretty === void 0 ? form.readPretty : _ref4$readPretty,
-        _ref4$block = _ref4.block,
-        block = _ref4$block === void 0 ? 'Form' : _ref4$block;
-
+    var _ref5 = options || {},
+      _ref5$readPretty = _ref5.readPretty,
+      readPretty = _ref5$readPretty === void 0 ? form.readPretty : _ref5$readPretty,
+      _ref5$block = _ref5.block,
+      block = _ref5$block === void 0 ? 'Form' : _ref5$block;
     var targetCollection = getCollection(v);
-    return _defineProperty({}, targetCollection.title, fields === null || fields === void 0 ? void 0 : (_fields$filter3 = fields.filter(function (field) {
+    return _defineProperty({}, targetCollection.title, fields === null || fields === void 0 ? void 0 : (_fields$filter4 = fields.filter(function (field) {
       return (field === null || field === void 0 ? void 0 : field.interface) && !(field === null || field === void 0 ? void 0 : field.isForeignKey);
-    })) === null || _fields$filter3 === void 0 ? void 0 : _fields$filter3.map(function (field) {
-      var _field$uiSchema6, _field$uiSchema7, _field$uiSchema8;
-
+    })) === null || _fields$filter4 === void 0 ? void 0 : _fields$filter4.map(function (field) {
+      var _field$uiSchema10, _field$uiSchema11, _field$uiSchema12;
       var interfaceConfig = getInterface(field.interface);
+      var targetCollection = getCollection(field.target);
+      var component = field.interface === 'o2m' && (targetCollection === null || targetCollection === void 0 ? void 0 : targetCollection.template) !== 'file' && !snapshot ? 'TableField' : 'CollectionField';
       var schema = {
         type: 'string',
         name: field.name,
-        title: (field === null || field === void 0 ? void 0 : (_field$uiSchema6 = field.uiSchema) === null || _field$uiSchema6 === void 0 ? void 0 : _field$uiSchema6.title) || field.name,
+        title: (field === null || field === void 0 ? void 0 : (_field$uiSchema10 = field.uiSchema) === null || _field$uiSchema10 === void 0 ? void 0 : _field$uiSchema10.title) || field.name,
         'x-designer': 'FormItem.Designer',
-        'x-component': field.interface === 'o2m' && !snapshot ? 'TableField' : 'CollectionField',
+        'x-component': component,
         'x-decorator': 'FormItem',
         'x-collection-field': "".concat(name, ".").concat(field.name),
         'x-component-props': {},
-        'x-read-pretty': field === null || field === void 0 ? void 0 : (_field$uiSchema7 = field.uiSchema) === null || _field$uiSchema7 === void 0 ? void 0 : _field$uiSchema7['x-read-pretty']
+        'x-read-pretty': field === null || field === void 0 ? void 0 : (_field$uiSchema11 = field.uiSchema) === null || _field$uiSchema11 === void 0 ? void 0 : _field$uiSchema11['x-read-pretty']
       };
       return {
         type: 'item',
-        title: (field === null || field === void 0 ? void 0 : (_field$uiSchema8 = field.uiSchema) === null || _field$uiSchema8 === void 0 ? void 0 : _field$uiSchema8.title) || field.name,
+        title: (field === null || field === void 0 ? void 0 : (_field$uiSchema12 = field.uiSchema) === null || _field$uiSchema12 === void 0 ? void 0 : _field$uiSchema12.title) || field.name,
         component: 'CollectionFieldInitializer',
         remove: removeGridFormItem,
         schemaInitialize: function schemaInitialize(s) {
-          var _interfaceConfig$sche6;
-
-          interfaceConfig === null || interfaceConfig === void 0 ? void 0 : (_interfaceConfig$sche6 = interfaceConfig.schemaInitialize) === null || _interfaceConfig$sche6 === void 0 ? void 0 : _interfaceConfig$sche6.call(interfaceConfig, s, {
+          var _interfaceConfig$sche7;
+          interfaceConfig === null || interfaceConfig === void 0 ? void 0 : (_interfaceConfig$sche7 = interfaceConfig.schemaInitialize) === null || _interfaceConfig$sche7 === void 0 ? void 0 : _interfaceConfig$sche7.call(interfaceConfig, s, {
+            field: field,
+            block: block,
+            readPretty: readPretty,
+            targetCollection: targetCollection
+          });
+        },
+        schema: schema
+      };
+    }));
+  });
+};
+// 筛选表单相关
+export var useFilterInheritsFormItemInitializerFields = function useFilterInheritsFormItemInitializerFields(options) {
+  var _useCollection9 = useCollection(),
+    name = _useCollection9.name;
+  var _useCollectionManager9 = useCollectionManager(),
+    getInterface = _useCollectionManager9.getInterface,
+    getInheritCollections = _useCollectionManager9.getInheritCollections,
+    getCollection = _useCollectionManager9.getCollection,
+    getParentCollectionFields = _useCollectionManager9.getParentCollectionFields;
+  var inherits = getInheritCollections(name);
+  var _useActionContext4 = useActionContext(),
+    snapshot = _useActionContext4.snapshot;
+  return inherits === null || inherits === void 0 ? void 0 : inherits.map(function (v) {
+    var _fields$filter5;
+    var fields = getParentCollectionFields(v, name);
+    var form = useForm();
+    var _ref7 = options || {},
+      _ref7$readPretty = _ref7.readPretty,
+      readPretty = _ref7$readPretty === void 0 ? form.readPretty : _ref7$readPretty,
+      _ref7$block = _ref7.block,
+      block = _ref7$block === void 0 ? 'Form' : _ref7$block;
+    var targetCollection = getCollection(v);
+    return _defineProperty({}, targetCollection.title, fields === null || fields === void 0 ? void 0 : (_fields$filter5 = fields.filter(function (field) {
+      var _getInterface2;
+      return (field === null || field === void 0 ? void 0 : field.interface) && !(field === null || field === void 0 ? void 0 : field.isForeignKey) && ((_getInterface2 = getInterface(field.interface)) === null || _getInterface2 === void 0 ? void 0 : _getInterface2.filterable);
+    })) === null || _fields$filter5 === void 0 ? void 0 : _fields$filter5.map(function (field) {
+      var _field$uiSchema13, _field$uiSchema14, _field$uiSchema15;
+      var interfaceConfig = getInterface(field.interface);
+      var targetCollection = getCollection(field.target);
+      var component = field.interface === 'o2m' && (targetCollection === null || targetCollection === void 0 ? void 0 : targetCollection.template) !== 'file' && !snapshot ? 'TableField' : 'CollectionField';
+      var schema = {
+        type: 'string',
+        name: field.name,
+        title: (field === null || field === void 0 ? void 0 : (_field$uiSchema13 = field.uiSchema) === null || _field$uiSchema13 === void 0 ? void 0 : _field$uiSchema13.title) || field.name,
+        required: false,
+        'x-designer': 'FormItem.FilterFormDesigner',
+        'x-component': component,
+        'x-decorator': 'FormItem',
+        'x-collection-field': "".concat(name, ".").concat(field.name),
+        'x-component-props': {},
+        'x-read-pretty': field === null || field === void 0 ? void 0 : (_field$uiSchema14 = field.uiSchema) === null || _field$uiSchema14 === void 0 ? void 0 : _field$uiSchema14['x-read-pretty']
+      };
+      return {
+        type: 'item',
+        title: (field === null || field === void 0 ? void 0 : (_field$uiSchema15 = field.uiSchema) === null || _field$uiSchema15 === void 0 ? void 0 : _field$uiSchema15.title) || field.name,
+        component: 'CollectionFieldInitializer',
+        remove: removeGridFormItem,
+        schemaInitialize: function schemaInitialize(s) {
+          var _interfaceConfig$sche8;
+          interfaceConfig === null || interfaceConfig === void 0 ? void 0 : (_interfaceConfig$sche8 = interfaceConfig.schemaInitialize) === null || _interfaceConfig$sche8 === void 0 ? void 0 : _interfaceConfig$sche8.call(interfaceConfig, s, {
             field: field,
             block: block,
-            readPretty: readPretty
+            readPretty: readPretty,
+            targetCollection: targetCollection
           });
         },
         schema: schema
@@ -454,36 +607,30 @@ export var useInheritsFormItemInitializerFields = function useInheritsFormItemIn
   });
 };
 export var useCustomFormItemInitializerFields = function useCustomFormItemInitializerFields(options) {
-  var _currentFields$filter2;
-
-  var _useCollection7 = useCollection(),
-      name = _useCollection7.name,
-      currentFields = _useCollection7.currentFields;
-
-  var _useCollectionManager7 = useCollectionManager(),
-      getInterface = _useCollectionManager7.getInterface;
-
+  var _currentFields$filter3;
+  var _useCollection10 = useCollection(),
+    name = _useCollection10.name,
+    currentFields = _useCollection10.currentFields;
+  var _useCollectionManager10 = useCollectionManager(),
+    getInterface = _useCollectionManager10.getInterface,
+    getCollection = _useCollectionManager10.getCollection;
   var form = useForm();
-
-  var _ref6 = options || {},
-      _ref6$readPretty = _ref6.readPretty,
-      readPretty = _ref6$readPretty === void 0 ? form.readPretty : _ref6$readPretty,
-      _ref6$block = _ref6.block,
-      block = _ref6$block === void 0 ? 'Form' : _ref6$block;
-
+  var _ref9 = options || {},
+    _ref9$readPretty = _ref9.readPretty,
+    readPretty = _ref9$readPretty === void 0 ? form.readPretty : _ref9$readPretty,
+    _ref9$block = _ref9.block,
+    block = _ref9$block === void 0 ? 'Form' : _ref9$block;
   var remove = useRemoveGridFormItem();
-  return currentFields === null || currentFields === void 0 ? void 0 : (_currentFields$filter2 = currentFields.filter(function (field) {
-    var _field$uiSchema9;
-
-    return (field === null || field === void 0 ? void 0 : field.interface) && !(field === null || field === void 0 ? void 0 : (_field$uiSchema9 = field.uiSchema) === null || _field$uiSchema9 === void 0 ? void 0 : _field$uiSchema9['x-read-pretty']) && field.interface !== 'snapshot';
-  })) === null || _currentFields$filter2 === void 0 ? void 0 : _currentFields$filter2.map(function (field) {
-    var _field$uiSchema10, _field$uiSchema11;
-
+  return currentFields === null || currentFields === void 0 ? void 0 : (_currentFields$filter3 = currentFields.filter(function (field) {
+    var _field$uiSchema16;
+    return (field === null || field === void 0 ? void 0 : field.interface) && !(field === null || field === void 0 ? void 0 : (_field$uiSchema16 = field.uiSchema) === null || _field$uiSchema16 === void 0 ? void 0 : _field$uiSchema16['x-read-pretty']) && field.interface !== 'snapshot';
+  })) === null || _currentFields$filter3 === void 0 ? void 0 : _currentFields$filter3.map(function (field) {
+    var _field$uiSchema17, _field$uiSchema18;
     var interfaceConfig = getInterface(field.interface);
     var schema = {
       type: 'string',
       name: field.name,
-      title: (field === null || field === void 0 ? void 0 : (_field$uiSchema10 = field.uiSchema) === null || _field$uiSchema10 === void 0 ? void 0 : _field$uiSchema10.title) || field.name,
+      title: (field === null || field === void 0 ? void 0 : (_field$uiSchema17 = field.uiSchema) === null || _field$uiSchema17 === void 0 ? void 0 : _field$uiSchema17.title) || field.name,
       'x-designer': 'FormItem.Designer',
       'x-component': 'AssignedField',
       'x-decorator': 'FormItem',
@@ -491,16 +638,16 @@ export var useCustomFormItemInitializerFields = function useCustomFormItemInitia
     };
     return {
       type: 'item',
-      title: (field === null || field === void 0 ? void 0 : (_field$uiSchema11 = field.uiSchema) === null || _field$uiSchema11 === void 0 ? void 0 : _field$uiSchema11.title) || field.name,
+      title: (field === null || field === void 0 ? void 0 : (_field$uiSchema18 = field.uiSchema) === null || _field$uiSchema18 === void 0 ? void 0 : _field$uiSchema18.title) || field.name,
       component: 'CollectionFieldInitializer',
       remove: remove,
       schemaInitialize: function schemaInitialize(s) {
-        var _interfaceConfig$sche7;
-
-        interfaceConfig === null || interfaceConfig === void 0 ? void 0 : (_interfaceConfig$sche7 = interfaceConfig.schemaInitialize) === null || _interfaceConfig$sche7 === void 0 ? void 0 : _interfaceConfig$sche7.call(interfaceConfig, s, {
+        var _interfaceConfig$sche9;
+        interfaceConfig === null || interfaceConfig === void 0 ? void 0 : (_interfaceConfig$sche9 = interfaceConfig.schemaInitialize) === null || _interfaceConfig$sche9 === void 0 ? void 0 : _interfaceConfig$sche9.call(interfaceConfig, s, {
           field: field,
           block: block,
-          readPretty: readPretty
+          readPretty: readPretty,
+          targetCollection: getCollection(field.target)
         });
       },
       schema: schema
@@ -508,36 +655,30 @@ export var useCustomFormItemInitializerFields = function useCustomFormItemInitia
   });
 };
 export var useCustomBulkEditFormItemInitializerFields = function useCustomBulkEditFormItemInitializerFields(options) {
-  var _fields$filter4;
-
-  var _useCollection8 = useCollection(),
-      name = _useCollection8.name,
-      fields = _useCollection8.fields;
-
-  var _useCollectionManager8 = useCollectionManager(),
-      getInterface = _useCollectionManager8.getInterface;
-
+  var _fields$filter6;
+  var _useCollection11 = useCollection(),
+    name = _useCollection11.name,
+    fields = _useCollection11.fields;
+  var _useCollectionManager11 = useCollectionManager(),
+    getInterface = _useCollectionManager11.getInterface,
+    getCollection = _useCollectionManager11.getCollection;
   var form = useForm();
-
-  var _ref7 = options || {},
-      _ref7$readPretty = _ref7.readPretty,
-      readPretty = _ref7$readPretty === void 0 ? form.readPretty : _ref7$readPretty,
-      _ref7$block = _ref7.block,
-      block = _ref7$block === void 0 ? 'Form' : _ref7$block;
-
+  var _ref10 = options || {},
+    _ref10$readPretty = _ref10.readPretty,
+    readPretty = _ref10$readPretty === void 0 ? form.readPretty : _ref10$readPretty,
+    _ref10$block = _ref10.block,
+    block = _ref10$block === void 0 ? 'Form' : _ref10$block;
   var remove = useRemoveGridFormItem();
-  return fields === null || fields === void 0 ? void 0 : (_fields$filter4 = fields.filter(function (field) {
-    var _field$uiSchema12;
-
-    return (field === null || field === void 0 ? void 0 : field.interface) && !(field === null || field === void 0 ? void 0 : (_field$uiSchema12 = field.uiSchema) === null || _field$uiSchema12 === void 0 ? void 0 : _field$uiSchema12['x-read-pretty']) && field.interface !== 'snapshot';
-  })) === null || _fields$filter4 === void 0 ? void 0 : _fields$filter4.map(function (field) {
-    var _field$uiSchema13, _field$uiSchema14;
-
+  return fields === null || fields === void 0 ? void 0 : (_fields$filter6 = fields.filter(function (field) {
+    var _field$uiSchema19;
+    return (field === null || field === void 0 ? void 0 : field.interface) && !(field === null || field === void 0 ? void 0 : (_field$uiSchema19 = field.uiSchema) === null || _field$uiSchema19 === void 0 ? void 0 : _field$uiSchema19['x-read-pretty']) && field.interface !== 'snapshot';
+  })) === null || _fields$filter6 === void 0 ? void 0 : _fields$filter6.map(function (field) {
+    var _field$uiSchema20, _field$uiSchema21;
     var interfaceConfig = getInterface(field.interface);
     var schema = {
       type: 'string',
       name: field.name,
-      title: (field === null || field === void 0 ? void 0 : (_field$uiSchema13 = field.uiSchema) === null || _field$uiSchema13 === void 0 ? void 0 : _field$uiSchema13.title) || field.name,
+      title: (field === null || field === void 0 ? void 0 : (_field$uiSchema20 = field.uiSchema) === null || _field$uiSchema20 === void 0 ? void 0 : _field$uiSchema20.title) || field.name,
       'x-designer': 'FormItem.Designer',
       'x-component': 'BulkEditField',
       'x-decorator': 'FormItem',
@@ -545,71 +686,58 @@ export var useCustomBulkEditFormItemInitializerFields = function useCustomBulkEd
     };
     return {
       type: 'item',
-      title: (field === null || field === void 0 ? void 0 : (_field$uiSchema14 = field.uiSchema) === null || _field$uiSchema14 === void 0 ? void 0 : _field$uiSchema14.title) || field.name,
+      title: (field === null || field === void 0 ? void 0 : (_field$uiSchema21 = field.uiSchema) === null || _field$uiSchema21 === void 0 ? void 0 : _field$uiSchema21.title) || field.name,
       component: 'CollectionFieldInitializer',
       remove: remove,
       schemaInitialize: function schemaInitialize(s) {
-        var _interfaceConfig$sche8;
-
-        interfaceConfig === null || interfaceConfig === void 0 ? void 0 : (_interfaceConfig$sche8 = interfaceConfig.schemaInitialize) === null || _interfaceConfig$sche8 === void 0 ? void 0 : _interfaceConfig$sche8.call(interfaceConfig, s, {
+        var _interfaceConfig$sche10;
+        interfaceConfig === null || interfaceConfig === void 0 ? void 0 : (_interfaceConfig$sche10 = interfaceConfig.schemaInitialize) === null || _interfaceConfig$sche10 === void 0 ? void 0 : _interfaceConfig$sche10.call(interfaceConfig, s, {
           field: field,
           block: block,
-          readPretty: readPretty
+          readPretty: readPretty,
+          targetCollection: getCollection(field.target)
         });
       },
       schema: schema
     };
   });
 };
-
 var findSchema = function findSchema(schema, key, action) {
   if (!Schema.isSchemaInstance(schema)) return null;
   return schema.reduceProperties(function (buf, s) {
     if (s[key] === action) {
       return s;
     }
-
     var c = findSchema(s, key, action);
-
     if (c) {
       return c;
     }
-
     return buf;
   });
 };
-
 var removeSchema = function removeSchema(schema, cb) {
   return cb(schema);
 };
-
 var recursiveParent = function recursiveParent(schema) {
   if (!schema.parent) return null;
   if (schema.parent['x-initializer']) return schema.parent;
   return recursiveParent(schema.parent);
 };
-
 export var useCurrentSchema = function useCurrentSchema(action, key) {
   var _fieldSchema;
-
   var find = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : findSchema;
   var rm = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : removeSchema;
   var fieldSchema = useFieldSchema();
-
   if (!((_fieldSchema = fieldSchema) === null || _fieldSchema === void 0 ? void 0 : _fieldSchema['x-initializer'])) {
     var recursiveInitializerSchema = recursiveParent(fieldSchema);
-
     if (recursiveInitializerSchema) {
       fieldSchema = recursiveInitializerSchema;
     }
   }
-
   var _useDesignable = useDesignable(),
-      _remove = _useDesignable.remove;
-
+    _remove = _useDesignable.remove;
   var schema = find(fieldSchema, key, action);
   var ctx = useContext(BlockRequestContext);
-  var exists = !!schema;
   return {
     schema: schema,
     exists: !!schema,
@@ -619,7 +747,6 @@ export var useCurrentSchema = function useCurrentSchema(action, key) {
         ctx.field.data.activeFields = ctx.field.data.activeFields || new Set();
         ctx.field.data.activeFields.delete(schema.name);
       }
-
       schema && rm(schema, _remove);
     }
   };
@@ -628,25 +755,19 @@ export var useRecordCollectionDataSourceItems = function useRecordCollectionData
   var item = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
   var collectionName = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : null;
   var resourceName = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
-
   var _useTranslation = useTranslation(),
-      t = _useTranslation.t;
-
+    t = _useTranslation.t;
   var collection = useCollection();
-
   var _useSchemaTemplateMan = useSchemaTemplateManager(),
-      getTemplatesByCollection = _useSchemaTemplateMan.getTemplatesByCollection;
-
+    getTemplatesByCollection = _useSchemaTemplateMan.getTemplatesByCollection;
   var templates = getTemplatesByCollection(collectionName || collection.name).filter(function (template) {
     return componentName && template.componentName === componentName;
   }).filter(function (template) {
     return ['FormItem', 'ReadPrettyFormItem'].includes(componentName) || template.resourceName === resourceName;
   });
-
   if (!templates.length) {
     return [];
   }
-
   var index = 0;
   return [{
     key: "".concat(collectionName || componentName, "_table_blank"),
@@ -692,31 +813,24 @@ export var useRecordCollectionDataSourceItems = function useRecordCollectionData
 };
 export var useCollectionDataSourceItems = function useCollectionDataSourceItems(componentName) {
   var _collections$filter;
-
   var _useTranslation2 = useTranslation(),
-      t = _useTranslation2.t;
-
-  var _useCollectionManager9 = useCollectionManager(),
-      collections = _useCollectionManager9.collections;
-
+    t = _useTranslation2.t;
+  var _useCollectionManager12 = useCollectionManager(),
+    collections = _useCollectionManager12.collections;
   var _useSchemaTemplateMan2 = useSchemaTemplateManager(),
-      getTemplatesByCollection = _useSchemaTemplateMan2.getTemplatesByCollection;
-
+    getTemplatesByCollection = _useSchemaTemplateMan2.getTemplatesByCollection;
   var _useState = useState([]),
-      _useState2 = _slicedToArray(_useState, 2),
-      selected = _useState2[0],
-      setSelected = _useState2[1];
-
+    _useState2 = _slicedToArray(_useState, 2),
+    selected = _useState2[0],
+    setSelected = _useState2[1];
   var _useState3 = useState(null),
-      _useState4 = _slicedToArray(_useState3, 2),
-      value = _useState4[0],
-      onChange = _useState4[1];
-
+    _useState4 = _slicedToArray(_useState3, 2),
+    value = _useState4[0],
+    onChange = _useState4[1];
   var clearKeywords = function clearKeywords() {
     setSelected([]);
     onChange(null);
   };
-
   return [{
     key: 'tableBlock',
     type: 'itemGroup',
@@ -727,13 +841,16 @@ export var useCollectionDataSourceItems = function useCollectionDataSourceItems(
     }),
     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;
       } else if (item.autoGenId === false && !item.fields.find(function (v) {
         return v.primaryKey;
       })) {
         return false;
+      } else if (['Kanban', 'FormItem'].includes(componentName) && item.template === 'view') {
+        return false;
+      } 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));
       }
@@ -741,7 +858,6 @@ export var useCollectionDataSourceItems = function useCollectionDataSourceItems(
       var templates = getTemplatesByCollection(item.name).filter(function (template) {
         return componentName && template.componentName === componentName && (!template.resourceName || template.resourceName === item.name);
       });
-
       if (!templates.length) {
         return {
           type: 'item',
@@ -750,7 +866,6 @@ export var useCollectionDataSourceItems = function useCollectionDataSourceItems(
           clearKeywords: clearKeywords
         };
       }
-
       return {
         key: "".concat(componentName, "_table_subMenu_").concat(index),
         type: 'subMenu',
@@ -801,16 +916,16 @@ export var useCollectionDataSourceItems = function useCollectionDataSourceItems(
   }];
 };
 export var createDetailsBlockSchema = function createDetailsBlockSchema(options) {
+  var _properties3;
   var _options$formItemInit = options.formItemInitializers,
-      formItemInitializers = _options$formItemInit === void 0 ? 'ReadPrettyFormItemInitializers' : _options$formItemInit,
-      _options$actionInitia = options.actionInitializers,
-      actionInitializers = _options$actionInitia === void 0 ? 'DetailsActionInitializers' : _options$actionInitia,
-      collection = options.collection,
-      association = options.association,
-      resource = options.resource,
-      template = options.template,
-      others = _objectWithoutProperties(options, _excluded);
-
+    formItemInitializers = _options$formItemInit === void 0 ? 'ReadPrettyFormItemInitializers' : _options$formItemInit,
+    _options$actionInitia = options.actionInitializers,
+    actionInitializers = _options$actionInitia === void 0 ? 'DetailsActionInitializers' : _options$actionInitia,
+    collection = options.collection,
+    association = options.association,
+    resource = options.resource,
+    template = options.template,
+    others = _objectWithoutProperties(options, _excluded);
   var resourceName = resource || association || collection;
   var schema = {
     type: 'void',
@@ -830,37 +945,33 @@ export var createDetailsBlockSchema = function createDetailsBlockSchema(options)
     'x-component': 'CardItem',
     properties: _defineProperty({}, uid(), {
       type: 'void',
-      'x-component': 'FormV2',
+      'x-component': 'Details',
       'x-read-pretty': true,
       'x-component-props': {
         useProps: '{{ useDetailsBlockProps }}'
       },
-      properties: {
-        actions: {
-          type: 'void',
-          'x-initializer': actionInitializers,
-          'x-component': 'ActionBar',
-          'x-component-props': {
-            style: {
-              marginBottom: 24
-            }
-          },
-          properties: {}
-        },
-        grid: template || {
-          type: 'void',
-          'x-component': 'Grid',
-          'x-initializer': formItemInitializers,
-          properties: {}
-        },
-        pagination: {
-          type: 'void',
-          'x-component': 'Pagination',
-          'x-component-props': {
-            useProps: '{{ useDetailsPaginationProps }}'
+      properties: (_properties3 = {}, _defineProperty(_properties3, uid(), {
+        type: 'void',
+        'x-initializer': actionInitializers,
+        'x-component': 'ActionBar',
+        'x-component-props': {
+          style: {
+            marginBottom: 24
           }
+        },
+        properties: {}
+      }), _defineProperty(_properties3, "grid", template || {
+        type: 'void',
+        'x-component': 'Grid',
+        'x-initializer': formItemInitializers,
+        properties: {}
+      }), _defineProperty(_properties3, "pagination", {
+        type: 'void',
+        'x-component': 'Pagination',
+        'x-component-props': {
+          useProps: '{{ useDetailsPaginationProps }}'
         }
-      }
+      }), _properties3)
     })
   };
   console.log(JSON.stringify(schema, null, 2));
@@ -868,16 +979,15 @@ export var createDetailsBlockSchema = function createDetailsBlockSchema(options)
 };
 export var createFormBlockSchema = function createFormBlockSchema(options) {
   var _options$formItemInit2 = options.formItemInitializers,
-      formItemInitializers = _options$formItemInit2 === void 0 ? 'FormItemInitializers' : _options$formItemInit2,
-      _options$actionInitia2 = options.actionInitializers,
-      actionInitializers = _options$actionInitia2 === void 0 ? 'FormActionInitializers' : _options$actionInitia2,
-      collection = options.collection,
-      resource = options.resource,
-      association = options.association,
-      action = options.action,
-      template = options.template,
-      others = _objectWithoutProperties(options, _excluded2);
-
+    formItemInitializers = _options$formItemInit2 === void 0 ? 'FormItemInitializers' : _options$formItemInit2,
+    _options$actionInitia2 = options.actionInitializers,
+    actionInitializers = _options$actionInitia2 === void 0 ? 'FormActionInitializers' : _options$actionInitia2,
+    collection = options.collection,
+    resource = options.resource,
+    association = options.association,
+    action = options.action,
+    template = options.template,
+    others = _objectWithoutProperties(options, _excluded2);
   var resourceName = resource || association || collection;
   var schema = {
     type: 'void',
@@ -890,10 +1000,11 @@ export var createFormBlockSchema = function createFormBlockSchema(options) {
       action: action,
       resource: resourceName,
       collection: collection,
-      association: association // action: 'get',
+      association: association
+      // action: 'get',
       // useParams: '{{ useParamsFromRecord }}',
-
     }),
+
     'x-designer': 'FormV2.Designer',
     'x-component': 'CardItem',
     properties: _defineProperty({}, uid(), {
@@ -924,20 +1035,75 @@ export var createFormBlockSchema = function createFormBlockSchema(options) {
       }
     })
   };
-  console.log(JSON.stringify(schema, null, 2));
   return schema;
 };
-export var createReadPrettyFormBlockSchema = function createReadPrettyFormBlockSchema(options) {
+export var createFilterFormBlockSchema = function createFilterFormBlockSchema(options) {
   var _options$formItemInit3 = options.formItemInitializers,
-      formItemInitializers = _options$formItemInit3 === void 0 ? 'ReadPrettyFormItemInitializers' : _options$formItemInit3,
-      _options$actionInitia3 = options.actionInitializers,
-      actionInitializers = _options$actionInitia3 === void 0 ? 'ReadPrettyFormActionInitializers' : _options$actionInitia3,
-      collection = options.collection,
-      association = options.association,
-      resource = options.resource,
-      template = options.template,
-      others = _objectWithoutProperties(options, _excluded3);
-
+    formItemInitializers = _options$formItemInit3 === void 0 ? 'FilterFormItemInitializers' : _options$formItemInit3,
+    _options$actionInitia3 = options.actionInitializers,
+    actionInitializers = _options$actionInitia3 === void 0 ? 'FilterFormActionInitializers' : _options$actionInitia3,
+    collection = options.collection,
+    resource = options.resource,
+    association = options.association,
+    action = options.action,
+    template = options.template,
+    others = _objectWithoutProperties(options, _excluded3);
+  var resourceName = resource || association || collection;
+  var schema = {
+    type: 'void',
+    'x-decorator': 'FilterFormBlockProvider',
+    'x-decorator-props': _objectSpread(_objectSpread({}, others), {}, {
+      action: action,
+      resource: resourceName,
+      collection: collection,
+      association: association
+    }),
+    'x-designer': 'FormV2.FilterDesigner',
+    'x-component': 'CardItem',
+    // 保存当前筛选区块所能过滤的数据区块
+    'x-filter-targets': [],
+    // 用于存储用户设置的每个字段的运算符，目前仅筛选表单区块支持自定义
+    'x-filter-operators': {},
+    properties: _defineProperty({}, uid(), {
+      type: 'void',
+      'x-component': 'FormV2',
+      'x-component-props': {
+        useProps: '{{ useFormBlockProps }}'
+      },
+      properties: {
+        grid: template || {
+          type: 'void',
+          'x-component': 'Grid',
+          'x-initializer': formItemInitializers,
+          properties: {}
+        },
+        actions: {
+          type: 'void',
+          'x-initializer': actionInitializers,
+          'x-component': 'ActionBar',
+          'x-component-props': {
+            layout: 'one-column',
+            style: {
+              float: 'right'
+            }
+          },
+          properties: {}
+        }
+      }
+    })
+  };
+  return schema;
+};
+export var createReadPrettyFormBlockSchema = function createReadPrettyFormBlockSchema(options) {
+  var _options$formItemInit4 = options.formItemInitializers,
+    formItemInitializers = _options$formItemInit4 === void 0 ? 'ReadPrettyFormItemInitializers' : _options$formItemInit4,
+    _options$actionInitia4 = options.actionInitializers,
+    actionInitializers = _options$actionInitia4 === void 0 ? 'ReadPrettyFormActionInitializers' : _options$actionInitia4,
+    collection = options.collection,
+    association = options.association,
+    resource = options.resource,
+    template = options.template,
+    others = _objectWithoutProperties(options, _excluded4);
   var resourceName = resource || association || collection;
   var schema = {
     type: 'void',
@@ -980,21 +1146,24 @@ export var createReadPrettyFormBlockSchema = function createReadPrettyFormBlockS
         }
       }
     })
-  }; // console.log(JSON.stringify(schema, null, 2));
-
+  };
+  // console.log(JSON.stringify(schema, null, 2));
   return schema;
 };
 export var createTableBlockSchema = function createTableBlockSchema(options) {
   var collection = options.collection,
-      resource = options.resource,
-      rowKey = options.rowKey,
-      tableActionInitializers = options.tableActionInitializers,
-      tableColumnInitializers = options.tableColumnInitializers,
-      tableActionColumnInitializers = options.tableActionColumnInitializers,
-      tableBlockProvider = options.tableBlockProvider,
-      disableTemplate = options.disableTemplate,
-      others = _objectWithoutProperties(options, _excluded4);
-
+    resource = options.resource,
+    rowKey = options.rowKey,
+    tableActionInitializers = options.tableActionInitializers,
+    tableColumnInitializers = options.tableColumnInitializers,
+    tableActionColumnInitializers = options.tableActionColumnInitializers,
+    tableBlockProvider = options.tableBlockProvider,
+    disableTemplate = options.disableTemplate,
+    TableBlockDesigner = options.TableBlockDesigner,
+    blockType = options.blockType,
+    _options$pageSize = options.pageSize,
+    pageSize = _options$pageSize === void 0 ? 20 : _options$pageSize,
+    others = _objectWithoutProperties(options, _excluded5);
   var schema = {
     type: 'void',
     'x-decorator': tableBlockProvider !== null && tableBlockProvider !== void 0 ? tableBlockProvider : 'TableBlockProvider',
@@ -1004,15 +1173,17 @@ export var createTableBlockSchema = function createTableBlockSchema(options) {
       resource: resource || collection,
       action: 'list',
       params: {
-        pageSize: 20
+        pageSize: pageSize
       },
       rowKey: rowKey,
       showIndex: true,
       dragSort: false,
-      disableTemplate: disableTemplate !== null && disableTemplate !== void 0 ? disableTemplate : false
+      disableTemplate: disableTemplate !== null && disableTemplate !== void 0 ? disableTemplate : false,
+      blockType: blockType
     }, others),
-    'x-designer': 'TableBlockDesigner',
+    'x-designer': TableBlockDesigner !== null && TableBlockDesigner !== void 0 ? TableBlockDesigner : 'TableBlockDesigner',
     'x-component': 'CardItem',
+    'x-filter-targets': [],
     properties: _defineProperty({
       actions: {
         type: 'void',
@@ -1059,16 +1230,41 @@ export var createTableBlockSchema = function createTableBlockSchema(options) {
         }
       }
     })
-  }; // console.log(JSON.stringify(schema, null, 2));
-
+  };
+  // console.log(JSON.stringify(schema, null, 2));
+  return schema;
+};
+export var createCollapseBlockSchema = function createCollapseBlockSchema(options) {
+  var collection = options.collection,
+    blockType = options.blockType;
+  var schema = {
+    type: 'void',
+    'x-decorator': 'AssociationFilter.Provider',
+    'x-decorator-props': {
+      collection: collection,
+      blockType: blockType,
+      associationFilterStyle: {
+        width: '100%'
+      }
+    },
+    'x-designer': 'AssociationFilter.BlockDesigner',
+    'x-component': 'CardItem',
+    'x-filter-targets': [],
+    properties: _defineProperty({}, uid(), {
+      type: 'void',
+      'x-action': 'associateFilter',
+      'x-initializer': 'AssociationFilter.FilterBlockInitializer',
+      'x-component': 'AssociationFilter',
+      properties: {}
+    })
+  };
   return schema;
 };
 export var createTableSelectorSchema = function createTableSelectorSchema(options) {
   var collection = options.collection,
-      resource = options.resource,
-      rowKey = options.rowKey,
-      others = _objectWithoutProperties(options, _excluded5);
-
+    resource = options.resource,
+    rowKey = options.rowKey,
+    others = _objectWithoutProperties(options, _excluded6);
   var schema = {
     type: 'void',
     'x-acl-action': "".concat(resource || collection, ":list"),
@@ -1115,10 +1311,9 @@ export var createTableSelectorSchema = function createTableSelectorSchema(option
 };
 export var createCalendarBlockSchema = function createCalendarBlockSchema(options) {
   var collection = options.collection,
-      resource = options.resource,
-      fieldNames = options.fieldNames,
-      others = _objectWithoutProperties(options, _excluded6);
-
+    resource = options.resource,
+    fieldNames = options.fieldNames,
+    others = _objectWithoutProperties(options, _excluded7);
   var schema = {
     type: 'void',
     'x-acl-action': "".concat(resource || collection, ":list"),
@@ -1171,6 +1366,9 @@ export var createCalendarBlockSchema = function createCalendarBlockSchema(option
                   'x-component': 'Tabs',
                   'x-component-props': {},
                   'x-initializer': 'TabPaneInitializers',
+                  'x-initializer-props': {
+                    gridInitializer: 'RecordBlockInitializers'
+                  },
                   properties: {
                     tab1: {
                       type: 'void',
@@ -1202,12 +1400,138 @@ export var createCalendarBlockSchema = function createCalendarBlockSchema(option
   console.log(JSON.stringify(schema, null, 2));
   return schema;
 };
+export var createGanttBlockSchema = function createGanttBlockSchema(options) {
+  var collection = options.collection,
+    resource = options.resource,
+    fieldNames = options.fieldNames,
+    others = _objectWithoutProperties(options, _excluded8);
+  var schema = {
+    type: 'void',
+    'x-acl-action': "".concat(resource || collection, ":list"),
+    'x-decorator': 'GanttBlockProvider',
+    'x-decorator-props': _objectSpread({
+      collection: collection,
+      resource: resource || collection,
+      action: 'list',
+      fieldNames: _objectSpread({
+        id: 'id'
+      }, fieldNames),
+      params: {
+        paginate: false
+      }
+    }, others),
+    'x-designer': 'Gantt.Designer',
+    'x-component': 'CardItem',
+    properties: _defineProperty({}, uid(), {
+      type: 'void',
+      'x-component': 'Gantt',
+      'x-component-props': {
+        useProps: '{{ useGanttBlockProps }}'
+      },
+      properties: {
+        toolBar: {
+          type: 'void',
+          'x-component': 'ActionBar',
+          'x-component-props': {
+            style: {
+              marginBottom: 24
+            }
+          },
+          'x-initializer': 'GanttActionInitializers',
+          properties: {}
+        },
+        table: {
+          type: 'array',
+          'x-decorator': 'div',
+          'x-decorator-props': {
+            style: {
+              float: 'left',
+              maxWidth: '35%'
+            }
+          },
+          'x-initializer': 'TableColumnInitializers',
+          'x-component': 'TableV2',
+          'x-component-props': {
+            rowKey: 'id',
+            rowSelection: {
+              type: 'checkbox'
+            },
+            useProps: '{{ useTableBlockProps }}',
+            pagination: false
+          },
+          properties: {
+            actions: {
+              type: 'void',
+              title: '{{ t("Actions") }}',
+              'x-action-column': 'actions',
+              'x-decorator': 'TableV2.Column.ActionBar',
+              'x-component': 'TableV2.Column',
+              'x-designer': 'TableV2.ActionColumnDesigner',
+              'x-initializer': 'TableActionColumnInitializers',
+              properties: {
+                actions: {
+                  type: 'void',
+                  'x-decorator': 'DndContext',
+                  'x-component': 'Space',
+                  'x-component-props': {
+                    split: '|'
+                  },
+                  properties: {}
+                }
+              }
+            }
+          }
+        },
+        detail: {
+          type: 'void',
+          'x-component': 'Gantt.Event',
+          properties: {
+            drawer: {
+              type: 'void',
+              'x-component': 'Action.Drawer',
+              'x-component-props': {
+                className: 'nb-action-popup'
+              },
+              title: '{{ t("View record") }}',
+              properties: {
+                tabs: {
+                  type: 'void',
+                  'x-component': 'Tabs',
+                  'x-component-props': {},
+                  'x-initializer': 'TabPaneInitializers',
+                  properties: {
+                    tab1: {
+                      type: 'void',
+                      title: '{{t("Details")}}',
+                      'x-component': 'Tabs.TabPane',
+                      'x-designer': 'Tabs.Designer',
+                      'x-component-props': {},
+                      properties: {
+                        grid: {
+                          type: 'void',
+                          'x-component': 'Grid',
+                          'x-initializer': 'RecordBlockInitializers',
+                          properties: {}
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    })
+  };
+  console.log(JSON.stringify(schema, null, 2));
+  return schema;
+};
 export var createKanbanBlockSchema = function createKanbanBlockSchema(options) {
   var collection = options.collection,
-      resource = options.resource,
-      groupField = options.groupField,
-      others = _objectWithoutProperties(options, _excluded7);
-
+    resource = options.resource,
+    groupField = options.groupField,
+    others = _objectWithoutProperties(options, _excluded9);
   var schema = {
     type: 'void',
     'x-acl-action': "".concat(resource || collection, ":list"),
@@ -1245,8 +1569,12 @@ export var createKanbanBlockSchema = function createKanbanBlockSchema(options) {
         card: {
           type: 'void',
           'x-read-pretty': true,
+          'x-label-disabled': true,
           'x-decorator': 'BlockItem',
           'x-component': 'Kanban.Card',
+          'x-component-props': {
+            openMode: 'drawer'
+          },
           'x-designer': 'Kanban.Card.Designer',
           properties: {
             grid: {
@@ -1263,6 +1591,7 @@ export var createKanbanBlockSchema = function createKanbanBlockSchema(options) {
           title: '{{ t("View") }}',
           'x-designer': 'Action.Designer',
           'x-component': 'Kanban.CardViewer',
+          'x-action': 'view',
           'x-component-props': {
             openMode: 'drawer'
           },