@nocobase/client 0.9.3-alpha.1 → 0.9.4-alpha.2

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

@@ -17,7 +17,9 @@ import { useTranslation } from 'react-i18next';
 import { useFilterByTk, useFormBlockContext } from '../../../block-provider';
 import { useCollection, useCollectionFilterOptions, useCollectionManager, useSortFields } from '../../../collection-manager';
 import { isTitleField } from '../../../collection-manager/Configuration/CollectionFields';
+import { GeneralSchemaItems } from '../../../schema-items';
 import { GeneralSchemaDesigner, SchemaSettings, isPatternDisabled, isShowDefaultValue } from '../../../schema-settings';
+import { useIsShowMultipleSwitch } from '../../../schema-settings/hooks/useIsShowMultipleSwitch';
 import { useCompile, useDesignable, useFieldComponentOptions, useFieldTitle } from '../../hooks';
 import { removeNullCondition } from '../filter';
 import { RemoteSelect } from '../remote-select';
@@ -70,7 +72,7 @@ var InternalAssociationSelect = connect(function (props) {
 }), mapReadPretty(ReadPretty));
 export var AssociationSelect = InternalAssociationSelect;
 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 _interfaceConfig$vali, _collectionField$uiSc, _field$componentProps, _field$componentProps2, _field$componentProps3, _field$componentProps4, _field$componentProps5, _field$componentProps6, _fieldSchema$xCompon, _field$componentProps7, _field$componentProps8;
   var _useCollectionManager = useCollectionManager(),
     getCollectionFields = _useCollectionManager.getCollectionFields,
     getInterface = _useCollectionManager.getInterface,
@@ -90,13 +92,14 @@ AssociationSelect.Designer = function Designer() {
     refresh = _useDesignable.refresh,
     insertAdjacent = _useDesignable.insertAdjacent;
   var compile = useCompile();
+  var IsShowMultipleSwitch = useIsShowMultipleSwitch();
   var collectionField = getField(fieldSchema['name']) || getCollectionJoinField(fieldSchema['x-collection-field']);
   var fieldComponentOptions = useFieldComponentOptions();
   var isSubFormAssociationField = field.address.segments.includes('__form_grid');
   var interfaceConfig = getInterface(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface);
   var validateSchema = interfaceConfig === null || interfaceConfig === void 0 ? void 0 : (_interfaceConfig$vali = interfaceConfig['validateSchema']) === null || _interfaceConfig$vali === void 0 ? void 0 : _interfaceConfig$vali.call(interfaceConfig, fieldSchema);
   var originalTitle = collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc = collectionField.uiSchema) === null || _collectionField$uiSc === void 0 ? void 0 : _collectionField$uiSc.title;
-  var targetFields = (collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) ? getCollectionFields(collectionField.target) : [];
+  var targetFields = (collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) ? getCollectionFields(collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) : [];
   var initialValue = {
     title: field.title === originalTitle ? undefined : field.title
   };
