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

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[];
 };

package/lib/block-provider/hooks/index.js

@@ -22,7 +22,6 @@ var _utils = require("../../filter-provider/utils");
 var _recordProvider = require("../../record-provider");
 var _schemaComponent = require("../../schema-component");
 var _components = require("../../schema-initializer/components");
-var _schemaTemplates = require("../../schema-templates");
 var _user = require("../../user");
 var _BlockProvider = require("../BlockProvider");
 var _DetailsBlockProvider = require("../DetailsBlockProvider");
@@ -164,7 +163,7 @@ var useCreateActionProps = function useCreateActionProps() {
   var _useActionContext = (0, _schemaComponent.useActionContext)(),
     setVisible = _useActionContext.setVisible,
     fieldSchema = _useActionContext.fieldSchema;
-  var history = (0, _reactRouterDom.useHistory)();
+  var navigate = (0, _reactRouterDom.useNavigate)();
   var _useTranslation = (0, _reactI18next.useTranslation)(),
     t = _useTranslation.t;
   var actionSchema = (0, _react.useFieldSchema)();
@@ -178,6 +177,8 @@ var useCreateActionProps = function useCreateActionProps() {
   var currentRecord = (0, _recordProvider.useRecord)();
   var currentUserContext = (0, _user.useCurrentUserContext)();
   var currentUser = currentUserContext === null || currentUserContext === void 0 ? void 0 : (_currentUserContext$d = currentUserContext.data) === null || _currentUserContext$d === void 0 ? void 0 : _currentUserContext$d.data;
+  var action = actionField.componentProps.saveMode || 'create';
+  var filterKeys = actionField.componentProps.filterKeys || [];
   return {
     onClick: function onClick() {
       return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
@@ -213,8 +214,9 @@ var useCreateActionProps = function useCreateActionProps() {
               actionField.data.loading = true;
               _context2.prev = 11;
               _context2.next = 14;
-              return resource.create({
-                values: _objectSpread(_objectSpread(_objectSpread({}, values), overwriteValues), assignedValues)
+              return resource[action]({
+                values: _objectSpread(_objectSpread(_objectSpread({}, values), overwriteValues), assignedValues),
+                filterKeys: filterKeys
               });
             case 14:
               data = _context2.sent;
@@ -243,7 +245,7 @@ var useCreateActionProps = function useCreateActionProps() {
                               if (isURL(onSuccess.redirectTo)) {
                                 window.location.href = onSuccess.redirectTo;
                               } else {
-                                history.push(onSuccess.redirectTo);
+                                navigate(onSuccess.redirectTo);
                               }
                             }
                           case 3:
@@ -550,7 +552,7 @@ var useCustomizeUpdateActionProps = function useCustomizeUpdateActionProps() {
   var currentRecord = (0, _recordProvider.useRecord)();
   var currentUserContext = (0, _user.useCurrentUserContext)();
   var currentUser = currentUserContext === null || currentUserContext === void 0 ? void 0 : (_currentUserContext$d3 = currentUserContext.data) === null || _currentUserContext$d3 === void 0 ? void 0 : _currentUserContext$d3.data;
-  var history = (0, _reactRouterDom.useHistory)();
+  var navigate = (0, _reactRouterDom.useNavigate)();
   var compile = (0, _schemaComponent.useCompile)();
   var form = (0, _react.useForm)();
   return {
@@ -602,7 +604,7 @@ var useCustomizeUpdateActionProps = function useCustomizeUpdateActionProps() {
                               if (isURL(onSuccess.redirectTo)) {
                                 window.location.href = onSuccess.redirectTo;
                               } else {
-                                history.push(onSuccess.redirectTo);
+                                navigate(onSuccess.redirectTo);
                               }
                             }
                           case 1:
@@ -644,7 +646,7 @@ var useCustomizeBulkUpdateActionProps = function useCustomizeBulkUpdateActionPro
   var selectedRecordKeys = (_ref6 = (_tableBlockContext$fi = (_tableBlockContext$fi2 = tableBlockContext.field) === null || _tableBlockContext$fi2 === void 0 ? void 0 : (_tableBlockContext$fi3 = _tableBlockContext$fi2.data) === null || _tableBlockContext$fi3 === void 0 ? void 0 : _tableBlockContext$fi3.selectedRowKeys) !== null && _tableBlockContext$fi !== void 0 ? _tableBlockContext$fi : expressionScope === null || expressionScope === void 0 ? void 0 : expressionScope.selectedRecordKeys) !== null && _ref6 !== void 0 ? _ref6 : {};
   var currentUserContext = (0, _user.useCurrentUserContext)();
   var currentUser = currentUserContext === null || currentUserContext === void 0 ? void 0 : (_currentUserContext$d4 = currentUserContext.data) === null || _currentUserContext$d4 === void 0 ? void 0 : _currentUserContext$d4.data;
-  var history = (0, _reactRouterDom.useHistory)();
+  var navigate = (0, _reactRouterDom.useNavigate)();
   var compile = (0, _schemaComponent.useCompile)();
   var _useTranslation2 = (0, _reactI18next.useTranslation)(),
     t = _useTranslation2.t;
@@ -737,7 +739,7 @@ var useCustomizeBulkUpdateActionProps = function useCustomizeBulkUpdateActionPro
                                           if (isURL(onSuccess.redirectTo)) {
                                             window.location.href = onSuccess.redirectTo;
                                           } else {
-                                            history.push(onSuccess.redirectTo);
+                                            navigate(onSuccess.redirectTo);
                                           }
                                         }
                                       case 1:
@@ -797,7 +799,7 @@ var useCustomizeBulkEditActionProps = function useCustomizeBulkEditActionProps()
     __parent = _useBlockRequestConte5.__parent;
   var expressionScope = (0, _react2.useContext)(_react.SchemaExpressionScopeContext);
   var actionContext = (0, _schemaComponent.useActionContext)();
-  var history = (0, _reactRouterDom.useHistory)();
+  var navigate = (0, _reactRouterDom.useNavigate)();
   var compile = (0, _schemaComponent.useCompile)();
   var actionField = (0, _react.useField)();
   var tableBlockContext = (0, _2.useTableBlockContext)();
@@ -893,7 +895,7 @@ var useCustomizeBulkEditActionProps = function useCustomizeBulkEditActionProps()
                               if (isURL(onSuccess.redirectTo)) {
                                 window.location.href = onSuccess.redirectTo;
                               } else {
-                                history.push(onSuccess.redirectTo);
+                                navigate(onSuccess.redirectTo);
                               }
                             }
                           case 3:
@@ -928,7 +930,7 @@ exports.useCustomizeBulkEditActionProps = useCustomizeBulkEditActionProps;
 var useCustomizeRequestActionProps = function useCustomizeRequestActionProps() {
   var _currentUserContext$d5;
   var apiClient = (0, _apiClient.useAPIClient)();
-  var history = (0, _reactRouterDom.useHistory)();
+  var navigate = (0, _reactRouterDom.useNavigate)();
   var filterByTk = (0, _BlockProvider.useFilterByTk)();
   var actionSchema = (0, _react.useFieldSchema)();
   var compile = (0, _schemaComponent.useCompile)();
@@ -1032,7 +1034,7 @@ var useCustomizeRequestActionProps = function useCustomizeRequestActionProps() {
                               if (isURL(onSuccess.redirectTo)) {
                                 window.location.href = onSuccess.redirectTo;
                               } else {
-                                history.push(onSuccess.redirectTo);
+                                navigate(onSuccess.redirectTo);
                               }
                             }
                           case 1:
@@ -1075,7 +1077,7 @@ var useUpdateActionProps = function useUpdateActionProps() {
   var _useActionContext4 = (0, _schemaComponent.useActionContext)(),
     setVisible = _useActionContext4.setVisible;
   var actionSchema = (0, _react.useFieldSchema)();
-  var history = (0, _reactRouterDom.useHistory)();
+  var navigate = (0, _reactRouterDom.useNavigate)();
   var _useCollection5 = (0, _collectionManager.useCollection)(),
     fields = _useCollection5.fields,
     getField = _useCollection5.getField;
@@ -1145,7 +1147,7 @@ var useUpdateActionProps = function useUpdateActionProps() {
                               if (isURL(onSuccess.redirectTo)) {
                                 window.location.href = onSuccess.redirectTo;
                               } else {
-                                history.push(onSuccess.redirectTo);
+                                navigate(onSuccess.redirectTo);
                               }
                             }
                           case 3:
@@ -1202,7 +1204,7 @@ var useDestroyActionProps = function useDestroyActionProps() {
               });
             case 2:
               _ref16 = (service === null || service === void 0 ? void 0 : (_service$data = service.data) === null || _service$data === void 0 ? void 0 : _service$data.meta) || {}, _ref16$count = _ref16.count, count = _ref16$count === void 0 ? 0 : _ref16$count, _ref16$page = _ref16.page, page = _ref16$page === void 0 ? 0 : _ref16$page, _ref16$pageSize = _ref16.pageSize, pageSize = _ref16$pageSize === void 0 ? 0 : _ref16$pageSize;
-              if (count % pageSize === 1) {
+              if (count % pageSize === 1 && page !== 1) {
                 service.run(_objectSpread(_objectSpread({}, service === null || service === void 0 ? void 0 : (_service$params2 = service.params) === null || _service$params2 === void 0 ? void 0 : _service$params2[0]), {}, {
                   page: page - 1
                 }));
@@ -1439,6 +1441,9 @@ var isOptionalField = function isOptionalField(field) {
 var useAssociationFilterBlockProps = function useAssociationFilterBlockProps() {
   var _fieldSchema$xCompon5, _fieldSchema$xCompon6, _field$componentProps3, _field$componentProps4;
   var collectionField = _2.AssociationFilter.useAssociationField();
+  if (!collectionField) {
+    return {};
+  }
   var fieldSchema = (0, _react.useFieldSchema)();
   var optionalFieldList = useOptionalFieldList();
   var _useFilterBlock3 = (0, _FilterProvider.useFilterBlock)(),
@@ -1550,133 +1555,44 @@ var useAssociationFilterBlockProps = function useAssociationFilterBlockProps() {
   };
 };
 exports.useAssociationFilterBlockProps = useAssociationFilterBlockProps;
-var getTemplateSchema = function getTemplateSchema(schema) {
-  var conf = {
-    url: "/uiSchemas:getJsonSchema/".concat(schema === null || schema === void 0 ? void 0 : schema.uid)
-  };
-  var _useRequest3 = (0, _apiClient.useRequest)(conf, {
-      manual: true
-    }),
-    data = _useRequest3.data,
-    loading = _useRequest3.loading,
-    run = _useRequest3.run;
-  if (loading) {}
-  (0, _react2.useEffect)(function () {
-    if (schema === null || schema === void 0 ? void 0 : schema.uid) {
-      run();
-    }
-  }, [schema === null || schema === void 0 ? void 0 : schema.uid]);
-  return (schema === null || schema === void 0 ? void 0 : schema.uid) ? new _react.Schema(data === null || data === void 0 ? void 0 : data.data) : null;
-};
-var useAssociationNames = function useAssociationNames(collection) {
-  var _templateSchema$xCom;
+function getAssociationPath(str) {
+  var lastIndex = str.lastIndexOf('.');
+  if (lastIndex !== -1) {
+    return str.substring(0, lastIndex);
+  }
+  return str;
+}
+var useAssociationNames = function useAssociationNames() {
   var _useCollectionManager2 = (0, _collectionManager.useCollectionManager)(),
     getCollectionJoinField = _useCollectionManager2.getCollectionJoinField;
-  var _useSchemaTemplateMan = (0, _schemaTemplates.useSchemaTemplateManager)(),
-    getTemplateById = _useSchemaTemplateMan.getTemplateById;
   var fieldSchema = (0, _react.useFieldSchema)();
-  var associationValues = [];
-  var formSchema = fieldSchema.reduceProperties(function (buf, schema) {
-    if (['FormV2', 'Details', 'List', 'GridCard'].includes(schema['x-component'])) {
-      return schema;
-    }
-    return buf;
-  }, new _react.Schema({}));
-  var templateSchema = formSchema.reduceProperties(function (buf, schema) {
-    if (schema['x-component'] === 'BlockTemplate') {
-      return schema;
-    }
-    return buf;
-  }, null);
-  var getAssociationAppends = function getAssociationAppends(schema) {
-    var arr = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-    var data = schema.reduceProperties(function (buf, s) {
+  var updateAssociationValues = new Set([]);
+  var appends = new Set([]);
+  var getAssociationAppends = function getAssociationAppends(schema, str) {
+    schema.reduceProperties(function (pre, s) {
+      var prefix = pre || str;
       var collectionfield = s['x-collection-field'] && getCollectionJoinField(s['x-collection-field']);
-      if (collectionfield && ['hasOne', 'hasMany', 'belongsTo', 'belongsToMany'].includes(collectionfield.type) && s['x-component'] !== 'TableField') {
+      var isAssociationSubfield = s.name.includes('.');
+      var isAssociationField = collectionfield && ['hasOne', 'hasMany', 'belongsTo', 'belongsToMany'].includes(collectionfield.type);
+      if (collectionfield && (isAssociationField || isAssociationSubfield) && s['x-component'] !== 'TableField') {
         var _s$xComponentProps;
-        buf.push(s.name);
+        var fieldPath = !isAssociationField && isAssociationSubfield ? getAssociationPath(s.name) : s.name;
+        var path = prefix === '' || !prefix ? fieldPath : prefix + '.' + fieldPath;
+        appends.add(path);
         if (['Nester', 'SubTable'].includes((_s$xComponentProps = s['x-component-props']) === null || _s$xComponentProps === void 0 ? void 0 : _s$xComponentProps.mode)) {
-          associationValues.push(s.name);
-        }
-        if (s['x-component-props'].mode === 'Nester') {
-          return getAssociationAppends(s, buf);
-        }
-        return buf;
-      } else {
-        if (s['x-component'] === 'Grid.Row') {
-          var _buf$concat;
-          var kk = buf === null || buf === void 0 ? void 0 : (_buf$concat = buf.concat) === null || _buf$concat === void 0 ? void 0 : _buf$concat.call(buf);
-          return getNesterAppends(s, kk || []);
-        } else {
-          var _s$xComponent;
-          return !((_s$xComponent = s['x-component']) === null || _s$xComponent === void 0 ? void 0 : _s$xComponent.includes('Action.')) && s['x-component'] !== 'TableField' ? getAssociationAppends(s, buf) : buf;
+          updateAssociationValues.add(path);
+          var bufPrefix = prefix && prefix !== '' ? prefix + '.' + s.name : s.name;
+          getAssociationAppends(s, bufPrefix);
         }
+      } else if (!['ActionBar', 'Action', 'Action.Link', 'Action.Modal', 'Selector', 'Viewer', 'AddNewer', 'AssociationField.Selector', 'AssociationField.AddNewer', 'TableField'].includes(s['x-component'])) {
+        getAssociationAppends(s, str);
       }
-    }, arr);
-    return data || [];
+    }, str);
   };
-  function flattenNestedList(nestedList) {
-    var flattenedList = [];
-    function flattenHelper(list, prefix) {
-      for (var i = 0; i < list.length; i++) {
-        if (Array.isArray(list[i])) {
-          "".concat(prefix) !== "".concat(list[i][0]) && flattenHelper(list[i], "".concat(prefix, ".").concat(list[i][0]));
-        } else {
-          var searchTerm = ".".concat(list[i]);
-          var lastIndex = prefix.lastIndexOf(searchTerm);
-          var str = '';
-          if (lastIndex !== -1) {
-            str = prefix.slice(0, lastIndex) + prefix.slice(lastIndex + searchTerm.length);
-          }
-          if (!str) {
-            !list.includes(str) && flattenedList.push("".concat(list[i]));
-          } else {
-            !list.includes(str) ? flattenedList.push("".concat(str, ".").concat(list[i])) : flattenedList.push(str);
-          }
-        }
-      }
-    }
-    for (var i = 0; i < nestedList.length; i++) {
-      flattenHelper(nestedList[i], nestedList[i][0]);
-    }
-    return (0, _lodash.uniq)(flattenedList.filter(function (obj) {
-      return !(obj === null || obj === void 0 ? void 0 : obj.startsWith('.'));
-    }));
-  }
-  var getNesterAppends = function getNesterAppends(gridSchema, data) {
-    gridSchema.reduceProperties(function (buf, s) {
-      buf.push(getAssociationAppends(s));
-      return buf;
-    }, data);
-    return data.filter(function (g) {
-      return g.length;
-    });
+  getAssociationAppends(fieldSchema, '');
+  return {
+    appends: _toConsumableArray(appends),
+    updateAssociationValues: _toConsumableArray(updateAssociationValues)
   };
-  var template = getTemplateById(templateSchema === null || templateSchema === void 0 ? void 0 : (_templateSchema$xCom = templateSchema['x-component-props']) === null || _templateSchema$xCom === void 0 ? void 0 : _templateSchema$xCom.templateId);
-  var schema = getTemplateSchema(template);
-  if (schema) {
-    var associations = getAssociationAppends(schema);
-    var appends = flattenNestedList(associations);
-    return {
-      appends: appends,
-      updateAssociationValues: appends.filter(function (item) {
-        return associationValues.some(function (suffix) {
-          return item.endsWith(suffix);
-        });
-      })
-    };
-  }
-  if (!schema) {
-    var _associations = getAssociationAppends(formSchema);
-    var _appends = flattenNestedList(_associations);
-    return {
-      appends: _appends,
-      updateAssociationValues: _appends.filter(function (item) {
-        return associationValues.some(function (suffix) {
-          return item.endsWith(suffix);
-        });
-      })
-    };
-  }
 };
 exports.useAssociationNames = useAssociationNames;

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

@@ -11,3 +11,4 @@ export * from './TableSelectorProvider';
 export * from './FormFieldProvider';
 export * from './GanttBlockProvider';
 export * from './SharedFilterProvider';
+export * from './hooks';

package/lib/block-provider/index.js

@@ -134,4 +134,15 @@ Object.keys(_GanttBlockProvider).forEach(function (key) {
       return _GanttBlockProvider[key];
     }
   });
+});
+var _hooks = require("./hooks");
+Object.keys(_hooks).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _hooks[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _hooks[key];
+    }
+  });
 });

package/lib/board/Card.d.ts

@@ -1,8 +1,8 @@
-/// <reference types="react" />
+import React from 'react';
 declare function Card({ children, index, renderCard, disableCardDrag }: {
     children: any;
     index: any;
     renderCard: any;
     disableCardDrag: any;
-}): JSX.Element;
+}): React.JSX.Element;
 export default Card;

package/lib/board/CardAdder.d.ts

@@ -1,6 +1,6 @@
-/// <reference types="react" />
+import React from 'react';
 declare function CardAdder({ column, onConfirm }: {
     column: any;
     onConfirm: any;
-}): JSX.Element;
+}): React.JSX.Element;
 export default CardAdder;

package/lib/board/CardForm.d.ts

@@ -1,6 +1,6 @@
-/// <reference types="react" />
+import React from 'react';
 declare function CardForm({ onConfirm, onCancel }: {
     onConfirm: any;
     onCancel: any;
-}): JSX.Element;
+}): React.JSX.Element;
 export default CardForm;