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

package/es/locale/es_ES.js

@@ -280,7 +280,7 @@ export default {
   "Display field title": "Mostrar título de campo",
   "Field component": "Componente del campo",
   "Subtable": "Subtabla",
-  "Subform": "Subformulario",
+  "Sub-form": "Subformulario",
   "Record picker": "Selector de registros",
   "Toggles the subfield mode": "Alterna el modo de subcampo",
   "Selector mode": "Modo selector",

package/es/locale/ja_JP.d.ts

@@ -540,7 +540,7 @@ declare const _default: {
     "Quick upload": string;
     "Select file": string;
     Subtable: string;
-    Subform: string;
+    "Sub-form": string;
     "Sub-details": string;
     "Field mode": string;
     "Allow add new data": string;
@@ -612,5 +612,7 @@ declare const _default: {
     "Update or create": string;
     "Find by the following fields": string;
     Create: string;
+    "Current form": string;
+    "Current object": string;
 };
 export default _default;

package/es/locale/ja_JP.js

@@ -540,7 +540,7 @@ export default {
   "Quick upload": "クイックアップロード",
   "Select file": "ファイルを選択",
   "Subtable": "サブテーブル",
-  "Subform": "サブフォーム",
+  "Sub-form": "サブフォーム",
   "Sub-details": "サブリスト",
   "Field mode": "フィールドコンポーネント",
   "Allow add new data": "データの追加を許可",
@@ -612,5 +612,7 @@ export default {
   "First or create": "存在しない場合に追加",
   "Update or create": "存在しなければ新規、存在すれば更新",
   "Find by the following fields": "次のフィールドで検索",
-  "Create": "新規のみ"
+  "Create": "新規のみ",
+  "Current form": "現在のフォーム",
+  "Current object": "現在のオブジェクト"
 };

package/es/locale/pt_BR.d.ts

@@ -244,7 +244,7 @@ declare const _default: {
     "Select file": string;
     "Allow multiple": string;
     Subtable: string;
-    Subform: string;
+    "Sub-form": string;
     "Record picker": string;
     "Toggles the subfield mode": string;
     "Selector mode": string;

package/es/locale/pt_BR.js

@@ -244,7 +244,7 @@ export default {
   "Select file": "Selecionar arquivo",
   "Allow multiple": "Permitir múltiplos",
   "Subtable": "Subtabela",
-  "Subform": "Subformulário",
+  "Sub-form": "Subformulário",
   "Record picker": "Selecionador de registros",
   "Toggles the subfield mode": "Alterna o modo de subcampo",
   "Selector mode": "Modo de seleção",

package/es/locale/ru_RU.d.ts

@@ -478,7 +478,7 @@ declare const _default: {
     "Quick upload": string;
     "Select file": string;
     Subtable: string;
-    Subform: string;
+    "Sub-form": string;
     "Regular expression": string;
     "Enabled languages": string;
     "View all plugins": string;

package/es/locale/ru_RU.js

@@ -478,7 +478,7 @@ export default {
   "Quick upload": "Быстрая загрузка",
   "Select file": "Выбрать файл",
   "Subtable": "Подтаблица",
-  "Subform": "Подформа",
+  "Sub-form": "Подформа",
   "Regular expression": "Образец",
   "Enabled languages": "Включенные языки",
   "View all plugins": "Посмотреть все плагины",

package/es/locale/zh_CN.d.ts

@@ -313,7 +313,7 @@ declare const _default: {
     "Quick upload": string;
     "Select file": string;
     Subtable: string;
-    Subform: string;
+    "Sub-form": string;
     "Sub-details": string;
     "Record picker": string;
     "Toggles the subfield mode": string;
@@ -748,6 +748,8 @@ declare const _default: {
     "Update or create": string;
     "Find by the following fields": string;
     Create: string;
+    "Current form": string;
+    "Current object": string;
     "Quick create": string;
     Dropdown: string;
     "Pop-up": string;

package/es/locale/zh_CN.js

@@ -313,7 +313,7 @@ export default {
   "Quick upload": "快速上传",
   "Select file": "选择文件",
   "Subtable": "子表格",
-  "Subform": "子表单",
+  "Sub-form": "子表单",
   "Sub-details": "子详情",
   "Record picker": "数据选择器",
   "Toggles the subfield mode": "切换子字段模式",
@@ -749,6 +749,8 @@ export default {
   "Update or create": "不存在时新增,存在时更新",
   "Find by the following fields": "通过以下字段查找",
   "Create": "仅新增",
+  "Current form": "当前表单",
+  "Current object": "当前对象",
   "Quick create": "快速创建",
   "Dropdown": "下拉菜单",
   "Pop-up": "弹窗",

package/es/pm/Card.js

@@ -10,14 +10,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 React, { useEffect, useMemo, useState, useCallback } from 'react';
-import { useAPIClient, useRequest } from '../api-client';
-import { Avatar, Card, message, Modal, Popconfirm, Spin, Switch, Tabs, Tag, Tooltip, Typography } from 'antd';
+import { DeleteOutlined, SettingOutlined } from '@ant-design/icons';
 import { css } from '@emotion/css';
+import { Avatar, Card, Modal, Popconfirm, Spin, Switch, Tabs, Tag, Tooltip, Typography, message } from 'antd';
 import cls from 'classnames';
-import { useNavigate } from 'react-router-dom';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { DeleteOutlined, SettingOutlined } from '@ant-design/icons';
+import { useNavigate } from 'react-router-dom';
+import { useAPIClient, useRequest } from '../api-client';
 import { useParseMarkdown } from '../schema-component/antd/markdown/util';
 /**
  * get color by string

package/es/pm/PluginManagerLink.js

@@ -16,12 +16,13 @@ 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 { ApiOutlined, SettingOutlined } from '@ant-design/icons';
 import { Button, Dropdown, Tooltip } from 'antd';
-import React, { useContext, useState } from 'react';
+import _ from 'lodash';
+import React, { useContext, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
 import { useACLRoleContext } from '../acl/ACLProvider';
 import { ActionContextProvider, useCompile } from '../schema-component';
-import { getPluginsTabs, SettingsCenterContext } from './index';
+import { SettingsCenterContext, getPluginsTabs } from './index';
 export var PluginManagerLink = function PluginManagerLink() {
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
@@ -36,7 +37,7 @@ export var PluginManagerLink = function PluginManagerLink() {
     }
   }));
 };
-var getBookmarkTabs = function getBookmarkTabs(data) {
+var getBookmarkTabs = _.memoize(function (data) {
   var bookmarkTabs = [];
   data.forEach(function (plugin) {
     var tabs = plugin.tabs;
@@ -47,7 +48,7 @@ var getBookmarkTabs = function getBookmarkTabs(data) {
     });
   });
   return bookmarkTabs;
-};
+});
 export var SettingsCenterDropdown = function SettingsCenterDropdown() {
   var _useACLRoleContext = useACLRoleContext(),
     _useACLRoleContext$sn = _useACLRoleContext.snippets,
@@ -63,14 +64,8 @@ export var SettingsCenterDropdown = function SettingsCenterDropdown() {
   var itemData = useContext(SettingsCenterContext);
   var pluginsTabs = getPluginsTabs(itemData, snippets);
   var bookmarkTabs = getBookmarkTabs(pluginsTabs);
-  return /*#__PURE__*/React.createElement(ActionContextProvider, {
-    value: {
-      visible: visible,
-      setVisible: setVisible
-    }
-  }, /*#__PURE__*/React.createElement(Dropdown, {
-    placement: "bottom",
-    menu: {
+  var menu = useMemo(function () {
+    return {
       items: [].concat(_toConsumableArray(bookmarkTabs.map(function (tab) {
         return {
           key: "/admin/settings/".concat(tab.path),
@@ -86,7 +81,16 @@ export var SettingsCenterDropdown = function SettingsCenterDropdown() {
         var key = _ref.key;
         navigate(key);
       }
+    };
+  }, [bookmarkTabs]);
+  return /*#__PURE__*/React.createElement(ActionContextProvider, {
+    value: {
+      visible: visible,
+      setVisible: setVisible
     }
+  }, /*#__PURE__*/React.createElement(Dropdown, {
+    placement: "bottom",
+    menu: menu
   }, /*#__PURE__*/React.createElement(Button, {
     icon: /*#__PURE__*/React.createElement(SettingOutlined, null)
   })));

package/es/pm/index.d.ts

@@ -1,3 +1,4 @@
+import _ from 'lodash';
 import React from 'react';
 export interface TData {
     data: IPluginData[];
@@ -29,7 +30,7 @@ export interface AllowedActions {
     destroy: number[];
 }
 export declare const SettingsCenterContext: React.Context<any>;
-export declare const getPluginsTabs: (items: any, snippets: any) => any[];
+export declare const getPluginsTabs: ((items: any, snippets: any) => any[]) & _.MemoizedFunction;
 export declare const SettingsCenterProvider: (props: any) => React.JSX.Element;
 export declare const PMProvider: (props: any) => React.JSX.Element;
 export default PMProvider;

package/es/pm/index.js

@@ -9,9 +9,10 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+import { PageHeader } from '@ant-design/pro-layout';
 import { css } from '@emotion/css';
-import { Layout, Menu, PageHeader, Result, Spin, Tabs } from 'antd';
-import { sortBy } from 'lodash';
+import { Layout, Menu, Result, Spin, Tabs } from 'antd';
+import _, { sortBy } from 'lodash';
 import React, { createContext, useContext, useEffect, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Navigate, useNavigate, useParams } from 'react-router-dom';
@@ -109,23 +110,28 @@ var PluginList = function PluginList(props) {
     }
   }, []);
   return snippets.includes('pm') ? /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(PageHeader, {
+    style: {
+      backgroundColor: 'white',
+      paddingBottom: 0
+    },
     ghost: false,
     title: t('Plugin manager'),
     footer: /*#__PURE__*/React.createElement(Tabs, {
       activeKey: tabName,
       onChange: function onChange(activeKey) {
         navigate("/admin/pm/list/".concat(activeKey));
-      }
-    }, /*#__PURE__*/React.createElement(Tabs.TabPane, {
-      tab: t('Local'),
-      key: 'local'
-    }), /*#__PURE__*/React.createElement(Tabs.TabPane, {
-      tab: t('Built-in'),
-      key: 'built-in'
-    }), /*#__PURE__*/React.createElement(Tabs.TabPane, {
-      tab: t('Marketplace'),
-      key: 'marketplace'
-    }))
+      },
+      items: [{
+        key: 'local',
+        label: t('Local')
+      }, {
+        key: 'built-in',
+        label: t('Built-in')
+      }, {
+        key: 'marketplace',
+        label: t('Marketplace')
+      }]
+    })
   }), /*#__PURE__*/React.createElement("div", {
     className: 'm24',
     style: {
@@ -190,7 +196,7 @@ var settings = {
     }
   }
 };
-export var getPluginsTabs = function getPluginsTabs(items, snippets) {
+export var getPluginsTabs = _.memoize(function (items, snippets) {
   var pluginsTabs = Object.keys(items).map(function (plugin) {
     var tabsObj = items[plugin].tabs;
     var tabs = sortBy(Object.keys(tabsObj).map(function (tab) {
@@ -213,7 +219,7 @@ export var getPluginsTabs = function getPluginsTabs(items, snippets) {
   return sortBy(pluginsTabs, function (o) {
     return !o.isAllow;
   });
-};
+});
 var SettingsCenter = function SettingsCenter(props) {
   var _activePlugin$tabs$fi, _items$pluginName2, _items$pluginName2$ta, _items$pluginName2$ta2, _items$pluginName3, _plugin$tabs;
   var _useACLRoleContext2 = useACLRoleContext(),
@@ -289,19 +295,27 @@ var SettingsCenter = function SettingsCenter(props) {
     },
     items: menuItems
   })), /*#__PURE__*/React.createElement(Layout.Content, null, aclPluginTabCheck && /*#__PURE__*/React.createElement(PageHeader, {
+    style: {
+      backgroundColor: 'white',
+      paddingBottom: 0
+    },
     ghost: false,
     title: compile((_items$pluginName3 = items[pluginName]) === null || _items$pluginName3 === void 0 ? void 0 : _items$pluginName3.title),
     footer: /*#__PURE__*/React.createElement(Tabs, {
       activeKey: tabName,
       onChange: function onChange(activeKey) {
         navigate("/admin/settings/".concat(pluginName, "/").concat(activeKey));
-      }
-    }, (_plugin$tabs = plugin.tabs) === null || _plugin$tabs === void 0 ? void 0 : _plugin$tabs.map(function (tab) {
-      return tab.isAllow && /*#__PURE__*/React.createElement(Tabs.TabPane, {
-        tab: compile(tab === null || tab === void 0 ? void 0 : tab.title),
-        key: tab.key
-      });
-    }))
+      },
+      items: (_plugin$tabs = plugin.tabs) === null || _plugin$tabs === void 0 ? void 0 : _plugin$tabs.map(function (tab) {
+        if (!tab.isAllow) {
+          return null;
+        }
+        return {
+          label: compile(tab === null || tab === void 0 ? void 0 : tab.title),
+          key: tab.key
+        };
+      })
+    })
   }), /*#__PURE__*/React.createElement("div", {
     className: 'm24',
     style: {

package/es/route-switch/antd/admin-layout/index.js

@@ -16,7 +16,7 @@ import { css } from '@emotion/css';
 import { Layout, Spin } from 'antd';
 import React, { createContext, useContext, useEffect, useMemo, useRef, useState } from 'react';
 import { Outlet, useNavigate, useParams } from 'react-router-dom';
-import { ACLRolesCheckProvider, CurrentAppInfoProvider, CurrentUser, CurrentUserProvider, PinnedPluginList, RemoteCollectionManagerProvider, RemoteSchemaTemplateManagerProvider, SchemaComponent, findByUid, findMenuItem, useACLRoleContext, useDocumentTitle, useRequest, useRoute, useSystemSettings } from '../../../';
+import { ACLRolesCheckProvider, CurrentAppInfoProvider, CurrentUser, CurrentUserProvider, PinnedPluginList, RemoteCollectionManagerProvider, RemoteSchemaTemplateManagerProvider, SchemaComponent, findByUid, findMenuItem, useACLRoleContext, useAdminSchemaUid, useDocumentTitle, useRequest, useSystemSettings } from '../../../';
 import { useCollectionManager } from '../../../collection-manager';
 var filterByACL = function filterByACL(schema, options) {
   var allowAll = options.allowAll,
@@ -60,7 +60,6 @@ var MenuEditor = function MenuEditor(props) {
   var defaultSelectedUid = params.name;
   var sideMenuRef = props.sideMenuRef;
   var ctx = useACLRoleContext();
-  var route = useRoute();
   var _useState = useState(null),
     _useState2 = _slicedToArray(_useState, 2),
     current = _useState2[0],
@@ -72,14 +71,15 @@ var MenuEditor = function MenuEditor(props) {
     setCurrent(schema);
     navigate("/admin/".concat(schema['x-uid']));
   };
+  var adminSchemaUid = useAdminSchemaUid();
   var _useRequest = useRequest({
-      url: "/uiSchemas:getJsonSchema/".concat(route.uiSchemaUid)
+      url: "/uiSchemas:getJsonSchema/".concat(adminSchemaUid)
     }, {
-      refreshDeps: [route.uiSchemaUid],
+      refreshDeps: [adminSchemaUid],
       onSuccess: function onSuccess(data) {
         var schema = filterByACL(data === null || data === void 0 ? void 0 : data.data, ctx);
         // url 为 `/admin` 的情况
-        if (params['*'] === 'admin') {
+        if (params['*'] === 'admin' || params['*'] === 'admin/') {
           var _s2 = findMenuItem(schema);
           if (_s2) {
             navigate("/admin/".concat(_s2['x-uid']));

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

@@ -15,7 +15,7 @@ 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 { connect, mapProps, useField, useFieldSchema } from '@formily/react';
 import { isValid, uid } from '@formily/shared';
-import { Tree as AntdTree, Menu } from 'antd';
+import { Tree as AntdTree } from 'antd';
 import { cloneDeep } from 'lodash';
 import React, { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -49,7 +49,7 @@ var MenuGroup = function MenuGroup(props) {
   if (!['customize:popup', 'customize:update', 'customize:save', 'customize:table:request', 'customize:form:request'].includes(actionType)) {
     return /*#__PURE__*/React.createElement(React.Fragment, null, props.children);
   }
-  return /*#__PURE__*/React.createElement(Menu.ItemGroup, {
+  return /*#__PURE__*/React.createElement(SchemaSettings.ItemGroup, {
     title: "".concat(t('Customize'), " > ").concat(actionTitles[actionType])
   }, props.children);
 };
@@ -63,9 +63,7 @@ export var ActionDesigner = function ActionDesigner(props) {
   var _useCollection = useCollection(),
     name = _useCollection.name;
   var _useCollectionManager = useCollectionManager(),
-    getChildrenCollections = _useCollectionManager.getChildrenCollections,
-    getCollection = _useCollectionManager.getCollection,
-    getCollectionField = _useCollectionManager.getCollectionField;
+    getChildrenCollections = _useCollectionManager.getChildrenCollections;
   var _useDesignable = useDesignable(),
     dn = _useDesignable.dn;
   var _useTranslation2 = useTranslation(),

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

@@ -45,7 +45,7 @@ export var ActionDrawer = observer(function (props) {
     width: openSizeWidthMap.get(openSize),
     title: field.title
   }, others), drawerProps), modalProps), {}, {
-    style: _objectSpread(_objectSpread({}, drawerProps === null || drawerProps === void 0 ? void 0 : drawerProps.style), others === null || others === void 0 ? void 0 : others.style),
+    rootStyle: _objectSpread(_objectSpread({}, drawerProps === null || drawerProps === void 0 ? void 0 : drawerProps.style), others === null || others === void 0 ? void 0 : others.style),
     destroyOnClose: true,
     open: visible,
     onClose: function onClose() {

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

@@ -9,7 +9,7 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import { cx } from '@emotion/css';
-import { observer, RecursionField, useFieldSchema } from '@formily/react';
+import { RecursionField, observer, useFieldSchema } from '@formily/react';
 import { Space } from 'antd';
 import React, { useContext } from 'react';
 import { createPortal } from 'react-dom';

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

@@ -7,7 +7,7 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 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); }); }; }
-import { observer, useField, useFieldSchema, useForm } from '@formily/react';
+import { observer, useField, useForm } from '@formily/react';
 import React from 'react';
 import { SchemaComponentOptions } from '../../';
 import { useAssociationCreateActionProps as useCAP } from '../../../block-provider/hooks';
@@ -23,7 +23,6 @@ var EditableAssociationField = observer(function (props) {
   var multiple = props.multiple;
   var field = useField();
   var form = useForm();
-  var fieldSchema = useFieldSchema();
   var _useAssociationFieldC = useAssociationFieldContext(),
     collectionField = _useAssociationFieldC.options,
     currentMode = _useAssociationFieldC.currentMode;

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

@@ -9,8 +9,9 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 import { CloseOutlined, PlusOutlined } from '@ant-design/icons';
 import { css } from '@emotion/css';
 import { spliceArrayState } from '@formily/core/esm/shared/internals';
-import { RecursionField, observer, useFieldSchema } from '@formily/react';
+import { observer, RecursionField, useFieldSchema } from '@formily/react';
 import { action } from '@formily/reactive';
+import { each } from '@formily/shared';
 import { Button, Card, Divider, Tooltip } from 'antd';
 import React, { useContext } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -77,6 +78,11 @@ var ToManyNester = observer(function (props) {
             insertCount: 1
           });
           field.value.splice(index + 1, 0, {});
+          each(field.form.fields, function (field, key) {
+            if (!field) {
+              delete field.form.fields[key];
+            }
+          });
           return field.onInput(field.value);
         });
       }

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

@@ -35,7 +35,7 @@ export var SubTable = observer(function (props) {
   return /*#__PURE__*/React.createElement("div", {
     className: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n          .ant-table-footer {\n            padding: 0 !important;\n          }\n          .ant-formily-item-error-help {\n            display: none;\n          }\n          .ant-description-textarea {\n            line-height: 34px;\n          }\n          .ant-table-cell .ant-formily-item-error-help {\n            display: block;\n            position: absolute;\n            font-size: 12px;\n            top: 100%;\n            background: #fff;\n            width: 100%;\n            margin-top: 3px;\n            padding: 3px;\n            z-index: 1;\n            border-radius: 3px;\n            box-shadow: 0 0 10px #eee;\n            animation: none;\n            transform: translateY(0);\n            opacity: 1;\n          }\n        "])))
   }, /*#__PURE__*/React.createElement(Table, {
-    className: css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n            .ant-select-selector {\n              /* min-height: 31px; */\n            }\n            .ant-formily-item.ant-formily-item-feedback-layout-loose {\n              margin-bottom: 0px !important;\n            }\n            .ant-formily-editable {\n              vertical-align: sub;\n            }\n            .ant-table table {\n            }\n            td:not(.ant-table-selection-column) {\n              padding: 0 !important;\n            }\n          "]))),
+    className: css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n            .ant-select-selector {\n              /* min-height: 31px; */\n            }\n            .ant-formily-item.ant-formily-item-feedback-layout-loose {\n              margin-bottom: 0px !important;\n            }\n            .ant-formily-editable {\n              vertical-align: sub;\n            }\n            .ant-table table {\n            }\n            td:not(.ant-table-selection-column) {\n              padding: 5px !important;\n            }\n          "]))),
     bordered: true,
     size: 'small',
     field: field,

package/es/schema-component/antd/calendar/DeleteEvent.js

@@ -94,7 +94,7 @@ export var DeleteEvent = observer(function () {
     t = _useTranslation.t;
   return /*#__PURE__*/createPortal( /*#__PURE__*/React.createElement(Modal, {
     title: cron ? t('Delete events') : null,
-    visible: visible,
+    open: visible,
     onCancel: function onCancel() {
       return setVisible(false);
     },

package/es/schema-component/antd/cascader/Cascader.js

@@ -76,7 +76,7 @@ export var Cascader = connect(function (props) {
     }));
   };
   var handelDropDownVisible = function handelDropDownVisible(value) {
-    if (value && !field.dataSource) {
+    if (value && !field.dataSource.length) {
       run();
     }
   };

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

@@ -83,6 +83,7 @@ FormItem.Designer = function Designer() {
     getField = _useCollection.getField;
   var _useFormBlockContext = useFormBlockContext(),
     form = _useFormBlockContext.form;
+  var ctx = useBlockRequestContext();
   var field = useField();
   var fieldSchema = useFieldSchema();
   var _useTranslation = useTranslation(),
@@ -399,12 +400,15 @@ FormItem.Designer = function Designer() {
       properties: {
         filter: {
           default: defaultFilter,
-          // title: '数据范围',
           enum: dataSource,
           'x-component': 'Filter',
           'x-component-props': {
             dynamicComponent: function dynamicComponent(props) {
-              return FilterDynamicComponent(_objectSpread({}, props));
+              return FilterDynamicComponent(_objectSpread(_objectSpread({}, props), {}, {
+                form: form,
+                collectionField: collectionField,
+                rootCollection: ctx.props.collection || ctx.props.resource
+              }));
             }
           }
         }
@@ -416,7 +420,6 @@ FormItem.Designer = function Designer() {
       filter = removeNullCondition(filter);
       _.set(field.componentProps, 'service.params.filter', filter);
       fieldSchema['x-component-props'] = field.componentProps;
-      field.componentProps = field.componentProps;
       dn.emit('patch', {
         schema: (_schema5 = {}, _defineProperty(_schema5, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema5, 'x-component-props', field.componentProps), _schema5)
       });
@@ -778,6 +781,10 @@ FormItem.Designer = function Designer() {
 export function isFileCollection(collection) {
   return (collection === null || collection === void 0 ? void 0 : collection.template) === 'file';
 }
+function extractFirstPart(path) {
+  var firstDotIndex = path.indexOf('.');
+  return firstDotIndex !== -1 ? path.slice(0, firstDotIndex) : path;
+}
 FormItem.FilterFormDesigner = FilterFormDesigner;
 export function getFieldDefaultValue(fieldSchema, collectionField) {
   var _fieldSchema$default, _collectionField$uiSc5;

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

@@ -163,7 +163,7 @@ var WithForm = function WithForm(props) {
       form.removeEffects(id);
     };
   }, [linkageRules]);
-  return fieldSchema['x-decorator'] === 'Form' ? /*#__PURE__*/React.createElement(FormDecorator, _objectSpread({}, props)) : /*#__PURE__*/React.createElement(FormComponent, _objectSpread({}, props));
+  return fieldSchema['x-decorator'] === 'FormV2' ? /*#__PURE__*/React.createElement(FormDecorator, _objectSpread({}, props)) : /*#__PURE__*/React.createElement(FormComponent, _objectSpread({}, props));
 };
 var WithoutForm = function WithoutForm(props) {
   var fieldSchema = useFieldSchema();
@@ -179,7 +179,7 @@ var WithoutForm = function WithoutForm(props) {
       }
     });
   }, []);
-  return fieldSchema['x-decorator'] === 'Form' ? /*#__PURE__*/React.createElement(FormDecorator, _objectSpread({
+  return fieldSchema['x-decorator'] === 'FormV2' ? /*#__PURE__*/React.createElement(FormDecorator, _objectSpread({
     form: form
   }, props)) : /*#__PURE__*/React.createElement(FormComponent, _objectSpread({
     form: form

package/es/schema-component/antd/gantt/components/gantt/gantt.js

@@ -238,7 +238,6 @@ export var Gantt = function Gantt(props) {
   useEffect(function () {
     tableCtx.field.onExpandClick = handleTableExpanderClick;
     tableCtx.field.onRowSelect = handleRowSelect;
-    tableCtx.setExpandFlag(true);
   }, []);
   useEffect(function () {
     expandAndCollapseAll === null || expandAndCollapseAll === void 0 ? void 0 : expandAndCollapseAll(!expandFlag);

package/es/schema-component/antd/gantt/components/grid/grid-body.js

@@ -1,11 +1,11 @@
 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(_e) { throw _e; }, 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(_e2) { didErr = true; err = _e2; }, 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 React from 'react';
 import { cx } from '@emotion/css';
-import { addToDate } from '../../helpers/date-helper';
-import { gridRowLine, gridRow, gridTick, gridHeightRow } from './style';
 import { uid } from '@nocobase/utils/client';
+import React from 'react';
+import { addToDate } from '../../helpers/date-helper';
+import { gridHeightRow, gridRow, gridRowLine, gridTick } from './style';
 var empty = [{
   id: uid()
 }, {

package/es/schema-component/antd/gantt/components/task-item/bar/bar-small.js

@@ -1,5 +1,5 @@
-import React from 'react';
 import { cx } from '@emotion/css';
+import React from 'react';
 import { getProgressPoint } from '../../../helpers/bar-helper';
 import { BarDisplay } from './bar-display';
 import { BarProgressHandle } from './bar-progress-handle';