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

package/es/schema-settings/SchemaSettings.js

@@ -41,14 +41,13 @@ import _, { cloneDeep } from 'lodash';
 import React, { createContext, useCallback, useContext, useMemo, useState } from 'react';
 import { createPortal } from 'react-dom';
 import { useTranslation } from 'react-i18next';
-import { APIClientProvider, ActionContext, CollectionManagerContext, FormProvider, RemoteSchemaComponent, SchemaComponent, SchemaComponentOptions, createDesignable, findFormBlock, useAPIClient, useCollection, useLinkageCollectionFilterOptions, useCollectionManager, useCompile, useDesignable } from '..';
+import { APIClientProvider, ActionContext, CollectionManagerContext, FormProvider, RemoteSchemaComponent, SchemaComponent, SchemaComponentOptions, createDesignable, findFormBlock, useAPIClient, useCollection, useCollectionManager, useCompile, useDesignable, useLinkageCollectionFilterOptions } from '..';
 import { findFilterTargets, updateFilterTargets } from '../block-provider/hooks';
 import { isSameCollection, useSupportedBlocks } from '../filter-provider/utils';
 import { getTargetKey } from '../schema-component/antd/association-filter/utilts';
 import { useSchemaTemplateManager } from '../schema-templates';
 import { useBlockTemplateContext } from '../schema-templates/BlockTemplate';
 import { FormDataTemplates } from './DataTemplates';
-import { EnableChildCollections } from './EnableChildCollections';
 import { FormLinkageRules } from './LinkageRules';
 import { useLinkageCollectionFieldOptions } from './LinkageRules/action-hooks';
 var SchemaSettingsContext = /*#__PURE__*/createContext(null);
@@ -97,7 +96,7 @@ export var SchemaSettings = function SchemaSettings(props) {
   }
   return DropdownMenu;
 };
-SchemaSettings.Template = function (props) {
+SchemaSettings.Template = function Template(props) {
   var componentName = props.componentName,
     collectionName = props.collectionName,
     resourceName = props.resourceName;
@@ -269,7 +268,7 @@ var findBlockTemplateSchema = function findBlockTemplateSchema(fieldSchema) {
     return buf;
   }, null);
 };
-SchemaSettings.FormItemTemplate = function (props) {
+SchemaSettings.FormItemTemplate = function FormItemTemplate(props) {
   var _props$insertAdjacent = props.insertAdjacentPosition,
     insertAdjacentPosition = _props$insertAdjacent === void 0 ? 'afterBegin' : _props$insertAdjacent,
     componentName = props.componentName,
@@ -444,7 +443,7 @@ SchemaSettings.FormItemTemplate = function (props) {
     }()
   }, t('Save as block template'));
 };
-SchemaSettings.Item = function (props) {
+SchemaSettings.Item = function Item(props) {
   var eventKey = props.eventKey;
   var key = useMemo(function () {
     return uid();
@@ -473,7 +472,7 @@ SchemaSettings.SubMenu = function (props) {
 SchemaSettings.Divider = function (props) {
   return /*#__PURE__*/React.createElement(Menu.Divider, _objectSpread({}, props));
 };
-SchemaSettings.Remove = function (props) {
+SchemaSettings.Remove = function Remove(props) {
   var confirm = props.confirm,
     removeParentsIfNoChildren = props.removeParentsIfNoChildren,
     breakRemoveOn = props.breakRemoveOn;
@@ -513,7 +512,7 @@ SchemaSettings.Remove = function (props) {
     }
   }, t('Delete'));
 };
-SchemaSettings.ConnectDataBlocks = function (props) {
+SchemaSettings.ConnectDataBlocks = function ConnectDataBlocks(props) {
   var type = props.type,
     emptyDescription = props.emptyDescription;
   var fieldSchema = useFieldSchema();
@@ -638,7 +637,7 @@ SchemaSettings.ConnectDataBlocks = function (props) {
     image: Empty.PRESENTED_IMAGE_SIMPLE
   }));
 };
-SchemaSettings.SelectItem = function (props) {
+SchemaSettings.SelectItem = function SelectItem(props) {
   var title = props.title,
     options = props.options,
     value = props.value,
@@ -657,11 +656,12 @@ SchemaSettings.SelectItem = function (props) {
     }
     _onClick === null || _onClick === void 0 ? void 0 : _onClick.apply(void 0, args);
   };
+  var onMouseEnter = useCallback(function () {
+    return setOpen(true);
+  }, []);
   // 鼠标 hover 时，打开下拉框
   var moreProps = openOnHover ? {
-    onMouseEnter: useCallback(function () {
-      return setOpen(true);
-    }, []),
+    onMouseEnter: onMouseEnter,
     open: open
   } : {};
   return /*#__PURE__*/React.createElement(SchemaSettings.Item, _objectSpread({}, others), /*#__PURE__*/React.createElement("div", {
@@ -707,7 +707,7 @@ SchemaSettings.CascaderItem = function (props) {
     }
   })));
 };
-SchemaSettings.SwitchItem = function (props) {
+SchemaSettings.SwitchItem = function SwitchItem(props) {
   var title = props.title,
     onChange = props.onChange,
     others = _objectWithoutProperties(props, _excluded5);
@@ -734,7 +734,7 @@ SchemaSettings.SwitchItem = function (props) {
     }
   })));
 };
