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

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/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,7 +19,7 @@ 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';
@@ -1301,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 = {
@@ -1319,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;
@@ -1338,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/collection-manager/Configuration/EditCollectionAction.d.ts

@@ -1,17 +1,4 @@
-export declare const useValuesFromRecord: (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 useValuesFromRecord: (options: any) => any;
 export declare const useUpdateCollectionActionAndRefreshCM: (options: any) => {
     run(): Promise<void>;
 };

package/es/collection-manager/Configuration/EditFieldAction.js

@@ -53,6 +53,7 @@ var getSchema = function getSchema(schema, record, compile, getContainer) {
         }
       }
     };
+    properties['defaultValue']['x-disabled'] = record.overriding;
   }
   return {
     type: 'object',

package/es/collection-manager/Configuration/OverridingCollectionField.js

@@ -38,6 +38,7 @@ var getSchema = function getSchema(schema, record, compile, getContainer) {
     properties['defaultValue'] = cloneDeep(schema.default.uiSchema);
     properties['defaultValue']['title'] = compile('{{ t("Default value") }}');
     properties['defaultValue']['x-decorator'] = 'FormItem';
+    properties['defaultValue']['x-disabled'] = true;
   }
   return {
     type: 'object',

package/es/collection-manager/action-hooks.d.ts

@@ -1,20 +1,7 @@
 export declare const useCancelAction: () => {
     run(): Promise<void>;
 };
-export declare const useValuesFromRecord: (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 useValuesFromRecord: (options: any) => any;
 export declare const useResetFilterAction: () => {
     run(): Promise<void>;
 };
@@ -40,20 +27,7 @@ export declare const useChildrenCollections: (collectionName: string) => {
 }[];
 export declare const useCollectionFilterOptions: (collectionName: string) => any[];
 export declare const useLinkageCollectionFilterOptions: (collectionName: string) => any[];
-export declare const useFilterDataSource: (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 useFilterDataSource: (options: any) => any;
 export declare const useFilterAction: () => {
     run(): Promise<void>;
 };
@@ -78,20 +52,7 @@ export declare const useDestroyAction: () => {
 export declare const useBulkDestroyAction: () => {
     run(): Promise<void>;
 };
-export declare const useValuesFromRA: (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 useValuesFromRA: (options: any) => any;
 export declare const useCreateActionAndRefreshCM: () => {
     run(): Promise<void>;
 };

package/es/collection-manager/interfaces/linkTo.js

@@ -180,5 +180,6 @@ export var linkTo = {
       //   },
       // },
     ]
-  }
+  },
+  invariable: true
 };

package/es/collection-manager/interfaces/m2m.js

@@ -279,5 +279,6 @@ export var m2m = {
       //   },
       // },
     ]
-  }
+  },
+  invariable: true
 };

package/es/collection-manager/interfaces/m2o.js

@@ -211,5 +211,6 @@ export var m2o = {
       //   },
       // },
     ]
-  }
+  },
+  invariable: true
 };

package/es/collection-manager/interfaces/o2m.js

@@ -269,5 +269,6 @@ export var o2m = {
       //   },
       // },
     ]
-  }
+  },
+  invariable: true
 };

package/es/collection-manager/interfaces/o2o.js

@@ -254,7 +254,8 @@ export var o2o = {
       //   },
       // },
     ]
-  }
+  },
+  invariable: true
 };
 export var oho = {
   name: 'oho',
@@ -427,7 +428,8 @@ export var oho = {
       //   },
       // },
     ]
-  }
+  },
+  invariable: true
 };
 export var obo = {
   name: 'obo',
@@ -617,5 +619,6 @@ export var obo = {
       //   },
       // },
     ]
-  }
+  },
+  invariable: true
 };

package/es/collection-manager/interfaces/types.d.ts

@@ -8,6 +8,8 @@ export interface IField extends ISchema {
     default?: IDefault;
     operators?: any[];
     filterable?: any;
+    /** 不支持使用变量的值进行设置 */
+    invariable?: boolean;
     [key: string]: any;
 }
 export {};

