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

package/es/acl/ACLProvider.d.ts

@@ -20,7 +20,7 @@ export declare const useRecordPkValue: () => any;
 export declare const ACLActionProvider: (props: any) => React.JSX.Element;
 export declare const useACLFieldWhitelist: () => {
     whitelist: any[];
-    schemaInWhitelist(fieldSchema: Schema): boolean;
+    schemaInWhitelist(fieldSchema: Schema, isSkip?: any): boolean;
 };
 export declare const ACLCollectionFieldProvider: (props: any) => React.JSX.Element;
 export declare const ACLMenuItemProvider: (props: any) => React.JSX.Element;

package/es/acl/ACLProvider.js

@@ -262,7 +262,10 @@ export var useACLFieldWhitelist = function useACLFieldWhitelist() {
   var whitelist = [].concat((params === null || params === void 0 ? void 0 : params.whitelist) || []).concat((params === null || params === void 0 ? void 0 : params.fields) || []).concat((params === null || params === void 0 ? void 0 : params.appends) || []);
   return {
     whitelist: whitelist,
-    schemaInWhitelist: function schemaInWhitelist(fieldSchema) {
+    schemaInWhitelist: function schemaInWhitelist(fieldSchema, isSkip) {
+      if (isSkip) {
+        return true;
+      }
       if (whitelist.length === 0) {
         return true;
       }

package/es/block-provider/FormBlockProvider.js

@@ -69,7 +69,8 @@ export var useIsEmptyRecord = function useIsEmptyRecord() {
 };
 export var FormBlockProvider = function FormBlockProvider(props) {
   var record = useRecord();
-  var collection = props.collection;
+  var collection = props.collection,
+    isCusomeizeCreate = props.isCusomeizeCreate;
   var __collection = record.__collection;
   var currentCollection = useCollection();
   var _useDesignable = useDesignable(),
@@ -83,16 +84,9 @@ export var FormBlockProvider = function FormBlockProvider(props) {
     }
   }
   var createFlag = currentCollection.name === ((collection === null || collection === void 0 ? void 0 : collection.name) || collection) && !isEmptyRecord || !currentCollection.name;
-  return (detailFlag || createFlag) && /*#__PURE__*/React.createElement(BlockProvider, _objectSpread(_objectSpread({}, props), {}, {
-    block: 'form',
-    params: _objectSpread(_objectSpread({}, props === null || props === void 0 ? void 0 : props.params), {}, {
-      targetCollection: collection
-    })
-  }), /*#__PURE__*/React.createElement(InternalFormBlockProvider, _objectSpread(_objectSpread({}, props), {}, {
-    params: _objectSpread(_objectSpread({}, props === null || props === void 0 ? void 0 : props.params), {}, {
-      targetCollection: collection
-    })
-  })));
+  return (detailFlag || createFlag || isCusomeizeCreate) && /*#__PURE__*/React.createElement(BlockProvider, _objectSpread(_objectSpread({}, props), {}, {
+    block: 'form'
+  }), /*#__PURE__*/React.createElement(InternalFormBlockProvider, _objectSpread({}, props)));
 };
 export var useFormBlockContext = function useFormBlockContext() {
   return useContext(FormBlockContext);

package/es/block-provider/TableBlockProvider.js

@@ -1,4 +1,5 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+var _excluded = ["params", "showIndex", "dragSort", "rowKey", "childrenColumnName", "fieldNames"];
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -11,6 +12,8 @@ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArra
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _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 _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); }
@@ -23,10 +26,10 @@ import { FormContext, useField, useFieldSchema } from '@formily/react';
 import React, { createContext, useContext, useEffect, useMemo, useState } from 'react';
 import { useCollectionManager } from '../collection-manager';
 import { useFilterBlock } from '../filter-provider/FilterProvider';
-import { FixedBlockWrapper, removeNullCondition, SchemaComponentOptions } from '../schema-component';
+import { FixedBlockWrapper, SchemaComponentOptions, removeNullCondition } from '../schema-component';
 import { BlockProvider, RenderChildrenWithAssociationFilter, useBlockRequestContext } from './BlockProvider';
-import { findFilterTargets } from './hooks';
 import { mergeFilter } from './SharedFilterProvider';
+import { findFilterTargets } from './hooks';
 export var TableBlockContext = /*#__PURE__*/createContext({});
 export function getIdsWithChildren(nodes) {
   var ids = [];
@@ -55,7 +58,8 @@ var InternalTableBlockProvider = function InternalTableBlockProvider(props) {
     dragSort = props.dragSort,
     rowKey = props.rowKey,
     childrenColumnName = props.childrenColumnName,
-    fieldNames = props.fieldNames;
+    fieldNames = props.fieldNames,
+    others = _objectWithoutProperties(props, _excluded);
   var field = useField();
   var _useBlockRequestConte = useBlockRequestContext(),
     resource = _useBlockRequestConte.resource,
@@ -75,7 +79,7 @@ var InternalTableBlockProvider = function InternalTableBlockProvider(props) {
     }
   }, [service === null || service === void 0 ? void 0 : service.loading]);
   return /*#__PURE__*/React.createElement(FixedBlockWrapper, null, /*#__PURE__*/React.createElement(TableBlockContext.Provider, {
-    value: {
+    value: _objectSpread(_objectSpread({}, others), {}, {
       field: field,
       service: service,
       resource: resource,
@@ -89,7 +93,7 @@ var InternalTableBlockProvider = function InternalTableBlockProvider(props) {
       setExpandFlag: function setExpandFlag() {
         return _setExpandFlag(!expandFlag);
       }
-    }
+    })
   }, /*#__PURE__*/React.createElement(RenderChildrenWithAssociationFilter, _objectSpread({}, props))));
 };
 export var TableBlockProvider = function TableBlockProvider(props) {

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

@@ -9,6 +9,7 @@ export declare const useCollection: () => {
     getPrimaryKey: () => any;
     currentFields: import("../types").FieldOptions[];
     inheritedFields: any[];
+    foreignKeyFields: import("../types").FieldOptions[];
     name?: string;
     title?: string;
     filterTargetKey?: string;

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

@@ -25,6 +25,9 @@ export var useCollection = function useCollection() {
   var totalFields = unionBy(currentFields === null || currentFields === void 0 ? void 0 : currentFields.concat(inheritedFields), 'name').filter(function (v) {
     return !v.isForeignKey;
   });
+  var foreignKeyFields = unionBy(currentFields === null || currentFields === void 0 ? void 0 : currentFields.concat(inheritedFields), 'name').filter(function (v) {
+    return v.isForeignKey;
+  });
   return _objectSpread(_objectSpread({}, collection), {}, {
     resource: resource,
     getField: function getField(name) {
@@ -50,6 +53,7 @@ export var useCollection = function useCollection() {
       return field ? field.name : 'id';
     },
     currentFields: currentFields,
-    inheritedFields: inheritedFields
+    inheritedFields: inheritedFields,
+    foreignKeyFields: foreignKeyFields
   });
 };

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

@@ -44,4 +44,5 @@ export declare const useCollectionManager: () => {
     getTemplate(name?: string): any;
     getParentCollectionFields: (parentCollection: any, currentCollection: any) => any;
     getAllCollectionsInheritChain: (collectionName: string) => string[];
+    getInheritCollectionsChain: (collectionName: string) => string[];
 };

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

@@ -225,6 +225,32 @@ export var useCollectionManager = function useCollectionManager() {
     };
     return getInheritChain(collectionName);
   };
+  /**
+   * 获取继承的所有 collectionName，排列顺序为当前表往祖先表排列
+   * @param collectionName
+   * @returns
+   */
+  var getInheritCollectionsChain = function getInheritCollectionsChain(collectionName) {
+    var collectionsInheritChain = [collectionName];
+    var getInheritChain = function getInheritChain(name) {
+      var collection = getCollection(name);
+      if (collection) {
+        var inherits = collection.inherits;
+        if (inherits) {
+          for (var index = 0; index < inherits.length; index++) {
+            var collectionKey = inherits[index];
+            if (collectionsInheritChain.includes(collectionKey)) {
+              continue;
+            }
+            collectionsInheritChain.push(collectionKey);
+            getInheritChain(collectionKey);
+          }
+        }
+      }
+      return collectionsInheritChain;
+    };
+    return getInheritChain(collectionName);
+  };
   return {
     service: service,
     interfaces: interfaces,
@@ -301,6 +327,7 @@ export var useCollectionManager = function useCollectionManager() {
         });
       });
     },
-    getAllCollectionsInheritChain: getAllCollectionsInheritChain
+    getAllCollectionsInheritChain: getAllCollectionsInheritChain,
+    getInheritCollectionsChain: getInheritCollectionsChain
   };
 };

