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

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

@@ -1,33 +1,40 @@
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 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); }
-
-import { useField, useFieldSchema, useForm } from '@formily/react';
-import { message, Modal } from 'antd';
+import { SchemaExpressionScopeContext, useField, useFieldSchema, useForm } from '@formily/react';
+import { Modal, message } from 'antd';
 import parse from 'json-templates';
 import { cloneDeep } from 'lodash';
 import get from 'lodash/get';
 import omit from 'lodash/omit';
+import { useContext } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useHistory } from 'react-router-dom';
 import { useReactToPrint } from 'react-to-print';
-import { useFormBlockContext, useTableBlockContext } from '../..';
-import { useAPIClient } from '../../api-client';
+import { AssociationFilter, useFormBlockContext, useTableBlockContext } from '../..';
+import { useAPIClient, useRequest } from '../../api-client';
 import { useCollection } from '../../collection-manager';
+import { useFilterBlock } from '../../filter-provider/FilterProvider';
+import { transformToFilter } from '../../filter-provider/utils';
 import { useRecord } from '../../record-provider';
-import { useActionContext, useCompile } from '../../schema-component';
+import { removeNullCondition, useActionContext, useCompile } from '../../schema-component';
 import { BulkEditFormItemValueType } from '../../schema-initializer/components';
 import { useCurrentUserContext } from '../../user';
 import { useBlockRequestContext, useFilterByTk } from '../BlockProvider';
 import { useDetailsBlockContext } from '../DetailsBlockProvider';
+import { mergeFilter } from '../SharedFilterProvider';
 import { TableFieldResource } from '../TableFieldProvider';
 export var usePickActionProps = function usePickActionProps() {
   var form = useForm();
@@ -37,64 +44,49 @@ export var usePickActionProps = function usePickActionProps() {
     }
   };
 };
-
 function renderTemplate(str, data) {
   var re = /\{\{\s*((\w+\.?)+)\s*\}\}/g;
   return str.replace(re, function (_, key) {
     return get(data, key) || '';
   });
 }
-
 function isURL(string) {
   var url;
-
   try {
     url = new URL(string);
   } catch (e) {
     return false;
   }
-
   return url.protocol === 'http:' || url.protocol === 'https:';
 }
-
 var filterValue = function filterValue(value) {
   if (_typeof(value) !== 'object') {
     return value;
   }
-
   if (!value) {
     return value;
   }
-
   if (Array.isArray(value)) {
     return value.map(function (v) {
       return filterValue(v);
     });
   }
-
   var obj = {};
-
   for (var key in value) {
     if (Object.prototype.hasOwnProperty.call(value, key)) {
       var val = value[key];
-
       if (Array.isArray(val) || val && _typeof(val) === 'object') {
         continue;
       }
-
       obj[key] = val;
     }
   }
-
   return obj;
 };
-
 function getFormValues(filterByTk, field, form, fieldNames, getField, resource) {
   if (filterByTk) {
     var _field$data;
-
     var actionFields = field === null || field === void 0 ? void 0 : (_field$data = field.data) === null || _field$data === void 0 ? void 0 : _field$data.activeFields;
-
     if (actionFields) {
       var keys = Object.keys(form.values).filter(function (key) {
         var f = getField(key);
@@ -103,88 +95,75 @@ function getFormValues(filterByTk, field, form, fieldNames, getField, resource)
       return omit(_objectSpread({}, form.values), keys);
     }
   }
-
+  console.log('form.values', form.values);
   return form.values;
   var values = {};
-
-  for (var key in form.values) {
+  var _loop = function _loop() {
     if (fieldNames.includes(key)) {
       var collectionField = getField(key);
-
       if (filterByTk) {
         if (field.added && !field.added.has(key)) {
-          continue;
+          return "continue";
         }
-
         if (['subTable', 'o2m', 'o2o', 'oho', 'obo', 'm2o'].includes(collectionField.interface)) {
           values[key] = form.values[key];
-          continue;
+          return "continue";
         }
       }
-
       var items = form.values[key];
-
       if (['linkTo', 'm2o', 'm2m'].includes(collectionField.interface)) {
-        (function () {
-          var targetKey = collectionField.targetKey || 'id';
-
-          if (resource instanceof TableFieldResource) {
-            if (Array.isArray(items)) {
-              values[key] = filterValue(items);
-            } else if (items && _typeof(items) === 'object') {
-              values[key] = filterValue(items);
-            } else {
-              values[key] = items;
-            }
+        var targetKey = collectionField.targetKey || 'id';
+        if (resource instanceof TableFieldResource) {
+          if (Array.isArray(items)) {
+            values[key] = filterValue(items);
+          } else if (items && _typeof(items) === 'object') {
+            values[key] = filterValue(items);
           } else {
-            if (Array.isArray(items)) {
-              values[key] = items.map(function (item) {
-                return item[targetKey];
-              });
-            } else if (items && _typeof(items) === 'object') {
-              values[key] = items[targetKey];
-            } else {
-              values[key] = items;
-            }
+            values[key] = items;
+          }
+        } else {
+          if (Array.isArray(items)) {
+            values[key] = items.map(function (item) {
+              return item[targetKey];
+            });
+          } else if (items && _typeof(items) === 'object') {
+            values[key] = items[targetKey];
+          } else {
+            values[key] = items;
           }
-        })();
+        }
       } else {
         values[key] = form.values[key];
       }
     } else {
       values[key] = form.values[key];
     }
+  };
+  for (var key in form.values) {
+    var _ret = _loop();
+    if (_ret === "continue") continue;
   }
-
   return values;
 }
-
 export var useCreateActionProps = function useCreateActionProps() {
   var _currentUserContext$d;
-
   var form = useForm();
-
   var _useBlockRequestConte = useBlockRequestContext(),
-      field = _useBlockRequestConte.field,
-      resource = _useBlockRequestConte.resource,
-      __parent = _useBlockRequestConte.__parent;
-
+    field = _useBlockRequestConte.field,
+    resource = _useBlockRequestConte.resource,
+    __parent = _useBlockRequestConte.__parent;
   var _useActionContext = useActionContext(),
-      visible = _useActionContext.visible,
-      setVisible = _useActionContext.setVisible;
-
+    setVisible = _useActionContext.setVisible,
+    fieldSchema = _useActionContext.fieldSchema;
   var history = useHistory();
-
   var _useTranslation = useTranslation(),
-      t = _useTranslation.t;
-
+    t = _useTranslation.t;
   var actionSchema = useFieldSchema();
   var actionField = useField();
-
   var _useCollection = useCollection(),
-      fields = _useCollection.fields,
-      getField = _useCollection.getField;
-
+    fields = _useCollection.fields,
+    getField = _useCollection.getField,
+    getTreeParentField = _useCollection.getTreeParentField;
   var compile = useCompile();
   var filterByTk = useFilterByTk();
   var currentRecord = useRecord();
@@ -192,122 +171,272 @@ export var useCreateActionProps = function useCreateActionProps() {
   var currentUser = currentUserContext === null || currentUserContext === void 0 ? void 0 : (_currentUserContext$d = currentUserContext.data) === null || _currentUserContext$d === void 0 ? void 0 : _currentUserContext$d.data;
   return {
     onClick: function onClick() {
-      return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
-        var _actionSchema$xActio;
-
-        var fieldNames, _ref, _ref$assignedValues, originalAssignedValues, onSuccess, overwriteValues, skipValidator, assignedValues, values, _parent$service, _parent$service$refre;
-
-        return regeneratorRuntime.wrap(function _callee2$(_context2) {
-          while (1) {
-            switch (_context2.prev = _context2.next) {
-              case 0:
-                fieldNames = fields.map(function (field) {
-                  return field.name;
-                });
-                _ref = (_actionSchema$xActio = actionSchema === null || actionSchema === void 0 ? void 0 : actionSchema['x-action-settings']) !== null && _actionSchema$xActio !== void 0 ? _actionSchema$xActio : {}, _ref$assignedValues = _ref.assignedValues, originalAssignedValues = _ref$assignedValues === void 0 ? {} : _ref$assignedValues, onSuccess = _ref.onSuccess, overwriteValues = _ref.overwriteValues, skipValidator = _ref.skipValidator;
-                assignedValues = parse(originalAssignedValues)({
-                  currentTime: new Date(),
-                  currentRecord: currentRecord,
-                  currentUser: currentUser
-                });
-
-                if (skipValidator) {
-                  _context2.next = 6;
-                  break;
-                }
-
-                _context2.next = 6;
-                return form.submit();
-
-              case 6:
-                values = getFormValues(filterByTk, field, form, fieldNames, getField, resource);
-                actionField.data = field.data || {};
-                actionField.data.loading = true;
-                _context2.prev = 9;
-                _context2.next = 12;
-                return resource.create({
-                  values: _objectSpread(_objectSpread(_objectSpread({}, values), overwriteValues), assignedValues)
-                });
-
-              case 12:
-                actionField.data.loading = false;
-                __parent === null || __parent === void 0 ? void 0 : (_parent$service = __parent.service) === null || _parent$service === void 0 ? void 0 : (_parent$service$refre = _parent$service.refresh) === null || _parent$service$refre === void 0 ? void 0 : _parent$service$refre.call(_parent$service);
-                setVisible === null || setVisible === void 0 ? void 0 : setVisible(false);
-
-                if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage) {
-                  _context2.next = 17;
-                  break;
-                }
-
-                return _context2.abrupt("return");
-
-              case 17:
-                if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.manualClose) {
-                  Modal.success({
-                    title: compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage),
-                    onOk: function () {
-                      var _onOk = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-                        return regeneratorRuntime.wrap(function _callee$(_context) {
-                          while (1) {
-                            switch (_context.prev = _context.next) {
-                              case 0:
-                                _context.next = 2;
-                                return form.reset();
-
-                              case 2:
-                                if ((onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.redirecting) && (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.redirectTo)) {
-                                  if (isURL(onSuccess.redirectTo)) {
-                                    window.location.href = onSuccess.redirectTo;
-                                  } else {
-                                    history.push(onSuccess.redirectTo);
-                                  }
-                                }
-
-                              case 3:
-                              case "end":
-                                return _context.stop();
-                            }
-                          }
-                        }, _callee);
-                      }));
-
-                      function onOk() {
-                        return _onOk.apply(this, arguments);
-                      }
-
-                      return onOk;
-                    }()
-                  });
-                } else {
-                  message.success(compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage));
-                }
-
-                _context2.next = 23;
+      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+        var _actionSchema$xActio, _fieldSchema$xCompon;
+        var fieldNames, _ref, _ref$assignedValues, originalAssignedValues, onSuccess, overwriteValues, skipValidator, addChild, assignedValues, values, _treeParentField$name, _treeParentField$fore, treeParentField, _parent$service, _parent$service$refre;
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
+            case 0:
+              fieldNames = fields.map(function (field) {
+                return field.name;
+              });
+              _ref = (_actionSchema$xActio = actionSchema === null || actionSchema === void 0 ? void 0 : actionSchema['x-action-settings']) !== null && _actionSchema$xActio !== void 0 ? _actionSchema$xActio : {}, _ref$assignedValues = _ref.assignedValues, originalAssignedValues = _ref$assignedValues === void 0 ? {} : _ref$assignedValues, onSuccess = _ref.onSuccess, overwriteValues = _ref.overwriteValues, skipValidator = _ref.skipValidator;
+              addChild = fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : _fieldSchema$xCompon.addChild;
+              assignedValues = parse(originalAssignedValues)({
+                currentTime: new Date(),
+                currentRecord: currentRecord,
+                currentUser: currentUser
+              });
+              if (skipValidator) {
+                _context2.next = 7;
+                break;
+              }
+              _context2.next = 7;
+              return form.submit();
+            case 7:
+              values = getFormValues(filterByTk, field, form, fieldNames, getField, resource);
+              if (addChild) {
+                treeParentField = getTreeParentField();
+                values[(_treeParentField$name = treeParentField === null || treeParentField === void 0 ? void 0 : treeParentField.name) !== null && _treeParentField$name !== void 0 ? _treeParentField$name : 'parent'] = currentRecord;
+                values[(_treeParentField$fore = treeParentField === null || treeParentField === void 0 ? void 0 : treeParentField.foreignKey) !== null && _treeParentField$fore !== void 0 ? _treeParentField$fore : 'parentId'] = currentRecord.id;
+              }
+              actionField.data = field.data || {};
+              actionField.data.loading = true;
+              _context2.prev = 11;
+              _context2.next = 14;
+              return resource.create({
+                values: _objectSpread(_objectSpread(_objectSpread({}, values), overwriteValues), assignedValues)
+              });
+            case 14:
+              actionField.data.loading = false;
+              __parent === null || __parent === void 0 ? void 0 : (_parent$service = __parent.service) === null || _parent$service === void 0 ? void 0 : (_parent$service$refre = _parent$service.refresh) === null || _parent$service$refre === void 0 ? void 0 : _parent$service$refre.call(_parent$service);
+              setVisible === null || setVisible === void 0 ? void 0 : setVisible(false);
+              if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage) {
+                _context2.next = 19;
                 break;
-
-              case 20:
-                _context2.prev = 20;
-                _context2.t0 = _context2["catch"](9);
-                actionField.data.loading = false;
-
-              case 23:
-              case "end":
-                return _context2.stop();
-            }
+              }
+              return _context2.abrupt("return");
+            case 19:
+              if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.manualClose) {
+                Modal.success({
+                  title: compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage),
+                  onOk: function () {
+                    var _onOk = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+                      return _regeneratorRuntime().wrap(function _callee$(_context) {
+                        while (1) switch (_context.prev = _context.next) {
+                          case 0:
+                            _context.next = 2;
+                            return form.reset();
+                          case 2:
+                            if ((onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.redirecting) && (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.redirectTo)) {
+                              if (isURL(onSuccess.redirectTo)) {
+                                window.location.href = onSuccess.redirectTo;
+                              } else {
+                                history.push(onSuccess.redirectTo);
+                              }
+                            }
+                          case 3:
+                          case "end":
+                            return _context.stop();
+                        }
+                      }, _callee);
+                    }));
+                    function onOk() {
+                      return _onOk.apply(this, arguments);
+                    }
+                    return onOk;
+                  }()
+                });
+              } else {
+                message.success(compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage));
+              }
+              _context2.next = 25;
+              break;
+            case 22:
+              _context2.prev = 22;
+              _context2.t0 = _context2["catch"](11);
+              actionField.data.loading = false;
+            case 25:
+            case "end":
+              return _context2.stop();
+          }
+        }, _callee2, null, [[11, 22]]);
+      }))();
+    }
+  };
+};
+export var findFilterTargets = function findFilterTargets(fieldSchema) {
+  while (fieldSchema) {
+    if (fieldSchema['x-filter-targets']) {
+      return {
+        targets: fieldSchema['x-filter-targets'],
+        uid: fieldSchema['x-uid']
+      };
+    }
+    fieldSchema = fieldSchema.parent;
+  }
+  return {};
+};
+export var updateFilterTargets = function updateFilterTargets(fieldSchema, targets) {
+  while (fieldSchema) {
+    if (fieldSchema['x-filter-targets']) {
+      fieldSchema['x-filter-targets'] = targets;
+      return;
+    }
+    fieldSchema = fieldSchema.parent;
+  }
+};
+export var useFilterBlockActionProps = function useFilterBlockActionProps() {
+  var form = useForm();
+  var actionField = useField();
+  var fieldSchema = useFieldSchema();
+  var _useFilterBlock = useFilterBlock(),
+    getDataBlocks = _useFilterBlock.getDataBlocks;
+  actionField.data = actionField.data || {};
+  return {
+    onClick: function onClick() {
+      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+        var _findFilterTargets, _findFilterTargets$ta, targets, uid;
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
+            case 0:
+              _findFilterTargets = findFilterTargets(fieldSchema), _findFilterTargets$ta = _findFilterTargets.targets, targets = _findFilterTargets$ta === void 0 ? [] : _findFilterTargets$ta, uid = _findFilterTargets.uid;
+              actionField.data.loading = true;
+              _context4.prev = 2;
+              _context4.next = 5;
+              return Promise.all(getDataBlocks().map( /*#__PURE__*/function () {
+                var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(block) {
+                  var _block$service$params, _block$service$params2, _block$service$params3;
+                  var target, param, storedFilter, mergedFilter;
+                  return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+                    while (1) switch (_context3.prev = _context3.next) {
+                      case 0:
+                        target = targets.find(function (target) {
+                          return target.uid === block.uid;
+                        });
+                        if (target) {
+                          _context3.next = 3;
+                          break;
+                        }
+                        return _context3.abrupt("return");
+                      case 3:
+                        param = ((_block$service$params = block.service.params) === null || _block$service$params === void 0 ? void 0 : _block$service$params[0]) || {}; // 保留原有的 filter
+                        storedFilter = ((_block$service$params2 = block.service.params) === null || _block$service$params2 === void 0 ? void 0 : (_block$service$params3 = _block$service$params2[1]) === null || _block$service$params3 === void 0 ? void 0 : _block$service$params3.filters) || {};
+                        storedFilter[uid] = removeNullCondition(transformToFilter(form.values, fieldSchema));
+                        mergedFilter = mergeFilter([].concat(_toConsumableArray(Object.values(storedFilter).map(function (filter) {
+                          return removeNullCondition(filter);
+                        })), [block.defaultFilter]));
+                        return _context3.abrupt("return", block.doFilter(_objectSpread(_objectSpread({}, param), {}, {
+                          page: 1,
+                          filter: mergedFilter
+                        }), {
+                          filters: storedFilter
+                        }));
+                      case 8:
+                      case "end":
+                        return _context3.stop();
+                    }
+                  }, _callee3);
+                }));
+                return function (_x) {
+                  return _ref2.apply(this, arguments);
+                };
+              }()));
+            case 5:
+              actionField.data.loading = false;
+              _context4.next = 11;
+              break;
+            case 8:
+              _context4.prev = 8;
+              _context4.t0 = _context4["catch"](2);
+              actionField.data.loading = false;
+            case 11:
+            case "end":
+              return _context4.stop();
           }
