@nocobase/client 0.9.3-alpha.1 → 0.9.4-alpha.2

package/lib/schema-component/antd/association-field/AssociationFieldProvider.js

@@ -4,25 +4,79 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.AssociationFieldProvider = AssociationFieldProvider;
+exports.AssociationFieldProvider = void 0;
 var _react = require("@formily/react");
 var _react2 = _interopRequireWildcard(require("react"));
 var _collectionManager = require("../../../collection-manager");
 var _context = require("./context");
 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 AssociationFieldProvider(props) {
+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 = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+var AssociationFieldProvider = (0, _react.observer)(function (props) {
+  var _fieldSchema$xCompon, _fieldSchema$xCompon2, _fieldSchema$xCompon4;
   var field = (0, _react.useField)();
   var _useCollectionManager = (0, _collectionManager.useCollectionManager)(),
-    getCollectionField = _useCollectionManager.getCollectionField;
+    getCollectionJoinField = _useCollectionManager.getCollectionJoinField,
+    getCollection = _useCollectionManager.getCollection;
   var fieldSchema = (0, _react.useFieldSchema)();
+  var allowMultiple = ((_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : _fieldSchema$xCompon.multiple) !== false;
+  var allowDissociate = ((_fieldSchema$xCompon2 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon2 === void 0 ? void 0 : _fieldSchema$xCompon2.allowDissociate) !== false;
   var collectionField = (0, _react2.useMemo)(function () {
-    return getCollectionField(fieldSchema['x-collection-field']);
+    return getCollectionJoinField(fieldSchema['x-collection-field']);
+  }, [fieldSchema['x-collection-field'], fieldSchema.name]);
+  var isFileCollection = (0, _react2.useMemo)(function () {
+    var _getCollection;
+    return ((_getCollection = getCollection(collectionField === null || collectionField === void 0 ? void 0 : collectionField.target)) === null || _getCollection === void 0 ? void 0 : _getCollection.template) === 'file';
   }, [fieldSchema['x-collection-field']]);
-  return /*#__PURE__*/_react2.default.createElement(_context.AssociationFieldContext.Provider, {
+  var currentMode = (0, _react2.useMemo)(function () {
+    var _fieldSchema$xCompon3;
+    return ((_fieldSchema$xCompon3 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon3 === void 0 ? void 0 : _fieldSchema$xCompon3.mode) || (isFileCollection ? 'FileManager' : 'Select');
+  }, [(_fieldSchema$xCompon4 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon4 === void 0 ? void 0 : _fieldSchema$xCompon4.mode]);
+  var _useState = (0, _react2.useState)(true),
+    _useState2 = _slicedToArray(_useState, 2),
+    loading = _useState2[0],
+    setLoading = _useState2[1];
+  (0, _react2.useEffect)(function () {
+    setLoading(true);
+    if (!collectionField) {
+      setLoading(false);
+      return;
+    }
+    if (field.value !== null && field.value !== undefined) {
+      // Nester 子表单时，如果没数据初始化一个 [null] 的占位
+      if (currentMode === 'Nester' && Array.isArray(field.value)) {
+        if (field.value.length === 0 && ['belongsToMany', 'hasMany'].includes(collectionField.type)) {
+          field.value = [null];
+        }
+      }
+      setLoading(false);
+      return;
+    }
+    if (currentMode === 'Nester') {
+      if (['belongsTo', 'hasOne'].includes(collectionField.type)) {
+        field.value = {};
+      } else if (['belongsToMany', 'hasMany'].includes(collectionField.type)) {
+        field.value = [null];
+      }
+    }
+    setLoading(false);
+  }, [currentMode, collectionField, field.value]);
+  if (loading) {
+    return null;
+  }
+  return collectionField ? /*#__PURE__*/_react2.default.createElement(_context.AssociationFieldContext.Provider, {
     value: {
       options: collectionField,
-      field: field
+      field: field,
+      allowMultiple: allowMultiple,
+      allowDissociate: allowDissociate,
+      currentMode: currentMode
     }
-  }, props.children);
-}
+  }, props.children) : null;
+});
+exports.AssociationFieldProvider = AssociationFieldProvider;

package/lib/schema-component/antd/association-field/AssociationSelect.js

@@ -7,67 +7,25 @@ exports.AssociationSelectReadPretty = exports.AssociationSelect = void 0;
 var _icons = require("@ant-design/icons");
 var _react = require("@formily/react");
 var _antd = require("antd");
-var _react2 = _interopRequireWildcard(require("react"));
-var _reactI18next = require("react-i18next");
-var _collectionManager = require("../../../collection-manager");
-var _hooks = require("../../hooks");
-var _action = require("../action");
+var _react2 = _interopRequireDefault(require("react"));
 var _remoteSelect = require("../remote-select");
-var _hooks2 = _interopRequireWildcard(require("./hooks"));
-var _schema = _interopRequireDefault(require("./schema"));
+var _hooks = _interopRequireDefault(require("./hooks"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-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 _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-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 = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var InternalAssociationSelect = (0, _react.observer)(function (props) {
   var fieldNames = props.fieldNames,
     _props$objectValue = props.objectValue,
     objectValue = _props$objectValue === void 0 ? true : _props$objectValue;
   var field = (0, _react.useField)();
-  var _useState = (0, _react2.useState)(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    visibleAddNewer = _useState2[0],
-    setVisibleAddNewer = _useState2[1];
-  var _useCollection = (0, _collectionManager.useCollection)(),
-    getField = _useCollection.getField;
-  var collectionField = getField(field.props.name);
-  var service = (0, _hooks2.default)(props);
   var fieldSchema = (0, _react.useFieldSchema)();
-  var isFilterForm = fieldSchema['x-designer'] === 'FormItem.FilterFormDesigner';
+  var service = (0, _hooks.default)(props);
   var isAllowAddNew = fieldSchema['x-add-new'];
-  var insertAddNewer = (0, _hooks2.useInsertSchema)('AddNewer');
-  var _useTranslation = (0, _reactI18next.useTranslation)(),
-    t = _useTranslation.t;
-  var normalizeValues = (0, _react2.useCallback)(function (obj) {
-    if (!objectValue && _typeof(obj) === 'object') {
-      return obj[fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value];
-    }
-    return obj;
-  }, [objectValue, fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value]);
-  var value = (0, _react2.useMemo)(function () {
-    if (props.value === undefined || props.value === null || !Object.keys(props.value).length) {
-      return;
-    }
-    if (Array.isArray(props.value)) {
-      return props.value;
-    } else {
-      return props.value;
-    }
-  }, [props.value, normalizeValues]);
-  (0, _react2.useEffect)(function () {
-    field.value = value;
-  }, []);
+  var value = Array.isArray(props.value) ? props.value.filter(Boolean) : props.value;
   return /*#__PURE__*/_react2.default.createElement("div", {
     key: fieldSchema.name
   }, /*#__PURE__*/_react2.default.createElement(_antd.Input.Group, {
@@ -83,35 +41,20 @@ var InternalAssociationSelect = (0, _react.observer)(function (props) {
     objectValue: objectValue,
     value: value,
     service: service
-  })), isAllowAddNew && !field.readPretty && !isFilterForm && /*#__PURE__*/_react2.default.createElement(_antd.Button, {
-    type: 'default',
-    onClick: function onClick() {
-      insertAddNewer(_schema.default.AddNewer);
-      setVisibleAddNewer(true);
-    }
-  }, t('Add new'))), /*#__PURE__*/_react2.default.createElement(_action.ActionContext.Provider, {
-    value: {
-      openMode: 'drawer',
-      visible: visibleAddNewer,
-      setVisible: setVisibleAddNewer
-    }
-  }, /*#__PURE__*/_react2.default.createElement(_collectionManager.CollectionProvider, {
-    name: collectionField.target
-  }, /*#__PURE__*/_react2.default.createElement(_react.RecursionField, {
+  })), isAllowAddNew && /*#__PURE__*/_react2.default.createElement(_react.RecursionField, {
     onlyRenderProperties: true,
     basePath: field.address,
     schema: fieldSchema,
     filterProperties: function filterProperties(s) {
-      return s['x-component'] === 'AssociationField.AddNewer';
+      return s['x-component'] === 'Action';
     }
-  }))));
+  })));
 });
 var AssociationSelect = InternalAssociationSelect;
 exports.AssociationSelect = AssociationSelect;
 var AssociationSelectReadPretty = (0, _react.connect)(function (props) {
+  var service = (0, _hooks.default)(props);
   if (props.fieldNames) {
-    var service = (0, _hooks2.default)(props);
-    (0, _hooks.useFieldTitle)();
     return /*#__PURE__*/_react2.default.createElement(_remoteSelect.RemoteSelect.ReadPretty, _objectSpread(_objectSpread({}, props), {}, {
       service: service
     }));

package/lib/schema-component/antd/association-field/Editable.d.ts

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

package/lib/schema-component/antd/association-field/Editable.js

@@ -6,18 +6,18 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Editable = void 0;
 var _react = require("@formily/react");
-var _react2 = _interopRequireWildcard(require("react"));
+var _react2 = _interopRequireDefault(require("react"));
+var _ = require("../../");
+var _hooks = require("../../../block-provider/hooks");
 var _AssociationFieldProvider = require("./AssociationFieldProvider");
+var _AssociationSelect = require("./AssociationSelect");
+var _FileManager = require("./FileManager");
 var _InternalNester = require("./InternalNester");
 var _InternalPicker = require("./InternalPicker");
-var _AssociationSelect = require("./AssociationSelect");
-var _hooks = require("../../../block-provider/hooks");
-var _collectionManager = require("../../../collection-manager");
-var _ = require("../../");
 var _InternalSubTable = require("./InternalSubTable");
-var _FileManager = require("./FileManager");
-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; }
+var _CreateRecordAction = require("./components/CreateRecordAction");
+var _hooks2 = require("./hooks");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 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; }
@@ -26,31 +26,14 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 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); }); }; }
-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 = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-var Editable = (0, _react.observer)(function (props) {
-  var _getCollection;
-  (0, _react2.useEffect)(function () {
-    props.mode && setCurrentMode(props.mode);
-  }, [props.mode]);
+var EditableAssociationField = (0, _react.observer)(function (props) {
   var multiple = props.multiple;
   var field = (0, _react.useField)();
   var form = (0, _react.useForm)();
   var fieldSchema = (0, _react.useFieldSchema)();
-  var _useCollection = (0, _collectionManager.useCollection)(),
-    getField = _useCollection.getField;
-  var _useCollectionManager = (0, _collectionManager.useCollectionManager)(),
-    getCollection = _useCollectionManager.getCollection;
-  var collectionField = getField(field.props.name);
-  var isFileCollection = ((_getCollection = getCollection(collectionField === null || collectionField === void 0 ? void 0 : collectionField.target)) === null || _getCollection === void 0 ? void 0 : _getCollection.template) === 'file';
-  var _useState = (0, _react2.useState)(props.mode || (isFileCollection ? 'FileManager' : 'Select')),
-    _useState2 = _slicedToArray(_useState, 2),
-    currentMode = _useState2[0],
-    setCurrentMode = _useState2[1];
+  var _useAssociationFieldC = (0, _hooks2.useAssociationFieldContext)(),
+    collectionField = _useAssociationFieldC.options,
+    currentMode = _useAssociationFieldC.currentMode;
   var useCreateActionProps = function useCreateActionProps() {
     var _useCAP = (0, _hooks.useAssociationCreateActionProps)(),
       _onClick = _useCAP.onClick;
@@ -67,17 +50,19 @@ var Editable = (0, _react.observer)(function (props) {
                 return _onClick();
               case 2:
                 _ref = ((_actionField$data = actionField.data) === null || _actionField$data === void 0 ? void 0 : (_actionField$data$dat = _actionField$data.data) === null || _actionField$data$dat === void 0 ? void 0 : _actionField$data$dat.data) || {}, data = _ref.data;
-                if (['m2m', 'o2m'].includes(collectionField.interface) && multiple !== false) {
-                  values = JSON.parse(JSON.stringify(form.values[fieldSchema.name] || []));
-                  values.push(_objectSpread({}, data));
-                  setTimeout(function () {
-                    form.setValuesIn(field.props.name, values);
-                  }, 100);
-                } else {
-                  value = _objectSpread({}, data);
-                  setTimeout(function () {
-                    form.setValuesIn(field.props.name, value);
-                  }, 100);
+                if (data) {
+                  if (['m2m', 'o2m'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) && multiple !== false) {
+                    values = JSON.parse(JSON.stringify(form.values[fieldSchema.name] || []));
+                    values.push(_objectSpread({}, data));
+                    setTimeout(function () {
+                      form.setValuesIn(field.props.name, values);
+                    }, 100);
+                  } else {
+                    value = _objectSpread({}, data);
+                    setTimeout(function () {
+                      form.setValuesIn(field.props.name, value);
+                    }, 100);
+                  }
                 }
               case 4:
               case "end":
@@ -88,10 +73,16 @@ var Editable = (0, _react.observer)(function (props) {
       }
     };
   };
-  return /*#__PURE__*/_react2.default.createElement(_AssociationFieldProvider.AssociationFieldProvider, null, /*#__PURE__*/_react2.default.createElement(_.SchemaComponentOptions, {
+  return /*#__PURE__*/_react2.default.createElement(_.SchemaComponentOptions, {
     scope: {
       useCreateActionProps: useCreateActionProps
+    },
+    components: {
+      CreateRecordAction: _CreateRecordAction.CreateRecordAction
     }
-  }, currentMode === 'Picker' && /*#__PURE__*/_react2.default.createElement(_InternalPicker.InternalPicker, _objectSpread({}, props)), currentMode === 'Nester' && /*#__PURE__*/_react2.default.createElement(_InternalNester.InternalNester, _objectSpread({}, props)), currentMode === 'Select' && /*#__PURE__*/_react2.default.createElement(_AssociationSelect.AssociationSelect, _objectSpread({}, props)), currentMode === 'SubTable' && /*#__PURE__*/_react2.default.createElement(_InternalSubTable.InternalSubTable, _objectSpread({}, props)), currentMode === 'FileManager' && /*#__PURE__*/_react2.default.createElement(_FileManager.InternalFileManager, _objectSpread({}, props))));
+  }, currentMode === 'Picker' && /*#__PURE__*/_react2.default.createElement(_InternalPicker.InternalPicker, _objectSpread({}, props)), currentMode === 'Nester' && /*#__PURE__*/_react2.default.createElement(_InternalNester.InternalNester, _objectSpread({}, props)), currentMode === 'Select' && /*#__PURE__*/_react2.default.createElement(_AssociationSelect.AssociationSelect, _objectSpread({}, props)), currentMode === 'SubTable' && /*#__PURE__*/_react2.default.createElement(_InternalSubTable.InternalSubTable, _objectSpread({}, props)), currentMode === 'FileManager' && /*#__PURE__*/_react2.default.createElement(_FileManager.InternalFileManager, _objectSpread({}, props)));
+});
+var Editable = (0, _react.observer)(function (props) {
+  return /*#__PURE__*/_react2.default.createElement(_AssociationFieldProvider.AssociationFieldProvider, null, /*#__PURE__*/_react2.default.createElement(EditableAssociationField, _objectSpread({}, props)));
 });
 exports.Editable = Editable;

package/lib/schema-component/antd/association-field/InternalNester.js

@@ -19,12 +19,12 @@ var InternalNester = function InternalNester() {
   var fieldSchema = (0, _react.useFieldSchema)();
   var insertNester = (0, _hooks.useInsertSchema)('Nester');
   var _useAssociationFieldC = (0, _hooks.useAssociationFieldContext)(),
-    options = _useAssociationFieldC.options;
+    collectionField = _useAssociationFieldC.options;
   (0, _react2.useEffect)(function () {
     insertNester(_schema.default.Nester);
   }, []);
   return /*#__PURE__*/_react2.default.createElement(_collectionManager.CollectionProvider, {
-    name: options.target
+    name: collectionField.target
   }, /*#__PURE__*/_react2.default.createElement(_antd.FormLayout, {
     layout: 'vertical'
   }, /*#__PURE__*/_react2.default.createElement(_react.RecursionField, {

package/lib/schema-component/antd/association-field/InternalPicker.js

@@ -9,7 +9,6 @@ var _react = require("@formily/react");
 var _antd = require("antd");
 var _lodash = require("lodash");
 var _react2 = _interopRequireWildcard(require("react"));
-var _reactI18next = require("react-i18next");
 var _ = require("../..");
 var _TableSelectorProvider = require("../../../block-provider/TableSelectorProvider");
 var _collectionManager = require("../../../collection-manager");
@@ -96,35 +95,29 @@ var InternalPicker = (0, _react.observer)(function (props) {
   var fieldNames = (0, _hooks2.useFieldNames)(props);
   var _useState = (0, _react2.useState)(false),
     _useState2 = _slicedToArray(_useState, 2),
-    visibleAddNewer = _useState2[0],
-    setVisibleAddNewer = _useState2[1];
-  var _useState3 = (0, _react2.useState)(false),
-    _useState4 = _slicedToArray(_useState3, 2),
-    visibleSelector = _useState4[0],
-    setVisibleSelector = _useState4[1];
+    visibleSelector = _useState2[0],
+    setVisibleSelector = _useState2[1];
   var fieldSchema = (0, _react.useFieldSchema)();
-  var insertAddNewer = (0, _hooks2.useInsertSchema)('AddNewer');
   var insertSelector = (0, _hooks2.useInsertSchema)('Selector');
-  var _useCollection = (0, _collectionManager.useCollection)(),
-    getField = _useCollection.getField;
-  var _useTranslation = (0, _reactI18next.useTranslation)(),
-    t = _useTranslation.t;
-  var collectionField = getField(field.props.name);
-  var addbuttonClick = function addbuttonClick() {
-    insertAddNewer(_schema.default.AddNewer);
-    setVisibleAddNewer(true);
-  };
+  var _useAssociationFieldC = (0, _hooks2.useAssociationFieldContext)(),
+    collectionField = _useAssociationFieldC.options;
   var compile = (0, _hooks.useCompile)();
   var labelUiSchema = (0, _util.useLabelUiSchema)(collectionField, (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.label) || 'label');
   var isAllowAddNew = fieldSchema['x-add-new'];
-  var _useState5 = (0, _react2.useState)([]),
-    _useState6 = _slicedToArray(_useState5, 2),
-    selectedRows = _useState6[0],
-    setSelectedRows = _useState6[1];
-  var _useState7 = (0, _react2.useState)([]),
-    _useState8 = _slicedToArray(_useState7, 2),
-    options = _useState8[0],
-    setOptions = _useState8[1];
+  var _useState3 = (0, _react2.useState)([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    selectedRows = _useState4[0],
+    setSelectedRows = _useState4[1];
+  var options = (0, _react2.useMemo)(function () {
+    if (value && Object.keys(value).length > 0) {
+      var opts = (Array.isArray(value) ? value : value ? [value] : []).filter(Boolean).map(function (option) {
+        var label = option === null || option === void 0 ? void 0 : option[fieldNames.label];
+        return _objectSpread(_objectSpread({}, option), {}, _defineProperty({}, fieldNames.label, (0, _util.getLabelFormatValue)(compile(labelUiSchema), compile(label))));
+      });
+      return opts;
+    }
+    return [];
+  }, [value, fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.label]);
   var pickerProps = {
     size: 'small',
     fieldNames: fieldNames,
@@ -138,19 +131,11 @@ var InternalPicker = (0, _react.observer)(function (props) {
     setSelectedRows: setSelectedRows,
     collectionField: collectionField
   };
-  (0, _react2.useEffect)(function () {
-    if (value && Object.keys(value).length > 0) {
-      var opts = (Array.isArray(value) ? value : value ? [value] : []).map(function (option) {
-        var label = option[fieldNames.label];
-        return _objectSpread(_objectSpread({}, option), {}, _defineProperty({}, fieldNames.label, (0, _util.getLabelFormatValue)(compile(labelUiSchema), compile(label))));
-      });
-      setOptions(opts);
-    }
-  }, [value, fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.label]);
   var getValue = function getValue() {
+    var _value$filter;
     if (multiple == null) return null;
-    return Array.isArray(value) ? value === null || value === void 0 ? void 0 : value.map(function (v) {
-      return v[fieldNames.value];
+    return Array.isArray(value) ? (_value$filter = value.filter(Boolean)) === null || _value$filter === void 0 ? void 0 : _value$filter.map(function (v) {
+      return v === null || v === void 0 ? void 0 : v[fieldNames.value];
     }) : value === null || value === void 0 ? void 0 : value[fieldNames.value];
   };
   var getFilter = function getFilter() {
@@ -225,37 +210,21 @@ var InternalPicker = (0, _react.observer)(function (props) {
     options: options,
     value: getValue(),
     open: false
-  }))), isAllowAddNew && /*#__PURE__*/_react2.default.createElement(_antd.Button, {
-    style: {
-      width: 'auto'
-    },
-    type: 'default',
-    onClick: function onClick() {
-      addbuttonClick();
-    }
-  }, t('Add new'))), /*#__PURE__*/_react2.default.createElement(_action.ActionContext.Provider, {
-    value: {
-      openMode: 'drawer',
-      visible: visibleAddNewer,
-      setVisible: setVisibleAddNewer
-    }
-  }, /*#__PURE__*/_react2.default.createElement(_collectionManager.CollectionProvider, {
-    name: collectionField.target
-  }, /*#__PURE__*/_react2.default.createElement(_react.RecursionField, {
+  }))), isAllowAddNew && /*#__PURE__*/_react2.default.createElement(_react.RecursionField, {
     onlyRenderProperties: true,
     basePath: field.address,
     schema: fieldSchema,
     filterProperties: function filterProperties(s) {
-      return s['x-component'] === 'AssociationField.AddNewer';
+      return s['x-component'] === 'Action';
     }
-  }))), /*#__PURE__*/_react2.default.createElement(_action.ActionContext.Provider, {
+  })), /*#__PURE__*/_react2.default.createElement(_action.ActionContext.Provider, {
     value: {
       openMode: 'drawer',
       visible: visibleSelector,
       setVisible: setVisibleSelector
     }
   }, /*#__PURE__*/_react2.default.createElement(_.RecordPickerProvider, _objectSpread({}, pickerProps), /*#__PURE__*/_react2.default.createElement(_collectionManager.CollectionProvider, {
-    name: collectionField.target
+    name: collectionField === null || collectionField === void 0 ? void 0 : collectionField.target
   }, /*#__PURE__*/_react2.default.createElement(_.FormProvider, null, /*#__PURE__*/_react2.default.createElement(_TableSelectorProvider.TableSelectorParamsProvider, {
     params: {
       filter: getFilter()

package/lib/schema-component/antd/association-field/InternalViewer.js

@@ -38,8 +38,6 @@ var ReadPrettyInternalViewer = (0, _react.observer)(function (props) {
   var fieldSchema = (0, _react.useFieldSchema)();
   var recordCtx = (0, _recordProvider.useRecord)();
   var enableLink = fieldSchema['x-component-props'].enableLink;
-  var _useCollectionManager = (0, _collectionManager.useCollectionManager)(),
-    getCollectionJoinField = _useCollectionManager.getCollectionJoinField;
   // value 做了转换，但 props.value 和原来 useField().value 的值不一致
   var field = (0, _react.useField)();
   var fieldNames = (0, _hooks2.useFieldNames)(props);
@@ -48,9 +46,8 @@ var ReadPrettyInternalViewer = (0, _react.observer)(function (props) {
     visible = _useState2[0],
     setVisible = _useState2[1];
   var insertViewer = (0, _hooks2.useInsertSchema)('Viewer');
-  var _useCollection = (0, _collectionManager.useCollection)(),
-    getField = _useCollection.getField;
-  var collectionField = getField(fieldSchema.name) || getCollectionJoinField(fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-collection-field']);
+  var _useAssociationFieldC = (0, _hooks2.useAssociationFieldContext)(),
+    collectionField = _useAssociationFieldC.options;
   var _useState3 = (0, _react2.useState)({}),
     _useState4 = _slicedToArray(_useState3, 2),
     record = _useState4[0],
@@ -107,10 +104,10 @@ var ReadPrettyInternalViewer = (0, _react.observer)(function (props) {
       record: record
     }, renderWithoutTableFieldResourceProvider());
   };
-  return collectionField ? /*#__PURE__*/_react2.default.createElement("div", null, /*#__PURE__*/_react2.default.createElement(_blockProvider.BlockAssociationContext.Provider, {
-    value: "".concat(collectionField.collectionName, ".").concat(collectionField.name)
+  return /*#__PURE__*/_react2.default.createElement("div", null, /*#__PURE__*/_react2.default.createElement(_blockProvider.BlockAssociationContext.Provider, {
+    value: "".concat(collectionField === null || collectionField === void 0 ? void 0 : collectionField.collectionName, ".").concat(collectionField === null || collectionField === void 0 ? void 0 : collectionField.name)
   }, /*#__PURE__*/_react2.default.createElement(_collectionManager.CollectionProvider, {
-    name: (_collectionField$targ = collectionField.target) !== null && _collectionField$targ !== void 0 ? _collectionField$targ : collectionField.targetCollection
+    name: (_collectionField$targ = collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) !== null && _collectionField$targ !== void 0 ? _collectionField$targ : collectionField === null || collectionField === void 0 ? void 0 : collectionField.targetCollection
   }, /*#__PURE__*/_react2.default.createElement(_EllipsisWithTooltip.EllipsisWithTooltip, {
     ellipsis: true,
     ref: ellipsisWithTooltipRef
@@ -119,8 +116,8 @@ var ReadPrettyInternalViewer = (0, _react.observer)(function (props) {
       visible: visible,
       setVisible: setVisible,
       openMode: 'drawer',
-      snapshot: collectionField.interface === 'snapshot'
+      snapshot: (collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) === 'snapshot'
     }
-  }, renderRecordProvider())))) : null;
+  }, renderRecordProvider()))));
 });
 exports.ReadPrettyInternalViewer = ReadPrettyInternalViewer;