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

package/es/acl/Configuration/MenuItemsProvider.js

@@ -1,7 +1,7 @@
 import { Spin } from 'antd';
 import React, { createContext, useContext } from 'react';
 import { useRequest } from '../../api-client';
-import { useRoute } from '../../route-switch';
+import { useAdminSchemaUid } from '../../hooks';
 var MenuItemsContext = /*#__PURE__*/createContext(null);
 export var toItems = function toItems() {
   var properties = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
@@ -26,9 +26,9 @@ export var useMenuItems = function useMenuItems() {
 };
 export var MenuItemsProvider = function MenuItemsProvider(props) {
   var _service$data, _service$data$data;
-  var route = useRoute();
+  var adminSchemaUid = useAdminSchemaUid();
   var options = {
-    url: "uiSchemas:getProperties/".concat(route.uiSchemaUid)
+    url: "uiSchemas:getProperties/".concat(adminSchemaUid)
   };
   var service = useRequest(options);
   if (service.loading) {

package/es/application/Application.js

@@ -29,6 +29,8 @@ import { Link, NavLink } from 'react-router-dom';
 import { ACLProvider } from '../acl';
 import { AntdConfigProvider } from '../antd-config-provider';
 import { APIClient, APIClientProvider } from '../api-client';
+import { SigninPage, SignupPage } from '../auth';
+import { SigninPageExtensionProvider } from '../auth/SigninPageExtension';
 import { BlockSchemaComponentProvider } from '../block-provider';
 import { RemoteDocumentTitleProvider } from '../document-title';
 import { i18n } from '../i18n';
@@ -40,8 +42,6 @@ import { ErrorFallback } from '../schema-component/antd/error-fallback';
 import { SchemaInitializerProvider } from '../schema-initializer';
 import { BlockTemplateDetails, BlockTemplatePage } from '../schema-templates';
 import { SystemSettingsProvider } from '../system-settings';
-import { SigninPage, SignupPage } from '../auth';
-import { SigninPageExtensionProvider } from '../auth/SigninPageExtension';
 import { compose } from './compose';
 export var getCurrentTimezone = function getCurrentTimezone() {
   var timezoneOffset = new Date().getTimezoneOffset() / -60;

package/es/auth/SigninPage.js

@@ -15,14 +15,14 @@ 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; }
-import { Space, Tabs } from 'antd';
-import React, { useCallback, useContext, createContext, createElement, useState } from 'react';
 import { css } from '@emotion/css';
+import { useForm } from '@formily/react';
+import { Space, Tabs } from 'antd';
+import React, { createContext, createElement, useCallback, useContext, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate, useSearchParams } from 'react-router-dom';
 import { useAPIClient, useCurrentDocumentTitle, useRequest, useViewport } from '..';
 import { useSigninPageExtension } from './SigninPageExtension';
-import { useForm } from '@formily/react';
 var SigninPageContext = /*#__PURE__*/createContext({});
 export var SigninPageProvider = function SigninPageProvider(props) {
   var components = useContext(SigninPageContext);
@@ -129,12 +129,15 @@ export var SigninPage = function SigninPage() {
   }, /*#__PURE__*/React.createElement(Space, {
     direction: "vertical",
     className: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n          display: flex;\n        "])))
-  }, tabs.length > 1 ? /*#__PURE__*/React.createElement(Tabs, null, tabs.map(function (tab) {
-    return /*#__PURE__*/React.createElement(Tabs.TabPane, {
-      tab: tab.tabTitle,
-      key: tab.name
-    }, tab.component);
-  })) : tabs.length ? /*#__PURE__*/React.createElement("div", null, tabs[0].component) : /*#__PURE__*/React.createElement(React.Fragment, null), /*#__PURE__*/React.createElement(Space, {
+  }, tabs.length > 1 ? /*#__PURE__*/React.createElement(Tabs, {
+    items: tabs.map(function (tab) {
+      return {
+        label: tab.tabTitle,
+        key: tab.name,
+        children: tab.component
+      };
+    })
+  }) : tabs.length ? /*#__PURE__*/React.createElement("div", null, tabs[0].component) : /*#__PURE__*/React.createElement(React.Fragment, null), /*#__PURE__*/React.createElement(Space, {
     direction: "vertical",
     className: css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n            display: flex;\n          "])))
   }, signinExtension)));

package/es/block-provider/GanttBlockProvider.js

@@ -12,10 +12,10 @@ 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); }
 import { useField } from '@formily/react';
 import React, { createContext, useContext, useEffect, useState } from 'react';
-import { BlockProvider, useBlockRequestContext } from './BlockProvider';
-import { TableBlockProvider } from './TableBlockProvider';
 import { useACLRoleContext } from '../acl/ACLProvider';
 import { useCollection } from '../collection-manager/hooks';
+import { BlockProvider, useBlockRequestContext } from './BlockProvider';
+import { TableBlockProvider } from './TableBlockProvider';
 export var GanttBlockContext = /*#__PURE__*/createContext({});
 var formatData = function formatData() {
   var data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
@@ -28,9 +28,10 @@ var formatData = function formatData() {
     var disable = checkPermassion(item);
     var percent = item[fieldNames.progress] * 100;
     if (item.children && item.children.length) {
+      var _item$fieldNames$star, _item$fieldNames$end;
       tasks.push({
-        start: new Date(item[fieldNames.start]),
-        end: new Date(item[fieldNames.end]),
+        start: new Date((_item$fieldNames$star = item[fieldNames.start]) !== null && _item$fieldNames$star !== void 0 ? _item$fieldNames$star : undefined),
+        end: new Date((_item$fieldNames$end = item[fieldNames.end]) !== null && _item$fieldNames$end !== void 0 ? _item$fieldNames$end : undefined),
         name: item[fieldNames.title],
         id: item.id + '',
         type: 'project',

package/es/block-provider/TableBlockProvider.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 export declare const TableBlockContext: React.Context<any>;
+export declare function getIdsWithChildren(nodes: any): any[];
 export declare const TableBlockProvider: (props: any) => React.JSX.Element;
 export declare const useTableBlockContext: () => any;
 export declare const useTableBlockProps: () => {

package/es/block-provider/TableBlockProvider.js

@@ -1,8 +1,4 @@
 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 _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); } }
 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); }); }; }
