@nocobase/client 0.7.1-alpha.7 → 0.7.2-alpha.1

package/es/application/Application.js

@@ -50,7 +50,6 @@ import { SchemaInitializerProvider } from '../schema-initializer';
 import { BlockTemplateDetails, BlockTemplatePage, SchemaTemplateShortcut } from '../schema-templates';
 import { SystemSettingsProvider, SystemSettingsShortcut } from '../system-settings';
 import { SigninPage, SignupPage } from '../user';
-import { WorkflowPage, WorkflowRouteProvider, WorkflowShortcut } from '../workflow';
 import { compose } from './compose';
 export var Application = /*#__PURE__*/function () {
   function Application(options) {
@@ -86,7 +85,6 @@ export var Application = /*#__PURE__*/function () {
         RouteSchemaComponent: RouteSchemaComponent,
         SigninPage: SigninPage,
         SignupPage: SignupPage,
-        WorkflowPage: WorkflowPage,
         BlockTemplatePage: BlockTemplatePage,
         BlockTemplateDetails: BlockTemplateDetails
       }
@@ -97,7 +95,6 @@ export var Application = /*#__PURE__*/function () {
         ACLShortcut: ACLShortcut,
         DesignableSwitch: DesignableSwitch,
         CollectionManagerShortcut: CollectionManagerShortcut,
-        WorkflowShortcut: WorkflowShortcut,
         SystemSettingsShortcut: SystemSettingsShortcut,
         SchemaTemplateShortcut: SchemaTemplateShortcut,
         FileStorageShortcut: FileStorageShortcut
@@ -118,7 +115,6 @@ export var Application = /*#__PURE__*/function () {
     this.use(AntdSchemaComponentProvider);
     this.use(ACLProvider);
     this.use(RemoteDocumentTitleProvider);
-    this.use(WorkflowRouteProvider);
 
     var _iterator = _createForOfIteratorHelper(options.plugins),
         _step;

package/es/block-provider/BlockSchemaComponentProvider.js

@@ -15,6 +15,7 @@ import { KanbanBlockProvider, useKanbanBlockProps } from './KanbanBlockProvider'
 import { TableBlockProvider, useTableBlockProps } from './TableBlockProvider';
 import { TableFieldProvider, useTableFieldProps } from './TableFieldProvider';
 import { TableSelectorProvider, useTableSelectorProps } from './TableSelectorProvider';
+import { FormFieldProvider, useFormFieldProps } from './FormFieldProvider';
 export var BlockSchemaComponentProvider = function BlockSchemaComponentProvider(props) {
   return /*#__PURE__*/React.createElement(SchemaComponentOptions, {
     components: {
@@ -23,6 +24,7 @@ export var BlockSchemaComponentProvider = function BlockSchemaComponentProvider(
       TableBlockProvider: TableBlockProvider,
       TableSelectorProvider: TableSelectorProvider,
       FormBlockProvider: FormBlockProvider,
+      FormFieldProvider: FormFieldProvider,
       DetailsBlockProvider: DetailsBlockProvider,
       KanbanBlockProvider: KanbanBlockProvider,
       RecordLink: RecordLink
@@ -33,6 +35,7 @@ export var BlockSchemaComponentProvider = function BlockSchemaComponentProvider(
       useParamsFromRecord: useParamsFromRecord,
       useCalendarBlockProps: useCalendarBlockProps,
       useFormBlockProps: useFormBlockProps,
+      useFormFieldProps: useFormFieldProps,
       useDetailsBlockProps: useDetailsBlockProps,
       useTableFieldProps: useTableFieldProps,
       useTableBlockProps: useTableBlockProps,

package/es/block-provider/FormBlockProvider.js

@@ -35,7 +35,8 @@ var InternalFormBlockProvider = function InternalFormBlockProvider(props) {
       form: form,
       field: field,
       service: service,
-      resource: resource
+      resource: resource,
+      updateAssociationValues: []
     }
   }, props.children);
 };

package/es/block-provider/FormFieldProvider.d.ts

@@ -0,0 +1,8 @@
+import React from 'react';
+export declare const FormFieldContext: React.Context<any>;
+export declare const WithoutFormFieldResource: React.Context<any>;
+export declare const FormFieldProvider: (props: any) => JSX.Element;
+export declare const useFormFieldContext: () => any;
+export declare const useFormFieldProps: () => {
+    form: any;
+};

package/es/block-provider/FormFieldProvider.js

@@ -0,0 +1,89 @@
+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) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+import { createForm, onFormValuesChange } from '@formily/core';
+import { useField } from '@formily/react';
+import { Spin } from 'antd';
+import React, { createContext, useContext, useEffect, useMemo } from 'react';
+import { RecordProvider } from '../record-provider';
+import { BlockProvider, useBlockRequestContext } from './BlockProvider';
+import { useFormBlockContext } from './FormBlockProvider';
+export var FormFieldContext = /*#__PURE__*/createContext({});
+
+var InternalFormFieldProvider = function InternalFormFieldProvider(props) {
+  var _formBlockCtx$updateA, _service$data;
+
+  var action = props.action,
+      readPretty = props.readPretty,
+      fieldName = props.fieldName;
+  var formBlockCtx = useFormBlockContext();
+
+  if (!(formBlockCtx === null || formBlockCtx === void 0 ? void 0 : (_formBlockCtx$updateA = formBlockCtx.updateAssociationValues) === null || _formBlockCtx$updateA === void 0 ? void 0 : _formBlockCtx$updateA.includes(fieldName))) {
+    var _formBlockCtx$updateA2;
+
+    formBlockCtx === null || formBlockCtx === void 0 ? void 0 : (_formBlockCtx$updateA2 = formBlockCtx.updateAssociationValues) === null || _formBlockCtx$updateA2 === void 0 ? void 0 : _formBlockCtx$updateA2.push(fieldName);
+  }
+
+  var field = useField();
+  var form = useMemo(function () {
+    return createForm({
+      effects: function effects() {
+        onFormValuesChange(function (form) {
+          var _formBlockCtx$form;
+
+          formBlockCtx === null || formBlockCtx === void 0 ? void 0 : (_formBlockCtx$form = formBlockCtx.form) === null || _formBlockCtx$form === void 0 ? void 0 : _formBlockCtx$form.setValuesIn(fieldName, form.values);
+        });
+      },
+      readPretty: readPretty
+    });
+  }, []);
+
+  var _useBlockRequestConte = useBlockRequestContext(),
+      resource = _useBlockRequestConte.resource,
+      service = _useBlockRequestConte.service;
+
+  if (service.loading) {
+    return /*#__PURE__*/React.createElement(Spin, null);
+  }
+
+  console.log('InternalFormFieldProvider', fieldName);
+  return /*#__PURE__*/React.createElement(RecordProvider, {
+    record: service === null || service === void 0 ? void 0 : (_service$data = service.data) === null || _service$data === void 0 ? void 0 : _service$data.data
+  }, /*#__PURE__*/React.createElement(FormFieldContext.Provider, {
+    value: {
+      action: action,
+      form: form,
+      field: field,
+      service: service,
+      resource: resource,
+      fieldName: fieldName
+    }
+  }, props.children));
+};
+
+export var WithoutFormFieldResource = /*#__PURE__*/createContext(null);
+export var FormFieldProvider = function FormFieldProvider(props) {
+  console.log('FormFieldProvider', props);
+  return /*#__PURE__*/React.createElement(WithoutFormFieldResource.Provider, {
+    value: false
+  }, /*#__PURE__*/React.createElement(BlockProvider, _objectSpread({
+    block: 'FormField'
+  }, props), /*#__PURE__*/React.createElement(InternalFormFieldProvider, _objectSpread({}, props))));
+};
+export var useFormFieldContext = function useFormFieldContext() {
+  return useContext(FormFieldContext);
+};
+export var useFormFieldProps = function useFormFieldProps() {
+  var ctx = useFormFieldContext();
+  useEffect(function () {
+    var _ctx$form, _ctx$service, _ctx$service$data;
+
+    ctx === null || ctx === void 0 ? void 0 : (_ctx$form = ctx.form) === null || _ctx$form === void 0 ? void 0 : _ctx$form.setInitialValues((_ctx$service = ctx.service) === null || _ctx$service === void 0 ? void 0 : (_ctx$service$data = _ctx$service.data) === null || _ctx$service$data === void 0 ? void 0 : _ctx$service$data.data);
+  }, []);
+  return {
+    form: ctx.form
+  };
+};

package/es/block-provider/KanbanBlockProvider.js

@@ -8,11 +8,26 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-import { useField } from '@formily/react';
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+
+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 _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+import { Schema, useField, useFieldSchema } from '@formily/react';
 import { Spin } from 'antd';
+import uniq from 'lodash/uniq';
 import React, { createContext, useContext, useEffect } from 'react';
 import { useACLRoleContext } from '../acl';
-import { useCollection } from '../collection-manager';
+import { useCollection, useCollectionManager } from '../collection-manager';
 import { toColumns } from '../schema-component/antd/kanban/Kanban';
 import { BlockProvider, useBlockRequestContext } from './BlockProvider';
 export var KanbanBlockContext = /*#__PURE__*/createContext({});
@@ -63,8 +78,107 @@ var InternalKanbanBlockProvider = function InternalKanbanBlockProvider(props) {
   }, props.children);
 };
 
+var recursiveProperties = function recursiveProperties(schema) {
+  var component = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'CollectionField';
+  var associationFields = arguments.length > 2 ? arguments[2] : undefined;
+  var appends = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : [];
+  schema.mapProperties(function (s) {
+    var name = s.name.toString();
+
+    if (s['x-component'] === component && !appends.includes(name)) {
+      // 关联字段和关联的关联字段
+      var _name$split = name.split('.'),
+          _name$split2 = _slicedToArray(_name$split, 1),
+          firstName = _name$split2[0];
+
+      if (associationFields.has(name)) {
+        appends.push(name);
+      } else if (associationFields.has(firstName) && !appends.includes(firstName)) {
+        appends.push(firstName);
+      }
+    } else {
+      recursiveProperties(s, component, associationFields, appends);
+    }
+  });
+};
+
+var useAssociationNames = function useAssociationNames(collection) {
+  var _kanbanSchema$propert, _kanbanSchema$propert2, _kanbanSchema$propert3;
+
+  var _useCollectionManager = useCollectionManager(),
+      getCollectionFields = _useCollectionManager.getCollectionFields;
+
+  var collectionFields = getCollectionFields(collection);
+  var associationFields = new Set();
+
+  var _iterator = _createForOfIteratorHelper(collectionFields),
+      _step;
+
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var collectionField = _step.value;
+
+      if (collectionField.target) {
+        associationFields.add(collectionField.name);
+        var fields = getCollectionFields(collectionField.target);
+
+        var _iterator2 = _createForOfIteratorHelper(fields),
+            _step2;
+
+        try {
+          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+            var field = _step2.value;
+
+            if (field.target) {
+              associationFields.add("".concat(collectionField.name, ".").concat(field.name));
+            }
+          }
+        } catch (err) {
+          _iterator2.e(err);
+        } finally {
+          _iterator2.f();
+        }
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+
+  var fieldSchema = useFieldSchema();
+  var kanbanSchema = fieldSchema.reduceProperties(function (buf, schema) {
+    if (schema['x-component'].startsWith('Kanban')) {
+      return schema;
+    }
+
+    return buf;
+  }, new Schema({}));
+  var gridSchema = kanbanSchema === null || kanbanSchema === void 0 ? void 0 : (_kanbanSchema$propert = kanbanSchema.properties) === null || _kanbanSchema$propert === void 0 ? void 0 : (_kanbanSchema$propert2 = _kanbanSchema$propert.card) === null || _kanbanSchema$propert2 === void 0 ? void 0 : (_kanbanSchema$propert3 = _kanbanSchema$propert2.properties) === null || _kanbanSchema$propert3 === void 0 ? void 0 : _kanbanSchema$propert3.grid;
+  var appends = [];
+
+  if (gridSchema) {
+    recursiveProperties(gridSchema, 'CollectionField', associationFields, appends);
+  }
+
+  return uniq(appends);
+};
+
 export var KanbanBlockProvider = function KanbanBlockProvider(props) {
-  return /*#__PURE__*/React.createElement(BlockProvider, _objectSpread({}, props), /*#__PURE__*/React.createElement(InternalKanbanBlockProvider, _objectSpread({}, props)));
+  var params = _objectSpread({}, props.params);
+
+  var appends = useAssociationNames(props.collection);
+  console.log('KanbanBlockProvider', appends);
+
+  if (!Object.keys(params).includes('appends')) {
+    params['appends'] = appends;
+  }
+
+  return /*#__PURE__*/React.createElement(BlockProvider, _objectSpread(_objectSpread({}, props), {}, {
+    params: params
+  }), /*#__PURE__*/React.createElement(InternalKanbanBlockProvider, _objectSpread(_objectSpread({}, props), {}, {
+    params: params
+  })));
 };
 export var useKanbanBlockContext = function useKanbanBlockContext() {
   return useContext(KanbanBlockContext);

package/es/block-provider/TableFieldProvider.js

@@ -17,18 +17,33 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 import { useField } from '@formily/react';
 import React, { createContext, useContext, useEffect } from 'react';
 import { BlockProvider, useBlockRequestContext } from './BlockProvider';
+import { useFormBlockContext } from './FormBlockProvider';
+import { useFormFieldContext } from './FormFieldProvider';
 export var TableFieldContext = /*#__PURE__*/createContext({});
 
 var InternalTableFieldProvider = function InternalTableFieldProvider(props) {
+  var _formBlockCtx$updateA;
+
   var _props$params = props.params,
       params = _props$params === void 0 ? {} : _props$params,
       showIndex = props.showIndex,
-      dragSort = props.dragSort;
+      dragSort = props.dragSort,
+      fieldName = props.fieldName;
   var field = useField();
 
   var _useBlockRequestConte = useBlockRequestContext(),
       resource = _useBlockRequestConte.resource,
-      service = _useBlockRequestConte.service; // if (service.loading) {
+      service = _useBlockRequestConte.service;
+
+  var formBlockCtx = useFormBlockContext();
+  var formFieldCtx = useFormFieldContext();
+  var fullFieldName = formFieldCtx && formFieldCtx.fieldName ? "".concat(formFieldCtx.fieldName, ".").concat(fieldName) : fieldName;
+
+  if (!(formBlockCtx === null || formBlockCtx === void 0 ? void 0 : (_formBlockCtx$updateA = formBlockCtx.updateAssociationValues) === null || _formBlockCtx$updateA === void 0 ? void 0 : _formBlockCtx$updateA.includes(fullFieldName))) {
+    var _formBlockCtx$updateA2;
+
+    formBlockCtx === null || formBlockCtx === void 0 ? void 0 : (_formBlockCtx$updateA2 = formBlockCtx.updateAssociationValues) === null || _formBlockCtx$updateA2 === void 0 ? void 0 : _formBlockCtx$updateA2.push(fullFieldName);
+  } // if (service.loading) {
   //   return <Spin />;
   // }
 

package/es/block-provider/TableSelectorProvider.js

@@ -8,10 +8,12 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-import { useField } from '@formily/react';
+import { useField, useFieldSchema } from '@formily/react';
 import React, { createContext, useContext, useEffect } from 'react';
 import { useCollectionManager } from '../collection-manager';
+import { useRecord } from '../record-provider';
 import { BlockProvider, useBlockRequestContext } from './BlockProvider';
+import { useFormBlockContext } from './FormBlockProvider';
 export var TableSelectorContext = /*#__PURE__*/createContext({});
 
 var InternalTableSelectorProvider = function InternalTableSelectorProvider(props) {
@@ -51,7 +53,23 @@ var useAssociationNames = function useAssociationNames(collection) {
   return names;
 };
 
+var recursiveParent = function recursiveParent(schema, component) {
+  return schema['x-component'] === component ? schema : schema.parent ? recursiveParent(schema.parent, component) : null;
+};
+
 export var TableSelectorProvider = function TableSelectorProvider(props) {
+  var fieldSchema = useFieldSchema();
+  var ctx = useFormBlockContext();
+
+  var _useCollectionManager2 = useCollectionManager(),
+      getCollectionJoinField = _useCollectionManager2.getCollectionJoinField;
+
+  var record = useRecord();
+  var collectionFieldSchema = recursiveParent(fieldSchema, 'CollectionField'); // const value = ctx.form.query(collectionFieldSchema?.name).value();
+
+  var collectionField = getCollectionJoinField(collectionFieldSchema === null || collectionFieldSchema === void 0 ? void 0 : collectionFieldSchema['x-collection-field']);
+  console.log('TableSelectorProvider', collectionFieldSchema, collectionField, record);
+
   var params = _objectSpread({}, props.params);
 
   var appends = useAssociationNames(props.collection);
@@ -64,6 +82,20 @@ export var TableSelectorProvider = function TableSelectorProvider(props) {
     params['appends'] = appends;
   }
 
+  if (collectionField) {
+    if (['oho', 'o2m'].includes(collectionField.interface)) {
+      params['filter'] = {
+        $or: [_defineProperty({}, collectionField.foreignKey, {
+          $is: null
+        }), _defineProperty({}, collectionField.foreignKey, {
+          $eq: record === null || record === void 0 ? void 0 : record[collectionField.sourceKey]
+        })]
+      };
+    }
+
+    if (['obo'].includes(collectionField.interface)) {}
+  }
+
   return /*#__PURE__*/React.createElement(BlockProvider, _objectSpread(_objectSpread({}, props), {}, {
     params: params
   }), /*#__PURE__*/React.createElement(InternalTableSelectorProvider, _objectSpread(_objectSpread({}, props), {}, {
@@ -108,14 +140,14 @@ export var useTableSelectorProps = function useTableSelectorProps() {
       ctx.field.data = (ctx === null || ctx === void 0 ? void 0 : (_ctx$field2 = ctx.field) === null || _ctx$field2 === void 0 ? void 0 : _ctx$field2.data) || {};
       ctx.field.data.selectedRowKeys = selectedRowKeys;
     },
-    onRowDragEnd: function onRowDragEnd(_ref) {
+    onRowDragEnd: function onRowDragEnd(_ref3) {
       return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
         var from, to;
         return regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                from = _ref.from, to = _ref.to;
+                from = _ref3.from, to = _ref3.to;
                 _context.next = 3;
                 return ctx.resource.move({
                   sourceId: from[ctx.rowKey || 'id'],
@@ -133,11 +165,11 @@ export var useTableSelectorProps = function useTableSelectorProps() {
         }, _callee);
       }))();
     },
-    onChange: function onChange(_ref2) {
+    onChange: function onChange(_ref4) {
       var _ctx$service$params;
 
-      var current = _ref2.current,
-          pageSize = _ref2.pageSize;
+      var current = _ref4.current,
+          pageSize = _ref4.pageSize;
       ctx.service.run(_objectSpread(_objectSpread({}, (_ctx$service$params = ctx.service.params) === null || _ctx$service$params === void 0 ? void 0 : _ctx$service$params[0]), {}, {
         page: current,
         pageSize: pageSize

package/es/block-provider/hooks/index.js

@@ -16,6 +16,7 @@ import { message, Modal } from 'antd';
 import get from 'lodash/get';
 import { useTranslation } from 'react-i18next';
 import { useHistory } from 'react-router-dom';
+import { useFormBlockContext } from '../..';
 import { useAPIClient } from '../../api-client';
 import { useCollection } from '../../collection-manager';
 import { useRecord } from '../../record-provider';
@@ -63,7 +64,7 @@ var filterValue = function filterValue(value) {
 
   if (Array.isArray(value)) {
     return value.map(function (v) {
-      return filterValue(value);
+      return filterValue(v);
     });
   }
 
@@ -96,7 +97,7 @@ function getFormValues(filterByTk, field, form, fieldNames, getField, resource)
           continue;
         }
 
-        if (['subTable', 'o2m'].includes(collectionField.interface)) {
+        if (['subTable', 'o2m', 'o2o', 'oho', 'obo', 'm2o'].includes(collectionField.interface)) {
           values[key] = form.values[key];
           continue;
         }
@@ -556,6 +557,7 @@ export var useUpdateActionProps = function useUpdateActionProps() {
 
   var actionSchema = useFieldSchema();
   var history = useHistory();
+  var record = useRecord();
 
   var _useCollection3 = useCollection(),
       fields = _useCollection3.fields,
@@ -563,6 +565,10 @@ export var useUpdateActionProps = function useUpdateActionProps() {
 
   var compile = useCompile();
   var actionField = useField();
+
+  var _useFormBlockContext = useFormBlockContext(),
+      updateAssociationValues = _useFormBlockContext.updateAssociationValues;
+
   return {
     onClick: function onClick() {
       return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee8() {
@@ -595,7 +601,8 @@ export var useUpdateActionProps = function useUpdateActionProps() {
                 _context8.next = 11;
                 return resource.update({
                   filterByTk: filterByTk,
-                  values: _objectSpread(_objectSpread(_objectSpread({}, values), overwriteValues), assignedValues)
+                  values: _objectSpread(_objectSpread(_objectSpread({}, values), overwriteValues), assignedValues),
+                  updateAssociationValues: updateAssociationValues
                 });
 
               case 11:

package/es/block-provider/index.d.ts

@@ -6,3 +6,4 @@ export * from './KanbanBlockProvider';
 export * from './TableBlockProvider';
 export * from './TableFieldProvider';
 export * from './TableSelectorProvider';
+export * from './FormFieldProvider';

package/es/block-provider/index.js

@@ -5,4 +5,5 @@ export * from './FormBlockProvider';
 export * from './KanbanBlockProvider';
 export * from './TableBlockProvider';
 export * from './TableFieldProvider';
-export * from './TableSelectorProvider';
+export * from './TableSelectorProvider';
+export * from './FormFieldProvider';

package/es/collection-manager/CollectionField.js

@@ -87,9 +87,13 @@ var InternalField = function InternalField(props) {
 };
 
 export var CollectionField = connect(function (props) {
+  var _fieldSchema$xCompon;
+
   var fieldSchema = useFieldSchema();
+  var field = fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : _fieldSchema$xCompon['field'];
   return /*#__PURE__*/React.createElement(CollectionFieldProvider, {
-    name: fieldSchema.name
+    name: fieldSchema.name,
+    field: field
   }, /*#__PURE__*/React.createElement(InternalField, _objectSpread({}, props)));
 });
 export default CollectionField;

package/es/collection-manager/CollectionFieldProvider.js

@@ -1,15 +1,20 @@
+import { useFieldSchema } from '@formily/react';
 import React from 'react';
 import { CollectionFieldContext } from './context';
-import { useCollection } from './hooks';
+import { useCollection, useCollectionManager } from './hooks';
 export var CollectionFieldProvider = function CollectionFieldProvider(props) {
   var name = props.name,
       field = props.field,
       children = props.children;
+  var fieldSchema = useFieldSchema();
 
   var _useCollection = useCollection(),
       getField = _useCollection.getField;
 
-  var value = field || getField((field === null || field === void 0 ? void 0 : field.name) || name);
+  var _useCollectionManager = useCollectionManager(),
+      getCollectionJoinField = _useCollectionManager.getCollectionJoinField;
+
+  var value = field || getField((field === null || field === void 0 ? void 0 : field.name) || name) || getCollectionJoinField(fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-collection-field']);
 
   if (!value) {
     return null;

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

@@ -65,7 +65,7 @@ var getSchema = function getSchema(schema, record, compile) {
           }, options);
         }
       },
-      title: "".concat(record.title, " - ").concat(compile('{{ t("Add field") }}')),
+      title: "".concat(compile(record.title), " - ").concat(compile('{{ t("Add field") }}')),
       properties: _objectSpread(_objectSpread({
         summary: {
           type: 'void',

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

@@ -57,7 +57,7 @@ var getSchema = function getSchema(schema, record, compile) {
           }, options);
         }
       },
-      title: "".concat((_record$__parent = record.__parent) === null || _record$__parent === void 0 ? void 0 : _record$__parent.title, " - ").concat(compile('{{ t("Edit field") }}')),
+      title: "".concat(compile((_record$__parent = record.__parent) === null || _record$__parent === void 0 ? void 0 : _record$__parent.title), " - ").concat(compile('{{ t("Edit field") }}')),
       properties: _objectSpread(_objectSpread({
         summary: {
           type: 'void',

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

@@ -78,6 +78,10 @@ export var useCollectionManager = function useCollectionManager() {
     },
     getCollectionField: getCollectionField,
     getCollectionJoinField: function getCollectionJoinField(name) {
+      if (!name) {
+        return;
+      }
+
       var _name$split3 = name.split('.'),
           _name$split4 = _toArray(_name$split3),
           collectionName = _name$split4[0],
@@ -88,11 +92,22 @@ export var useCollectionManager = function useCollectionManager() {
       }
 
       var cName = collectionName;
-      return fieldNames.reduce(function (result, curFieldName) {
-        var collectionField = getCollectionField("".concat(cName, ".").concat(curFieldName));
-        cName = collectionField.target;
-        return collectionField;
-      }, null);
+      var collectionField;
+
+      while (cName && fieldNames.length > 0) {
+        var _collectionField;
+
+        var fileName = fieldNames.shift();
+        collectionField = getCollectionField("".concat(cName, ".").concat(fileName));
+
+        if ((_collectionField = collectionField) === null || _collectionField === void 0 ? void 0 : _collectionField.target) {
+          cName = collectionField.target;
+        } else {
+          cName = null;
+        }
+      }
+
+      return collectionField;
     },
     getInterface: function getInterface(name) {
       return interfaces[name] ? clone(interfaces[name]) : null;

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

@@ -6,9 +6,11 @@ export * from './createdAt';
 export * from './createdBy';
 export * from './datetime';
 export * from './email';
+export * from './formula';
 export * from './icon';
 export * from './id';
 export * from './input';
+export * from './integer';
 export * from './linkTo';
 export * from './m2m';
 export * from './m2o';
@@ -28,4 +30,3 @@ export * from './textarea';
 export * from './time';
 export * from './updatedAt';
 export * from './updatedBy';
-export * from './formula';

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

@@ -6,9 +6,11 @@ export * from './createdAt';
 export * from './createdBy';
 export * from './datetime';
 export * from './email';
+export * from './formula';
 export * from './icon';
 export * from './id';
 export * from './input';
+export * from './integer';
 export * from './linkTo';
 export * from './m2m';
 export * from './m2o';
@@ -27,5 +29,4 @@ export * from './subTable';
 export * from './textarea';
 export * from './time';
 export * from './updatedAt';
-export * from './updatedBy';
-export * from './formula';
+export * from './updatedBy';

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

@@ -0,0 +1,2 @@
+import { IField } from './types';
+export declare const integer: IField;