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

package/es/schema-component/antd/association-select/AssociationSelect.js

@@ -1,7 +1,6 @@
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _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); }
 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 _objectDestructuringEmpty(obj) { if (obj == null) throw new TypeError("Cannot destructure " + obj); }
 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 _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); }
@@ -17,7 +16,8 @@ import React, { useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useFilterByTk, useFormBlockContext } from '../../../block-provider';
 import { useCollection, useCollectionFilterOptions, useCollectionManager, useSortFields } from '../../../collection-manager';
-import { GeneralSchemaDesigner, SchemaSettings } from '../../../schema-settings';
+import { isTitleField } from '../../../collection-manager/Configuration/CollectionFields';
+import { GeneralSchemaDesigner, SchemaSettings, isPatternDisabled, isShowDefaultValue } from '../../../schema-settings';
 import { useCompile, useDesignable, useFieldComponentOptions, useFieldTitle } from '../../hooks';
 import { removeNullCondition } from '../filter';
 import { RemoteSelect } from '../remote-select';
@@ -69,16 +69,15 @@ var InternalAssociationSelect = connect(function (props) {
   });
 }), mapReadPretty(ReadPretty));
 export var AssociationSelect = InternalAssociationSelect;
-AssociationSelect.Designer = function () {
-  var _interfaceConfig$vali, _collectionField$uiSc, _field$componentProps, _field$componentProps2, _field$componentProps3, _field$componentProps4, _field$componentProps5, _field$componentProps6, _collectionField$uiSc2, _fieldSchema$xDecora, _collectionField$uiSc4, _fieldSchema$xCompon, _field$componentProps7, _field$componentProps8;
+AssociationSelect.Designer = function Designer() {
+  var _interfaceConfig$vali, _collectionField$uiSc, _field$componentProps, _field$componentProps2, _field$componentProps3, _field$componentProps4, _field$componentProps5, _field$componentProps6, _collectionField$uiSc2, _fieldSchema$xDecora, _fieldSchema$xCompon, _field$componentProps7, _field$componentProps8;
   var _useCollectionManager = useCollectionManager(),
     getCollectionFields = _useCollectionManager.getCollectionFields,
     getInterface = _useCollectionManager.getInterface,
     getCollectionJoinField = _useCollectionManager.getCollectionJoinField,
     getCollection = _useCollectionManager.getCollection;
   var _useCollection = useCollection(),
-    getField = _useCollection.getField,
-    template = _useCollection.template;
+    getField = _useCollection.getField;
   var _useFormBlockContext = useFormBlockContext(),
     form = _useFormBlockContext.form;
   var field = useField();
@@ -86,7 +85,6 @@ AssociationSelect.Designer = function () {
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
   var tk = useFilterByTk();
-  _objectDestructuringEmpty(useCollection());
   var _useDesignable = useDesignable(),
     dn = _useDesignable.dn,
     refresh = _useDesignable.refresh,
@@ -119,7 +117,7 @@ AssociationSelect.Designer = function () {
     initialValue['required'] = field.required;
   }
   var options = targetFields.filter(function (field) {
-    return !(field === null || field === void 0 ? void 0 : field.target) && field.type !== 'boolean';
+    return isTitleField(field);
   }).map(function (field) {
     var _field$uiSchema;
     return {
@@ -370,20 +368,27 @@ AssociationSelect.Designer = function () {
       });
       refresh();
     }
-  }), form && !(form === null || form === void 0 ? void 0 : form.readPretty) && (collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc4 = collectionField.uiSchema) === null || _collectionField$uiSc4 === void 0 ? void 0 : _collectionField$uiSc4.type) && /*#__PURE__*/React.createElement(SchemaSettings.ModalItem, {
+  }), form && !(form === null || form === void 0 ? void 0 : form.readPretty) && isShowDefaultValue(collectionField, getInterface) && !isPatternDisabled(fieldSchema) && /*#__PURE__*/React.createElement(SchemaSettings.ModalItem, {
     title: t('Set default value'),
     components: {
       ArrayCollapse: ArrayCollapse,
       FormLayout: FormLayout
     },
+    width: 800,
     schema: {
       type: 'object',
       title: t('Set default value'),
       properties: {
-        default: _objectSpread(_objectSpread({}, collectionField.uiSchema), {}, {
+        default: _objectSpread(_objectSpread({}, fieldSchema || {}), {}, {
+          'x-decorator': 'FormItem',
+          'x-component-props': _objectSpread(_objectSpread({}, fieldSchema['x-component-props']), {}, {
+            component: (collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) ? 'AssociationSelect' : undefined,
+            service: {
+              resource: collectionField === null || collectionField === void 0 ? void 0 : collectionField.target
+            }
+          }),
           name: 'default',
           title: t('Default value'),
-          'x-decorator': 'FormItem',
           default: fieldSchema.default || collectionField.defaultValue
         })
       }
@@ -405,7 +410,7 @@ AssociationSelect.Designer = function () {
     options: fieldComponentOptions,
     value: fieldSchema['x-component'],
     onChange: function onChange(type) {
-      var _collectionField$uiSc5, _interfaceConfig$sche;
+      var _collectionField$uiSc4, _interfaceConfig$sche;
       var schema = {
         name: collectionField.name,
         type: 'void',
@@ -418,7 +423,7 @@ AssociationSelect.Designer = function () {
         'x-validator': fieldSchema['x-validator'],
         'x-collection-field': fieldSchema['x-collection-field'],
         'x-decorator-props': fieldSchema['x-decorator-props'],
-        'x-component-props': _objectSpread(_objectSpread({}, collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc5 = collectionField.uiSchema) === null || _collectionField$uiSc5 === void 0 ? void 0 : _collectionField$uiSc5['x-component-props']), fieldSchema['x-component-props'])
+        'x-component-props': _objectSpread(_objectSpread({}, collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc4 = collectionField.uiSchema) === null || _collectionField$uiSc4 === void 0 ? void 0 : _collectionField$uiSc4['x-component-props']), fieldSchema['x-component-props'])
       };
       interfaceConfig === null || interfaceConfig === void 0 ? void 0 : (_interfaceConfig$sche = interfaceConfig.schemaInitialize) === null || _interfaceConfig$sche === void 0 ? void 0 : _interfaceConfig$sche.call(interfaceConfig, schema, {
         field: collectionField,
@@ -441,6 +446,22 @@ AssociationSelect.Designer = function () {
         }
       });
     }
+  }), form && !(form === null || form === void 0 ? void 0 : form.readPretty) && ['o2m', 'm2m'].includes(collectionField.interface) && fieldSchema['x-component'] !== 'TableField' && /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
+    key: "multiple",
+    title: t('Multiple'),
+    checked: ((_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : _fieldSchema$xCompon.multiple) === undefined ? true : fieldSchema['x-component-props'].multiple,
+    onChange: function onChange(value) {
+      var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
+      fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
+      field.componentProps = field.componentProps || {};
+      fieldSchema['x-component-props'].multiple = value;
+      field.componentProps.multiple = value;
+      schema['x-component-props'] = fieldSchema['x-component-props'];
+      dn.emit('patch', {
+        schema: schema
+      });
+      refresh();
+    }
   }), /*#__PURE__*/React.createElement(SchemaSettings.ModalItem, {
     title: t('Set the data scope'),
     schema: {
@@ -461,13 +482,13 @@ AssociationSelect.Designer = function () {
       }
     },
     onSubmit: function onSubmit(_ref4) {
-      var _schema4;
+      var _schema5;
       var filter = _ref4.filter;
       filter = removeNullCondition(filter);
       _.set(field.componentProps, 'service.params.filter', filter);
       fieldSchema['x-component-props'] = field.componentProps;
       dn.emit('patch', {
-        schema: (_schema4 = {}, _defineProperty(_schema4, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema4, 'x-component-props', field.componentProps), _schema4)
+        schema: (_schema5 = {}, _defineProperty(_schema5, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema5, 'x-component-props', field.componentProps), _schema5)
       });
     }
   }), /*#__PURE__*/React.createElement(SchemaSettings.ModalItem, {
@@ -542,7 +563,7 @@ AssociationSelect.Designer = function () {
       }
     },
     onSubmit: function onSubmit(_ref5) {
-      var _schema5;
+      var _schema6;
       var sort = _ref5.sort;
       var sortArr = sort.map(function (item) {
         return item.direction === 'desc' ? "-".concat(item.field) : item.field;
@@ -550,10 +571,10 @@ AssociationSelect.Designer = function () {
       _.set(field.componentProps, 'service.params.sort', sortArr);
       fieldSchema['x-component-props'] = field.componentProps;
       dn.emit('patch', {
-        schema: (_schema5 = {}, _defineProperty(_schema5, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema5, 'x-component-props', field.componentProps), _schema5)
+        schema: (_schema6 = {}, _defineProperty(_schema6, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema6, 'x-component-props', field.componentProps), _schema6)
       });
     }
-  }), form && !(form === null || form === void 0 ? void 0 : form.readPretty) && (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : _fieldSchema$xCompon['pattern-disable']) != true && /*#__PURE__*/React.createElement(SchemaSettings.SelectItem, {
+  }), form && !(form === null || form === void 0 ? void 0 : form.readPretty) && !isPatternDisabled(fieldSchema) && /*#__PURE__*/React.createElement(SchemaSettings.SelectItem, {
     key: "pattern",
     title: t('Pattern'),
     options: [{
@@ -611,9 +632,9 @@ AssociationSelect.Designer = function () {
     options: options,
     value: field === null || field === void 0 ? void 0 : (_field$componentProps7 = field.componentProps) === null || _field$componentProps7 === void 0 ? void 0 : (_field$componentProps8 = _field$componentProps7.fieldNames) === null || _field$componentProps8 === void 0 ? void 0 : _field$componentProps8.label,
     onChange: function onChange(label) {
-      var _collectionField$uiSc6, _collectionField$uiSc7;
+      var _collectionField$uiSc5, _collectionField$uiSc6;
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
-      var fieldNames = _objectSpread(_objectSpread(_objectSpread({}, collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc6 = collectionField.uiSchema) === null || _collectionField$uiSc6 === void 0 ? void 0 : (_collectionField$uiSc7 = _collectionField$uiSc6['x-component-props']) === null || _collectionField$uiSc7 === void 0 ? void 0 : _collectionField$uiSc7['fieldNames']), field.componentProps.fieldNames), {}, {
+      var fieldNames = _objectSpread(_objectSpread(_objectSpread({}, collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc5 = collectionField.uiSchema) === null || _collectionField$uiSc5 === void 0 ? void 0 : (_collectionField$uiSc6 = _collectionField$uiSc5['x-component-props']) === null || _collectionField$uiSc6 === void 0 ? void 0 : _collectionField$uiSc6['fieldNames']), field.componentProps.fieldNames), {}, {
         label: label
       });
       field.componentProps.fieldNames = fieldNames;
@@ -640,14 +661,14 @@ AssociationSelect.Designer = function () {
  * 用于筛选表单区块
  * @returns
  */
-AssociationSelect.FilterDesigner = function () {
-  var _interfaceConfig$vali2, _collectionField$uiSc8, _field$componentProps9, _field$componentProps10, _field$componentProps11, _field$componentProps12, _field$componentProps13, _field$componentProps14, _collectionField$uiSc9, _fieldSchema$xDecora2, _collectionField$uiSc11, _field$componentProps15, _field$componentProps16;
+AssociationSelect.FilterDesigner = function FilterDesigner() {
+  var _interfaceConfig$vali2, _collectionField$uiSc7, _field$componentProps9, _field$componentProps10, _field$componentProps11, _field$componentProps12, _field$componentProps13, _field$componentProps14, _collectionField$uiSc8, _fieldSchema$xDecora2, _collectionField$uiSc10, _field$componentProps15, _field$componentProps16;
   var _useCollectionManager2 = useCollectionManager(),
     getCollectionFields = _useCollectionManager2.getCollectionFields,
     getInterface = _useCollectionManager2.getInterface,
     getCollectionJoinField = _useCollectionManager2.getCollectionJoinField;
-  var _useCollection3 = useCollection(),
-    getField = _useCollection3.getField;
+  var _useCollection2 = useCollection(),
+    getField = _useCollection2.getField;
   var _useFormBlockContext2 = useFormBlockContext(),
     form = _useFormBlockContext2.form;
   var field = useField();
@@ -661,7 +682,7 @@ AssociationSelect.FilterDesigner = function () {
   var collectionField = getField(fieldSchema['name']) || getCollectionJoinField(fieldSchema['x-collection-field']);
   var interfaceConfig = getInterface(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface);
   var validateSchema = interfaceConfig === null || interfaceConfig === void 0 ? void 0 : (_interfaceConfig$vali2 = interfaceConfig['validateSchema']) === null || _interfaceConfig$vali2 === void 0 ? void 0 : _interfaceConfig$vali2.call(interfaceConfig, fieldSchema);
-  var originalTitle = collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc8 = collectionField.uiSchema) === null || _collectionField$uiSc8 === void 0 ? void 0 : _collectionField$uiSc8.title;
+  var originalTitle = collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc7 = collectionField.uiSchema) === null || _collectionField$uiSc7 === void 0 ? void 0 : _collectionField$uiSc7.title;
   var targetFields = (collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) ? getCollectionFields(collectionField.target) : [];
   var initialValue = {
     title: field.title === originalTitle ? undefined : field.title
@@ -708,7 +729,7 @@ AssociationSelect.FilterDesigner = function () {
         title: {
           title: t('Field title'),
           default: field === null || field === void 0 ? void 0 : field.title,
-          description: "".concat(t('Original field title: ')).concat(collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc9 = collectionField.uiSchema) === null || _collectionField$uiSc9 === void 0 ? void 0 : _collectionField$uiSc9.title),
+          description: "".concat(t('Original field title: ')).concat(collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc8 = collectionField.uiSchema) === null || _collectionField$uiSc8 === void 0 ? void 0 : _collectionField$uiSc8.title),
           'x-decorator': 'FormItem',
           'x-component': 'Input',
           'x-component-props': {}
@@ -873,7 +894,7 @@ AssociationSelect.FilterDesigner = function () {
       }
     },
     onSubmit: function onSubmit(v) {
-      var _collectionField$uiSc10;
+      var _collectionField$uiSc9;
       var rules = [];
       var _iterator3 = _createForOfIteratorHelper(v.rules),
         _step3;
@@ -911,7 +932,7 @@ AssociationSelect.FilterDesigner = function () {
           _iterator4.f();
         }
       }
-      var concatValidator = _.concat([], (collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc10 = collectionField.uiSchema) === null || _collectionField$uiSc10 === void 0 ? void 0 : _collectionField$uiSc10['x-validator']) || [], rules);
+      var concatValidator = _.concat([], (collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc9 = collectionField.uiSchema) === null || _collectionField$uiSc9 === void 0 ? void 0 : _collectionField$uiSc9['x-validator']) || [], rules);
       field.validator = concatValidator;
       fieldSchema['x-validator'] = rules;
       schema['x-validator'] = rules;
@@ -920,7 +941,7 @@ AssociationSelect.FilterDesigner = function () {
       });
       refresh();
     }
-  }), form && !(form === null || form === void 0 ? void 0 : form.readPretty) && (collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc11 = collectionField.uiSchema) === null || _collectionField$uiSc11 === void 0 ? void 0 : _collectionField$uiSc11.type) && /*#__PURE__*/React.createElement(SchemaSettings.ModalItem, {
+  }), form && !(form === null || form === void 0 ? void 0 : form.readPretty) && (collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc10 = collectionField.uiSchema) === null || _collectionField$uiSc10 === void 0 ? void 0 : _collectionField$uiSc10.type) && /*#__PURE__*/React.createElement(SchemaSettings.ModalItem, {
     title: t('Set default value'),
     components: {
       ArrayCollapse: ArrayCollapse,
@@ -970,13 +991,13 @@ AssociationSelect.FilterDesigner = function () {
       }
     },
     onSubmit: function onSubmit(_ref9) {
-      var _schema10;
+      var _schema11;
       var filter = _ref9.filter;
       filter = removeNullCondition(filter);
       _.set(field.componentProps, 'service.params.filter', filter);
       fieldSchema['x-component-props'] = field.componentProps;
       dn.emit('patch', {
-        schema: (_schema10 = {}, _defineProperty(_schema10, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema10, 'x-component-props', field.componentProps), _schema10)
+        schema: (_schema11 = {}, _defineProperty(_schema11, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema11, 'x-component-props', field.componentProps), _schema11)
       });
     }
   }), /*#__PURE__*/React.createElement(SchemaSettings.ModalItem, {
@@ -1051,7 +1072,7 @@ AssociationSelect.FilterDesigner = function () {
       }
     },
     onSubmit: function onSubmit(_ref10) {
-      var _schema11;
+      var _schema12;
       var sort = _ref10.sort;
       var sortArr = sort.map(function (item) {
         return item.direction === 'desc' ? "-".concat(item.field) : item.field;
@@ -1059,7 +1080,7 @@ AssociationSelect.FilterDesigner = function () {
       _.set(field.componentProps, 'service.params.sort', sortArr);
       fieldSchema['x-component-props'] = field.componentProps;
       dn.emit('patch', {
-        schema: (_schema11 = {}, _defineProperty(_schema11, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema11, 'x-component-props', field.componentProps), _schema11)
+        schema: (_schema12 = {}, _defineProperty(_schema12, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema12, 'x-component-props', field.componentProps), _schema12)
       });
     }
   }), (collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) && ['CollectionField', 'AssociationSelect'].includes(fieldSchema['x-component']) && /*#__PURE__*/React.createElement(SchemaSettings.SelectItem, {
@@ -1068,9 +1089,9 @@ AssociationSelect.FilterDesigner = function () {
     options: options,
     value: field === null || field === void 0 ? void 0 : (_field$componentProps15 = field.componentProps) === null || _field$componentProps15 === void 0 ? void 0 : (_field$componentProps16 = _field$componentProps15.fieldNames) === null || _field$componentProps16 === void 0 ? void 0 : _field$componentProps16.label,
     onChange: function onChange(label) {
-      var _collectionField$uiSc12, _collectionField$uiSc13;
+      var _collectionField$uiSc11, _collectionField$uiSc12;
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
-      var fieldNames = _objectSpread(_objectSpread(_objectSpread({}, collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc12 = collectionField.uiSchema) === null || _collectionField$uiSc12 === void 0 ? void 0 : (_collectionField$uiSc13 = _collectionField$uiSc12['x-component-props']) === null || _collectionField$uiSc13 === void 0 ? void 0 : _collectionField$uiSc13['fieldNames']), field.componentProps.fieldNames), {}, {
+      var fieldNames = _objectSpread(_objectSpread(_objectSpread({}, collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc11 = collectionField.uiSchema) === null || _collectionField$uiSc11 === void 0 ? void 0 : (_collectionField$uiSc12 = _collectionField$uiSc11['x-component-props']) === null || _collectionField$uiSc12 === void 0 ? void 0 : _collectionField$uiSc12['fieldNames']), field.componentProps.fieldNames), {}, {
         label: label
       });
       field.componentProps.fieldNames = fieldNames;

package/es/schema-component/antd/association-select/useServiceOptions.js

@@ -8,6 +8,7 @@ import { useFieldSchema } from '@formily/react';
 import { useCallback, useMemo } from 'react';
 import { mergeFilter } from '../../../block-provider/SharedFilterProvider';
 import { useCollection, useCollectionManager } from '../../../collection-manager';
+import { isInFilterFormBlock } from '../../../filter-provider';
 import { useRecord } from '../../../record-provider';
 export default function useServiceOptions(props) {
   var _props$action = props.action,
@@ -43,9 +44,9 @@ export default function useServiceOptions(props) {
   var sourceValue = record === null || record === void 0 ? void 0 : record[collectionField === null || collectionField === void 0 ? void 0 : collectionField.sourceKey];
   var filter = useMemo(function () {
     var isOToAny = ['oho', 'o2m'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface);
-    return mergeFilter([mergeFilter([isOToAny ? _defineProperty({}, collectionField.foreignKey, {
+    return mergeFilter([mergeFilter([isOToAny && !isInFilterFormBlock(fieldSchema) ? _defineProperty({}, collectionField.foreignKey, {
       $is: null
-    }) : null, params === null || params === void 0 ? void 0 : params.filter]), isOToAny && sourceValue !== undefined && sourceValue !== null ? _defineProperty({}, collectionField.foreignKey, {
+    }) : null, params === null || params === void 0 ? void 0 : params.filter]), isOToAny && sourceValue !== undefined && sourceValue !== null && !isInFilterFormBlock(fieldSchema) ? _defineProperty({}, collectionField.foreignKey, {
       $eq: sourceValue
     }) : null, (params === null || params === void 0 ? void 0 : params.filter) && value ? _defineProperty({}, fieldNames.value, _defineProperty({}, '$in', value)) : null], '$or');
   }, [params === null || params === void 0 ? void 0 : params.filter, getCollectionFields, collectionField, sourceValue, value, fieldNames.value]);

package/es/schema-component/antd/checkbox/Checkbox.js

@@ -10,6 +10,7 @@ import { isValid } from '@formily/shared';
 import { Checkbox as AntdCheckbox, Tag } from 'antd';
 import uniq from 'lodash/uniq';
 import React from 'react';
+import { EllipsisWithTooltip } from '../input/EllipsisWithTooltip';
 export var Checkbox = connect(function (props) {
   var changeHandler = function changeHandler(val) {
     props === null || props === void 0 ? void 0 : props.onChange(val);
@@ -41,12 +42,12 @@ Checkbox.Group = connect(AntdCheckbox.Group, mapProps({
   if (!isValid(props.value)) {
     return null;
   }
-  var _props$options = props.options,
-    options = _props$options === void 0 ? [] : _props$options;
   var field = useField();
   var dataSource = field.dataSource || [];
   var value = uniq(field.value ? field.value : []);
-  return /*#__PURE__*/React.createElement("div", null, dataSource.filter(function (option) {
+  return /*#__PURE__*/React.createElement(EllipsisWithTooltip, {
+    ellipsis: props.ellipsis
+  }, dataSource.filter(function (option) {
     return value.includes(option.value);
   }).map(function (option, key) {
     return /*#__PURE__*/React.createElement(Tag, {

package/es/schema-component/antd/collection-select/CollectionSelect.d.ts

@@ -1,5 +1,5 @@
-import { SelectProps } from "antd";
-import React from "react";
+import { SelectProps } from 'antd';
+import React from 'react';
 export declare type CollectionSelectProps = SelectProps<any, any> & {
     filter?: (item: any, index: number, array: any[]) => boolean;
 };

package/es/schema-component/antd/collection-select/CollectionSelect.js

@@ -7,12 +7,12 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 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 _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-import { connect, mapReadPretty, observer } from "@formily/react";
-import { Select, Tag } from "antd";
-import React from "react";
-import { useTranslation } from "react-i18next";
-import { useCollectionManager } from "../../../collection-manager/hooks";
-import { useCompile } from "../../hooks";
+import { connect, mapReadPretty, observer } from '@formily/react';
+import { Select, Tag } from 'antd';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
+import { useCollectionManager } from '../../../collection-manager/hooks';
+import { useCompile } from '../../hooks';
 function useOptions(_ref) {
   var filter = _ref.filter;
   var compile = useCompile();

package/es/schema-component/antd/error-fallback/ErrorFallback.d.ts

@@ -0,0 +1,3 @@
+export declare const ErrorFallback: ({ error }: {
+    error: any;
+}) => JSX.Element;

package/es/schema-component/antd/error-fallback/ErrorFallback.js

@@ -0,0 +1,47 @@
+import { Button, Result, Typography } from 'antd';
+import React from 'react';
+import { useErrorBoundary } from 'react-error-boundary';
+import { Trans, useTranslation } from 'react-i18next';
+var Paragraph = Typography.Paragraph,
+  Text = Typography.Text,
+  Link = Typography.Link;
+export var ErrorFallback = function ErrorFallback(_ref) {
+  var error = _ref.error;
+  var _useErrorBoundary = useErrorBoundary(),
+    resetBoundary = _useErrorBoundary.resetBoundary;
+  var _useTranslation = useTranslation(),
+    t = _useTranslation.t;
+  var subTitle = /*#__PURE__*/React.createElement(Trans, null, 'This is likely a NocoBase internals bug. Please open an issue at ', /*#__PURE__*/React.createElement(Link, {
+    href: "https://github.com/nocobase/nocobase/issues"
+  }, "here"));
+  return /*#__PURE__*/React.createElement("div", {
+    style: {
+      backgroundColor: 'white'
+    }
+  }, /*#__PURE__*/React.createElement(Result, {
+    style: {
+      maxWidth: '60vw',
+      margin: 'auto'
+    },
+    status: "error",
+    title: t('Render Failed'),
+    subTitle: subTitle,
+    extra: [/*#__PURE__*/React.createElement(Button, {
+      type: "primary",
+      key: "feedback"
+    }, /*#__PURE__*/React.createElement("a", {
+      href: "https://github.com/nocobase/nocobase/issues"
+    }, t('Feedback'))), /*#__PURE__*/React.createElement(Button, {
+      key: "try",
+      onClick: resetBoundary
+    }, t('Try again'))]
+  }, /*#__PURE__*/React.createElement(Paragraph, {
+    copyable: true
+  }, /*#__PURE__*/React.createElement(Text, {
+    type: "danger",
+    style: {
+      whiteSpace: 'pre-line',
+      textAlign: 'center'
+    }
+  }, error.stack))));
+};

package/es/schema-component/antd/error-fallback/index.d.ts

@@ -0,0 +1 @@
+export * from './ErrorFallback';

package/es/schema-component/antd/error-fallback/index.js

@@ -0,0 +1 @@
+export * from './ErrorFallback';

package/es/schema-component/antd/filter/useFilterActionProps.d.ts

@@ -1,4 +1,6 @@
+export declare const useGetFilterOptions: () => (collectionName: any) => any[];
 export declare const useFilterOptions: (collectionName: string) => any[];
+export declare const useGetFilterFieldOptions: () => (fields: any) => any[];
 export declare const useFilterFieldOptions: (fields: any) => any[];
 export declare const removeNullCondition: (filter: any) => any;
 export declare const useFilterActionProps: () => {

package/es/schema-component/antd/filter/useFilterActionProps.js

@@ -17,15 +17,70 @@ import { useCompile } from '../..';
 import { useBlockRequestContext } from '../../../block-provider';
 import { mergeFilter } from '../../../block-provider/SharedFilterProvider';
 import { useCollection, useCollectionManager } from '../../../collection-manager';
-export var useFilterOptions = function useFilterOptions(collectionName) {
+export var useGetFilterOptions = function useGetFilterOptions() {
   var _useCollectionManager = useCollectionManager(),
     getCollectionFields = _useCollectionManager.getCollectionFields;
-  var fields = getCollectionFields(collectionName);
-  var options = useFilterFieldOptions(fields);
   var compile = useCompile();
   var _useCollectionManager2 = useCollectionManager(),
     getChildrenCollections = _useCollectionManager2.getChildrenCollections;
   var collection = useCollection();
+  var getFilterFieldOptions = useGetFilterFieldOptions();
+  return function (collectionName) {
+    var fields = getCollectionFields(collectionName);
+    var options = getFilterFieldOptions(fields);
+    var childrenCollections = getChildrenCollections(collection.name);
+    if (childrenCollections.length > 0 && !options.find(function (v) {
+      return v.name == 'tableoid';
+    })) {
+      options.push({
+        name: 'tableoid',
+        type: 'string',
+        title: '{{t("Table OID(Inheritance)")}}',
+        schema: {
+          'x-component': 'Select',
+          enum: [{
+            value: collection.name,
+            label: compile(collection.title)
+          }].concat(childrenCollections.map(function (v) {
+            return {
+              value: v.name,
+              label: compile(v.title)
+            };
+          }))
+        },
+        operators: [{
+          label: '{{t("contains")}}',
+          value: '$childIn',
+          schema: {
+            'x-component': 'Select',
+            'x-component-props': {
+              mode: 'tags'
+            }
+          }
+        }, {
+          label: '{{t("does not contain")}}',
+          value: '$childNotIn',
+          schema: {
+            'x-component': 'Select',
+            'x-component-props': {
+              mode: 'tags'
+            }
+          }
+        }]
+      });
+    }
+    return options;
+  };
+};
+export var useFilterOptions = function useFilterOptions(collectionName) {
+  var _useCollectionManager3 = useCollectionManager(),
+    getCollectionFields = _useCollectionManager3.getCollectionFields;
+  var compile = useCompile();
+  var _useCollectionManager4 = useCollectionManager(),
+    getChildrenCollections = _useCollectionManager4.getChildrenCollections;
+  var collection = useCollection();
+  var fields = getCollectionFields(collectionName);
+  var options = useFilterFieldOptions(fields);
   var childrenCollections = getChildrenCollections(collection.name);
   if (childrenCollections.length > 0 && !options.find(function (v) {
     return v.name == 'tableoid';
@@ -69,13 +124,13 @@ export var useFilterOptions = function useFilterOptions(collectionName) {
   }
   return options;
 };
-export var useFilterFieldOptions = function useFilterFieldOptions(fields) {
+export var useGetFilterFieldOptions = function useGetFilterFieldOptions() {
   var _fieldSchema$xCompon;
   var fieldSchema = useFieldSchema();
   var nonfilterable = (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : _fieldSchema$xCompon.nonfilterable) || [];
-  var _useCollectionManager3 = useCollectionManager(),
-    getCollectionFields = _useCollectionManager3.getCollectionFields,
-    getInterface = _useCollectionManager3.getInterface;
+  var _useCollectionManager5 = useCollectionManager(),
+    getCollectionFields = _useCollectionManager5.getCollectionFields,
+    getInterface = _useCollectionManager5.getInterface;
   var field2option = function field2option(field, depth) {
     var _field$uiSchema, _operators$filter;
     if (nonfilterable.length && depth === 1 && nonfilterable.includes(field.name)) {
@@ -130,6 +185,71 @@ export var useFilterFieldOptions = function useFilterFieldOptions(fields) {
     });
     return options;
   };
+  return function (fields) {
+    return getOptions(fields, 1);
+  };
+};
+export var useFilterFieldOptions = function useFilterFieldOptions(fields) {
+  var _fieldSchema$xCompon2;
+  var fieldSchema = useFieldSchema();
+  var nonfilterable = (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon2 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon2 === void 0 ? void 0 : _fieldSchema$xCompon2.nonfilterable) || [];
+  var _useCollectionManager6 = useCollectionManager(),
+    getCollectionFields = _useCollectionManager6.getCollectionFields,
+    getInterface = _useCollectionManager6.getInterface;
+  var field2option = function field2option(field, depth) {
+    var _field$uiSchema2, _operators$filter2;
+    if (nonfilterable.length && depth === 1 && nonfilterable.includes(field.name)) {
+      return;
+    }
+    if (!field.interface) {
+      return;
+    }
+    var fieldInterface = getInterface(field.interface);
+    if (!fieldInterface.filterable) {
+      return;
+    }
+    var _fieldInterface$filte2 = fieldInterface.filterable,
+      nested = _fieldInterface$filte2.nested,
+      children = _fieldInterface$filte2.children,
+      operators = _fieldInterface$filte2.operators;
+    var option = {
+      name: field.name,
+      type: field.type,
+      target: field.target,
+      title: (field === null || field === void 0 ? void 0 : (_field$uiSchema2 = field.uiSchema) === null || _field$uiSchema2 === void 0 ? void 0 : _field$uiSchema2.title) || field.name,
+      schema: field === null || field === void 0 ? void 0 : field.uiSchema,
+      operators: (operators === null || operators === void 0 ? void 0 : (_operators$filter2 = operators.filter) === null || _operators$filter2 === void 0 ? void 0 : _operators$filter2.call(operators, function (operator) {
+        return !(operator === null || operator === void 0 ? void 0 : operator.visible) || operator.visible(field);
+      })) || []
+    };
+    if (field.target && depth > 2) {
+      return;
+    }
+    if (depth > 2) {
+      return option;
+    }
+    if (children === null || children === void 0 ? void 0 : children.length) {
+      option['children'] = children;
+    }
+    if (nested) {
+      var _option$children2;
+      var targetFields = getCollectionFields(field.target);
+      var options = getOptions(targetFields, depth + 1).filter(Boolean);
+      option['children'] = option['children'] || [];
+      (_option$children2 = option['children']).push.apply(_option$children2, _toConsumableArray(options));
+    }
+    return option;
+  };
+  var getOptions = function getOptions(fields, depth) {
+    var options = [];
+    fields.forEach(function (field) {
+      var option = field2option(field, depth);
+      if (option) {
+        options.push(option);
+      }
+    });
+    return options;
+  };
   return getOptions(fields, 1);
 };
 var isEmpty = function isEmpty(obj) {