@nocobase/client 0.9.2-alpha.4 → 0.9.3-alpha.1

package/es/schema-component/antd/form-item/FormItem.js

@@ -10,7 +10,7 @@ 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 _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 import { css } from '@emotion/css';
-import { ArrayCollapse, FormLayout, FormItem as Item } from '@formily/antd';
+import { ArrayCollapse, FormLayout, FormItem as Item, ArrayItems } from '@formily/antd';
 import { observer, useField, useFieldSchema } from '@formily/react';
 import { uid } from '@formily/shared';
 import _ from 'lodash';
@@ -19,13 +19,15 @@ import React, { useContext, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { ACLCollectionFieldProvider } from '../../../acl/ACLProvider';
 import { BlockRequestContext, useFilterByTk, useFormBlockContext } from '../../../block-provider';
-import { useCollection, useCollectionManager } from '../../../collection-manager';
+import { useCollection, useCollectionManager, useSortFields, useCollectionFilterOptions } from '../../../collection-manager';
 import { isTitleField } from '../../../collection-manager/Configuration/CollectionFields';
 import { GeneralSchemaDesigner, SchemaSettings, isPatternDisabled, isShowDefaultValue } from '../../../schema-settings';
 import { VariableInput } from '../../../schema-settings/VariableInput/VariableInput';
+import { FilterDynamicComponent } from '../table-v2/FilterDynamicComponent';
 import { isVariable, parseVariables, useVariablesCtx } from '../../common/utils/uitls';
 import { SchemaComponent } from '../../core';
-import { useCompile, useDesignable, useFieldComponentOptions } from '../../hooks';
+import { removeNullCondition } from '../filter';
+import { useCompile, useDesignable, useFieldModeOptions } from '../../hooks';
 import { BlockItem } from '../block-item';
 import { HTMLEncode } from '../input/shared';
 import { isInvariable } from '../variable';
@@ -73,7 +75,7 @@ export var FormItem = observer(function (props) {
   }))));
 });
 FormItem.Designer = function Designer() {
-  var _interfaceConfig$vali, _collectionField$uiSc, _getCollectionFields, _collectionField$uiSc2, _fieldSchema$xDecora, _fieldSchema$xCompon, _fieldSchema$xCompon2, _fieldSchema$xCompon3, _fieldSchema$xCompon4, _fieldSchema$xCompon5, _field$componentProps, _field$componentProps2;
+  var _interfaceConfig$vali, _collectionField$uiSc, _getCollectionFields, _field$componentProps, _field$componentProps2, _field$componentProps3, _field$componentProps4, _field$componentProps5, _field$componentProps6, _field$componentProps7, _collectionField$uiSc2, _fieldSchema$xDecora, _fieldSchema$xCompon, _fieldSchema$xCompon2, _fieldSchema$xCompon3, _fieldSchema$xCompon4, _field$componentProps8, _field$componentProps9;
   var _useCollectionManager = useCollectionManager(),
     getCollectionFields = _useCollectionManager.getCollectionFields,
     getInterface = _useCollectionManager.getInterface,
@@ -100,8 +102,10 @@ FormItem.Designer = function Designer() {
   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 === null || collectionField === void 0 ? void 0 : collectionField.target) : (_getCollectionFields = getCollectionFields(collectionField === null || collectionField === void 0 ? void 0 : collectionField.targetCollection)) !== null && _getCollectionFields !== void 0 ? _getCollectionFields : [];
-  var fieldComponentOptions = useFieldComponentOptions();
-  var isSubFormAssociationField = field.address.segments.includes('__form_grid');
+  var fieldModeOptions = useFieldModeOptions();
+  var isAssociationField = ['belongsTo', 'hasOne', 'hasMany', 'belongsToMany'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.type);
+  var isTableField = fieldSchema['x-component'] === 'TableField';
+  var isFileField = isFileCollection(targetCollection);
   var initialValue = {
     title: field.title === originalTitle ? undefined : field.title
   };
@@ -124,6 +128,21 @@ FormItem.Designer = function Designer() {
   if (fieldSchema['x-read-pretty'] === true) {
     readOnlyMode = 'read-pretty';
   }
+  var dataSource = useCollectionFilterOptions(collectionField === null || collectionField === void 0 ? void 0 : collectionField.target);
+  var defaultFilter = ((_field$componentProps = field.componentProps) === null || _field$componentProps === void 0 ? void 0 : (_field$componentProps2 = _field$componentProps.service) === null || _field$componentProps2 === void 0 ? void 0 : (_field$componentProps3 = _field$componentProps2.params) === null || _field$componentProps3 === void 0 ? void 0 : _field$componentProps3.filter) || {};
+  var sortFields = useSortFields(collectionField === null || collectionField === void 0 ? void 0 : collectionField.target);
+  var defaultSort = ((_field$componentProps4 = field.componentProps) === null || _field$componentProps4 === void 0 ? void 0 : (_field$componentProps5 = _field$componentProps4.service) === null || _field$componentProps5 === void 0 ? void 0 : (_field$componentProps6 = _field$componentProps5.params) === null || _field$componentProps6 === void 0 ? void 0 : _field$componentProps6.sort) || [];
+  var fieldMode = (field === null || field === void 0 ? void 0 : (_field$componentProps7 = field.componentProps) === null || _field$componentProps7 === void 0 ? void 0 : _field$componentProps7['mode']) || (isFileField ? 'FileManager' : 'Select');
+  var isSelectFieldMode = fieldMode === 'Select';
+  var sort = defaultSort === null || defaultSort === void 0 ? void 0 : defaultSort.map(function (item) {
+    return item.startsWith('-') ? {
+      field: item.substring(1),
+      direction: 'desc'
+    } : {
+      field: item,
+      direction: 'asc'
+    };
+  });
   return /*#__PURE__*/React.createElement(GeneralSchemaDesigner, null, collectionField && /*#__PURE__*/React.createElement(SchemaSettings.ModalItem, {
     key: "edit-field-title",
     title: t('Edit field title'),
@@ -225,10 +244,10 @@ FormItem.Designer = function Designer() {
       });
       refresh();
     }
-  }), !(form === null || form === void 0 ? void 0 : form.readPretty) && isFileCollection(targetCollection) ? /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
+  }), !(form === null || form === void 0 ? void 0 : form.readPretty) && isFileField ? /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
     key: "quick-upload",
     title: t('Quick upload'),