-        }, _callee2, null, [[9, 20]]);
+        }, _callee4, null, [[2, 8]]);
+      }))();
+    }
+  };
+};
+export var useResetBlockActionProps = function useResetBlockActionProps() {
+  var form = useForm();
+  var actionField = useField();
+  var fieldSchema = useFieldSchema();
+  var _useFilterBlock2 = useFilterBlock(),
+    getDataBlocks = _useFilterBlock2.getDataBlocks;
+  actionField.data = actionField.data || {};
+  return {
+    onClick: function onClick() {
+      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+        var _findFilterTargets2, targets, uid;
+        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+          while (1) switch (_context6.prev = _context6.next) {
+            case 0:
+              _findFilterTargets2 = findFilterTargets(fieldSchema), targets = _findFilterTargets2.targets, uid = _findFilterTargets2.uid;
+              form.reset();
+              actionField.data.loading = true;
+              _context6.prev = 3;
+              _context6.next = 6;
+              return Promise.all(getDataBlocks().map( /*#__PURE__*/function () {
+                var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(block) {
+                  var _block$service$params4, _block$service$params5, _block$service$params6;
+                  var target, param, storedFilter, mergedFilter;
+                  return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+                    while (1) switch (_context5.prev = _context5.next) {
+                      case 0:
+                        target = targets.find(function (target) {
+                          return target.uid === block.uid;
+                        });
+                        if (target) {
+                          _context5.next = 3;
+                          break;
+                        }
+                        return _context5.abrupt("return");
+                      case 3:
+                        param = ((_block$service$params4 = block.service.params) === null || _block$service$params4 === void 0 ? void 0 : _block$service$params4[0]) || {}; // 保留原有的 filter
+                        storedFilter = ((_block$service$params5 = block.service.params) === null || _block$service$params5 === void 0 ? void 0 : (_block$service$params6 = _block$service$params5[1]) === null || _block$service$params6 === void 0 ? void 0 : _block$service$params6.filters) || {};
+                        delete storedFilter[uid];
+                        mergedFilter = mergeFilter([].concat(_toConsumableArray(Object.values(storedFilter)), [block.defaultFilter]));
+                        return _context5.abrupt("return", block.doFilter(_objectSpread(_objectSpread({}, param), {}, {
+                          page: 1,
+                          filter: mergedFilter
+                        }), {
+                          filters: storedFilter
+                        }));
+                      case 8:
+                      case "end":
+                        return _context5.stop();
+                    }
+                  }, _callee5);
+                }));
+                return function (_x2) {
+                  return _ref3.apply(this, arguments);
+                };
+              }()));
+            case 6:
+              actionField.data.loading = false;
+              _context6.next = 12;
+              break;
+            case 9:
+              _context6.prev = 9;
+              _context6.t0 = _context6["catch"](3);
+              actionField.data.loading = false;
+            case 12:
+            case "end":
+              return _context6.stop();
+          }
+        }, _callee6, null, [[3, 9]]);
       }))();
     }
   };
 };
 export var useCustomizeUpdateActionProps = function useCustomizeUpdateActionProps() {
   var _currentUserContext$d2;
-
   var _useBlockRequestConte2 = useBlockRequestContext(),
-      resource = _useBlockRequestConte2.resource,
-      __parent = _useBlockRequestConte2.__parent,
-      service = _useBlockRequestConte2.service;
-
+    resource = _useBlockRequestConte2.resource,
+    __parent = _useBlockRequestConte2.__parent,
+    service = _useBlockRequestConte2.service;
   var filterByTk = useFilterByTk();
   var actionSchema = useFieldSchema();
   var currentRecord = useRecord();
@@ -318,833 +447,674 @@ export var useCustomizeUpdateActionProps = function useCustomizeUpdateActionProp
   var form = useForm();
   return {
     onClick: function onClick() {
-      return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee4() {
+      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
         var _actionSchema$xActio2, _service$refresh;
-
-        var _ref2, _ref2$assignedValues, originalAssignedValues, onSuccess, skipValidator, assignedValues, _parent$service2, _parent$service2$refr;
-
-        return regeneratorRuntime.wrap(function _callee4$(_context4) {
-          while (1) {
-            switch (_context4.prev = _context4.next) {
-              case 0:
-                _ref2 = (_actionSchema$xActio2 = actionSchema === null || actionSchema === void 0 ? void 0 : actionSchema['x-action-settings']) !== null && _actionSchema$xActio2 !== void 0 ? _actionSchema$xActio2 : {}, _ref2$assignedValues = _ref2.assignedValues, originalAssignedValues = _ref2$assignedValues === void 0 ? {} : _ref2$assignedValues, onSuccess = _ref2.onSuccess, skipValidator = _ref2.skipValidator;
-                assignedValues = parse(originalAssignedValues)({
-                  currentTime: new Date(),
-                  currentRecord: currentRecord,
-                  currentUser: currentUser
-                });
-
-                if (!(skipValidator === false)) {
-                  _context4.next = 5;
-                  break;
-                }
-
-                _context4.next = 5;
-                return form.submit();
-
-              case 5:
-                _context4.next = 7;
-                return resource.update({
-                  filterByTk: filterByTk,
-                  values: _objectSpread({}, assignedValues)
-                });
-
-              case 7:
-                service === null || service === void 0 ? void 0 : (_service$refresh = service.refresh) === null || _service$refresh === void 0 ? void 0 : _service$refresh.call(service);
-
-                if (!(resource instanceof TableFieldResource)) {
-                  __parent === null || __parent === void 0 ? void 0 : (_parent$service2 = __parent.service) === null || _parent$service2 === void 0 ? void 0 : (_parent$service2$refr = _parent$service2.refresh) === null || _parent$service2$refr === void 0 ? void 0 : _parent$service2$refr.call(_parent$service2);
-                }
-
-                if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage) {
-                  _context4.next = 11;
-                  break;
-                }
-
-                return _context4.abrupt("return");
-
-              case 11:
-                if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.manualClose) {
-                  Modal.success({
-                    title: compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage),
-                    onOk: function () {
-                      var _onOk2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
-                        return regeneratorRuntime.wrap(function _callee3$(_context3) {
-                          while (1) {
-                            switch (_context3.prev = _context3.next) {
-                              case 0:
-                                if ((onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.redirecting) && (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.redirectTo)) {
-                                  if (isURL(onSuccess.redirectTo)) {
-                                    window.location.href = onSuccess.redirectTo;
-                                  } else {
-                                    history.push(onSuccess.redirectTo);
-                                  }
-                                }
-
-                              case 1:
-                              case "end":
-                                return _context3.stop();
+        var _ref4, _ref4$assignedValues, originalAssignedValues, onSuccess, skipValidator, assignedValues, _parent$service2, _parent$service2$refr;
+        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
+            case 0:
+              _ref4 = (_actionSchema$xActio2 = actionSchema === null || actionSchema === void 0 ? void 0 : actionSchema['x-action-settings']) !== null && _actionSchema$xActio2 !== void 0 ? _actionSchema$xActio2 : {}, _ref4$assignedValues = _ref4.assignedValues, originalAssignedValues = _ref4$assignedValues === void 0 ? {} : _ref4$assignedValues, onSuccess = _ref4.onSuccess, skipValidator = _ref4.skipValidator;
+              assignedValues = parse(originalAssignedValues)({
+                currentTime: new Date(),
+                currentRecord: currentRecord,
+                currentUser: currentUser
+              });
+              if (!(skipValidator === false)) {
+                _context8.next = 5;
+                break;
+              }
+              _context8.next = 5;
+              return form.submit();
+            case 5:
+              _context8.next = 7;
+              return resource.update({
+                filterByTk: filterByTk,
+                values: _objectSpread({}, assignedValues)
+              });
+            case 7:
+              service === null || service === void 0 ? void 0 : (_service$refresh = service.refresh) === null || _service$refresh === void 0 ? void 0 : _service$refresh.call(service);
+              if (!(resource instanceof TableFieldResource)) {
+                __parent === null || __parent === void 0 ? void 0 : (_parent$service2 = __parent.service) === null || _parent$service2 === void 0 ? void 0 : (_parent$service2$refr = _parent$service2.refresh) === null || _parent$service2$refr === void 0 ? void 0 : _parent$service2$refr.call(_parent$service2);
+              }
+              if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage) {
+                _context8.next = 11;
+                break;
+              }
+              return _context8.abrupt("return");
+            case 11:
+              if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.manualClose) {
+                Modal.success({
+                  title: compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage),
+                  onOk: function () {
+                    var _onOk2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+                      return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+                        while (1) switch (_context7.prev = _context7.next) {
+                          case 0:
+                            if ((onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.redirecting) && (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.redirectTo)) {
+                              if (isURL(onSuccess.redirectTo)) {
+                                window.location.href = onSuccess.redirectTo;
+                              } else {
+                                history.push(onSuccess.redirectTo);
+                              }
                             }
-                          }
-                        }, _callee3);
-                      }));
-
-                      function onOk() {
-                        return _onOk2.apply(this, arguments);
-                      }
-
-                      return onOk;
-                    }()
-                  });
-                } else {
-                  message.success(compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage));
-                }
-
-              case 12:
-              case "end":
-                return _context4.stop();
-            }
+                          case 1:
+                          case "end":
+                            return _context7.stop();
+                        }
+                      }, _callee7);
+                    }));
+                    function onOk() {
+                      return _onOk2.apply(this, arguments);
+                    }
+                    return onOk;
+                  }()
+                });
+              } else {
+                message.success(compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage));
+              }
+            case 12:
+            case "end":
+              return _context8.stop();
           }
