@nocobase/client 0.9.2-alpha.2 → 0.9.2-alpha.4

package/es/acl/Configuration/FilterDynamicComponent.d.ts

@@ -0,0 +1,2 @@
+/// <reference types="react" />
+export declare function FilterDynamicComponent(props: any): JSX.Element;

package/es/{schema-component/antd/table-v2/hooks/useUserVariable.js → acl/Configuration/FilterDynamicComponent.js}

@@ -1,4 +1,8 @@
-import { useFilterOptions } from '../../filter';
+import React from 'react';
+import { useCompile } from '../../schema-component';
+import { useFilterOptions } from '../../schema-component/antd/filter';
+import { useValues } from '../../schema-component/antd/filter/useValues';
+import { Variable } from '../../schema-component/antd/variable';
 var useOptions = function useOptions(collectionName, _ref) {
   var schema = _ref.schema,
     operator = _ref.operator,
@@ -36,13 +40,13 @@ var useOptions = function useOptions(collectionName, _ref) {
   });
   return result;
 };
-export var useUserVariable = function useUserVariable(_ref2) {
+var useUserVariable = function useUserVariable(_ref2) {
   var schema = _ref2.schema,
     operator = _ref2.operator;
   var options = useOptions('users', {
     schema: schema,
     operator: operator,
-    maxDepth: 3
+    maxDepth: 1
   }) || [];
   return {
     label: "{{t(\"Current user\")}}",
@@ -53,4 +57,28 @@ export var useUserVariable = function useUserVariable(_ref2) {
     }),
     children: options
   };
-};
+};
+var useVariableOptions = function useVariableOptions() {
+  var _useValues = useValues(),
+    operator = _useValues.operator,
+    schema = _useValues.schema;
+  var userVariable = useUserVariable({
+    schema: schema,
+    operator: operator
+  });
+  if (!operator || !schema) return [];
+  return [userVariable];
+};
+export function FilterDynamicComponent(props) {
+  var value = props.value,
+    onChange = props.onChange,
+    renderSchemaComponent = props.renderSchemaComponent;
+  var options = useVariableOptions();
+  var compile = useCompile();
+  var scope = compile(options);
+  return /*#__PURE__*/React.createElement(Variable.Input, {
+    value: value,
+    onChange: onChange,
+    scope: scope
+  }, renderSchemaComponent());
+}

package/es/acl/Configuration/schemas/scopes.js

@@ -1,6 +1,7 @@
 import { useContext, useEffect } from 'react';
 import { useFormBlockContext } from '../../../block-provider';
 import { useFilterOptions } from '../../../schema-component';