-    checked: (_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : _fieldSchema$xCompon.quickUpload,
+    checked: ((_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : _fieldSchema$xCompon.quickUpload) !== false,
     onChange: function onChange(value) {
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
       field.componentProps.quickUpload = value;
@@ -240,10 +259,10 @@ FormItem.Designer = function Designer() {
       });
       refresh();
     }
-  }) : null, !(form === null || form === void 0 ? void 0 : form.readPretty) && isFileCollection(targetCollection) ? /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
+  }) : null, !(form === null || form === void 0 ? void 0 : form.readPretty) && isFileField ? /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
     key: "select-file",
     title: t('Select file'),
-    checked: (_fieldSchema$xCompon2 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon2 === void 0 ? void 0 : _fieldSchema$xCompon2.selectFile,
+    checked: ((_fieldSchema$xCompon2 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon2 === void 0 ? void 0 : _fieldSchema$xCompon2.selectFile) !== false,
     onChange: function onChange(value) {
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
       field.componentProps.selectFile = value;
@@ -464,44 +483,154 @@ FormItem.Designer = function Designer() {
       });
       refresh();
     }
-  }), form && !isSubFormAssociationField && fieldComponentOptions && /*#__PURE__*/React.createElement(SchemaSettings.SelectItem, {
-    title: t('Field component'),
-    options: fieldComponentOptions,
-    value: fieldSchema['x-component'],
-    onChange: function onChange(type) {
-      var _collectionField$uiSc4, _interfaceConfig$sche;
-      var schema = {
-        name: collectionField === null || collectionField === void 0 ? void 0 : collectionField.name,
-        type: 'void',
-        required: fieldSchema['required'],
-        description: fieldSchema['description'],
-        default: fieldSchema['default'],
-        'x-decorator': 'FormItem',
-        'x-designer': 'FormItem.Designer',
-        'x-component': type,
-        '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'])
-      };
-      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: targetCollection
+  }), isSelectFieldMode && !field.readPretty && /*#__PURE__*/React.createElement(SchemaSettings.ModalItem, {
+    title: t('Set the data scope'),
+    schema: {
+      type: 'object',
+      title: t('Set the data scope'),
+      properties: {
+        filter: {
+          default: defaultFilter,
+          // title: '数据范围',
+          enum: dataSource,
+          'x-component': 'Filter',
+          'x-component-props': {
+            dynamicComponent: function dynamicComponent(props) {
+              return FilterDynamicComponent(_objectSpread({}, props));
+            }
+          }
+        }
+      }
+    },
+    onSubmit: function onSubmit(_ref4) {
+      var _schema6;
+      var filter = _ref4.filter;
+      filter = removeNullCondition(filter);
+      _.set(field.componentProps, 'service.params.filter', filter);
+      fieldSchema['x-component-props'] = field.componentProps;
+      field.componentProps = field.componentProps;
+      dn.emit('patch', {
+        schema: (_schema6 = {}, _defineProperty(_schema6, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema6, 'x-component-props', field.componentProps), _schema6)
       });
-      insertAdjacent('beforeBegin', divWrap(schema), {
-        onSuccess: function onSuccess() {
-          dn.remove(null, {
-            removeParentsIfNoChildren: true,
-            breakRemoveOn: {
-              'x-component': 'Grid'
+    }
+  }), isSelectFieldMode && !field.readPretty && /*#__PURE__*/React.createElement(SchemaSettings.ModalItem, {
+    title: t('Set default sorting rules'),
+    components: {
+      ArrayItems: ArrayItems
+    },
+    schema: {
+      type: 'object',
+      title: t('Set default sorting rules'),
+      properties: {
+        sort: {
+          type: 'array',
+          default: sort,
+          'x-component': 'ArrayItems',
+          'x-decorator': 'FormItem',
+          items: {
+            type: 'object',
+            properties: {
+              space: {
+                type: 'void',
+                'x-component': 'Space',
+                properties: {
+                  sort: {
+                    type: 'void',
+                    'x-decorator': 'FormItem',
+                    'x-component': 'ArrayItems.SortHandle'
+                  },
+                  field: {
+                    type: 'string',
+                    enum: sortFields,
+                    'x-decorator': 'FormItem',
+                    'x-component': 'Select',
+                    'x-component-props': {
+                      style: {
+                        width: 260
+                      }
+                    }
+                  },
+                  direction: {
+                    type: 'string',
+                    'x-decorator': 'FormItem',
+                    'x-component': 'Radio.Group',
+                    'x-component-props': {
+                      optionType: 'button'
+                    },
+                    enum: [{
+                      label: t('ASC'),
+                      value: 'asc'
+                    }, {
+                      label: t('DESC'),
+                      value: 'desc'
+                    }]
+                  },
+                  remove: {
+                    type: 'void',
+                    'x-decorator': 'FormItem',
+                    'x-component': 'ArrayItems.Remove'
+                  }
+                }
+              }
             }
-          });
+          },
+          properties: {
+            add: {
+              type: 'void',
+              title: t('Add sort field'),
+              'x-component': 'ArrayItems.Addition'
+            }
+          }
         }
+      }
+    },
+    onSubmit: function onSubmit(_ref5) {
+      var _schema7;
+      var sort = _ref5.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: (_schema7 = {}, _defineProperty(_schema7, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema7, 'x-component-props', field.componentProps), _schema7)
       });
     }
+  }), isAssociationField && fieldModeOptions && !isTableField && /*#__PURE__*/React.createElement(SchemaSettings.SelectItem, {
+    key: "field-mode",
+    title: t('Field mode'),
+    options: fieldModeOptions,
+    value: fieldMode,
+    onChange: function onChange(mode) {
+      var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
+      fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
+      fieldSchema['x-component-props']['mode'] = mode;
+      schema['x-component-props'] = fieldSchema['x-component-props'];
+      field.componentProps = field.componentProps || {};
+      field.componentProps.mode = mode;
+      if (mode === 'Nester') {
+        var initValue = ['o2m', 'm2m'].includes(collectionField.interface) ? [] : {};
+        field.value = field.value || initValue;
+      }
+      dn.emit('patch', {
+        schema: schema
+      });
+      dn.refresh();
+    }
+  }), !field.readPretty && isAssociationField && ['Select', 'Picker'].includes(fieldMode) && /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
+    key: "allowAddNew",
+    title: t('Allow add new data'),
+    checked: fieldSchema['x-add-new'],
+    onChange: function onChange(allowAddNew) {
+      var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
+      field['x-add-new'] = allowAddNew;
+      fieldSchema['x-add-new'] = allowAddNew;
+      schema['x-add-new'] = allowAddNew;
+      dn.emit('patch', {
+        schema: schema
+      });
+      refresh();
+    }
   }), form && !(form === null || form === void 0 ? void 0 : form.readPretty) && ['o2m', 'm2m'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) && fieldSchema['x-component'] !== 'TableField' && /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
     key: "multiple",
     title: t('Multiple'),