-        }, _callee4);
+        }, _callee8);
       }))();
     }
   };
 };
 export var useCustomizeBulkUpdateActionProps = function useCustomizeBulkUpdateActionProps() {
-  var _tableBlockContext$fi, _tableBlockContext$fi2, _currentUserContext$d3;
-
+  var _ref5, _tableBlockContext$fi, _tableBlockContext$fi2, _tableBlockContext$fi3, _currentUserContext$d3;
   var _useBlockRequestConte3 = useBlockRequestContext(),
-      field = _useBlockRequestConte3.field,
-      resource = _useBlockRequestConte3.resource,
-      __parent = _useBlockRequestConte3.__parent,
-      service = _useBlockRequestConte3.service;
-
+    field = _useBlockRequestConte3.field,
+    resource = _useBlockRequestConte3.resource,
+    __parent = _useBlockRequestConte3.__parent,
+    service = _useBlockRequestConte3.service;
+  var expressionScope = useContext(SchemaExpressionScopeContext);
   var actionSchema = useFieldSchema();
-  var currentRecord = useRecord();
   var tableBlockContext = useTableBlockContext();
   var rowKey = tableBlockContext.rowKey;
-
-  var _ref3 = (_tableBlockContext$fi = (_tableBlockContext$fi2 = tableBlockContext.field) === null || _tableBlockContext$fi2 === void 0 ? void 0 : _tableBlockContext$fi2.data) !== null && _tableBlockContext$fi !== void 0 ? _tableBlockContext$fi : {},
-      selectedRowKeys = _ref3.selectedRowKeys;
-
+  var selectedRecordKeys = (_ref5 = (_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 && _ref5 !== void 0 ? _ref5 : {};
   var currentUserContext = 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 = useHistory();
   var compile = useCompile();
-
   var _useTranslation2 = useTranslation(),
-      t = _useTranslation2.t;
-
+    t = _useTranslation2.t;
   var actionField = useField();
   return {
     onClick: function onClick() {
-      return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee8() {
+      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
         var _actionSchema$xActio3;
-
-        var _ref4, _ref4$assignedValues, originalAssignedValues, onSuccess, updateMode, assignedValues;
-
-        return regeneratorRuntime.wrap(function _callee8$(_context8) {
-          while (1) {
-            switch (_context8.prev = _context8.next) {
-              case 0:
-                _ref4 = (_actionSchema$xActio3 = actionSchema === null || actionSchema === void 0 ? void 0 : actionSchema['x-action-settings']) !== null && _actionSchema$xActio3 !== void 0 ? _actionSchema$xActio3 : {}, _ref4$assignedValues = _ref4.assignedValues, originalAssignedValues = _ref4$assignedValues === void 0 ? {} : _ref4$assignedValues, onSuccess = _ref4.onSuccess, updateMode = _ref4.updateMode;
-                actionField.data = field.data || {};
-                actionField.data.loading = true;
-                assignedValues = parse(originalAssignedValues)({
-                  currentTime: new Date(),
-                  currentUser: currentUser
-                });
-                Modal.confirm({
-                  title: t('Bulk update'),
-                  content: updateMode === 'selected' ? t('Update selected data?') : t('Update all data?'),
-                  onOk: function onOk() {
-                    return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6() {
-                      var _service$params$, _service$params, _service$refresh2;
-
-                      var _ref5, filter, updateData, _parent$service3, _parent$service3$refr;
-
-                      return regeneratorRuntime.wrap(function _callee6$(_context6) {
-                        while (1) {
-                          switch (_context6.prev = _context6.next) {
-                            case 0:
-                              _ref5 = (_service$params$ = (_service$params = service.params) === null || _service$params === void 0 ? void 0 : _service$params[0]) !== null && _service$params$ !== void 0 ? _service$params$ : {}, filter = _ref5.filter;
-                              updateData = {
-                                values: _objectSpread({}, assignedValues),
-                                filter: filter,
-                                forceUpdate: false
-                              };
-
-                              if (!(updateMode === 'selected')) {
-                                _context6.next = 8;
-                                break;
-                              }
-
-                              if (selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length) {
-                                _context6.next = 7;
-                                break;
-                              }
-
-                              message.error(t('Please select the records to be updated'));
-                              actionField.data.loading = false;
-                              return _context6.abrupt("return");
-
-                            case 7:
-                              updateData.filter = {
-                                $and: [_defineProperty({}, rowKey || 'id', {
-                                  $in: selectedRowKeys
-                                })]
-                              };
-
-                            case 8:
-                              if (!updateData.filter) {
-                                updateData.forceUpdate = true;
-                              }
-
-                              _context6.prev = 9;
-                              _context6.next = 12;
-                              return resource.update(updateData);
-
-                            case 12:
-                              _context6.next = 16;
-                              break;
-
-                            case 14:
-                              _context6.prev = 14;
-                              _context6.t0 = _context6["catch"](9);
-
-                            case 16:
-                              _context6.prev = 16;
-                              actionField.data.loading = false;
-                              return _context6.finish(16);
-
-                            case 19:
-                              service === null || service === void 0 ? void 0 : (_service$refresh2 = service.refresh) === null || _service$refresh2 === void 0 ? void 0 : _service$refresh2.call(service);
-
-                              if (!(resource instanceof TableFieldResource)) {
-                                __parent === null || __parent === void 0 ? void 0 : (_parent$service3 = __parent.service) === null || _parent$service3 === void 0 ? void 0 : (_parent$service3$refr = _parent$service3.refresh) === null || _parent$service3$refr === void 0 ? void 0 : _parent$service3$refr.call(_parent$service3);
-                              }
-
-                              if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage) {
-                                _context6.next = 23;
-                                break;
-                              }
-
-                              return _context6.abrupt("return");
-
-                            case 23:
-                              if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.manualClose) {
-                                Modal.success({
-                                  title: compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage),
-                                  onOk: function () {
-                                    var _onOk3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee5() {
-                                      return regeneratorRuntime.wrap(function _callee5$(_context5) {
-                                        while (1) {
-                                          switch (_context5.prev = _context5.next) {
-                                            case 0:
-                                              if ((onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.redirecting) && (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.redirectTo)) {
-                                                if (isURL(onSuccess.redirectTo)) {
-                                                  window.location.href = onSuccess.redirectTo;
-                                                } else {
-                                                  history.push(onSuccess.redirectTo);
-                                                }
-                                              }
-
-                                            case 1:
-                                            case "end":
-                                              return _context5.stop();
+        var _ref6, _ref6$assignedValues, originalAssignedValues, onSuccess, updateMode, assignedValues;
+        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
+            case 0:
+              _ref6 = (_actionSchema$xActio3 = actionSchema === null || actionSchema === void 0 ? void 0 : actionSchema['x-action-settings']) !== null && _actionSchema$xActio3 !== void 0 ? _actionSchema$xActio3 : {}, _ref6$assignedValues = _ref6.assignedValues, originalAssignedValues = _ref6$assignedValues === void 0 ? {} : _ref6$assignedValues, onSuccess = _ref6.onSuccess, updateMode = _ref6.updateMode;
+              actionField.data = field.data || {};
+              actionField.data.loading = true;
+              assignedValues = parse(originalAssignedValues)({
+                currentTime: new Date(),
+                currentUser: currentUser
+              });
+              Modal.confirm({
+                title: t('Bulk update'),
+                content: updateMode === 'selected' ? t('Update selected data?') : t('Update all data?'),
+                onOk: function onOk() {
+                  return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
+                    var _service$params$, _service$params, _service$refresh2;
+                    var _ref7, filter, updateData, _parent$service3, _parent$service3$refr;
+                    return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+                      while (1) switch (_context10.prev = _context10.next) {
+                        case 0:
+                          _ref7 = (_service$params$ = (_service$params = service.params) === null || _service$params === void 0 ? void 0 : _service$params[0]) !== null && _service$params$ !== void 0 ? _service$params$ : {}, filter = _ref7.filter;
+                          updateData = {
+                            values: _objectSpread({}, assignedValues),
+                            filter: filter,
+                            forceUpdate: false
+                          };
+                          if (!(updateMode === 'selected')) {
+                            _context10.next = 8;
+                            break;
+                          }
+                          if (selectedRecordKeys === null || selectedRecordKeys === void 0 ? void 0 : selectedRecordKeys.length) {
+                            _context10.next = 7;
+                            break;
+                          }
+                          message.error(t('Please select the records to be updated'));
+                          actionField.data.loading = false;
+                          return _context10.abrupt("return");
+                        case 7:
+                          updateData.filter = {
+                            $and: [_defineProperty({}, rowKey || 'id', {
+                              $in: selectedRecordKeys
+                            })]
+                          };
+                        case 8:
+                          if (!updateData.filter) {
+                            updateData.forceUpdate = true;
+                          }
+                          _context10.prev = 9;
+                          _context10.next = 12;
+                          return resource.update(updateData);
+                        case 12:
+                          _context10.next = 16;
+                          break;
+                        case 14:
+                          _context10.prev = 14;
+                          _context10.t0 = _context10["catch"](9);
+                        case 16:
+                          _context10.prev = 16;
+                          actionField.data.loading = false;
+                          return _context10.finish(16);
+                        case 19:
+                          service === null || service === void 0 ? void 0 : (_service$refresh2 = service.refresh) === null || _service$refresh2 === void 0 ? void 0 : _service$refresh2.call(service);
+                          if (!(resource instanceof TableFieldResource)) {
+                            __parent === null || __parent === void 0 ? void 0 : (_parent$service3 = __parent.service) === null || _parent$service3 === void 0 ? void 0 : (_parent$service3$refr = _parent$service3.refresh) === null || _parent$service3$refr === void 0 ? void 0 : _parent$service3$refr.call(_parent$service3);
+                          }
+                          if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage) {
+                            _context10.next = 23;
+                            break;
+                          }
+                          return _context10.abrupt("return");
+                        case 23:
+                          if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.manualClose) {
+                            Modal.success({
+                              title: compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage),
+                              onOk: function () {
+                                var _onOk3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
+                                  return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+                                    while (1) switch (_context9.prev = _context9.next) {
+                                      case 0:
+                                        if ((onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.redirecting) && (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.redirectTo)) {
+                                          if (isURL(onSuccess.redirectTo)) {
+                                            window.location.href = onSuccess.redirectTo;
+                                          } else {
+                                            history.push(onSuccess.redirectTo);
                                           }
                                         }
-                                      }, _callee5);
-                                    }));
-
-                                    function onOk() {
-                                      return _onOk3.apply(this, arguments);
+                                      case 1:
+                                      case "end":
+                                        return _context9.stop();
                                     }
-
-                                    return onOk;
-                                  }()
-                                });
-                              } else {
-                                message.success(compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage));
-                              }
-
-                            case 24:
-                            case "end":
-                              return _context6.stop();
-                          }
-                        }
-                      }, _callee6, null, [[9, 14, 16, 19]]);
-                    }))();
-                  },
-                  onCancel: function onCancel() {
-                    return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7() {
-                      return regeneratorRuntime.wrap(function _callee7$(_context7) {
-                        while (1) {
-                          switch (_context7.prev = _context7.next) {
-                            case 0:
-                              actionField.data.loading = false;
-
-                            case 1:
-                            case "end":
-                              return _context7.stop();
+                                  }, _callee9);
+                                }));
+                                function onOk() {
+                                  return _onOk3.apply(this, arguments);
+                                }
+                                return onOk;
+                              }()
+                            });
+                          } else {
+                            message.success(compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage));
                           }
-                        }
-                      }, _callee7);
-                    }))();
-                  }
-                });
-
-              case 5:
-              case "end":
-                return _context8.stop();
-            }
+                        case 24:
+                        case "end":
+                          return _context10.stop();
+                      }
+                    }, _callee10, null, [[9, 14, 16, 19]]);
+                  }))();
+                },
+                onCancel: function onCancel() {
+                  return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
+                    return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+                      while (1) switch (_context11.prev = _context11.next) {
+                        case 0:
+                          actionField.data.loading = false;
+                        case 1:
+                        case "end":
+                          return _context11.stop();
+                      }
+                    }, _callee11);
+                  }))();
+                }
+              });
+            case 5:
+            case "end":
+              return _context12.stop();
           }