+import { FilterDynamicComponent } from '../FilterDynamicComponent';
 import { RoleResourceCollectionContext } from '../RolesResourcesActions';
 export var rolesResourcesScopesCollection = {
   name: 'rolesResourcesScopes',
@@ -139,6 +140,7 @@ export var scopesSchema = {
                                       'x-decorator': 'FormItem',
                                       'x-component': 'Filter',
                                       'x-component-props': {
+                                        dynamicComponent: FilterDynamicComponent,
                                         useProps: function useProps() {
                                           var ctx = useContext(RoleResourceCollectionContext);
                                           var options = useFilterOptions(ctx.name);
@@ -267,6 +269,7 @@ export var scopesSchema = {
                                               'x-decorator': 'FormItem',
                                               'x-component': 'Filter',
                                               'x-component-props': {
+                                                dynamicComponent: FilterDynamicComponent,
                                                 useProps: function useProps() {
                                                   var ctx = useContext(RoleResourceCollectionContext);
                                                   var options = useFilterOptions(ctx.name);

package/es/acl/Configuration/schemas/useRoleResourceValues.d.ts

@@ -1,14 +1 @@
-export declare const useRoleResourceValues: (options: any) => {
-    state: {};
-    setState: import("ahooks/lib/useSetState").SetState<{}>;
-    loading: boolean;
-    data?: any;
-    error?: Error;
-    params: any;
-    cancel: () => void;
-    refresh: () => void;
-    refreshAsync: () => Promise<any>;
-    run: (...params: any) => void;
-    runAsync: (...params: any) => Promise<any>;
-    mutate: (data?: any) => void;
-};
+export declare const useRoleResourceValues: (options: any) => any;

package/es/api-client/hooks/useRequest.d.ts

@@ -9,18 +9,5 @@ export declare type ResourceActionOptions<P = any> = {
 };
 export declare function useRequest<P>(service: AxiosRequestConfig<P> | ResourceActionOptions<P> | FunctionService, options?: Options<any, any> & {
     uid?: string;
-}): {
-    state: {};
-    setState: import("ahooks/lib/useSetState").SetState<{}>;
-    loading: boolean;
-    data?: any;
-    error?: Error;
-    params: any;
-    cancel: () => void;
-    refresh: () => void;
-    refreshAsync: () => Promise<any>;
-    run: (...params: any) => void;
-    runAsync: (...params: any) => Promise<any>;
-    mutate: (data?: any) => void;
-};
+}): any;
 export {};

package/es/api-client/hooks/useRequest.js

@@ -1,12 +1,12 @@
 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); }
-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) { 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 _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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _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); }
@@ -28,64 +28,59 @@ export function useRequest(service) {
     state = _useSetState2[0],
     setState = _useSetState2[1];
   var api = useContext(APIClientContext);
+  var tempOptions, tempService;
   if (typeof service === 'function') {
-    var _result = useReq(service, _objectSpread(_objectSpread({}, options), {}, {
-      onSuccess: function onSuccess() {
-        var _options$onSuccess;
-        for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-          args[_key] = arguments[_key];
-        }
-        (_options$onSuccess = options.onSuccess) === null || _options$onSuccess === void 0 ? void 0 : _options$onSuccess.call.apply(_options$onSuccess, [options].concat(args));
-        if (options.uid) {
-          api.services[options.uid] = _result;
-        }
-      }
-    }));
-    return _objectSpread(_objectSpread({}, _result), {}, {
-      state: state,
-      setState: setState
-    });
-  }
-  var result = useReq( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var params,
-      resource,
-      args,
-      response,
-      _args = arguments;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          params = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
-          resource = service.resource;
-          args = cloneDeep(service);
-          if (resource) {
-            args.params = args.params || {};
-            assign(args.params, params);
-          } else {
-            args = merge(args, params);
+    tempService = service;
+  } else {
+    tempService = /*#__PURE__*/function () {
+      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+        var params,
+          resource,
+          args,
+          response,
+          _args = arguments;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              params = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
+              resource = service.resource;
+              args = cloneDeep(service);
+              if (resource) {
+                args.params = args.params || {};
+                assign(args.params, params);
+              } else {
+                args = merge(args, params);
+              }
+              _context.next = 6;
+              return api.request(args);
+            case 6:
+              response = _context.sent;
+              return _context.abrupt("return", response === null || response === void 0 ? void 0 : response.data);
+            case 8:
+            case "end":
+              return _context.stop();
           }
-          _context.next = 6;
-          return api.request(args);
-        case 6:
-          response = _context.sent;
-          return _context.abrupt("return", response === null || response === void 0 ? void 0 : response.data);
-        case 8:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  })), _objectSpread(_objectSpread({}, options), {}, {
+        }, _callee);
+      }));
+      return function tempService() {
+        return _ref.apply(this, arguments);
+      };
+    }();
+  }
+  tempOptions = _objectSpread(_objectSpread({}, options), {}, {
     onSuccess: function onSuccess() {
-      var _options$onSuccess2;
-      for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-        args[_key2] = arguments[_key2];
+      var _options$onSuccess;
+      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+        args[_key] = arguments[_key];
       }
-      (_options$onSuccess2 = options.onSuccess) === null || _options$onSuccess2 === void 0 ? void 0 : _options$onSuccess2.call.apply(_options$onSuccess2, [options].concat(args));
+      // @ts-ignore
+      (_options$onSuccess = options.onSuccess) === null || _options$onSuccess === void 0 ? void 0 : _options$onSuccess.call.apply(_options$onSuccess, [options].concat(args));
       if (options.uid) {
         api.services[options.uid] = result;
       }
     }
-  }));
+  });
+  var result = useReq(tempService, tempOptions);
   return _objectSpread(_objectSpread({}, result), {}, {
     state: state,
     setState: setState

package/es/application/Application.d.ts

@@ -22,5 +22,6 @@ export declare class Application {
      * TODO
      */
     plugin(plugin: PluginCallback): void;
+    handleErrors(error: any): void;
     render(): (props: any) => JSX.Element;
 }

package/es/application/Application.js

@@ -23,6 +23,7 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 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; }
 import { Spin } from 'antd';
 import React, { useEffect, useState } from 'react';
+import { ErrorBoundary } from 'react-error-boundary';
 import { I18nextProvider } from 'react-i18next';
 import { Link, NavLink } from 'react-router-dom';
 import { ACLProvider } from '../acl';
@@ -35,6 +36,7 @@ import { PinnedPluginListProvider } from '../plugin-manager';
 import PMProvider, { PluginManagerLink, SettingsCenterDropdown } from '../pm';
 import { AdminLayout, AuthLayout, RemoteRouteSwitchProvider, RouteSchemaComponent, RouteSwitch, useRoutes } from '../route-switch';
 import { AntdSchemaComponentProvider, DesignableSwitch, MenuItemInitializers, SchemaComponentProvider } from '../schema-component';
+import { ErrorFallback } from '../schema-component/antd/error-fallback';
 import { SchemaInitializerProvider } from '../schema-initializer';
 import { BlockTemplateDetails, BlockTemplatePage } from '../schema-templates';
 import { SystemSettingsProvider } from '../system-settings';
@@ -156,6 +158,11 @@ export var Application = /*#__PURE__*/function () {
     value: function plugin(_plugin) {
       this.plugins.push(_plugin);
     }
+  }, {
+    key: "handleErrors",
+    value: function handleErrors(error) {
+      console.error(error);
+    }
   }, {
     key: "render",
     value: function render() {
@@ -226,9 +233,12 @@ export var Application = /*#__PURE__*/function () {
         if (loading) {
           return /*#__PURE__*/React.createElement(Spin, null);
         }
-        return /*#__PURE__*/React.createElement(App, {
+        return /*#__PURE__*/React.createElement(ErrorBoundary, {
+          FallbackComponent: ErrorFallback,
+          onError: _this.handleErrors
+        }, /*#__PURE__*/React.createElement(App, {
           providers: _this.providers
-        });
+        }));
       };
     }
   }]);

