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

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

@@ -1,5 +1,5 @@
 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); }
-var _templateObject, _templateObject2;
+var _templateObject, _templateObject2, _templateObject3;
 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; }
@@ -9,27 +9,30 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _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, ArrayItems } from '@formily/antd';
+import { css, cx } from '@emotion/css';
+import { ArrayCollapse, ArrayItems, FormLayout, FormItem as Item } from '@formily/antd';
 import { observer, useField, useFieldSchema } from '@formily/react';
 import { uid } from '@formily/shared';
+import { Select } from 'antd';
 import _ from 'lodash';
 import moment from 'moment';
 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, useSortFields, useCollectionFilterOptions } from '../../../collection-manager';
+import { BlockRequestContext, useFormBlockContext } from '../../../block-provider';
+import { useCollection, useCollectionFilterOptions, useCollectionManager, useSortFields } from '../../../collection-manager';
 import { isTitleField } from '../../../collection-manager/Configuration/CollectionFields';
+import { GeneralSchemaItems } from '../../../schema-items/GeneralSchemaItems';
 import { GeneralSchemaDesigner, SchemaSettings, isPatternDisabled, isShowDefaultValue } from '../../../schema-settings';
 import { VariableInput } from '../../../schema-settings/VariableInput/VariableInput';
-import { FilterDynamicComponent } from '../table-v2/FilterDynamicComponent';
+import { useIsShowMultipleSwitch } from '../../../schema-settings/hooks/useIsShowMultipleSwitch';
 import { isVariable, parseVariables, useVariablesCtx } from '../../common/utils/uitls';
 import { SchemaComponent } from '../../core';
-import { removeNullCondition } from '../filter';
 import { useCompile, useDesignable, useFieldModeOptions } from '../../hooks';
 import { BlockItem } from '../block-item';
+import { removeNullCondition } from '../filter';
 import { HTMLEncode } from '../input/shared';
+import { FilterDynamicComponent } from '../table-v2/FilterDynamicComponent';
 import { isInvariable } from '../variable';
 import { FilterFormDesigner } from './FormItem.FilterFormDesigner';
 import { useEnsureOperatorsValid } from './SchemaSettingOptions';
@@ -62,10 +65,12 @@ export var FormItem = observer(function (props) {
       }
     }
   }, []);