@@ -518,13 +647,14 @@ FormItem.Designer = function Designer() {
       });
       refresh();
     }
-  }), field.readPretty && options.length > 0 && fieldSchema['x-component'] === 'CollectionField' && /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
+  }), field.readPretty && options.length > 0 && fieldSchema['x-component'] === 'CollectionField' && !isFileField && /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
     title: t('Enable link'),
-    checked: ((_fieldSchema$xCompon4 = (_fieldSchema$xCompon5 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon5 === void 0 ? void 0 : _fieldSchema$xCompon5.mode) !== null && _fieldSchema$xCompon4 !== void 0 ? _fieldSchema$xCompon4 : 'links') === 'links',
+    checked: ((_fieldSchema$xCompon4 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon4 === void 0 ? void 0 : _fieldSchema$xCompon4.enableLink) !== false,
     onChange: function onChange(flag) {
       fieldSchema['x-component-props'] = _objectSpread(_objectSpread({}, fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-component-props']), {}, {
-        mode: flag ? 'links' : 'tags'
+        enableLink: flag
       });
+      field.componentProps['enableLink'] = flag;
       dn.emit('patch', {
         schema: {
           'x-uid': fieldSchema['x-uid'],
@@ -589,16 +719,17 @@ FormItem.Designer = function Designer() {
     key: "title-field",
     title: t('Title field'),
     options: options,
-    value: field === null || field === void 0 ? void 0 : (_field$componentProps = field.componentProps) === null || _field$componentProps === void 0 ? void 0 : (_field$componentProps2 = _field$componentProps.fieldNames) === null || _field$componentProps2 === void 0 ? void 0 : _field$componentProps2.label,
+    value: field === null || field === void 0 ? void 0 : (_field$componentProps8 = field.componentProps) === null || _field$componentProps8 === void 0 ? void 0 : (_field$componentProps9 = _field$componentProps8.fieldNames) === null || _field$componentProps9 === void 0 ? void 0 : _field$componentProps9.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
       });
       fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
       fieldSchema['x-component-props']['fieldNames'] = fieldNames;
       schema['x-component-props'] = fieldSchema['x-component-props'];
+      field.componentProps.fieldNames = fieldSchema['x-component-props'].fieldNames;
       dn.emit('patch', {
         schema: schema
       });
@@ -615,14 +746,14 @@ FormItem.Designer = function Designer() {
     }
   }));
 };
-function isFileCollection(collection) {
+export function isFileCollection(collection) {
   return (collection === null || collection === void 0 ? void 0 : collection.template) === 'file';
 }
 FormItem.FilterFormDesigner = FilterFormDesigner;
 export function getFieldDefaultValue(fieldSchema, collectionField) {
-  var _collectionField$uiSc7;
+  var _collectionField$uiSc6;
   var result = (fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema.default) || (collectionField === null || collectionField === void 0 ? void 0 : collectionField.defaultValue);
-  if ((collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc7 = collectionField.uiSchema) === null || _collectionField$uiSc7 === void 0 ? void 0 : _collectionField$uiSc7['x-component']) === 'DatePicker' && result) {
+  if ((collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc6 = collectionField.uiSchema) === null || _collectionField$uiSc6 === void 0 ? void 0 : _collectionField$uiSc6['x-component']) === 'DatePicker' && result) {
     return moment(result);
   }
   return result;

package/es/schema-component/antd/form-item/SchemaSettingOptions.js

@@ -13,11 +13,12 @@ import { uid } from '@formily/shared';
 import _ from 'lodash';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { useFilterByTk, useFormBlockContext } from '../../../block-provider';
+import { useFormBlockContext } from '../../../block-provider';
 import { useCollection, useCollectionManager } from '../../../collection-manager';
 import { SchemaSettings, isPatternDisabled } from '../../../schema-settings';
-import { useCompile, useDesignable, useFieldComponentOptions } from '../../hooks';
+import { useCompile, useDesignable, useFieldModeOptions } from '../../hooks';
 import { useOperatorList } from '../filter/useOperators';
+import { isFileCollection } from './FormItem';
 export var findFilterOperators = function findFilterOperators(schema) {
   while (schema) {
     if (schema['x-filter-operators']) {
@@ -387,64 +388,39 @@ export var EditDefaultValue = function EditDefaultValue() {
   }) : null;
 };
 export var EditComponent = function EditComponent() {
+  var _field$componentProps;
   var _useCollectionManager4 = useCollectionManager(),
-    getInterface = _useCollectionManager4.getInterface,
     getCollectionJoinField = _useCollectionManager4.getCollectionJoinField,
     getCollection = _useCollectionManager4.getCollection;
   var _useCollection4 = useCollection(),
-    getField = _useCollection4.getField,
-    template = _useCollection4.template;
-  var tk = useFilterByTk();
-  var _useFormBlockContext3 = useFormBlockContext(),
-    form = _useFormBlockContext3.form;
+    getField = _useCollection4.getField;
   var field = useField();
   var fieldSchema = useFieldSchema();
   var _useTranslation7 = useTranslation(),
     t = _useTranslation7.t;
   var _useDesignable7 = useDesignable(),
-    dn = _useDesignable7.dn,
-    insertAdjacent = _useDesignable7.insertAdjacent;
+    dn = _useDesignable7.dn;
   var collectionField = getField(fieldSchema['name']) || getCollectionJoinField(fieldSchema['x-collection-field']);
-  var interfaceConfig = getInterface(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface);
-  var fieldComponentOptions = useFieldComponentOptions();
-  var isSubFormAssociationField = field.address.segments.includes('__form_grid');
-  return form && !isSubFormAssociationField && fieldComponentOptions ? /*#__PURE__*/React.createElement(SchemaSettings.SelectItem, {
-    title: t('Field component'),
-    options: fieldComponentOptions,
-    value: fieldSchema['x-component'],
-    onChange: function onChange(type) {
-      var _collectionField$uiSc4, _interfaceConfig$sche;
-      var schema = {
-        name: collectionField.name,
-        type: 'void',
-        required: fieldSchema['required'],
-        description: fieldSchema['description'],
-        default: fieldSchema['default'],
-        'x-decorator': 'FormItem',
-        'x-designer': 'FormItem.Designer',
-        'x-component': type,
-        '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'])
-      };
-      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)
-      });
-      insertAdjacent('beforeBegin', divWrap(schema), {
-        onSuccess: function onSuccess() {
-          dn.remove(null, {
-            removeParentsIfNoChildren: true,
-            breakRemoveOn: {
-              'x-component': 'Grid'
-            }
-          });
-        }
+  var fieldModeOptions = useFieldModeOptions();
+  var isAssociationField = ['belongsTo', 'hasOne', 'hasMany', 'belongsToMany'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.type);
+  var targetCollection = getCollection(collectionField === null || collectionField === void 0 ? void 0 : collectionField.target);
+  var isFileField = isFileCollection(targetCollection);
+  return isAssociationField && fieldModeOptions ? /*#__PURE__*/React.createElement(SchemaSettings.SelectItem, {
+    key: "field-mode",
+    title: t('Field mode'),
+    options: fieldModeOptions,
+    value: (field === null || field === void 0 ? void 0 : (_field$componentProps = field.componentProps) === null || _field$componentProps === void 0 ? void 0 : _field$componentProps['mode']) || (isFileField ? 'FileManager' : 'Select'),
+    onChange: function onChange(mode) {
+      var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
+      fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
+      fieldSchema['x-component-props']['mode'] = mode;
+      schema['x-component-props'] = fieldSchema['x-component-props'];
+      field.componentProps = field.componentProps || {};
+      field.componentProps.mode = mode;
+      dn.emit('patch', {
+        schema: schema
       });
+      dn.refresh();
     }
   }) : null;
 };
@@ -453,8 +429,8 @@ export var EditPattern = function EditPattern() {
     getCollectionJoinField = _useCollectionManager5.getCollectionJoinField;
   var _useCollection5 = useCollection(),
     getField = _useCollection5.getField;
-  var _useFormBlockContext4 = useFormBlockContext(),
-    form = _useFormBlockContext4.form;
+  var _useFormBlockContext3 = useFormBlockContext(),
+    form = _useFormBlockContext3.form;
   var field = useField();
   var fieldSchema = useFieldSchema();
   var _useTranslation8 = useTranslation(),
@@ -545,7 +521,8 @@ export var EditOperator = function EditOperator() {
     dn = _useDesignable9.dn;
   var operatorList = useOperatorList();
   var _findFilterOperators2 = findFilterOperators(fieldSchema),
-    storedOperators = _findFilterOperators2.operators,
+    _findFilterOperators3 = _findFilterOperators2.operators,
+    storedOperators = _findFilterOperators3 === void 0 ? {} : _findFilterOperators3,
     uid = _findFilterOperators2.uid;
   if (operatorList.length && !storedOperators[fieldSchema.name]) {
     storedOperators[fieldSchema.name] = operatorList[0].value;
@@ -556,9 +533,9 @@ export var EditOperator = function EditOperator() {
     value: storedOperators[fieldSchema.name],
     options: compile(operatorList),
     onChange: function onChange(v) {
-      var _schema5;
+      var _schema6;
       storedOperators[fieldSchema.name] = v;
-      var schema = (_schema5 = {}, _defineProperty(_schema5, 'x-uid', uid), _defineProperty(_schema5, 'x-filter-operators', storedOperators), _schema5);
+      var schema = (_schema6 = {}, _defineProperty(_schema6, 'x-uid', uid), _defineProperty(_schema6, 'x-filter-operators', storedOperators), _schema6);
       dn.emit('patch', {
         schema: schema
       });
@@ -567,7 +544,7 @@ export var EditOperator = function EditOperator() {
   }) : null;
 };
 export var EditTitleField = function EditTitleField() {
-  var _getCollectionFields, _field$componentProps, _field$componentProps2;
+  var _getCollectionFields, _field$componentProps2, _field$componentProps3;
   var _useCollectionManager6 = useCollectionManager(),
     getCollectionFields = _useCollectionManager6.getCollectionFields,
     getCollectionJoinField = _useCollectionManager6.getCollectionJoinField;
@@ -595,16 +572,17 @@ export var EditTitleField = function EditTitleField() {
     key: "title-field",
     title: t('Title field'),
     options: options,
-    value: field === null || field === void 0 ? void 0 : (_field$componentProps = field.componentProps) === null || _field$componentProps === void 0 ? void 0 : (_field$componentProps2 = _field$componentProps.fieldNames) === null || _field$componentProps2 === void 0 ? void 0 : _field$componentProps2.label,
+    value: field === null || field === void 0 ? void 0 : (_field$componentProps2 = field.componentProps) === null || _field$componentProps2 === void 0 ? void 0 : (_field$componentProps3 = _field$componentProps2.fieldNames) === null || _field$componentProps3 === void 0 ? void 0 : _field$componentProps3.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
       });
       fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
       fieldSchema['x-component-props']['fieldNames'] = fieldNames;
       schema['x-component-props'] = fieldSchema['x-component-props'];
+      field.componentProps.fieldNames = fieldSchema['x-component-props'].fieldNames;
       dn.emit('patch', {
         schema: schema
       });

package/es/schema-component/antd/form-v2/utils.js

@@ -70,7 +70,9 @@ export var linkageMergeAction = function linkageMergeAction(_ref, field, conditi
               }
             }));
             valueResult.push(result);
-          } catch (error) {}
+          } catch (error) {
+            console.log(error);
+          }
         } else if ((value === null || value === void 0 ? void 0 : value.mode) === 'constant') {
           valueResult.push((value === null || value === void 0 ? void 0 : value.value) || value);
         } else {

package/es/schema-component/antd/gantt/components/other/tooltip.js

@@ -97,7 +97,7 @@ export var StandardTooltipContent = function StandardTooltipContent(_ref2) {
     }
   }, task.name, ": ", getYmd(task.start), " ~ ", getYmd(task.end)), task.end.getTime() - task.start.getTime() !== 0 && /*#__PURE__*/React.createElement("p", {
     className: cx(tooltipDefaultContainerParagraph)
-  }, "Duration: ".concat(~~((task.end.getTime() - task.start.getTime()) / (1000 * 60 * 60 * 24)), " day(s)")), /*#__PURE__*/React.createElement("p", {
+  }, "Duration: ".concat(Math.round((task.end.getTime() - task.start.getTime()) / (1000 * 60 * 60 * 24) * 10) / 10, " day(s)")), /*#__PURE__*/React.createElement("p", {
     className: cx(tooltipDefaultContainerParagraph)
   }, !!task.progress && "Progress: ".concat(task.progress, "%")));
 };

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