@@ -139,108 +142,8 @@ AssociationSelect.Designer = function Designer() {
   if (fieldSchema['x-read-pretty'] === true) {
     readOnlyMode = 'read-pretty';
   }
-  return /*#__PURE__*/React.createElement(GeneralSchemaDesigner, null, collectionField && /*#__PURE__*/React.createElement(SchemaSettings.ModalItem, {
-    key: "edit-field-title",
-    title: t('Edit field title'),
-    schema: {
-      type: 'object',
-      title: t('Edit field title'),
-      properties: {
-        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$uiSc2 = collectionField.uiSchema) === null || _collectionField$uiSc2 === void 0 ? void 0 : _collectionField$uiSc2.title),
-          'x-decorator': 'FormItem',
-          'x-component': 'Input',
-          'x-component-props': {}
-        }
-      }
-    },
-    onSubmit: function onSubmit(_ref) {
-      var title = _ref.title;
-      if (title) {
-        field.title = title;
-        fieldSchema.title = title;
-        dn.emit('patch', {
-          schema: {
-            'x-uid': fieldSchema['x-uid'],
-            title: fieldSchema.title
-          }
-        });
-      }
-      dn.refresh();
-    }
-  }), !field.readPretty && /*#__PURE__*/React.createElement(SchemaSettings.ModalItem, {
-    key: "edit-description",
-    title: t('Edit description'),
-    schema: {
-      type: 'object',
-      title: t('Edit description'),
-      properties: {
-        description: {
-          // title: t('Description'),
-          default: field === null || field === void 0 ? void 0 : field.description,
-          'x-decorator': 'FormItem',
-          'x-component': 'Input.TextArea',
-          'x-component-props': {}
-        }
-      }
-    },
-    onSubmit: function onSubmit(_ref2) {
-      var description = _ref2.description;
-      field.description = description;
-      fieldSchema.description = description;
-      dn.emit('patch', {
-        schema: {
-          'x-uid': fieldSchema['x-uid'],
-          description: fieldSchema.description
-        }
-      });
-      dn.refresh();
-    }
-  }), field.readPretty && /*#__PURE__*/React.createElement(SchemaSettings.ModalItem, {
-    key: "edit-tooltip",
-    title: t('Edit tooltip'),
-    schema: {
-      type: 'object',
-      title: t('Edit description'),
-      properties: {
-        tooltip: {
-          default: fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xDecora = fieldSchema['x-decorator-props']) === null || _fieldSchema$xDecora === void 0 ? void 0 : _fieldSchema$xDecora.tooltip,
-          'x-decorator': 'FormItem',
-          'x-component': 'Input.TextArea',
-          'x-component-props': {}
-        }
-      }
-    },
-    onSubmit: function onSubmit(_ref3) {
-      var tooltip = _ref3.tooltip;
-      field.decoratorProps.tooltip = tooltip;
-      fieldSchema['x-decorator-props'] = fieldSchema['x-decorator-props'] || {};
-      fieldSchema['x-decorator-props']['tooltip'] = tooltip;
-      dn.emit('patch', {
-        schema: {
-          'x-uid': fieldSchema['x-uid'],
-          'x-decorator-props': fieldSchema['x-decorator-props']
-        }
-      });
-      dn.refresh();
-    }
-  }), !field.readPretty && /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
-    key: "required",
-    title: t('Required'),
-    checked: fieldSchema.required,
-    onChange: function onChange(required) {
-      var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
-      field.required = required;
-      fieldSchema['required'] = required;
-      schema['required'] = required;
-      dn.emit('patch', {
-        schema: schema
-      });
-      refresh();
-    }
-  }), form && !(form === null || form === void 0 ? void 0 : form.readPretty) && validateSchema && /*#__PURE__*/React.createElement(SchemaSettings.ModalItem, {
+  var fieldSchemaWithoutRequired = _.omit(fieldSchema, 'required');
+  return /*#__PURE__*/React.createElement(GeneralSchemaDesigner, null, /*#__PURE__*/React.createElement(GeneralSchemaItems, null), form && !(form === null || form === void 0 ? void 0 : form.readPretty) && validateSchema && /*#__PURE__*/React.createElement(SchemaSettings.ModalItem, {
     title: t('Set validation rules'),
     components: {
       ArrayCollapse: ArrayCollapse,
@@ -328,7 +231,7 @@ AssociationSelect.Designer = function Designer() {
       }
     },
     onSubmit: function onSubmit(v) {
-      var _collectionField$uiSc3;
+      var _collectionField$uiSc2;
       var rules = [];
       var _iterator = _createForOfIteratorHelper(v.rules),
         _step;
@@ -366,7 +269,7 @@ AssociationSelect.Designer = function Designer() {
           _iterator2.f();
         }
       }
-      var concatValidator = _.concat([], (collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc3 = collectionField.uiSchema) === null || _collectionField$uiSc3 === void 0 ? void 0 : _collectionField$uiSc3['x-validator']) || [], rules);
+      var concatValidator = _.concat([], (collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc2 = collectionField.uiSchema) === null || _collectionField$uiSc2 === void 0 ? void 0 : _collectionField$uiSc2['x-validator']) || [], rules);
       field.validator = concatValidator;
       fieldSchema['x-validator'] = rules;
       schema['x-validator'] = rules;
@@ -386,9 +289,9 @@ AssociationSelect.Designer = function Designer() {
       type: 'object',
       title: t('Set default value'),
       properties: {
-        default: _objectSpread(_objectSpread({}, fieldSchema || {}), {}, {
+        default: _objectSpread(_objectSpread({}, fieldSchemaWithoutRequired || {}), {}, {
           'x-decorator': 'FormItem',
-          'x-component-props': _objectSpread(_objectSpread({}, fieldSchema['x-component-props']), {}, {
+          'x-component-props': _objectSpread(_objectSpread({}, fieldSchemaWithoutRequired['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
@@ -396,7 +299,7 @@ AssociationSelect.Designer = function Designer() {
           }),
           name: 'default',
           title: t('Default value'),
-          default: fieldSchema.default || collectionField.defaultValue,
+          default: fieldSchema.default || (collectionField === null || collectionField === void 0 ? void 0 : collectionField.defaultValue),
           'x-read-pretty': false,
           'x-disabled': false
         })
@@ -419,9 +322,9 @@ AssociationSelect.Designer = function Designer() {
     options: fieldComponentOptions,
     value: fieldSchema['x-component'],
     onChange: function onChange(type) {
-      var _collectionField$uiSc4, _interfaceConfig$sche;
+      var _collectionField$uiSc3, _interfaceConfig$sche;
       var schema = {
-        name: collectionField.name,
+        name: collectionField === null || collectionField === void 0 ? void 0 : collectionField.name,
         type: 'void',
         required: fieldSchema['required'],
         description: fieldSchema['description'],
@@ -432,14 +335,14 @@ AssociationSelect.Designer = function Designer() {
         '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$uiSc4 = collectionField.uiSchema) === null || _collectionField$uiSc4 === void 0 ? void 0 : _collectionField$uiSc4['x-component-props']), fieldSchema['x-component-props'])
+        'x-component-props': _objectSpread(_objectSpread({}, collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc3 = collectionField.uiSchema) === null || _collectionField$uiSc3 === void 0 ? void 0 : _collectionField$uiSc3['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,
         block: 'Form',
         readPretty: field.readPretty,
         action: tk ? 'get' : null,
-        targetCollection: getCollection(collectionField.target)
+        targetCollection: getCollection(collectionField === null || collectionField === void 0 ? void 0 : collectionField.target)
       });
       if (type === 'CollectionField') {
         schema['type'] = 'string';
@@ -455,9 +358,9 @@ AssociationSelect.Designer = function Designer() {
         }
       });
     }
-  }), form && !(form === null || form === void 0 ? void 0 : form.readPretty) && ['o2m', 'm2m'].includes(collectionField.interface) && fieldSchema['x-component'] !== 'TableField' && /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
+  }), IsShowMultipleSwitch() ? /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
     key: "multiple",
-    title: t('Multiple'),
+    title: t('Allow 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']);
@@ -471,7 +374,7 @@ AssociationSelect.Designer = function Designer() {
       });
       refresh();
     }
-  }), /*#__PURE__*/React.createElement(SchemaSettings.ModalItem, {
+  }) : null, /*#__PURE__*/React.createElement(SchemaSettings.ModalItem, {
     title: t('Set the data scope'),
     schema: {
       type: 'object',
@@ -490,14 +393,14 @@ AssociationSelect.Designer = function Designer() {
         }
       }
     },
-    onSubmit: function onSubmit(_ref4) {
-      var _schema5;
-      var filter = _ref4.filter;
+    onSubmit: function onSubmit(_ref) {
+      var _schema4;
+      var filter = _ref.filter;
       filter = removeNullCondition(filter);
       _.set(field.componentProps, 'service.params.filter', filter);
       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: (_schema4 = {}, _defineProperty(_schema4, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema4, 'x-component-props', field.componentProps), _schema4)
       });
     }
   }), /*#__PURE__*/React.createElement(SchemaSettings.ModalItem, {
@@ -571,16 +474,16 @@ AssociationSelect.Designer = function Designer() {
         }
       }
     },
-    onSubmit: function onSubmit(_ref5) {
-      var _schema6;
-      var sort = _ref5.sort;
+    onSubmit: function onSubmit(_ref2) {
+      var _schema5;
+      var sort = _ref2.sort;
       var sortArr = sort.map(function (item) {
         return item.direction === 'desc' ? "-".concat(item.field) : item.field;
       });
       _.set(field.componentProps, 'service.params.sort', sortArr);
       fieldSchema['x-component-props'] = field.componentProps;
       dn.emit('patch', {
-        schema: (_schema6 = {}, _defineProperty(_schema6, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema6, 'x-component-props', field.componentProps), _schema6)
+        schema: (_schema5 = {}, _defineProperty(_schema5, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema5, 'x-component-props', field.componentProps), _schema5)
       });
     }
   }), form && !(form === null || form === void 0 ? void 0 : form.readPretty) && !isPatternDisabled(fieldSchema) && /*#__PURE__*/React.createElement(SchemaSettings.SelectItem, {
@@ -641,9 +544,9 @@ AssociationSelect.Designer = function Designer() {
     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$uiSc5, _collectionField$uiSc6;
+      var _collectionField$uiSc4, _collectionField$uiSc5;
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
-      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), {}, {
+      var fieldNames = _objectSpread(_objectSpread(_objectSpread({}, collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc4 = collectionField.uiSchema) === null || _collectionField$uiSc4 === void 0 ? void 0 : (_collectionField$uiSc5 = _collectionField$uiSc4['x-component-props']) === null || _collectionField$uiSc5 === void 0 ? void 0 : _collectionField$uiSc5['fieldNames']), field.componentProps.fieldNames), {}, {
         label: label
       });
       field.componentProps.fieldNames = fieldNames;
@@ -671,7 +574,7 @@ AssociationSelect.Designer = function Designer() {
  * @returns
  */
 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 _interfaceConfig$vali2, _collectionField$uiSc6, _field$componentProps9, _field$componentProps10, _field$componentProps11, _field$componentProps12, _field$componentProps13, _field$componentProps14, _collectionField$uiSc8, _field$componentProps15, _field$componentProps16;
   var _useCollectionManager2 = useCollectionManager(),
     getCollectionFields = _useCollectionManager2.getCollectionFields,
     getInterface = _useCollectionManager2.getInterface,
@@ -691,8 +594,8 @@ AssociationSelect.FilterDesigner = function FilterDesigner() {
   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$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 originalTitle = collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc6 = collectionField.uiSchema) === null || _collectionField$uiSc6 === void 0 ? void 0 : _collectionField$uiSc6.title;
+  var targetFields = (collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) ? getCollectionFields(collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) : [];
   var initialValue = {
     title: field.title === originalTitle ? undefined : field.title
   };
@@ -728,93 +631,8 @@ AssociationSelect.FilterDesigner = function FilterDesigner() {
   if (fieldSchema['x-read-pretty'] === true) {
     readOnlyMode = 'read-pretty';
   }
-  return /*#__PURE__*/React.createElement(GeneralSchemaDesigner, null, collectionField && /*#__PURE__*/React.createElement(SchemaSettings.ModalItem, {
-    key: "edit-field-title",
-    title: t('Edit field title'),
-    schema: {
-      type: 'object',
-      title: t('Edit field title'),
-      properties: {
-        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$uiSc8 = collectionField.uiSchema) === null || _collectionField$uiSc8 === void 0 ? void 0 : _collectionField$uiSc8.title),
-          'x-decorator': 'FormItem',
-          'x-component': 'Input',
-          'x-component-props': {}
-        }
-      }
-    },
-    onSubmit: function onSubmit(_ref6) {
-      var title = _ref6.title;
-      if (title) {
-        field.title = title;
-        fieldSchema.title = title;
-        dn.emit('patch', {
-          schema: {
-            'x-uid': fieldSchema['x-uid'],
-            title: fieldSchema.title
-          }
-        });
-      }
-      dn.refresh();
-    }
-  }), !field.readPretty && /*#__PURE__*/React.createElement(SchemaSettings.ModalItem, {
-    key: "edit-description",
-    title: t('Edit description'),
-    schema: {
-      type: 'object',
-      title: t('Edit description'),
-      properties: {
-        description: {
-          // title: t('Description'),
-          default: field === null || field === void 0 ? void 0 : field.description,
-          'x-decorator': 'FormItem',
-          'x-component': 'Input.TextArea',
-          'x-component-props': {}
-        }
-      }
-    },
-    onSubmit: function onSubmit(_ref7) {
-      var description = _ref7.description;
-      field.description = description;
-      fieldSchema.description = description;
-      dn.emit('patch', {
-        schema: {
-          'x-uid': fieldSchema['x-uid'],
-          description: fieldSchema.description
-        }
-      });
-      dn.refresh();
-    }
-  }), field.readPretty && /*#__PURE__*/React.createElement(SchemaSettings.ModalItem, {
-    key: "edit-tooltip",
-    title: t('Edit tooltip'),
-    schema: {
-      type: 'object',
-      title: t('Edit description'),
-      properties: {
-        tooltip: {
-          default: fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xDecora2 = fieldSchema['x-decorator-props']) === null || _fieldSchema$xDecora2 === void 0 ? void 0 : _fieldSchema$xDecora2.tooltip,
-          'x-decorator': 'FormItem',
-          'x-component': 'Input.TextArea',
-          'x-component-props': {}
-        }
-      }
-    },
-    onSubmit: function onSubmit(_ref8) {
-      var tooltip = _ref8.tooltip;
-      field.decoratorProps.tooltip = tooltip;
-      fieldSchema['x-decorator-props'] = fieldSchema['x-decorator-props'] || {};
-      fieldSchema['x-decorator-props']['tooltip'] = tooltip;
-      dn.emit('patch', {
-        schema: {
-          'x-uid': fieldSchema['x-uid'],
-          'x-decorator-props': fieldSchema['x-decorator-props']
-        }
-      });
-      dn.refresh();
-    }
+  return /*#__PURE__*/React.createElement(GeneralSchemaDesigner, null, /*#__PURE__*/React.createElement(GeneralSchemaItems, {
+    required: false
   }), form && !(form === null || form === void 0 ? void 0 : form.readPretty) && validateSchema && /*#__PURE__*/React.createElement(SchemaSettings.ModalItem, {
     title: t('Set validation rules'),
     components: {
@@ -903,7 +721,7 @@ AssociationSelect.FilterDesigner = function FilterDesigner() {
       }
     },
     onSubmit: function onSubmit(v) {
-      var _collectionField$uiSc9;
+      var _collectionField$uiSc7;
       var rules = [];
       var _iterator3 = _createForOfIteratorHelper(v.rules),
         _step3;
@@ -941,7 +759,7 @@ AssociationSelect.FilterDesigner = function FilterDesigner() {
           _iterator4.f();
         }
       }
-      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);
+      var concatValidator = _.concat([], (collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc7 = collectionField.uiSchema) === null || _collectionField$uiSc7 === void 0 ? void 0 : _collectionField$uiSc7['x-validator']) || [], rules);
       field.validator = concatValidator;
       fieldSchema['x-validator'] = rules;
       schema['x-validator'] = rules;
@@ -950,7 +768,7 @@ AssociationSelect.FilterDesigner = function FilterDesigner() {
       });
       refresh();
     }
-  }), 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, {
+  }), form && !(form === null || form === void 0 ? void 0 : form.readPretty) && (collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc8 = collectionField.uiSchema) === null || _collectionField$uiSc8 === void 0 ? void 0 : _collectionField$uiSc8.type) && /*#__PURE__*/React.createElement(SchemaSettings.ModalItem, {
     title: t('Set default value'),
     components: {
       ArrayCollapse: ArrayCollapse,
@@ -960,11 +778,11 @@ AssociationSelect.FilterDesigner = function FilterDesigner() {
       type: 'object',
       title: t('Set default value'),
       properties: {
-        default: _objectSpread(_objectSpread({}, collectionField.uiSchema), {}, {
+        default: _objectSpread(_objectSpread({}, _.omit(collectionField === null || collectionField === void 0 ? void 0 : collectionField.uiSchema, 'required')), {}, {
           name: 'default',
           title: t('Default value'),
           'x-decorator': 'FormItem',
-          default: fieldSchema.default || collectionField.defaultValue
+          default: fieldSchema.default || (collectionField === null || collectionField === void 0 ? void 0 : collectionField.defaultValue)
         })
       }
     },
@@ -999,14 +817,14 @@ AssociationSelect.FilterDesigner = function FilterDesigner() {
         }
       }
     },
-    onSubmit: function onSubmit(_ref9) {
-      var _schema11;
-      var filter = _ref9.filter;
+    onSubmit: function onSubmit(_ref3) {
+      var _schema10;
+      var filter = _ref3.filter;
       filter = removeNullCondition(filter);
       _.set(field.componentProps, 'service.params.filter', filter);
       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: (_schema10 = {}, _defineProperty(_schema10, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema10, 'x-component-props', field.componentProps), _schema10)
       });
     }
   }), /*#__PURE__*/React.createElement(SchemaSettings.ModalItem, {
@@ -1080,16 +898,16 @@ AssociationSelect.FilterDesigner = function FilterDesigner() {
         }
       }
     },
