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

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

@@ -1,2 +1,3 @@
-export declare const SyncFieldsAction: (props: any) => JSX.Element;
-export declare const SyncFieldsActionCom: (props: any) => JSX.Element;
+import React from 'react';
+export declare const SyncFieldsAction: (props: any) => React.JSX.Element;
+export declare const SyncFieldsActionCom: (props: any) => React.JSX.Element;

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

@@ -23,7 +23,7 @@ import React, { useState } from 'react';
 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 { ActionContextProvider, SchemaComponent, useActionContext, useCompile } from '../../schema-component';
 import { useCancelAction } from '../action-hooks';
 import { useCollectionManager } from '../hooks';
 import { useResourceActionContext, useResourceContext } from '../ResourceActionProvider';
@@ -205,7 +205,7 @@ export var SyncFieldsActionCom = function SyncFieldsActionCom(props) {
     t = _useTranslation.t;
   return record.template === 'view' && /*#__PURE__*/React.createElement(RecordProvider, {
     record: record
-  }, /*#__PURE__*/React.createElement(ActionContext.Provider, {
+  }, /*#__PURE__*/React.createElement(ActionContextProvider, {
     value: {
       visible: visible,
       setVisible: setVisible

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

@@ -1,2 +1,3 @@
-export declare const ViewCollectionField: (props: any) => JSX.Element;
-export declare const ViewFieldAction: (props: any) => JSX.Element;
+import React from 'react';
+export declare const ViewCollectionField: (props: any) => React.JSX.Element;
+export declare const ViewFieldAction: (props: any) => React.JSX.Element;

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

@@ -21,7 +21,7 @@ import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useAPIClient, useRequest } from '../../api-client';
 import { RecordProvider, useRecord } from '../../record-provider';
-import { ActionContext, SchemaComponent, useCompile } from '../../schema-component';
+import { ActionContextProvider, SchemaComponent, useCompile } from '../../schema-component';
 import { useCollectionManager } from '../hooks';
 import * as components from './components';
 var getSchema = function getSchema(schema, record, compile, getContainer) {
@@ -95,7 +95,7 @@ export var ViewFieldAction = function ViewFieldAction(props) {
     setData = _useState6[1];
   return /*#__PURE__*/React.createElement(RecordProvider, {
     record: record
-  }, /*#__PURE__*/React.createElement(ActionContext.Provider, {
+  }, /*#__PURE__*/React.createElement(ActionContextProvider, {
     value: {
       visible: visible,
       setVisible: setVisible

package/es/collection-manager/Configuration/components/CollectionCategory.d.ts

@@ -1,2 +1,2 @@
 import React from 'react';
-export declare const CollectionCategory: React.MemoExoticComponent<React.FunctionComponent<Pick<any, string | number | symbol>>>;
+export declare const CollectionCategory: React.MemoExoticComponent<import("@formily/react").ReactFC<Pick<any, string | number | symbol>>>;

package/es/collection-manager/Configuration/components/CollectionCategory.js

@@ -10,4 +10,6 @@ export var CollectionCategory = observer(function (props) {
       color: item.color
     }, compile(item === null || item === void 0 ? void 0 : item.name));
   }));
+}, {
+  displayName: 'CollectionCategory'
 });

package/es/collection-manager/Configuration/components/CollectionFieldInterface.d.ts

@@ -1,2 +1,2 @@
 import React from 'react';
-export declare const CollectionFieldInterface: React.MemoExoticComponent<React.FunctionComponent<Pick<any, string | number | symbol>>>;
+export declare const CollectionFieldInterface: React.MemoExoticComponent<import("@formily/react").ReactFC<Pick<any, string | number | symbol>>>;

package/es/collection-manager/Configuration/components/CollectionFieldInterface.js

@@ -11,4 +11,6 @@ export var CollectionFieldInterface = observer(function (props) {
   var schema = getInterface(value);
   if (!schema) return null;
   return /*#__PURE__*/React.createElement(Tag, null, compile(schema.title));
+}, {
+  displayName: 'CollectionFieldInterface'
 });

package/es/collection-manager/Configuration/components/CollectionTemplate.d.ts

@@ -1,2 +1,2 @@
 import React from 'react';
-export declare const CollectionTemplate: React.MemoExoticComponent<React.FunctionComponent<Pick<any, string | number | symbol>>>;
+export declare const CollectionTemplate: React.MemoExoticComponent<import("@formily/react").ReactFC<Pick<any, string | number | symbol>>>;

package/es/collection-manager/Configuration/components/CollectionTemplate.js

@@ -10,4 +10,6 @@ export var CollectionTemplate = observer(function (props) {
   var compile = useCompile();
   var schema = getTemplate(value);
   return /*#__PURE__*/React.createElement(Tag, null, compile((schema === null || schema === void 0 ? void 0 : schema.title) || '{{t("General collection")}}'));
+}, {
+  displayName: 'CollectionTemplate'
 });

package/es/collection-manager/Configuration/components/FieldSummary.d.ts

@@ -1,2 +1,2 @@
 import React from 'react';
-export declare const FieldSummary: React.MemoExoticComponent<React.FunctionComponent<Pick<any, string | number | symbol>>>;
+export declare const FieldSummary: React.MemoExoticComponent<import("@formily/react").ReactFC<Pick<any, string | number | symbol>>>;

package/es/collection-manager/Configuration/components/FieldSummary.js

@@ -17,10 +17,12 @@ export var FieldSummary = observer(function (props) {
   var schema = getInterface(schemaKey);
   if (!schema) return null;
   return /*#__PURE__*/React.createElement("div", {
-    className: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n        background: #f6f6f6;\n        margin-bottom: 24px;\n        padding: 16px;\n      "])))
+    className: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n          background: #f6f6f6;\n          margin-bottom: 24px;\n          padding: 16px;\n        "])))
   }, /*#__PURE__*/React.createElement("div", {
     className: css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral([""])))
   }, t('Field interface'), ": ", /*#__PURE__*/React.createElement(Tag, null, compile(schema.title))), schema.description ? /*#__PURE__*/React.createElement("div", {
-    className: css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n            margin-top: 8px;\n            color: rgba(0, 0, 0, 0.45);\n          "])))
+    className: css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n              margin-top: 8px;\n              color: rgba(0, 0, 0, 0.45);\n            "])))
   }, compile(schema.description)) : null);
+}, {
+  displayName: 'FieldSummary'
 });

package/es/collection-manager/Configuration/components/TemplateSummay.d.ts

@@ -1,2 +1,2 @@
 import React from 'react';
-export declare const TemplateSummay: React.MemoExoticComponent<React.FunctionComponent<Pick<any, string | number | symbol>>>;
+export declare const TemplateSummay: React.MemoExoticComponent<import("@formily/react").ReactFC<Pick<any, string | number | symbol>>>;

package/es/collection-manager/Configuration/components/TemplateSummay.js

@@ -17,10 +17,12 @@ export var TemplateSummay = observer(function (props) {
   var schema = getTemplate(schemaKey);
   if (!schema) return null;
   return /*#__PURE__*/React.createElement("div", {
-    className: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n        background: #f6f6f6;\n        margin-bottom: 24px;\n        padding: 16px;\n      "])))
+    className: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n          background: #f6f6f6;\n          margin-bottom: 24px;\n          padding: 16px;\n        "])))
   }, /*#__PURE__*/React.createElement("div", {
     className: css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral([""])))
   }, t('Collection template'), ": ", /*#__PURE__*/React.createElement(Tag, null, compile(schema.title))), schema.description ? /*#__PURE__*/React.createElement("div", {
-    className: css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n            margin-top: 8px;\n            color: rgba(0, 0, 0, 0.45);\n          "])))
+    className: css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n              margin-top: 8px;\n              color: rgba(0, 0, 0, 0.45);\n            "])))
   }, compile(schema.description)) : null);
+}, {
+  displayName: 'TemplateSummay'
 });

package/es/collection-manager/Configuration/components/index.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
-export declare const SourceForeignKey: React.MemoExoticComponent<React.FunctionComponent<unknown>>;
-export declare const ThroughForeignKey: React.MemoExoticComponent<React.FunctionComponent<unknown>>;
-export declare const TargetForeignKey: React.MemoExoticComponent<React.FunctionComponent<unknown>>;
-export declare const SourceCollection: React.MemoExoticComponent<React.FunctionComponent<unknown>>;
-export declare const SourceKey: React.MemoExoticComponent<React.FunctionComponent<unknown>>;
-export declare const TargetKey: React.MemoExoticComponent<React.FunctionComponent<unknown>>;
+export declare const SourceForeignKey: React.MemoExoticComponent<import("@formily/react").ReactFC<unknown>>;
+export declare const ThroughForeignKey: React.MemoExoticComponent<import("@formily/react").ReactFC<unknown>>;
+export declare const TargetForeignKey: React.MemoExoticComponent<import("@formily/react").ReactFC<unknown>>;
+export declare const SourceCollection: React.MemoExoticComponent<import("@formily/react").ReactFC<unknown>>;
+export declare const SourceKey: React.MemoExoticComponent<import("@formily/react").ReactFC<unknown>>;
+export declare const TargetKey: React.MemoExoticComponent<import("@formily/react").ReactFC<unknown>>;

package/es/collection-manager/Configuration/components/index.js

@@ -28,6 +28,8 @@ export var SourceForeignKey = observer(function () {
       };
     })
   }));