-SchemaSettings.PopupItem = function (props) {
+SchemaSettings.PopupItem = function PopupItem(props) {
   var schema = props.schema,
     others = _objectWithoutProperties(props, _excluded6);
   var _useState7 = useState(false),
@@ -885,7 +885,7 @@ SchemaSettings.ActionModalItem = /*#__PURE__*/React.memo(function (props) {
     schema: schema
   }))))), document.body));
 });
-SchemaSettings.ModalItem = function (props) {
+SchemaSettings.ModalItem = function ModalItem(props) {
   var hidden = props.hidden,
     title = props.title,
     components = props.components,
@@ -965,7 +965,7 @@ SchemaSettings.ModalItem = function (props) {
     }()
   }), props.children || props.title);
 };
-SchemaSettings.BlockTitleItem = function () {
+SchemaSettings.BlockTitleItem = function BlockTitleItem() {
   var _fieldSchema$xCompon;
   var field = useField();
   var fieldSchema = useFieldSchema();
@@ -1002,7 +1002,7 @@ SchemaSettings.BlockTitleItem = function () {
     }
   });
 };
-SchemaSettings.DefaultSortingRules = function (props) {
+SchemaSettings.DefaultSortingRules = function DefaultSortingRules(props) {
   var sort = props.sort,
     sortFields = props.sortFields,
     onSubmit = props.onSubmit;
@@ -1082,7 +1082,7 @@ SchemaSettings.DefaultSortingRules = function (props) {
     onSubmit: onSubmit
   });
 };
-SchemaSettings.LinkageRules = function (props) {
+SchemaSettings.LinkageRules = function LinkageRules(props) {
   var collectionName = props.collectionName;
   var fieldSchema = useFieldSchema();
   var _useDesignable3 = useDesignable(),
@@ -1154,7 +1154,7 @@ export var useDataTemplates = function useDataTemplates() {
     templateData: _.cloneDeep(formSchema === null || formSchema === void 0 ? void 0 : formSchema['x-data-templates'])
   };
 };
-SchemaSettings.DataTemplates = function (props) {
+SchemaSettings.DataTemplates = function DataTemplates(props) {
   var collectionName = props.collectionName;
   var fieldSchema = useFieldSchema();
   var _useDesignable4 = useDesignable(),
@@ -1200,7 +1200,7 @@ SchemaSettings.DataTemplates = function (props) {
     }
   });
 };
-SchemaSettings.EnableChildCollections = function (props) {
+SchemaSettings.EnableChildCollections = function EnableChildCollections(props) {
   var collectionName = props.collectionName;
   var fieldSchema = useFieldSchema();
   var _useDesignable5 = useDesignable(),
@@ -1274,4 +1274,17 @@ SchemaSettings.EnableChildCollections = function (props) {
       dn.refresh();
     }
   });
+};
+// 是否显示默认值配置项
+export var isShowDefaultValue = function isShowDefaultValue(collectionField, getInterface) {
+  return !['o2o', 'oho', 'obo', 'o2m', 'attachment'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) && !isSystemField(collectionField, getInterface);
+};
+// 是否是系统字段
+export var isSystemField = function isSystemField(collectionField, getInterface) {
+  var i = getInterface === null || getInterface === void 0 ? void 0 : getInterface(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface);
+  return (i === null || i === void 0 ? void 0 : i.group) === 'systemInfo';
+};
+export var isPatternDisabled = function isPatternDisabled(fieldSchema) {
+  var _fieldSchema$xCompon2;
+  return (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon2 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon2 === void 0 ? void 0 : _fieldSchema$xCompon2['pattern-disable']) == true;
 };

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

@@ -0,0 +1,13 @@
+import React from 'react';
+declare type Props = {
+    value: any;
+    onChange: (value: any) => void;
+    collectionName: string;
+    renderSchemaComponent?: (props: any) => any;
+    style: React.CSSProperties;
+    schema: any;
+    operator: any;
+    children: any;
+};
+export declare const VariableInput: (props: Props) => JSX.Element;
+export {};

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

@@ -0,0 +1,37 @@
+import React, { useMemo } from 'react';
+import { Variable, useCompile } from '../../schema-component';
+import { useUserVariable } from './hooks/useUserVariable';
+export var VariableInput = function VariableInput(props) {
+  var value = props.value,
+    onChange = props.onChange,
+    RenderSchemaComponent = props.renderSchemaComponent,
+    style = props.style,
+    schema = props.schema;
+  var compile = useCompile();
+  var userVariable = useUserVariable({
+    schema: schema,
+    level: 1
+  });
+  var scope = useMemo(function () {
+    return [userVariable, compile({
+      label: "{{t(\"Date variables\")}}",
+      value: '$date',
+      key: '$date',
+      disabled: schema['x-component'] !== 'DatePicker',
+      children: [{
+        key: 'now',
+        value: 'now',
+        label: "{{t(\"Now\")}}"
+      }]
+    })];
+  }, []);
+  return /*#__PURE__*/React.createElement(Variable.Input, {
+    value: value,
+    onChange: onChange,
+    scope: scope,
+    style: style
+  }, /*#__PURE__*/React.createElement(RenderSchemaComponent, {
+    value: value,
+    onChange: onChange
+  }));
+};

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

@@ -0,0 +1,4 @@
+export declare const useDateVariable: ({ operator, schema }: {
+    operator: any;
+    schema: any;
+}) => any;

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/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;
   }, []);