package/es/block-provider/FormFieldProvider.js

@@ -7,6 +7,7 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 import { createForm, onFormValuesChange } from '@formily/core';
 import { useField } from '@formily/react';
 import { autorun } from '@formily/reactive';
+import { forEach } from '@nocobase/utils/client';
 import { Spin } from 'antd';
 import React, { createContext, useContext, useEffect, useMemo } from 'react';
 import { RecordProvider } from '../record-provider';
@@ -39,7 +40,14 @@ var InternalFormFieldProvider = function InternalFormFieldProvider(props) {
   useEffect(function () {
     var dispose = autorun(function () {
       var _formBlockCtx$form2;
-      form.values = (formBlockCtx === null || formBlockCtx === void 0 ? void 0 : (_formBlockCtx$form2 = formBlockCtx.form) === null || _formBlockCtx$form2 === void 0 ? void 0 : _formBlockCtx$form2.values[fieldName]) || form.values;
+      var data = (formBlockCtx === null || formBlockCtx === void 0 ? void 0 : (_formBlockCtx$form2 = formBlockCtx.form) === null || _formBlockCtx$form2 === void 0 ? void 0 : _formBlockCtx$form2.values[fieldName]) || {};
+      // 先清空表单值，再赋值，避免当值为空时，表单未被清空
+      form.reset();
+      forEach(data, function (value, key) {
+        if (value) {
+          form.values[key] = value;
+        }
+      });
     });
     return dispose;
   }, []);

package/es/block-provider/TableSelectorProvider.js

@@ -18,6 +18,7 @@ import { Schema, useField, useFieldSchema } from '@formily/react';
 import uniq from 'lodash/uniq';
 import React, { createContext, useContext, useEffect, useState } from 'react';
 import { useCollectionManager } from '../collection-manager';
+import { isInFilterFormBlock } from '../filter-provider';
 import { RecordProvider, useRecord } from '../record-provider';
 import { SchemaComponentOptions } from '../schema-component';
 import { BlockProvider, RenderChildrenWithAssociationFilter, useBlockRequestContext } from './BlockProvider';
@@ -189,7 +190,7 @@ export var TableSelectorProvider = function TableSelectorProvider(props) {
   }
   var extraFilter;
   if (collectionField) {
-    if (['oho', 'o2m'].includes(collectionField.interface)) {
+    if (['oho', 'o2m'].includes(collectionField.interface) && !isInFilterFormBlock(fieldSchema)) {
       if (record === null || record === void 0 ? void 0 : record[collectionField.sourceKey]) {
         extraFilter = {
           $or: [_defineProperty({}, collectionField.foreignKey, {
@@ -204,7 +205,7 @@ export var TableSelectorProvider = function TableSelectorProvider(props) {
         });
       }
     }
-    if (['obo'].includes(collectionField.interface)) {
+    if (['obo'].includes(collectionField.interface) && !isInFilterFormBlock(fieldSchema)) {
       var fields = getCollectionFields(collectionField.target);
       var targetField = fields.find(function (f) {
         return f.foreignKey && f.foreignKey === collectionField.foreignKey;

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

@@ -67,7 +67,7 @@ export declare const useAssociationFilterProps: () => {
     onSelected: (value: any) => void;
     handleSearchInput: (e: ChangeEvent<any>) => void;
     params: any;
-    run: (...params: any) => void;
+    run: any;
 };
 export declare const useOptionalFieldList: () => import("../..").FieldOptions[];
 export declare const useAssociationFilterBlockProps: () => {

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

@@ -19,13 +19,13 @@ 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';
 import { AssociationFilter, useFormBlockContext, useTableBlockContext } from '../..';
 import { useAPIClient, useRequest } from '../../api-client';
-import { useCollection } from '../../collection-manager';
+import { useCollection, useCollectionManager } from '../../collection-manager';
 import { useFilterBlock } from '../../filter-provider/FilterProvider';
 import { transformToFilter } from '../../filter-provider/utils';
 import { useRecord } from '../../record-provider';
@@ -292,6 +292,10 @@ export var useFilterBlockActionProps = function useFilterBlockActionProps() {
   var fieldSchema = useFieldSchema();
   var _useFilterBlock = useFilterBlock(),
     getDataBlocks = _useFilterBlock.getDataBlocks;
+  var _useCollection2 = useCollection(),
+    name = _useCollection2.name;
+  var _useCollectionManager = useCollectionManager(),
+    getCollectionJoinField = _useCollectionManager.getCollectionJoinField;
   actionField.data = actionField.data || {};
   return {
     onClick: function onClick() {
@@ -322,7 +326,7 @@ export var useFilterBlockActionProps = function useFilterBlockActionProps() {
                       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));
+                        storedFilter[uid] = removeNullCondition(transformToFilter(form.values, fieldSchema, getCollectionJoinField, name));
                         mergedFilter = mergeFilter([].concat(_toConsumableArray(Object.values(storedFilter).map(function (filter) {
                           return removeNullCondition(filter);
                         })), [block.defaultFilter]));
@@ -344,13 +348,14 @@ export var useFilterBlockActionProps = function useFilterBlockActionProps() {
               }()));
             case 5:
               actionField.data.loading = false;
-              _context4.next = 11;
+              _context4.next = 12;
               break;
             case 8:
               _context4.prev = 8;
               _context4.t0 = _context4["catch"](2);
+              console.error(_context4.t0);
               actionField.data.loading = false;
-            case 11:
+            case 12:
             case "end":
               return _context4.stop();
           }
@@ -822,9 +827,9 @@ export var useCustomizeRequestActionProps = function useCustomizeRequestActionPr
   var actionSchema = useFieldSchema();
   var compile = useCompile();
   var form = useForm();
-  var _useCollection2 = useCollection(),
-    fields = _useCollection2.fields,
-    getField = _useCollection2.getField;
+  var _useCollection3 = useCollection(),
+    fields = _useCollection3.fields,
+    getField = _useCollection3.getField;
   var _useBlockRequestConte5 = useBlockRequestContext(),
     field = _useBlockRequestConte5.field,
     resource = _useBlockRequestConte5.resource,
@@ -964,9 +969,9 @@ export var useUpdateActionProps = function useUpdateActionProps() {
     setVisible = _useActionContext3.setVisible;
   var actionSchema = useFieldSchema();
   var history = useHistory();
-  var _useCollection3 = useCollection(),
-    fields = _useCollection3.fields,
-    getField = _useCollection3.getField;
+  var _useCollection4 = useCollection(),
+    fields = _useCollection4.fields,
+    getField = _useCollection4.getField;
   var compile = useCompile();
   var actionField = useField();
   var _useFormBlockContext = useFormBlockContext(),
@@ -1284,9 +1289,9 @@ export var useAssociationFilterProps = function useAssociationFilterProps() {
   };
 };
 export var useOptionalFieldList = function useOptionalFieldList() {
-  var _useCollection4 = useCollection(),
-    _useCollection4$curre = _useCollection4.currentFields,
-    currentFields = _useCollection4$curre === void 0 ? [] : _useCollection4$curre;
+  var _useCollection5 = useCollection(),
+    _useCollection5$curre = _useCollection5.currentFields,
+    currentFields = _useCollection5$curre === void 0 ? [] : _useCollection5$curre;
   return currentFields.filter(function (field) {
     return isOptionalField(field) && field.uiSchema.enum;
   });
@@ -1296,16 +1301,42 @@ var isOptionalField = function isOptionalField(field) {
   return optionalInterfaces.includes(field.interface);
 };
 export var useAssociationFilterBlockProps = function useAssociationFilterBlockProps() {
+  var _fieldSchema$xCompon4, _fieldSchema$xCompon5, _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$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 === 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 = {
@@ -1314,13 +1345,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;
@@ -1333,24 +1364,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) {

package/es/board/CardAdder.js

@@ -23,7 +23,7 @@ function CardAdder(_ref) {
       return setAddingCard(false);
     }
   }) : /*#__PURE__*/React.createElement("button", {
-    className: 'react-kanban-card-adder-button',
+    className: "react-kanban-card-adder-button",
     onClick: function onClick() {
       return setAddingCard(!addingCard);
     }

package/es/board/ColumnForm.js

@@ -10,7 +10,7 @@ function ColumnForm(_ref) {
     when(inputColumnTitle.current.value)(onConfirm);
   }
   return /*#__PURE__*/React.createElement("div", {
-    className: 'react-kanban-column',
+    className: "react-kanban-column",
     style: {
       minWidth: '230px'
     }
@@ -21,13 +21,13 @@ function ColumnForm(_ref) {
     },
     onSubmit: addColumn
   }, /*#__PURE__*/React.createElement("input", {
-    type: 'text',
+    type: "text",
     ref: inputColumnTitle,
     autoFocus: true
   }), /*#__PURE__*/React.createElement("button", {
-    type: 'submit'
+    type: "submit"
   }, "Add"), /*#__PURE__*/React.createElement("button", {
-    type: 'button',
+    type: "button",
     onClick: onCancel
   }, "Cancel")));
 }