@nocobase/client 0.9.2-alpha.3 → 0.9.3-alpha.1

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

@@ -1,3 +1,4 @@
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 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); }
@@ -13,13 +14,13 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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 { SchemaExpressionScopeContext, useField, useFieldSchema, useForm } from '@formily/react';
+import { Schema, SchemaExpressionScopeContext, useField, useFieldSchema, useForm } from '@formily/react';
+import { parse } from '@nocobase/utils/client';
 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 { useContext, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useHistory } from 'react-router-dom';
 import { useReactToPrint } from 'react-to-print';
@@ -173,7 +174,7 @@ export var useCreateActionProps = function useCreateActionProps() {
     onClick: function onClick() {
       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;
+        var fieldNames, _ref, _ref$assignedValues, originalAssignedValues, onSuccess, overwriteValues, skipValidator, addChild, assignedValues, values, _treeParentField$name, _treeParentField$fore, treeParentField, _parent$service, _parent$service$refre, data;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -208,15 +209,17 @@ export var useCreateActionProps = function useCreateActionProps() {
                 values: _objectSpread(_objectSpread(_objectSpread({}, values), overwriteValues), assignedValues)
               });
             case 14:
+              data = _context2.sent;
               actionField.data.loading = false;
+              actionField.data.data = data;
               __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;
+                _context2.next = 21;
                 break;
               }
               return _context2.abrupt("return");
-            case 19:
+            case 21:
               if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.manualClose) {
                 Modal.success({
                   title: compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage),
@@ -250,17 +253,102 @@ export var useCreateActionProps = function useCreateActionProps() {
               } else {
                 message.success(compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage));
               }
-              _context2.next = 25;
+              _context2.next = 27;
               break;
-            case 22:
-              _context2.prev = 22;
+            case 24:
+              _context2.prev = 24;
               _context2.t0 = _context2["catch"](11);
               actionField.data.loading = false;
-            case 25:
+            case 27:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, null, [[11, 22]]);
+        }, _callee2, null, [[11, 24]]);
+      }))();
+    }
+  };
+};
+export var useAssociationCreateActionProps = function useAssociationCreateActionProps() {
+  var _currentUserContext$d2;
+  var form = useForm();
+  var _useBlockRequestConte2 = useBlockRequestContext(),
+    field = _useBlockRequestConte2.field,
+    resource = _useBlockRequestConte2.resource;
+  var _useActionContext2 = useActionContext(),
+    setVisible = _useActionContext2.setVisible,
+    fieldSchema = _useActionContext2.fieldSchema;
+  var actionSchema = useFieldSchema();
+  var actionField = useField();
+  var _useCollection2 = useCollection(),
+    fields = _useCollection2.fields,
+    getField = _useCollection2.getField,
+    getTreeParentField = _useCollection2.getTreeParentField;
+  var compile = useCompile();
+  var filterByTk = useFilterByTk();
+  var currentRecord = useRecord();
+  var currentUserContext = useCurrentUserContext();
+  var currentUser = currentUserContext === null || currentUserContext === void 0 ? void 0 : (_currentUserContext$d2 = currentUserContext.data) === null || _currentUserContext$d2 === void 0 ? void 0 : _currentUserContext$d2.data;
+  return {
+    onClick: function onClick() {
+      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+        var _actionSchema$xActio2, _fieldSchema$xCompon2;
+        var fieldNames, _ref2, _ref2$assignedValues, originalAssignedValues, onSuccess, overwriteValues, skipValidator, addChild, assignedValues, values, _treeParentField$name2, _treeParentField$fore2, treeParentField, data;
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              fieldNames = fields.map(function (field) {
+                return field.name;
+              });
+              _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, overwriteValues = _ref2.overwriteValues, skipValidator = _ref2.skipValidator;
+              addChild = fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon2 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon2 === void 0 ? void 0 : _fieldSchema$xCompon2.addChild;
+              assignedValues = parse(originalAssignedValues)({
+                currentTime: new Date(),
+                currentRecord: currentRecord,
+                currentUser: currentUser
+              });
+              if (skipValidator) {
+                _context3.next = 7;
+                break;
+              }
+              _context3.next = 7;
+              return form.submit();
+            case 7:
+              values = getFormValues(filterByTk, field, form, fieldNames, getField, resource);
+              if (addChild) {
+                treeParentField = getTreeParentField();
+                values[(_treeParentField$name2 = treeParentField === null || treeParentField === void 0 ? void 0 : treeParentField.name) !== null && _treeParentField$name2 !== void 0 ? _treeParentField$name2 : 'parent'] = currentRecord;
+                values[(_treeParentField$fore2 = treeParentField === null || treeParentField === void 0 ? void 0 : treeParentField.foreignKey) !== null && _treeParentField$fore2 !== void 0 ? _treeParentField$fore2 : 'parentId'] = currentRecord.id;
+              }
+              actionField.data = field.data || {};
+              actionField.data.loading = true;
+              _context3.prev = 11;
+              _context3.next = 14;
+              return resource.create({
+                values: _objectSpread(_objectSpread(_objectSpread({}, values), overwriteValues), assignedValues)
+              });
+            case 14:
+              data = _context3.sent;
+              actionField.data.loading = false;
+              actionField.data.data = data;
+              setVisible === null || setVisible === void 0 ? void 0 : setVisible(false);
+              if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage) {
+                _context3.next = 20;
+                break;
+              }
+              return _context3.abrupt("return");
+            case 20:
+              message.success(compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage));
+              _context3.next = 26;
+              break;
+            case 23:
+              _context3.prev = 23;
+              _context3.t0 = _context3["catch"](11);
+              actionField.data.loading = false;
+            case 26:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3, null, [[11, 23]]);
       }))();
     }
   };
