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

package/es/collection-manager/hooks/useCollection.d.ts

@@ -1,8 +1,10 @@
 import { SchemaKey } from '@formily/react';
 import { CollectionFieldOptions } from '../types';
+export declare type Collection = ReturnType<typeof useCollection>;
 export declare const useCollection: () => {
     resource: import("@nocobase/sdk").IResource;
     getField(name: SchemaKey): CollectionFieldOptions;
+    getTreeParentField(): import("../types").FieldOptions;
     fields: import("../types").FieldOptions[];
     getPrimaryKey: () => any;
     currentFields: import("../types").FieldOptions[];
@@ -13,4 +15,6 @@ export declare const useCollection: () => {
     targetKey?: string;
     sortable?: any;
     inherits?: string[];
+    tree?: string;
+    template?: string;
 };

package/es/collection-manager/hooks/useCollection.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 { reduce, unionBy } from 'lodash';
 import { useContext } from 'react';
 import { useAPIClient } from '../../api-client';
@@ -13,11 +13,9 @@ export var useCollection = function useCollection() {
   var collection = useContext(CollectionContext);
   var api = useAPIClient();
   var resource = api === null || api === void 0 ? void 0 : api.resource(collection === null || collection === void 0 ? void 0 : collection.name);
-
   var _useCollectionManager = useCollectionManager(),
-      getInheritCollections = _useCollectionManager.getInheritCollections,
-      getCurrentCollectionFields = _useCollectionManager.getCurrentCollectionFields;
-
+    getInheritCollections = _useCollectionManager.getInheritCollections,
+    getCurrentCollectionFields = _useCollectionManager.getCurrentCollectionFields;
   var currentFields = (collection === null || collection === void 0 ? void 0 : collection.fields) || [];
   var inheritKeys = getInheritCollections(collection === null || collection === void 0 ? void 0 : collection.name) || [];
   var inheritedFields = reduce(inheritKeys, function (result, value) {
@@ -35,12 +33,17 @@ export var useCollection = function useCollection() {
         return field.name === name;
       });
     },
+    getTreeParentField: function getTreeParentField() {
+      var fields = totalFields;
+      return fields === null || fields === void 0 ? void 0 : fields.find(function (field) {
+        return field.treeParent;
+      });
+    },
     fields: totalFields,
     getPrimaryKey: function getPrimaryKey() {
       if (collection.targetKey || collection.filterTargetKey) {
         return collection.targetKey || collection.filterTargetKey;
       }
-
       var field = currentFields.find(function (field) {
         return field.primaryKey;
       });

package/es/collection-manager/hooks/useCollectionDataSource.d.ts

@@ -1 +1 @@
-export declare function useCollectionDataSource(): (field: any) => void;
+export declare function useCollectionDataSource(filter?: Function): (field: any) => void;

package/es/collection-manager/hooks/useCollectionDataSource.js

@@ -1,16 +1,15 @@
 import { action } from '@formily/reactive';
 import { useCollectionManager } from ".";
 import { useCompile } from "../../schema-component";
-export function useCollectionDataSource() {
+export function useCollectionDataSource(filter) {
   return function (field) {
     var compile = useCompile();
-
     var _useCollectionManager = useCollectionManager(),
-        _useCollectionManager2 = _useCollectionManager.collections,
-        collections = _useCollectionManager2 === void 0 ? [] : _useCollectionManager2;
-
+      _useCollectionManager2 = _useCollectionManager.collections,
+      collections = _useCollectionManager2 === void 0 ? [] : _useCollectionManager2;
     action.bound(function (data) {
-      field.dataSource = data.map(function (item) {
+      var filtered = typeof filter === 'function' ? data.filter(filter) : data;
+      field.dataSource = filtered.map(function (item) {
         return {
           label: compile(item.title),
           value: item.name

package/es/collection-manager/hooks/useCollectionField.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 } from 'react';
 import { useAPIClient } from '../../api-client';
 import { useRecord } from '../../record-provider';
@@ -16,11 +16,9 @@ export var useCollectionField = function useCollectionField() {
   var api = useAPIClient();
   var compile = useCompile();
   var ctx = useContext(CollectionFieldContext);
-
   if (!ctx) {
     return {};
   }
-
   var resourceName = "".concat((ctx === null || ctx === void 0 ? void 0 : ctx.collectionName) || (collection === null || collection === void 0 ? void 0 : collection.name), ".").concat(ctx.name);
   var resource = api === null || api === void 0 ? void 0 : api.resource(resourceName, record[ctx.sourceKey]);
   return _objectSpread(_objectSpread({}, ctx), {}, {

package/es/collection-manager/hooks/useCollectionManager.d.ts

@@ -4,23 +4,43 @@ export declare const useCollectionManager: () => {
     interfaces: any;
     collections: any[];
     getInheritCollections: (name: any) => any[];
-    getChildrenCollections: (name: any) => any[];
+    getChildrenCollections: (name: any, isSupportView?: boolean) => any[];
     refreshCM: () => Promise<void>;
     get(name: string): any;
     getInheritedFields: (name: any) => any[];
     getCollectionField: (name: string) => CollectionFieldOptions;
     getCollectionFields: (name: string) => CollectionFieldOptions[];
     getCollectionFieldsOptions: (collectionName: string, type?: string | string[], opts?: {
+        cached?: Record<string, any>;
+        collectionNames?: string[];
         /**
          * 为 true 时允许查询所有关联字段
          * 为 Array<string> 时仅允许查询指定的关联字段
          */
         association?: boolean | string[];
-    }) => any[];
+        /**
+         * Max depth of recursion
+         */
+        maxDepth?: number;
+        allowAllTypes?: boolean;
+        /**
+         * 排除这些接口的字段
+         */
+        exceptInterfaces?: string[];
+        /**
+         * field value 的前缀，用 . 连接，比如 a.b.c
+         */
+        prefixFieldValue?: string;
+        /**
+         * 是否使用 prefixFieldValue 作为 field value
+         */
+        usePrefix?: boolean;
+    }) => any;
     getCurrentCollectionFields: (name: string) => any;
-    getCollection(name: any): any;
+    getCollection: (name: any) => any;
     getCollectionJoinField(name: string): any;
     getInterface(name: string): any;
     getTemplate(name?: string): any;
     getParentCollectionFields: (parentCollection: any, currentCollection: any) => any;
+    getAllCollectionsInheritChain: (collectionName: string) => string[];
 };

package/es/collection-manager/hooks/useCollectionManager.js

@@ -1,96 +1,82 @@
+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 _toArray(arr) { return _arrayWithHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableRest(); }
-
+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 _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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 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; }
-
 import { clone } from '@formily/shared';
-import { reduce, unionBy, uniq, uniqBy } from 'lodash';
+import _, { reduce, unionBy, uniq, uniqBy } from 'lodash';
 import { useContext } from 'react';
 import { useCompile } from '../../schema-component';
 import { CollectionManagerContext } from '../context';
 export var useCollectionManager = function useCollectionManager() {
   var _useContext = useContext(CollectionManagerContext),
-      _refreshCM = _useContext.refreshCM,
-      service = _useContext.service,
-      interfaces = _useContext.interfaces,
-      collections = _useContext.collections,
-      templates = _useContext.templates;
-
+    _refreshCM = _useContext.refreshCM,
+    service = _useContext.service,
+    interfaces = _useContext.interfaces,
+    collections = _useContext.collections,
+    templates = _useContext.templates;
   var compile = useCompile();
-
   var getInheritedFields = function getInheritedFields(name) {
     var inheritKeys = getInheritCollections(name);
     var inheritedFields = reduce(inheritKeys, function (result, value) {
       var _collections$find;
-
       var arr = result;
       return arr.concat(collections === null || collections === void 0 ? void 0 : (_collections$find = collections.find(function (collection) {
         return collection.name === value;
       })) === null || _collections$find === void 0 ? void 0 : _collections$find.fields);
     }, []);
-    return inheritedFields;
+    return inheritedFields.filter(Boolean);
   };
-
   var getCollectionFields = function getCollectionFields(name) {
     var _collections$find2;
-
-    var currentFields = collections === null || collections === void 0 ? void 0 : (_collections$find2 = collections.find(function (collection) {
+    var currentFields = (collections === null || collections === void 0 ? void 0 : (_collections$find2 = collections.find(function (collection) {
       return collection.name === name;
-    })) === null || _collections$find2 === void 0 ? void 0 : _collections$find2.fields;
+    })) === null || _collections$find2 === void 0 ? void 0 : _collections$find2.fields) || [];
     var inheritedFields = getInheritedFields(name);
     var totalFields = unionBy((currentFields === null || currentFields === void 0 ? void 0 : currentFields.concat(inheritedFields)) || [], 'name').filter(function (v) {
       return !v.isForeignKey;
     });
     return totalFields;
   };
-
   var getCollectionField = function getCollectionField(name) {
     var _getCollectionFields;
-
     var _name$split = name.split('.'),
-        _name$split2 = _slicedToArray(_name$split, 2),
-        collectionName = _name$split2[0],
-        fieldName = _name$split2[1];
-
+      _name$split2 = _slicedToArray(_name$split, 2),
+      collectionName = _name$split2[0],
+      fieldName = _name$split2[1];
     if (!fieldName) {
       return;
     }
-
     var collection = collections === null || collections === void 0 ? void 0 : collections.find(function (collection) {
       return collection.name === collectionName;
     });
-
     if (!collection) {
       return;
     }
-
     return (_getCollectionFields = getCollectionFields(collectionName)) === null || _getCollectionFields === void 0 ? void 0 : _getCollectionFields.find(function (field) {
       return field.name === fieldName;
     });
   };
-
   var getInheritCollections = function getInheritCollections(name) {
     var parents = [];
-
     var getParents = function getParents(name) {
       var collection = collections === null || collections === void 0 ? void 0 : collections.find(function (collection) {
         return collection.name === name;
       });
-
       if (collection) {
         var inherits = collection.inherits;
-
         if (inherits) {
           for (var index = 0; index < inherits.length; index++) {
             var collectionKey = inherits[index];
@@ -99,20 +85,16 @@ export var useCollectionManager = function useCollectionManager() {
           }
         }
       }
-
       return uniq(parents);
     };
-
     return getParents(name);
   };
-
   var getChildrenCollections = function getChildrenCollections(name) {
+    var isSupportView = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     var children = [];
-
     var getChildren = function getChildren(name) {
       var inheritCollections = collections.filter(function (v) {
         var _v$inherits;
-
         return (_v$inherits = v.inherits) === null || _v$inherits === void 0 ? void 0 : _v$inherits.includes(name);
       });
       inheritCollections.forEach(function (v) {
@@ -120,60 +102,130 @@ export var useCollectionManager = function useCollectionManager() {
         children.push(v);
         return getChildren(collectionKey);
       });
+      if (isSupportView) {
+        var sourceCollections = collections.filter(function (v) {
+          var _v$sources;
+          return ((_v$sources = v.sources) === null || _v$sources === void 0 ? void 0 : _v$sources.length) === 1 && (v === null || v === void 0 ? void 0 : v.sources[0]) === name;
+        });
+        sourceCollections.forEach(function (v) {
+          var collectionKey = v.name;
+          children.push(v);
+          return getChildren(collectionKey);
+        });
+      }
       return uniqBy(children, 'key');
     };
-
     return getChildren(name);
   };
-
   var getCurrentCollectionFields = function getCurrentCollectionFields(name) {
     var collection = collections === null || collections === void 0 ? void 0 : collections.find(function (collection) {
       return collection.name === name;
     });
     return (collection === null || collection === void 0 ? void 0 : collection.fields) || [];
   };
-
+  // 缓存下面已经获取的 options，防止无限循环
   var getCollectionFieldsOptions = function getCollectionFieldsOptions(collectionName) {
     var _fields$filter;
-
     var type = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'string';
     var opts = arguments.length > 2 ? arguments[2] : undefined;
-
     var _ref = opts || {},
-        _ref$association = _ref.association,
-        association = _ref$association === void 0 ? false : _ref$association;
-
+      _ref$association = _ref.association,
+      association = _ref$association === void 0 ? false : _ref$association,
+      _ref$cached = _ref.cached,
+      cached = _ref$cached === void 0 ? {} : _ref$cached,
+      _ref$collectionNames = _ref.collectionNames,
+      collectionNames = _ref$collectionNames === void 0 ? [collectionName] : _ref$collectionNames,
+      _ref$maxDepth = _ref.maxDepth,
+      maxDepth = _ref$maxDepth === void 0 ? 1 : _ref$maxDepth,
+      _ref$allowAllTypes = _ref.allowAllTypes,
+      allowAllTypes = _ref$allowAllTypes === void 0 ? false : _ref$allowAllTypes,
+      _ref$exceptInterfaces = _ref.exceptInterfaces,
+      exceptInterfaces = _ref$exceptInterfaces === void 0 ? [] : _ref$exceptInterfaces,
+      _ref$prefixFieldValue = _ref.prefixFieldValue,
+      prefixFieldValue = _ref$prefixFieldValue === void 0 ? '' : _ref$prefixFieldValue,
+      _ref$usePrefix = _ref.usePrefix,
+      usePrefix = _ref$usePrefix === void 0 ? false : _ref$usePrefix;
+    if (collectionNames.length - 1 > maxDepth) {
+      return;
+    }
+    if (cached[collectionName]) {
+      // avoid infinite recursion
+      return _.cloneDeep(cached[collectionName]);
+    }
     if (typeof type === 'string') {
       type = [type];
     }
-
     var fields = getCollectionFields(collectionName);
     var options = fields === null || fields === void 0 ? void 0 : (_fields$filter = fields.filter(function (field) {
-      return field.interface && (type.includes(field.type) || (association && field.target && field.target !== collectionName && Array.isArray(association) ? association.includes(field.interface) : false));
+      return field.interface && !exceptInterfaces.includes(field.interface) && (allowAllTypes || type.includes(field.type) || (association && field.target && field.target !== collectionName && Array.isArray(association) ? association.includes(field.interface) : false));
     })) === null || _fields$filter === void 0 ? void 0 : _fields$filter.map(function (field) {
       var _field$uiSchema;
-
-      var result = {
-        value: field.name,
+      var result = _objectSpread({
+        value: usePrefix && prefixFieldValue ? "".concat(prefixFieldValue, ".").concat(field.name) : field.name,
         label: compile(field === null || field === void 0 ? void 0 : (_field$uiSchema = field.uiSchema) === null || _field$uiSchema === void 0 ? void 0 : _field$uiSchema.title) || field.name
-      };
-
+      }, field);
       if (association && field.target) {
         var _result$children;
-
-        result.children = getCollectionFieldsOptions(field.target, type, opts);
-
+        result.children = collectionNames.includes(field.target) ? [] : getCollectionFieldsOptions(field.target, type, _objectSpread(_objectSpread({}, opts), {}, {
+          cached: cached,
+          collectionNames: [].concat(_toConsumableArray(collectionNames), [field.target]),
+          prefixFieldValue: usePrefix ? prefixFieldValue ? "".concat(prefixFieldValue, ".").concat(field.name) : field.name : '',
+          usePrefix: usePrefix
+        }));
         if (!((_result$children = result.children) === null || _result$children === void 0 ? void 0 : _result$children.length)) {
           return null;
         }
       }
-
       return result;
-    }) // 过滤 map 产生为 null 的数据
+    })
+    // 过滤 map 产生为 null 的数据
     .filter(Boolean);
+    cached[collectionName] = options;
     return options;
   };
-
+  var getCollection = function getCollection(name) {
+    if (typeof name !== 'string') {
+      return name;
+    }
+    return collections === null || collections === void 0 ? void 0 : collections.find(function (collection) {
+      return collection.name === name;
+    });
+  };
+  // 获取当前 collection 继承链路上的所有 collection
+  var getAllCollectionsInheritChain = function getAllCollectionsInheritChain(collectionName) {
+    var collectionsInheritChain = [collectionName];
+    var getInheritChain = function getInheritChain(name) {
+      var collection = getCollection(name);
+      if (collection) {
+        var inherits = collection.inherits;
+        var children = getChildrenCollections(name);
+        // 搜寻祖先表
+        if (inherits) {
+          for (var index = 0; index < inherits.length; index++) {
+            var collectionKey = inherits[index];
+            if (collectionsInheritChain.includes(collectionKey)) {
+              continue;
+            }
+            collectionsInheritChain.push(collectionKey);
+            getInheritChain(collectionKey);
+          }
+        }
+        // 搜寻后代表
+        if (children) {
+          for (var _index = 0; _index < children.length; _index++) {
+            var _collectionKey = children[_index].name;
+            if (collectionsInheritChain.includes(_collectionKey)) {
+              continue;
+            }
+            collectionsInheritChain.push(_collectionKey);
+            getInheritChain(_collectionKey);
+          }
+        }
+      }
+      return collectionsInheritChain;
+    };
+    return getInheritChain(collectionName);
+  };
   return {
     service: service,
     interfaces: interfaces,
@@ -193,45 +245,30 @@ export var useCollectionManager = function useCollectionManager() {
     getCollectionFields: getCollectionFields,
     getCollectionFieldsOptions: getCollectionFieldsOptions,
     getCurrentCollectionFields: getCurrentCollectionFields,
-    getCollection: function getCollection(name) {
-      if (typeof name !== 'string') {
-        return name;
-      }
-
-      return collections === null || collections === void 0 ? void 0 : collections.find(function (collection) {
-        return collection.name === name;
-      });
-    },
+    getCollection: getCollection,
     getCollectionJoinField: function getCollectionJoinField(name) {
       if (!name) {
         return;
       }
-
       var _name$split3 = name.split('.'),
-          _name$split4 = _toArray(_name$split3),
-          collectionName = _name$split4[0],
-          fieldNames = _name$split4.slice(1);
-
+        _name$split4 = _toArray(_name$split3),
+        collectionName = _name$split4[0],
+        fieldNames = _name$split4.slice(1);
       if (!(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.length)) {
         return;
       }
-
       var cName = collectionName;
       var collectionField;
-
       while (cName && fieldNames.length > 0) {
         var _collectionField;
-
         var fileName = fieldNames.shift();
         collectionField = getCollectionField("".concat(cName, ".").concat(fileName));
-
         if ((_collectionField = collectionField) === null || _collectionField === void 0 ? void 0 : _collectionField.target) {
           cName = collectionField.target;
         } else {
           cName = null;
         }
       }
-
       return collectionField;
     },
     getInterface: function getInterface(name) {
@@ -243,29 +280,27 @@ export var useCollectionManager = function useCollectionManager() {
     },
     getParentCollectionFields: function getParentCollectionFields(parentCollection, currentCollection) {
       var _collections$find3, _collections$find4;
-
-      var currentFields = collections === null || collections === void 0 ? void 0 : (_collections$find3 = collections.find(function (collection) {
+      var currentFields = (collections === null || collections === void 0 ? void 0 : (_collections$find3 = collections.find(function (collection) {
         return collection.name === currentCollection;
-      })) === null || _collections$find3 === void 0 ? void 0 : _collections$find3.fields;
-      var parentFields = collections === null || collections === void 0 ? void 0 : (_collections$find4 = collections.find(function (collection) {
+      })) === null || _collections$find3 === void 0 ? void 0 : _collections$find3.fields) || [];
+      var parentFields = (collections === null || collections === void 0 ? void 0 : (_collections$find4 = collections.find(function (collection) {
         return collection.name === parentCollection;
-      })) === null || _collections$find4 === void 0 ? void 0 : _collections$find4.fields;
+      })) === null || _collections$find4 === void 0 ? void 0 : _collections$find4.fields) || [];
       var inheritKeys = getInheritCollections(currentCollection);
       var index = inheritKeys.indexOf(parentCollection);
       var filterFields = currentFields;
-
       if (index > 0) {
         inheritKeys.splice(index);
         inheritKeys.forEach(function (v) {
           filterFields = filterFields.concat(getCurrentCollectionFields(v));
         });
       }
-
       return parentFields.filter(function (v) {
         return !filterFields.find(function (k) {
           return k.name === v.name;
         });
       });
-    }
+    },
+    getAllCollectionsInheritChain: getAllCollectionsInheritChain
   };
 };

package/es/collection-manager/hooks/useOptions.js

@@ -1,15 +1,14 @@
+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 set from 'lodash/set';
 import { useCollectionManager } from './useCollectionManager';
 export var useOptions = function useOptions() {
   var _useCollectionManager = useCollectionManager(),
-      interfaces = _useCollectionManager.interfaces;
-
+    interfaces = _useCollectionManager.interfaces;
   var fields = {};
   Object.keys(interfaces).forEach(function (type) {
     var schema = interfaces[type];
@@ -17,12 +16,10 @@ export var useOptions = function useOptions() {
       order: 0
     }, schema));
   });
-
   function registerField(group, type, schema) {
     fields[group] = fields[group] || {};
     set(fields, [group, type], schema);
   }
-
   var groupLabels = {
     basic: '{{t("Basic")}}',
     choices: '{{t("Choices")}}',

package/es/collection-manager/index.d.ts

@@ -1,4 +1,4 @@
-export { useCollectionFilterOptions, useSortFields } from './action-hooks';
+export { useCollectionFilterOptions, useSortFields, useLinkageCollectionFilterOptions } from './action-hooks';
 export * from './CollectionField';
 export * from './CollectionFieldProvider';
 export * from './CollectionManagerProvider';

package/es/collection-manager/index.js

@@ -1,4 +1,4 @@
-export { useCollectionFilterOptions, useSortFields } from './action-hooks';
+export { useCollectionFilterOptions, useSortFields, useLinkageCollectionFilterOptions } from './action-hooks';
 export * from './CollectionField';
 export * from './CollectionFieldProvider';
 export * from './CollectionManagerProvider';

package/es/collection-manager/interfaces/attachment.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 { uid } from '@formily/shared';
 import { defaultProps, operators } from './properties';
 export var attachment = {
@@ -25,9 +25,9 @@ export var attachment = {
       }
     }
   },
+  availableTypes: ['belongsToMany'],
   schemaInitialize: function schemaInitialize(schema, _ref) {
     var block = _ref.block;
-
     if (['Table', 'Kanban'].includes(block)) {
       schema['x-component-props'] = schema['x-component-props'] || {};
       schema['x-component-props']['size'] = 'small';
@@ -37,19 +37,15 @@ export var attachment = {
     if (!values.through) {
       values.through = "t_".concat(uid());
     }
-
     if (!values.foreignKey) {
       values.foreignKey = "f_".concat(uid());
     }
-
     if (!values.otherKey) {
       values.otherKey = "f_".concat(uid());
     }
-
     if (!values.sourceKey) {
       values.sourceKey = 'id';
     }
-
     if (!values.targetKey) {
       values.targetKey = 'id';
     }