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

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

@@ -12,13 +12,14 @@ function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(
 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 React, { useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { ACLCollectionFieldProvider } from '../../../acl/ACLProvider';
-import { BlockRequestContext, useFormBlockContext } from '../../../block-provider';
+import { useBlockRequestContext } from '../../../block-provider/BlockProvider';
+import { useFormBlockContext } from '../../../block-provider/FormBlockProvider';
 import { useCollection, useCollectionFilterOptions, useCollectionManager, useSortFields } from '../../../collection-manager';
 import { isTitleField } from '../../../collection-manager/Configuration/CollectionFields';
 import { GeneralSchemaItems } from '../../../schema-items/GeneralSchemaItems';
@@ -35,22 +36,12 @@ import { FilterDynamicComponent } from '../table-v2/FilterDynamicComponent';
 import { isInvariable } from '../variable';
 import { FilterFormDesigner } from './FormItem.FilterFormDesigner';
 import { useEnsureOperatorsValid } from './SchemaSettingOptions';
-import { Select } from 'antd';
 var defaultInputStyle = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  & > .nb-form-item {\n    flex: 1;\n  }\n"])));
-var divWrap = function divWrap(schema) {
-  return {
-    type: 'void',
-    'x-component': 'div',
-    'x-component-props': {
-      className: 'nb-block-wrap'
-    },
-    properties: _defineProperty({}, schema.name || uid(), schema)
-  };
-};
 export var FormItem = observer(function (props) {
+  var _schema$xDecoratorP, _schema$xDecoratorP2;
   useEnsureOperatorsValid();
   var field = useField();
-  var ctx = useContext(BlockRequestContext);
+  var ctx = useBlockRequestContext();
   var schema = useFieldSchema();
   var variablesCtx = useVariablesCtx();
   useEffect(function () {
@@ -65,12 +56,11 @@ export var FormItem = observer(function (props) {
       }
     }
   }, []);
-  var _props$showTitle = props.showTitle,
-    showTitle = _props$showTitle === void 0 ? true : _props$showTitle;
+  var showTitle = (_schema$xDecoratorP = (_schema$xDecoratorP2 = schema['x-decorator-props']) === null || _schema$xDecoratorP2 === void 0 ? void 0 : _schema$xDecoratorP2.showTitle) !== null && _schema$xDecoratorP !== void 0 ? _schema$xDecoratorP : true;
   return /*#__PURE__*/React.createElement(ACLCollectionFieldProvider, null, /*#__PURE__*/React.createElement(BlockItem, {
     className: 'nb-form-item'
   }, /*#__PURE__*/React.createElement(Item, _objectSpread(_objectSpread({
-    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))
+    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: {
@@ -78,9 +68,12 @@ export var FormItem = observer(function (props) {
       }
     }) : field.description
   }))));
+}, {
+  displayName: 'FormItem'
 });
 FormItem.Designer = function Designer() {
-  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, _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$xCompon2, _fieldSchema$xCompon3, _fieldSchema$xCompon4, _fieldSchema$xCompon5, _fieldSchema$xCompon6, _fieldSchema$xCompon7, _fieldSchema$xCompon8, _field$componentProps8, _fieldSchema$xCompon9, _fieldSchema$xCompon10, _fieldSchema$xCompon11, _field$componentProps9, _field$componentProps10;
+  var targetField;
   var _useCollectionManager = useCollectionManager(),
     getCollectionFields = _useCollectionManager.getCollectionFields,
     getInterface = _useCollectionManager.getInterface,
@@ -102,13 +95,17 @@ FormItem.Designer = function Designer() {
   var variablesCtx = useVariablesCtx();
   var IsShowMultipleSwitch = useIsShowMultipleSwitch();
   var collectionField = getField(fieldSchema['name']) || getCollectionJoinField(fieldSchema['x-collection-field']);
+  if (collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) {
+    var _fieldSchema$xCompon, _fieldSchema$xCompon$;
+    targetField = getCollectionJoinField("".concat(collectionField.target, ".").concat(((_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : (_fieldSchema$xCompon$ = _fieldSchema$xCompon.fieldNames) === null || _fieldSchema$xCompon$ === void 0 ? void 0 : _fieldSchema$xCompon$.label) || 'id'));
+  }
   var targetCollection = getCollection(collectionField === null || collectionField === void 0 ? void 0 : collectionField.target);
   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 === 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 fieldModeOptions = useFieldModeOptions();
-  var isAssociationField = ['belongsTo', 'hasOne', 'hasMany', 'belongsToMany'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.type);
+  var isAssociationField = ['obo', 'oho', 'o2o', 'o2m', 'm2m', 'm2o'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface);
   var isTableField = fieldSchema['x-component'] === 'TableField';
   var isFileField = isFileCollection(targetCollection);
   var initialValue = {
@@ -138,7 +135,7 @@ FormItem.Designer = function Designer() {
   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 isSelectFieldMode = isAssociationField && fieldMode === 'Select';
   var sort = defaultSort === null || defaultSort === void 0 ? void 0 : defaultSort.map(function (item) {
     return (item === null || item === void 0 ? void 0 : item.startsWith('-')) ? {
       field: item.substring(1),
@@ -149,13 +146,14 @@ FormItem.Designer = function Designer() {
     };
   });
   var fieldSchemaWithoutRequired = _.omit(fieldSchema, 'required');
-  var isPickerMode = fieldSchema['x-component-props'].mode === 'Picker';
+  var isSubFormMode = ((_fieldSchema$xCompon2 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon2 === void 0 ? void 0 : _fieldSchema$xCompon2.mode) === 'Nester';
+  var isPickerMode = ((_fieldSchema$xCompon3 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon3 === void 0 ? void 0 : _fieldSchema$xCompon3.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$xCompon4 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon4 === void 0 ? void 0 : _fieldSchema$xCompon4.quickUpload) !== false,
     onChange: function onChange(value) {
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
       field.componentProps.quickUpload = value;
@@ -170,7 +168,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$xCompon5 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon5 === void 0 ? void 0 : _fieldSchema$xCompon5.selectFile) !== false,
     onChange: function onChange(value) {
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
       field.componentProps.selectFile = value;
@@ -332,6 +330,7 @@ FormItem.Designer = function Designer() {
         default: isInvariable(interfaceConfig) ? _objectSpread(_objectSpread({}, fieldSchemaWithoutRequired || {}), {}, {
           'x-decorator': 'FormItem',
           'x-component-props': _objectSpread(_objectSpread({}, fieldSchema['x-component-props']), {}, {
+            targetField: targetField,
             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
@@ -350,6 +349,7 @@ FormItem.Designer = function Designer() {
           'x-decorator': 'FormItem',
           'x-component': 'VariableInput',
           'x-component-props': _objectSpread(_objectSpread({}, (fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-component-props']) || {}), {}, {
+            targetField: targetField,
             collectionName: collectionField === null || collectionField === void 0 ? void 0 : collectionField.collectionName,
             schema: collectionField === null || collectionField === void 0 ? void 0 : collectionField.uiSchema,
             className: defaultInputStyle,
@@ -507,7 +507,7 @@ FormItem.Designer = function Designer() {
     }
   }), showFieldMode && /*#__PURE__*/React.createElement(SchemaSettings.SelectItem, {
     key: "field-mode",
-    title: t('Field mode'),
+    title: t('Field component'),
     options: fieldModeOptions,
     value: fieldMode,
     onChange: function onChange(mode) {
@@ -544,7 +544,7 @@ FormItem.Designer = function Designer() {
       label: t('Large'),
       value: 'large'
     }],
-    value: (_fieldSchema$xCompon3 = fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon4 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon4 === void 0 ? void 0 : _fieldSchema$xCompon4['openSize']) !== null && _fieldSchema$xCompon3 !== void 0 ? _fieldSchema$xCompon3 : (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon5 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon5 === void 0 ? void 0 : _fieldSchema$xCompon5['openMode']) == 'modal' ? 'large' : 'middle',
+    value: (_fieldSchema$xCompon6 = fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon7 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon7 === void 0 ? void 0 : _fieldSchema$xCompon7['openSize']) !== null && _fieldSchema$xCompon6 !== void 0 ? _fieldSchema$xCompon6 : (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon8 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon8 === void 0 ? void 0 : _fieldSchema$xCompon8['openMode']) == 'modal' ? 'large' : 'middle',
     onChange: function onChange(value) {
       field.componentProps.openSize = value;
       fieldSchema['x-component-props'] = field.componentProps;
@@ -560,7 +560,7 @@ FormItem.Designer = function Designer() {
       textAlign: 'right',
       minWidth: 100
     }
-  }))), !field.readPretty && isAssociationField && ['Select', 'Picker'].includes(fieldMode) && /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
+  }))), !field.readPretty && isAssociationField && ['Picker'].includes(fieldMode) && /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
     key: "allowAddNew",
     title: t('Allow add new data'),
     checked: fieldSchema['x-add-new'],
@@ -595,10 +595,59 @@ FormItem.Designer = function Designer() {
       });
       refresh();
     }
-  }), IsShowMultipleSwitch() ? /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
+  }), !field.readPretty && isAssociationField && ['Select'].includes(fieldMode) && /*#__PURE__*/React.createElement(SchemaSettings.SelectItem, {
+    key: "add-mode",
+    title: t('Quick create'),
+    options: [{
+      label: t('None'),
+      value: 'none'
+    }, {
+      label: t('Dropdown'),
+      value: 'quickAdd'
+    }, {
+      label: t('Pop-up'),
+      value: 'modalAdd'
+    }],
+    value: ((_field$componentProps8 = field.componentProps) === null || _field$componentProps8 === void 0 ? void 0 : _field$componentProps8.addMode) || 'none',
+    onChange: function onChange(mode) {
+      if (mode === 'modalAdd') {
+        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']);
+      fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
+      fieldSchema['x-component-props']['addMode'] = mode;
+      schema['x-component-props'] = fieldSchema['x-component-props'];
+      field.componentProps = field.componentProps || {};
+      field.componentProps.addMode = mode;
+      dn.emit('patch', {
+        schema: schema
+      });
+      dn.refresh();
+    }
+  }), isAssociationField && IsShowMultipleSwitch() ? /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
     key: "multiple",
     title: t('Allow multiple'),
-    checked: ((_fieldSchema$xCompon6 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon6 === void 0 ? void 0 : _fieldSchema$xCompon6.multiple) === undefined ? true : fieldSchema['x-component-props'].multiple,
+    checked: ((_fieldSchema$xCompon9 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon9 === void 0 ? void 0 : _fieldSchema$xCompon9.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'] || {};
@@ -611,9 +660,25 @@ FormItem.Designer = function Designer() {
       });
       refresh();
     }
+  }) : null, IsShowMultipleSwitch() && isSubFormMode ? /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
+    key: "allowDissociate",
+    title: t('Allow dissociate'),
+    checked: ((_fieldSchema$xCompon10 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon10 === void 0 ? void 0 : _fieldSchema$xCompon10.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$xCompon7 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon7 === void 0 ? void 0 : _fieldSchema$xCompon7.enableLink) !== false,
+    checked: ((_fieldSchema$xCompon11 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon11 === void 0 ? void 0 : _fieldSchema$xCompon11.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
@@ -679,11 +744,11 @@ FormItem.Designer = function Designer() {
       });
       dn.refresh();
     }
-  }), options.length > 0 && isAssociationField && /*#__PURE__*/React.createElement(SchemaSettings.SelectItem, {
+  }), options.length > 0 && isAssociationField && fieldMode !== 'SubTable' && /*#__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,
+    value: field === null || field === void 0 ? void 0 : (_field$componentProps9 = field.componentProps) === null || _field$componentProps9 === void 0 ? void 0 : (_field$componentProps10 = _field$componentProps9.fieldNames) === null || _field$componentProps10 === void 0 ? void 0 : _field$componentProps10.label,
     onChange: function onChange(label) {
       var _collectionField$uiSc3, _collectionField$uiSc4;
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
@@ -715,8 +780,8 @@ export function isFileCollection(collection) {
 }
 FormItem.FilterFormDesigner = FilterFormDesigner;
 export function getFieldDefaultValue(fieldSchema, collectionField) {
-  var _collectionField$uiSc5;
-  var result = (fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema.default) || (collectionField === null || collectionField === void 0 ? void 0 : collectionField.defaultValue);
+  var _fieldSchema$default, _collectionField$uiSc5;
+  var result = (_fieldSchema$default = fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema.default) !== null && _fieldSchema$default !== void 0 ? _fieldSchema$default : collectionField === null || collectionField === void 0 ? void 0 : collectionField.defaultValue;
   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);
   }

package/es/schema-component/antd/form-item/SchemaSettingOptions.d.ts

@@ -1,4 +1,5 @@
 import { Schema } from '@formily/react';
+import React from 'react';
 export declare const findFilterOperators: (schema: Schema) => {
     operators: any;
     uid: any;
@@ -6,18 +7,18 @@ export declare const findFilterOperators: (schema: Schema) => {
     operators?: undefined;
     uid?: undefined;
 };
-export declare const EditTitle: () => JSX.Element;
-export declare const EditDescription: () => JSX.Element;
-export declare const EditTooltip: () => JSX.Element;
-export declare const EditRequired: () => JSX.Element;
-export declare const EditValidationRules: () => JSX.Element;
-export declare const EditDefaultValue: () => JSX.Element;
-export declare const EditComponent: () => JSX.Element;
-export declare const EditPattern: () => JSX.Element;
+export declare const EditTitle: () => React.JSX.Element;
+export declare const EditDescription: () => React.JSX.Element;
+export declare const EditTooltip: () => React.JSX.Element;
+export declare const EditRequired: () => React.JSX.Element;
+export declare const EditValidationRules: () => React.JSX.Element;
+export declare const EditDefaultValue: () => React.JSX.Element;
+export declare const EditComponent: () => React.JSX.Element;
+export declare const EditPattern: () => React.JSX.Element;
 /**
  * 如果用户没有手动设置过 operator，那么在筛选的时候 operator 会是空的，
  * 该方法确保 operator 一定有值（需要在 FormItem 中调用）
  */
 export declare const useEnsureOperatorsValid: () => void;
-export declare const EditOperator: () => JSX.Element;
-export declare const EditTitleField: () => JSX.Element;
+export declare const EditOperator: () => React.JSX.Element;
+export declare const EditTitleField: () => React.JSX.Element;

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

@@ -407,7 +407,7 @@ export var EditComponent = function EditComponent() {
   var isFileField = isFileCollection(targetCollection);
   return isAssociationField && fieldModeOptions ? /*#__PURE__*/React.createElement(SchemaSettings.SelectItem, {
     key: "field-mode",
-    title: t('Field mode'),
+    title: t('Field component'),
     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) {

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

@@ -1,3 +1,4 @@
-export declare const FormDesigner: () => JSX.Element;
-export declare const ReadPrettyFormDesigner: () => JSX.Element;
-export declare const DetailsDesigner: () => JSX.Element;
+import React from 'react';
+export declare const FormDesigner: () => React.JSX.Element;
+export declare const ReadPrettyFormDesigner: () => React.JSX.Element;
+export declare const DetailsDesigner: () => React.JSX.Element;

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

@@ -1,5 +1,6 @@
+import React from 'react';
 /**
  * 筛选区块所使用的表单设计器
  * @returns
  */
-export declare const FilterDesigner: () => JSX.Element;
+export declare const FilterDesigner: () => React.JSX.Element;

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

@@ -1,7 +1,9 @@
 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;
 var _excluded = ["form", "children"],
   _excluded2 = ["form", "children", "disabled"],
   _excluded3 = ["form", "disabled"];
+function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -11,10 +13,11 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import { FormLayout } from '@formily/antd';
 import { createForm, onFieldChange, onFieldInit, onFieldReact, onFormInputChange } from '@formily/core';
-import { FieldContext, FormContext, RecursionField, observer, useField, useFieldSchema } from '@formily/react';
+import { FieldContext, FormContext, observer, RecursionField, useField, useFieldSchema } from '@formily/react';
 import { uid } from '@formily/shared';
 import { ConfigProvider, Spin } from 'antd';
 import React, { useEffect, useMemo } from 'react';
+import { css } from '@emotion/css';
 import { useActionContext } from '..';
 import { useAttach, useComponent } from '../..';
 import { useProps } from '../../hooks/useProps';
@@ -191,7 +194,9 @@ export var Form = observer(function (props) {
   var formDisabled = disabled || field.disabled;
   return /*#__PURE__*/React.createElement(ConfigProvider, {
     componentDisabled: formDisabled
-  }, /*#__PURE__*/React.createElement("form", null, /*#__PURE__*/React.createElement(Spin, {
+  }, /*#__PURE__*/React.createElement("form", {
+    className: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n            .ant-formily-item-feedback-layout-loose {\n              margin-bottom: 12px;\n            }\n          "])))
+  }, /*#__PURE__*/React.createElement(Spin, {
     spinning: field.loading || false
   }, form ? /*#__PURE__*/React.createElement(WithForm, _objectSpread(_objectSpread({
     form: form
@@ -200,4 +205,6 @@ export var Form = observer(function (props) {
   })) : /*#__PURE__*/React.createElement(WithoutForm, _objectSpread(_objectSpread({}, others), {}, {
     disabled: formDisabled
   })))));
+}, {
+  displayName: 'Form'
 });

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

@@ -22,4 +22,6 @@ export var FormField = observer(function (props) {
     }
   }, []);
   return /*#__PURE__*/React.createElement("div", null, props.children);
+}, {
+  displayName: 'FormField'
 });

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

@@ -1,3 +1,4 @@
+import React from 'react';
 export interface ITemplate {
     config?: {
         [key: string]: {
@@ -21,4 +22,9 @@ export interface ITemplate {
 export declare const Templates: ({ style, form }: {
     style?: {};
     form: any;
-}) => JSX.Element;
+}) => React.JSX.Element;
+export declare function fetchTemplateData(api: any, template: {
+    collection: string;
+    dataId: number;
+    fields: string[];
+}, t: any): Promise<any>;

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

@@ -1,4 +1,3 @@
-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); }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -8,6 +7,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+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); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -22,17 +22,22 @@ import { useTranslation } from 'react-i18next';
 import { useAPIClient } from '../../../api-client';
 import { findFormBlock } from '../../../block-provider';
 import { useCollectionManager } from '../../../collection-manager';
+import { useDuplicatefieldsContext } from '../../../schema-initializer/components';
 var useDataTemplates = function useDataTemplates() {
   var fieldSchema = useFieldSchema();
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
+  var data = useDuplicatefieldsContext();
+  var _useCollectionManager = useCollectionManager(),
+    getCollectionJoinField = _useCollectionManager.getCollectionJoinField;
+  if (data) {
+    return data;
+  }
   var _findDataTemplates = findDataTemplates(fieldSchema),
     _findDataTemplates$it = _findDataTemplates.items,
     items = _findDataTemplates$it === void 0 ? [] : _findDataTemplates$it,
     _findDataTemplates$di = _findDataTemplates.display,
     display = _findDataTemplates$di === void 0 ? true : _findDataTemplates$di;
-  var _useCollectionManager = useCollectionManager(),
-    getCollectionJoinField = _useCollectionManager.getCollectionJoinField;
   // 过滤掉已经被删除的字段
   items.forEach(function (item) {
     try {
@@ -69,6 +74,15 @@ var useDataTemplates = function useDataTemplates() {
     })
   };
 };
+function filterReferences(obj) {
+  var filteredObj = {};
+  for (var key in obj) {
+    if (_typeof(obj[key]) !== 'object') {
+      filteredObj[key] = obj[key];
+    }
+  }
+  return filteredObj;
+}
 export var Templates = function Templates(_ref) {
   var _ref$style = _ref.style,
     style = _ref$style === void 0 ? {} : _ref$style,
@@ -87,6 +101,7 @@ export var Templates = function Templates(_ref) {
     t = _useTranslation2.t;
   useEffect(function () {
     if (enabled && defaultTemplate) {
+      form.__template = true;
       fetchTemplateData(api, defaultTemplate, t).then(function (data) {
         if (form && data) {
           forEach(data, function (value, key) {
@@ -110,6 +125,9 @@ export var Templates = function Templates(_ref) {
             if (option.key !== 'none') {
               fetchTemplateData(api, option, t).then(function (data) {
                 if (form && data) {
+                  // 切换之前先把之前的数据清空
+                  form.reset();
+                  form.__template = true;
                   forEach(data, function (value, key) {
                     if (value) {
                       form.values[key] = value;
@@ -170,7 +188,7 @@ function findDataTemplates(fieldSchema) {
   }
   return {};
 }
-function fetchTemplateData(_x4, _x5, _x6) {
+export function fetchTemplateData(_x4, _x5, _x6) {
   return _fetchTemplateData.apply(this, arguments);
 }
 function _fetchTemplateData() {

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

@@ -1,8 +1,10 @@
 import { Form as FormV2 } from './Form';
 import { DetailsDesigner, FormDesigner, ReadPrettyFormDesigner } from './Form.Designer';
 import { FilterDesigner } from './Form.FilterDesigner';
+import { Templates } from './Templates';
 FormV2.Designer = FormDesigner;
 FormV2.FilterDesigner = FilterDesigner;
 FormV2.ReadPrettyDesigner = ReadPrettyFormDesigner;
+FormV2.Templates = Templates;
 export * from './FormField';
 export { FormV2, DetailsDesigner };

package/es/schema-component/antd/g2plot/G2Plot.js

@@ -135,6 +135,8 @@ export var G2Plot = observer(function (props) {
       data: Array.isArray(config === null || config === void 0 ? void 0 : config.data) ? config.data : []
     })
   }));
+}, {
+  displayName: 'G2Plot'
 });
 G2Plot.Designer = G2PlotDesigner;
 G2Plot.plots = plots;

package/es/schema-component/antd/g2plot/G2PlotDesigner.d.ts

@@ -1 +1,2 @@
-export declare const G2PlotDesigner: () => JSX.Element;
+import React from 'react';
+export declare const G2PlotDesigner: () => React.JSX.Element;

package/es/schema-component/antd/gantt/Gantt.Designer.d.ts

@@ -1 +1,2 @@
-export declare const GanttDesigner: () => JSX.Element;
+import React from 'react';
+export declare const GanttDesigner: () => React.JSX.Element;

package/es/schema-component/antd/gantt/components/gantt/Event.d.ts

@@ -1,2 +1,2 @@
 import React from 'react';
-export declare const Event: React.MemoExoticComponent<React.FunctionComponent<unknown>>;
+export declare const Event: React.MemoExoticComponent<import("@formily/react").ReactFC<unknown>>;

package/es/schema-component/antd/gantt/components/gantt/Event.js

@@ -2,4 +2,6 @@ import { observer } from '@formily/react';
 import React from 'react';
 export var Event = observer(function (props) {
   return /*#__PURE__*/React.createElement(React.Fragment, null, props.children);
+}, {
+  displayName: 'Event'
 });

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

@@ -29,7 +29,7 @@ import { useCurrentAppInfo } from '../../../../../appInfo';
 import { useBlockRequestContext, useGanttBlockContext, useTableBlockContext } from '../../../../../block-provider';
 import { RecordProvider } from '../../../../../record-provider';
 import { useDesignable } from '../../../../../schema-component';
-import { ActionContext } from '../../../action';
+import { ActionContextProvider } from '../../../action';
 import { convertToBarTasks } from '../../helpers/bar-helper';
 import { ganttDateRange, seedDates } from '../../helpers/date-helper';
 import { removeHiddenTasks, sortTasks } from '../../helpers/other-helper';
@@ -61,7 +61,7 @@ var GanttRecordViewer = function GanttRecordViewer(props) {
     value: {
       close: close
     }
-  }, /*#__PURE__*/React.createElement(ActionContext.Provider, {
+  }, /*#__PURE__*/React.createElement(ActionContextProvider, {
     value: {
       visible: visible,
       setVisible: setVisible

package/es/schema-component/antd/grid/Block.d.ts

@@ -1,2 +1,2 @@
 import React from 'react';
-export declare const Block: React.MemoExoticComponent<React.FunctionComponent<unknown>>;
+export declare const Block: React.MemoExoticComponent<import("@formily/react").ReactFC<unknown>>;

package/es/schema-component/antd/grid/Block.js

@@ -12,4 +12,6 @@ export var Block = observer(function (props) {
       background: '#f1f1f1'
     }
   }, "Block ", fieldSchema.title, /*#__PURE__*/React.createElement(DragHandler, null));
+}, {
+  displayName: 'Block'
 });