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

package/es/schema-settings/VariableInput/hooks/useDateVariable.js

@@ -0,0 +1,129 @@
+import { useCompile } from '../../../schema-component';
+export var useDateVariable = function useDateVariable(_ref) {
+  var operator = _ref.operator,
+    schema = _ref.schema;
+  var compile = useCompile();
+  var operatorValue = (operator === null || operator === void 0 ? void 0 : operator.value) || '';
+  if (!operator || !schema) return null;
+  var disabled = !['DatePicker', 'DatePicker.RangePicker'].includes(schema['x-component']);
+  var dateOptions = [{
+    key: 'now',
+    value: 'now',
+    label: "{{t(\"Now\")}}",
+    disabled: schema['x-component'] !== 'DatePicker' || operatorValue === '$dateBetween'
+  }, {
+    key: 'yesterday',
+    value: 'yesterday',
+    label: "{{t(\"Yesterday\")}}",
+    disabled: disabled
+  }, {
+    key: 'today',
+    value: 'today',
+    label: "{{t(\"Today\")}}",
+    disabled: disabled
+  }, {
+    key: 'tomorrow',
+    value: 'tomorrow',
+    label: "{{t(\"Tomorrow\")}}",
+    disabled: disabled
+  }, {
+    key: 'lastIsoWeek',
+    value: 'lastIsoWeek',
+    label: "{{t(\"Last week\")}}",
+    disabled: disabled
+  }, {
+    key: 'thisIsoWeek',
+    value: 'thisIsoWeek',
+    label: "{{t(\"This week\")}}",
+    disabled: disabled
+  }, {
+    key: 'nextIsoWeek',
+    value: 'nextIsoWeek',
+    label: "{{t(\"Next week\")}}",
+    disabled: disabled
+  }, {
+    key: 'lastMonth',
+    value: 'lastMonth',
+    label: "{{t(\"Last month\")}}",
+    disabled: disabled
+  }, {
+    key: 'thisMonth',
+    value: 'thisMonth',
+    label: "{{t(\"This month\")}}",
+    disabled: disabled
+  }, {
+    key: 'nextMonth',
+    value: 'nextMonth',
+    label: "{{t(\"Next month\")}}",
+    disabled: disabled
+  }, {
+    key: 'lastQuarter',
+    value: 'lastQuarter',
+    label: "{{t(\"Last quarter\")}}",
+    disabled: disabled
+  }, {
+    key: 'thisQuarter',
+    value: 'thisQuarter',
+    label: "{{t(\"This quarter\")}}",
+    disabled: disabled
+  }, {
+    key: 'nextQuarter',
+    value: 'nextQuarter',
+    label: "{{t(\"Next quarter\")}}",
+    disabled: disabled
+  }, {
+    key: 'lastYear',
+    value: 'lastYear',
+    label: "{{t(\"Last year\")}}",
+    disabled: disabled
+  }, {
+    key: 'thisYear',
+    value: 'thisYear',
+    label: "{{t(\"This year\")}}",
+    disabled: disabled
+  }, {
+    key: 'nextYear',
+    value: 'nextYear',
+    label: "{{t(\"Next year\")}}",
+    disabled: disabled
+  }, {
+    key: 'last7Days',
+    value: 'last7Days',
+    label: "{{t(\"Last 7 days\")}}",
+    disabled: disabled
+  }, {
+    key: 'next7Days',
+    value: 'next7Days',
+    label: "{{t(\"Next 7 days\")}}",
+    disabled: disabled
+  }, {
+    key: 'last30Days',
+    value: 'last30Days',
+    label: "{{t(\"Last 30 days\")}}",
+    disabled: disabled
+  }, {
+    key: 'next30Days',
+    value: 'next30Days',
+    label: "{{t(\"Next 30 days\")}}",
+    disabled: disabled
+  }, {
+    key: 'last90Days',
+    value: 'last90Days',
+    label: "{{t(\"Last 90 days\")}}",
+    disabled: disabled
+  }, {
+    key: 'next90Days',
+    value: 'next90Days',
+    label: "{{t(\"Next 90 days\")}}",
+    disabled: disabled
+  }];
+  return compile({
+    label: "{{t(\"Date variables\")}}",
+    value: '$date',
+    key: '$date',
+    disabled: dateOptions.every(function (option) {
+      return option.disabled;
+    }),
+    children: dateOptions
+  });
+};