@@ -292,37 +380,37 @@ export var useFilterBlockActionProps = function useFilterBlockActionProps() {
   var fieldSchema = useFieldSchema();
   var _useFilterBlock = useFilterBlock(),
     getDataBlocks = _useFilterBlock.getDataBlocks;
-  var _useCollection2 = useCollection(),
-    name = _useCollection2.name;
+  var _useCollection3 = useCollection(),
+    name = _useCollection3.name;
   var _useCollectionManager = useCollectionManager(),
     getCollectionJoinField = _useCollectionManager.getCollectionJoinField;
   actionField.data = actionField.data || {};
   return {
     onClick: function onClick() {
-      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
         var _findFilterTargets, _findFilterTargets$ta, targets, uid;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.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;
+              _context5.prev = 2;
+              _context5.next = 5;
               return Promise.all(getDataBlocks().map( /*#__PURE__*/function () {
-                var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(block) {
+                var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(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) {
+                  return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+                    while (1) switch (_context4.prev = _context4.next) {
                       case 0:
                         target = targets.find(function (target) {
                           return target.uid === block.uid;
                         });
                         if (target) {
-                          _context3.next = 3;
+                          _context4.next = 3;
                           break;
                         }
-                        return _context3.abrupt("return");
+                        return _context4.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) || {};
@@ -330,7 +418,7 @@ export var useFilterBlockActionProps = function useFilterBlockActionProps() {
                         mergedFilter = mergeFilter([].concat(_toConsumableArray(Object.values(storedFilter).map(function (filter) {
                           return removeNullCondition(filter);
                         })), [block.defaultFilter]));
-                        return _context3.abrupt("return", block.doFilter(_objectSpread(_objectSpread({}, param), {}, {
+                        return _context4.abrupt("return", block.doFilter(_objectSpread(_objectSpread({}, param), {}, {
                           page: 1,
                           filter: mergedFilter
                         }), {
@@ -338,28 +426,28 @@ export var useFilterBlockActionProps = function useFilterBlockActionProps() {
                         }));
                       case 8:
                       case "end":
-                        return _context3.stop();
+                        return _context4.stop();
                     }
-                  }, _callee3);
+                  }, _callee4);
                 }));
                 return function (_x) {
-                  return _ref2.apply(this, arguments);
+                  return _ref3.apply(this, arguments);
                 };
               }()));
             case 5:
               actionField.data.loading = false;
-              _context4.next = 12;
+              _context5.next = 12;
               break;
             case 8:
-              _context4.prev = 8;
-              _context4.t0 = _context4["catch"](2);
-              console.error(_context4.t0);
+              _context5.prev = 8;
+              _context5.t0 = _context5["catch"](2);
+              console.error(_context5.t0);
               actionField.data.loading = false;
             case 12:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4, null, [[2, 8]]);
+        }, _callee5, null, [[2, 8]]);
       }))();
     }
   };
@@ -373,37 +461,37 @@ export var useResetBlockActionProps = function useResetBlockActionProps() {
   actionField.data = actionField.data || {};
   return {
     onClick: function onClick() {
-      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
         var _findFilterTargets2, targets, uid;
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
               _findFilterTargets2 = findFilterTargets(fieldSchema), targets = _findFilterTargets2.targets, uid = _findFilterTargets2.uid;
               form.reset();
               actionField.data.loading = true;
-              _context6.prev = 3;
-              _context6.next = 6;
+              _context7.prev = 3;
+              _context7.next = 6;
               return Promise.all(getDataBlocks().map( /*#__PURE__*/function () {
-                var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(block) {
+                var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(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) {
+                  return _regeneratorRuntime().wrap(function _callee6$(_context6) {
+                    while (1) switch (_context6.prev = _context6.next) {
                       case 0:
                         target = targets.find(function (target) {
                           return target.uid === block.uid;
                         });
                         if (target) {
-                          _context5.next = 3;
+                          _context6.next = 3;
                           break;
                         }
-                        return _context5.abrupt("return");
+                        return _context6.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), {}, {
+                        return _context6.abrupt("return", block.doFilter(_objectSpread(_objectSpread({}, param), {}, {
                           page: 1,
                           filter: mergedFilter
                         }), {
@@ -411,67 +499,67 @@ export var useResetBlockActionProps = function useResetBlockActionProps() {
                         }));
                       case 8:
                       case "end":
-                        return _context5.stop();
+                        return _context6.stop();
                     }
-                  }, _callee5);
+                  }, _callee6);
                 }));
                 return function (_x2) {
-                  return _ref3.apply(this, arguments);
+                  return _ref4.apply(this, arguments);
                 };
               }()));
             case 6:
               actionField.data.loading = false;
-              _context6.next = 12;
+              _context7.next = 12;
               break;
             case 9:
-              _context6.prev = 9;
-              _context6.t0 = _context6["catch"](3);
+              _context7.prev = 9;
+              _context7.t0 = _context7["catch"](3);
               actionField.data.loading = false;
             case 12:
             case "end":
-              return _context6.stop();
+              return _context7.stop();
           }
-        }, _callee6, null, [[3, 9]]);
+        }, _callee7, null, [[3, 9]]);
       }))();
     }
   };
 };
 export var useCustomizeUpdateActionProps = function useCustomizeUpdateActionProps() {
-  var _currentUserContext$d2;
-  var _useBlockRequestConte2 = useBlockRequestContext(),
-    resource = _useBlockRequestConte2.resource,
-    __parent = _useBlockRequestConte2.__parent,
-    service = _useBlockRequestConte2.service;
+  var _currentUserContext$d3;
+  var _useBlockRequestConte3 = useBlockRequestContext(),
+    resource = _useBlockRequestConte3.resource,
+    __parent = _useBlockRequestConte3.__parent,
+    service = _useBlockRequestConte3.service;
   var filterByTk = useFilterByTk();
   var actionSchema = useFieldSchema();
   var currentRecord = useRecord();
   var currentUserContext = useCurrentUserContext();
-  var currentUser = currentUserContext === null || currentUserContext === void 0 ? void 0 : (_currentUserContext$d2 = currentUserContext.data) === null || _currentUserContext$d2 === void 0 ? void 0 : _currentUserContext$d2.data;
+  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 form = useForm();
   return {
     onClick: function onClick() {
-      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
-        var _actionSchema$xActio2, _service$refresh;
-        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) {
+      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
+        var _actionSchema$xActio3, _service$refresh;
+        var _ref5, _ref5$assignedValues, originalAssignedValues, onSuccess, skipValidator, assignedValues, _parent$service2, _parent$service2$refr;
+        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
+          while (1) switch (_context9.prev = _context9.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;
+              _ref5 = (_actionSchema$xActio3 = actionSchema === null || actionSchema === void 0 ? void 0 : actionSchema['x-action-settings']) !== null && _actionSchema$xActio3 !== void 0 ? _actionSchema$xActio3 : {}, _ref5$assignedValues = _ref5.assignedValues, originalAssignedValues = _ref5$assignedValues === void 0 ? {} : _ref5$assignedValues, onSuccess = _ref5.onSuccess, skipValidator = _ref5.skipValidator;
               assignedValues = parse(originalAssignedValues)({
                 currentTime: new Date(),
                 currentRecord: currentRecord,
                 currentUser: currentUser
               });
               if (!(skipValidator === false)) {
-                _context8.next = 5;
+                _context9.next = 5;
                 break;
               }
-              _context8.next = 5;
+              _context9.next = 5;
               return form.submit();
             case 5:
-              _context8.next = 7;
+              _context9.next = 7;
               return resource.update({
                 filterByTk: filterByTk,
                 values: _objectSpread({}, assignedValues)
@@ -482,18 +570,18 @@ export var useCustomizeUpdateActionProps = function useCustomizeUpdateActionProp
                 __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;
+                _context9.next = 11;
                 break;
               }
-              return _context8.abrupt("return");
+              return _context9.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) {
+                    var _onOk2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+                      return _regeneratorRuntime().wrap(function _callee8$(_context8) {
+                        while (1) switch (_context8.prev = _context8.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)) {
@@ -504,9 +592,9 @@ export var useCustomizeUpdateActionProps = function useCustomizeUpdateActionProp
                             }
                           case 1:
                           case "end":
-                            return _context7.stop();
+                            return _context8.stop();
                         }
-                      }, _callee7);
+                      }, _callee8);
                     }));
                     function onOk() {
                       return _onOk2.apply(this, arguments);
@@ -519,27 +607,27 @@ export var useCustomizeUpdateActionProps = function useCustomizeUpdateActionProp
               }
             case 12:
             case "end":
