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

package/lib/block-provider/BlockProvider.js

@@ -3,20 +3,22 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useSourceIdFromRecord = exports.useSourceIdFromParentRecord = exports.useResourceAction = exports.useParamsFromRecord = exports.useFilterByTk = exports.useBlockResource = exports.useBlockRequestContext = exports.useBlockAssociationContext = exports.useAssociation = exports.RenderChildrenWithAssociationFilter = exports.RecordLink = exports.MaybeCollectionProvider = exports.BlockResourceContext = exports.BlockRequestContext = exports.BlockProvider = exports.BlockAssociationContext = void 0;
+exports.useSourceIdFromRecord = exports.useSourceIdFromParentRecord = exports.useResourceAction = exports.useParamsFromRecord = exports.useFilterByTk = exports.useBlockResource = exports.useBlockRequestContext = exports.useBlockAssociationContext = exports.useAssociation = exports.RenderChildrenWithAssociationFilter = exports.RecordLink = exports.MaybeCollectionProvider = exports.BlockResourceContext = exports.BlockRequestProvider = exports.BlockRequestContext = exports.BlockProvider = exports.BlockAssociationContext = void 0;
 var _css = require("@emotion/css");
 var _react = require("@formily/react");
 var _ahooks = require("ahooks");
-var _deepmerge = _interopRequireDefault(require("deepmerge"));
 var _antd = require("antd");
+var _deepmerge = _interopRequireDefault(require("deepmerge"));
 var _template = _interopRequireDefault(require("lodash/template"));
 var _react2 = _interopRequireWildcard(require("react"));
 var _reactRouterDom = require("react-router-dom");
 var _ = require("../");
+var _ACLProvider = require("../acl/ACLProvider");
 var _collectionManager = require("../collection-manager");
 var _FilterProvider = require("../filter-provider/FilterProvider");
 var _recordProvider = require("../record-provider");
 var _SharedFilterProvider = require("./SharedFilterProvider");
+var _hooks = require("./hooks");
 var _excluded = ["title", "to"];
 var _templateObject, _templateObject2, _templateObject3, _templateObject4;
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -183,7 +185,7 @@ var MaybeCollectionProvider = function MaybeCollectionProvider(props) {
   var collection = props.collection;
   return collection ? /*#__PURE__*/_react2.default.createElement(_collectionManager.CollectionProvider, {
     collection: collection
-  }, /*#__PURE__*/_react2.default.createElement(_.ACLCollectionProvider, null, props.children)) : /*#__PURE__*/_react2.default.createElement(_react2.default.Fragment, null, props.children);
+  }, /*#__PURE__*/_react2.default.createElement(_ACLProvider.ACLCollectionProvider, null, props.children)) : props.children;
 };
 exports.MaybeCollectionProvider = MaybeCollectionProvider;
 var BlockRequestProvider = function BlockRequestProvider(props) {
@@ -214,10 +216,12 @@ var BlockRequestProvider = function BlockRequestProvider(props) {
       field: field,
       service: service,
       resource: resource,
-      __parent: __parent
+      __parent: __parent,
+      updateAssociationValues: (props === null || props === void 0 ? void 0 : props.updateAssociationValues) || []
     }
   }, props.children);
 };
+exports.BlockRequestProvider = BlockRequestProvider;
 var useBlockRequestContext = function useBlockRequestContext() {
   return (0, _react2.useContext)(BlockRequestContext);
 };