package/es/schema-settings/VariableInput/hooks/useUserVariable.d.ts

@@ -0,0 +1,5 @@
+export declare const useUserVariable: ({ operator, schema, level }: {
+    operator?: any;
+    schema: any;
+    level?: number;
+}) => any;

package/es/schema-settings/VariableInput/hooks/useUserVariable.js

@@ -0,0 +1,68 @@
+import { useMemo } from 'react';
+import { useCompile, useGetFilterOptions } from '../../../schema-component';
+var getChildren = function getChildren(options, _ref) {
+  var schema = _ref.schema,
+    operator = _ref.operator,
+    maxDepth = _ref.maxDepth,
+    _ref$count = _ref.count,
+    count = _ref$count === void 0 ? 1 : _ref$count,
+    getFilterOptions = _ref.getFilterOptions;
+  if (count > maxDepth) {
+    return [];
+  }
+  var result = options.map(function (option) {
+    if (option.type !== 'belongsTo' && option.type !== 'hasOne' || !option.target) {
+      var _option$schema;
+      return {
+        key: option.name,
+        value: option.name,
+        label: option.title,
+        // TODO: 现在是通过组件的名称来过滤能够被选择的选项，这样的坏处是不够精确，后续可以优化
+        disabled: (schema === null || schema === void 0 ? void 0 : schema['x-component']) !== ((_option$schema = option.schema) === null || _option$schema === void 0 ? void 0 : _option$schema['x-component'])
+      };
+    }
+    var children = getChildren(getFilterOptions(option.target), {
+      schema: schema,
+      operator: operator,
+      maxDepth: maxDepth,
+      count: count + 1,
+      getFilterOptions: getFilterOptions
+    }) || [];
+    return {
+      key: option.name,
+      value: option.name,
+      label: option.title,
+      children: children,
+      disabled: children.every(function (child) {
+        return child.disabled;
+      })
+    };
+  });
+  return result;
+};
+export var useUserVariable = function useUserVariable(_ref2) {
+  var operator = _ref2.operator,
+    schema = _ref2.schema,
+    level = _ref2.level;
+  var compile = useCompile();
+  var getFilterOptions = useGetFilterOptions();
+  var children = useMemo(function () {
+    return getChildren(getFilterOptions('users'), {
+      schema: schema,
+      operator: operator,
+      maxDepth: level || 3,
+      getFilterOptions: getFilterOptions
+    }) || [];
+  }, [operator, schema]);
+  return useMemo(function () {
+    return compile({
+      label: "{{t(\"Current user\")}}",
+      value: '$user',
+      key: '$user',
+      disabled: children.every(function (option) {
+        return option.disabled;
+      }),
+      children: children
+    });
+  }, [children]);
+};

package/es/schema-settings/VariableInput/hooks/useVariableOptions.d.ts

@@ -0,0 +1 @@
+export declare const useVariableOptions: () => any[];

package/es/schema-settings/VariableInput/hooks/useVariableOptions.js

@@ -0,0 +1,18 @@
+import { useValues } from '../../../schema-component/antd/filter/useValues';
+import { useDateVariable } from './useDateVariable';
+import { useUserVariable } from './useUserVariable';
+export var useVariableOptions = function useVariableOptions() {
+  var _useValues = useValues(),
+    operator = _useValues.operator,
+    schema = _useValues.schema;
+  var userVariable = useUserVariable({
+    operator: operator,
+    schema: schema
+  });
+  var dateVariable = useDateVariable({
+    operator: operator,
+    schema: schema
+  });
+  if (!operator || !schema) return [];
+  return [userVariable, dateVariable];
+};

package/es/user/VerificationCode.js

