@nocobase/client 0.10.0-alpha.2 → 0.10.0-alpha.3

package/lib/auth/SigninPage.js

@@ -7,14 +7,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.SigninPageProvider = exports.SigninPage = exports.AuthenticatorsContext = void 0;
 exports.useRedirect = useRedirect;
 exports.useSignIn = void 0;
-var _antd = require("antd");
-var _react = _interopRequireWildcard(require("react"));
 var _css = require("@emotion/css");
+var _react = require("@formily/react");
+var _antd = require("antd");
+var _react2 = _interopRequireWildcard(require("react"));
 var _reactI18next = require("react-i18next");
 var _reactRouterDom = require("react-router-dom");
 var _ = require("..");
 var _SigninPageExtension = require("./SigninPageExtension");
-var _react2 = require("@formily/react");
 var _templateObject, _templateObject2;
 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; }
@@ -33,19 +33,19 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 SigninPageContext = /*#__PURE__*/(0, _react.createContext)({});
+var SigninPageContext = /*#__PURE__*/(0, _react2.createContext)({});
 var SigninPageProvider = function SigninPageProvider(props) {
-  var components = (0, _react.useContext)(SigninPageContext);
+  var components = (0, _react2.useContext)(SigninPageContext);
   components[props.authType] = {
     component: props.component,
     tabTitle: props.tabTitle
   };
-  return /*#__PURE__*/_react.default.createElement(SigninPageContext.Provider, {
+  return /*#__PURE__*/_react2.default.createElement(SigninPageContext.Provider, {
     value: components
   }, props.children);
 };
 exports.SigninPageProvider = SigninPageProvider;
-var AuthenticatorsContext = /*#__PURE__*/(0, _react.createContext)([]);
+var AuthenticatorsContext = /*#__PURE__*/(0, _react2.createContext)([]);
 exports.AuthenticatorsContext = AuthenticatorsContext;
 function useRedirect() {
   var next = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '/admin';
@@ -53,14 +53,14 @@ function useRedirect() {
   var _useSearchParams = (0, _reactRouterDom.useSearchParams)(),
     _useSearchParams2 = _slicedToArray(_useSearchParams, 1),
     searchParams = _useSearchParams2[0];
-  return (0, _react.useCallback)(function () {
+  return (0, _react2.useCallback)(function () {
     navigate(searchParams.get('redirect') || '/admin', {
       replace: true
     });
   }, [navigate, searchParams]);
 }
 var useSignIn = function useSignIn(authenticator) {
-  var form = (0, _react2.useForm)();
+  var form = (0, _react.useForm)();
   var api = (0, _.useAPIClient)();
   var redirect = useRedirect();
   return {
@@ -91,13 +91,13 @@ var SigninPage = function SigninPage() {
     t = _useTranslation.t;
   (0, _.useCurrentDocumentTitle)('Signin');
   (0, _.useViewport)();
-  var signInPages = (0, _react.useContext)(SigninPageContext);
+  var signInPages = (0, _react2.useContext)(SigninPageContext);
   var api = (0, _.useAPIClient)();
-  var _useState = (0, _react.useState)([]),
+  var _useState = (0, _react2.useState)([]),
     _useState2 = _slicedToArray(_useState, 2),
     authenticators = _useState2[0],
     setAuthenticators = _useState2[1];
-  var _useState3 = (0, _react.useState)([]),
+  var _useState3 = (0, _react2.useState)([]),
     _useState4 = _slicedToArray(_useState3, 2),
     tabs = _useState4[0],
     setTabs = _useState4[1];
@@ -109,7 +109,7 @@ var SigninPage = function SigninPage() {
         return;
       }
       return _objectSpread({
-        component: /*#__PURE__*/(0, _react.createElement)(page.component, {
+        component: /*#__PURE__*/(0, _react2.createElement)(page.component, {
           authenticator: authenticator
         }),
         tabTitle: authenticator.title || page.tabTitle || authenticator.name
@@ -131,23 +131,26 @@ var SigninPage = function SigninPage() {
     }
   });
   if (!authenticators.length) {
-    return /*#__PURE__*/_react.default.createElement("div", {
+    return /*#__PURE__*/_react2.default.createElement("div", {
       style: {
         color: '#ccc'
       }
     }, t('Oops! No authentication methods available.'));
   }
-  return /*#__PURE__*/_react.default.createElement(AuthenticatorsContext.Provider, {
+  return /*#__PURE__*/_react2.default.createElement(AuthenticatorsContext.Provider, {
     value: authenticators
-  }, /*#__PURE__*/_react.default.createElement(_antd.Space, {
+  }, /*#__PURE__*/_react2.default.createElement(_antd.Space, {
     direction: "vertical",
     className: (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n          display: flex;\n        "])))
-  }, tabs.length > 1 ? /*#__PURE__*/_react.default.createElement(_antd.Tabs, null, tabs.map(function (tab) {
-    return /*#__PURE__*/_react.default.createElement(_antd.Tabs.TabPane, {
-      tab: tab.tabTitle,
-      key: tab.name
-    }, tab.component);
-  })) : tabs.length ? /*#__PURE__*/_react.default.createElement("div", null, tabs[0].component) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null), /*#__PURE__*/_react.default.createElement(_antd.Space, {
+  }, tabs.length > 1 ? /*#__PURE__*/_react2.default.createElement(_antd.Tabs, {
+    items: tabs.map(function (tab) {
+      return {
+        label: tab.tabTitle,
+        key: tab.name,
+        children: tab.component
+      };
+    })
+  }) : tabs.length ? /*#__PURE__*/_react2.default.createElement("div", null, tabs[0].component) : /*#__PURE__*/_react2.default.createElement(_react2.default.Fragment, null), /*#__PURE__*/_react2.default.createElement(_antd.Space, {
     direction: "vertical",
     className: (0, _css.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n            display: flex;\n          "])))
   }, signinExtension)));

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

@@ -317,21 +317,38 @@ var AddCollectionAction = function AddCollectionAction(props) {
   var compile = (0, _schemaComponent.useCompile)();
   var _useTranslation = (0, _reactI18next.useTranslation)(),
     t = _useTranslation.t;
-  var collectionTemplates = (0, _templates.templateOptions)();
-  var items = [];
-  collectionTemplates.forEach(function (item) {
-    if (item.divider) {
-      items.push({
-        type: 'divider'
+  var collectionTemplates = (0, _react2.useMemo)(_templates.templateOptions, []);
+  var items = (0, _react2.useMemo)(function () {
+    var result = [];
+    collectionTemplates.forEach(function (item) {
+      if (item.divider) {
+        result.push({
+          type: 'divider'
+        });
+      }
+      result.push({
+        label: compile(item.title),
+        key: item.name
       });
-    }
-    items.push({
-      label: compile(item.title),
-      key: item.name
     });
-  });
+    return result;
+  }, [collectionTemplates]);
   var _useResourceActionCon2 = (0, _ResourceActionProvider.useResourceActionContext)(),
     category = _useResourceActionCon2.state.category;
+  var menu = (0, _react2.useMemo)(function () {
+    return {
+      style: {
+        maxHeight: '60vh',
+        overflow: 'auto'
+      },
+      onClick: function onClick(info) {
+        var schema = getSchema(getTemplate(info.key), category, compile);
+        setSchema(schema);
+        setVisible(true);
+      },
+      items: items
+    };
+  }, [category, items]);
   return /*#__PURE__*/_react2.default.createElement(_recordProvider.RecordProvider, {
     record: record
   }, /*#__PURE__*/_react2.default.createElement(_schemaComponent.ActionContextProvider, {
@@ -343,18 +360,7 @@ var AddCollectionAction = function AddCollectionAction(props) {
     getPopupContainer: getContainer,
     trigger: trigger,
     align: align,
-    overlay: /*#__PURE__*/_react2.default.createElement(_antd2.Menu, {
-      style: {
-        maxHeight: '60vh',
-        overflow: 'auto'
-      },
-      onClick: function onClick(info) {
-        var schema = getSchema(getTemplate(info.key), category, compile);
-        setSchema(schema);
-        setVisible(true);
-      },
-      items: items
-    })
+    menu: menu
   }, children || /*#__PURE__*/_react2.default.createElement(_antd2.Button, {
     icon: /*#__PURE__*/_react2.default.createElement(_icons.PlusOutlined, null),
     type: 'primary'

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

@@ -18,7 +18,6 @@ var _schemaComponent = require("../../schema-component");
 var _ResourceActionProvider = require("../ResourceActionProvider");
 var _actionHooks = require("../action-hooks");
 var _hooks = require("../hooks");
-var _useOptions = require("../hooks/useOptions");
 var components = _interopRequireWildcard(require("./components"));
 var _interfaces = require("./interfaces");
 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); }
@@ -227,8 +226,7 @@ var AddFieldAction = function AddFieldAction(props) {
   var compile = (0, _schemaComponent.useCompile)();
   var _useTranslation = (0, _reactI18next.useTranslation)(),
     t = _useTranslation.t;
-  var options = (0, _useOptions.useOptions)();
-  var getFieldOptions = function getFieldOptions() {
+  var getFieldOptions = (0, _react2.useCallback)(function () {
     var _ref = getTemplate(record.template) || {},
       availableFieldInterfaces = _ref.availableFieldInterfaces;
     var _ref2 = availableFieldInterfaces || {},
@@ -270,19 +268,32 @@ var AddFieldAction = function AddFieldAction(props) {
       }
     });
     return optionArr;
-  };
-  return record.template !== 'view' && /*#__PURE__*/_react2.default.createElement(_recordProvider.RecordProvider, {
-    record: record
-  }, /*#__PURE__*/_react2.default.createElement(_schemaComponent.ActionContextProvider, {
-    value: {
-      visible: visible,
-      setVisible: setVisible
-    }
-  }, /*#__PURE__*/_react2.default.createElement(_antd2.Dropdown, {
-    getPopupContainer: getContainer,
-    trigger: trigger,
-    align: align,
-    overlay: /*#__PURE__*/_react2.default.createElement(_antd2.Menu, {
+  }, [getTemplate, record]);
+  var items = (0, _react2.useMemo)(function () {
+    return getFieldOptions().map(function (option) {
+      if (option.children.length === 0) {
+        return null;
+      }
+      return {
+        type: 'group',
+        label: compile(option.label),
+        title: compile(option.label),
+        key: option.label,
+        children: option.children.filter(function (child) {
+          return !['o2o', 'subTable', 'linkTo'].includes(child.name);
+        }).map(function (child) {
+          return {
+            label: compile(child.title),
+            title: compile(child.title),
+            key: child.name,
+            dataTargetScope: child.targetScope
+          };
+        })
+      };
+    });
+  }, [getFieldOptions]);
+  var menu = (0, _react2.useMemo)(function () {
+    return {
       style: {
         maxHeight: '60vh',
         overflow: 'auto'
@@ -296,20 +307,22 @@ var AddFieldAction = function AddFieldAction(props) {
           setSchema(schema);
           setVisible(true);
         }
-      }
-    }, getFieldOptions().map(function (option) {
-      return option.children.length > 0 && /*#__PURE__*/_react2.default.createElement(_antd2.Menu.ItemGroup, {
-        key: option.label,
-        title: compile(option.label)
-      }, option.children.filter(function (child) {
-        return !['o2o', 'subTable', 'linkTo'].includes(child.name);
-      }).map(function (child) {
-        return /*#__PURE__*/_react2.default.createElement(_antd2.Menu.Item, {
-          key: child.name,
-          "data-targetScope": child.targetScope
-        }, compile(child.title));
-      }));
-    }))
+      },
+      items: items
+    };
+  }, [getInterface, items, record]);
+  return record.template !== 'view' && /*#__PURE__*/_react2.default.createElement(_recordProvider.RecordProvider, {
+    record: record
+  }, /*#__PURE__*/_react2.default.createElement(_schemaComponent.ActionContextProvider, {
+    value: {
+      visible: visible,
+      setVisible: setVisible
+    }
+  }, /*#__PURE__*/_react2.default.createElement(_antd2.Dropdown, {
+    getPopupContainer: getContainer,
+    trigger: trigger,
+    align: align,
+    menu: menu
   }, children || /*#__PURE__*/_react2.default.createElement(_antd2.Button, {
     icon: /*#__PURE__*/_react2.default.createElement(_icons.PlusOutlined, null),
     type: 'primary'

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

@@ -130,26 +130,23 @@ var AddSubFieldAction = function AddSubFieldAction() {
   var options = (0, _useOptions.useOptions)();
   var _useTranslation = (0, _reactI18next.useTranslation)(),
     t = _useTranslation.t;
-  var items = options.map(function (option) {
-    var children = option.children.map(function (child) {
+  var items = (0, _react.useMemo)(function () {
+    return options.map(function (option) {
+      var children = option.children.map(function (child) {
+        return {
+          label: compile(child.title),
+          key: child.name
+        };
+      });
       return {
-        label: compile(child.title),
-        key: child.name
+        label: compile(option.label),
+        key: option.key,
+        children: children
       };
     });
+  }, [options]);
+  var menu = (0, _react.useMemo)(function () {
     return {
-      label: compile(option.label),
-      key: option.key,
-      children: children
-    };
-  });
-  return /*#__PURE__*/_react.default.createElement(_schemaComponent.ActionContextProvider, {
-    value: {
-      visible: visible,
-      setVisible: setVisible
-    }
-  }, /*#__PURE__*/_react.default.createElement(_antd2.Dropdown, {
-    overlay: /*#__PURE__*/_react.default.createElement(_antd2.Menu, {
       style: {
         maxHeight: '60vh',
         overflow: 'auto'
@@ -160,7 +157,15 @@ var AddSubFieldAction = function AddSubFieldAction() {
         setVisible(true);
       },
       items: items
-    })
+    };
+  }, [items]);
+  return /*#__PURE__*/_react.default.createElement(_schemaComponent.ActionContextProvider, {
+    value: {
+      visible: visible,
+      setVisible: setVisible
+    }
+  }, /*#__PURE__*/_react.default.createElement(_antd2.Dropdown, {
+    menu: menu
   }, /*#__PURE__*/_react.default.createElement(_antd2.Button, {
     icon: /*#__PURE__*/_react.default.createElement(_icons.PlusOutlined, null),
     type: 'primary'

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

@@ -9,6 +9,7 @@ var _core = require("@dnd-kit/core");
 var _react = require("@formily/react");
 var _shared = require("@formily/shared");
 var _antd = require("antd");
+var _lodash = _interopRequireDefault(require("lodash"));
 var _react2 = _interopRequireWildcard(require("react"));
 var _apiClient = require("../../api-client");
 var _schemaComponent = require("../../schema-component");
@@ -18,6 +19,7 @@ var _CollectionFields = require("./CollectionFields");
 var _collections = require("./schemas/collections");
 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 _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 _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 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); } }
@@ -270,26 +272,30 @@ var ConfigurationTabs = function ConfigurationTabs() {
       return _ref4.apply(this, arguments);
     };
   }();
-  var menu = function menu(item) {
-    return /*#__PURE__*/_react2.default.createElement(_antd.Menu, null, /*#__PURE__*/_react2.default.createElement(_antd.Menu.Item, {
-      key: 'edit'
-    }, /*#__PURE__*/_react2.default.createElement(_schemaComponent.SchemaComponent, {
-      schema: {
-        type: 'void',
-        properties: _defineProperty({}, (0, _shared.uid)(), {
-          'x-component': 'EditCategory',
-          'x-component-props': {
-            item: item
+  var menu = _lodash.default.memoize(function (item) {
+    return {
+      items: [{
+        key: 'edit',
+        label: /*#__PURE__*/_react2.default.createElement(_schemaComponent.SchemaComponent, {
+          schema: {
+            type: 'void',
+            properties: _defineProperty({}, (0, _shared.uid)(), {
+              'x-component': 'EditCategory',
+              'x-component-props': {
+                item: item
+              }
+            })
           }
         })
-      }
-    })), /*#__PURE__*/_react2.default.createElement(_antd.Menu.Item, {
-      key: "delete",
-      onClick: function onClick() {
-        return remove(item.id);
-      }
-    }, compile("{{t('Delete category')}}")));
-  };
+      }, {
+        key: 'delete',
+        label: compile("{{t('Delete category')}}"),
+        onClick: function onClick() {
+          return remove(item.id);
+        }
+      }]
+    };
+  });
   return /*#__PURE__*/_react2.default.createElement(DndProvider, null, /*#__PURE__*/_react2.default.createElement(_antd.Tabs, {
     addIcon: /*#__PURE__*/_react2.default.createElement(_schemaComponent.SchemaComponent, {
       schema: {
@@ -312,36 +318,38 @@ var ConfigurationTabs = function ConfigurationTabs() {
     destroyInactiveTabPane: true,
     tabBarStyle: {
       marginBottom: '0px'
-    }
-  }, tabsItems.map(function (item) {
-    return /*#__PURE__*/_react2.default.createElement(_antd.Tabs.TabPane, {
-      tab: item.id !== 'all' ? /*#__PURE__*/_react2.default.createElement("div", {
-        "data-no-dnd": "true"
-      }, /*#__PURE__*/_react2.default.createElement(TabTitle, {
-        item: item
-      })) : compile(item.name),
-      key: item.id,
-      closable: item.closable,
-      closeIcon: /*#__PURE__*/_react2.default.createElement(_antd.Dropdown, {
-        overlay: menu(item)
-      }, /*#__PURE__*/_react2.default.createElement(_icons.MenuOutlined, null))
-    }, /*#__PURE__*/_react2.default.createElement(_antd.Card, {
-      bordered: false
-    }, /*#__PURE__*/_react2.default.createElement(_schemaComponent.SchemaComponentOptions, {
-      components: {
-        CollectionFields: _CollectionFields.CollectionFields
-      },
-      inherit: true,
-      scope: {
-        loadCategories: loadCategories,
-        categoryVisible: item.id === 'all',
-        categoryId: item.id
-      }
-    }, /*#__PURE__*/_react2.default.createElement(_react.RecursionField, {
-      name: key,
-      schema: item.schema,
-      onlyRenderProperties: true
-    }))));
-  })));
+    },
+    items: tabsItems.map(function (item) {
+      return {
+        label: item.id !== 'all' ? /*#__PURE__*/_react2.default.createElement("div", {
+          "data-no-dnd": "true"
+        }, /*#__PURE__*/_react2.default.createElement(TabTitle, {
+          item: item
+        })) : compile(item.name),
+        key: item.id,
+        closable: item.closable,
+        closeIcon: /*#__PURE__*/_react2.default.createElement(_antd.Dropdown, {
+          menu: menu(item)
+        }, /*#__PURE__*/_react2.default.createElement(_icons.MenuOutlined, null)),
+        children: /*#__PURE__*/_react2.default.createElement(_antd.Card, {
+          bordered: false
+        }, /*#__PURE__*/_react2.default.createElement(_schemaComponent.SchemaComponentOptions, {
+          components: {
+            CollectionFields: _CollectionFields.CollectionFields
+          },
+          inherit: true,
+          scope: {
+            loadCategories: loadCategories,
+            categoryVisible: item.id === 'all',
+            categoryId: item.id
+          }
+        }, /*#__PURE__*/_react2.default.createElement(_react.RecursionField, {
+          name: key,
+          schema: item.schema,
+          onlyRenderProperties: true
+        })))
+      };
+    })
+  }));
 };
 exports.ConfigurationTabs = ConfigurationTabs;

package/lib/collection-manager/hooks/useOptions.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useOptions = void 0;
 var _set = _interopRequireDefault(require("lodash/set"));
+var _react = require("react");
 var _useCollectionManager2 = require("./useCollectionManager");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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); }
@@ -16,42 +17,44 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 var useOptions = function useOptions() {
   var _useCollectionManager = (0, _useCollectionManager2.useCollectionManager)(),
     interfaces = _useCollectionManager.interfaces;
-  var fields = {};
-  Object.keys(interfaces).forEach(function (type) {
-    var schema = interfaces[type];
-    registerField(schema.group || 'others', type, _objectSpread({
-      order: 0
-    }, schema));
-  });
-  function registerField(group, type, schema) {
-    fields[group] = fields[group] || {};
-    (0, _set.default)(fields, [group, type], schema);
-  }
-  var groupLabels = {
-    basic: '{{t("Basic")}}',
-    choices: '{{t("Choices")}}',
-    media: '{{t("Media")}}',
-    datetime: '{{t("Date & Time")}}',
-    relation: '{{t("Relation")}}',
-    advanced: '{{t("Advanced type")}}',
-    systemInfo: '{{t("System info")}}',
-    others: '{{t("Others")}}'
-  };
-  return Object.keys(groupLabels).map(function (groupName) {
-    return {
-      label: groupLabels[groupName],
-      key: groupName,
-      children: Object.keys(fields[groupName] || {}).map(function (type) {
-        var field = fields[groupName][type];
-        return _objectSpread({
-          value: type,
-          label: field.title,
-          name: type
-        }, fields[groupName][type]);
-      }).sort(function (a, b) {
-        return a.order - b.order;
-      })
+  return (0, _react.useMemo)(function () {
+    var fields = {};
+    Object.keys(interfaces).forEach(function (type) {
+      var schema = interfaces[type];
+      registerField(schema.group || 'others', type, _objectSpread({
+        order: 0
+      }, schema));
+    });
+    function registerField(group, type, schema) {
+      fields[group] = fields[group] || {};
+      (0, _set.default)(fields, [group, type], schema);
+    }
+    var groupLabels = {
+      basic: '{{t("Basic")}}',
+      choices: '{{t("Choices")}}',
+      media: '{{t("Media")}}',
+      datetime: '{{t("Date & Time")}}',
+      relation: '{{t("Relation")}}',
+      advanced: '{{t("Advanced type")}}',
+      systemInfo: '{{t("System info")}}',
+      others: '{{t("Others")}}'
     };
-  });
+    return Object.keys(groupLabels).map(function (groupName) {
+      return {
+        label: groupLabels[groupName],
+        key: groupName,
+        children: Object.keys(fields[groupName] || {}).map(function (type) {
+          var field = fields[groupName][type];
+          return _objectSpread({
+            value: type,
+            label: field.title,
+            name: type
+          }, fields[groupName][type]);
+        }).sort(function (a, b) {
+          return a.order - b.order;
+        })
+      };
+    });
+  }, [interfaces]);
 };
 exports.useOptions = useOptions;

package/lib/collection-manager/interfaces/integer.js

@@ -33,7 +33,7 @@ var integer = {
       'x-component': 'InputNumber',
       'x-component-props': {
         stringMode: true,
-        step: '0'
+        step: '1'
       },
       'x-validator': 'integer'
     }

package/lib/collection-manager/interfaces/number.js

@@ -28,7 +28,7 @@ var number = {
       'x-component': 'InputNumber',
       'x-component-props': {
         stringMode: true,
-        step: '0'
+        step: '1'
       }
     }
   },
@@ -41,9 +41,9 @@ var number = {
       title: '{{t("Precision")}}',
       'x-component': 'Select',
       'x-decorator': 'FormItem',
-      default: '0',
+      default: '1',
       enum: [{
-        value: '0',
+        value: '1',
         label: '1'
       }, {
         value: '0.1',