+}, {
+  displayName: 'SourceForeignKey'
 });
 export var ThroughForeignKey = observer(function () {
   var field = useField();
@@ -49,6 +51,8 @@ export var ThroughForeignKey = observer(function () {
       };
     })
   }));
+}, {
+  displayName: 'ThroughForeignKey'
 });
 export var TargetForeignKey = observer(function () {
   var field = useField();
@@ -70,6 +74,8 @@ export var TargetForeignKey = observer(function () {
       };
     })
   }));
+}, {
+  displayName: 'TargetForeignKey'
 });
 export var SourceCollection = observer(function () {
   var record = useRecord();
@@ -85,6 +91,8 @@ export var SourceCollection = observer(function () {
       label: compile(collection.title)
     }]
   }));
+}, {
+  displayName: 'SourceCollection'
 });
 export var SourceKey = observer(function () {
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Select, {
@@ -95,6 +103,8 @@ export var SourceKey = observer(function () {
       label: 'ID'
     }]
   }));
+}, {
+  displayName: 'SourceKey'
 });
 export var TargetKey = observer(function () {
   return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Select, {
@@ -105,4 +115,6 @@ export var TargetKey = observer(function () {
       label: 'ID'
     }]
   }));
+}, {
+  displayName: 'TargetKey'
 });

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

