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

package/es/collection-manager/CollectionField.js

@@ -1,9 +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); }
 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; }
 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 _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); }
 import { connect, useField, useFieldSchema } from '@formily/react';
 import { merge } from '@formily/shared';
 import { concat } from 'lodash';
@@ -68,7 +68,7 @@ var InternalField = function InternalField(props) {
   if (!uiSchema) {
     return null;
   }
-  return /*#__PURE__*/React.createElement(Component, props, props.children);
+  return /*#__PURE__*/React.createElement(Component, _objectSpread({}, props));
 };
 export var InternalFallbackField = function InternalFallbackField() {
   var _fieldSchema$xCompon, _fieldSchema$xCompon2, _fieldSchema$xCompon3;
@@ -99,7 +99,7 @@ var DeletedField = function DeletedField() {
     style: {
       color: '#ccc'
     }
-  }, t('The field has bee deleted'));
+  }, t('The field has been deleted'));
 };
 export var CollectionField = connect(function (props) {
   var _fieldSchema$xCompon4;

package/es/collection-manager/CollectionFieldProvider.js

@@ -6,7 +6,8 @@ export var CollectionFieldProvider = function CollectionFieldProvider(props) {
   var name = props.name,
     field = props.field,
     children = props.children,
-    fallback = props.fallback;
+    _props$fallback = props.fallback,
+    fallback = _props$fallback === void 0 ? null : _props$fallback;
   var fieldSchema = useFieldSchema();
   var _useCollection = useCollection(),
     getField = _useCollection.getField;

package/es/collection-manager/Configuration/AddFieldAction.js

@@ -15,7 +15,7 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { PlusOutlined } from '@ant-design/icons';
 import { ArrayTable } from '@formily/antd';
-import { useForm, useField } from '@formily/react';
+import { useField, useForm } from '@formily/react';
 import { uid } from '@formily/shared';
 import { Button, Dropdown, Menu } from 'antd';
 import { cloneDeep } from 'lodash';
@@ -24,10 +24,10 @@ import { useTranslation } from 'react-i18next';
 import { useRequest } from '../../api-client';
 import { RecordProvider, useRecord } from '../../record-provider';
 import { ActionContext, SchemaComponent, useActionContext, useCompile } from '../../schema-component';
+import { useResourceActionContext, useResourceContext } from '../ResourceActionProvider';
 import { useCancelAction } from '../action-hooks';
 import { useCollectionManager } from '../hooks';
 import { useOptions } from '../hooks/useOptions';
-import { useResourceActionContext, useResourceContext } from '../ResourceActionProvider';
 import * as components from './components';
 import { getOptions } from './interfaces';
 var getSchema = function getSchema(schema, record, compile) {
@@ -292,7 +292,7 @@ export var AddFieldAction = function AddFieldAction(props) {
         key: option.label,
         title: compile(option.label)
       }, option.children.filter(function (child) {
-        return !['o2o', 'subTable'].includes(child.name);
+        return !['o2o', 'subTable', 'linkTo'].includes(child.name);
       }).map(function (child) {
         return /*#__PURE__*/React.createElement(Menu.Item, {
           key: child.name,

package/es/collection-manager/Configuration/CollectionFields.d.ts

@@ -1,2 +1,2 @@
 export declare const isTitleField: (field: any) => boolean;
-export declare const CollectionFields: (props: any) => JSX.Element;
+export declare const CollectionFields: () => JSX.Element;

package/es/collection-manager/Configuration/CollectionFields.js

@@ -67,7 +67,6 @@ var CurrentFields = function CurrentFields(props) {
     loadingRecord = _React$useState2[0],
     setLoadingRecord = _React$useState2[1];
   var _useCollectionManager2 = useCollectionManager(),
-    updateCollection = _useCollectionManager2.updateCollection,
     refreshCM = _useCollectionManager2.refreshCM;
   var columns = [{
     dataIndex: ['uiSchema', 'title'],
@@ -165,9 +164,8 @@ var CurrentFields = function CurrentFields(props) {
       type: 'checkbox',
       onChange: function onChange(selectedRowKeys) {
         setState(function (state) {
-          var result = [].concat(_toConsumableArray(state.selectedRowKeys || []), _toConsumableArray(selectedRowKeys));
           return _objectSpread(_objectSpread({}, state), {}, {
-            selectedRowKeys: result
+            selectedRowKeys: selectedRowKeys
           });
         });
       }
@@ -193,7 +191,6 @@ var InheritFields = function InheritFields(props) {
   var _useTranslation2 = useTranslation(),
     t = _useTranslation2.t;
   var _useCollectionManager4 = useCollectionManager(),
-    updateCollection = _useCollectionManager4.updateCollection,
     refreshCM = _useCollectionManager4.refreshCM;
   var columns = [{
     dataIndex: ['uiSchema', 'title'],
@@ -287,7 +284,7 @@ var InheritFields = function InheritFields(props) {
     })
   });
 };
-export var CollectionFields = function CollectionFields(props) {
+export var CollectionFields = function CollectionFields() {
   var compile = useCompile();
   var field = useField();
   var _useRecord3 = useRecord(),

package/es/collection-manager/Configuration/ConfigurationTabs.js

@@ -151,6 +151,13 @@ export var ConfigurationTabs = function ConfigurationTabs() {
     _useState4 = _slicedToArray(_useState3, 2),
     key = _useState4[0],
     setKey = _useState4[1];
+  var _useState5 = useState('all'),
+    _useState6 = _slicedToArray(_useState5, 2),
+    activeKey = _useState6[0],
+    setActiveKey = _useState6[1];
+  var compile = useCompile();
+  var api = useAPIClient();
+  if (!data) return null;
   var tabsItems = data.sort(function (a, b) {
     return b.sort - a.sort;
   }).concat().map(function (v) {
@@ -167,12 +174,6 @@ export var ConfigurationTabs = function ConfigurationTabs() {
     closable: false,
     schema: collectionTableSchema
   });
-  var compile = useCompile();
-  var _useState5 = useState('all'),
-    _useState6 = _slicedToArray(_useState5, 2),
-    activeKey = _useState6[0],
-    setActiveKey = _useState6[1];
-  var api = useAPIClient();
   var onChange = function onChange(key) {
     setActiveKey(key);
     setKey(uid());

package/es/collection-manager/Configuration/EditFieldAction.js

@@ -53,7 +53,6 @@ var getSchema = function getSchema(schema, record, compile, getContainer) {
         }
       }
     };
-    properties['defaultValue']['x-disabled'] = record.overriding;
   }
   return {
     type: 'object',

package/es/collection-manager/Configuration/OverridingCollectionField.js

@@ -38,7 +38,6 @@ var getSchema = function getSchema(schema, record, compile, getContainer) {
     properties['defaultValue'] = cloneDeep(schema.default.uiSchema);
     properties['defaultValue']['title'] = compile('{{ t("Default value") }}');
     properties['defaultValue']['x-decorator'] = 'FormItem';
-    properties['defaultValue']['x-disabled'] = true;
   }
   return {
     type: 'object',

package/es/collection-manager/action-hooks.d.ts

@@ -50,7 +50,7 @@ export declare const useDestroyAction: () => {
     run(): Promise<void>;
 };
 export declare const useBulkDestroyAction: () => {
-    run(): Promise<void>;
+    run(): Promise<any>;
 };
 export declare const useValuesFromRA: (options: any) => any;
 export declare const useCreateActionAndRefreshCM: () => {

package/es/collection-manager/action-hooks.js

@@ -20,6 +20,7 @@ import { useField, useForm } from '@formily/react';
 import { message } from 'antd';
 import omit from 'lodash/omit';
 import { useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
 import { useCollection, useCollectionManager } from '.';
 import { useCompile } from '..';
 import { useRequest } from '../api-client';
@@ -220,9 +221,10 @@ export var useCollectionFilterOptions = function useCollectionFilterOptions(coll
   var options = getOptions(fields, 1);
   var compile = useCompile();
   var _useCollectionManager4 = useCollectionManager(),
-    getChildrenCollections = _useCollectionManager4.getChildrenCollections;
-  var collection = useCollection();
-  var childrenCollections = getChildrenCollections(collection.name);
+    getChildrenCollections = _useCollectionManager4.getChildrenCollections,
+    getCollection = _useCollectionManager4.getCollection;
+  var collection = getCollection(collectionName);
+  var childrenCollections = getChildrenCollections(collectionName);
   if (childrenCollections.length > 0 && !options.find(function (v) {
     return v.name == 'tableoid';
   })) {
@@ -233,7 +235,7 @@ export var useCollectionFilterOptions = function useCollectionFilterOptions(coll
       schema: {
         'x-component': 'Select',
         enum: [{
-          value: collection.name,
+          value: collectionName,
           label: compile(collection.title)
         }].concat(childrenCollections.map(function (v) {
           return {
@@ -581,22 +583,31 @@ export var useBulkDestroyAction = function useBulkDestroyAction() {
     refresh = _useResourceActionCon7.refresh;
   var _useResourceContext7 = useResourceContext(),
     resource = _useResourceContext7.resource;
+  var _useTranslation = useTranslation(),
+    t = _useTranslation.t;
   return {
     run: function run() {
       return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
+        var _state$selectedRowKey;
         return _regeneratorRuntime().wrap(function _callee11$(_context11) {
           while (1) switch (_context11.prev = _context11.next) {
             case 0:
-              _context11.next = 2;
+              if (state === null || state === void 0 ? void 0 : (_state$selectedRowKey = state.selectedRowKeys) === null || _state$selectedRowKey === void 0 ? void 0 : _state$selectedRowKey.length) {
+                _context11.next = 2;
+                break;
+              }
+              return _context11.abrupt("return", message.error(t('Please select the records you want to delete')));
+            case 2:
+              _context11.next = 4;
               return resource.destroy({
                 filterByTk: (state === null || state === void 0 ? void 0 : state.selectedRowKeys) || []
               });
-            case 2:
+            case 4:
               setState === null || setState === void 0 ? void 0 : setState({
                 selectedRowKeys: []
               });
               refresh();
-            case 4:
+            case 6:
             case "end":
               return _context11.stop();
           }

package/es/collection-manager/hooks/useCollection.d.ts

@@ -3,7 +3,7 @@ import { CollectionFieldOptions } from '../types';
 export declare type Collection = ReturnType<typeof useCollection>;
 export declare const useCollection: () => {
     resource: import("@nocobase/sdk").IResource;
-    getField(name: SchemaKey): CollectionFieldOptions;
+    getField(name: SchemaKey): CollectionFieldOptions | null;
     getTreeParentField(): import("../types").FieldOptions;
     fields: import("../types").FieldOptions[];
     getPrimaryKey: () => any;

package/es/collection-manager/hooks/useCollectionDataSource.js

@@ -2,11 +2,11 @@ import { action } from '@formily/reactive';
 import { useCollectionManager } from '.';
 import { useCompile } from '../../schema-component';
 export function useCollectionDataSource(filter) {
+  var compile = useCompile();
+  var _useCollectionManager = useCollectionManager(),
+    _useCollectionManager2 = _useCollectionManager.collections,
+    collections = _useCollectionManager2 === void 0 ? [] : _useCollectionManager2;
   return function (field) {
-    var compile = useCompile();
-    var _useCollectionManager = useCollectionManager(),
-      _useCollectionManager2 = _useCollectionManager.collections,
-      collections = _useCollectionManager2 === void 0 ? [] : _useCollectionManager2;
     action.bound(function (data) {
       var filtered = typeof filter === 'function' ? data.filter(filter) : data;
       field.dataSource = filtered.map(function (item) {

package/es/collection-manager/interfaces/createdBy.js

@@ -21,7 +21,7 @@ export var createdBy = {
     uiSchema: {
       type: 'object',
       title: '{{t("Created by")}}',
-      'x-component': 'RecordPicker',
+      'x-component': 'AssociationField',
       'x-component-props': {
         fieldNames: {
           value: 'id',

package/es/collection-manager/interfaces/linkTo.js

@@ -5,8 +5,7 @@ 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); }
 import { uid } from '@formily/shared';
-import { cloneDeep } from 'lodash';
-import { defaultProps, recordPickerSelector, recordPickerViewer } from './properties';
+import { defaultProps } from './properties';
 export var linkTo = {
   name: 'linkTo',
   type: 'object',
@@ -20,7 +19,7 @@ export var linkTo = {
     // name,
     uiSchema: {
       // title,
-      'x-component': 'RecordPicker',
+      'x-component': 'AssociationField',
       'x-component-props': {
         // mode: 'tags',
         multiple: true,
@@ -36,7 +35,7 @@ export var linkTo = {
       // name,
       uiSchema: {
         // title,
-        'x-component': 'RecordPicker',
+        'x-component': 'AssociationField',
         'x-component-props': {
           // mode: 'tags',
           multiple: true,
@@ -59,41 +58,6 @@ export var linkTo = {
       };
       schema['x-component-props'].fieldNames.label = targetCollection.titleField;
     }
-    if ((targetCollection === null || targetCollection === void 0 ? void 0 : targetCollection.template) === 'file') {
-      var fieldNames = schema['x-component-props']['fieldNames'] || {
-        label: 'preview',
-        value: 'id'
-      };
-      fieldNames.label = 'preview';
-      schema['x-component-props']['fieldNames'] = fieldNames;
-      schema['x-component-props'].quickUpload = true;
-      schema['x-component-props'].selectFile = true;
-    }
-    if (block === 'Form') {
-      if (schema['x-component'] === 'AssociationSelect') {
-        Object.assign(schema, {
-          type: 'string',
-          'x-designer': 'AssociationSelect.Designer'
-        });
-      } else {
-        schema.type = 'string';
-        schema['properties'] = {
-          viewer: cloneDeep(recordPickerViewer),
-          selector: cloneDeep(recordPickerSelector)
-        };
-      }
-      return schema;
-    } else {
-      if (readPretty) {
-        schema['properties'] = {
-          viewer: cloneDeep(recordPickerViewer)
-        };
-      } else {
-        schema['properties'] = {
-          selector: cloneDeep(recordPickerSelector)
-        };
-      }
-    }
     if (['Table', 'Kanban'].includes(block)) {
       schema['x-component-props'] = schema['x-component-props'] || {};
       schema['x-component-props']['ellipsis'] = true;

package/es/collection-manager/interfaces/m2m.js

@@ -5,8 +5,7 @@ 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); }
 import { uid } from '@formily/shared';
-import { cloneDeep } from 'lodash';
-import { defaultProps, recordPickerSelector, recordPickerViewer, relationshipType, reverseFieldProperties } from './properties';
+import { defaultProps, relationshipType, reverseFieldProperties } from './properties';
 export var m2m = {
   name: 'm2m',
   type: 'object',
@@ -20,7 +19,7 @@ export var m2m = {
     // name,
     uiSchema: {
       // title,
-      'x-component': 'RecordPicker',
+      'x-component': 'AssociationField',
       'x-component-props': {
         // mode: 'tags',
         multiple: true,
@@ -36,7 +35,7 @@ export var m2m = {
       // name,
       uiSchema: {
         // title,
-        'x-component': 'RecordPicker',
+        'x-component': 'AssociationField',
         'x-component-props': {
           // mode: 'tags',
           multiple: true,
@@ -53,46 +52,13 @@ export var m2m = {
     var readPretty = _ref.readPretty,
       block = _ref.block,
       targetCollection = _ref.targetCollection;
+    // schema['type'] = 'array';
     if ((targetCollection === null || targetCollection === void 0 ? void 0 : targetCollection.titleField) && schema['x-component-props']) {
       schema['x-component-props'].fieldNames = schema['x-component-props'].fieldNames || {
         value: 'id'
       };
       schema['x-component-props'].fieldNames.label = targetCollection.titleField;
     }
-    if ((targetCollection === null || targetCollection === void 0 ? void 0 : targetCollection.template) === 'file') {
-      var fieldNames = schema['x-component-props']['fieldNames'] || {
-        label: 'preview',
-        value: 'id'
-      };
-      fieldNames.label = 'preview';
-      schema['x-component-props']['fieldNames'] = fieldNames;
-      schema['x-component-props'].quickUpload = true;
-      schema['x-component-props'].selectFile = true;
-    }
-    if (block === 'Form') {
-      if (schema['x-component'] === 'AssociationSelect') {
-        Object.assign(schema, {
-          type: 'string',
-          'x-designer': 'AssociationSelect.Designer'
-        });
-      } else {
-        schema.type = 'string';
-        schema['properties'] = {
-          viewer: cloneDeep(recordPickerViewer),
-          selector: cloneDeep(recordPickerSelector)
-        };
-      }
-      return schema;
-    }
-    if (readPretty) {
-      schema['properties'] = {
-        viewer: cloneDeep(recordPickerViewer)
-      };
-    } else {
-      schema['properties'] = {
-        selector: cloneDeep(recordPickerSelector)
-      };
-    }
     if (['Table', 'Kanban'].includes(block)) {
       schema['x-component-props'] = schema['x-component-props'] || {};
       schema['x-component-props']['ellipsis'] = true;

package/es/collection-manager/interfaces/m2o.js

@@ -4,8 +4,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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; }
 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); }
-import { cloneDeep } from 'lodash';
-import { constraintsProps, recordPickerSelector, recordPickerViewer, relationshipType, reverseFieldProperties } from './properties';
+import { constraintsProps, relationshipType, reverseFieldProperties } from './properties';
 export var m2o = {
   name: 'm2o',
   type: 'object',
@@ -19,7 +18,7 @@ export var m2o = {
     // name,
     uiSchema: {
       // title,
-      'x-component': 'RecordPicker',
+      'x-component': 'AssociationField',
       'x-component-props': {
         // mode: 'tags',
         multiple: false,
@@ -35,7 +34,7 @@ export var m2o = {
       // name,
       uiSchema: {
         // title,
-        'x-component': 'RecordPicker',
+        'x-component': 'AssociationField',
         'x-component-props': {
           // mode: 'tags',
           multiple: true,
@@ -52,46 +51,13 @@ export var m2o = {
     var block = _ref.block,
       readPretty = _ref.readPretty,
       targetCollection = _ref.targetCollection;
+    // schema['type'] = 'object';
     if ((targetCollection === null || targetCollection === void 0 ? void 0 : targetCollection.titleField) && schema['x-component-props']) {
       schema['x-component-props'].fieldNames = schema['x-component-props'].fieldNames || {
         value: 'id'
       };
       schema['x-component-props'].fieldNames.label = targetCollection.titleField;
     }
-    if ((targetCollection === null || targetCollection === void 0 ? void 0 : targetCollection.template) === 'file') {
-      var fieldNames = schema['x-component-props']['fieldNames'] || {
-        label: 'preview',
-        value: 'id'
-      };
-      fieldNames.label = 'preview';
-      schema['x-component-props']['fieldNames'] = fieldNames;
-      schema['x-component-props'].quickUpload = true;
-      schema['x-component-props'].selectFile = true;
-    }
-    if (block === 'Form') {
-      if (schema['x-component'] === 'AssociationSelect') {
-        Object.assign(schema, {
-          type: 'string',
-          'x-designer': 'AssociationSelect.Designer'
-        });
-      } else {
-        schema.type = 'string';
-        schema['properties'] = {
-          viewer: cloneDeep(recordPickerViewer),
-          selector: cloneDeep(recordPickerSelector)
-        };
-      }
-      return schema;
-    }
-    if (readPretty) {
-      schema['properties'] = {
-        viewer: cloneDeep(recordPickerViewer)
-      };
-    } else {
-      schema['properties'] = {
-        selector: cloneDeep(recordPickerSelector)
-      };
-    }
     if (['Table', 'Kanban'].includes(block)) {
       schema['x-component-props'] = schema['x-component-props'] || {};
       schema['x-component-props']['ellipsis'] = true;

package/es/collection-manager/interfaces/o2m.js

@@ -4,8 +4,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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; }
 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); }
-import { cloneDeep } from 'lodash';
-import { constraintsProps, recordPickerSelector, recordPickerViewer, relationshipType, reverseFieldProperties } from './properties';
+import { constraintsProps, relationshipType, reverseFieldProperties } from './properties';
 export var o2m = {
   name: 'o2m',
   type: 'object',
@@ -19,7 +18,7 @@ export var o2m = {
     // name,
     uiSchema: {
       // title,
-      'x-component': 'RecordPicker',
+      'x-component': 'AssociationField',
       'x-component-props': {
         // mode: 'tags',
         multiple: true,
@@ -35,7 +34,7 @@ export var o2m = {
       // name,
       uiSchema: {
         // title,
-        'x-component': 'RecordPicker',
+        'x-component': 'AssociationField',
         'x-component-props': {
           // mode: 'tags',
           multiple: false,
@@ -53,76 +52,13 @@ export var o2m = {
       block = _ref.block,
       readPretty = _ref.readPretty,
       targetCollection = _ref.targetCollection;
+    // schema['type'] = 'array';
     if ((targetCollection === null || targetCollection === void 0 ? void 0 : targetCollection.titleField) && schema['x-component-props']) {
       schema['x-component-props'].fieldNames = schema['x-component-props'].fieldNames || {
         value: 'id'
       };
       schema['x-component-props'].fieldNames.label = targetCollection.titleField;
     }
-    if (block === 'Form') {
-      if (schema['x-component'] === 'TableField') {
-        var association = "".concat(field.collectionName, ".").concat(field.name);
-        schema['type'] = 'void';
-        schema['properties'] = {
-          block: {
-            type: 'void',
-            'x-decorator': 'TableFieldProvider',
-            'x-acl-action': "".concat(association, ":list"),
-            'x-decorator-props': {
-              collection: field.target,
-              association: association,
-              resource: association,
-              action: 'list',
-              params: {
-                paginate: false
-              },
-              showIndex: true,
-              dragSort: false,
-              fieldName: field.name
-            },
-            properties: _defineProperty({
-              actions: {
-                type: 'void',
-                'x-initializer': 'SubTableActionInitializers',
-                'x-component': 'TableField.ActionBar',
-                'x-component-props': {}
-              }
-            }, field.name, {
-              type: 'array',
-              'x-initializer': 'TableColumnInitializers',
-              'x-component': 'TableV2',
-              'x-component-props': {
-                rowSelection: {
-                  type: 'checkbox'
-                },
-                useProps: '{{ useTableFieldProps }}'
-              }
-            })
-          }
-        };
-      } else if (schema['x-component'] === 'AssociationSelect') {
-        Object.assign(schema, {
-          type: 'string',
-          'x-designer': 'AssociationSelect.Designer'
-        });
-      } else {
-        schema.type = 'string';
-        schema['properties'] = {
-          viewer: cloneDeep(recordPickerViewer),
-          selector: cloneDeep(recordPickerSelector)
-        };
-      }
-      return schema;
-    }
-    if (readPretty) {
-      schema['properties'] = {
-        viewer: cloneDeep(recordPickerViewer)
-      };
-    } else {
-      schema['properties'] = {
-        selector: cloneDeep(recordPickerSelector)
-      };
-    }
     if (['Table', 'Kanban'].includes(block)) {
       schema['x-component-props'] = schema['x-component-props'] || {};
       schema['x-component-props']['ellipsis'] = true;