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

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

@@ -1,19 +1,72 @@
-import { useField, useFieldSchema } from '@formily/react';
-import React, { useMemo } from 'react';
+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; }
+import { observer, useField, useFieldSchema } from '@formily/react';
+import React, { useEffect, useMemo, useState } from 'react';
 import { useCollectionManager } from '../../../collection-manager';
 import { AssociationFieldContext } from './context';
-export function AssociationFieldProvider(props) {
+export var AssociationFieldProvider = observer(function (props) {
+  var _fieldSchema$xCompon, _fieldSchema$xCompon2, _fieldSchema$xCompon4;
   var field = useField();
   var _useCollectionManager = useCollectionManager(),
-    getCollectionField = _useCollectionManager.getCollectionField;
+    getCollectionJoinField = _useCollectionManager.getCollectionJoinField,
+    getCollection = _useCollectionManager.getCollection;
   var fieldSchema = 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 = useMemo(function () {
-    return getCollectionField(fieldSchema['x-collection-field']);
+    return getCollectionJoinField(fieldSchema['x-collection-field']);
+  }, [fieldSchema['x-collection-field'], fieldSchema.name]);
+  var isFileCollection = 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__*/React.createElement(AssociationFieldContext.Provider, {
+  var currentMode = 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 = useState(true),
+    _useState2 = _slicedToArray(_useState, 2),
+    loading = _useState2[0],
+    setLoading = _useState2[1];
+  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__*/React.createElement(AssociationFieldContext.Provider, {
     value: {
       options: collectionField,
-      field: field
+      field: field,
+      allowMultiple: allowMultiple,
+      allowDissociate: allowDissociate,
+      currentMode: currentMode
     }
-  }, props.children);
-}
+  }, props.children) : null;
+});

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

@@ -1,64 +1,24 @@
+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; }
 import { LoadingOutlined } from '@ant-design/icons';
 import { RecursionField, connect, mapProps, observer, useField, useFieldSchema } from '@formily/react';
-import { Button, Input } from 'antd';
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { CollectionProvider, useCollection } from '../../../collection-manager';
-import { useFieldTitle } from '../../hooks';
-import { ActionContext } from '../action';
+import { Input } from 'antd';
+import React from 'react';
 import { RemoteSelect } from '../remote-select';