-              return _context8.stop();
+              return _context9.stop();
           }
-        }, _callee8);
+        }, _callee9);
       }))();
     }
   };
 };
 export var useCustomizeBulkUpdateActionProps = function useCustomizeBulkUpdateActionProps() {
-  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;
+  var _ref6, _tableBlockContext$fi, _tableBlockContext$fi2, _tableBlockContext$fi3, _currentUserContext$d4;
+  var _useBlockRequestConte4 = useBlockRequestContext(),
+    field = _useBlockRequestConte4.field,
+    resource = _useBlockRequestConte4.resource,
+    __parent = _useBlockRequestConte4.__parent,
+    service = _useBlockRequestConte4.service;
   var expressionScope = useContext(SchemaExpressionScopeContext);
   var actionSchema = useFieldSchema();
   var tableBlockContext = useTableBlockContext();
   var rowKey = tableBlockContext.rowKey;
-  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 selectedRecordKeys = (_ref6 = (_tableBlockContext$fi = (_tableBlockContext$fi2 = tableBlockContext.field) === null || _tableBlockContext$fi2 === void 0 ? void 0 : (_tableBlockContext$fi3 = _tableBlockContext$fi2.data) === null || _tableBlockContext$fi3 === void 0 ? void 0 : _tableBlockContext$fi3.selectedRowKeys) !== null && _tableBlockContext$fi !== void 0 ? _tableBlockContext$fi : expressionScope === null || expressionScope === void 0 ? void 0 : expressionScope.selectedRecordKeys) !== null && _ref6 !== void 0 ? _ref6 : {};
   var currentUserContext = 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 currentUser = currentUserContext === null || currentUserContext === void 0 ? void 0 : (_currentUserContext$d4 = currentUserContext.data) === null || _currentUserContext$d4 === void 0 ? void 0 : _currentUserContext$d4.data;
   var history = useHistory();
   var compile = useCompile();
   var _useTranslation2 = useTranslation(),
@@ -547,13 +635,13 @@ export var useCustomizeBulkUpdateActionProps = function useCustomizeBulkUpdateAc
   var actionField = useField();
   return {
     onClick: function onClick() {
-      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
-        var _actionSchema$xActio3;
-        var _ref6, _ref6$assignedValues, originalAssignedValues, onSuccess, updateMode, assignedValues;
-        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
+      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
+        var _actionSchema$xActio4;
+        var _ref7, _ref7$assignedValues, originalAssignedValues, onSuccess, updateMode, assignedValues;
+        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+          while (1) switch (_context13.prev = _context13.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;
+              _ref7 = (_actionSchema$xActio4 = actionSchema === null || actionSchema === void 0 ? void 0 : actionSchema['x-action-settings']) !== null && _actionSchema$xActio4 !== void 0 ? _actionSchema$xActio4 : {}, _ref7$assignedValues = _ref7.assignedValues, originalAssignedValues = _ref7$assignedValues === void 0 ? {} : _ref7$assignedValues, onSuccess = _ref7.onSuccess, updateMode = _ref7.updateMode;
               actionField.data = field.data || {};
               actionField.data.loading = true;
               assignedValues = parse(originalAssignedValues)({
@@ -564,29 +652,29 @@ export var useCustomizeBulkUpdateActionProps = function useCustomizeBulkUpdateAc
                 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() {
+                  return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
                     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) {
+                    var _ref8, filter, updateData, _parent$service3, _parent$service3$refr;
+                    return _regeneratorRuntime().wrap(function _callee11$(_context11) {
+                      while (1) switch (_context11.prev = _context11.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;
+                          _ref8 = (_service$params$ = (_service$params = service.params) === null || _service$params === void 0 ? void 0 : _service$params[0]) !== null && _service$params$ !== void 0 ? _service$params$ : {}, filter = _ref8.filter;
                           updateData = {
                             values: _objectSpread({}, assignedValues),
                             filter: filter,
                             forceUpdate: false
                           };
                           if (!(updateMode === 'selected')) {
-                            _context10.next = 8;
+                            _context11.next = 8;
                             break;
                           }
                           if (selectedRecordKeys === null || selectedRecordKeys === void 0 ? void 0 : selectedRecordKeys.length) {
-                            _context10.next = 7;
+                            _context11.next = 7;
                             break;
                           }
                           message.error(t('Please select the records to be updated'));
                           actionField.data.loading = false;
-                          return _context10.abrupt("return");
+                          return _context11.abrupt("return");
                         case 7:
                           updateData.filter = {
                             $and: [_defineProperty({}, rowKey || 'id', {
@@ -597,37 +685,37 @@ export var useCustomizeBulkUpdateActionProps = function useCustomizeBulkUpdateAc
                           if (!updateData.filter) {
                             updateData.forceUpdate = true;
                           }
-                          _context10.prev = 9;
-                          _context10.next = 12;
+                          _context11.prev = 9;
+                          _context11.next = 12;
                           return resource.update(updateData);
                         case 12:
-                          _context10.next = 16;
+                          _context11.next = 16;
                           break;
                         case 14:
-                          _context10.prev = 14;
-                          _context10.t0 = _context10["catch"](9);
+                          _context11.prev = 14;
+                          _context11.t0 = _context11["catch"](9);
                         case 16:
-                          _context10.prev = 16;
+                          _context11.prev = 16;
                           actionField.data.loading = false;
-                          return _context10.finish(16);
+                          return _context11.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;
+                            _context11.next = 23;
                             break;
                           }
-                          return _context10.abrupt("return");
+                          return _context11.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) {
+                                var _onOk3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
+                                  return _regeneratorRuntime().wrap(function _callee10$(_context10) {
+                                    while (1) switch (_context10.prev = _context10.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)) {
@@ -638,9 +726,9 @@ export var useCustomizeBulkUpdateActionProps = function useCustomizeBulkUpdateAc
                                         }
                                       case 1:
                                       case "end":
-                                        return _context9.stop();
+                                        return _context10.stop();
                                     }
-                                  }, _callee9);
+                                  }, _callee10);
                                 }));
                                 function onOk() {
                                   return _onOk3.apply(this, arguments);
@@ -653,43 +741,43 @@ export var useCustomizeBulkUpdateActionProps = function useCustomizeBulkUpdateAc
                           }
                         case 24:
                         case "end":
-                          return _context10.stop();
+                          return _context11.stop();
                       }
-                    }, _callee10, null, [[9, 14, 16, 19]]);
+                    }, _callee11, 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) {
+                  return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
+                    return _regeneratorRuntime().wrap(function _callee12$(_context12) {
+                      while (1) switch (_context12.prev = _context12.next) {
                         case 0:
                           actionField.data.loading = false;
                         case 1:
                         case "end":
-                          return _context11.stop();
+                          return _context12.stop();
                       }
-                    }, _callee11);
+                    }, _callee12);
                   }))();
                 }
               });
             case 5:
             case "end":