@@ -1,4 +1,5 @@
 export * from './action';
+export * from './association-field';
 export * from './association-select';
 export * from './block-item';
 export * from './calendar';
@@ -10,11 +11,13 @@ export * from './color-select';
 export * from './cron';
 export * from './date-picker';
 export * from './details';
+export * from './expand-action';
 export * from './filter';
 export * from './form';
 export * from './form-item';
 export * from './form-v2';
 export * from './g2plot';
+export * from './gantt';
 export * from './grid';
 export * from './icon-picker';
 export * from './input';
@@ -40,5 +43,4 @@ export * from './time-picker';
 export * from './tree-select';
 export * from './upload';
 export * from './variable';
-export * from './gantt';
 import './index.less';

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

@@ -1,4 +1,5 @@
 export * from './action';
+export * from './association-field';
 export * from './association-select';
 export * from './block-item';
 export * from './calendar';
@@ -10,11 +11,13 @@ export * from './color-select';
 export * from './cron';
 export * from './date-picker';
 export * from './details';
+export * from './expand-action';
 export * from './filter';
 export * from './form';
 export * from './form-item';
 export * from './form-v2';
 export * from './g2plot';
+export * from './gantt';
 export * from './grid';
 export * from './icon-picker';
 export * from './input';
@@ -40,5 +43,4 @@ export * from './time-picker';
 export * from './tree-select';
 export * from './upload';
 export * from './variable';
