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

package/es/schema-component/antd/record-picker/InputRecordPicker.js

@@ -1,6 +1,7 @@
 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 _excluded = ["onRowSelectionChange", "rowKey"],
-  _excluded2 = ["value", "multiple", "onChange", "quickUpload", "selectFile"];
+  _excluded2 = ["value", "multiple", "onChange", "quickUpload", "selectFile"],
+  _excluded3 = ["multiple", "onChange", "selectedRows", "setSelectedRows", "options", "collectionField"];
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 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; } }
@@ -63,7 +64,7 @@ var useTableSelectorProps = function useTableSelectorProps() {
     rowKey: rowKey,
     rowSelection: {
       type: multiple ? 'checkbox' : 'radio',
-      selectedRowKeys: rcSelectRows.filter(function (item) {
+      selectedRowKeys: rcSelectRows === null || rcSelectRows === void 0 ? void 0 : rcSelectRows.filter(function (item) {
         return options.every(function (row) {
           return row[rowKey] !== item[rowKey];
         });
@@ -211,6 +212,7 @@ export var InputRecordPicker = function InputRecordPicker(props) {
         var _value = multiple ? [] : null;
         _onChange(_value);
         setSelectedRows(_value);
+        setOptions([]);
       } else if (Array.isArray(changed)) {
         if (!changed.length) {
           _onChange([]);
@@ -239,6 +241,25 @@ export var InputRecordPicker = function InputRecordPicker(props) {
     options: options
   }));
 };
+export var RecordPickerProvider = function RecordPickerProvider(props) {
+  var multiple = props.multiple,
+    onChange = props.onChange,
+    selectedRows = props.selectedRows,
+    setSelectedRows = props.setSelectedRows,
+    options = props.options,
+    collectionField = props.collectionField,
+    other = _objectWithoutProperties(props, _excluded3);
+  return /*#__PURE__*/React.createElement(RecordPickerContext.Provider, {
+    value: _objectSpread({
+      multiple: multiple,
+      onChange: onChange,
+      selectedRows: selectedRows,
+      setSelectedRows: setSelectedRows,
+      options: options,
+      collectionField: collectionField
+    }, other)
+  }, props.children);
+};
 var Drawer = function Drawer(_ref) {
   var multiple = _ref.multiple,
     onChange = _ref.onChange,
@@ -259,16 +280,15 @@ var Drawer = function Drawer(_ref) {
     } : {};
     return filter;
   };
-  return /*#__PURE__*/React.createElement(RecordPickerContext.Provider, {
-    value: {
-      multiple: multiple,
-      onChange: onChange,
-      selectedRows: selectedRows,
-      setSelectedRows: setSelectedRows,
-      options: options,
-      collectionField: collectionField
-    }
-  }, /*#__PURE__*/React.createElement(CollectionProvider, {
+  var recordPickerProps = {
+    multiple: multiple,
+    onChange: onChange,
+    selectedRows: selectedRows,
+    setSelectedRows: setSelectedRows,
+    options: options,
+    collectionField: collectionField
+  };
+  return /*#__PURE__*/React.createElement(RecordPickerProvider, _objectSpread({}, recordPickerProps), /*#__PURE__*/React.createElement(CollectionProvider, {
     allowNull: true,
     name: collectionField === null || collectionField === void 0 ? void 0 : collectionField.target
   }, /*#__PURE__*/React.createElement(ActionContext.Provider, {

package/es/schema-component/antd/remote-select/RemoteSelect.js

@@ -11,9 +11,10 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import { LoadingOutlined } from '@ant-design/icons';
-import { connect, mapProps, mapReadPretty, useFieldSchema } from '@formily/react';
+import { connect, mapProps, mapReadPretty, useFieldSchema, useField } from '@formily/react';
 import { Tag } from 'antd';
 import moment from 'moment';
+import { uniqBy } from 'lodash';
 import React, { useCallback, useEffect, useMemo, useRef } from 'react';
 import { useRequest } from '../../../api-client';
 import { mergeFilter } from '../../../block-provider/SharedFilterProvider';
@@ -22,7 +23,7 @@ import { useCompile } from '../../hooks';
 import { Select, defaultFieldNames } from '../select';
 import { ReadPretty } from './ReadPretty';
 var InternalRemoteSelect = connect(function (props) {
-  var _service$params;
+  var _field$componentProps, _field$componentProps2, _field$componentProps3, _service$params;
   var _props$fieldNames = props.fieldNames,
     fieldNames = _props$fieldNames === void 0 ? {} : _props$fieldNames,
     _props$service = props.service,
@@ -39,6 +40,7 @@ var InternalRemoteSelect = connect(function (props) {
   var compile = useCompile();
   var firstRun = useRef(false);
   var fieldSchema = useFieldSchema();
+  var field = useField();
   var _useCollection = useCollection(),
     getField = _useCollection.getField;
   var _useCollectionManager = useCollectionManager(),
@@ -56,7 +58,7 @@ var InternalRemoteSelect = connect(function (props) {
   var mapOptionsToTags = useCallback(function (options) {
     try {
       return options.map(function (option) {
-        var _targetField$uiSchema, _ref;
+        var _targetField$uiSchema, _objectSpread2;
         var label = option[fieldNames.label];
         if (targetField === null || targetField === void 0 ? void 0 : (_targetField$uiSchema = targetField.uiSchema) === null || _targetField$uiSchema === void 0 ? void 0 : _targetField$uiSchema.enum) {
           if (Array.isArray(label)) {
@@ -94,7 +96,7 @@ var InternalRemoteSelect = connect(function (props) {
           var _mapOptions;
           return mapOptions((_mapOptions = {}, _defineProperty(_mapOptions, fieldNames.label, label), _defineProperty(_mapOptions, fieldNames.value, option[fieldNames.value]), _mapOptions));
         }
-        return _ref = {}, _defineProperty(_ref, fieldNames.label, label || option[fieldNames.value]), _defineProperty(_ref, fieldNames.value, option[fieldNames.value]), _ref;
+        return _objectSpread(_objectSpread({}, option), {}, (_objectSpread2 = {}, _defineProperty(_objectSpread2, fieldNames.label, label || option[fieldNames.value]), _defineProperty(_objectSpread2, fieldNames.value, option[fieldNames.value]), _objectSpread2));
       });
     } catch (err) {
       console.error(err);
@@ -109,7 +111,7 @@ var InternalRemoteSelect = connect(function (props) {
       }, service === null || service === void 0 ? void 0 : service.params), {}, {
         // fields: [fieldNames.label, fieldNames.value, ...(service?.params?.fields || [])],
         // search needs
-        filter: mergeFilter([service === null || service === void 0 ? void 0 : (_service$params = service.params) === null || _service$params === void 0 ? void 0 : _service$params.filter])
+        filter: mergeFilter([((_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) || (service === null || service === void 0 ? void 0 : (_service$params = service.params) === null || _service$params === void 0 ? void 0 : _service$params.filter)])
       })
     }), {
       manual: manual,
@@ -131,13 +133,13 @@ var InternalRemoteSelect = connect(function (props) {
     }
   }, [runDep]);
   var onSearch = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(search) {
-      var _service$params2;
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(search) {
+      var _field$componentProps4, _field$componentProps5, _field$componentProps6, _service$params2;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             run({
-              filter: mergeFilter([_defineProperty({}, fieldNames.label, _defineProperty({}, operator, search)), service === null || service === void 0 ? void 0 : (_service$params2 = service.params) === null || _service$params2 === void 0 ? void 0 : _service$params2.filter])
+              filter: mergeFilter([_defineProperty({}, fieldNames.label, _defineProperty({}, operator, search)), ((_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.filter) || (service === null || service === void 0 ? void 0 : (_service$params2 = service.params) === null || _service$params2 === void 0 ? void 0 : _service$params2.filter)])
             });
           case 1:
           case "end":
@@ -146,32 +148,28 @@ var InternalRemoteSelect = connect(function (props) {
       }, _callee);
     }));
     return function onSearch(_x) {
-      return _ref2.apply(this, arguments);
+      return _ref.apply(this, arguments);
     };
   }();
   var getOptionsByFieldNames = useCallback(function (item) {
     return Object.keys(fieldNames).reduce(function (obj, key) {
-      var value = item[fieldNames[key]];
-      if (value) {
-        // support hidden, disabled, etc.
-        obj[['label', 'value', 'options'].includes(key) ? fieldNames[key] : key] = key === 'label' ? compile(value) : value;
-      }
       return obj;
     }, {});
   }, [fieldNames]);
   var normalizeOptions = useCallback(function (obj) {
-    var _ref4;
+    var _ref3;
     if (objectValue || _typeof(obj) === 'object') {
       return getOptionsByFieldNames(obj);
     }
-    return _ref4 = {}, _defineProperty(_ref4, fieldNames.value, obj), _defineProperty(_ref4, fieldNames.label, obj), _ref4;
+    return _ref3 = {}, _defineProperty(_ref3, fieldNames.value, obj), _defineProperty(_ref3, fieldNames.label, obj), _ref3;
   }, [objectValue, getOptionsByFieldNames]);
   var options = useMemo(function () {
     var _data$data, _data$data2;
     if (!(data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : _data$data.length)) {
-      return value !== undefined && value !== null ? Array.isArray(value) ? value.map(normalizeOptions) : [normalizeOptions(value)] : [];
+      return value !== undefined && value !== null ? Array.isArray(value) ? value : [value] : [];
     }
-    return (data === null || data === void 0 ? void 0 : (_data$data2 = data.data) === null || _data$data2 === void 0 ? void 0 : _data$data2.map(getOptionsByFieldNames)) || [];
+    var valueOptions = value !== undefined && value !== null && (Array.isArray(value) ? value : [value]) || [];
+    return uniqBy((data === null || data === void 0 ? void 0 : (_data$data2 = data.data) === null || _data$data2 === void 0 ? void 0 : _data$data2.concat(valueOptions)) || [], fieldNames.value);
   }, [data === null || data === void 0 ? void 0 : data.data, getOptionsByFieldNames, normalizeOptions, value]);
   var onDropdownVisibleChange = function onDropdownVisibleChange() {
     if (firstRun.current) {

package/es/schema-component/antd/table-v2/Table.Column.Designer.js

@@ -31,12 +31,13 @@ var useLabelFields = function useLabelFields(collectionName) {
   });
 };
 export var TableColumnDesigner = function TableColumnDesigner(props) {
-  var _fieldSchema$xCompon, _uiSchema$xComponent, _collectionField$targ, _collectionField$uiSc, _columnSchema$xCompo, _fieldSchema$xCompon2, _fieldSchema$xCompon3;
+  var _fieldSchema$xCompon, _uiSchema$xComponent, _collectionField$targ, _collectionField$uiSc, _columnSchema$xCompo, _fieldSchema$xCompon2;
   var uiSchema = props.uiSchema,
     fieldSchema = props.fieldSchema,
     collectionField = props.collectionField;
   var _useCollectionManager2 = useCollectionManager(),
-    getInterface = _useCollectionManager2.getInterface;
+    getInterface = _useCollectionManager2.getInterface,
+    getCollection = _useCollectionManager2.getCollection;
   var field = useField();
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
@@ -46,6 +47,8 @@ export var TableColumnDesigner = function TableColumnDesigner(props) {
   var fieldNames = (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : _fieldSchema$xCompon['fieldNames']) || (uiSchema === null || uiSchema === void 0 ? void 0 : (_uiSchema$xComponent = uiSchema['x-component-props']) === null || _uiSchema$xComponent === void 0 ? void 0 : _uiSchema$xComponent['fieldNames']);
   var options = useLabelFields((_collectionField$targ = collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) !== null && _collectionField$targ !== void 0 ? _collectionField$targ : collectionField === null || collectionField === void 0 ? void 0 : collectionField.targetCollection);
   var intefaceCfg = getInterface(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface);
+  var targetCollection = getCollection(collectionField === null || collectionField === void 0 ? void 0 : collectionField.target);
+  var isFileField = isFileCollection(targetCollection);
   return /*#__PURE__*/React.createElement(GeneralSchemaDesigner, {
     disableInitializer: true
   }, /*#__PURE__*/React.createElement(SchemaSettings.ModalItem, {
@@ -120,17 +123,20 @@ export var TableColumnDesigner = function TableColumnDesigner(props) {
       });
       dn.refresh();
     }
-  }), ['linkTo', 'm2m', 'm2o', 'o2m', 'obo', 'oho', 'snapshot', 'createdBy', 'updatedBy'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) && /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
+  }), ['linkTo', 'm2m', 'm2o', 'o2m', 'obo', 'oho', 'snapshot', 'createdBy', 'updatedBy'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) && !isFileField && /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
     title: t('Enable link'),
-    checked: ((_fieldSchema$xCompon2 = (_fieldSchema$xCompon3 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon3 === void 0 ? void 0 : _fieldSchema$xCompon3.mode) !== null && _fieldSchema$xCompon2 !== void 0 ? _fieldSchema$xCompon2 : 'links') === 'links',
+    checked: ((_fieldSchema$xCompon2 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon2 === void 0 ? void 0 : _fieldSchema$xCompon2.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 = _objectSpread(_objectSpread({}, fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-component-props']), {}, {
+        enableLink: flag
       });
       dn.emit('patch', {
         schema: {
           'x-uid': fieldSchema['x-uid'],
-          'x-component-props': _objectSpread({}, fieldSchema['x-component-props'])
+          'x-component-props': _objectSpread({}, fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-component-props'])
         }
       });
       dn.refresh();
@@ -140,8 +146,8 @@ export var TableColumnDesigner = function TableColumnDesigner(props) {
     options: options,
     value: fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames['label'],
     onChange: function onChange(label) {
-      var _collectionField$uiSc2, _fieldSchema$xCompon4;
-      var fieldNames = _objectSpread(_objectSpread(_objectSpread({}, collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc2 = collectionField.uiSchema) === null || _collectionField$uiSc2 === void 0 ? void 0 : _collectionField$uiSc2['x-component-props']['fieldNames']), fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon4 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon4 === void 0 ? void 0 : _fieldSchema$xCompon4['fieldNames']), {}, {
+      var _collectionField$uiSc2, _fieldSchema$xCompon3;
+      var fieldNames = _objectSpread(_objectSpread(_objectSpread({}, collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc2 = collectionField.uiSchema) === null || _collectionField$uiSc2 === void 0 ? void 0 : _collectionField$uiSc2['x-component-props']['fieldNames']), fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon3 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon3 === void 0 ? void 0 : _fieldSchema$xCompon3['fieldNames']), {}, {
         label: label
       });
       fieldSchema['x-component-props']['fieldNames'] = fieldNames;
@@ -165,4 +171,7 @@ export var TableColumnDesigner = function TableColumnDesigner(props) {
       title: t('Delete table column')
     }
   }));
-};
+};
+function isFileCollection(collection) {
+  return (collection === null || collection === void 0 ? void 0 : collection.template) === 'file';
+}

package/es/schema-component/antd/table-v2/Table.Index.d.ts

@@ -0,0 +1 @@
+export declare const TableIndex: (props: any) => JSX.Element;

package/es/schema-component/antd/table-v2/Table.Index.js

@@ -0,0 +1,6 @@
+import React from 'react';
+import { useRecordIndex } from '../../../record-provider';
+export var TableIndex = function TableIndex(props) {
+  var recordIndex = useRecordIndex();
+  return /*#__PURE__*/React.createElement("div", null, recordIndex + 1);
+};

package/es/schema-component/antd/table-v2/Table.js

@@ -35,9 +35,13 @@ import { DndContext, useDesignable, useTableSize } from '../..';
 import { RecordIndexProvider, RecordProvider, useSchemaInitializer, useTableBlockContext, useTableSelectorContext } from '../../../';
 import { useACLFieldWhitelist } from '../../../acl/ACLProvider';
 import { extractIndex, getIdsWithChildren, isCollectionFieldComponent, isColumnComponent } from './utils';
-var useTableColumns = function useTableColumns() {
-  var _schema$reducePropert;
+var useArrayField = function useArrayField(props) {
   var field = useField();
+  return props.field || field;
+};
+var useTableColumns = function useTableColumns(props) {
+  var _schema$reducePropert;
+  var field = useArrayField(props);
   var schema = useFieldSchema();
   var _useACLFieldWhitelist = useACLFieldWhitelist(),
     schemaInWhitelist = _useACLFieldWhitelist.schemaInWhitelist;
@@ -78,8 +82,8 @@ var useTableColumns = function useTableColumns() {
         }, /*#__PURE__*/React.createElement(RecordProvider, {
           record: record
         }, /*#__PURE__*/React.createElement(RecursionField, {
+          basePath: field.address.concat(record.__index || index),
           schema: s,
-          name: record.__index || index,
           onlyRenderProperties: true
         })));
       }
@@ -179,8 +183,6 @@ var useValidator = function useValidator(validator) {
 };
 export var Table = observer(function (props) {
   var _schema$parent, _schema$parent2, _field$data, _fieldSchema$parent, _fieldSchema$parent$x, _field$value4, _field$value4$slice;
-  var field = useField();
-  var columns = useTableColumns();
   var pagination1 = props.pagination,
     useProps = props.useProps,
     onChange = props.onChange,
@@ -201,6 +203,8 @@ export var Table = observer(function (props) {
     required = _others1$others.required,
     _onExpand = _others1$others.onExpand,
     others = _objectWithoutProperties(_others1$others, _excluded3);
+  var field = useArrayField(others);
+  var columns = useTableColumns(others);
   var schema = useFieldSchema();
   var isTableSelector = (schema === null || schema === void 0 ? void 0 : (_schema$parent = schema.parent) === null || _schema$parent === void 0 ? void 0 : _schema$parent['x-decorator']) === 'TableSelectorProvider';
   var ctx = isTableSelector ? useTableSelectorContext() : useTableBlockContext();

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

@@ -4,6 +4,7 @@ import { TableColumn } from './Table.Column';
 import { TableColumnActionBar } from './Table.Column.ActionBar';
 import { TableColumnDecorator } from './Table.Column.Decorator';
 import { TableColumnDesigner } from './Table.Column.Designer';
+import { TableIndex } from './Table.Index';
 import { TableSelector } from './TableSelector';
 export * from './TableBlockDesigner';
 export * from './TableField';
@@ -14,4 +15,5 @@ TableV2.Column.ActionBar = TableColumnActionBar;
 TableV2.Column.Decorator = TableColumnDecorator;
 TableV2.Column.Designer = TableColumnDesigner;
 TableV2.ActionColumnDesigner = TableActionColumnDesigner;
-TableV2.Selector = TableSelector;
+TableV2.Selector = TableSelector;
+TableV2.Index = TableIndex;

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

@@ -31,7 +31,7 @@ export function getIdsWithChildren(nodes) {
         var node = _step.value;
         if (node.children && node.children.length > 0) {
           ids.push(node.id);
-          ids.push.apply(ids, _toConsumableArray(getIdsWithChildren(node.children)));
+          ids.push.apply(ids, _toConsumableArray(getIdsWithChildren(node === null || node === void 0 ? void 0 : node.children)));
         }
       }
     } catch (err) {

package/es/schema-component/antd/variable/Input.js

@@ -45,7 +45,7 @@ var ConstantTypes = {
   string: {
     label: "{{t(\"String\")}}",
     value: 'string',
-    component: function component(_ref) {
+    component: function StringComponent(_ref) {
       var _onChange = _ref.onChange,
         value = _ref.value;
       return /*#__PURE__*/React.createElement(AntInput, {
@@ -60,7 +60,7 @@ var ConstantTypes = {
   number: {
     label: '{{t("Number")}}',
     value: 'number',
-    component: function component(_ref2) {
+    component: function NumberComponent(_ref2) {
       var onChange = _ref2.onChange,
         value = _ref2.value;
       return /*#__PURE__*/React.createElement(InputNumber, {
@@ -73,7 +73,7 @@ var ConstantTypes = {
   boolean: {
     label: "{{t(\"Boolean\")}}",
     value: 'boolean',
-    component: function Com(_ref3) {
+    component: function BooleanComponent(_ref3) {
       var onChange = _ref3.onChange,
         value = _ref3.value;
       var _useTranslation = useTranslation(),
@@ -96,7 +96,7 @@ var ConstantTypes = {
   date: {
     label: '{{t("Date")}}',
     value: 'date',
-    component: function component(_ref4) {
+    component: function DateComponent(_ref4) {
       var _onChange2 = _ref4.onChange,
         value = _ref4.value;
       return /*#__PURE__*/React.createElement(DatePicker, {
@@ -116,7 +116,7 @@ var ConstantTypes = {
   null: {
     label: "{{t(\"Null\")}}",
     value: 'null',
-    component: function Com() {
+    component: function NullComponent() {
       var _useTranslation2 = useTranslation(),
         t = _useTranslation2.t;
       return /*#__PURE__*/React.createElement(AntInput, {

package/es/schema-component/antd/variable/TextArea.js

@@ -15,7 +15,6 @@ import React, { useState, useEffect, useRef, useMemo } from 'react';
 import { Input } from 'antd';
 import { useForm } from '@formily/react';
 import { cx, css } from '@emotion/css';
-import { useTranslation } from 'react-i18next';
 import * as sanitizeHTML from 'sanitize-html';
 import { EllipsisWithTooltip, useCompile } from '../..';
 import { VariableSelect } from './VariableSelect';
@@ -215,8 +214,6 @@ export function TextArea(props) {
     _props$multiline = props.multiline,
     multiline = _props$multiline === void 0 ? true : _props$multiline;
   var compile = useCompile();
-  var _useTranslation = useTranslation(),
-    t = _useTranslation.t;
   var inputRef = useRef(null);
   var options = compile((_ref2 = typeof scope === 'function' ? scope() : scope) !== null && _ref2 !== void 0 ? _ref2 : []);
   var form = useForm();
@@ -334,7 +331,7 @@ export function TextArea(props) {
     if (ev.key === 'Enter') {
       ev.preventDefault();
     }
-    setIME(ev.keyCode === 229);
+    setIME(ev.keyCode === 229 && ![' ', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', 'Enter'].includes(ev.key));
     // if (ev.key === 'Control') {
     //   console.debug(getSelection().getRangeAt(0));
     // }
@@ -392,7 +389,7 @@ export function TextArea(props) {
     onInsert: onInsert
   }) : null);
 }
-TextArea.ReadPretty = function (props) {
+TextArea.ReadPretty = function ReadPretty(props) {
   var _ref5;
   var value = props.value,
     _props$multiline2 = props.multiline,

package/es/schema-component/common/dnd-context/index.js

@@ -23,7 +23,7 @@ var useDragEnd = function useDragEnd(props) {
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
   return function (event) {
-    var _active$data, _active$data$current, _over$data, _over$data$current, _over$data2, _over$data2$current, _over$data3, _over$data3$current, _over$data4, _over$data4$current, _over$data5, _over$data5$current;
+    var _active$data, _active$data$current, _over$data, _over$data$current, _over$data2, _over$data2$current, _over$data3, _over$data3$current, _over$data4, _over$data4$current, _over$data5, _over$data5$current, _over$data$current$re;
     var active = event.active,
       over = event.over;
     var activeSchema = active === null || active === void 0 ? void 0 : (_active$data = active.data) === null || _active$data === void 0 ? void 0 : (_active$data$current = _active$data.current) === null || _active$data$current === void 0 ? void 0 : _active$data$current.schema;
@@ -32,6 +32,7 @@ var useDragEnd = function useDragEnd(props) {
     var breakRemoveOn = over === null || over === void 0 ? void 0 : (_over$data3 = over.data) === null || _over$data3 === void 0 ? void 0 : (_over$data3$current = _over$data3.current) === null || _over$data3$current === void 0 ? void 0 : _over$data3$current.breakRemoveOn;
     var wrapSchema = over === null || over === void 0 ? void 0 : (_over$data4 = over.data) === null || _over$data4 === void 0 ? void 0 : (_over$data4$current = _over$data4.current) === null || _over$data4$current === void 0 ? void 0 : _over$data4$current.wrapSchema;
     var onSuccess = over === null || over === void 0 ? void 0 : (_over$data5 = over.data) === null || _over$data5 === void 0 ? void 0 : (_over$data5$current = _over$data5.current) === null || _over$data5$current === void 0 ? void 0 : _over$data5$current.onSuccess;
+    var removeParentsIfNoChildren = (_over$data$current$re = over.data.current.removeParentsIfNoChildren) !== null && _over$data$current$re !== void 0 ? _over$data$current$re : true;
     if (!activeSchema || !overSchema) {
       var _props$onDragEnd;
       props === null || props === void 0 ? void 0 : (_props$onDragEnd = props.onDragEnd) === null || _props$onDragEnd === void 0 ? void 0 : _props$onDragEnd.call(props, event);
@@ -60,7 +61,7 @@ var useDragEnd = function useDragEnd(props) {
       dn.insertAdjacent(insertAdjacent, activeSchema, {
         wrap: wrapSchema,
         breakRemoveOn: breakRemoveOn,
-        removeParentsIfNoChildren: true,
+        removeParentsIfNoChildren: removeParentsIfNoChildren,
         onSuccess: onSuccess
       });
       props === null || props === void 0 ? void 0 : (_props$onDragEnd4 = props.onDragEnd) === null || _props$onDragEnd4 === void 0 ? void 0 : _props$onDragEnd4.call(props, event);

package/es/schema-component/common/sortable-item/SortableItem.js

@@ -72,15 +72,18 @@ var useSortableItemId = function useSortableItemId(props) {
   return field.address.toString();
 };
 export var SortableItem = observer(function (props) {
+  var _others$removeParents;
   var _useSortableItemProps = useSortableItemProps(props),
     schema = _useSortableItemProps.schema,
     id = _useSortableItemProps.id,
     others = _objectWithoutProperties(_useSortableItemProps, _excluded2);
+  var removeParentsIfNoChildren = (_others$removeParents = others.removeParentsIfNoChildren) !== null && _others$removeParents !== void 0 ? _others$removeParents : true;
   return /*#__PURE__*/React.createElement(SortableProvider, {
     id: id,
     data: {
       insertAdjacent: 'afterEnd',
-      schema: schema
+      schema: schema,
+      removeParentsIfNoChildren: removeParentsIfNoChildren
     }
   }, /*#__PURE__*/React.createElement(Sortable, _objectSpread({}, others), props.children));
 });

package/es/schema-component/common/utils/uitls.js

@@ -62,7 +62,7 @@ var getValue = function getValue(str, values) {
   var regex = /{{(.*?)}}/;
   var matches = str === null || str === void 0 ? void 0 : (_str$match3 = str.match) === null || _str$match3 === void 0 ? void 0 : _str$match3.call(str, regex);
   if (matches) {
-    return getVariableValue(str, values);
+    return getVariableValue(str, flat(values));
   } else {
     return str;
   }

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

@@ -9,3 +9,4 @@ export * from './useFieldComponentOptions';
 export * from './useFieldTitle';
 export * from './useProps';
 export * from './useTableSize';
+export * from './useFieldModeOptions';

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

@@ -8,4 +8,5 @@ export * from './useSchemaComponentContext';
 export * from './useFieldComponentOptions';
 export * from './useFieldTitle';
 export * from './useProps';
-export * from './useTableSize';
+export * from './useTableSize';
+export * from './useFieldModeOptions';

package/es/schema-component/hooks/useFieldModeOptions.d.ts

@@ -0,0 +1,4 @@
+export declare const useFieldModeOptions: () => {
+    label: string;
+    value: string;
+}[];

package/es/schema-component/hooks/useFieldModeOptions.js

@@ -0,0 +1,105 @@
+import { useFieldSchema, useField } from '@formily/react';
+import { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useCollection, useCollectionManager } from '../../collection-manager';
+export var useFieldModeOptions = function useFieldModeOptions() {
+  var _fieldSchema$xCompon;
+  var _useCollectionManager = useCollectionManager(),
+    getCollectionJoinField = _useCollectionManager.getCollectionJoinField,
+    getCollection = _useCollectionManager.getCollection;
+  var fieldSchema = useFieldSchema();
+  var field = useField();
+  var isReadPretty = field.readPretty;
+  var _useCollection = useCollection(),
+    getField = _useCollection.getField;
+  var collectionField = getField(fieldSchema['name']) || getCollectionJoinField(fieldSchema['x-collection-field']);
+  var _useTranslation = useTranslation(),
+    t = _useTranslation.t;
+  var _ref = ((_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : _fieldSchema$xCompon.fieldNames) || {},
+    label = _ref.label;
+  var fieldModeOptions = useMemo(function () {
+    if (!collectionField || !(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface)) {
+      return;
+    }
+    if (!['o2o', 'oho', 'obo', 'o2m', 'linkTo', 'm2o', 'm2m'].includes(collectionField.interface)) return;
+    var collection = getCollection(collectionField.target);
+    if ((collection === null || collection === void 0 ? void 0 : collection.template) === 'file') {
+      return isReadPretty ? [{
+        label: t('Title'),
+        value: 'Select'
+      }, {
+        label: t('File manager'),
+        value: 'FileManager'
+      }] : [{
+        label: t('File manager'),
+        value: 'FileManager'
+      }, {
+        label: t('Record picker'),
+        value: 'Picker'
+      }, {
+        label: t('Select'),
+        value: 'Select'
+      }];
+    }
+    switch (collectionField.interface) {
+      case 'o2m':
+        return isReadPretty ? [{
+          label: t('Title'),
+          value: 'Select'
+        },
+        // { label: t('Subtable'), value: 'SubTable' },
+        {
+          label: t('Sub-details'),
+          value: 'Nester'
+        }] : [{
+          label: t('Record picker'),
+          value: 'Picker'
+        },
+        // { label: t('Subtable'), value: 'SubTable' },
+        {
+          label: t('Select'),
+          value: 'Select'
+        }, {
+          label: t('Subform'),
+          value: 'Nester'
+        }];
+      case 'm2o':
+      case 'm2m':
+      case 'linkTo':
+        return isReadPretty ? [{
+          label: t('Title'),
+          value: 'Select'
+        }, {
+          label: t('Sub-details'),
+          value: 'Nester'
+        }] : [{
+          label: t('Record picker'),
+          value: 'Picker'
+        }, {
+          label: t('Select'),
+          value: 'Select'
+        }, {
+          label: t('Subform'),
+          value: 'Nester'
+        }];
+      default:
+        return isReadPretty ? [{
+          label: t('Title'),
+          value: 'Select'
+        }, {
+          label: t('Sub-details'),
+          value: 'Nester'
+        }] : [{
+          label: t('Record picker'),
+          value: 'Picker'
+        }, {
+          label: t('Select'),
+          value: 'Select'
+        }, {
+          label: t('Subform'),
+          value: 'Nester'
+        }];
+    }
+  }, [t, collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface, label]);
+  return fieldModeOptions;
+};

package/es/schema-initializer/components/CreateRecordAction.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
 export declare const actionDesignerCss: string;
-export declare const CreateRecordAction: React.MemoExoticComponent<React.FunctionComponent<unknown>>;
+export declare const CreateRecordAction: React.MemoExoticComponent<React.FunctionComponent<Pick<any, string | number | symbol>>>;

package/es/schema-initializer/components/CreateRecordAction.js

@@ -108,6 +108,7 @@ export var CreateRecordAction = observer(function (props) {
   var compile = useCompile();
   var _useDesignable = useDesignable(),
     designable = _useDesignable.designable;
+  var icon = props.icon || /*#__PURE__*/React.createElement(PlusOutlined, null);
   var menu = /*#__PURE__*/React.createElement(Menu, null, inheritsCollections.map(function (option) {
     return /*#__PURE__*/React.createElement(Menu.Item, {
       key: option.name,
@@ -151,16 +152,16 @@ export var CreateRecordAction = observer(function (props) {
       setVisible(true);
       setCurrentCollection(collection.name);
     }
-  }, /*#__PURE__*/React.createElement(PlusOutlined, null), props.children) : /*#__PURE__*/React.createElement(Dropdown, {
+  }, icon, props.children) : /*#__PURE__*/React.createElement(Dropdown, {
     overlay: menu
   }, /*#__PURE__*/React.createElement(Button, {
-    icon: /*#__PURE__*/React.createElement(PlusOutlined, null),
+    icon: icon,
     type: 'primary'
   }, props.children, " ", /*#__PURE__*/React.createElement(DownOutlined, null))) : /*#__PURE__*/React.createElement(Button, {
     type: componentType,
     disabled: field.disabled,
     danger: componentType === 'danger',
-    icon: /*#__PURE__*/React.createElement(PlusOutlined, null),
+    icon: icon,
     onClick: function onClick(info) {
       setVisible(true);
       setCurrentCollection(collection.name);