-              return _context12.stop();
+              return _context13.stop();
           }
-        }, _callee12);
+        }, _callee13);
       }))();
     }
   };
 };
 export var useCustomizeBulkEditActionProps = function useCustomizeBulkEditActionProps() {
-  var _ref9, _tableBlockContext$fi4, _tableBlockContext$fi5, _tableBlockContext$fi6;
+  var _ref10, _tableBlockContext$fi4, _tableBlockContext$fi5, _tableBlockContext$fi6;
   var form = useForm();
   var _useTranslation3 = useTranslation(),
     t = _useTranslation3.t;
-  var _useBlockRequestConte4 = useBlockRequestContext(),
-    field = _useBlockRequestConte4.field,
-    resource = _useBlockRequestConte4.resource,
-    __parent = _useBlockRequestConte4.__parent;
+  var _useBlockRequestConte5 = useBlockRequestContext(),
+    field = _useBlockRequestConte5.field,
+    resource = _useBlockRequestConte5.resource,
+    __parent = _useBlockRequestConte5.__parent;
   var expressionScope = useContext(SchemaExpressionScopeContext);
   var actionContext = useActionContext();
   var history = useHistory();
@@ -697,24 +785,24 @@ export var useCustomizeBulkEditActionProps = function useCustomizeBulkEditAction
   var actionField = useField();
   var tableBlockContext = useTableBlockContext();
   var rowKey = tableBlockContext.rowKey;
-  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 selectedRecordKeys = (_ref10 = (_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 && _ref10 !== void 0 ? _ref10 : {};
   var setVisible = actionContext.setVisible,
     actionSchema = actionContext.fieldSchema;
   return {
     onClick: function onClick() {
-      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
-        var _actionSchema$xActio4, _parent$service$para, _parent$service$para2;
-        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) {
+      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
+        var _actionSchema$xActio5, _parent$service$para, _parent$service$para2;
+        var _ref11, onSuccess, skipValidator, updateMode, _ref12, filter, values, key, value, _parent$service4, _parent$service4$refr, updateData, _parent$__parent, _parent$__parent$serv, _parent$__parent$serv2;
+        return _regeneratorRuntime().wrap(function _callee15$(_context15) {
+          while (1) switch (_context15.prev = _context15.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;
+              _ref11 = (_actionSchema$xActio5 = actionSchema === null || actionSchema === void 0 ? void 0 : actionSchema['x-action-settings']) !== null && _actionSchema$xActio5 !== void 0 ? _actionSchema$xActio5 : {}, onSuccess = _ref11.onSuccess, skipValidator = _ref11.skipValidator, updateMode = _ref11.updateMode;
+              _ref12 = (_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 = _ref12.filter;
               if (skipValidator) {
-                _context14.next = 5;
+                _context15.next = 5;
                 break;
               }
-              _context14.next = 5;
+              _context15.next = 5;
               return form.submit();
             case 5:
               values = cloneDeep(form.values);
@@ -732,22 +820,22 @@ export var useCustomizeBulkEditActionProps = function useCustomizeBulkEditAction
                   }
                 }
               }
-              _context14.prev = 9;
+              _context15.prev = 9;
               updateData = {
                 values: values,
                 filter: filter,
                 forceUpdate: false
               };
               if (!(updateMode === 'selected')) {
-                _context14.next = 16;
+                _context15.next = 16;
                 break;
               }
               if (selectedRecordKeys === null || selectedRecordKeys === void 0 ? void 0 : selectedRecordKeys.length) {
-                _context14.next = 15;
+                _context15.next = 15;
                 break;
               }
               message.error(t('Please select the records to be updated'));
-              return _context14.abrupt("return");
+              return _context15.abrupt("return");
             case 15:
               updateData.filter = {
                 $and: [_defineProperty({}, rowKey || 'id', {
@@ -758,7 +846,7 @@ export var useCustomizeBulkEditActionProps = function useCustomizeBulkEditAction
               if (!updateData.filter) {
                 updateData.forceUpdate = true;
               }
-              _context14.next = 19;
+              _context15.next = 19;
               return resource.update(updateData);
             case 19:
               actionField.data.loading = false;
@@ -768,20 +856,20 @@ export var useCustomizeBulkEditActionProps = function useCustomizeBulkEditAction
               __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;
+                _context15.next = 25;
                 break;
               }
-              return _context14.abrupt("return");
+              return _context15.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) {
+                    var _onOk4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
+                      return _regeneratorRuntime().wrap(function _callee14$(_context14) {
+                        while (1) switch (_context14.prev = _context14.next) {
                           case 0:
-                            _context13.next = 2;
+                            _context14.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)) {
@@ -793,9 +881,9 @@ export var useCustomizeBulkEditActionProps = function useCustomizeBulkEditAction
                             }
                           case 3:
                           case "end":
-                            return _context13.stop();
+                            return _context14.stop();
                         }
-                      }, _callee13);
+                      }, _callee14);
                     }));
                     function onOk() {
                       return _onOk4.apply(this, arguments);
@@ -807,61 +895,61 @@ export var useCustomizeBulkEditActionProps = function useCustomizeBulkEditAction
                 message.success(compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage));
               }
             case 26:
-              _context14.prev = 26;
+              _context15.prev = 26;
               actionField.data.loading = false;
-              return _context14.finish(26);
+              return _context15.finish(26);
             case 29:
             case "end":
-              return _context14.stop();
+              return _context15.stop();
           }