@@ -10,13 +10,13 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { useTranslation } from "react-i18next";
+import { useTranslation } from 'react-i18next';
 import { css } from '@emotion/css';
-import { useAPIClient } from "../api-client";
-import { useForm } from "@formily/react";
-import { useEffect, useRef, useState } from "react";
-import { Button, Input, message } from "antd";
-import React from "react";
+import { useAPIClient } from '../api-client';
+import { useForm } from '@formily/react';
+import { useEffect, useRef, useState } from 'react';
+import { Button, Input, message } from 'antd';
+import React from 'react';
 export default function VerificationCode(_ref) {
   var _ref$targetFieldName = _ref.targetFieldName,
     targetFieldName = _ref$targetFieldName === void 0 ? 'phone' : _ref$targetFieldName,
@@ -88,9 +88,8 @@ export default function VerificationCode(_ref) {
     }));
     return _onGetCode.apply(this, arguments);
   }
-  ;
   return /*#__PURE__*/React.createElement("fieldset", {
-    className: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n      display: flex;\n      gap: .5em;\n    "])))
+    className: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n        display: flex;\n        gap: 0.5em;\n      "])))
   }, /*#__PURE__*/React.createElement(Input, {
     value: value,
     onChange: onChange,

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

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

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

@@ -3,8 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.useUserVariable = void 0;
-var _filter = require("../../filter");
+exports.FilterDynamicComponent = FilterDynamicComponent;
+var _react = _interopRequireDefault(require("react"));
+var _schemaComponent = require("../../schema-component");
+var _filter = require("../../schema-component/antd/filter");
+var _useValues2 = require("../../schema-component/antd/filter/useValues");
+var _variable = require("../../schema-component/antd/variable");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 var useOptions = function useOptions(collectionName, _ref) {
   var schema = _ref.schema,
     operator = _ref.operator,
@@ -48,7 +53,7 @@ var useUserVariable = function useUserVariable(_ref2) {
   var options = useOptions('users', {
     schema: schema,
     operator: operator,
-    maxDepth: 3
+    maxDepth: 1
   }) || [];
   return {
     label: "{{t(\"Current user\")}}",
@@ -60,4 +65,27 @@ var useUserVariable = function useUserVariable(_ref2) {
     children: options
   };
 };
-exports.useUserVariable = useUserVariable;
+var useVariableOptions = function useVariableOptions() {
+  var _useValues = (0, _useValues2.useValues)(),
+    operator = _useValues.operator,
+    schema = _useValues.schema;
+  var userVariable = useUserVariable({
+    schema: schema,
+    operator: operator
+  });
+  if (!operator || !schema) return [];
+  return [userVariable];
+};
+function FilterDynamicComponent(props) {
+  var value = props.value,
+    onChange = props.onChange,
+    renderSchemaComponent = props.renderSchemaComponent;
+  var options = useVariableOptions();
+  var compile = (0, _schemaComponent.useCompile)();
+  var scope = compile(options);
+  return /*#__PURE__*/_react.default.createElement(_variable.Variable.Input, {
+    value: value,
+    onChange: onChange,
+    scope: scope
+  }, renderSchemaComponent());
+}

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

@@ -7,6 +7,7 @@ exports.scopesSchema = exports.rolesResourcesScopesCollection = void 0;
 var _react = require("react");
 var _blockProvider = require("../../../block-provider");
 var _schemaComponent = require("../../../schema-component");
+var _FilterDynamicComponent = require("../FilterDynamicComponent");
 var _RolesResourcesActions = require("../RolesResourcesActions");
 var rolesResourcesScopesCollection = {
   name: 'rolesResourcesScopes',
@@ -146,6 +147,7 @@ var scopesSchema = {
                                       'x-decorator': 'FormItem',
                                       'x-component': 'Filter',
                                       'x-component-props': {
+                                        dynamicComponent: _FilterDynamicComponent.FilterDynamicComponent,
                                         useProps: function useProps() {
                                           var ctx = (0, _react.useContext)(_RolesResourcesActions.RoleResourceCollectionContext);
                                           var options = (0, _schemaComponent.useFilterOptions)(ctx.name);
@@ -274,6 +276,7 @@ var scopesSchema = {
                                               'x-decorator': 'FormItem',
                                               'x-component': 'Filter',
                                               'x-component-props': {
+                                                dynamicComponent: _FilterDynamicComponent.FilterDynamicComponent,
                                                 useProps: function useProps() {
                                                   var ctx = (0, _react.useContext)(_RolesResourcesActions.RoleResourceCollectionContext);
                                                   var options = (0, _schemaComponent.useFilterOptions)(ctx.name);

package/lib/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/lib/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/lib/api-client/hooks/useRequest.js

@@ -13,14 +13,14 @@ var _react = require("react");
 var _context2 = require("../context");
 var _assign = require("./assign");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: 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); }
@@ -35,64 +35,59 @@ function useRequest(service) {
     state = _useSetState2[0],
     setState = _useSetState2[1];
   var api = (0, _react.useContext)(_context2.APIClientContext);
+  var tempOptions, tempService;
   if (typeof service === 'function') {
-    var _result = (0, _useRequest.default)(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 = (0, _useRequest.default)( /*#__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 = (0, _cloneDeep.default)(service);
-          if (resource) {
-            args.params = args.params || {};
-            (0, _assign.assign)(args.params, params);
-          } else {
-            args = (0, _shared.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 = (0, _cloneDeep.default)(service);
+              if (resource) {
+                args.params = args.params || {};
+                (0, _assign.assign)(args.params, params);
+              } else {
+                args = (0, _shared.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 = (0, _useRequest.default)(tempService, tempOptions);
   return _objectSpread(_objectSpread({}, result), {}, {
     state: state,
     setState: setState

package/lib/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/lib/application/Application.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.getCurrentTimezone = exports.Application = void 0;
 var _antd = require("antd");
 var _react = _interopRequireWildcard(require("react"));
+var _reactErrorBoundary = require("react-error-boundary");
 var _reactI18next = require("react-i18next");
 var _reactRouterDom = require("react-router-dom");
 var _acl = require("../acl");
@@ -19,6 +20,7 @@ var _pluginManager = require("../plugin-manager");
 var _pm = _interopRequireWildcard(require("../pm"));
 var _routeSwitch = require("../route-switch");
 var _schemaComponent = require("../schema-component");
+var _errorFallback = require("../schema-component/antd/error-fallback");
 var _schemaInitializer = require("../schema-initializer");
 var _schemaTemplates = require("../schema-templates");
 var _systemSettings = require("../system-settings");
@@ -165,6 +167,11 @@ 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() {
@@ -235,9 +242,12 @@ var Application = /*#__PURE__*/function () {
         if (loading) {
           return /*#__PURE__*/_react.default.createElement(_antd.Spin, null);
         }
-        return /*#__PURE__*/_react.default.createElement(App, {
+        return /*#__PURE__*/_react.default.createElement(_reactErrorBoundary.ErrorBoundary, {
+          FallbackComponent: _errorFallback.ErrorFallback,
+          onError: _this.handleErrors
+        }, /*#__PURE__*/_react.default.createElement(App, {
           providers: _this.providers
-        });
+        }));
       };
     }
   }]);

package/lib/block-provider/FormFieldProvider.js

@@ -7,6 +7,7 @@ exports.useFormFieldProps = exports.useFormFieldContext = exports.WithoutFormFie
 var _core = require("@formily/core");
 var _react = require("@formily/react");
 var _reactive = require("@formily/reactive");
+var _client = require("@nocobase/utils/client");
 var _antd = require("antd");
 var _react2 = _interopRequireWildcard(require("react"));
 var _recordProvider = require("../record-provider");
@@ -48,7 +49,14 @@ var InternalFormFieldProvider = function InternalFormFieldProvider(props) {
   (0, _react2.useEffect)(function () {
     var dispose = (0, _reactive.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();
+      (0, _client.forEach)(data, function (value, key) {
+        if (value) {
+          form.values[key] = value;
+        }
+      });
     });
     return dispose;
   }, []);