-    onSubmit: function onSubmit(_ref10) {
-      var _schema12;
-      var sort = _ref10.sort;
+    onSubmit: function onSubmit(_ref4) {
+      var _schema11;
+      var sort = _ref4.sort;
       var sortArr = sort.map(function (item) {
         return item.direction === 'desc' ? "-".concat(item.field) : item.field;
       });
       _.set(field.componentProps, 'service.params.sort', sortArr);
       fieldSchema['x-component-props'] = field.componentProps;
       dn.emit('patch', {
-        schema: (_schema12 = {}, _defineProperty(_schema12, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema12, 'x-component-props', field.componentProps), _schema12)
+        schema: (_schema11 = {}, _defineProperty(_schema11, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema11, 'x-component-props', field.componentProps), _schema11)
       });
     }
   }), (collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) && ['CollectionField', 'AssociationSelect'].includes(fieldSchema['x-component']) && /*#__PURE__*/React.createElement(SchemaSettings.SelectItem, {
@@ -1098,9 +916,9 @@ AssociationSelect.FilterDesigner = function FilterDesigner() {
     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$uiSc11, _collectionField$uiSc12;
+      var _collectionField$uiSc9, _collectionField$uiSc10;
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
-      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), {}, {
+      var fieldNames = _objectSpread(_objectSpread(_objectSpread({}, collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc9 = collectionField.uiSchema) === null || _collectionField$uiSc9 === void 0 ? void 0 : (_collectionField$uiSc10 = _collectionField$uiSc9['x-component-props']) === null || _collectionField$uiSc10 === void 0 ? void 0 : _collectionField$uiSc10['fieldNames']), field.componentProps.fieldNames), {}, {
         label: label
       });
       field.componentProps.fieldNames = fieldNames;

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

@@ -44,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 && !isInFilterFormBlock(fieldSchema) ? _defineProperty({}, collectionField.foreignKey, {
+    return mergeFilter([mergeFilter([isOToAny && !isInFilterFormBlock(fieldSchema) && (collectionField === null || collectionField === void 0 ? void 0 : collectionField.foreignKey) ? _defineProperty({}, collectionField.foreignKey, {
       $is: null
-    }) : null, params === null || params === void 0 ? void 0 : params.filter]), isOToAny && sourceValue !== undefined && sourceValue !== null && !isInFilterFormBlock(fieldSchema) ? _defineProperty({}, collectionField.foreignKey, {
+    }) : null, params === null || params === void 0 ? void 0 : params.filter]), isOToAny && sourceValue !== undefined && sourceValue !== null && !isInFilterFormBlock(fieldSchema) && (collectionField === null || collectionField === void 0 ? void 0 : collectionField.foreignKey) ? _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/collection-select/CollectionSelect.js

@@ -40,6 +40,11 @@ export var CollectionSelect = connect(function (props) {
   return /*#__PURE__*/React.createElement(Select, _objectSpread(_objectSpread({
     placeholder: t('Select collection')
   }, others), {}, {
+    showSearch: true,
+    filterOption: function filterOption(input, option) {
+      var _option$label;
+      return ((_option$label = option === null || option === void 0 ? void 0 : option.label) !== null && _option$label !== void 0 ? _option$label : '').includes(input);
+    },
     options: options
   }));
 }, mapReadPretty(observer(function (props) {

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

@@ -59,8 +59,8 @@ export var FilterAction = observer(function (props) {
   }, /*#__PURE__*/React.createElement(Popover, {
     destroyTooltipOnHide: true,
     placement: 'bottomLeft',
-    visible: visible,
-    onVisibleChange: function onVisibleChange(visible) {
+    open: visible,
+    onOpenChange: function onOpenChange(visible) {
       setVisible(visible);
     },
     trigger: 'click',

package/es/schema-component/antd/form/Form.js

@@ -78,7 +78,7 @@ var FormDecorator = function FormDecorator(props) {
     onlyRenderProperties: true
   })))))));
 };
-var useRequestProps = function useRequestProps(props) {
+var getRequestParams = function getRequestParams(props) {
   var request = props.request,
     initialValue = props.initialValue;
   if (request) {
@@ -90,10 +90,10 @@ var useRequestProps = function useRequestProps(props) {
     });
   };
 };
-var useDef = function useDef() {
+var useDefaultValues = function useDefaultValues() {
   var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   var props = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  return useRequest(useRequestProps(props), opts);
+  return useRequest(getRequestParams(props), opts);
 };
 var FormBlockContext = /*#__PURE__*/createContext(null);
 export var Form = observer(function (props) {
@@ -101,7 +101,7 @@ export var Form = observer(function (props) {
     effects = props.effects,
     initialValue = props.initialValue,
     _props$useValues = props.useValues,
-    useValues = _props$useValues === void 0 ? useDef : _props$useValues,
+    useValues = _props$useValues === void 0 ? useDefaultValues : _props$useValues,
     others = _objectWithoutProperties(props, _excluded3);
   var fieldSchema = useFieldSchema();
   var field = useField();