@@ -53,6 +53,7 @@ export declare const interfaces: Map<string, import("@formily/react").Stringify<
     "x-editable"?: boolean;
     "x-read-only"?: boolean;
     "x-read-pretty"?: boolean;
+    "x-compile-omitted"?: string[];
 }>>;
 export declare function registerField(group: string, type: string, schema: any): void;
 export declare function registerGroup(key: string, label: string | {

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

@@ -53,6 +53,7 @@ export declare const templates: Map<string, import("@formily/react").Stringify<{
     "x-editable"?: boolean;
     "x-read-only"?: boolean;
     "x-read-pretty"?: boolean;
+    "x-compile-omitted"?: string[];
 }>>;
 export declare const collectionTemplates: any;
 export declare function registerTemplate(key: string, schema: any): void;

package/es/collection-manager/ResourceActionProvider.d.ts

@@ -1,4 +1,4 @@
-import { Result } from 'ahooks/lib/useRequest/src/types';
+import { Result } from 'ahooks/es/useRequest/src/types';
 import React from 'react';
 export declare const ResourceActionContext: React.Context<Result<any, any> & {
     state?: any;

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

@@ -27,6 +27,7 @@ export declare const useChildrenCollections: (collectionName: string) => {
 }[];
 export declare const useCollectionFilterOptions: (collectionName: string) => any[];
 export declare const useLinkageCollectionFilterOptions: (collectionName: string) => any[];
+export declare const useCollectionFieldsOptions: (collectionName: string, maxDepth?: number, excludes?: any[]) => any[];
 export declare const useFilterDataSource: (options: any) => any;
 export declare const useFilterAction: () => {
     run(): Promise<void>;

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

@@ -19,7 +19,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 import { useField, useForm } from '@formily/react';
 import { message } from 'antd';
 import omit from 'lodash/omit';
-import { useEffect } from 'react';
+import { useEffect, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useCollection, useCollectionManager } from '.';
 import { useCompile } from '..';
@@ -166,10 +166,115 @@ export var useChildrenCollections = function useChildrenCollections(collectionNa
 export var useCollectionFilterOptions = function useCollectionFilterOptions(collectionName) {
   var _useCollectionManager3 = useCollectionManager(),
     getCollectionFields = _useCollectionManager3.getCollectionFields,
-    getInterface = _useCollectionManager3.getInterface;
+    getInterface = _useCollectionManager3.getInterface,
+    getChildrenCollections = _useCollectionManager3.getChildrenCollections,
+    getCollection = _useCollectionManager3.getCollection;
+  var compile = useCompile();
+  return useMemo(function () {
+    var fields = getCollectionFields(collectionName);
+    var field2option = function field2option(field, depth) {
+      var _field$uiSchema2, _operators$filter;
+      if (!field.interface) {
+        return;
+      }
+      var fieldInterface = getInterface(field.interface);
+      if (!(fieldInterface === null || fieldInterface === void 0 ? void 0 : fieldInterface.filterable)) {
+        return;
+      }
+      var _fieldInterface$filte = fieldInterface.filterable,
+        nested = _fieldInterface$filte.nested,
+        children = _fieldInterface$filte.children,
+        operators = _fieldInterface$filte.operators;
+      var option = {
+        name: field.name,
+        title: (field === null || field === void 0 ? void 0 : (_field$uiSchema2 = field.uiSchema) === null || _field$uiSchema2 === void 0 ? void 0 : _field$uiSchema2.title) || field.name,
+        schema: field === null || field === void 0 ? void 0 : field.uiSchema,
+        operators: (operators === null || operators === void 0 ? void 0 : (_operators$filter = operators.filter) === null || _operators$filter === void 0 ? void 0 : _operators$filter.call(operators, function (operator) {
+          return !(operator === null || operator === void 0 ? void 0 : operator.visible) || operator.visible(field);
+        })) || [],
+        interface: field.interface
+      };
+      if (field.target && depth > 2) {
+        return;
+      }
+      if (depth > 2) {
+        return option;
+      }
+      if (children === null || children === void 0 ? void 0 : children.length) {
+        option['children'] = children;
+      }
+      if (nested) {
+        var _option$children;
+        var targetFields = getCollectionFields(field.target);
+        var _options = getOptions(targetFields, depth + 1).filter(Boolean);
+        option['children'] = option['children'] || [];
+        (_option$children = option['children']).push.apply(_option$children, _toConsumableArray(_options));
+      }
+      return option;
+    };
+    var getOptions = function getOptions(fields, depth) {
+      var options = [];
+      fields.forEach(function (field) {
+        var option = field2option(field, depth);
+        if (option) {
+          options.push(option);
+        }
+      });
+      return options;
+    };
+    var options = getOptions(fields, 1);
+    var collection = getCollection(collectionName);
+    var childrenCollections = getChildrenCollections(collectionName);
+    if (childrenCollections.length > 0 && !options.find(function (v) {
+      return v.name == 'tableoid';
+    })) {
+      options.push({
+        name: 'tableoid',
+        type: 'string',
+        title: '{{t("Table OID(Inheritance)")}}',
+        schema: {
+          'x-component': 'Select',
+          enum: [{
+            value: collectionName,
+            label: compile(collection.title)
+          }].concat(childrenCollections.map(function (v) {
+            return {
+              value: v.name,
+              label: compile(v.title)
+            };
+          }))
+        },
+        operators: [{
+          label: '{{t("contains")}}',
+          value: '$childIn',
+          schema: {
+            'x-component': 'Select',
+            'x-component-props': {
+              mode: 'tags'
+            }
+          }
+        }, {
+          label: '{{t("does not contain")}}',
+          value: '$childNotIn',
+          schema: {
+            'x-component': 'Select',
+            'x-component-props': {
+              mode: 'tags'
+            }
+          }
+        }]
+      });
+    }
+    return options;
+  }, [collectionName]);
+};
+export var useLinkageCollectionFilterOptions = function useLinkageCollectionFilterOptions(collectionName) {
+  var _useCollectionManager4 = useCollectionManager(),
+    getCollectionFields = _useCollectionManager4.getCollectionFields,
+    getInterface = _useCollectionManager4.getInterface;
   var fields = getCollectionFields(collectionName);
   var field2option = function field2option(field, depth) {
-    var _field$uiSchema2, _operators$filter;
+    var _field$uiSchema3, _operators$filter2;
     if (!field.interface) {
       return;
     }
@@ -177,15 +282,15 @@ export var useCollectionFilterOptions = function useCollectionFilterOptions(coll
     if (!(fieldInterface === null || fieldInterface === void 0 ? void 0 : fieldInterface.filterable)) {
       return;
     }
-    var _fieldInterface$filte = fieldInterface.filterable,
-      nested = _fieldInterface$filte.nested,
-      children = _fieldInterface$filte.children,
-      operators = _fieldInterface$filte.operators;
+    var _fieldInterface$filte2 = fieldInterface.filterable,
+      nested = _fieldInterface$filte2.nested,
+      children = _fieldInterface$filte2.children,
+      operators = _fieldInterface$filte2.operators;
     var option = {
       name: field.name,
-      title: (field === null || field === void 0 ? void 0 : (_field$uiSchema2 = field.uiSchema) === null || _field$uiSchema2 === void 0 ? void 0 : _field$uiSchema2.title) || field.name,
+      title: (field === null || field === void 0 ? void 0 : (_field$uiSchema3 = field.uiSchema) === null || _field$uiSchema3 === void 0 ? void 0 : _field$uiSchema3.title) || field.name,
       schema: field === null || field === void 0 ? void 0 : field.uiSchema,
-      operators: (operators === null || operators === void 0 ? void 0 : (_operators$filter = operators.filter) === null || _operators$filter === void 0 ? void 0 : _operators$filter.call(operators, function (operator) {
+      operators: (operators === null || operators === void 0 ? void 0 : (_operators$filter2 = operators.filter) === null || _operators$filter2 === void 0 ? void 0 : _operators$filter2.call(operators, function (operator) {
         return !(operator === null || operator === void 0 ? void 0 : operator.visible) || operator.visible(field);
       })) || [],
       interface: field.interface
@@ -200,11 +305,16 @@ export var useCollectionFilterOptions = function useCollectionFilterOptions(coll
       option['children'] = children;
     }
     if (nested) {
-      var _option$children;
-      var targetFields = getCollectionFields(field.target);
-      var _options = getOptions(targetFields, depth + 1).filter(Boolean);
+      var _option$children2;
+      var targetFields = getCollectionFields(field.target).filter(function (v) {
+        if (['hasMany', 'belongsToMany'].includes(field.type)) {
+          return !['hasOne', 'hasMany', 'belongsTo', 'belongsToMany'].includes(v.type);
+        }
+        return !['hasMany', 'belongsToMany'].includes(v.type);
+      });
+      var _options2 = getOptions(targetFields, depth + 1).filter(Boolean);
       option['children'] = option['children'] || [];
-      (_option$children = option['children']).push.apply(_option$children, _toConsumableArray(_options));
+      (_option$children2 = option['children']).push.apply(_option$children2, _toConsumableArray(_options2));
     }
     return option;
   };
@@ -219,63 +329,20 @@ export var useCollectionFilterOptions = function useCollectionFilterOptions(coll
     return options;
   };
   var options = getOptions(fields, 1);
-  var compile = useCompile();
-  var _useCollectionManager4 = useCollectionManager(),
-    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';
-  })) {
-    options.push({
-      name: 'tableoid',
-      type: 'string',
-      title: '{{t("Table OID(Inheritance)")}}',
-      schema: {
-        'x-component': 'Select',
-        enum: [{
-          value: collectionName,
-          label: compile(collection.title)
-        }].concat(childrenCollections.map(function (v) {
-          return {
-            value: v.name,
-            label: compile(v.title)
-          };
-        }))
-      },
-      operators: [{
-        label: '{{t("contains")}}',
-        value: '$childIn',
-        schema: {
-          'x-component': 'Select',
-          'x-component-props': {
-            mode: 'tags'
-          }
-        }
-      }, {
-        label: '{{t("does not contain")}}',
-        value: '$childNotIn',
-        schema: {
-          'x-component': 'Select',
-          'x-component-props': {
-            mode: 'tags'
-          }
-        }
-      }]
-    });
-  }
   return options;
 };
-export var useLinkageCollectionFilterOptions = function useLinkageCollectionFilterOptions(collectionName) {
+// 通用
+export var useCollectionFieldsOptions = function useCollectionFieldsOptions(collectionName) {
+  var maxDepth = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 2;
+  var excludes = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
   var _useCollectionManager5 = useCollectionManager(),
     getCollectionFields = _useCollectionManager5.getCollectionFields,
     getInterface = _useCollectionManager5.getInterface;
   var fields = getCollectionFields(collectionName).filter(function (v) {
-    return !['o2m', 'm2m'].includes(v.interface);
+    return !excludes.includes(v.interface);
   });
-  var field2option = function field2option(field, depth) {
-    var _field$uiSchema3, _operators$filter2;
+  var field2option = function field2option(field, depth, prefix) {
+    var _field$uiSchema4;
     if (!field.interface) {
       return;
     }
@@ -283,43 +350,44 @@ export var useLinkageCollectionFilterOptions = function useLinkageCollectionFilt
     if (!(fieldInterface === null || fieldInterface === void 0 ? void 0 : fieldInterface.filterable)) {
       return;
     }
-    var _fieldInterface$filte2 = fieldInterface.filterable,
-      nested = _fieldInterface$filte2.nested,
-      children = _fieldInterface$filte2.children,
-      operators = _fieldInterface$filte2.operators;
-    var option = {
+    var _fieldInterface$filte3 = fieldInterface.filterable,
+      nested = _fieldInterface$filte3.nested,
+      children = _fieldInterface$filte3.children;
+    var value = prefix ? "".concat(prefix, ".").concat(field.name) : field.name;
+    var option = _objectSpread(_objectSpread({}, field), {}, {
       name: field.name,
-      title: (field === null || field === void 0 ? void 0 : (_field$uiSchema3 = field.uiSchema) === null || _field$uiSchema3 === void 0 ? void 0 : _field$uiSchema3.title) || field.name,
+      title: (field === null || field === void 0 ? void 0 : (_field$uiSchema4 = field.uiSchema) === null || _field$uiSchema4 === void 0 ? void 0 : _field$uiSchema4.title) || field.name,
       schema: field === null || field === void 0 ? void 0 : field.uiSchema,
-      operators: (operators === null || operators === void 0 ? void 0 : (_operators$filter2 = operators.filter) === null || _operators$filter2 === void 0 ? void 0 : _operators$filter2.call(operators, function (operator) {
-        return !(operator === null || operator === void 0 ? void 0 : operator.visible) || operator.visible(field);
-      })) || [],
-      interface: field.interface
-    };
-    if (field.target && depth > 2) {
+      key: value
+    });
+    if (field.target && depth > maxDepth) {
       return;
     }
-    if (depth > 2) {
+    if (depth > maxDepth) {
       return option;
     }
     if (children === null || children === void 0 ? void 0 : children.length) {
-      option['children'] = children;
+      option['children'] = children.map(function (v) {
+        return _objectSpread(_objectSpread({}, v), {}, {
+          key: "".concat(field.name, ".").concat(v.name)
+        });
+      });
     }
     if (nested) {
-      var _option$children2;
+      var _option$children3;
       var targetFields = getCollectionFields(field.target).filter(function (v) {
-        return !['o2m', 'm2m'].includes(v.interface);
+        return !excludes.includes(v.interface);
       });
-      var _options2 = getOptions(targetFields, depth + 1).filter(Boolean);
+      var _options3 = getOptions(targetFields, depth + 1, field.name).filter(Boolean);
       option['children'] = option['children'] || [];
-      (_option$children2 = option['children']).push.apply(_option$children2, _toConsumableArray(_options2));
+      (_option$children3 = option['children']).push.apply(_option$children3, _toConsumableArray(_options3));
     }
     return option;
   };
-  var getOptions = function getOptions(fields, depth) {
+  var getOptions = function getOptions(fields, depth, prefix) {
     var options = [];
     fields.forEach(function (field) {
-      var option = field2option(field, depth);
+      var option = field2option(field, depth, prefix);
       if (option) {
         options.push(option);
       }
@@ -526,23 +594,33 @@ export var useUpdateAction = function useUpdateAction() {
             case 2:
               field.data = field.data || {};
               field.data.loading = true;
-              _context9.next = 6;
+              _context9.prev = 4;
+              _context9.next = 7;
               return resource.update({
                 filterByTk: filterByTk,
                 values: form.values
               });
-            case 6:
+            case 7:
               ctx.setVisible(false);
-              _context9.next = 9;
+              _context9.next = 10;
               return form.reset();
-            case 9:
-              field.data.loading = false;
+            case 10:
               refresh();
-            case 11:
+              _context9.next = 16;
+              break;
+            case 13:
+              _context9.prev = 13;
+              _context9.t0 = _context9["catch"](4);
+              console.log(_context9.t0);
+            case 16:
+              _context9.prev = 16;
+              field.data.loading = false;
+              return _context9.finish(16);
+            case 19:
             case "end":
               return _context9.stop();
           }
-        }, _callee9);
+        }, _callee9, null, [[4, 13, 16, 19]]);
       }))();
     }
   };