-        }, _callee8);
+        }, _callee12);
       }))();
     }
   };
 };
 export var useCustomizeBulkEditActionProps = function useCustomizeBulkEditActionProps() {
-  var _tableBlockContext$fi3, _tableBlockContext$fi4;
-
+  var _ref9, _tableBlockContext$fi4, _tableBlockContext$fi5, _tableBlockContext$fi6;
   var form = useForm();
-
   var _useTranslation3 = useTranslation(),
-      t = _useTranslation3.t;
-
+    t = _useTranslation3.t;
   var _useBlockRequestConte4 = useBlockRequestContext(),
-      field = _useBlockRequestConte4.field,
-      resource = _useBlockRequestConte4.resource,
-      __parent = _useBlockRequestConte4.__parent;
-
+    field = _useBlockRequestConte4.field,
+    resource = _useBlockRequestConte4.resource,
+    __parent = _useBlockRequestConte4.__parent;
+  var expressionScope = useContext(SchemaExpressionScopeContext);
   var actionContext = useActionContext();
   var history = useHistory();
   var compile = useCompile();
   var actionField = useField();
   var tableBlockContext = useTableBlockContext();
   var rowKey = tableBlockContext.rowKey;
-
-  var _ref7 = (_tableBlockContext$fi3 = (_tableBlockContext$fi4 = tableBlockContext.field) === null || _tableBlockContext$fi4 === void 0 ? void 0 : _tableBlockContext$fi4.data) !== null && _tableBlockContext$fi3 !== void 0 ? _tableBlockContext$fi3 : {},
-      selectedRowKeys = _ref7.selectedRowKeys;
-
+  var selectedRecordKeys = (_ref9 = (_tableBlockContext$fi4 = (_tableBlockContext$fi5 = tableBlockContext.field) === null || _tableBlockContext$fi5 === void 0 ? void 0 : (_tableBlockContext$fi6 = _tableBlockContext$fi5.data) === null || _tableBlockContext$fi6 === void 0 ? void 0 : _tableBlockContext$fi6.selectedRowKeys) !== null && _tableBlockContext$fi4 !== void 0 ? _tableBlockContext$fi4 : expressionScope === null || expressionScope === void 0 ? void 0 : expressionScope.selectedRecordKeys) !== null && _ref9 !== void 0 ? _ref9 : {};
   var setVisible = actionContext.setVisible,
-      actionSchema = actionContext.fieldSchema;
+    actionSchema = actionContext.fieldSchema;
   return {
     onClick: function onClick() {
-      return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee10() {
+      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
         var _actionSchema$xActio4, _parent$service$para, _parent$service$para2;
-
-        var _ref8, onSuccess, skipValidator, updateMode, _ref9, filter, values, key, value, _parent$service4, _parent$service4$refr, updateData, _parent$__parent, _parent$__parent$serv, _parent$__parent$serv2;
-
-        return regeneratorRuntime.wrap(function _callee10$(_context10) {
-          while (1) {
-            switch (_context10.prev = _context10.next) {
-              case 0:
-                _ref8 = (_actionSchema$xActio4 = actionSchema === null || actionSchema === void 0 ? void 0 : actionSchema['x-action-settings']) !== null && _actionSchema$xActio4 !== void 0 ? _actionSchema$xActio4 : {}, onSuccess = _ref8.onSuccess, skipValidator = _ref8.skipValidator, updateMode = _ref8.updateMode;
-                _ref9 = (_parent$service$para = (_parent$service$para2 = __parent.service.params) === null || _parent$service$para2 === void 0 ? void 0 : _parent$service$para2[0]) !== null && _parent$service$para !== void 0 ? _parent$service$para : {}, filter = _ref9.filter;
-
-                if (skipValidator) {
-                  _context10.next = 5;
-                  break;
-                }
-
-                _context10.next = 5;
-                return form.submit();
-
-              case 5:
-                values = cloneDeep(form.values);
-                actionField.data = field.data || {};
-                actionField.data.loading = true;
-
-                for (key in values) {
-                  if (Object.prototype.hasOwnProperty.call(values, key)) {
-                    value = values[key];
-
-                    if (BulkEditFormItemValueType.Clear in value) {
-                      values[key] = null;
-                    } else if (BulkEditFormItemValueType.ChangedTo in value) {
-                      values[key] = value[BulkEditFormItemValueType.ChangedTo];
-                    } else if (BulkEditFormItemValueType.RemainsTheSame in value) {
-                      delete values[key];
-                    }
+        var _ref10, onSuccess, skipValidator, updateMode, _ref11, filter, values, key, value, _parent$service4, _parent$service4$refr, updateData, _parent$__parent, _parent$__parent$serv, _parent$__parent$serv2;
+        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
+            case 0:
+              _ref10 = (_actionSchema$xActio4 = actionSchema === null || actionSchema === void 0 ? void 0 : actionSchema['x-action-settings']) !== null && _actionSchema$xActio4 !== void 0 ? _actionSchema$xActio4 : {}, onSuccess = _ref10.onSuccess, skipValidator = _ref10.skipValidator, updateMode = _ref10.updateMode;
+              _ref11 = (_parent$service$para = (_parent$service$para2 = __parent.service.params) === null || _parent$service$para2 === void 0 ? void 0 : _parent$service$para2[0]) !== null && _parent$service$para !== void 0 ? _parent$service$para : {}, filter = _ref11.filter;
+              if (skipValidator) {
+                _context14.next = 5;
+                break;
+              }
+              _context14.next = 5;
+              return form.submit();
+            case 5:
+              values = cloneDeep(form.values);
+              actionField.data = field.data || {};
+              actionField.data.loading = true;
+              for (key in values) {
+                if (Object.prototype.hasOwnProperty.call(values, key)) {
+                  value = values[key];
+                  if (BulkEditFormItemValueType.Clear in value) {
+                    values[key] = null;
+                  } else if (BulkEditFormItemValueType.ChangedTo in value) {
+                    values[key] = value[BulkEditFormItemValueType.ChangedTo];
+                  } else if (BulkEditFormItemValueType.RemainsTheSame in value) {
+                    delete values[key];
                   }
                 }
-
-                _context10.prev = 9;
-                updateData = {
-                  values: values,
-                  filter: filter,
-                  forceUpdate: false
-                };
-
-                if (!(updateMode === 'selected')) {
-                  _context10.next = 16;
-                  break;
-                }
-
-                if (selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length) {
-                  _context10.next = 15;
-                  break;
-                }
-
-                message.error(t('Please select the records to be updated'));
-                return _context10.abrupt("return");
-
-              case 15:
-                updateData.filter = {
-                  $and: [_defineProperty({}, rowKey || 'id', {
-                    $in: selectedRowKeys
-                  })]
-                };
-
-              case 16:
-                if (!updateData.filter) {
-                  updateData.forceUpdate = true;
-                }
-
-                _context10.next = 19;
-                return resource.update(updateData);
-
-              case 19:
-                actionField.data.loading = false;
-
-                if (!(resource instanceof TableFieldResource)) {
-                  __parent === null || __parent === void 0 ? void 0 : (_parent$__parent = __parent.__parent) === null || _parent$__parent === void 0 ? void 0 : (_parent$__parent$serv = _parent$__parent.service) === null || _parent$__parent$serv === void 0 ? void 0 : (_parent$__parent$serv2 = _parent$__parent$serv.refresh) === null || _parent$__parent$serv2 === void 0 ? void 0 : _parent$__parent$serv2.call(_parent$__parent$serv);
-                }
-
-                __parent === null || __parent === void 0 ? void 0 : (_parent$service4 = __parent.service) === null || _parent$service4 === void 0 ? void 0 : (_parent$service4$refr = _parent$service4.refresh) === null || _parent$service4$refr === void 0 ? void 0 : _parent$service4$refr.call(_parent$service4);
-                setVisible === null || setVisible === void 0 ? void 0 : setVisible(false);
-
-                if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage) {
-                  _context10.next = 25;
-                  break;
-                }
-
-                return _context10.abrupt("return");
-
-              case 25:
-                if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.manualClose) {
-                  Modal.success({
-                    title: compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage),
-                    onOk: function () {
-                      var _onOk4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee9() {
-                        return regeneratorRuntime.wrap(function _callee9$(_context9) {
-                          while (1) {
-                            switch (_context9.prev = _context9.next) {
-                              case 0:
-                                _context9.next = 2;
-                                return form.reset();
-
-                              case 2:
-                                if ((onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.redirecting) && (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.redirectTo)) {
-                                  if (isURL(onSuccess.redirectTo)) {
-                                    window.location.href = onSuccess.redirectTo;
-                                  } else {
-                                    history.push(onSuccess.redirectTo);
-                                  }
-                                }
-
-                              case 3:
-                              case "end":
-                                return _context9.stop();
+              }
+              _context14.prev = 9;
+              updateData = {
+                values: values,
+                filter: filter,
+                forceUpdate: false
+              };
+              if (!(updateMode === 'selected')) {
+                _context14.next = 16;
+                break;
+              }
+              if (selectedRecordKeys === null || selectedRecordKeys === void 0 ? void 0 : selectedRecordKeys.length) {
+                _context14.next = 15;
+                break;
+              }
+              message.error(t('Please select the records to be updated'));
+              return _context14.abrupt("return");
+            case 15:
+              updateData.filter = {
+                $and: [_defineProperty({}, rowKey || 'id', {
+                  $in: selectedRecordKeys
+                })]
+              };
+            case 16:
+              if (!updateData.filter) {
+                updateData.forceUpdate = true;
+              }
+              _context14.next = 19;
+              return resource.update(updateData);
+            case 19:
+              actionField.data.loading = false;
+              if (!(resource instanceof TableFieldResource)) {
+                __parent === null || __parent === void 0 ? void 0 : (_parent$__parent = __parent.__parent) === null || _parent$__parent === void 0 ? void 0 : (_parent$__parent$serv = _parent$__parent.service) === null || _parent$__parent$serv === void 0 ? void 0 : (_parent$__parent$serv2 = _parent$__parent$serv.refresh) === null || _parent$__parent$serv2 === void 0 ? void 0 : _parent$__parent$serv2.call(_parent$__parent$serv);
+              }
+              __parent === null || __parent === void 0 ? void 0 : (_parent$service4 = __parent.service) === null || _parent$service4 === void 0 ? void 0 : (_parent$service4$refr = _parent$service4.refresh) === null || _parent$service4$refr === void 0 ? void 0 : _parent$service4$refr.call(_parent$service4);
+              setVisible === null || setVisible === void 0 ? void 0 : setVisible(false);
+              if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage) {
+                _context14.next = 25;
+                break;
+              }
+              return _context14.abrupt("return");
+            case 25:
+              if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.manualClose) {
+                Modal.success({
+                  title: compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage),
+                  onOk: function () {
+                    var _onOk4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
+                      return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+                        while (1) switch (_context13.prev = _context13.next) {
+                          case 0:
+                            _context13.next = 2;
+                            return form.reset();
+                          case 2:
+                            if ((onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.redirecting) && (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.redirectTo)) {
+                              if (isURL(onSuccess.redirectTo)) {
+                                window.location.href = onSuccess.redirectTo;
+                              } else {
+                                history.push(onSuccess.redirectTo);
+                              }
                             }
-                          }
-                        }, _callee9);
-                      }));
-
-                      function onOk() {
-                        return _onOk4.apply(this, arguments);
-                      }
-
-                      return onOk;
-                    }()
-                  });
-                } else {
-                  message.success(compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage));
-                }
-
-              case 26:
-                _context10.prev = 26;
-                actionField.data.loading = false;
-                return _context10.finish(26);
-
-              case 29:
-              case "end":
-                return _context10.stop();
-            }
+                          case 3:
+                          case "end":
+                            return _context13.stop();
+                        }
+                      }, _callee13);
+                    }));
+                    function onOk() {
+                      return _onOk4.apply(this, arguments);
+                    }
+                    return onOk;
+                  }()
+                });
+              } else {
+                message.success(compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage));
+              }
+            case 26:
+              _context14.prev = 26;
+              actionField.data.loading = false;
+              return _context14.finish(26);
+            case 29:
+            case "end":
+              return _context14.stop();
           }