package/es/filter-provider/FilterProvider.d.ts

@@ -1,13 +1,22 @@
 import React from 'react';
 import { SharedFilter } from '../block-provider/SharedFilterProvider';
-import { CollectionFieldOptions, useCollection } from '../collection-manager';
+import { CollectionFieldOptions, FieldOptions, useCollection } from '../collection-manager';
+export interface ForeignKeyField extends FieldOptions {
+    /** 外键字段所在的数据表的名称 */
+    collectionName: string;
+    isForeignKey: boolean;
+    key: string;
+    name: string;
+    parentKey: null | string;
+    reverseKey: null | string;
+}
 type Collection = ReturnType<typeof useCollection>;
 export interface DataBlock {
     /** 唯一标识符，schema 中的 name 值 */
     uid: string;
     /** 用户自行设置的区块名称 */
     title?: string;
-    /** 与当前区块相关的数据表信息 */
+    /** 与数据区块相关的数据表信息 */
     collection: Collection;
     /** 根据提供的参数执行该方法即可刷新数据区块的数据 */
     doFilter: (params: any, params2?: any) => Promise<void>;
@@ -15,10 +24,13 @@ export interface DataBlock {
     clearFilter: (uid: string) => void;
     /** 数据区块表中所有的关系字段 */
     associatedFields?: CollectionFieldOptions[];
-    /** 通过右上角菜单设置的过滤条件 */
+    /** 数据区块表中所有的外键字段 */
+    foreignKeyFields?: ForeignKeyField[];
+    /** 数据区块已经存在的过滤条件（通过 `设置数据范围` 或者其它能设置筛选条件的功能） */
     defaultFilter?: SharedFilter;
+    /** 数据区块用于请求数据的接口 */
     service?: any;
-    /** 区块所对应的 DOM 容器 */
+    /** 数据区块所的 DOM 容器 */
     dom: HTMLElement;
 }
 /**

package/es/filter-provider/FilterProvider.js

@@ -62,6 +62,7 @@ export var FilterBlockRecord = function FilterBlockRecord(_ref2) {
       doFilter: service.runAsync,
       collection: collection,
       associatedFields: associatedFields,
+      foreignKeyFields: collection.foreignKeyFields,
       defaultFilter: (params === null || params === void 0 ? void 0 : params.filter) || {},
       service: service,
       dom: container.current,

package/es/filter-provider/utils.d.ts

@@ -1,18 +1,21 @@
 import { Schema } from '@formily/react';
 import { FilterTarget } from '../block-provider/hooks';
-import { Collection, CollectionFieldOptions, FieldOptions } from '../collection-manager';
+import { Collection, CollectionFieldOptions, FieldOptions, useCollection } from '../collection-manager';
+import { DataBlock } from './FilterProvider';
 export declare enum FilterBlockType {
     FORM = 0,
     TABLE = 1,
     TREE = 2,
     COLLAPSE = 3
 }
+export declare const getSupportFieldsByAssociation: (inheritCollectionsChain: string[], block: DataBlock) => CollectionFieldOptions[];
+export declare const getSupportFieldsByForeignKey: (filterBlockCollection: ReturnType<typeof useCollection>, block: DataBlock) => import("./FilterProvider").ForeignKeyField[];
 /**
  * 根据筛选区块类型筛选出支持的数据区块（同表或具有关系字段的表）
  * @param filterBlockType
  * @returns
  */
-export declare const useSupportedBlocks: (filterBlockType: FilterBlockType) => import("./FilterProvider").DataBlock[];
+export declare const useSupportedBlocks: (filterBlockType: FilterBlockType) => DataBlock[];
 export declare const transformToFilter: (values: Record<string, any>, fieldSchema: Schema, getCollectionJoinField: (name: string) => CollectionFieldOptions, collectionName: string) => {
     $and: {
         [x: string]: {

package/es/filter-provider/utils.js

@@ -20,7 +20,7 @@ import _ from 'lodash';
 import { useCallback, useEffect, useState } from 'react';
 import { mergeFilter } from '../block-provider';
 import { findFilterTargets } from '../block-provider/hooks';
-import { useCollection } from '../collection-manager';
+import { useCollection, useCollectionManager } from '../collection-manager';
 import { removeNullCondition } from '../schema-component';
 import { findFilterOperators } from '../schema-component/antd/form-item/SchemaSettingOptions';
 import { useFilterBlock } from './FilterProvider';
@@ -31,6 +31,22 @@ export var FilterBlockType;
   FilterBlockType[FilterBlockType["TREE"] = 2] = "TREE";
   FilterBlockType[FilterBlockType["COLLAPSE"] = 3] = "COLLAPSE";
 })(FilterBlockType || (FilterBlockType = {}));
+export var getSupportFieldsByAssociation = function getSupportFieldsByAssociation(inheritCollectionsChain, block) {
+  var _block$associatedFiel;
+  return (_block$associatedFiel = block.associatedFields) === null || _block$associatedFiel === void 0 ? void 0 : _block$associatedFiel.filter(function (field) {
+    return inheritCollectionsChain.some(function (collectionName) {
+      return collectionName === field.target;
+    });
+  });
+};
+export var getSupportFieldsByForeignKey = function getSupportFieldsByForeignKey(filterBlockCollection, block) {
+  var _block$foreignKeyFiel;
+  return (_block$foreignKeyFiel = block.foreignKeyFields) === null || _block$foreignKeyFiel === void 0 ? void 0 : _block$foreignKeyFiel.filter(function (foreignKeyField) {
+    return filterBlockCollection.fields.some(function (field) {
+      return field.type !== 'belongsTo' && field.foreignKey === foreignKeyField.name;
+    });
+  });
+};
 /**
  * 根据筛选区块类型筛选出支持的数据区块（同表或具有关系字段的表）
  * @param filterBlockType
@@ -41,6 +57,8 @@ export var useSupportedBlocks = function useSupportedBlocks(filterBlockType) {
     getDataBlocks = _useFilterBlock.getDataBlocks;
   var fieldSchema = useFieldSchema();
   var collection = useCollection();
+  var _useCollectionManager = useCollectionManager(),
+    getAllCollectionsInheritChain = _useCollectionManager.getAllCollectionsInheritChain;
   // Form 和 Collapse 仅支持同表的数据区块
   if (filterBlockType === FilterBlockType.FORM || filterBlockType === FilterBlockType.COLLAPSE) {
     return getDataBlocks().filter(function (block) {
@@ -50,9 +68,11 @@ export var useSupportedBlocks = function useSupportedBlocks(filterBlockType) {
   // Table 和 Tree 支持同表或者关系表的数据区块
   if (filterBlockType === FilterBlockType.TABLE || filterBlockType === FilterBlockType.TREE) {
     return getDataBlocks().filter(function (block) {
-      return fieldSchema['x-uid'] !== block.uid && (isSameCollection(block.collection, collection) || block.associatedFields.some(function (field) {
-        return field.target === collection.name;
-      }));
+      var _getSupportFieldsByAs, _getSupportFieldsByFo;
+      // 1. 同表
+      // 2. 关系字段
+      // 3. 外键字段
+      return fieldSchema['x-uid'] !== block.uid && (isSameCollection(block.collection, collection) || ((_getSupportFieldsByAs = getSupportFieldsByAssociation(getAllCollectionsInheritChain(collection.name), block)) === null || _getSupportFieldsByAs === void 0 ? void 0 : _getSupportFieldsByAs.length) || ((_getSupportFieldsByFo = getSupportFieldsByForeignKey(collection, block)) === null || _getSupportFieldsByFo === void 0 ? void 0 : _getSupportFieldsByFo.length));
     });
   }
 };

package/es/locale/en_US.d.ts

@@ -708,5 +708,8 @@ declare const _default: {
     "Current object": string;
     "Linkage with form fields": string;
     "Allow add new, update and delete actions": string;
+    "Date display format": string;
+    "Assign  data scope for the template": string;
+    "Table selected records": string;
 };
 export default _default;

package/es/locale/en_US.js

@@ -707,5 +707,8 @@ export default {
   "Current form": "Current form",
   "Current object": "Current object",
   "Linkage with form fields": "Linkage with form fields",
-  "Allow add new, update and delete actions": "Allow add new, update and delete actions"
+  "Allow add new, update and delete actions": "Allow add new, update and delete actions",
+  "Date display format": "Date display format",
+  "Assign  data scope for the template": "Assign  data scope for the template",
+  "Table selected records": "Table selected records"
 };