-        }, _callee14, null, [[9,, 26, 29]]);
+        }, _callee15, null, [[9,, 26, 29]]);
       }))();
     }
   };
 };
 export var useCustomizeRequestActionProps = function useCustomizeRequestActionProps() {
-  var _currentUserContext$d4;
+  var _currentUserContext$d5;
   var apiClient = useAPIClient();
   var history = useHistory();
   var filterByTk = useFilterByTk();
   var actionSchema = useFieldSchema();
   var compile = useCompile();
   var form = useForm();
-  var _useCollection3 = useCollection(),
-    fields = _useCollection3.fields,
-    getField = _useCollection3.getField;
-  var _useBlockRequestConte5 = useBlockRequestContext(),
-    field = _useBlockRequestConte5.field,
-    resource = _useBlockRequestConte5.resource,
-    __parent = _useBlockRequestConte5.__parent,
-    service = _useBlockRequestConte5.service;
+  var _useCollection4 = useCollection(),
+    fields = _useCollection4.fields,
+    getField = _useCollection4.getField;
+  var _useBlockRequestConte6 = useBlockRequestContext(),
+    field = _useBlockRequestConte6.field,
+    resource = _useBlockRequestConte6.resource,
+    __parent = _useBlockRequestConte6.__parent,
+    service = _useBlockRequestConte6.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 currentUser = currentUserContext === null || currentUserContext === void 0 ? void 0 : (_currentUserContext$d5 = currentUserContext.data) === null || _currentUserContext$d5 === void 0 ? void 0 : _currentUserContext$d5.data;
   var actionField = useField();
-  var _useActionContext2 = useActionContext(),
-    setVisible = _useActionContext2.setVisible;
+  var _useActionContext3 = useActionContext(),
+    setVisible = _useActionContext3.setVisible;
   return {
     onClick: function onClick() {
-      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
-        var _actionSchema$xActio5;
-        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) {
+      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17() {
+        var _actionSchema$xActio6;
+        var _ref14, skipValidator, onSuccess, requestSettings, xAction, headers, params, data, methods, fieldNames, values, requestBody, _service$refresh3, _parent$service5, _parent$service5$refr;
+        return _regeneratorRuntime().wrap(function _callee17$(_context17) {
+          while (1) switch (_context17.prev = _context17.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;
+              _ref14 = (_actionSchema$xActio6 = actionSchema === null || actionSchema === void 0 ? void 0 : actionSchema['x-action-settings']) !== null && _actionSchema$xActio6 !== void 0 ? _actionSchema$xActio6 : {}, skipValidator = _ref14.skipValidator, onSuccess = _ref14.onSuccess, requestSettings = _ref14.requestSettings;
               xAction = actionSchema === null || actionSchema === void 0 ? void 0 : actionSchema['x-action'];
               if (requestSettings['url']) {
-                _context16.next = 4;
+                _context17.next = 4;
                 break;
               }
-              return _context16.abrupt("return");
+              return _context17.abrupt("return");
             case 4:
               if (!(skipValidator !== true && xAction === 'customize:form:request')) {
-                _context16.next = 7;
+                _context17.next = 7;
                 break;
               }
-              _context16.next = 7;
+              _context17.next = 7;
               return form.submit();
             case 7:
               headers = requestSettings['headers'] ? JSON.parse(requestSettings['headers']) : {};
@@ -896,8 +984,8 @@ export var useCustomizeRequestActionProps = function useCustomizeRequestActionPr
               };
               actionField.data = field.data || {};
               actionField.data.loading = true;
-              _context16.prev = 15;
-              _context16.next = 18;
+              _context17.prev = 15;
+              _context17.next = 18;
               return apiClient.request(_objectSpread({}, requestBody));
             case 18:
               actionField.data.loading = false;
@@ -909,18 +997,18 @@ export var useCustomizeRequestActionProps = function useCustomizeRequestActionPr
                 setVisible === null || setVisible === void 0 ? void 0 : setVisible(false);
               }
               if (onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage) {
-                _context16.next = 24;
+                _context17.next = 24;
                 break;
               }
-              return _context16.abrupt("return");
+              return _context17.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) {
+                    var _onOk5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee16() {
+                      return _regeneratorRuntime().wrap(function _callee16$(_context16) {
+                        while (1) switch (_context16.prev = _context16.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)) {
@@ -931,9 +1019,9 @@ export var useCustomizeRequestActionProps = function useCustomizeRequestActionPr
                             }
                           case 1:
                           case "end":
-                            return _context15.stop();
+                            return _context16.stop();
                         }
-                      }, _callee15);
+                      }, _callee16);
                     }));
                     function onOk() {
                       return _onOk5.apply(this, arguments);
@@ -945,59 +1033,59 @@ export var useCustomizeRequestActionProps = function useCustomizeRequestActionPr
                 message.success(compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage));
               }
             case 25:
-              _context16.prev = 25;
+              _context17.prev = 25;
               actionField.data.loading = false;
-              return _context16.finish(25);
+              return _context17.finish(25);
             case 28:
             case "end":
-              return _context16.stop();
+              return _context17.stop();
           }