-        }, _callee10, null, [[9,, 26, 29]]);
+        }, _callee14, null, [[9,, 26, 29]]);
       }))();
     }
   };
 };
 export var useCustomizeRequestActionProps = function useCustomizeRequestActionProps() {
   var _currentUserContext$d4;
-
   var apiClient = useAPIClient();
   var history = useHistory();
   var filterByTk = useFilterByTk();
   var actionSchema = useFieldSchema();
   var compile = useCompile();
   var form = useForm();
-
   var _useCollection2 = useCollection(),
-      fields = _useCollection2.fields,
-      getField = _useCollection2.getField;
-
+    fields = _useCollection2.fields,
+    getField = _useCollection2.getField;
   var _useBlockRequestConte5 = useBlockRequestContext(),
-      field = _useBlockRequestConte5.field,
-      resource = _useBlockRequestConte5.resource,
-      __parent = _useBlockRequestConte5.__parent,
-      service = _useBlockRequestConte5.service;
-
+    field = _useBlockRequestConte5.field,
+    resource = _useBlockRequestConte5.resource,
+    __parent = _useBlockRequestConte5.__parent,
+    service = _useBlockRequestConte5.service;
   var currentRecord = useRecord();
   var currentUserContext = 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 actionField = useField();
-
   var _useActionContext2 = useActionContext(),
-      visible = _useActionContext2.visible,
-      setVisible = _useActionContext2.setVisible;
-
+    setVisible = _useActionContext2.setVisible;
   return {
     onClick: function onClick() {
-      return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee12() {
+      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
         var _actionSchema$xActio5;
-
-        var _ref11, skipValidator, onSuccess, requestSettings, xAction, headers, params, data, methods, fieldNames, values, requestBody, _service$refresh3, _parent$service5, _parent$service5$refr;
-
-        return regeneratorRuntime.wrap(function _callee12$(_context12) {
-          while (1) {
-            switch (_context12.prev = _context12.next) {
-              case 0:
-                _ref11 = (_actionSchema$xActio5 = actionSchema === null || actionSchema === void 0 ? void 0 : actionSchema['x-action-settings']) !== null && _actionSchema$xActio5 !== void 0 ? _actionSchema$xActio5 : {}, skipValidator = _ref11.skipValidator, onSuccess = _ref11.onSuccess, requestSettings = _ref11.requestSettings;
-                xAction = actionSchema === null || actionSchema === void 0 ? void 0 : actionSchema['x-action'];
-
-                if (requestSettings['url']) {
-                  _context12.next = 4;
-                  break;
-                }
-
-                return _context12.abrupt("return");
-
-              case 4:
-                if (!(skipValidator !== true && xAction === 'customize:form:request')) {
-                  _context12.next = 7;
-                  break;
-                }
-
-                _context12.next = 7;
-                return form.submit();
-
-              case 7:
-                headers = requestSettings['headers'] ? JSON.parse(requestSettings['headers']) : {};
-                params = requestSettings['params'] ? JSON.parse(requestSettings['params']) : {};
-                data = requestSettings['data'] ? JSON.parse(requestSettings['data']) : {};
-                methods = ['POST', 'PUT', 'PATCH'];
-
-                if (xAction === 'customize:form:request' && methods.includes(requestSettings['method'])) {
-                  fieldNames = fields.map(function (field) {
-                    return field.name;
-                  });
-                  values = getFormValues(filterByTk, field, form, fieldNames, getField, resource);
-                  Object.assign(data, values);
-                }
-
-                requestBody = {
-                  url: renderTemplate(requestSettings['url'], {
-                    currentRecord: currentRecord,
-                    currentUser: currentUser
-                  }),
-                  method: requestSettings['method'],
-                  headers: parse(headers)({
-                    currentRecord: currentRecord,
-                    currentUser: currentUser
-                  }),
-                  params: parse(params)({
-                    currentRecord: currentRecord,
-                    currentUser: currentUser
-                  }),
-                  data: parse(data)({
-                    currentRecord: currentRecord,
-                    currentUser: currentUser
-                  })
-                };
-                actionField.data = field.data || {};
-                actionField.data.loading = true;
-                _context12.prev = 15;
-                _context12.next = 18;
-                return apiClient.request(_objectSpread({}, requestBody));
-
-              case 18:
-                actionField.data.loading = false;
-
-                if (!(resource instanceof TableFieldResource)) {
-                  __parent === null || __parent === void 0 ? void 0 : (_parent$service5 = __parent.service) === null || _parent$service5 === void 0 ? void 0 : (_parent$service5$refr = _parent$service5.refresh) === null || _parent$service5$refr === void 0 ? void 0 : _parent$service5$refr.call(_parent$service5);
-                }
-
-                service === null || service === void 0 ? void 0 : (_service$refresh3 = service.refresh) === null || _service$refresh3 === void 0 ? void 0 : _service$refresh3.call(service);
-
-                if (xAction === 'customize:form:request') {
-                  setVisible === null || setVisible === void 0 ? void 0 : setVisible(false);
-                }
-
-                if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage) {
-                  _context12.next = 24;
-                  break;
-                }
-
-                return _context12.abrupt("return");
-
-              case 24:
-                if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.manualClose) {
-                  Modal.success({
-                    title: compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage),
-                    onOk: function () {
-                      var _onOk5 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee11() {
-                        return regeneratorRuntime.wrap(function _callee11$(_context11) {
-                          while (1) {
-                            switch (_context11.prev = _context11.next) {
-                              case 0:
-                                if ((onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.redirecting) && (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.redirectTo)) {
-                                  if (isURL(onSuccess.redirectTo)) {
-                                    window.location.href = onSuccess.redirectTo;
-                                  } else {
-                                    history.push(onSuccess.redirectTo);
-                                  }
-                                }
-
-                              case 1:
-                              case "end":
-                                return _context11.stop();
+        var _ref13, skipValidator, onSuccess, requestSettings, xAction, headers, params, data, methods, fieldNames, values, requestBody, _service$refresh3, _parent$service5, _parent$service5$refr;
+        return _regeneratorRuntime().wrap(function _callee16$(_context16) {
+          while (1) switch (_context16.prev = _context16.next) {
+            case 0:
+              _ref13 = (_actionSchema$xActio5 = actionSchema === null || actionSchema === void 0 ? void 0 : actionSchema['x-action-settings']) !== null && _actionSchema$xActio5 !== void 0 ? _actionSchema$xActio5 : {}, skipValidator = _ref13.skipValidator, onSuccess = _ref13.onSuccess, requestSettings = _ref13.requestSettings;
+              xAction = actionSchema === null || actionSchema === void 0 ? void 0 : actionSchema['x-action'];
+              if (requestSettings['url']) {
+                _context16.next = 4;
+                break;
+              }
+              return _context16.abrupt("return");
+            case 4:
+              if (!(skipValidator !== true && xAction === 'customize:form:request')) {
+                _context16.next = 7;
+                break;
+              }
+              _context16.next = 7;
+              return form.submit();
+            case 7:
+              headers = requestSettings['headers'] ? JSON.parse(requestSettings['headers']) : {};
+              params = requestSettings['params'] ? JSON.parse(requestSettings['params']) : {};
+              data = requestSettings['data'] ? JSON.parse(requestSettings['data']) : {};
+              methods = ['POST', 'PUT', 'PATCH'];
+              if (xAction === 'customize:form:request' && methods.includes(requestSettings['method'])) {
+                fieldNames = fields.map(function (field) {
+                  return field.name;
+                });
+                values = getFormValues(filterByTk, field, form, fieldNames, getField, resource);
+                Object.assign(data, values);
+              }
+              requestBody = {
+                url: renderTemplate(requestSettings['url'], {
+                  currentRecord: currentRecord,
+                  currentUser: currentUser
+                }),
+                method: requestSettings['method'],
+                headers: parse(headers)({
+                  currentRecord: currentRecord,
+                  currentUser: currentUser
+                }),
+                params: parse(params)({
+                  currentRecord: currentRecord,
+                  currentUser: currentUser
+                }),
+                data: parse(data)({
+                  currentRecord: currentRecord,
+                  currentUser: currentUser
+                })
+              };
+              actionField.data = field.data || {};
+              actionField.data.loading = true;
+              _context16.prev = 15;
+              _context16.next = 18;
+              return apiClient.request(_objectSpread({}, requestBody));
+            case 18:
+              actionField.data.loading = false;
+              if (!(resource instanceof TableFieldResource)) {
+                __parent === null || __parent === void 0 ? void 0 : (_parent$service5 = __parent.service) === null || _parent$service5 === void 0 ? void 0 : (_parent$service5$refr = _parent$service5.refresh) === null || _parent$service5$refr === void 0 ? void 0 : _parent$service5$refr.call(_parent$service5);
+              }
+              service === null || service === void 0 ? void 0 : (_service$refresh3 = service.refresh) === null || _service$refresh3 === void 0 ? void 0 : _service$refresh3.call(service);
+              if (xAction === 'customize:form:request') {
+                setVisible === null || setVisible === void 0 ? void 0 : setVisible(false);
+              }
+              if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage) {
+                _context16.next = 24;
+                break;
+              }
+              return _context16.abrupt("return");
+            case 24:
+              if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.manualClose) {
+                Modal.success({
+                  title: compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage),
+                  onOk: function () {
+                    var _onOk5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
+                      return _regeneratorRuntime().wrap(function _callee15$(_context15) {
+                        while (1) switch (_context15.prev = _context15.next) {
+                          case 0:
+                            if ((onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.redirecting) && (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.redirectTo)) {
+                              if (isURL(onSuccess.redirectTo)) {
+                                window.location.href = onSuccess.redirectTo;
+                              } else {
+                                history.push(onSuccess.redirectTo);
+                              }
                             }
-                          }
-                        }, _callee11);
-                      }));
-
-                      function onOk() {
-                        return _onOk5.apply(this, arguments);
-                      }
-
-                      return onOk;
-                    }()
-                  });
-                } else {
-                  message.success(compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage));
-                }
-
-              case 25:
-                _context12.prev = 25;
-                actionField.data.loading = false;
-                return _context12.finish(25);
-
-              case 28:
-              case "end":
-                return _context12.stop();
-            }
+                          case 1:
+                          case "end":
+                            return _context15.stop();
+                        }
+                      }, _callee15);
+                    }));
+                    function onOk() {
+                      return _onOk5.apply(this, arguments);
+                    }
+                    return onOk;
+                  }()
+                });
+              } else {
+                message.success(compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage));
+              }
+            case 25:
+              _context16.prev = 25;
+              actionField.data.loading = false;
+              return _context16.finish(25);
+            case 28:
+            case "end":
+              return _context16.stop();
           }