@@ -268,13 +272,27 @@ var BlockProvider = function BlockProvider(props) {
   var collection = props.collection,
     association = props.association;
   var resource = useResource(props);
+  var params = _objectSpread({}, props.params);
+  var _useAssociationNames = (0, _hooks.useAssociationNames)(),
+    appends = _useAssociationNames.appends,
+    updateAssociationValues = _useAssociationNames.updateAssociationValues;
+  if (!Object.keys(params).includes('appends')) {
+    params['appends'] = appends;
+  }
   return /*#__PURE__*/_react2.default.createElement(MaybeCollectionProvider, {
     collection: collection
   }, /*#__PURE__*/_react2.default.createElement(BlockAssociationContext.Provider, {
     value: association
   }, /*#__PURE__*/_react2.default.createElement(BlockResourceContext.Provider, {
     value: resource
-  }, /*#__PURE__*/_react2.default.createElement(BlockRequestProvider, _objectSpread({}, props), /*#__PURE__*/_react2.default.createElement(_SharedFilterProvider.SharedFilterProvider, _objectSpread({}, props), /*#__PURE__*/_react2.default.createElement(_FilterProvider.FilterBlockRecord, _objectSpread({}, props), props.children))))));
+  }, /*#__PURE__*/_react2.default.createElement(BlockRequestProvider, _objectSpread(_objectSpread({}, props), {}, {
+    updateAssociationValues: updateAssociationValues,
+    params: params
+  }), /*#__PURE__*/_react2.default.createElement(_SharedFilterProvider.SharedFilterProvider, _objectSpread(_objectSpread({}, props), {}, {
+    params: params
+  }), /*#__PURE__*/_react2.default.createElement(_FilterProvider.FilterBlockRecord, _objectSpread(_objectSpread({}, props), {}, {
+    params: params
+  }), props.children))))));
 };
 exports.BlockProvider = BlockProvider;
 var useBlockAssociationContext = function useBlockAssociationContext() {

package/lib/block-provider/CalendarBlockProvider.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 export declare const CalendarBlockContext: React.Context<any>;
-export declare const CalendarBlockProvider: (props: any) => JSX.Element;
+export declare const CalendarBlockProvider: (props: any) => React.JSX.Element;
 export declare const useCalendarBlockContext: () => any;
 export declare const useCalendarBlockProps: () => {
     fieldNames: any;

package/lib/block-provider/DetailsBlockProvider.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 export declare const DetailsBlockContext: React.Context<any>;
-export declare const DetailsBlockProvider: (props: any) => JSX.Element;
+export declare const DetailsBlockProvider: (props: any) => React.JSX.Element;
 export declare const useDetailsBlockContext: () => any;
 export declare const useDetailsBlockProps: () => {
     form: any;

package/lib/block-provider/DetailsBlockProvider.js

@@ -10,7 +10,6 @@ var _antd = require("antd");
 var _react2 = _interopRequireWildcard(require("react"));
 var _recordProvider = require("../record-provider");
 var _BlockProvider = require("./BlockProvider");
-var _hooks = require("./hooks");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 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); }
@@ -51,18 +50,7 @@ var InternalDetailsBlockProvider = function InternalDetailsBlockProvider(props)
   }, props.children));
 };
 var DetailsBlockProvider = function DetailsBlockProvider(props) {
-  var params = _objectSpread({}, props.params);
-  var collection = props.collection;
-  var _useAssociationNames = (0, _hooks.useAssociationNames)(collection),
-    appends = _useAssociationNames.appends;
-  if (!Object.keys(params).includes('appends')) {
-    params['appends'] = appends;
-  }
-  return /*#__PURE__*/_react2.default.createElement(_BlockProvider.BlockProvider, _objectSpread(_objectSpread({}, props), {}, {
-    params: params
-  }), /*#__PURE__*/_react2.default.createElement(InternalDetailsBlockProvider, _objectSpread(_objectSpread({}, props), {}, {
-    params: params
-  })));
+  return /*#__PURE__*/_react2.default.createElement(_BlockProvider.BlockProvider, _objectSpread({}, props), /*#__PURE__*/_react2.default.createElement(InternalDetailsBlockProvider, _objectSpread({}, props)));
 };
 exports.DetailsBlockProvider = DetailsBlockProvider;
 var useDetailsBlockContext = function useDetailsBlockContext() {

package/lib/block-provider/FilterFormBlockProvider.d.ts

@@ -1 +1,2 @@
-export declare const FilterFormBlockProvider: (props: any) => JSX.Element;
+import React from 'react';
+export declare const FilterFormBlockProvider: (props: any) => React.JSX.Element;

package/lib/block-provider/FormBlockProvider.d.ts

@@ -2,7 +2,7 @@ import { Schema } from '@formily/react';
 import React from 'react';
 export declare const FormBlockContext: React.Context<any>;
 export declare const useIsEmptyRecord: () => boolean;
-export declare const FormBlockProvider: (props: any) => JSX.Element;
+export declare const FormBlockProvider: (props: any) => React.JSX.Element;
 export declare const useFormBlockContext: () => any;
 export declare const useFormBlockProps: () => {
     form: any;

package/lib/block-provider/FormBlockProvider.js

@@ -7,13 +7,13 @@ exports.useIsEmptyRecord = exports.useFormBlockProps = exports.useFormBlockConte
 var _core = require("@formily/core");
 var _react = require("@formily/react");
 var _lodash = require("lodash");
+var _antd = require("antd");
 var _react2 = _interopRequireWildcard(require("react"));
 var _collectionManager = require("../collection-manager");
 var _recordProvider = require("../record-provider");
 var _schemaComponent = require("../schema-component");
 var _Templates = require("../schema-component/antd/form-v2/Templates");
 var _BlockProvider = require("./BlockProvider");
-var _hooks = require("./hooks");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 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); }
@@ -25,11 +25,10 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 var FormBlockContext = /*#__PURE__*/(0, _react2.createContext)({});
 exports.FormBlockContext = FormBlockContext;
 var InternalFormBlockProvider = function InternalFormBlockProvider(props) {
-  var _service$data;
+  var _Object$keys, _service$data;
   var action = props.action,
     readPretty = props.readPretty,
-    params = props.params,
-    updateAssociationValues = props.updateAssociationValues;
+    params = props.params;
   var field = (0, _react.useField)();
   var form = (0, _react2.useMemo)(function () {
     return (0, _core.createForm)({
@@ -38,12 +37,13 @@ var InternalFormBlockProvider = function InternalFormBlockProvider(props) {
   }, []);
   var _useBlockRequestConte = (0, _BlockProvider.useBlockRequestContext)(),
     resource = _useBlockRequestConte.resource,
-    service = _useBlockRequestConte.service;
+    service = _useBlockRequestConte.service,
+    updateAssociationValues = _useBlockRequestConte.updateAssociationValues;
   var formBlockRef = (0, _react2.useRef)();
   var record = (0, _recordProvider.useRecord)();
-  // if (service.loading) {
-  //   return <Spin />;
-  // }
+  if (service.loading && ((_Object$keys = Object.keys(form === null || form === void 0 ? void 0 : form.initialValues)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length) === 0 && action) {
+    return /*#__PURE__*/_react2.default.createElement(_antd.Spin, null);
+  }
   return /*#__PURE__*/_react2.default.createElement(FormBlockContext.Provider, {
     value: {
       params: params,
@@ -81,17 +81,10 @@ var FormBlockProvider = function FormBlockProvider(props) {
   var record = (0, _recordProvider.useRecord)();
   var collection = props.collection;
   var __collection = record.__collection;
-  var params = _objectSpread({}, props.params);
   var currentCollection = (0, _collectionManager.useCollection)();
   var _useDesignable = (0, _schemaComponent.useDesignable)(),
     designable = _useDesignable.designable;
   var isEmptyRecord = useIsEmptyRecord();
-  var _useAssociationNames = (0, _hooks.useAssociationNames)(collection),
-    appends = _useAssociationNames.appends,
-    updateAssociationValues = _useAssociationNames.updateAssociationValues;
-  if (!Object.keys(params).includes('appends')) {
-    params['appends'] = appends;
-  }
   var detailFlag = false;
   if (isEmptyRecord) {
     detailFlag = true;
@@ -101,12 +94,8 @@ 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__*/_react2.default.createElement(_BlockProvider.BlockProvider, _objectSpread(_objectSpread({}, props), {}, {
-    block: 'form',
-    params: params
-  }), /*#__PURE__*/_react2.default.createElement(InternalFormBlockProvider, _objectSpread(_objectSpread({}, props), {}, {
-    params: params,
-    updateAssociationValues: updateAssociationValues
-  })));
+    block: 'form'
+  }), /*#__PURE__*/_react2.default.createElement(InternalFormBlockProvider, _objectSpread({}, props)));
 };
 exports.FormBlockProvider = FormBlockProvider;
 var useFormBlockContext = function useFormBlockContext() {

package/lib/block-provider/FormFieldProvider.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 export declare const FormFieldContext: React.Context<any>;
 export declare const WithoutFormFieldResource: React.Context<any>;
-export declare const FormFieldProvider: (props: any) => JSX.Element;
+export declare const FormFieldProvider: (props: any) => React.JSX.Element;
 export declare const useFormFieldContext: () => any;
 export declare const useFormFieldProps: () => {
     form: any;

package/lib/block-provider/GanttBlockProvider.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 export declare const GanttBlockContext: React.Context<any>;
-export declare const GanttBlockProvider: (props: any) => JSX.Element;
+export declare const GanttBlockProvider: (props: any) => React.JSX.Element;
 export declare const useGanttBlockContext: () => any;
 export declare const useGanttBlockProps: () => {
     fieldNames: any;

package/lib/block-provider/KanbanBlockProvider.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 export declare const KanbanBlockContext: React.Context<any>;
-export declare const KanbanBlockProvider: (props: any) => JSX.Element;
+export declare const KanbanBlockProvider: (props: any) => React.JSX.Element;
 export declare const useKanbanBlockContext: () => any;
 export declare const useKanbanBlockProps: () => {
     groupField: any;

package/lib/block-provider/TableBlockProvider.d.ts

@@ -1,7 +1,6 @@
 import React from 'react';
 export declare const TableBlockContext: React.Context<any>;
-export declare const useAssociationNames: (collection: any) => any[];
-export declare const TableBlockProvider: (props: any) => JSX.Element;
+export declare const TableBlockProvider: (props: any) => React.JSX.Element;
 export declare const useTableBlockContext: () => any;
 export declare const useTableBlockProps: () => {
     childrenColumnName: any;

package/lib/block-provider/TableBlockProvider.js

@@ -4,20 +4,19 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useTableBlockProps = exports.useTableBlockContext = exports.useAssociationNames = exports.TableBlockProvider = exports.TableBlockContext = void 0;
+exports.useTableBlockProps = exports.useTableBlockContext = exports.TableBlockProvider = exports.TableBlockContext = void 0;
 var _core = require("@formily/core");
 var _react = require("@formily/react");
-var _uniq = _interopRequireDefault(require("lodash/uniq"));
 var _react2 = _interopRequireWildcard(require("react"));
 var _collectionManager = require("../collection-manager");
 var _FilterProvider = require("../filter-provider/FilterProvider");
+var _recordProvider = require("../record-provider");
 var _schemaComponent = require("../schema-component");
 var _BlockProvider = require("./BlockProvider");
 var _SharedFilterProvider = require("./SharedFilterProvider");
 var _hooks = require("./hooks");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: 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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
@@ -25,7 +24,6 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 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; }
@@ -70,86 +68,63 @@ var InternalTableBlockProvider = function InternalTableBlockProvider(props) {
     }
   }, /*#__PURE__*/_react2.default.createElement(_BlockProvider.RenderChildrenWithAssociationFilter, _objectSpread({}, props))));
 };
-var useAssociationNames = function useAssociationNames(collection) {
-  var _useCollectionManager = (0, _collectionManager.useCollectionManager)(),
-    getCollectionFields = _useCollectionManager.getCollectionFields;
-  var collectionFields = getCollectionFields(collection);
-  var associationFields = new Set();
-  var _iterator = _createForOfIteratorHelper(collectionFields),
-    _step;
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var collectionField = _step.value;
-      if (collectionField.target) {
-        associationFields.add(collectionField.name);
-        var fields = getCollectionFields(collectionField.target);
-        var _iterator2 = _createForOfIteratorHelper(fields),
-          _step2;
-        try {
-          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-            var field = _step2.value;
-            if (field.target) {
-              associationFields.add("".concat(collectionField.name, ".").concat(field.name));
-            }
-          }
-        } catch (err) {
-          _iterator2.e(err);
-        } finally {
-          _iterator2.f();
-        }
-      }
-    }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
-  }
-  var fieldSchema = (0, _react.useFieldSchema)();
-  var tableSchema = fieldSchema.reduceProperties(function (buf, schema) {
-    if (schema['x-component'] === 'TableV2') {
-      return schema;
-    }
-    if (schema['x-component'] === 'Gantt') {
-      var _schema$properties;
-      return (_schema$properties = schema.properties) === null || _schema$properties === void 0 ? void 0 : _schema$properties.table;
-    }
-    return buf;
-  }, new _react.Schema({}));
-  return (0, _uniq.default)(tableSchema.reduceProperties(function (buf, schema) {
-    if (schema['x-component'] === 'TableV2.Column') {
-      var s = schema.reduceProperties(function (buf, s) {
-        var _s$name$split = s.name.split('.'),
-          _s$name$split2 = _slicedToArray(_s$name$split, 1),
-          name = _s$name$split2[0];
-        if (s['x-collection-field'] && associationFields.has(name)) {
-          return s;
-        }
-        return buf;
-      }, null);
-      if (s) {
-        // 关联字段和关联的关联字段
-        var _s$name$split3 = s.name.split('.'),
-          _s$name$split4 = _slicedToArray(_s$name$split3, 1),
-          firstName = _s$name$split4[0];
-        if (associationFields.has(s.name)) {
-          buf.push(s.name);
-        } else if (associationFields.has(firstName)) {
-          buf.push(firstName);
-        }
-      }
-    }
-    return buf;
-  }, []));
-};
-exports.useAssociationNames = useAssociationNames;
+// export const useAssociationNames = (collection) => {
+//   const { getCollectionFields } = useCollectionManager();
+//   const collectionFields = getCollectionFields(collection);
+//   const associationFields = new Set();
+//   for (const collectionField of collectionFields) {
+//     if (collectionField.target) {
+//       associationFields.add(collectionField.name);
+//       const fields = getCollectionFields(collectionField.target);
+//       for (const field of fields) {
+//         if (field.target) {
+//           associationFields.add(`${collectionField.name}.${field.name}`);
+//         }
+//       }
+//     }
+//   }
+//   const fieldSchema = useFieldSchema();
+//   const tableSchema = fieldSchema.reduceProperties((buf, schema) => {
+//     if (schema['x-component'] === 'TableV2') {
+//       return schema;
+//     }
+//     if (schema['x-component'] === 'Gantt') {
+//       return schema.properties?.table;
+//     }
+//     return buf;
+//   }, new Schema({}));
+//   return uniq(
+//     tableSchema.reduceProperties((buf, schema) => {
+//       if (schema['x-component'] === 'TableV2.Column') {
+//         const s = schema.reduceProperties((buf, s) => {
+//           const [name] = (s.name as string).split('.');
+//           if (s['x-collection-field'] && associationFields.has(name)) {
+//             return s;
+//           }
+//           return buf;
+//         }, null);
+//         if (s) {
+//           // 关联字段和关联的关联字段
+//           const [firstName] = s.name.split('.');
+//           if (associationFields.has(s.name)) {
+//             buf.push(s.name);
+//           } else if (associationFields.has(firstName)) {
+//             buf.push(firstName);
+//           }
+//         }
+//       }
+//       return buf;
+//     }, []),
+//   );
+// };
 var TableBlockProvider = function TableBlockProvider(props) {
   var resourceName = props.resource;
   var params = _objectSpread({}, props.params);
-  var appends = useAssociationNames(props.collection);
+  var record = (0, _recordProvider.useRecord)();
   var fieldSchema = (0, _react.useFieldSchema)();
-  var _useCollectionManager2 = (0, _collectionManager.useCollectionManager)(),
-    getCollection = _useCollectionManager2.getCollection,
-    getCollectionField = _useCollectionManager2.getCollectionField;
+  var _useCollectionManager = (0, _collectionManager.useCollectionManager)(),
+    getCollection = _useCollectionManager.getCollection,
+    getCollectionField = _useCollectionManager.getCollectionField;
   var collection = getCollection(props.collection);
   var _ref = (fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-decorator-props']) || {},
     treeTable = _ref.treeTable;
@@ -174,9 +149,6 @@ var TableBlockProvider = function TableBlockProvider(props) {
       params['tree'] = true;
     }
   }
-  if (!Object.keys(params).includes('appends')) {
-    params['appends'] = appends;
-  }
   var form = (0, _react2.useMemo)(function () {
     return (0, _core.createForm)();
   }, [treeTable]);
@@ -187,7 +159,8 @@ var TableBlockProvider = function TableBlockProvider(props) {
   }, /*#__PURE__*/_react2.default.createElement(_react.FormContext.Provider, {
     value: form
   }, /*#__PURE__*/_react2.default.createElement(_BlockProvider.BlockProvider, _objectSpread(_objectSpread({}, props), {}, {
-    params: params
+    params: params,
+    runWhenParamsChanged: true
   }), /*#__PURE__*/_react2.default.createElement(InternalTableBlockProvider, _objectSpread(_objectSpread({}, props), {}, {
     childrenColumnName: childrenColumnName,
     params: params

package/lib/block-provider/TableFieldProvider.d.ts

@@ -23,7 +23,7 @@ export declare class TableFieldResource {
     destroy(options: any): Promise<void>;
 }
 export declare const WithoutTableFieldResource: React.Context<any>;
-export declare const TableFieldProvider: (props: any) => JSX.Element;
+export declare const TableFieldProvider: (props: any) => React.JSX.Element;
 export declare const useTableFieldContext: () => any;
 export declare const useTableFieldProps: () => {
     size: string;

package/lib/block-provider/TableSelectorProvider.d.ts

@@ -15,8 +15,8 @@ declare type TableSelectorProviderProps = {
 export declare const TableSelectorParamsProvider: ({ params, children }: {
     params: Params;
     children: any;
-}) => JSX.Element;
-export declare const TableSelectorProvider: (props: TableSelectorProviderProps) => JSX.Element;
+}) => React.JSX.Element;
+export declare const TableSelectorProvider: (props: TableSelectorProviderProps) => React.JSX.Element;
 export declare const useTableSelectorContext: () => any;
 export declare const useTableSelectorProps: () => {
     loading: any;

package/lib/block-provider/hooks/index.d.ts

@@ -77,6 +77,15 @@ export declare const useAssociationFilterProps: () => {
 };
 export declare const useOptionalFieldList: () => import("../..").FieldOptions[];
 export declare const useAssociationFilterBlockProps: () => {
+    /** 渲染 Collapse 的列表数据 */
+    list?: undefined;
+    onSelected?: undefined;
+    handleSearchInput?: undefined;
+    params?: undefined;
+    run?: undefined;
+    valueKey?: undefined;
+    labelKey?: undefined;
+} | {
     /** 渲染 Collapse 的列表数据 */
     list: any;
     onSelected: any;
@@ -86,7 +95,7 @@ export declare const useAssociationFilterBlockProps: () => {
     valueKey: any;
     labelKey: any;
 };
-export declare const useAssociationNames: (collection: any) => {
+export declare const useAssociationNames: () => {
     appends: any[];
     updateAssociationValues: any[];
 };