-        }, _callee16, null, [[15,, 25, 28]]);
+        }, _callee17, null, [[15,, 25, 28]]);
       }))();
     }
   };
 };
 export var useUpdateActionProps = function useUpdateActionProps() {
-  var _currentUserContext$d5;
+  var _currentUserContext$d6;
   var form = useForm();
   var filterByTk = useFilterByTk();
-  var _useBlockRequestConte6 = useBlockRequestContext(),
-    field = _useBlockRequestConte6.field,
-    resource = _useBlockRequestConte6.resource,
-    __parent = _useBlockRequestConte6.__parent;
-  var _useActionContext3 = useActionContext(),
-    setVisible = _useActionContext3.setVisible;
+  var _useBlockRequestConte7 = useBlockRequestContext(),
+    field = _useBlockRequestConte7.field,
+    resource = _useBlockRequestConte7.resource,
+    __parent = _useBlockRequestConte7.__parent;
+  var _useActionContext4 = useActionContext(),
+    setVisible = _useActionContext4.setVisible;
   var actionSchema = useFieldSchema();
   var history = useHistory();
-  var _useCollection4 = useCollection(),
-    fields = _useCollection4.fields,
-    getField = _useCollection4.getField;
+  var _useCollection5 = useCollection(),
+    fields = _useCollection5.fields,
+    getField = _useCollection5.getField;
   var compile = useCompile();
   var actionField = useField();
   var _useFormBlockContext = useFormBlockContext(),
     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;
+  var currentUser = currentUserContext === null || currentUserContext === void 0 ? void 0 : (_currentUserContext$d6 = currentUserContext.data) === null || _currentUserContext$d6 === void 0 ? void 0 : _currentUserContext$d6.data;
   return {
     onClick: function onClick() {
-      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18() {
-        var _actionSchema$xActio6;
-        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) {
+      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19() {
+        var _actionSchema$xActio7;
+        var _ref15, _ref15$assignedValues, originalAssignedValues, onSuccess, overwriteValues, skipValidator, assignedValues, fieldNames, values, _parent$service6, _parent$service6$refr;
+        return _regeneratorRuntime().wrap(function _callee19$(_context19) {
+          while (1) switch (_context19.prev = _context19.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;
+              _ref15 = (_actionSchema$xActio7 = actionSchema === null || actionSchema === void 0 ? void 0 : actionSchema['x-action-settings']) !== null && _actionSchema$xActio7 !== void 0 ? _actionSchema$xActio7 : {}, _ref15$assignedValues = _ref15.assignedValues, originalAssignedValues = _ref15$assignedValues === void 0 ? {} : _ref15$assignedValues, onSuccess = _ref15.onSuccess, overwriteValues = _ref15.overwriteValues, skipValidator = _ref15.skipValidator;
               assignedValues = parse(originalAssignedValues)({
                 currentTime: new Date(),
                 currentRecord: currentRecord,
                 currentUser: currentUser
               });
               if (skipValidator) {
-                _context18.next = 5;
+                _context19.next = 5;
                 break;
               }
-              _context18.next = 5;
+              _context19.next = 5;
               return form.submit();
             case 5:
               fieldNames = fields.map(function (field) {
@@ -1006,8 +1094,8 @@ export var useUpdateActionProps = function useUpdateActionProps() {
               values = getFormValues(filterByTk, field, form, fieldNames, getField, resource);
               actionField.data = field.data || {};
               actionField.data.loading = true;
-              _context18.prev = 9;
-              _context18.next = 12;
+              _context19.prev = 9;
+              _context19.next = 12;
               return resource.update({
                 filterByTk: filterByTk,
                 values: _objectSpread(_objectSpread(_objectSpread({}, values), overwriteValues), assignedValues),
@@ -1015,26 +1103,23 @@ export var useUpdateActionProps = function useUpdateActionProps() {
               });
             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;
+                _context19.next = 17;
                 break;
               }
-              return _context18.abrupt("return");
-            case 18:
+              return _context19.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 _onOk6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17() {
-                      return _regeneratorRuntime().wrap(function _callee17$(_context17) {
-                        while (1) switch (_context17.prev = _context17.next) {
+                    var _onOk6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee18() {
+                      return _regeneratorRuntime().wrap(function _callee18$(_context18) {
+                        while (1) switch (_context18.prev = _context18.next) {
                           case 0:
-                            _context17.next = 2;
+                            _context18.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)) {
@@ -1046,9 +1131,9 @@ export var useUpdateActionProps = function useUpdateActionProps() {
                             }
                           case 3:
                           case "end":
-                            return _context17.stop();
+                            return _context18.stop();
                         }
-                      }, _callee17);
+                      }, _callee18);
                     }));
                     function onOk() {
                       return _onOk6.apply(this, arguments);
@@ -1059,44 +1144,44 @@ export var useUpdateActionProps = function useUpdateActionProps() {
               } else {
                 message.success(compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage));
               }
-              _context18.next = 24;
+              _context19.next = 23;
               break;
-            case 21:
-              _context18.prev = 21;
-              _context18.t0 = _context18["catch"](9);
+            case 20:
+              _context19.prev = 20;
+              _context19.t0 = _context19["catch"](9);
               actionField.data.loading = false;
-            case 24:
+            case 23:
             case "end":
-              return _context18.stop();
+              return _context19.stop();
           }
-        }, _callee18, null, [[9, 21]]);
+        }, _callee19, null, [[9, 20]]);
       }))();
     }
   };
 };
 export var useDestroyActionProps = function useDestroyActionProps() {
   var filterByTk = useFilterByTk();
-  var _useBlockRequestConte7 = useBlockRequestContext(),
-    resource = _useBlockRequestConte7.resource,
-    service = _useBlockRequestConte7.service,
-    block = _useBlockRequestConte7.block,
-    __parent = _useBlockRequestConte7.__parent;
-  var _useActionContext4 = useActionContext(),
-    setVisible = _useActionContext4.setVisible;
+  var _useBlockRequestConte8 = useBlockRequestContext(),
+    resource = _useBlockRequestConte8.resource,
+    service = _useBlockRequestConte8.service,
+    block = _useBlockRequestConte8.block,
+    __parent = _useBlockRequestConte8.__parent;
+  var _useActionContext5 = useActionContext(),
+    setVisible = _useActionContext5.setVisible;
   return {
     onClick: function onClick() {
-      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19() {
+      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20() {
         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) {
+        var _ref16, _ref16$count, count, _ref16$page, page, _ref16$pageSize, pageSize, _service$params2, _service$refresh4, _parent$service7, _parent$service7$refr;
+        return _regeneratorRuntime().wrap(function _callee20$(_context20) {
+          while (1) switch (_context20.prev = _context20.next) {
             case 0:
-              _context19.next = 2;
+              _context20.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;
+              _ref16 = (service === null || service === void 0 ? void 0 : (_service$data = service.data) === null || _service$data === void 0 ? void 0 : _service$data.meta) || {}, _ref16$count = _ref16.count, count = _ref16$count === void 0 ? 0 : _ref16$count, _ref16$page = _ref16.page, page = _ref16$page === void 0 ? 0 : _ref16$page, _ref16$pageSize = _ref16.pageSize, pageSize = _ref16$pageSize === void 0 ? 0 : _ref16$pageSize;
               if (count % pageSize === 1) {
                 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
@@ -1110,9 +1195,32 @@ export var useDestroyActionProps = function useDestroyActionProps() {
               }
             case 5:
             case "end":
-              return _context19.stop();
+              return _context20.stop();
           }
-        }, _callee19);
+        }, _callee20);
+      }))();
+    }
+  };
+};
+export var useRemoveActionProps = function useRemoveActionProps(associationName) {
+  var filterByTk = useFilterByTk();
+  var api = useAPIClient();
+  var resource = api.resource(associationName, filterByTk);
+  return {
+    onClick: function onClick(value) {
+      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21() {
+        return _regeneratorRuntime().wrap(function _callee21$(_context21) {
+          while (1) switch (_context21.prev = _context21.next) {
+            case 0:
+              _context21.next = 2;
+              return resource.remove({
+                values: [value.id]
+              });
+            case 2:
+            case "end":
+              return _context21.stop();
+          }
+        }, _callee21);
       }))();
     }
   };