-        }, _callee12, null, [[15,, 25, 28]]);
+        }, _callee16, null, [[15,, 25, 28]]);
       }))();
     }
   };
 };
 export var useUpdateActionProps = function useUpdateActionProps() {
   var _currentUserContext$d5;
-
   var form = useForm();
   var filterByTk = useFilterByTk();
-
   var _useBlockRequestConte6 = useBlockRequestContext(),
-      field = _useBlockRequestConte6.field,
-      resource = _useBlockRequestConte6.resource,
-      __parent = _useBlockRequestConte6.__parent;
-
+    field = _useBlockRequestConte6.field,
+    resource = _useBlockRequestConte6.resource,
+    __parent = _useBlockRequestConte6.__parent;
   var _useActionContext3 = useActionContext(),
-      setVisible = _useActionContext3.setVisible;
-
+    setVisible = _useActionContext3.setVisible;
   var actionSchema = useFieldSchema();
   var history = useHistory();
-
   var _useCollection3 = useCollection(),
-      fields = _useCollection3.fields,
-      getField = _useCollection3.getField;
-
+    fields = _useCollection3.fields,
+    getField = _useCollection3.getField;
   var compile = useCompile();
   var actionField = useField();
-
   var _useFormBlockContext = useFormBlockContext(),
-      updateAssociationValues = _useFormBlockContext.updateAssociationValues;
-
+    updateAssociationValues = _useFormBlockContext.updateAssociationValues;
   var currentRecord = useRecord();
   var currentUserContext = useCurrentUserContext();
   var currentUser = currentUserContext === null || currentUserContext === void 0 ? void 0 : (_currentUserContext$d5 = currentUserContext.data) === null || _currentUserContext$d5 === void 0 ? void 0 : _currentUserContext$d5.data;
   return {
     onClick: function onClick() {
-      return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee14() {
+      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18() {
         var _actionSchema$xActio6;
-
-        var _ref12, _ref12$assignedValues, originalAssignedValues, onSuccess, overwriteValues, skipValidator, assignedValues, fieldNames, values, _parent$service6, _parent$service6$refr, _parent$__parent2, _parent$__parent2$ser, _parent$__parent2$ser2;
-
-        return regeneratorRuntime.wrap(function _callee14$(_context14) {
-          while (1) {
-            switch (_context14.prev = _context14.next) {
-              case 0:
-                _ref12 = (_actionSchema$xActio6 = actionSchema === null || actionSchema === void 0 ? void 0 : actionSchema['x-action-settings']) !== null && _actionSchema$xActio6 !== void 0 ? _actionSchema$xActio6 : {}, _ref12$assignedValues = _ref12.assignedValues, originalAssignedValues = _ref12$assignedValues === void 0 ? {} : _ref12$assignedValues, onSuccess = _ref12.onSuccess, overwriteValues = _ref12.overwriteValues, skipValidator = _ref12.skipValidator;
-                assignedValues = parse(originalAssignedValues)({
-                  currentTime: new Date(),
-                  currentRecord: currentRecord,
-                  currentUser: currentUser
-                });
-
-                if (skipValidator) {
-                  _context14.next = 5;
-                  break;
-                }
-
-                _context14.next = 5;
-                return form.submit();
-
-              case 5:
-                fieldNames = fields.map(function (field) {
-                  return field.name;
-                });
-                values = getFormValues(filterByTk, field, form, fieldNames, getField, resource);
-                actionField.data = field.data || {};
-                actionField.data.loading = true;
-                _context14.prev = 9;
-                _context14.next = 12;
-                return resource.update({
-                  filterByTk: filterByTk,
-                  values: _objectSpread(_objectSpread(_objectSpread({}, values), overwriteValues), assignedValues),
-                  updateAssociationValues: updateAssociationValues
-                });
-
-              case 12:
-                actionField.data.loading = false;
-
-                if (!(resource instanceof TableFieldResource)) {
-                  __parent === null || __parent === void 0 ? void 0 : (_parent$__parent2 = __parent.__parent) === null || _parent$__parent2 === void 0 ? void 0 : (_parent$__parent2$ser = _parent$__parent2.service) === null || _parent$__parent2$ser === void 0 ? void 0 : (_parent$__parent2$ser2 = _parent$__parent2$ser.refresh) === null || _parent$__parent2$ser2 === void 0 ? void 0 : _parent$__parent2$ser2.call(_parent$__parent2$ser);
-                }
-
-                __parent === null || __parent === void 0 ? void 0 : (_parent$service6 = __parent.service) === null || _parent$service6 === void 0 ? void 0 : (_parent$service6$refr = _parent$service6.refresh) === null || _parent$service6$refr === void 0 ? void 0 : _parent$service6$refr.call(_parent$service6);
-                setVisible === null || setVisible === void 0 ? void 0 : setVisible(false);
-
-                if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage) {
-                  _context14.next = 18;
-                  break;
-                }
-
-                return _context14.abrupt("return");
-
-              case 18:
-                if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.manualClose) {
-                  Modal.success({
-                    title: compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage),
-                    onOk: function () {
-                      var _onOk6 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee13() {
-                        return regeneratorRuntime.wrap(function _callee13$(_context13) {
-                          while (1) {
-                            switch (_context13.prev = _context13.next) {
-                              case 0:
-                                _context13.next = 2;
-                                return form.reset();
-
-                              case 2:
-                                if ((onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.redirecting) && (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.redirectTo)) {
-                                  if (isURL(onSuccess.redirectTo)) {
-                                    window.location.href = onSuccess.redirectTo;
-                                  } else {
-                                    history.push(onSuccess.redirectTo);
-                                  }
-                                }
-
-                              case 3:
-                              case "end":
-                                return _context13.stop();
-                            }
-                          }
-                        }, _callee13);
-                      }));
-
-                      function onOk() {
-                        return _onOk6.apply(this, arguments);
-                      }
-
-                      return onOk;
-                    }()
-                  });
-                } else {
-                  message.success(compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage));
-                }
-
-                _context14.next = 24;
+        var _ref14, _ref14$assignedValues, originalAssignedValues, onSuccess, overwriteValues, skipValidator, assignedValues, fieldNames, values, _parent$service6, _parent$service6$refr, _parent$__parent2, _parent$__parent2$ser, _parent$__parent2$ser2;
+        return _regeneratorRuntime().wrap(function _callee18$(_context18) {
+          while (1) switch (_context18.prev = _context18.next) {
+            case 0:
+              _ref14 = (_actionSchema$xActio6 = actionSchema === null || actionSchema === void 0 ? void 0 : actionSchema['x-action-settings']) !== null && _actionSchema$xActio6 !== void 0 ? _actionSchema$xActio6 : {}, _ref14$assignedValues = _ref14.assignedValues, originalAssignedValues = _ref14$assignedValues === void 0 ? {} : _ref14$assignedValues, onSuccess = _ref14.onSuccess, overwriteValues = _ref14.overwriteValues, skipValidator = _ref14.skipValidator;
+              assignedValues = parse(originalAssignedValues)({
+                currentTime: new Date(),
+                currentRecord: currentRecord,
+                currentUser: currentUser
+              });
+              if (skipValidator) {
+                _context18.next = 5;
+                break;
+              }
+              _context18.next = 5;
+              return form.submit();
+            case 5:
+              fieldNames = fields.map(function (field) {
+                return field.name;
+              });
+              values = getFormValues(filterByTk, field, form, fieldNames, getField, resource);
+              actionField.data = field.data || {};
+              actionField.data.loading = true;
+              _context18.prev = 9;
+              _context18.next = 12;
+              return resource.update({
+                filterByTk: filterByTk,
+                values: _objectSpread(_objectSpread(_objectSpread({}, values), overwriteValues), assignedValues),
+                updateAssociationValues: updateAssociationValues
+              });
+            case 12:
+              actionField.data.loading = false;
+              if (!(resource instanceof TableFieldResource)) {
+                __parent === null || __parent === void 0 ? void 0 : (_parent$__parent2 = __parent.__parent) === null || _parent$__parent2 === void 0 ? void 0 : (_parent$__parent2$ser = _parent$__parent2.service) === null || _parent$__parent2$ser === void 0 ? void 0 : (_parent$__parent2$ser2 = _parent$__parent2$ser.refresh) === null || _parent$__parent2$ser2 === void 0 ? void 0 : _parent$__parent2$ser2.call(_parent$__parent2$ser);
+              }
+              __parent === null || __parent === void 0 ? void 0 : (_parent$service6 = __parent.service) === null || _parent$service6 === void 0 ? void 0 : (_parent$service6$refr = _parent$service6.refresh) === null || _parent$service6$refr === void 0 ? void 0 : _parent$service6$refr.call(_parent$service6);
+              setVisible === null || setVisible === void 0 ? void 0 : setVisible(false);
+              if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage) {
+                _context18.next = 18;
                 break;
-
-              case 21:
-                _context14.prev = 21;
-                _context14.t0 = _context14["catch"](9);
-                actionField.data.loading = false;
-
-              case 24:
-              case "end":
-                return _context14.stop();
-            }
+              }
+              return _context18.abrupt("return");
+            case 18:
+              if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.manualClose) {
+                Modal.success({
+                  title: compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage),
+                  onOk: function () {
+                    var _onOk6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17() {
+                      return _regeneratorRuntime().wrap(function _callee17$(_context17) {
+                        while (1) switch (_context17.prev = _context17.next) {
+                          case 0:
+                            _context17.next = 2;
+                            return form.reset();
+                          case 2:
+                            if ((onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.redirecting) && (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.redirectTo)) {
+                              if (isURL(onSuccess.redirectTo)) {
+                                window.location.href = onSuccess.redirectTo;
+                              } else {
+                                history.push(onSuccess.redirectTo);
+                              }
+                            }
+                          case 3:
+                          case "end":
+                            return _context17.stop();
+                        }
+                      }, _callee17);
+                    }));
+                    function onOk() {
+                      return _onOk6.apply(this, arguments);
+                    }
+                    return onOk;
+                  }()
+                });
+              } else {
+                message.success(compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage));
+              }
+              _context18.next = 24;
+              break;
+            case 21:
+              _context18.prev = 21;
+              _context18.t0 = _context18["catch"](9);
+              actionField.data.loading = false;
+            case 24:
+            case "end":
+              return _context18.stop();
           }