@@ -13,35 +9,72 @@ 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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _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 _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
+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; }
 import { createForm } from '@formily/core';
 import { FormContext, useField, useFieldSchema } from '@formily/react';
 import React, { createContext, useContext, useEffect, useMemo, useState } from 'react';
 import { useCollectionManager } from '../collection-manager';
 import { useFilterBlock } from '../filter-provider/FilterProvider';
 import { useRecord } from '../record-provider';
-import { FixedBlockWrapper, SchemaComponentOptions, removeNullCondition } from '../schema-component';
+import { FixedBlockWrapper, removeNullCondition, SchemaComponentOptions } from '../schema-component';
 import { BlockProvider, RenderChildrenWithAssociationFilter, useBlockRequestContext } from './BlockProvider';
-import { mergeFilter } from './SharedFilterProvider';
 import { findFilterTargets } from './hooks';
+import { mergeFilter } from './SharedFilterProvider';
 export var TableBlockContext = /*#__PURE__*/createContext({});
+export function getIdsWithChildren(nodes) {
+  var ids = [];
+  if (nodes) {
+    var _iterator = _createForOfIteratorHelper(nodes),
+      _step;
+    try {
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        var node = _step.value;
+        if ((node === null || node === void 0 ? void 0 : node.children) && node.children.length > 0) {
+          ids.push(node.id);
+          ids.push.apply(ids, _toConsumableArray(getIdsWithChildren(node === null || node === void 0 ? void 0 : node.children)));
+        }
+      }
+    } catch (err) {
+      _iterator.e(err);
+    } finally {
+      _iterator.f();
+    }
+  }
+  return ids;
+}
 var InternalTableBlockProvider = function InternalTableBlockProvider(props) {
   var params = props.params,
     showIndex = props.showIndex,
     dragSort = props.dragSort,
     rowKey = props.rowKey,
-    childrenColumnName = props.childrenColumnName;
+    childrenColumnName = props.childrenColumnName,
+    fieldNames = props.fieldNames;
   var field = useField();
   var _useBlockRequestConte = useBlockRequestContext(),
     resource = _useBlockRequestConte.resource,
     service = _useBlockRequestConte.service;
-  var _useState = useState(false),
+  var fieldSchema = useFieldSchema();
+  var _ref = (fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-decorator-props']) || {},
+    treeTable = _ref.treeTable;
+  var _useState = useState(fieldNames ? true : false),
     _useState2 = _slicedToArray(_useState, 2),
     expandFlag = _useState2[0],
     _setExpandFlag = _useState2[1];
+  var allIncludesChildren = useMemo(function () {
+    if (treeTable !== false) {
+      var _service$data;
+      var keys = getIdsWithChildren(service === null || service === void 0 ? void 0 : (_service$data = service.data) === null || _service$data === void 0 ? void 0 : _service$data.data);
+      return keys || [];
+    }
+  }, [service === null || service === void 0 ? void 0 : service.loading]);
   return /*#__PURE__*/React.createElement(FixedBlockWrapper, null, /*#__PURE__*/React.createElement(TableBlockContext.Provider, {
     value: {
       field: field,
@@ -53,6 +86,7 @@ var InternalTableBlockProvider = function InternalTableBlockProvider(props) {
       rowKey: rowKey,
       expandFlag: expandFlag,
       childrenColumnName: childrenColumnName,
+      allIncludesChildren: allIncludesChildren,
       setExpandFlag: function setExpandFlag() {
         return _setExpandFlag(!expandFlag);
       }
@@ -117,8 +151,8 @@ export var TableBlockProvider = function TableBlockProvider(props) {
     getCollection = _useCollectionManager.getCollection,
     getCollectionField = _useCollectionManager.getCollectionField;
   var collection = getCollection(props.collection);
-  var _ref = (fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-decorator-props']) || {},
-    treeTable = _ref.treeTable;
+  var _ref2 = (fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-decorator-props']) || {},
+    treeTable = _ref2.treeTable;
   if (props.dragSort) {
     params['sort'] = ['sort'];
   }
@@ -198,13 +232,13 @@ export var useTableBlockProps = function useTableBlockProps() {
       ctx.field.data.selectedRowKeys = selectedRowKeys;
       ctx === null || ctx === void 0 ? void 0 : (_ctx$field3 = ctx.field) === null || _ctx$field3 === void 0 ? void 0 : (_ctx$field3$onRowSele = _ctx$field3.onRowSelect) === null || _ctx$field3$onRowSele === void 0 ? void 0 : _ctx$field3$onRowSele.call(_ctx$field3, selectedRowKeys);
     },
-    onRowDragEnd: function onRowDragEnd(_ref2) {
+    onRowDragEnd: function onRowDragEnd(_ref3) {
       return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
         var from, to;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              from = _ref2.from, to = _ref2.to;
+              from = _ref3.from, to = _ref3.to;
               _context.next = 3;
               return ctx.resource.move({
                 sourceId: from[ctx.rowKey || 'id'],
@@ -219,10 +253,10 @@ export var useTableBlockProps = function useTableBlockProps() {
         }, _callee);
       }))();
     },
-    onChange: function onChange(_ref3, filters, sorter) {
+    onChange: function onChange(_ref4, filters, sorter) {
       var _ctx$service$params, _ctx$service$params$, _ctx$service$params2;
-      var current = _ref3.current,
-        pageSize = _ref3.pageSize;
+      var current = _ref4.current,
+        pageSize = _ref4.pageSize;
       var sort = sorter.order ? sorter.order === "ascend" ? [sorter.field] : ["-".concat(sorter.field)] : globalSort || ((_ctx$service$params = ctx.service.params) === null || _ctx$service$params === void 0 ? void 0 : (_ctx$service$params$ = _ctx$service$params[0]) === null || _ctx$service$params$ === void 0 ? void 0 : _ctx$service$params$.sort);
       ctx.service.run(_objectSpread(_objectSpread({}, (_ctx$service$params2 = ctx.service.params) === null || _ctx$service$params2 === void 0 ? void 0 : _ctx$service$params2[0]), {}, {
         page: current,

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

@@ -21,9 +21,9 @@ import { DownOutlined, PlusOutlined } from '@ant-design/icons';
 import { ArrayTable } from '@formily/antd';
 import { useField, useForm } from '@formily/react';
 import { uid } from '@formily/shared';
-import { Button, Dropdown, Menu } from 'antd';
+import { Button, Dropdown } from 'antd';
 import { cloneDeep } from 'lodash';
-import React, { useState } from 'react';
+import React, { useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useRequest } from '../../api-client';
 import { RecordProvider, useRecord } from '../../record-provider';
@@ -308,21 +308,38 @@ export var AddCollectionAction = function AddCollectionAction(props) {
   var compile = useCompile();
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
-  var collectionTemplates = templateOptions();
-  var items = [];
-  collectionTemplates.forEach(function (item) {
-    if (item.divider) {
-      items.push({
-        type: 'divider'
+  var collectionTemplates = useMemo(templateOptions, []);
+  var items = 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 = useResourceActionContext(),
     category = _useResourceActionCon2.state.category;
+  var menu = 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__*/React.createElement(RecordProvider, {
     record: record
   }, /*#__PURE__*/React.createElement(ActionContextProvider, {
@@ -334,18 +351,7 @@ export var AddCollectionAction = function AddCollectionAction(props) {
     getPopupContainer: getContainer,
     trigger: trigger,
     align: align,
-    overlay: /*#__PURE__*/React.createElement(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__*/React.createElement(Button, {
     icon: /*#__PURE__*/React.createElement(PlusOutlined, null),
     type: 'primary'

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

@@ -17,9 +17,9 @@ import { PlusOutlined } from '@ant-design/icons';
 import { ArrayTable } from '@formily/antd';
 import { useField, useForm } from '@formily/react';
 import { uid } from '@formily/shared';
-import { Button, Dropdown, Menu } from 'antd';
+import { Button, Dropdown } from 'antd';
 import { cloneDeep } from 'lodash';
-import React, { useState } from 'react';
+import React, { useCallback, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useRequest } from '../../api-client';
 import { RecordProvider, useRecord } from '../../record-provider';
@@ -27,7 +27,6 @@ import { ActionContextProvider, SchemaComponent, useActionContext, useCompile }
 import { useResourceActionContext, useResourceContext } from '../ResourceActionProvider';
 import { useCancelAction } from '../action-hooks';
 import { useCollectionManager } from '../hooks';
-import { useOptions } from '../hooks/useOptions';
 import * as components from './components';
 import { getOptions } from './interfaces';
 var getSchema = function getSchema(schema, record, compile) {
@@ -217,8 +216,7 @@ export var AddFieldAction = function AddFieldAction(props) {
   var compile = useCompile();
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
-  var options = useOptions();
-  var getFieldOptions = function getFieldOptions() {
+  var getFieldOptions = useCallback(function () {
     var _ref = getTemplate(record.template) || {},
       availableFieldInterfaces = _ref.availableFieldInterfaces;
     var _ref2 = availableFieldInterfaces || {},
@@ -260,19 +258,32 @@ export var AddFieldAction = function AddFieldAction(props) {
       }
     });
     return optionArr;
-  };
-  return record.template !== 'view' && /*#__PURE__*/React.createElement(RecordProvider, {
-    record: record
-  }, /*#__PURE__*/React.createElement(ActionContextProvider, {
-    value: {
-      visible: visible,
-      setVisible: setVisible
-    }
-  }, /*#__PURE__*/React.createElement(Dropdown, {
-    getPopupContainer: getContainer,
-    trigger: trigger,
-    align: align,
-    overlay: /*#__PURE__*/React.createElement(Menu, {
+  }, [getTemplate, record]);
+  var items = 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 = useMemo(function () {
+    return {
       style: {
         maxHeight: '60vh',
         overflow: 'auto'
@@ -286,20 +297,22 @@ export var AddFieldAction = function AddFieldAction(props) {
           setSchema(schema);
           setVisible(true);
         }
-      }
-    }, getFieldOptions().map(function (option) {
-      return option.children.length > 0 && /*#__PURE__*/React.createElement(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__*/React.createElement(Menu.Item, {
-          key: child.name,
-          "data-targetScope": child.targetScope
-        }, compile(child.title));
-      }));
-    }))
+      },
+      items: items
+    };
+  }, [getInterface, items, record]);
+  return record.template !== 'view' && /*#__PURE__*/React.createElement(RecordProvider, {
+    record: record
+  }, /*#__PURE__*/React.createElement(ActionContextProvider, {
+    value: {
+      visible: visible,
+      setVisible: setVisible
+    }
+  }, /*#__PURE__*/React.createElement(Dropdown, {
+    getPopupContainer: getContainer,
+    trigger: trigger,
+    align: align,
+    menu: menu
   }, children || /*#__PURE__*/React.createElement(Button, {
     icon: /*#__PURE__*/React.createElement(PlusOutlined, null),
     type: 'primary'

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

@@ -16,9 +16,9 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 import { PlusOutlined } from '@ant-design/icons';
 import { ArrayTable } from '@formily/antd';
 import { uid } from '@formily/shared';
-import { Button, Dropdown, Menu } from 'antd';
+import { Button, Dropdown } from 'antd';
 import { cloneDeep } from 'lodash';
-import React, { useState } from 'react';
+import React, { useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useRequest } from '../../api-client';
 import { RecordProvider } from '../../record-provider';
@@ -122,26 +122,23 @@ export var AddSubFieldAction = function AddSubFieldAction() {
   var options = useOptions();
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
-  var items = options.map(function (option) {
-    var children = option.children.map(function (child) {
+  var items = 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 = useMemo(function () {
     return {
-      label: compile(option.label),
-      key: option.key,
-      children: children
-    };
-  });
-  return /*#__PURE__*/React.createElement(ActionContextProvider, {
-    value: {
-      visible: visible,
-      setVisible: setVisible
-    }
-  }, /*#__PURE__*/React.createElement(Dropdown, {
-    overlay: /*#__PURE__*/React.createElement(Menu, {
       style: {
         maxHeight: '60vh',
         overflow: 'auto'
@@ -152,7 +149,15 @@ export var AddSubFieldAction = function AddSubFieldAction() {
         setVisible(true);
       },
       items: items
-    })
+    };
+  }, [items]);
+  return /*#__PURE__*/React.createElement(ActionContextProvider, {
+    value: {
+      visible: visible,
+      setVisible: setVisible
+    }
+  }, /*#__PURE__*/React.createElement(Dropdown, {
+    menu: menu
   }, /*#__PURE__*/React.createElement(Button, {
     icon: /*#__PURE__*/React.createElement(PlusOutlined, null),
     type: 'primary'