-import useServiceOptions, { useInsertSchema } from './hooks';
-import schema from './schema';
+import useServiceOptions from './hooks';
 var InternalAssociationSelect = observer(function (props) {
   var fieldNames = props.fieldNames,
     _props$objectValue = props.objectValue,
     objectValue = _props$objectValue === void 0 ? true : _props$objectValue;
   var field = useField();
-  var _useState = useState(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    visibleAddNewer = _useState2[0],
-    setVisibleAddNewer = _useState2[1];
-  var _useCollection = useCollection(),
-    getField = _useCollection.getField;
-  var collectionField = getField(field.props.name);
-  var service = useServiceOptions(props);
   var fieldSchema = useFieldSchema();
-  var isFilterForm = fieldSchema['x-designer'] === 'FormItem.FilterFormDesigner';
+  var service = useServiceOptions(props);
   var isAllowAddNew = fieldSchema['x-add-new'];
-  var insertAddNewer = useInsertSchema('AddNewer');
-  var _useTranslation = useTranslation(),
-    t = _useTranslation.t;
-  var normalizeValues = 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 = 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]);
-  useEffect(function () {
-    field.value = value;
-  }, []);
+  var value = Array.isArray(props.value) ? props.value.filter(Boolean) : props.value;
   return /*#__PURE__*/React.createElement("div", {
     key: fieldSchema.name
   }, /*#__PURE__*/React.createElement(Input.Group, {
@@ -74,34 +34,19 @@ var InternalAssociationSelect = observer(function (props) {
     objectValue: objectValue,
     value: value,
     service: service
-  })), isAllowAddNew && !field.readPretty && !isFilterForm && /*#__PURE__*/React.createElement(Button, {
-    type: 'default',
-    onClick: function onClick() {
-      insertAddNewer(schema.AddNewer);
-      setVisibleAddNewer(true);
-    }
-  }, t('Add new'))), /*#__PURE__*/React.createElement(ActionContext.Provider, {
-    value: {
-      openMode: 'drawer',
-      visible: visibleAddNewer,
-      setVisible: setVisibleAddNewer
-    }
-  }, /*#__PURE__*/React.createElement(CollectionProvider, {
-    name: collectionField.target
-  }, /*#__PURE__*/React.createElement(RecursionField, {
+  })), isAllowAddNew && /*#__PURE__*/React.createElement(RecursionField, {
     onlyRenderProperties: true,
     basePath: field.address,
     schema: fieldSchema,
     filterProperties: function filterProperties(s) {
-      return s['x-component'] === 'AssociationField.AddNewer';
+      return s['x-component'] === 'Action';
     }
-  }))));
+  })));
 });
 export var AssociationSelect = InternalAssociationSelect;
 export var AssociationSelectReadPretty = connect(function (props) {
+  var service = useServiceOptions(props);
   if (props.fieldNames) {
-    var service = useServiceOptions(props);
-    useFieldTitle();
     return /*#__PURE__*/React.createElement(RemoteSelect.ReadPretty, _objectSpread(_objectSpread({}, props), {}, {
       service: service
     }));

package/es/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/es/schema-component/antd/association-field/Editable.js

@@ -7,42 +7,26 @@ 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; }
 import { observer, useField, useFieldSchema, useForm } from '@formily/react';
-import React, { useEffect, useState } from 'react';
+import React from 'react';
+import { SchemaComponentOptions } from '../../';
+import { useAssociationCreateActionProps as useCAP } from '../../../block-provider/hooks';
 import { AssociationFieldProvider } from './AssociationFieldProvider';
+import { AssociationSelect } from './AssociationSelect';
+import { InternalFileManager } from './FileManager';
 import { InternalNester } from './InternalNester';
 import { InternalPicker } from './InternalPicker';
-import { AssociationSelect } from './AssociationSelect';
-import { useAssociationCreateActionProps as useCAP } from '../../../block-provider/hooks';
-import { useCollection, useCollectionManager } from '../../../collection-manager';
-import { SchemaComponentOptions } from '../../';
 import { InternalSubTable } from './InternalSubTable';
-import { InternalFileManager } from './FileManager';
-export var Editable = observer(function (props) {
-  var _getCollection;
-  useEffect(function () {
-    props.mode && setCurrentMode(props.mode);
-  }, [props.mode]);
+import { CreateRecordAction } from './components/CreateRecordAction';
+import { useAssociationFieldContext } from './hooks';
+var EditableAssociationField = observer(function (props) {
   var multiple = props.multiple;
   var field = useField();
   var form = useForm();
   var fieldSchema = useFieldSchema();
-  var _useCollection = useCollection(),
-    getField = _useCollection.getField;
-  var _useCollectionManager = 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 = useState(props.mode || (isFileCollection ? 'FileManager' : 'Select')),
-    _useState2 = _slicedToArray(_useState, 2),
-    currentMode = _useState2[0],
-    setCurrentMode = _useState2[1];
+  var _useAssociationFieldC = useAssociationFieldContext(),
+    collectionField = _useAssociationFieldC.options,
+    currentMode = _useAssociationFieldC.currentMode;
   var useCreateActionProps = function useCreateActionProps() {
     var _useCAP = useCAP(),
       _onClick = _useCAP.onClick;
@@ -59,17 +43,19 @@ export var Editable = 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":
@@ -80,9 +66,15 @@ export var Editable = observer(function (props) {
       }
     };
   };
-  return /*#__PURE__*/React.createElement(AssociationFieldProvider, null, /*#__PURE__*/React.createElement(SchemaComponentOptions, {
+  return /*#__PURE__*/React.createElement(SchemaComponentOptions, {
     scope: {
       useCreateActionProps: useCreateActionProps
+    },
+    components: {
+      CreateRecordAction: CreateRecordAction
     }
-  }, currentMode === 'Picker' && /*#__PURE__*/React.createElement(InternalPicker, _objectSpread({}, props)), currentMode === 'Nester' && /*#__PURE__*/React.createElement(InternalNester, _objectSpread({}, props)), currentMode === 'Select' && /*#__PURE__*/React.createElement(AssociationSelect, _objectSpread({}, props)), currentMode === 'SubTable' && /*#__PURE__*/React.createElement(InternalSubTable, _objectSpread({}, props)), currentMode === 'FileManager' && /*#__PURE__*/React.createElement(InternalFileManager, _objectSpread({}, props))));
+  }, currentMode === 'Picker' && /*#__PURE__*/React.createElement(InternalPicker, _objectSpread({}, props)), currentMode === 'Nester' && /*#__PURE__*/React.createElement(InternalNester, _objectSpread({}, props)), currentMode === 'Select' && /*#__PURE__*/React.createElement(AssociationSelect, _objectSpread({}, props)), currentMode === 'SubTable' && /*#__PURE__*/React.createElement(InternalSubTable, _objectSpread({}, props)), currentMode === 'FileManager' && /*#__PURE__*/React.createElement(InternalFileManager, _objectSpread({}, props)));
+});
+export var Editable = observer(function (props) {
+  return /*#__PURE__*/React.createElement(AssociationFieldProvider, null, /*#__PURE__*/React.createElement(EditableAssociationField, _objectSpread({}, props)));
 });

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

@@ -2,19 +2,20 @@ import { FormLayout } from '@formily/antd';
 import { RecursionField, useField, useFieldSchema } from '@formily/react';
 import React, { useEffect } from 'react';
 import { CollectionProvider } from '../../../collection-manager';
-import { useAssociationFieldContext, useInsertSchema } from './hooks';
+import { useInsertSchema } from './hooks';
+import { useAssociationFieldContext } from './hooks';
 import schema from './schema';
 export var InternalNester = function InternalNester() {
   var field = useField();
   var fieldSchema = useFieldSchema();
   var insertNester = useInsertSchema('Nester');
   var _useAssociationFieldC = useAssociationFieldContext(),
-    options = _useAssociationFieldC.options;
+    collectionField = _useAssociationFieldC.options;
   useEffect(function () {
     insertNester(schema.Nester);
   }, []);
   return /*#__PURE__*/React.createElement(CollectionProvider, {
-    name: options.target
+    name: collectionField.target
   }, /*#__PURE__*/React.createElement(FormLayout, {
     layout: 'vertical'
   }, /*#__PURE__*/React.createElement(RecursionField, {

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

@@ -15,16 +15,15 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import { RecursionField, observer, useField, useFieldSchema } from '@formily/react';
-import { Button, Input, Select } from 'antd';
+import { Input, Select } from 'antd';
 import { differenceBy, unionBy } from 'lodash';
-import React, { useContext, useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
+import React, { useContext, useMemo, useState } from 'react';
 import { FormProvider, RecordPickerContext, RecordPickerProvider, SchemaComponentOptions, useActionContext } from '../..';
 import { TableSelectorParamsProvider, useTableSelectorProps as useTsp } from '../../../block-provider/TableSelectorProvider';
-import { CollectionProvider, useCollection } from '../../../collection-manager';
+import { CollectionProvider } from '../../../collection-manager';
 import { useCompile } from '../../hooks';
 import { ActionContext } from '../action';
-import { useFieldNames, useInsertSchema } from './hooks';
+import { useAssociationFieldContext, useFieldNames, useInsertSchema } from './hooks';
 import schema from './schema';
 import { flatData, getLabelFormatValue, useLabelUiSchema } from './util';
 var useTableSelectorProps = function useTableSelectorProps() {
@@ -87,35 +86,29 @@ export var InternalPicker = observer(function (props) {
   var fieldNames = useFieldNames(props);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
-    visibleAddNewer = _useState2[0],
-    setVisibleAddNewer = _useState2[1];
-  var _useState3 = useState(false),
-    _useState4 = _slicedToArray(_useState3, 2),
-    visibleSelector = _useState4[0],
-    setVisibleSelector = _useState4[1];
+    visibleSelector = _useState2[0],
+    setVisibleSelector = _useState2[1];
   var fieldSchema = useFieldSchema();
-  var insertAddNewer = useInsertSchema('AddNewer');
   var insertSelector = useInsertSchema('Selector');
-  var _useCollection = useCollection(),
-    getField = _useCollection.getField;
-  var _useTranslation = useTranslation(),
-    t = _useTranslation.t;
-  var collectionField = getField(field.props.name);
-  var addbuttonClick = function addbuttonClick() {
-    insertAddNewer(schema.AddNewer);
-    setVisibleAddNewer(true);
-  };
+  var _useAssociationFieldC = useAssociationFieldContext(),
+    collectionField = _useAssociationFieldC.options;
   var compile = useCompile();
   var labelUiSchema = useLabelUiSchema(collectionField, (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.label) || 'label');
   var isAllowAddNew = fieldSchema['x-add-new'];
-  var _useState5 = useState([]),
-    _useState6 = _slicedToArray(_useState5, 2),
-    selectedRows = _useState6[0],
-    setSelectedRows = _useState6[1];
-  var _useState7 = useState([]),
-    _useState8 = _slicedToArray(_useState7, 2),
-    options = _useState8[0],
-    setOptions = _useState8[1];
+  var _useState3 = useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    selectedRows = _useState4[0],
+    setSelectedRows = _useState4[1];
+  var options = 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, getLabelFormatValue(compile(labelUiSchema), compile(label))));
+      });
+      return opts;
+    }
+    return [];
+  }, [value, fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.label]);
   var pickerProps = {
     size: 'small',
     fieldNames: fieldNames,
@@ -129,19 +122,11 @@ export var InternalPicker = observer(function (props) {
     setSelectedRows: setSelectedRows,
     collectionField: collectionField
   };
-  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, 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() {
@@ -216,37 +201,21 @@ export var InternalPicker = observer(function (props) {
     options: options,
     value: getValue(),
     open: false
-  }))), isAllowAddNew && /*#__PURE__*/React.createElement(Button, {
-    style: {
-      width: 'auto'
-    },
-    type: 'default',
-    onClick: function onClick() {
-      addbuttonClick();
-    }
-  }, t('Add new'))), /*#__PURE__*/React.createElement(ActionContext.Provider, {
-    value: {
-      openMode: 'drawer',
-      visible: visibleAddNewer,
-      setVisible: setVisibleAddNewer
-    }
-  }, /*#__PURE__*/React.createElement(CollectionProvider, {
-    name: collectionField.target
-  }, /*#__PURE__*/React.createElement(RecursionField, {
+  }))), isAllowAddNew && /*#__PURE__*/React.createElement(RecursionField, {
     onlyRenderProperties: true,
     basePath: field.address,
     schema: fieldSchema,
     filterProperties: function filterProperties(s) {
-      return s['x-component'] === 'AssociationField.AddNewer';
+      return s['x-component'] === 'Action';
     }
-  }))), /*#__PURE__*/React.createElement(ActionContext.Provider, {
+  })), /*#__PURE__*/React.createElement(ActionContext.Provider, {
     value: {
       openMode: 'drawer',
       visible: visibleSelector,
       setVisible: setVisibleSelector
     }
   }, /*#__PURE__*/React.createElement(RecordPickerProvider, _objectSpread({}, pickerProps), /*#__PURE__*/React.createElement(CollectionProvider, {
-    name: collectionField.target
+    name: collectionField === null || collectionField === void 0 ? void 0 : collectionField.target
   }, /*#__PURE__*/React.createElement(FormProvider, null, /*#__PURE__*/React.createElement(TableSelectorParamsProvider, {
     params: {
       filter: getFilter()

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

@@ -8,13 +8,13 @@ import { RecursionField, observer, useField, useFieldSchema } from '@formily/rea
 import { toArr } from '@formily/shared';
 import React, { Fragment, useRef, useState } from 'react';
 import { BlockAssociationContext, WithoutTableFieldResource } from '../../../block-provider';
-import { CollectionProvider, useCollection, useCollectionManager } from '../../../collection-manager';
+import { CollectionProvider } from '../../../collection-manager';
 import { RecordProvider, useRecord } from '../../../record-provider';
 import { FormProvider } from '../../core';
 import { useCompile } from '../../hooks';
 import { ActionContext, useActionContext } from '../action';
 import { EllipsisWithTooltip } from '../input/EllipsisWithTooltip';
-import { useFieldNames, useInsertSchema } from './hooks';
+import { useAssociationFieldContext, useFieldNames, useInsertSchema } from './hooks';
 import schema from './schema';
 import { getLabelFormatValue, useLabelUiSchema } from './util';
 var toValue = function toValue(value, placeholder) {
@@ -28,8 +28,6 @@ export var ReadPrettyInternalViewer = observer(function (props) {
   var fieldSchema = useFieldSchema();
   var recordCtx = useRecord();
   var enableLink = fieldSchema['x-component-props'].enableLink;
-  var _useCollectionManager = useCollectionManager(),
-    getCollectionJoinField = _useCollectionManager.getCollectionJoinField;
   // value 做了转换，但 props.value 和原来 useField().value 的值不一致
   var field = useField();
   var fieldNames = useFieldNames(props);
@@ -38,9 +36,8 @@ export var ReadPrettyInternalViewer = observer(function (props) {
     visible = _useState2[0],
     setVisible = _useState2[1];
   var insertViewer = useInsertSchema('Viewer');
-  var _useCollection = useCollection(),
-    getField = _useCollection.getField;
-  var collectionField = getField(fieldSchema.name) || getCollectionJoinField(fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-collection-field']);
+  var _useAssociationFieldC = useAssociationFieldContext(),
+    collectionField = _useAssociationFieldC.options;
   var _useState3 = useState({}),
     _useState4 = _slicedToArray(_useState3, 2),
     record = _useState4[0],
@@ -97,10 +94,10 @@ export var ReadPrettyInternalViewer = observer(function (props) {
       record: record
     }, renderWithoutTableFieldResourceProvider());
   };
-  return collectionField ? /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(BlockAssociationContext.Provider, {
-    value: "".concat(collectionField.collectionName, ".").concat(collectionField.name)
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(BlockAssociationContext.Provider, {
+    value: "".concat(collectionField === null || collectionField === void 0 ? void 0 : collectionField.collectionName, ".").concat(collectionField === null || collectionField === void 0 ? void 0 : collectionField.name)
   }, /*#__PURE__*/React.createElement(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__*/React.createElement(EllipsisWithTooltip, {
     ellipsis: true,
     ref: ellipsisWithTooltipRef
@@ -109,7 +106,7 @@ export var ReadPrettyInternalViewer = 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()))));
 });

package/es/schema-component/antd/association-field/Nester.js

@@ -4,14 +4,13 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+import { CloseCircleOutlined } from '@ant-design/icons';
 import { RecursionField, observer, useFieldSchema } from '@formily/react';
 import { Button, Card, Divider } from 'antd';
-import { CloseCircleOutlined } from '@ant-design/icons';
 import React, { useContext } from 'react';
+import { useTranslation } from 'react-i18next';
 import { AssociationFieldContext } from './context';
 import { useAssociationFieldContext } from './hooks';
-import { useTranslation } from 'react-i18next';
-// import { useRemoveActionProps } from '../../../block-provider/hooks';
 export var Nester = function Nester(props) {
   var _useContext = useContext(AssociationFieldContext),
     options = _useContext.options;
@@ -28,30 +27,26 @@ var ToOneNester = function ToOneNester(props) {
     bordered: true
   }, props.children);
 };
-var toArr = function toArr(value) {
-  if (!value) {
-    return [];
-  }
-  if (Array.isArray(value)) {
-    return value;
-  }
-  return [value];
-};
 var ToManyNester = observer(function (props) {
   var fieldSchema = useFieldSchema();
   var _useAssociationFieldC = useAssociationFieldContext(),
-    field = _useAssociationFieldC.field;
-  var values = toArr(field.value);
+    options = _useAssociationFieldC.options,
+    field = _useAssociationFieldC.field,
+    allowMultiple = _useAssociationFieldC.allowMultiple,
+    allowDissociate = _useAssociationFieldC.allowDissociate;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
-  // const { onClick } = useRemoveActionProps(`${collectionField.collectionName}.${collectionField.target}`);
   return /*#__PURE__*/React.createElement(Card, {
     bordered: true,
     style: {
       position: 'relative'
     }
-  }, values.map(function (value, index) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, !field.readPretty && /*#__PURE__*/React.createElement("div", {
+  }, (field.value || []).map(function (value, index) {
+    var allowed = allowDissociate;
+    if (!allowDissociate) {
+      allowed = !(value === null || value === void 0 ? void 0 : value[options.targetKey]);
+    }
+    return /*#__PURE__*/React.createElement(React.Fragment, null, !field.readPretty && allowed && /*#__PURE__*/React.createElement("div", {
       style: {
         textAlign: 'right'
       }
@@ -62,19 +57,22 @@ var ToManyNester = observer(function (props) {
         color: '#a8a3a3'
       },
       onClick: function onClick() {
-        field.value.splice(index, 1);
+        var result = field.value;
+        result.splice(index, 1);
+        field.value = result;
       }
     })), /*#__PURE__*/React.createElement(RecursionField, {
       onlyRenderProperties: true,
       basePath: field.address.concat(index),
       schema: fieldSchema
     }), /*#__PURE__*/React.createElement(Divider, null));
-  }), field.editable && /*#__PURE__*/React.createElement(Button, {
+  }), field.editable && allowMultiple && /*#__PURE__*/React.createElement(Button, {
     type: 'dashed',
     block: true,
     onClick: function onClick() {
-      field.value = field.value || [];
-      field.value.push({});
+      var result = field.value;
+      result.push({});
+      field.value = result;
     }
   }, t('Add new')));
 });

package/es/schema-component/antd/association-field/ReadPretty.d.ts

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