@@ -1128,40 +1236,40 @@ export var useDetailPrintActionProps = function useDetailPrintActionProps() {
   });
   return {
     onClick: function onClick() {
-      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee20() {
-        return _regeneratorRuntime().wrap(function _callee20$(_context20) {
-          while (1) switch (_context20.prev = _context20.next) {
+      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22() {
+        return _regeneratorRuntime().wrap(function _callee22$(_context22) {
+          while (1) switch (_context22.prev = _context22.next) {
             case 0:
               printHandler();
             case 1:
             case "end":
-              return _context20.stop();
+              return _context22.stop();
           }
-        }, _callee20);
+        }, _callee22);
       }))();
     }
   };
 };
 export var useBulkDestroyActionProps = function useBulkDestroyActionProps() {
-  var _useBlockRequestConte8 = useBlockRequestContext(),
-    field = _useBlockRequestConte8.field;
   var _useBlockRequestConte9 = useBlockRequestContext(),
-    resource = _useBlockRequestConte9.resource,
-    service = _useBlockRequestConte9.service;
+    field = _useBlockRequestConte9.field;
+  var _useBlockRequestConte10 = useBlockRequestContext(),
+    resource = _useBlockRequestConte10.resource,
+    service = _useBlockRequestConte10.service;
   return {
     onClick: function onClick() {
-      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee21() {
+      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23() {
         var _field$data2, _field$data2$selected, _field$data3, _service$refresh5;
-        return _regeneratorRuntime().wrap(function _callee21$(_context21) {
-          while (1) switch (_context21.prev = _context21.next) {
+        return _regeneratorRuntime().wrap(function _callee23$(_context23) {
+          while (1) switch (_context23.prev = _context23.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;
+                _context23.next = 2;
                 break;
               }
-              return _context21.abrupt("return");
+              return _context23.abrupt("return");
             case 2:
-              _context21.next = 4;
+              _context23.next = 4;
               return resource.destroy({
                 filterByTk: (_field$data3 = field.data) === null || _field$data3 === void 0 ? void 0 : _field$data3.selectedRowKeys
               });
@@ -1170,29 +1278,29 @@ export var useBulkDestroyActionProps = function useBulkDestroyActionProps() {
               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();
+              return _context23.stop();
           }
-        }, _callee21);
+        }, _callee23);
       }))();
     }
   };
 };
 export var useRefreshActionProps = function useRefreshActionProps() {
-  var _useBlockRequestConte10 = useBlockRequestContext(),
-    service = _useBlockRequestConte10.service;
+  var _useBlockRequestConte11 = useBlockRequestContext(),
+    service = _useBlockRequestConte11.service;
   return {
     onClick: function onClick() {
-      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee22() {
+      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee24() {
         var _service$refresh6;
-        return _regeneratorRuntime().wrap(function _callee22$(_context22) {
-          while (1) switch (_context22.prev = _context22.next) {
+        return _regeneratorRuntime().wrap(function _callee24$(_context24) {
+          while (1) switch (_context24.prev = _context24.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();
+              return _context24.stop();
           }
-        }, _callee22);
+        }, _callee24);
       }))();
     }
   };
@@ -1208,11 +1316,11 @@ export var useDetailsPaginationProps = function useDetailsPaginationProps() {
     total: count,
     pageSize: 1,
     onChange: function onChange(page) {
-      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee23() {
+      return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee25() {
         var _ctx$service3, _ctx$service3$params;
         var params;
-        return _regeneratorRuntime().wrap(function _callee23$(_context23) {
-          while (1) switch (_context23.prev = _context23.next) {
+        return _regeneratorRuntime().wrap(function _callee25$(_context25) {
+          while (1) switch (_context25.prev = _context25.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), {}, {
@@ -1220,9 +1328,9 @@ export var useDetailsPaginationProps = function useDetailsPaginationProps() {
               }));
             case 2:
             case "end":
-              return _context23.stop();
+              return _context25.stop();
           }
-        }, _callee23);
+        }, _callee25);
       }))();
     },
     style: {
@@ -1232,14 +1340,14 @@ export var useDetailsPaginationProps = function useDetailsPaginationProps() {
   };
 };
 export var useAssociationFilterProps = function useAssociationFilterProps() {
-  var _fieldSchema$xCompon2, _fieldSchema$xCompon3, _field$componentProps, _field$componentProps2;
+  var _fieldSchema$xCompon3, _fieldSchema$xCompon4, _field$componentProps, _field$componentProps2;
   var collectionField = AssociationFilter.useAssociationField();
-  var _useBlockRequestConte11 = useBlockRequestContext(),
-    service = _useBlockRequestConte11.service,
-    blockProps = _useBlockRequestConte11.props;
+  var _useBlockRequestConte12 = useBlockRequestContext(),
+    service = _useBlockRequestConte12.service,
+    blockProps = _useBlockRequestConte12.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 labelKey = ((_fieldSchema$xCompon3 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon3 === void 0 ? void 0 : (_fieldSchema$xCompon4 = _fieldSchema$xCompon3.fieldNames) === null || _fieldSchema$xCompon4 === void 0 ? void 0 : _fieldSchema$xCompon4.label) || valueKey;
   var field = useField();
   var collectionFieldName = collectionField.name;
   var _useRequest = useRequest({
@@ -1289,9 +1397,9 @@ export var useAssociationFilterProps = function useAssociationFilterProps() {
   };
 };
 export var useOptionalFieldList = function useOptionalFieldList() {
-  var _useCollection5 = useCollection(),
-    _useCollection5$curre = _useCollection5.currentFields,
-    currentFields = _useCollection5$curre === void 0 ? [] : _useCollection5$curre;
+  var _useCollection6 = useCollection(),
+    _useCollection6$curre = _useCollection6.currentFields,
+    currentFields = _useCollection6$curre === void 0 ? [] : _useCollection6$curre;
   return currentFields.filter(function (field) {
     return isOptionalField(field) && field.uiSchema.enum;
   });
@@ -1301,16 +1409,42 @@ var isOptionalField = function isOptionalField(field) {
   return optionalInterfaces.includes(field.interface);
 };
 export var useAssociationFilterBlockProps = function useAssociationFilterBlockProps() {
+  var _fieldSchema$xCompon5, _fieldSchema$xCompon6, _field$componentProps3, _field$componentProps4;
   var collectionField = AssociationFilter.useAssociationField();
   var fieldSchema = useFieldSchema();
   var optionalFieldList = useOptionalFieldList();
   var _useFilterBlock3 = useFilterBlock(),
     getDataBlocks = _useFilterBlock3.getDataBlocks;
   var collectionFieldName = collectionField.name;
+  var field = useField();
   var list, onSelected, handleSearchInput, params, run, data, valueKey, labelKey, filterKey;
+  valueKey = (collectionField === null || collectionField === void 0 ? void 0 : collectionField.targetKey) || 'id';
+  labelKey = ((_fieldSchema$xCompon5 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon5 === void 0 ? void 0 : (_fieldSchema$xCompon6 = _fieldSchema$xCompon5.fieldNames) === null || _fieldSchema$xCompon6 === void 0 ? void 0 : _fieldSchema$xCompon6.label) || valueKey;
+  var _useRequest2 = useRequest({
+    resource: collectionField === null || collectionField === void 0 ? void 0 : collectionField.target,
+    action: 'list',
+    params: _objectSpread({
+      fields: [labelKey, valueKey],
+      pageSize: 200,
+      page: 1
+    }, (_field$componentProps4 = field.componentProps) === null || _field$componentProps4 === void 0 ? void 0 : _field$componentProps4.params)
+  }, {
+    // 由于 选项字段不需要触发当前请求，所以当前请求更改为手动触发
+    manual: true,
+    debounceWait: 300
+  });
+  data = _useRequest2.data;
+  params = _useRequest2.params;
+  run = _useRequest2.run;
+  useEffect(function () {
+    // 由于 选项字段不需要触发当前请求，所以请求单独在 关系字段的时候触发
+    if (!isOptionalField(fieldSchema)) {
+      run();
+    }
+  }, [labelKey, valueKey, JSON.stringify(((_field$componentProps3 = field.componentProps) === null || _field$componentProps3 === void 0 ? void 0 : _field$componentProps3.params) || {}), isOptionalField(fieldSchema)]);
   if (isOptionalField(fieldSchema)) {
     var _field$uiSchema;
-    var field = optionalFieldList.find(function (field) {
+    var _field = optionalFieldList.find(function (field) {
       return field.name === fieldSchema.name;
     });
     var operatorMap = {
@@ -1319,13 +1453,13 @@ export var useAssociationFilterBlockProps = function useAssociationFilterBlockPr
       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) || [];
+    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]);
+    filterKey = "".concat(_field.name, ".").concat(operatorMap[_field.interface]);
     handleSearchInput = function handleSearchInput(e) {
       // TODO: 列表没有刷新，在这个 hook 中使用 useState 会产生 re-render 次数过多的错误
       var value = e.target.value;
@@ -1338,24 +1472,7 @@ export var useAssociationFilterBlockProps = function useAssociationFilterBlockPr
       });
     };
   } 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;
+    var _data;
     filterKey = "".concat(collectionFieldName, ".").concat(valueKey, ".$in");
     list = ((_data = data) === null || _data === void 0 ? void 0 : _data.data) || [];
     handleSearchInput = function handleSearchInput(e) {
@@ -1403,4 +1520,113 @@ export var useAssociationFilterBlockProps = function useAssociationFilterBlockPr
     valueKey: valueKey,
     labelKey: labelKey
   };
+};
+export var useAssociationNames = function useAssociationNames(collection) {
+  var _useCollectionManager2 = useCollectionManager(),
+    getCollectionFields = _useCollectionManager2.getCollectionFields,
+    getCollectionJoinField = _useCollectionManager2.getCollectionJoinField;
+  var collectionFields = getCollectionFields(collection);
+  var associationFields = new Set();
+  var _iterator = _createForOfIteratorHelper(collectionFields),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var collectionField = _step.value;
+      if (collectionField.target) {
+        associationFields.add(collectionField.name);
+        var fields = getCollectionFields(collectionField.target);
+        var _iterator2 = _createForOfIteratorHelper(fields),
+          _step2;
+        try {
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+            var field = _step2.value;
+            if (field.target) {
+              associationFields.add("".concat(collectionField.name, ".").concat(field.name));
+            }
+          }
+        } catch (err) {
+          _iterator2.e(err);
+        } finally {
+          _iterator2.f();
+        }
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  var fieldSchema = useFieldSchema();
+  var associationValues = [];
+  var formSchema = fieldSchema.reduceProperties(function (buf, schema) {
+    if (['FormV2', 'Details'].includes(schema['x-component'])) {
+      return schema;
+    }
+    return buf;
+  }, new Schema({}));
+  var getAssociationAppends = function getAssociationAppends(schema) {
+    var arr = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+    return schema.reduceProperties(function (buf, s) {
+      var collectionfield = s['x-collection-field'] && getCollectionJoinField(s['x-collection-field']);
+      if (collectionfield && ['createdBy', 'updatedBy', 'o2m', 'obo', 'oho', 'm2o', 'm2m'].includes(collectionfield.interface)) {
+        var _s$xComponentProps;
+        if (['Nester', 'SubTable'].includes((_s$xComponentProps = s['x-component-props']) === null || _s$xComponentProps === void 0 ? void 0 : _s$xComponentProps.mode)) {
+          associationValues.push(s.name);
+        }
+        buf.push(s.name);
+        if (s['x-component-props'].mode === 'Nester' || s['x-component'] === 'TableField') {
+          return getAssociationAppends(s, buf);
+        }
+        return buf;
+      } else {
+        if (s['x-component'] === 'Grid' || s['x-component'] === 'TableV2') {
+          var _buf$concat;
+          var kk = buf === null || buf === void 0 ? void 0 : (_buf$concat = buf.concat) === null || _buf$concat === void 0 ? void 0 : _buf$concat.call(buf);
+          return getNesterAppends(s, kk || []);
+        } else {
+          var _s$xComponent;
+          return !((_s$xComponent = s['x-component']) === null || _s$xComponent === void 0 ? void 0 : _s$xComponent.includes('Action.')) && getAssociationAppends(s, buf);
+        }
+      }
+    }, arr);
+  };
+  function flattenNestedList(nestedList) {
+    var flattenedList = [];
+    function flattenHelper(list, prefix) {
+      for (var i = 0; i < list.length; i++) {
+        if (Array.isArray(list[i])) {
+          "".concat(prefix) !== "".concat(list[i][0]) && flattenHelper(list[i], "".concat(prefix, ".").concat(list[i][0]));
+        } else {
+          var str = prefix.replaceAll("".concat(list[i]), '').replace('..', '.').trim();
+          !list.includes(str) && flattenedList.push("".concat(str).concat(list[i]));
+        }
+      }
+    }
+    for (var i = 0; i < nestedList.length; i++) {
+      flattenHelper(nestedList[i], nestedList[i][0]);
+    }
+    return flattenedList.filter(function (obj) {
+      return !obj.startsWith('.');
+    });
+  }
+  var getNesterAppends = function getNesterAppends(gridSchema, data) {
+    gridSchema.reduceProperties(function (buf, s) {
+      buf.push(getAssociationAppends(s));
+      return buf;
+    }, data);
+    return data.filter(function (g) {
+      return g.length;
+    });
+  };
+  var data = getAssociationAppends(formSchema);
+  var associations = data.filter(function (g) {
+    return g.length;
+  });
+  var appends = flattenNestedList(associations);
+  return {
+    appends: appends,
+    updateAssociationValues: appends.filter(function (v) {
+      return associationValues.includes(v);
+    })
+  };
 };