+  var _props$showTitle = props.showTitle,
+    showTitle = _props$showTitle === void 0 ? true : _props$showTitle;
   return /*#__PURE__*/React.createElement(ACLCollectionFieldProvider, null, /*#__PURE__*/React.createElement(BlockItem, {
     className: 'nb-form-item'
   }, /*#__PURE__*/React.createElement(Item, _objectSpread(_objectSpread({
-    className: "".concat(css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n            & .ant-space {\n              flex-wrap: wrap;\n            }\n          "]))))
+    className: cx(css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n              & .ant-space {\n                flex-wrap: wrap;\n              }\n            "]))), _defineProperty({}, css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n                > .ant-formily-item-label {\n                  display: none;\n                }\n              "]))), showTitle === false))
   }, props), {}, {
     extra: typeof field.description === 'string' ? /*#__PURE__*/React.createElement("div", {
       dangerouslySetInnerHTML: {
@@ -75,7 +80,7 @@ export var FormItem = observer(function (props) {
   }))));
 });
 FormItem.Designer = function Designer() {
-  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 _interfaceConfig$vali, _collectionField$uiSc, _getCollectionFields, _field$componentProps, _field$componentProps2, _field$componentProps3, _field$componentProps4, _field$componentProps5, _field$componentProps6, _field$componentProps7, _fieldSchema$xCompon, _fieldSchema$xCompon2, _fieldSchema$xCompon3, _fieldSchema$xCompon4, _fieldSchema$xCompon5, _fieldSchema$xCompon6, _fieldSchema$xCompon7, _fieldSchema$xCompon8, _fieldSchema$xCompon9, _fieldSchema$xCompon10, _field$componentProps8, _field$componentProps9;
   var _useCollectionManager = useCollectionManager(),
     getCollectionFields = _useCollectionManager.getCollectionFields,
     getInterface = _useCollectionManager.getInterface,
@@ -83,7 +88,6 @@ FormItem.Designer = function Designer() {
     getCollection = _useCollectionManager.getCollection;
   var _useCollection = useCollection(),
     getField = _useCollection.getField;
-  var tk = useFilterByTk();
   var _useFormBlockContext = useFormBlockContext(),
     form = _useFormBlockContext.form;
   var field = useField();
@@ -96,6 +100,7 @@ FormItem.Designer = function Designer() {
     insertAdjacent = _useDesignable.insertAdjacent;
   var compile = useCompile();
   var variablesCtx = useVariablesCtx();
+  var IsShowMultipleSwitch = useIsShowMultipleSwitch();
   var collectionField = getField(fieldSchema['name']) || getCollectionJoinField(fieldSchema['x-collection-field']);
   var targetCollection = getCollection(collectionField === null || collectionField === void 0 ? void 0 : collectionField.target);
   var interfaceConfig = getInterface(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface);
@@ -135,7 +140,7 @@ FormItem.Designer = function Designer() {
   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('-') ? {
+    return (item === null || item === void 0 ? void 0 : item.startsWith('-')) ? {
       field: item.substring(1),
       direction: 'desc'
     } : {
@@ -143,111 +148,15 @@ FormItem.Designer = function Designer() {
       direction: 'asc'
     };
   });
-  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 && fieldSchema['x-component'] !== 'FormField' && /*#__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 === null || form === void 0 ? void 0 : form.readPretty) && isFileField ? /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
+  var fieldSchemaWithoutRequired = _.omit(fieldSchema, 'required');
+  var isSubFormMode = ((_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : _fieldSchema$xCompon.mode) === 'Nester';
+  var isPickerMode = ((_fieldSchema$xCompon2 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon2 === void 0 ? void 0 : _fieldSchema$xCompon2.mode) === 'Picker';
+  var showFieldMode = isAssociationField && fieldModeOptions && !isTableField;
+  var showModeSelect = showFieldMode && isPickerMode;
+  return /*#__PURE__*/React.createElement(GeneralSchemaDesigner, null, /*#__PURE__*/React.createElement(GeneralSchemaItems, null), !(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) !== false,
+    checked: ((_fieldSchema$xCompon3 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon3 === void 0 ? void 0 : _fieldSchema$xCompon3.quickUpload) !== false,
     onChange: function onChange(value) {
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
       field.componentProps.quickUpload = value;
@@ -262,7 +171,7 @@ FormItem.Designer = function Designer() {
   }) : 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) !== false,
+    checked: ((_fieldSchema$xCompon4 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon4 === void 0 ? void 0 : _fieldSchema$xCompon4.selectFile) !== false,
     onChange: function onChange(value) {
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
       field.componentProps.selectFile = value;
@@ -362,7 +271,7 @@ FormItem.Designer = function Designer() {
       }
     },
     onSubmit: function onSubmit(v) {
-      var _collectionField$uiSc3;
+      var _collectionField$uiSc2;
       var rules = [];
       var _iterator = _createForOfIteratorHelper(v.rules),
         _step;
@@ -400,7 +309,7 @@ FormItem.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;
@@ -421,10 +330,10 @@ FormItem.Designer = function Designer() {
       type: 'object',
       title: t('Set default value'),
       properties: {
-        default: isInvariable(interfaceConfig) ? _objectSpread(_objectSpread({}, fieldSchema || {}), {}, {
+        default: isInvariable(interfaceConfig) ? _objectSpread(_objectSpread({}, fieldSchemaWithoutRequired || {}), {}, {
           'x-decorator': 'FormItem',
           'x-component-props': _objectSpread(_objectSpread({}, fieldSchema['x-component-props']), {}, {
-            component: (collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) && collectionField.interface !== 'chinaRegion' ? 'AssociationSelect' : undefined,
+            component: (collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) && (collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) !== 'chinaRegion' ? 'AssociationSelect' : undefined,
             service: {
               resource: collectionField === null || collectionField === void 0 ? void 0 : collectionField.target
             },
@@ -438,7 +347,7 @@ FormItem.Designer = function Designer() {
           default: getFieldDefaultValue(fieldSchema, collectionField),
           'x-read-pretty': false,
           'x-disabled': false
-        }) : _objectSpread(_objectSpread({}, fieldSchema || {}), {}, {
+        }) : _objectSpread(_objectSpread({}, fieldSchemaWithoutRequired || {}), {}, {
           'x-decorator': 'FormItem',
           'x-component': 'VariableInput',
           'x-component-props': _objectSpread(_objectSpread({}, (fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-component-props']) || {}), {}, {
@@ -446,7 +355,7 @@ FormItem.Designer = function Designer() {
             schema: collectionField === null || collectionField === void 0 ? void 0 : collectionField.uiSchema,
             className: defaultInputStyle,
             renderSchemaComponent: function Com(props) {
-              var s = _.cloneDeep(fieldSchema) || {};
+              var s = _.cloneDeep(fieldSchemaWithoutRequired) || {};
               s.title = '';
               s['x-read-pretty'] = false;
               s['x-disabled'] = false;
@@ -502,15 +411,15 @@ FormItem.Designer = function Designer() {
         }
       }
     },
-    onSubmit: function onSubmit(_ref4) {
-      var _schema6;
-      var filter = _ref4.filter;
+    onSubmit: function onSubmit(_ref) {
+      var _schema5;
+      var filter = _ref.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)
+        schema: (_schema5 = {}, _defineProperty(_schema5, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema5, 'x-component-props', field.componentProps), _schema5)
       });
     }
   }), isSelectFieldMode && !field.readPretty && /*#__PURE__*/React.createElement(SchemaSettings.ModalItem, {
@@ -542,6 +451,7 @@ FormItem.Designer = function Designer() {
                   field: {
                     type: 'string',
                     enum: sortFields,
+                    required: true,
                     'x-decorator': 'FormItem',
                     'x-component': 'Select',
                     'x-component-props': {
@@ -584,19 +494,19 @@ FormItem.Designer = function Designer() {
         }
       }
     },
-    onSubmit: function onSubmit(_ref5) {
-      var _schema7;
-      var sort = _ref5.sort;
+    onSubmit: function onSubmit(_ref2) {
+      var _schema6;
+      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: (_schema7 = {}, _defineProperty(_schema7, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema7, 'x-component-props', field.componentProps), _schema7)
+        schema: (_schema6 = {}, _defineProperty(_schema6, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema6, 'x-component-props', field.componentProps), _schema6)
       });
     }
-  }), isAssociationField && fieldModeOptions && !isTableField && /*#__PURE__*/React.createElement(SchemaSettings.SelectItem, {
+  }), showFieldMode && /*#__PURE__*/React.createElement(SchemaSettings.SelectItem, {
     key: "field-mode",
     title: t('Field mode'),
     options: fieldModeOptions,
@@ -608,20 +518,75 @@ FormItem.Designer = function Designer() {
       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;
-      }
+      // if (mode === 'Nester') {
+      //   const initValue = ['hasMany', 'belongsToMany'].includes(collectionField?.type) ? [{}] : {};
+      //   field.value = field.value || initValue;
+      // }
       dn.emit('patch', {
         schema: schema
       });
       dn.refresh();
     }
-  }), !field.readPretty && isAssociationField && ['Select', 'Picker'].includes(fieldMode) && /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
+  }), showModeSelect && /*#__PURE__*/React.createElement(SchemaSettings.Item, null, /*#__PURE__*/React.createElement("div", {
+    style: {
+      alignItems: 'center',
+      display: 'flex',
+      justifyContent: 'space-between'
+    }
+  }, t('Popup size'), /*#__PURE__*/React.createElement(Select, {
+    bordered: false,
+    options: [{
+      label: t('Small'),
+      value: 'small'
+    }, {
+      label: t('Middle'),
+      value: 'middle'
+    }, {
+      label: t('Large'),
+      value: 'large'
+    }],
+    value: (_fieldSchema$xCompon5 = fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon6 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon6 === void 0 ? void 0 : _fieldSchema$xCompon6['openSize']) !== null && _fieldSchema$xCompon5 !== void 0 ? _fieldSchema$xCompon5 : (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon7 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon7 === void 0 ? void 0 : _fieldSchema$xCompon7['openMode']) == 'modal' ? 'large' : 'middle',
+    onChange: function onChange(value) {
+      field.componentProps.openSize = value;
+      fieldSchema['x-component-props'] = field.componentProps;
+      dn.emit('patch', {
+        schema: {
+          'x-uid': fieldSchema['x-uid'],
+          'x-component-props': fieldSchema['x-component-props']
+        }
+      });
+      dn.refresh();
+    },
+    style: {
+      textAlign: 'right',
+      minWidth: 100
+    }
+  }))), !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 hasAddNew = fieldSchema.reduceProperties(function (buf, schema) {
+        if (schema['x-component'] === 'Action') {
+          return schema;
+        }
+        return buf;
+      }, null);
+      if (!hasAddNew) {
+        var addNewActionschema = {
+          'x-action': 'create',
+          title: "{{t('Add new')}}",
+          'x-designer': 'Action.Designer',
+          'x-component': 'Action',
+          'x-decorator': 'ACLActionProvider',
+          'x-component-props': {
+            openMode: 'drawer',
+            type: 'default',
+            component: 'CreateRecordAction'
+          }
+        };
+        insertAdjacent('afterBegin', addNewActionschema);
+      }
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
       field['x-add-new'] = allowAddNew;
       fieldSchema['x-add-new'] = allowAddNew;
@@ -631,10 +596,10 @@ FormItem.Designer = function Designer() {
       });
       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, {
+  }), IsShowMultipleSwitch() ? /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
     key: "multiple",
-    title: t('Multiple'),
-    checked: ((_fieldSchema$xCompon3 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon3 === void 0 ? void 0 : _fieldSchema$xCompon3.multiple) === undefined ? true : fieldSchema['x-component-props'].multiple,
+    title: t('Allow multiple'),
+    checked: ((_fieldSchema$xCompon8 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon8 === void 0 ? void 0 : _fieldSchema$xCompon8.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'] || {};
@@ -647,9 +612,25 @@ FormItem.Designer = function Designer() {
       });
       refresh();
     }
-  }), field.readPretty && options.length > 0 && fieldSchema['x-component'] === 'CollectionField' && !isFileField && /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
+  }) : null, IsShowMultipleSwitch() && isSubFormMode ? /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
+    key: "allowDissociate",
+    title: t('Allow dissociate'),
+    checked: ((_fieldSchema$xCompon9 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon9 === void 0 ? void 0 : _fieldSchema$xCompon9.allowDissociate) !== false,
+    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'].allowDissociate = value;
+      field.componentProps.allowDissociate = value;
+      schema['x-component-props'] = fieldSchema['x-component-props'];
+      dn.emit('patch', {
+        schema: schema
+      });
+      refresh();
+    }
+  }) : null, field.readPretty && options.length > 0 && fieldSchema['x-component'] === 'CollectionField' && !isFileField && /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
     title: t('Enable link'),
-    checked: ((_fieldSchema$xCompon4 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon4 === void 0 ? void 0 : _fieldSchema$xCompon4.enableLink) !== false,
+    checked: ((_fieldSchema$xCompon10 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon10 === void 0 ? void 0 : _fieldSchema$xCompon10.enableLink) !== false,
     onChange: function onChange(flag) {
       fieldSchema['x-component-props'] = _objectSpread(_objectSpread({}, fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-component-props']), {}, {
         enableLink: flag
@@ -715,15 +696,15 @@ FormItem.Designer = function Designer() {
       });
       dn.refresh();
     }
-  }), options.length > 0 && fieldSchema['x-component'] === 'CollectionField' && /*#__PURE__*/React.createElement(SchemaSettings.SelectItem, {
+  }), options.length > 0 && isAssociationField && /*#__PURE__*/React.createElement(SchemaSettings.SelectItem, {
     key: "title-field",
     title: t('Title field'),
     options: options,
     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$uiSc4, _collectionField$uiSc5;
+      var _collectionField$uiSc3, _collectionField$uiSc4;
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
-      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), {}, {
+      var fieldNames = _objectSpread(_objectSpread(_objectSpread({}, collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc3 = collectionField.uiSchema) === null || _collectionField$uiSc3 === void 0 ? void 0 : (_collectionField$uiSc4 = _collectionField$uiSc3['x-component-props']) === null || _collectionField$uiSc4 === void 0 ? void 0 : _collectionField$uiSc4['fieldNames']), field.componentProps.fieldNames), {}, {
         label: label
       });
       fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
@@ -751,9 +732,9 @@ export function isFileCollection(collection) {
 }
 FormItem.FilterFormDesigner = FilterFormDesigner;
 export function getFieldDefaultValue(fieldSchema, collectionField) {
-  var _collectionField$uiSc6;
+  var _collectionField$uiSc5;
   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$uiSc6 = collectionField.uiSchema) === null || _collectionField$uiSc6 === void 0 ? void 0 : _collectionField$uiSc6['x-component']) === 'DatePicker' && result) {
+  if ((collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc5 = collectionField.uiSchema) === null || _collectionField$uiSc5 === void 0 ? void 0 : _collectionField$uiSc5['x-component']) === 'DatePicker' && result) {
     return moment(result);
   }
   return result;

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

@@ -365,11 +365,11 @@ export var EditDefaultValue = function EditDefaultValue() {
       type: 'object',
       title: t('Set default value'),
       properties: {
-        default: _objectSpread(_objectSpread({}, collectionField.uiSchema), {}, {
+        default: _objectSpread(_objectSpread({}, collectionField === null || collectionField === void 0 ? void 0 : collectionField.uiSchema), {}, {
           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)
         })
       }
     },
@@ -558,7 +558,7 @@ export var EditTitleField = function EditTitleField() {
     dn = _useDesignable10.dn;
   var compile = useCompile();
   var collectionField = getField(fieldSchema['name']) || getCollectionJoinField(fieldSchema['x-collection-field']);
-  var targetFields = (collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) ? getCollectionFields(collectionField.target) : (_getCollectionFields = getCollectionFields(collectionField === null || collectionField === void 0 ? void 0 : collectionField.targetCollection)) !== null && _getCollectionFields !== void 0 ? _getCollectionFields : [];
+  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 options = targetFields.filter(function (field) {
     return !(field === null || field === void 0 ? void 0 : field.target) && field.type !== 'boolean';
   }).map(function (field) {

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

@@ -162,6 +162,7 @@ export var DetailsDesigner = function DetailsDesigner() {
                   field: {
                     type: 'string',
                     enum: sortFields,
+                    required: true,
                     'x-decorator': 'FormItem',
                     'x-component': 'Select',
                     'x-component-props': {

package/es/schema-component/antd/form-v2/Templates.d.ts

@@ -1,3 +1,23 @@
+export interface ITemplate {
+    config?: {
+        [key: string]: {
+            /** 设置的数据范围 */
+            filter?: any;
+            /** 设置的标题字段 */
+            titleField?: string;
+        };
+    };
+    items: {
+        key: string;
+        title: string;
+        collection: string;
+        dataId: number;
+        fields: string[];
+        default?: boolean;
+    }[];
+    /** 是否在 Form 区块显示模板选择器 */
+    display: boolean;
+}
 export declare const Templates: ({ style, form }: {
     style?: {};
     form: any;