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

package/lib/block-provider/FormBlockProvider.js

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

package/lib/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/lib/block-provider/FormFieldProvider.js

@@ -0,0 +1,120 @@
+"use strict";
+
+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); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useFormFieldProps = exports.useFormFieldContext = exports.WithoutFormFieldResource = exports.FormFieldProvider = exports.FormFieldContext = void 0;
+
+var _core = require("@formily/core");
+
+var _react = require("@formily/react");
+
+var _antd = require("antd");
+
+var _react2 = _interopRequireWildcard(require("react"));
+
+var _recordProvider = require("../record-provider");
+
+var _BlockProvider = require("./BlockProvider");
+
+var _FormBlockProvider = require("./FormBlockProvider");
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+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; }
+
+var FormFieldContext = /*#__PURE__*/(0, _react2.createContext)({});
+exports.FormFieldContext = FormFieldContext;
+
+var InternalFormFieldProvider = function InternalFormFieldProvider(props) {
+  var _formBlockCtx$updateA, _service$data;
+
+  var action = props.action,
+      readPretty = props.readPretty,
+      fieldName = props.fieldName;
+  var formBlockCtx = (0, _FormBlockProvider.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 = (0, _react.useField)();
+  var form = (0, _react2.useMemo)(function () {
+    return (0, _core.createForm)({
+      effects: function effects() {
+        (0, _core.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 = (0, _BlockProvider.useBlockRequestContext)(),
+      resource = _useBlockRequestConte.resource,
+      service = _useBlockRequestConte.service;
+
+  if (service.loading) {
+    return /*#__PURE__*/_react2.default.createElement(_antd.Spin, null);
+  }
+
+  console.log('InternalFormFieldProvider', fieldName);
+  return /*#__PURE__*/_react2.default.createElement(_recordProvider.RecordProvider, {
+    record: service === null || service === void 0 ? void 0 : (_service$data = service.data) === null || _service$data === void 0 ? void 0 : _service$data.data
+  }, /*#__PURE__*/_react2.default.createElement(FormFieldContext.Provider, {
+    value: {
+      action: action,
+      form: form,
+      field: field,
+      service: service,
+      resource: resource,
+      fieldName: fieldName
+    }
+  }, props.children));
+};
+
+var WithoutFormFieldResource = /*#__PURE__*/(0, _react2.createContext)(null);
+exports.WithoutFormFieldResource = WithoutFormFieldResource;
+
+var FormFieldProvider = function FormFieldProvider(props) {
+  console.log('FormFieldProvider', props);
+  return /*#__PURE__*/_react2.default.createElement(WithoutFormFieldResource.Provider, {
+    value: false
+  }, /*#__PURE__*/_react2.default.createElement(_BlockProvider.BlockProvider, _objectSpread({
+    block: 'FormField'
+  }, props), /*#__PURE__*/_react2.default.createElement(InternalFormFieldProvider, _objectSpread({}, props))));
+};
+
+exports.FormFieldProvider = FormFieldProvider;
+
+var useFormFieldContext = function useFormFieldContext() {
+  return (0, _react2.useContext)(FormFieldContext);
+};
+
+exports.useFormFieldContext = useFormFieldContext;
+
+var useFormFieldProps = function useFormFieldProps() {
+  var ctx = useFormFieldContext();
+  (0, _react2.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
+  };
+};
+
+exports.useFormFieldProps = useFormFieldProps;

package/lib/block-provider/KanbanBlockProvider.js

@@ -11,6 +11,8 @@ var _react = require("@formily/react");
 
 var _antd = require("antd");
 
+var _uniq = _interopRequireDefault(require("lodash/uniq"));
+
 var _react2 = _interopRequireWildcard(require("react"));
 
 var _acl = require("../acl");
@@ -25,6 +27,8 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -35,6 +39,20 @@ 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; }
 
+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; }
+
 var KanbanBlockContext = /*#__PURE__*/(0, _react2.createContext)({});
 exports.KanbanBlockContext = KanbanBlockContext;
 
@@ -84,8 +102,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 = (0, _collectionManager.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 = (0, _react.useFieldSchema)();
+  var kanbanSchema = fieldSchema.reduceProperties(function (buf, schema) {
+    if (schema['x-component'].startsWith('Kanban')) {
+      return schema;
+    }
+
+    return buf;
+  }, new _react.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 (0, _uniq.default)(appends);
+};
+
 var KanbanBlockProvider = function KanbanBlockProvider(props) {
-  return /*#__PURE__*/_react2.default.createElement(_BlockProvider.BlockProvider, _objectSpread({}, props), /*#__PURE__*/_react2.default.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__*/_react2.default.createElement(_BlockProvider.BlockProvider, _objectSpread(_objectSpread({}, props), {}, {
+    params: params
+  }), /*#__PURE__*/_react2.default.createElement(InternalKanbanBlockProvider, _objectSpread(_objectSpread({}, props), {}, {
+    params: params
+  })));
 };
 
 exports.KanbanBlockProvider = KanbanBlockProvider;

package/lib/block-provider/TableFieldProvider.js

@@ -13,6 +13,10 @@ var _react2 = _interopRequireWildcard(require("react"));
 
 var _BlockProvider = require("./BlockProvider");
 
+var _FormBlockProvider = require("./FormBlockProvider");
+
+var _FormFieldProvider = require("./FormFieldProvider");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -37,15 +41,28 @@ var TableFieldContext = /*#__PURE__*/(0, _react2.createContext)({});
 exports.TableFieldContext = TableFieldContext;
 
 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 = (0, _react.useField)();
 
   var _useBlockRequestConte = (0, _BlockProvider.useBlockRequestContext)(),
       resource = _useBlockRequestConte.resource,
-      service = _useBlockRequestConte.service; // if (service.loading) {
+      service = _useBlockRequestConte.service;
+
+  var formBlockCtx = (0, _FormBlockProvider.useFormBlockContext)();
+  var formFieldCtx = (0, _FormFieldProvider.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/lib/block-provider/TableSelectorProvider.js

@@ -13,8 +13,12 @@ var _react2 = _interopRequireWildcard(require("react"));
 
 var _collectionManager = require("../collection-manager");
 
+var _recordProvider = require("../record-provider");
+
 var _BlockProvider = require("./BlockProvider");
 
+var _FormBlockProvider = require("./FormBlockProvider");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -69,7 +73,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;
+};
+
 var TableSelectorProvider = function TableSelectorProvider(props) {
+  var fieldSchema = (0, _react.useFieldSchema)();
+  var ctx = (0, _FormBlockProvider.useFormBlockContext)();
+
+  var _useCollectionManager2 = (0, _collectionManager.useCollectionManager)(),
+      getCollectionJoinField = _useCollectionManager2.getCollectionJoinField;
+
+  var record = (0, _recordProvider.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);
@@ -82,6 +102,20 @@ 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__*/_react2.default.createElement(_BlockProvider.BlockProvider, _objectSpread(_objectSpread({}, props), {}, {
     params: params
   }), /*#__PURE__*/_react2.default.createElement(InternalTableSelectorProvider, _objectSpread(_objectSpread({}, props), {}, {
@@ -132,14 +166,14 @@ 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'],
@@ -157,11 +191,11 @@ 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/lib/block-provider/hooks/index.js

@@ -17,6 +17,8 @@ var _reactI18next = require("react-i18next");
 
 var _reactRouterDom = require("react-router-dom");
 
+var _2 = require("../..");
+
 var _apiClient = require("../../api-client");
 
 var _collectionManager = require("../../collection-manager");
@@ -88,7 +90,7 @@ var filterValue = function filterValue(value) {
 
   if (Array.isArray(value)) {
     return value.map(function (v) {
-      return filterValue(value);
+      return filterValue(v);
     });
   }
 
@@ -121,7 +123,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;
         }
@@ -590,6 +592,7 @@ var useUpdateActionProps = function useUpdateActionProps() {
 
   var actionSchema = (0, _react.useFieldSchema)();
   var history = (0, _reactRouterDom.useHistory)();
+  var record = (0, _recordProvider.useRecord)();
 
   var _useCollection3 = (0, _collectionManager.useCollection)(),
       fields = _useCollection3.fields,
@@ -597,6 +600,10 @@ var useUpdateActionProps = function useUpdateActionProps() {
 
   var compile = (0, _schemaComponent.useCompile)();
   var actionField = (0, _react.useField)();
+
+  var _useFormBlockContext = (0, _2.useFormBlockContext)(),
+      updateAssociationValues = _useFormBlockContext.updateAssociationValues;
+
   return {
     onClick: function onClick() {
       return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee8() {
@@ -629,7 +636,8 @@ 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/lib/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/lib/block-provider/index.js

@@ -106,4 +106,17 @@ Object.keys(_TableSelectorProvider).forEach(function (key) {
       return _TableSelectorProvider[key];
     }
   });
+});
+
+var _FormFieldProvider = require("./FormFieldProvider");
+
+Object.keys(_FormFieldProvider).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _FormFieldProvider[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _FormFieldProvider[key];
+    }
+  });
 });

package/lib/collection-manager/CollectionField.js

@@ -106,9 +106,13 @@ var InternalField = function InternalField(props) {
 };
 
 var CollectionField = (0, _react.connect)(function (props) {
+  var _fieldSchema$xCompon;
+
   var fieldSchema = (0, _react.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__*/_react2.default.createElement(_CollectionFieldProvider.CollectionFieldProvider, {
-    name: fieldSchema.name
+    name: fieldSchema.name,
+    field: field
   }, /*#__PURE__*/_react2.default.createElement(InternalField, _objectSpread({}, props)));
 });
 exports.CollectionField = CollectionField;

package/lib/collection-manager/CollectionFieldProvider.js

@@ -5,7 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.CollectionFieldProvider = void 0;
 
-var _react = _interopRequireDefault(require("react"));
+var _react = require("@formily/react");
+
+var _react2 = _interopRequireDefault(require("react"));
 
 var _context = require("./context");
 
@@ -17,17 +19,21 @@ var CollectionFieldProvider = function CollectionFieldProvider(props) {
   var name = props.name,
       field = props.field,
       children = props.children;
+  var fieldSchema = (0, _react.useFieldSchema)();
 
   var _useCollection = (0, _hooks.useCollection)(),
       getField = _useCollection.getField;
 
-  var value = field || getField((field === null || field === void 0 ? void 0 : field.name) || name);
+  var _useCollectionManager = (0, _hooks.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;
   }
 
-  return /*#__PURE__*/_react.default.createElement(_context.CollectionFieldContext.Provider, {
+  return /*#__PURE__*/_react2.default.createElement(_context.CollectionFieldContext.Provider, {
     value: value
   }, children);
 };

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

@@ -92,7 +92,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/lib/collection-manager/Configuration/EditFieldAction.js

@@ -83,7 +83,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/lib/collection-manager/hooks/useCollectionManager.js

@@ -88,6 +88,10 @@ 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],
@@ -98,11 +102,22 @@ 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] ? (0, _shared.clone)(interfaces[name]) : null;

package/lib/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';