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

package/es/locale/zh_CN.d.ts

@@ -310,6 +310,7 @@ declare const _default: {
     "Display field title": string;
     "Field component": string;
     "Allow multiple": string;
+    "Allow dissociate": string;
     "Quick upload": string;
     "Select file": string;
     Subtable: string;

package/es/locale/zh_CN.js

@@ -309,7 +309,8 @@ export default {
   "Display association fields": "显示关联表的字段",
   "Display field title": "显示字段标题",
   "Field component": "字段组件",
-  "Allow multiple": "允许多选",
+  "Allow multiple": "允许添加/关联多条",
+  "Allow dissociate": "允许移除已关联记录",
   "Quick upload": "快速上传",
   "Select file": "选择文件",
   "Subtable": "子表格",

package/es/pm/PluginManagerLink.js

@@ -1,4 +1,8 @@
 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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 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); }
@@ -11,7 +15,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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 { ApiOutlined, SettingOutlined } from '@ant-design/icons';
-import { Button, Dropdown, Menu, Tooltip } from 'antd';
+import { Button, Dropdown, Tooltip } from 'antd';
 import React, { useContext, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useHistory } from 'react-router-dom';
@@ -66,19 +70,23 @@ export var SettingsCenterDropdown = function SettingsCenterDropdown() {
     }
   }, /*#__PURE__*/React.createElement(Dropdown, {
     placement: "bottom",
-    overlay: /*#__PURE__*/React.createElement(Menu, null, bookmarkTabs.map(function (tab) {
-      return /*#__PURE__*/React.createElement(Menu.Item, {
-        onClick: function onClick() {
-          history.push('/admin/settings/' + tab.path);
-        },
-        key: tab.path
-      }, compile(tab.title));
-    }), /*#__PURE__*/React.createElement(Menu.Divider, null), /*#__PURE__*/React.createElement(Menu.Item, {
-      onClick: function onClick() {
-        history.push('/admin/settings');
-      },
-      key: "/admin/settings"
-    }, t('All plugin settings')))
+    menu: {
+      items: [].concat(_toConsumableArray(bookmarkTabs.map(function (tab) {
+        return {
+          key: "/admin/settings/".concat(tab.path),
+          label: compile(tab.title)
+        };
+      })), [{
+        type: 'divider'
+      }, {
+        key: '/admin/settings',
+        label: t('All plugin settings')
+      }]),
+      onClick: function onClick(_ref) {
+        var key = _ref.key;
+        history.push(key);
+      }
+    }
   }, /*#__PURE__*/React.createElement(Button, {
     icon: /*#__PURE__*/React.createElement(SettingOutlined, null)
   })));

package/es/schema-component/antd/action/Action.Designer.js

@@ -290,7 +290,7 @@ export var ActionDesigner = function ActionDesigner(props) {
     }
   }), isChildCollectionAction && /*#__PURE__*/React.createElement(SchemaSettings.EnableChildCollections, {
     collectionName: name
-  }), !isDelete && [/*#__PURE__*/React.createElement(SchemaSettings.Divider, null), /*#__PURE__*/React.createElement(SchemaSettings.Remove, {
+  }), !isDelete && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(SchemaSettings.Divider, null), /*#__PURE__*/React.createElement(SchemaSettings.Remove, {
     removeParentsIfNoChildren: true,
     breakRemoveOn: function breakRemoveOn(s) {
       return s['x-component'] === 'Space' || s['x-component'].endsWith('ActionBar');
@@ -298,5 +298,5 @@ export var ActionDesigner = function ActionDesigner(props) {
     confirm: {
       title: t('Delete action')
     }
-  })]));
+  }))));
 };

package/es/schema-component/antd/action/Action.Drawer.js