-        }, _callee14, null, [[9, 21]]);
+        }, _callee18, null, [[9, 21]]);
       }))();
     }
   };
 };
 export var useDestroyActionProps = function useDestroyActionProps() {
   var filterByTk = useFilterByTk();
-
   var _useBlockRequestConte7 = useBlockRequestContext(),
-      resource = _useBlockRequestConte7.resource,
-      service = _useBlockRequestConte7.service,
-      block = _useBlockRequestConte7.block,
-      __parent = _useBlockRequestConte7.__parent;
-
+    resource = _useBlockRequestConte7.resource,
+    service = _useBlockRequestConte7.service,
+    block = _useBlockRequestConte7.block,
+    __parent = _useBlockRequestConte7.__parent;
   var _useActionContext4 = useActionContext(),
-      setVisible = _useActionContext4.setVisible;
-
+    setVisible = _useActionContext4.setVisible;
   return {
     onClick: function onClick() {
-      return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee15() {
-        var _service$refresh4;
-
-        var _parent$service7, _parent$service7$refr;
-
-        return regeneratorRuntime.wrap(function _callee15$(_context15) {
-          while (1) {
-            switch (_context15.prev = _context15.next) {
-              case 0:
-                _context15.next = 2;
-                return resource.destroy({
-                  filterByTk: filterByTk
-                });
-
-              case 2:
+      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19() {
+        var _service$data;
+        var _ref15, _ref15$count, count, _ref15$page, page, _ref15$pageSize, pageSize, _service$params2, _service$refresh4, _parent$service7, _parent$service7$refr;
+        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
+          while (1) switch (_context19.prev = _context19.next) {
+            case 0:
+              _context19.next = 2;
+              return resource.destroy({
+                filterByTk: filterByTk
+              });
+            case 2:
+              _ref15 = (service === null || service === void 0 ? void 0 : (_service$data = service.data) === null || _service$data === void 0 ? void 0 : _service$data.meta) || {}, _ref15$count = _ref15.count, count = _ref15$count === void 0 ? 0 : _ref15$count, _ref15$page = _ref15.page, page = _ref15$page === void 0 ? 0 : _ref15$page, _ref15$pageSize = _ref15.pageSize, pageSize = _ref15$pageSize === void 0 ? 0 : _ref15$pageSize;
+              if (count % pageSize === 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
+                }));
+              } else {
                 service === null || service === void 0 ? void 0 : (_service$refresh4 = service.refresh) === null || _service$refresh4 === void 0 ? void 0 : _service$refresh4.call(service);
-
-                if (block !== 'TableField') {
-                  __parent === null || __parent === void 0 ? void 0 : (_parent$service7 = __parent.service) === null || _parent$service7 === void 0 ? void 0 : (_parent$service7$refr = _parent$service7.refresh) === null || _parent$service7$refr === void 0 ? void 0 : _parent$service7$refr.call(_parent$service7);
-                  setVisible === null || setVisible === void 0 ? void 0 : setVisible(false);
-                }
-
-              case 4:
-              case "end":
-                return _context15.stop();
-            }
+              }
+              if (block !== 'TableField') {
+                __parent === null || __parent === void 0 ? void 0 : (_parent$service7 = __parent.service) === null || _parent$service7 === void 0 ? void 0 : (_parent$service7$refr = _parent$service7.refresh) === null || _parent$service7$refr === void 0 ? void 0 : _parent$service7$refr.call(_parent$service7);
+                setVisible === null || setVisible === void 0 ? void 0 : setVisible(false);
+              }
+            case 5:
+            case "end":
+              return _context19.stop();
           }
-        }, _callee15);
+        }, _callee19);
       }))();
     }
   };
 };
 export var useDetailPrintActionProps = function useDetailPrintActionProps() {
   var _useFormBlockContext2 = useFormBlockContext(),
-      formBlockRef = _useFormBlockContext2.formBlockRef;
-
+    formBlockRef = _useFormBlockContext2.formBlockRef;
   var printHandler = useReactToPrint({
     content: function content() {
       return formBlockRef.current;
@@ -1153,95 +1123,77 @@ export var useDetailPrintActionProps = function useDetailPrintActionProps() {
   });
   return {
     onClick: function onClick() {
-      return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee16() {
-        return regeneratorRuntime.wrap(function _callee16$(_context16) {
-          while (1) {
-            switch (_context16.prev = _context16.next) {
-              case 0:
-                printHandler();
-
-              case 1:
-              case "end":
-                return _context16.stop();
-            }
+      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20() {
+        return _regeneratorRuntime().wrap(function _callee20$(_context20) {
+          while (1) switch (_context20.prev = _context20.next) {
+            case 0:
+              printHandler();
+            case 1:
+            case "end":
+              return _context20.stop();
           }
-        }, _callee16);
+        }, _callee20);
       }))();
     }
   };
 };
 export var useBulkDestroyActionProps = function useBulkDestroyActionProps() {
   var _useBlockRequestConte8 = useBlockRequestContext(),
-      field = _useBlockRequestConte8.field;
-
+    field = _useBlockRequestConte8.field;
   var _useBlockRequestConte9 = useBlockRequestContext(),
-      resource = _useBlockRequestConte9.resource,
-      service = _useBlockRequestConte9.service;
-
+    resource = _useBlockRequestConte9.resource,
+    service = _useBlockRequestConte9.service;
   return {
     onClick: function onClick() {
-      return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee17() {
+      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21() {
         var _field$data2, _field$data2$selected, _field$data3, _service$refresh5;
-
-        return regeneratorRuntime.wrap(function _callee17$(_context17) {
-          while (1) {
-            switch (_context17.prev = _context17.next) {
-              case 0:
-                if (field === null || field === void 0 ? void 0 : (_field$data2 = field.data) === null || _field$data2 === void 0 ? void 0 : (_field$data2$selected = _field$data2.selectedRowKeys) === null || _field$data2$selected === void 0 ? void 0 : _field$data2$selected.length) {
-                  _context17.next = 2;
-                  break;
-                }
-
-                return _context17.abrupt("return");
-
-              case 2:
-                _context17.next = 4;
-                return resource.destroy({
-                  filterByTk: (_field$data3 = field.data) === null || _field$data3 === void 0 ? void 0 : _field$data3.selectedRowKeys
-                });
-
-              case 4:
-                field.data.selectedRowKeys = [];
-                service === null || service === void 0 ? void 0 : (_service$refresh5 = service.refresh) === null || _service$refresh5 === void 0 ? void 0 : _service$refresh5.call(service);
-
-              case 6:
-              case "end":
-                return _context17.stop();
-            }
+        return _regeneratorRuntime().wrap(function _callee21$(_context21) {
+          while (1) switch (_context21.prev = _context21.next) {
+            case 0:
+              if (field === null || field === void 0 ? void 0 : (_field$data2 = field.data) === null || _field$data2 === void 0 ? void 0 : (_field$data2$selected = _field$data2.selectedRowKeys) === null || _field$data2$selected === void 0 ? void 0 : _field$data2$selected.length) {
+                _context21.next = 2;
+                break;
+              }
+              return _context21.abrupt("return");
+            case 2:
+              _context21.next = 4;
+              return resource.destroy({
+                filterByTk: (_field$data3 = field.data) === null || _field$data3 === void 0 ? void 0 : _field$data3.selectedRowKeys
+              });
+            case 4:
+              field.data.selectedRowKeys = [];
+              service === null || service === void 0 ? void 0 : (_service$refresh5 = service.refresh) === null || _service$refresh5 === void 0 ? void 0 : _service$refresh5.call(service);
+            case 6:
+            case "end":
+              return _context21.stop();
           }
-        }, _callee17);
+        }, _callee21);
       }))();
     }
   };
 };
 export var useRefreshActionProps = function useRefreshActionProps() {
   var _useBlockRequestConte10 = useBlockRequestContext(),
-      service = _useBlockRequestConte10.service;
-
+    service = _useBlockRequestConte10.service;
   return {
     onClick: function onClick() {
-      return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee18() {
+      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22() {
         var _service$refresh6;
-
-        return regeneratorRuntime.wrap(function _callee18$(_context18) {
-          while (1) {
-            switch (_context18.prev = _context18.next) {
-              case 0:
-                service === null || service === void 0 ? void 0 : (_service$refresh6 = service.refresh) === null || _service$refresh6 === void 0 ? void 0 : _service$refresh6.call(service);
-
-              case 1:
-              case "end":
-                return _context18.stop();
-            }
+        return _regeneratorRuntime().wrap(function _callee22$(_context22) {
+          while (1) switch (_context22.prev = _context22.next) {
+            case 0:
+              service === null || service === void 0 ? void 0 : (_service$refresh6 = service.refresh) === null || _service$refresh6 === void 0 ? void 0 : _service$refresh6.call(service);
+            case 1:
+            case "end":
+              return _context22.stop();
           }
-        }, _callee18);
+        }, _callee22);
       }))();
     }
   };
 };
 export var useDetailsPaginationProps = function useDetailsPaginationProps() {
   var _ctx$service, _ctx$service$data, _ctx$service$data$met, _ctx$service2, _ctx$service2$data, _ctx$service2$data$me;
-
   var ctx = useDetailsBlockContext();
   var count = ((_ctx$service = ctx.service) === null || _ctx$service === void 0 ? void 0 : (_ctx$service$data = _ctx$service.data) === null || _ctx$service$data === void 0 ? void 0 : (_ctx$service$data$met = _ctx$service$data.meta) === null || _ctx$service$data$met === void 0 ? void 0 : _ctx$service$data$met.count) || 0;
   return {
@@ -1251,25 +1203,21 @@ export var useDetailsPaginationProps = function useDetailsPaginationProps() {
     total: count,
     pageSize: 1,
     onChange: function onChange(page) {
-      return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee19() {
+      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23() {
         var _ctx$service3, _ctx$service3$params;
-
         var params;
-        return regeneratorRuntime.wrap(function _callee19$(_context19) {
-          while (1) {
-            switch (_context19.prev = _context19.next) {
-              case 0:
-                params = (_ctx$service3 = ctx.service) === null || _ctx$service3 === void 0 ? void 0 : (_ctx$service3$params = _ctx$service3.params) === null || _ctx$service3$params === void 0 ? void 0 : _ctx$service3$params[0];
-                ctx.service.run(_objectSpread(_objectSpread({}, params), {}, {
-                  page: page
-                }));
-
-              case 2:
-              case "end":
-                return _context19.stop();
-            }
+        return _regeneratorRuntime().wrap(function _callee23$(_context23) {
+          while (1) switch (_context23.prev = _context23.next) {
+            case 0:
+              params = (_ctx$service3 = ctx.service) === null || _ctx$service3 === void 0 ? void 0 : (_ctx$service3$params = _ctx$service3.params) === null || _ctx$service3$params === void 0 ? void 0 : _ctx$service3$params[0];
+              ctx.service.run(_objectSpread(_objectSpread({}, params), {}, {
+                page: page
+              }));
+            case 2:
+            case "end":
+              return _context23.stop();
           }
-        }, _callee19);
+        }, _callee23);
       }))();
     },
     style: {
@@ -1277,4 +1225,177 @@ export var useDetailsPaginationProps = function useDetailsPaginationProps() {
       textAlign: 'center'
     }
   };
+};
+export var useAssociationFilterProps = function useAssociationFilterProps() {
+  var _fieldSchema$xCompon2, _fieldSchema$xCompon3, _field$componentProps, _field$componentProps2;
+  var collectionField = AssociationFilter.useAssociationField();
+  var _useBlockRequestConte11 = useBlockRequestContext(),
+    service = _useBlockRequestConte11.service,
+    blockProps = _useBlockRequestConte11.props;
+  var fieldSchema = useFieldSchema();
+  var valueKey = (collectionField === null || collectionField === void 0 ? void 0 : collectionField.targetKey) || 'id';
+  var labelKey = ((_fieldSchema$xCompon2 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon2 === void 0 ? void 0 : (_fieldSchema$xCompon3 = _fieldSchema$xCompon2.fieldNames) === null || _fieldSchema$xCompon3 === void 0 ? void 0 : _fieldSchema$xCompon3.label) || valueKey;
+  var field = useField();
+  var collectionFieldName = collectionField.name;
+  var _useRequest = useRequest({
+      resource: collectionField.target,
+      action: 'list',
+      params: _objectSpread({
+        fields: [labelKey, valueKey],
+        pageSize: 200,
+        page: 1
+      }, (_field$componentProps = field.componentProps) === null || _field$componentProps === void 0 ? void 0 : _field$componentProps.params)
+    }, {
+      refreshDeps: [labelKey, valueKey, JSON.stringify(((_field$componentProps2 = field.componentProps) === null || _field$componentProps2 === void 0 ? void 0 : _field$componentProps2.params) || {})],
+      debounceWait: 300
+    }),
+    data = _useRequest.data,
+    params = _useRequest.params,
+    run = _useRequest.run;
+  var list = (data === null || data === void 0 ? void 0 : data.data) || [];
+  var onSelected = function onSelected(value) {
+    var _service$params3, _service$params3$, _service$params4, _blockProps$params;
+    var filters = ((_service$params3 = service.params) === null || _service$params3 === void 0 ? void 0 : (_service$params3$ = _service$params3[1]) === null || _service$params3$ === void 0 ? void 0 : _service$params3$.filters) || {};
+    if (value.length) {
+      filters["af.".concat(collectionFieldName)] = _defineProperty({}, "".concat(collectionFieldName, ".").concat(valueKey, ".$in"), value);
+    } else {
+      delete filters["af.".concat(collectionFieldName)];
+    }
+    service.run(_objectSpread(_objectSpread({}, (_service$params4 = service.params) === null || _service$params4 === void 0 ? void 0 : _service$params4[0]), {}, {
+      pageSize: 200,
+      page: 1,
+      filter: mergeFilter([].concat(_toConsumableArray(Object.values(filters)), [blockProps === null || blockProps === void 0 ? void 0 : (_blockProps$params = blockProps.params) === null || _blockProps$params === void 0 ? void 0 : _blockProps$params.filter]))
+    }), {
+      filters: filters
+    });
+  };
+  var handleSearchInput = function handleSearchInput(e) {
+    run(_objectSpread(_objectSpread({}, params === null || params === void 0 ? void 0 : params[0]), {}, {
+      filter: _defineProperty({}, "".concat(labelKey, ".$includes"), e.target.value)
+    }));
+  };
+  return {
+    /** 渲染 Collapse 的列表数据 */
+    list: list,
+    onSelected: onSelected,
+    handleSearchInput: handleSearchInput,
+    params: params,
+    run: run
+  };
+};
+export var useOptionalFieldList = function useOptionalFieldList() {
+  var _useCollection4 = useCollection(),
+    _useCollection4$curre = _useCollection4.currentFields,
+    currentFields = _useCollection4$curre === void 0 ? [] : _useCollection4$curre;
+  return currentFields.filter(function (field) {
+    return isOptionalField(field) && field.uiSchema.enum;
+  });
+};
+var isOptionalField = function isOptionalField(field) {
+  var optionalInterfaces = ['select', 'multipleSelect', 'checkbox', 'checkboxGroup', 'chinaRegion'];
+  return optionalInterfaces.includes(field.interface);
+};
+export var useAssociationFilterBlockProps = function useAssociationFilterBlockProps() {
+  var collectionField = AssociationFilter.useAssociationField();
+  var fieldSchema = useFieldSchema();
+  var optionalFieldList = useOptionalFieldList();
+  var _useFilterBlock3 = useFilterBlock(),
+    getDataBlocks = _useFilterBlock3.getDataBlocks;
+  var collectionFieldName = collectionField.name;
+  var list, onSelected, handleSearchInput, params, run, data, valueKey, labelKey, filterKey;
+  if (isOptionalField(fieldSchema)) {
+    var _field$uiSchema;
+    var field = optionalFieldList.find(function (field) {
+      return field.name === fieldSchema.name;
+    });
+    var operatorMap = {
+      select: '$in',
+      multipleSelect: '$anyOf',
+      checkbox: '$in',
+      checkboxGroup: '$anyOf'
+    };
+    var _list = (field === null || field === void 0 ? void 0 : (_field$uiSchema = field.uiSchema) === null || _field$uiSchema === void 0 ? void 0 : _field$uiSchema.enum) || [];
+    valueKey = 'value';
+    labelKey = 'label';
+    list = _list;
+    params = {};
+    run = function run() {};
+    filterKey = "".concat(field.name, ".").concat(operatorMap[field.interface]);
+    handleSearchInput = function handleSearchInput(e) {
+      // TODO: 列表没有刷新，在这个 hook 中使用 useState 会产生 re-render 次数过多的错误
+      var value = e.target.value;
+      if (!value) {
+        list = _list;
+        return;
+      }
+      list = _list.filter(function (item) {
+        return item.label.includes(value);
+      });
+    };
+  } else {
+    var _fieldSchema$xCompon4, _fieldSchema$xCompon5, _data;
+    valueKey = (collectionField === null || collectionField === void 0 ? void 0 : collectionField.targetKey) || 'id';
+    labelKey = ((_fieldSchema$xCompon4 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon4 === void 0 ? void 0 : (_fieldSchema$xCompon5 = _fieldSchema$xCompon4.fieldNames) === null || _fieldSchema$xCompon5 === void 0 ? void 0 : _fieldSchema$xCompon5.label) || valueKey;
+    var _useRequest2 = useRequest({
+      resource: collectionField.target,
+      action: 'list',
+      params: {
+        fields: [labelKey, valueKey],
+        pageSize: 200,
+        page: 1
+      }
+    }, {
+      refreshDeps: [labelKey, valueKey],
+      debounceWait: 300
+    });
+    data = _useRequest2.data;
+    params = _useRequest2.params;
+    run = _useRequest2.run;
+    filterKey = "".concat(collectionFieldName, ".").concat(valueKey, ".$in");
+    list = ((_data = data) === null || _data === void 0 ? void 0 : _data.data) || [];
+    handleSearchInput = function handleSearchInput(e) {
+      var _params;
+      run(_objectSpread(_objectSpread({}, (_params = params) === null || _params === void 0 ? void 0 : _params[0]), {}, {
+        filter: _defineProperty({}, "".concat(labelKey, ".$includes"), e.target.value)
+      }));
+    };
+  }
+  onSelected = function onSelected(value) {
+    var _findFilterTargets3 = findFilterTargets(fieldSchema),
+      targets = _findFilterTargets3.targets,
+      uid = _findFilterTargets3.uid;
+    getDataBlocks().forEach(function (block) {
+      var _block$service$params7, _block$service$params8, _block$service$params9;
+      var target = targets.find(function (target) {
+        return target.uid === block.uid;
+      });
+      if (!target) return;
+      var key = "".concat(uid).concat(fieldSchema.name);
+      var param = ((_block$service$params7 = block.service.params) === null || _block$service$params7 === void 0 ? void 0 : _block$service$params7[0]) || {};
+      // 保留原有的 filter
+      var storedFilter = ((_block$service$params8 = block.service.params) === null || _block$service$params8 === void 0 ? void 0 : (_block$service$params9 = _block$service$params8[1]) === null || _block$service$params9 === void 0 ? void 0 : _block$service$params9.filters) || {};
+      if (value.length) {
+        storedFilter[key] = _defineProperty({}, filterKey, value);
+      } else {
+        delete storedFilter[key];
+      }
+      var mergedFilter = mergeFilter([].concat(_toConsumableArray(Object.values(storedFilter)), [block.defaultFilter]));
+      return block.doFilter(_objectSpread(_objectSpread({}, param), {}, {
+        page: 1,
+        filter: mergedFilter
+      }), {
+        filters: storedFilter
+      });
+    });
+  };
+  return {
+    /** 渲染 Collapse 的列表数据 */
+    list: list,
+    onSelected: onSelected,
+    handleSearchInput: handleSearchInput,
+    params: params,
+    run: run,
+    valueKey: valueKey,
+    labelKey: labelKey
+  };
 };