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

package/es/schema-settings/SchemaSettings.js

@@ -81,8 +81,8 @@ export var SchemaSettings = function SchemaSettings(props) {
     visible = _useState2[0],
     setVisible = _useState2[1];
   var DropdownMenu = /*#__PURE__*/React.createElement(Dropdown, {
-    visible: visible,
-    onVisibleChange: function onVisibleChange(visible) {
+    open: visible,
+    onOpenChange: function onOpenChange(visible) {
       setVisible(visible);
     },
     overlay: /*#__PURE__*/React.createElement(Menu, null, props.children),

package/es/settings-form/SettingsForm.js

@@ -67,8 +67,8 @@ export var SettingsForm = observer(function (props) {
   }, /*#__PURE__*/React.createElement(FieldContext.Provider, {
     value: f
   }, /*#__PURE__*/React.createElement(Dropdown, {
-    visible: dropdownVisible,
-    onVisibleChange: function onVisibleChange(visible) {
+    open: dropdownVisible,
+    onOpenChange: function onOpenChange(visible) {
       return setDropdownVisible(visible);
     },
     overlayStyle: {

package/es/user/CurrentUser.js

@@ -91,8 +91,8 @@ export var CurrentUser = function CurrentUser() {
       setVisible: setVisible
     }
   }, /*#__PURE__*/React.createElement(Dropdown, {
-    visible: visible,
-    onVisibleChange: function onVisibleChange(visible) {
+    open: visible,
+    onOpenChange: function onOpenChange(visible) {
       setVisible(visible);
     },
     overlay: /*#__PURE__*/React.createElement(Menu, null, /*#__PURE__*/React.createElement(ApplicationVersion, null), /*#__PURE__*/React.createElement(Menu.Divider, null), /*#__PURE__*/React.createElement(EditProfile, null), /*#__PURE__*/React.createElement(ChangePassword, null), /*#__PURE__*/React.createElement(Menu.Divider, null), /*#__PURE__*/React.createElement(SwitchRole, null), /*#__PURE__*/React.createElement(LanguageSettings, null), /*#__PURE__*/React.createElement(ThemeSettings, null), /*#__PURE__*/React.createElement(Menu.Divider, null), appAllowed && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Menu.Item, {

package/lib/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/lib/locale/zh_CN.js

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

package/lib/pm/PluginManagerLink.js

@@ -15,6 +15,10 @@ var _index = require("./index");
 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 _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); }
@@ -75,19 +79,23 @@ var SettingsCenterDropdown = function SettingsCenterDropdown() {
     }
   }, /*#__PURE__*/_react.default.createElement(_antd.Dropdown, {
     placement: "bottom",
-    overlay: /*#__PURE__*/_react.default.createElement(_antd.Menu, null, bookmarkTabs.map(function (tab) {
-      return /*#__PURE__*/_react.default.createElement(_antd.Menu.Item, {
-        onClick: function onClick() {
-          history.push('/admin/settings/' + tab.path);
-        },
-        key: tab.path
-      }, compile(tab.title));
-    }), /*#__PURE__*/_react.default.createElement(_antd.Menu.Divider, null), /*#__PURE__*/_react.default.createElement(_antd.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.default.createElement(_antd.Button, {
     icon: /*#__PURE__*/_react.default.createElement(_icons.SettingOutlined, null)
   })));

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

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

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

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

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

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

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

@@ -11,13 +11,21 @@ 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 _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$xCompon2;
+  var _fieldSchema$xCompon, _fieldSchema$xCompon2, _fieldSchema$xCompon4;
   var field = (0, _react.useField)();
   var _useCollectionManager = (0, _collectionManager.useCollectionManager)(),
     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 getCollectionJoinField(fieldSchema['x-collection-field']);
   }, [fieldSchema['x-collection-field'], fieldSchema.name]);
@@ -26,13 +34,47 @@ var AssociationFieldProvider = (0, _react.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 = (0, _react2.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 = (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,
+      allowMultiple: allowMultiple,
+      allowDissociate: allowDissociate,
       currentMode: currentMode
     }
   }, props.children) : null;

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

@@ -6,7 +6,7 @@ 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");
@@ -17,8 +17,7 @@ var _InternalPicker = require("./InternalPicker");
 var _InternalSubTable = require("./InternalSubTable");
 var _CreateRecordAction = require("./components/CreateRecordAction");
 var _hooks2 = require("./hooks");
-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 _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; }
@@ -27,12 +26,6 @@ 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 EditableAssociationField = (0, _react.observer)(function (props) {
   var multiple = props.multiple;
   var field = (0, _react.useField)();
@@ -41,32 +34,6 @@ var EditableAssociationField = (0, _react.observer)(function (props) {
   var _useAssociationFieldC = (0, _hooks2.useAssociationFieldContext)(),
     collectionField = _useAssociationFieldC.options,
     currentMode = _useAssociationFieldC.currentMode;
-  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) {
-      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 = (0, _hooks.useAssociationCreateActionProps)(),
       _onClick = _useCAP.onClick;

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

@@ -39,7 +39,10 @@ var ToOneNester = function ToOneNester(props) {
 var ToManyNester = (0, _react.observer)(function (props) {
   var fieldSchema = (0, _react.useFieldSchema)();
   var _useAssociationFieldC = (0, _hooks.useAssociationFieldContext)(),
-    field = _useAssociationFieldC.field;
+    options = _useAssociationFieldC.options,
+    field = _useAssociationFieldC.field,
+    allowMultiple = _useAssociationFieldC.allowMultiple,
+    allowDissociate = _useAssociationFieldC.allowDissociate;
   var _useTranslation = (0, _reactI18next.useTranslation)(),
     t = _useTranslation.t;
   return /*#__PURE__*/_react2.default.createElement(_antd.Card, {
@@ -48,7 +51,11 @@ var ToManyNester = (0, _react.observer)(function (props) {
       position: 'relative'
     }
   }, (field.value || []).map(function (value, index) {
-    return /*#__PURE__*/_react2.default.createElement(_react2.default.Fragment, null, !field.readPretty && /*#__PURE__*/_react2.default.createElement("div", {
+    var allowed = allowDissociate;
+    if (!allowDissociate) {
+      allowed = !(value === null || value === void 0 ? void 0 : value[options.targetKey]);
+    }
+    return /*#__PURE__*/_react2.default.createElement(_react2.default.Fragment, null, !field.readPretty && allowed && /*#__PURE__*/_react2.default.createElement("div", {
       style: {
         textAlign: 'right'
       }
@@ -68,7 +75,7 @@ var ToManyNester = (0, _react.observer)(function (props) {
       basePath: field.address.concat(index),
       schema: fieldSchema
     }), /*#__PURE__*/_react2.default.createElement(_antd.Divider, null));
-  }), field.editable && /*#__PURE__*/_react2.default.createElement(_antd.Button, {
+  }), field.editable && allowMultiple && /*#__PURE__*/_react2.default.createElement(_antd.Button, {
     type: 'dashed',
     block: true,
     onClick: function onClick() {

package/lib/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/lib/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/lib/schema-component/antd/filter/FilterAction.js

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

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

@@ -11,6 +11,7 @@ var _css = require("@emotion/css");
 var _antd = require("@formily/antd");
 var _react = require("@formily/react");
 var _shared = require("@formily/shared");
+var _antd2 = require("antd");
 var _lodash = _interopRequireDefault(require("lodash"));
 var _moment = _interopRequireDefault(require("moment"));
 var _react2 = _interopRequireWildcard(require("react"));
@@ -33,7 +34,6 @@ var _FilterDynamicComponent = require("../table-v2/FilterDynamicComponent");
 var _variable = require("../variable");
 var _FormItem = require("./FormItem.FilterFormDesigner");
 var _SchemaSettingOptions = require("./SchemaSettingOptions");
-var _antd2 = require("antd");
 var _templateObject, _templateObject2, _templateObject3;
 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; }
@@ -92,7 +92,7 @@ var FormItem = (0, _react.observer)(function (props) {
 });
 exports.FormItem = FormItem;
 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 = (0, _collectionManager.useCollectionManager)(),
     getCollectionFields = _useCollectionManager.getCollectionFields,
     getInterface = _useCollectionManager.getInterface,
@@ -161,13 +161,14 @@ FormItem.Designer = function Designer() {
     };
   });
   var fieldSchemaWithoutRequired = _lodash.default.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__*/_react2.default.createElement(_schemaSettings.GeneralSchemaDesigner, null, /*#__PURE__*/_react2.default.createElement(_GeneralSchemaItems.GeneralSchemaItems, null), !(form === null || form === void 0 ? void 0 : form.readPretty) && isFileField ? /*#__PURE__*/_react2.default.createElement(_schemaSettings.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;
@@ -182,7 +183,7 @@ FormItem.Designer = function Designer() {
   }) : null, !(form === null || form === void 0 ? void 0 : form.readPretty) && isFileField ? /*#__PURE__*/_react2.default.createElement(_schemaSettings.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;
@@ -556,7 +557,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;
@@ -610,7 +611,7 @@ FormItem.Designer = function Designer() {
   }), IsShowMultipleSwitch() ? /*#__PURE__*/_react2.default.createElement(_schemaSettings.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'] || {};
@@ -623,9 +624,25 @@ FormItem.Designer = function Designer() {
       });
       refresh();
     }
+  }) : null, IsShowMultipleSwitch() && isSubFormMode ? /*#__PURE__*/_react2.default.createElement(_schemaSettings.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__*/_react2.default.createElement(_schemaSettings.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/lib/schema-component/antd/form-v2/Templates.js

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

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

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

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

@@ -61,8 +61,8 @@ var EllipsisWithTooltip = /*#__PURE__*/(0, _react.forwardRef)(function (props, r
     return contentWidth > offsetWidth;
   };
   return /*#__PURE__*/_react.default.createElement(_antd.Popover, {
-    visible: ellipsis && visible,
-    onVisibleChange: function onVisibleChange(visible) {
+    open: ellipsis && visible,
+    onOpenChange: function onOpenChange(visible) {
       setVisible(ellipsis && visible);
     },
     content: /*#__PURE__*/_react.default.createElement("div", {

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

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

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

@@ -11,8 +11,8 @@ var _antd = require("antd");
 var _react2 = _interopRequireDefault(require("react"));
 var _ReadPretty = require("./ReadPretty");
 var _shared2 = require("./shared");
-var _excluded = ["value", "options", "onChange", "fieldNames", "mode"],
-  _excluded2 = ["objectValue", "value"];
+var _excluded = ["value", "options", "onChange", "fieldNames", "mode", "loading"],
+  _excluded2 = ["objectValue", "loading", "value"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: 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; }
@@ -31,6 +31,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;
@@ -57,6 +58,9 @@ var ObjectSelect = function ObjectSelect(props) {
     value: toValue(value),
     allowClear: true,
     labelInValue: true,
+    notFoundContent: loading ? /*#__PURE__*/_react2.default.createElement(_antd.Spin, null) : /*#__PURE__*/_react2.default.createElement(_antd.Empty, {
+      image: _antd.Empty.PRESENTED_IMAGE_SIMPLE
+    }),
     options: options,
     fieldNames: fieldNames,
     showSearch: true,
@@ -88,6 +92,7 @@ var filterOption = function filterOption(input, option) {
 };
 var InternalSelect = (0, _react.connect)(function (props) {
   var objectValue = props.objectValue,
+    loading = props.loading,
     value = props.value,
     others = _objectWithoutProperties(props, _excluded2);
   var mode = props.multiple ? 'multiple' : props.mode;
@@ -97,7 +102,8 @@ var InternalSelect = (0, _react.connect)(function (props) {
   if (objectValue) {
     return /*#__PURE__*/_react2.default.createElement(ObjectSelect, _objectSpread(_objectSpread({}, others), {}, {
       value: value,
-      mode: mode
+      mode: mode,
+      loading: loading
     }));
   }
   return /*#__PURE__*/_react2.default.createElement(_antd.Select, _objectSpread(_objectSpread({
@@ -105,6 +111,9 @@ var InternalSelect = (0, _react.connect)(function (props) {
     filterOption: filterOption,
     allowClear: true,
     dropdownMatchSelectWidth: false,
+    notFoundContent: loading ? /*#__PURE__*/_react2.default.createElement(_antd.Spin, null) : /*#__PURE__*/_react2.default.createElement(_antd.Empty, {
+      image: _antd.Empty.PRESENTED_IMAGE_SIMPLE
+    }),
     value: value
   }, others), {}, {
     onChange: function onChange(changed) {