package/es/collection-manager/sub-table.d.ts

@@ -2,20 +2,7 @@ import React from 'react';
 export declare const DataSourceContext: React.Context<any>;
 export declare const ds: {
     useSelectedRowKeys: () => any[];
-    useDataSource: (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;
-    };
+    useDataSource: (options: any) => any;
     useCreateAction: () => {
         run(): Promise<void>;
     };

package/es/locale/en_US.d.ts

@@ -210,7 +210,7 @@ declare const _default: {
     "Association fields filter": string;
     "PK & FK fields": string;
     "Association fields": string;
-    "Optional fields": string;
+    "Choices fields": string;
     "System fields": string;
     "General fields": string;
     "Inherited fields": string;

package/es/locale/en_US.js

@@ -210,7 +210,7 @@ export default {
   "Association fields filter": "Association fields filter",
   "PK & FK fields": "PK & FK fields",
   "Association fields": "Association fields",
-  "Optional fields": "Optional fields",
+  "Choices fields": "Choices fields",
   "System fields": "System fields",
   "General fields": "General fields",
   "Inherited fields": "Inherited fields",

package/es/locale/ja_JP.d.ts

@@ -576,7 +576,7 @@ declare const _default: {
     "Enable SMS authentication": string;
     "Display association fields": string;
     "Set default value": string;
-    "Optional fields": string;
+    "Choices fields": string;
     Editable: string;
     Readonly: string;
     "Easy-reading": string;

package/es/locale/ja_JP.js

@@ -577,7 +577,7 @@ export default {
   "Enable SMS authentication": "SMS認証を有効にする",
   "Display association fields": "関連付けられたコレクションのフィールドを表示",
   "Set default value": "デフォルト値を設定",
-  "Optional fields": "オプションフィールド",
+  "Choices fields": "チョイスフィールド",
   "Editable": "編集可能",
   "Readonly": "読み取り専用（編集不可）",
   "Easy-reading": "読取り専用（読取りモード）",

package/es/locale/pt_BR.d.ts

@@ -170,7 +170,7 @@ declare const _default: {
     "Association fields filter": string;
     "PK & FK fields": string;
     "Association fields": string;
-    "Optional fields": string;
+    "Choices fields": string;
     "System fields": string;
     "General fields": string;
     "Inherited fields": string;

package/es/locale/pt_BR.js

@@ -170,7 +170,7 @@ export default {
   "Association fields filter": "Filtro de campos de associação",
   "PK & FK fields": "Campos PK & FK",
   "Association fields": "Campos de associação",
-  "Optional fields": "Campos opcionais",
+  "Choices fields": "Campos de opções",
   "System fields": "Campos do sistema",
   "General fields": "Campos gerais",
   "Inherited fields": "Campos herdados",

package/es/locale/zh_CN.d.ts

@@ -221,7 +221,7 @@ declare const _default: {
     "Association fields filter": string;
     "PK & FK fields": string;
     "Association fields": string;
-    "Optional fields": string;
+    "Choices fields": string;
     "System fields": string;
     "General fields": string;
     "Inherited fields": string;

package/es/locale/zh_CN.js

@@ -221,7 +221,7 @@ export default {
   "Association fields filter": "关系筛选",
   "PK & FK fields": "主外键字段",
   "Association fields": "关系字段",
-  "Optional fields": "可选字段",
+  "Choices fields": "选项字段",
   "System fields": "系统字段",
   "General fields": "普通字段",
   "Inherited fields": "继承字段",

package/es/schema-component/antd/association-filter/AssociationFilter.FilterBlockInitializer.js

@@ -63,10 +63,10 @@ export var AssociationFilterFilterBlockInitializer = function AssociationFilterF
     title: t('Association fields'),
     children: children
   };
-  // 可选项字段
+  // 选项字段
   var optionalFieldGroup = {
     type: 'itemGroup',
-    title: t('Optional fields'),
+    title: t('Choices fields'),
     children: optionalChildren
   };
   var dividerItem = {