-export * from './gantt';
 import './index.less';

package/es/schema-component/antd/menu/Menu.js

@@ -232,7 +232,8 @@ Menu.Item = observer(function (props) {
     eventKey: schema.name,
     schema: schema
   }), /*#__PURE__*/React.createElement(SortableItem, {
-    className: designerCss
+    className: designerCss,
+    removeParentsIfNoChildren: false
   }, /*#__PURE__*/React.createElement(Icon, {
     type: icon
   }), /*#__PURE__*/React.createElement("span", {
@@ -254,7 +255,8 @@ Menu.URL = observer(function (props) {
       window.open(props.href, '_blank');
     }
   }), /*#__PURE__*/React.createElement(SortableItem, {
-    className: designerCss
+    className: designerCss,
+    removeParentsIfNoChildren: false
   }, /*#__PURE__*/React.createElement(Icon, {
     type: icon
   }), /*#__PURE__*/React.createElement("span", {
@@ -276,7 +278,8 @@ Menu.SubMenu = observer(function (props) {
     key: schema.name,
     eventKey: schema.name,
     title: /*#__PURE__*/React.createElement(SortableItem, {
-      className: subMenuDesignerCss
+      className: subMenuDesignerCss,
+      removeParentsIfNoChildren: false
     }, /*#__PURE__*/React.createElement(Icon, {
       type: icon
     }), field.title, /*#__PURE__*/React.createElement(Designer, null))

package/es/schema-component/antd/record-picker/InputRecordPicker.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
 export declare const RecordPickerContext: React.Context<any>;
 export declare const InputRecordPicker: React.FC<any>;
+export declare const RecordPickerProvider: (props: any) => JSX.Element;
 export declare function isShowFilePicker(labelUiSchema: any): boolean;