@@ -49,7 +49,7 @@ export var ActionDrawer = observer(function (props) {
     title: field.title
   }, others), {}, {
     destroyOnClose: true,
-    visible: visible,
+    open: visible,
     onClose: function onClose() {
       return setVisible(false, true);
     },

package/es/schema-component/antd/action/Action.js

@@ -148,8 +148,8 @@ Action.Popover = observer(function (props) {
     setVisible = _useActionContext.setVisible;
   return /*#__PURE__*/React.createElement(Popover, _objectSpread(_objectSpread({}, props), {}, {
     destroyTooltipOnHide: true,
-    visible: visible,
-    onVisibleChange: function onVisibleChange(visible) {
+    open: visible,
+    onOpenChange: function onOpenChange(visible) {
       setVisible(visible);
     },
     content: props.children

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

@@ -1,14 +1,22 @@
+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, { useMemo } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 import { useCollectionManager } from '../../../collection-manager';
 import { AssociationFieldContext } from './context';
 export var AssociationFieldProvider = observer(function (props) {
-  var _fieldSchema$xCompon2;
+  var _fieldSchema$xCompon, _fieldSchema$xCompon2, _fieldSchema$xCompon4;
   var field = useField();
   var _useCollectionManager = useCollectionManager(),
     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 getCollectionJoinField(fieldSchema['x-collection-field']);
   }, [fieldSchema['x-collection-field'], fieldSchema.name]);
@@ -17,13 +25,47 @@ export var AssociationFieldProvider = observer(function (props) {
     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']]);
   var currentMode = useMemo(function () {
-    var _fieldSchema$xCompon;
-    return ((_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : _fieldSchema$xCompon.mode) || (isFileCollection ? 'FileManager' : 'Select');
-  }, [(_fieldSchema$xCompon2 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon2 === void 0 ? void 0 : _fieldSchema$xCompon2.mode]);
+    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,
+      allowMultiple: allowMultiple,
+      allowDissociate: allowDissociate,
       currentMode: currentMode
     }
   }, props.children) : null;

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

@@ -7,14 +7,8 @@ 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';
@@ -33,32 +27,6 @@ var EditableAssociationField = observer(function (props) {
   var _useAssociationFieldC = useAssociationFieldContext(),
     collectionField = _useAssociationFieldC.options,
     currentMode = _useAssociationFieldC.currentMode;
-  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) {
-      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;
-  }
   var useCreateActionProps = function useCreateActionProps() {
     var _useCAP = useCAP(),
       _onClick = _useCAP.onClick;

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

@@ -30,7 +30,10 @@ var ToOneNester = function ToOneNester(props) {
 var ToManyNester = observer(function (props) {
   var fieldSchema = useFieldSchema();
   var _useAssociationFieldC = useAssociationFieldContext(),
-    field = _useAssociationFieldC.field;
+    options = _useAssociationFieldC.options,
+    field = _useAssociationFieldC.field,
+    allowMultiple = _useAssociationFieldC.allowMultiple,
+    allowDissociate = _useAssociationFieldC.allowDissociate;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
   return /*#__PURE__*/React.createElement(Card, {
@@ -39,7 +42,11 @@ var ToManyNester = observer(function (props) {
       position: 'relative'
     }
   }, (field.value || []).map(function (value, index) {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, !field.readPretty && /*#__PURE__*/React.createElement("div", {
+    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'
       }
@@ -59,7 +66,7 @@ var ToManyNester = observer(function (props) {
       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() {

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

@@ -4,5 +4,7 @@ export interface AssociationFieldContextProps {
     options?: any;
     field?: GeneralField;
     currentMode?: string;
+    allowMultiple?: boolean;
+    allowDissociate?: boolean;
 }
 export declare const AssociationFieldContext: import("react").Context<AssociationFieldContextProps>;

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

@@ -4,6 +4,8 @@ export declare function useAssociationFieldContext<F extends GeneralField>(): {
     options: any;
     field: F;
     currentMode: string;
+    allowMultiple?: boolean;
+    allowDissociate?: boolean;
 };
 export default function useServiceOptions(props: any): any;
 export declare const useFieldNames: (props: any) => any;

package/es/schema-component/antd/filter/FilterAction.js

@@ -59,8 +59,8 @@ export var FilterAction = observer(function (props) {
   }, /*#__PURE__*/React.createElement(Popover, {
     destroyTooltipOnHide: true,
     placement: 'bottomLeft',
-    visible: visible,
-    onVisibleChange: function onVisibleChange(visible) {
+    open: visible,
+    onOpenChange: function onOpenChange(visible) {
       setVisible(visible);
     },
     trigger: 'click',

package/es/schema-component/antd/form-item/FormItem.js

@@ -13,6 +13,7 @@ import { css, cx } from '@emotion/css';
 import { ArrayCollapse, ArrayItems, FormLayout, FormItem as Item } from '@formily/antd';
 import { observer, useField, useFieldSchema } from '@formily/react';
 import { uid } from '@formily/shared';
+import { Select } from 'antd';
 import _ from 'lodash';
 import moment from 'moment';
 import React, { useContext, useEffect } from 'react';
@@ -35,7 +36,6 @@ import { FilterDynamicComponent } from '../table-v2/FilterDynamicComponent';
 import { isInvariable } from '../variable';
 import { FilterFormDesigner } from './FormItem.FilterFormDesigner';
 import { useEnsureOperatorsValid } from './SchemaSettingOptions';
-import { Select } from 'antd';
 var defaultInputStyle = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  & > .nb-form-item {\n    flex: 1;\n  }\n"])));
 var divWrap = function divWrap(schema) {
   return {
@@ -80,7 +80,7 @@ export var FormItem = observer(function (props) {
   }))));
 });
 FormItem.Designer = function Designer() {
-  var _interfaceConfig$vali, _collectionField$uiSc, _getCollectionFields, _field$componentProps, _field$componentProps2, _field$componentProps3, _field$componentProps4, _field$componentProps5, _field$componentProps6, _field$componentProps7, _fieldSchema$xCompon, _fieldSchema$xCompon2, _fieldSchema$xCompon3, _fieldSchema$xCompon4, _fieldSchema$xCompon5, _fieldSchema$xCompon6, _fieldSchema$xCompon7, _field$componentProps8, _field$componentProps9;
+  var _interfaceConfig$vali, _collectionField$uiSc, _getCollectionFields, _field$componentProps, _field$componentProps2, _field$componentProps3, _field$componentProps4, _field$componentProps5, _field$componentProps6, _field$componentProps7, _fieldSchema$xCompon, _fieldSchema$xCompon2, _fieldSchema$xCompon3, _fieldSchema$xCompon4, _fieldSchema$xCompon5, _fieldSchema$xCompon6, _fieldSchema$xCompon7, _fieldSchema$xCompon8, _fieldSchema$xCompon9, _fieldSchema$xCompon10, _field$componentProps8, _field$componentProps9;
   var _useCollectionManager = useCollectionManager(),
     getCollectionFields = _useCollectionManager.getCollectionFields,
     getInterface = _useCollectionManager.getInterface,
@@ -149,13 +149,14 @@ FormItem.Designer = function Designer() {
     };
   });
   var fieldSchemaWithoutRequired = _.omit(fieldSchema, 'required');
-  var isPickerMode = fieldSchema['x-component-props'].mode === 'Picker';
+  var isSubFormMode = ((_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : _fieldSchema$xCompon.mode) === 'Nester';
+  var isPickerMode = ((_fieldSchema$xCompon2 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon2 === void 0 ? void 0 : _fieldSchema$xCompon2.mode) === 'Picker';
   var showFieldMode = isAssociationField && fieldModeOptions && !isTableField;
   var showModeSelect = showFieldMode && isPickerMode;
   return /*#__PURE__*/React.createElement(GeneralSchemaDesigner, null, /*#__PURE__*/React.createElement(GeneralSchemaItems, null), !(form === null || form === void 0 ? void 0 : form.readPretty) && isFileField ? /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
     key: "quick-upload",
     title: t('Quick upload'),
-    checked: ((_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : _fieldSchema$xCompon.quickUpload) !== false,
+    checked: ((_fieldSchema$xCompon3 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon3 === void 0 ? void 0 : _fieldSchema$xCompon3.quickUpload) !== false,
     onChange: function onChange(value) {
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
       field.componentProps.quickUpload = value;
@@ -170,7 +171,7 @@ FormItem.Designer = function Designer() {
   }) : null, !(form === null || form === void 0 ? void 0 : form.readPretty) && isFileField ? /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
     key: "select-file",
     title: t('Select file'),
-    checked: ((_fieldSchema$xCompon2 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon2 === void 0 ? void 0 : _fieldSchema$xCompon2.selectFile) !== false,
+    checked: ((_fieldSchema$xCompon4 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon4 === void 0 ? void 0 : _fieldSchema$xCompon4.selectFile) !== false,
     onChange: function onChange(value) {
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
       field.componentProps.selectFile = value;
@@ -544,7 +545,7 @@ FormItem.Designer = function Designer() {
       label: t('Large'),
       value: 'large'
     }],
-    value: (_fieldSchema$xCompon3 = fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon4 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon4 === void 0 ? void 0 : _fieldSchema$xCompon4['openSize']) !== null && _fieldSchema$xCompon3 !== void 0 ? _fieldSchema$xCompon3 : (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon5 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon5 === void 0 ? void 0 : _fieldSchema$xCompon5['openMode']) == 'modal' ? 'large' : 'middle',
+    value: (_fieldSchema$xCompon5 = fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon6 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon6 === void 0 ? void 0 : _fieldSchema$xCompon6['openSize']) !== null && _fieldSchema$xCompon5 !== void 0 ? _fieldSchema$xCompon5 : (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon7 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon7 === void 0 ? void 0 : _fieldSchema$xCompon7['openMode']) == 'modal' ? 'large' : 'middle',
     onChange: function onChange(value) {
       field.componentProps.openSize = value;
       fieldSchema['x-component-props'] = field.componentProps;
@@ -598,7 +599,7 @@ FormItem.Designer = function Designer() {
   }), IsShowMultipleSwitch() ? /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
     key: "multiple",
     title: t('Allow multiple'),
-    checked: ((_fieldSchema$xCompon6 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon6 === void 0 ? void 0 : _fieldSchema$xCompon6.multiple) === undefined ? true : fieldSchema['x-component-props'].multiple,
+    checked: ((_fieldSchema$xCompon8 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon8 === void 0 ? void 0 : _fieldSchema$xCompon8.multiple) === undefined ? true : fieldSchema['x-component-props'].multiple,
     onChange: function onChange(value) {
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
       fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
@@ -611,9 +612,25 @@ FormItem.Designer = function Designer() {
       });
       refresh();
     }
+  }) : null, IsShowMultipleSwitch() && isSubFormMode ? /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
+    key: "allowDissociate",
+    title: t('Allow dissociate'),
+    checked: ((_fieldSchema$xCompon9 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon9 === void 0 ? void 0 : _fieldSchema$xCompon9.allowDissociate) !== false,
+    onChange: function onChange(value) {
+      var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
+      fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
+      field.componentProps = field.componentProps || {};
+      fieldSchema['x-component-props'].allowDissociate = value;
+      field.componentProps.allowDissociate = value;
+      schema['x-component-props'] = fieldSchema['x-component-props'];
+      dn.emit('patch', {
+        schema: schema
+      });
+      refresh();
+    }
   }) : null, field.readPretty && options.length > 0 && fieldSchema['x-component'] === 'CollectionField' && !isFileField && /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
     title: t('Enable link'),
-    checked: ((_fieldSchema$xCompon7 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon7 === void 0 ? void 0 : _fieldSchema$xCompon7.enableLink) !== false,
+    checked: ((_fieldSchema$xCompon10 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon10 === void 0 ? void 0 : _fieldSchema$xCompon10.enableLink) !== false,
     onChange: function onChange(flag) {
       fieldSchema['x-component-props'] = _objectSpread(_objectSpread({}, fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-component-props']), {}, {
         enableLink: flag

package/es/schema-component/antd/form-v2/Templates.js

@@ -110,6 +110,8 @@ export var Templates = function Templates(_ref) {
             if (option.key !== 'none') {
               fetchTemplateData(api, option, t).then(function (data) {
                 if (form && data) {
+                  // 切换之前先把之前的数据清空
+                  form.reset();
                   forEach(data, function (value, key) {
                     if (value) {
                       form.values[key] = value;

package/es/schema-component/antd/icon-picker/IconPicker.js

@@ -37,8 +37,8 @@ function IconField(props) {
     compact: true
   }, /*#__PURE__*/React.createElement(Popover, {
     placement: 'bottom',
-    visible: visible,
-    onVisibleChange: function onVisibleChange(val) {
+    open: visible,
+    onOpenChange: function onOpenChange(val) {
       if (disabled) {
         return;
       }

package/es/schema-component/antd/input/EllipsisWithTooltip.js

@@ -53,8 +53,8 @@ export var EllipsisWithTooltip = /*#__PURE__*/forwardRef(function (props, ref) {
     return contentWidth > offsetWidth;
   };
   return /*#__PURE__*/React.createElement(Popover, {
-    visible: ellipsis && visible,
-    onVisibleChange: function onVisibleChange(visible) {
+    open: ellipsis && visible,
+    onOpenChange: function onOpenChange(visible) {
       setVisible(ellipsis && visible);
     },
     content: /*#__PURE__*/React.createElement("div", {

package/es/schema-component/antd/remote-select/RemoteSelect.js

@@ -190,7 +190,7 @@ var InternalRemoteSelect = connect(function (props) {
     objectValue: objectValue,
     value: value
   }, others), {}, {
-    loading: loading,
+    loading: data ? loading : true,
     options: mapOptionsToTags(options)
   }));
 }, mapProps({

package/es/schema-component/antd/select/Select.js

@@ -1,5 +1,5 @@
-var _excluded = ["value", "options", "onChange", "fieldNames", "mode"],
-  _excluded2 = ["objectValue", "value"];
+var _excluded = ["value", "options", "onChange", "fieldNames", "mode", "loading"],
+  _excluded2 = ["objectValue", "loading", "value"];
 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; }
@@ -11,7 +11,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 import { LoadingOutlined } from '@ant-design/icons';
 import { connect, mapProps, mapReadPretty } from '@formily/react';
 import { isValid, toArr } from '@formily/shared';
-import { Select as AntdSelect } from 'antd';
+import { Select as AntdSelect, Spin, Empty } from 'antd';
 import React from 'react';
 import { ReadPretty } from './ReadPretty';
 import { defaultFieldNames, getCurrentOptions } from './shared';
@@ -24,6 +24,7 @@ var ObjectSelect = function ObjectSelect(props) {
     _onChange = props.onChange,
     fieldNames = props.fieldNames,
     mode = props.mode,
+    loading = props.loading,
     others = _objectWithoutProperties(props, _excluded);
   var toValue = function toValue(v) {
     var _getCurrentOptions;
@@ -50,6 +51,9 @@ var ObjectSelect = function ObjectSelect(props) {
     value: toValue(value),
     allowClear: true,
     labelInValue: true,
+    notFoundContent: loading ? /*#__PURE__*/React.createElement(Spin, null) : /*#__PURE__*/React.createElement(Empty, {
+      image: Empty.PRESENTED_IMAGE_SIMPLE
+    }),
     options: options,
     fieldNames: fieldNames,
     showSearch: true,
@@ -81,6 +85,7 @@ var filterOption = function filterOption(input, option) {
 };
 var InternalSelect = connect(function (props) {
   var objectValue = props.objectValue,
+    loading = props.loading,
     value = props.value,
     others = _objectWithoutProperties(props, _excluded2);
   var mode = props.multiple ? 'multiple' : props.mode;
@@ -90,7 +95,8 @@ var InternalSelect = connect(function (props) {
   if (objectValue) {
     return /*#__PURE__*/React.createElement(ObjectSelect, _objectSpread(_objectSpread({}, others), {}, {
       value: value,
-      mode: mode
+      mode: mode,
+      loading: loading
     }));
   }
   return /*#__PURE__*/React.createElement(AntdSelect, _objectSpread(_objectSpread({
@@ -98,6 +104,9 @@ var InternalSelect = connect(function (props) {
     filterOption: filterOption,
     allowClear: true,
     dropdownMatchSelectWidth: false,
+    notFoundContent: loading ? /*#__PURE__*/React.createElement(Spin, null) : /*#__PURE__*/React.createElement(Empty, {
+      image: Empty.PRESENTED_IMAGE_SIMPLE
+    }),
     value: value
   }, others), {}, {
     onChange: function onChange(changed) {

package/es/schema-component/common/sortable-item/SortableItem.js

@@ -1,6 +1,6 @@
 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); }
 var _excluded = ["component", "style", "children", "openMode"],
-  _excluded2 = ["schema", "id"];
+  _excluded2 = ["schema", "id", "removeParentsIfNoChildren"];
 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; }
@@ -72,18 +72,17 @@ var useSortableItemId = function useSortableItemId(props) {
   return field.address.toString();
 };
 export var SortableItem = observer(function (props) {
-  var _others$removeParents;
   var _useSortableItemProps = useSortableItemProps(props),
     schema = _useSortableItemProps.schema,
     id = _useSortableItemProps.id,
+    removeParentsIfNoChildren = _useSortableItemProps.removeParentsIfNoChildren,
     others = _objectWithoutProperties(_useSortableItemProps, _excluded2);
-  var removeParentsIfNoChildren = (_others$removeParents = others.removeParentsIfNoChildren) !== null && _others$removeParents !== void 0 ? _others$removeParents : true;
   return /*#__PURE__*/React.createElement(SortableProvider, {
     id: id,
     data: {
       insertAdjacent: 'afterEnd',
       schema: schema,
-      removeParentsIfNoChildren: removeParentsIfNoChildren
+      removeParentsIfNoChildren: removeParentsIfNoChildren !== null && removeParentsIfNoChildren !== void 0 ? removeParentsIfNoChildren : true
     }
   }, /*#__PURE__*/React.createElement(Sortable, _objectSpread({}, others), props.children));
 });

package/es/schema-settings/DataTemplates/components/AsDefaultTemplate.js

@@ -8,7 +8,7 @@ import { ArrayBase } from '@formily/antd';
 import { Switch } from 'antd';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-export var AsDefaultTemplate = /*#__PURE__*/React.forwardRef(function (props) {
+export var AsDefaultTemplate = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _array$field;
   var array = ArrayBase.useArray();
   var index = ArrayBase.useIndex(props.index);

package/es/schema-settings/DataTemplates/components/DataTemplateTitle.js

@@ -1,15 +1,15 @@
 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 _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; }
-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); }
 import { CopyOutlined } from '@ant-design/icons';
 import { ArrayBase } from '@formily/antd';
 import { RecursionField, observer, useField, useFieldSchema } from '@formily/react';
@@ -19,7 +19,7 @@ import cls from 'classnames';
 import { clone } from 'lodash';
 import React, { Fragment, useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-var DataTemplateTitle = function DataTemplateTitle(props) {
+var DataTemplateTitle = observer(function (props) {
   var _array$field;
   var array = ArrayBase.useArray();
   var index = ArrayBase.useIndex(props.index);
@@ -40,15 +40,11 @@ var DataTemplateTitle = function DataTemplateTitle(props) {
     placeholder: t('Template name'),
     onChange: function onChange(ev) {
       ev.stopPropagation();
-      array.field.value.splice(index, 1, _objectSpread(_objectSpread({}, value), {}, {
-        title: ev.target.value
-      }));
+      value.title = ev.target.value;
     },
     onBlur: function onBlur(ev) {
       ev.stopPropagation();
-      array.field.value.splice(index, 1, _objectSpread(_objectSpread({}, value), {}, {
-        title: ev.target.value
-      }));
+      value.title = ev.target.value;
     },
     autoSize: true,
     style: {
@@ -59,7 +55,7 @@ var DataTemplateTitle = function DataTemplateTitle(props) {
       e.stopPropagation();
     }
   });
-};
+});
 var isAdditionComponent = function isAdditionComponent(schema) {
   var _schema$xComponent, _schema$xComponent$in;
   return ((_schema$xComponent = schema['x-component']) === null || _schema$xComponent === void 0 ? void 0 : (_schema$xComponent$in = _schema$xComponent.indexOf) === null || _schema$xComponent$in === void 0 ? void 0 : _schema$xComponent$in.call(_schema$xComponent, 'Addition')) > -1;