@nocobase/client 0.8.1-alpha.4 → 0.9.0-alpha.2

package/es/pm/PluginManagerLink.js

@@ -1,3 +1,9 @@
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 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."); }
@@ -10,29 +16,15 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 import { AppstoreAddOutlined, SettingOutlined } from '@ant-design/icons';
-import { uid } from '@formily/shared';
 import { Dropdown, Menu } from 'antd';
-import React, { useState } from 'react';
+import React, { useContext, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useHistory } from 'react-router-dom';
+import { useACLRoleContext } from '../acl/ACLProvider';
 import { PluginManager } from '../plugin-manager';
-import { ActionContext } from '../schema-component';
-var schema = {
-  type: 'object',
-  properties: _defineProperty({}, uid(), {
-    'x-component': 'Action.Drawer',
-    type: 'void',
-    title: '{{t("Collections & Fields")}}',
-    properties: {
-      configuration: {
-        'x-component': 'ConfigurationTable'
-      }
-    }
-  })
-};
+import { ActionContext, useCompile } from '../schema-component';
+import { getPluginsTabs, SettingsCenterContext } from './index';
 export var PluginManagerLink = function PluginManagerLink() {
   var _useState = useState(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -56,7 +48,25 @@ export var PluginManagerLink = function PluginManagerLink() {
     }
   }));
 };
+
+var getBookmarkTabs = function getBookmarkTabs(data) {
+  var bookmarkTabs = [];
+  data.forEach(function (plugin) {
+    var tabs = plugin.tabs;
+    tabs.forEach(function (tab) {
+      tab.isBookmark && tab.isAllow && bookmarkTabs.push(_objectSpread(_objectSpread({}, tab), {}, {
+        path: "".concat(plugin.key, "/").concat(tab.key)
+      }));
+    });
+  });
+  return bookmarkTabs;
+};
+
 export var SettingsCenterDropdown = function SettingsCenterDropdown() {
+  var _useACLRoleContext = useACLRoleContext(),
+      _useACLRoleContext$sn = _useACLRoleContext.snippets,
+      snippets = _useACLRoleContext$sn === void 0 ? [] : _useACLRoleContext$sn;
+
   var _useState3 = useState(false),
       _useState4 = _slicedToArray(_useState3, 2),
       visible = _useState4[0],
@@ -65,48 +75,33 @@ export var SettingsCenterDropdown = function SettingsCenterDropdown() {
   var _useTranslation2 = useTranslation(),
       t = _useTranslation2.t;
 
+  var compile = useCompile();
   var history = useHistory();
-  var items = [{
-    title: t('Collections & Fields'),
-    path: 'collection-manager/collections'
-  }, {
-    title: t('Roles & Permissions'),
-    path: 'acl/roles'
-  }, {
-    title: t('File storages'),
-    path: 'file-manager/storages'
-  }, {
-    title: t('System settings'),
-    path: 'system-settings/system-settings'
-  }, {
-    title: t('workflow:Workflow'),
-    path: 'workflow/workflows'
-  } // {
-  //   title: t('Graph Collections'),
-  //   path: 'graph/collections',
-  // },
-  ];
+  var itemData = useContext(SettingsCenterContext);
+  var pluginsTabs = getPluginsTabs(itemData, snippets);
+  var bookmarkTabs = getBookmarkTabs(pluginsTabs);
   return /*#__PURE__*/React.createElement(ActionContext.Provider, {
     value: {
       visible: visible,
       setVisible: setVisible
     }
   }, /*#__PURE__*/React.createElement(Dropdown, {
+    placement: "bottom",
     overlay: /*#__PURE__*/React.createElement(Menu, null, /*#__PURE__*/React.createElement(Menu.ItemGroup, {
       title: t('Bookmark')
-    }, items.map(function (item) {
+    }, bookmarkTabs.map(function (tab) {
       return /*#__PURE__*/React.createElement(Menu.Item, {
         onClick: function onClick() {
-          history.push('/admin/settings/' + item.path);
+          history.push('/admin/settings/' + tab.path);
         },
-        key: item.path
-      }, item.title);
+        key: tab.path
+      }, compile(tab.title));
     })), /*#__PURE__*/React.createElement(Menu.Divider, null), /*#__PURE__*/React.createElement(Menu.Item, {
       onClick: function onClick() {
         history.push('/admin/settings');
       },
       key: "/admin/settings"
-    }, t('Settings center')))
+    }, t('All plugin settings')))
   }, /*#__PURE__*/React.createElement(PluginManager.Toolbar.Item, {
     icon: /*#__PURE__*/React.createElement(SettingOutlined, null)
   })));

package/es/pm/index.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 export declare const SettingsCenterContext: React.Context<any>;
+export declare const getPluginsTabs: (items: any, snippets: any) => any[];
 export declare const SettingsCenterProvider: (props: any) => JSX.Element;
 export declare const PMProvider: (props: any) => JSX.Element;
 export default PMProvider;

package/es/pm/index.js

@@ -20,11 +20,13 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 
 import { DeleteOutlined, SettingOutlined } from '@ant-design/icons';
 import { css } from '@emotion/css';
-import { Avatar, Card, Layout, Menu, message, PageHeader, Popconfirm, Spin, Switch, Tabs } from 'antd';
+import { Avatar, Card, Layout, Menu, message, PageHeader, Popconfirm, Result, Spin, Switch, Tabs } from 'antd';
+import { sortBy } from 'lodash';
 import React, { createContext, useContext, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Redirect, useHistory, useRouteMatch } from 'react-router-dom';
 import { ACLPane } from '../acl';
+import { useACLRoleContext } from '../acl/ACLProvider';
 import { useAPIClient, useRequest } from '../api-client';
 import { CollectionManagerPane } from '../collection-manager';
 import { useDocumentTitle } from '../document-title';
@@ -172,7 +174,6 @@ var LocalPlugins = function LocalPlugins() {
 
   return /*#__PURE__*/React.createElement(React.Fragment, null, data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : _data$data.map(function (item) {
     return /*#__PURE__*/React.createElement(PluginCard, {
-      key: item.id,
       data: item
     });
   }));
@@ -229,7 +230,11 @@ var PluginList = function PluginList(props) {
   var _useTranslation3 = useTranslation(),
       t = _useTranslation3.t;
 
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(PageHeader, {
+  var _useACLRoleContext = useACLRoleContext(),
+      _useACLRoleContext$sn = _useACLRoleContext.snippets,
+      snippets = _useACLRoleContext$sn === void 0 ? [] : _useACLRoleContext$sn;
+
+  return snippets.includes('pm') ? /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(PageHeader, {
     ghost: false,
     title: t('Plugin manager'),
     footer: /*#__PURE__*/React.createElement(Tabs, {
@@ -257,7 +262,11 @@ var PluginList = function PluginList(props) {
     local: LocalPlugins,
     'built-in': BuiltinPlugins,
     marketplace: MarketplacePlugins
-  }[tabName])));
+  }[tabName]))) : /*#__PURE__*/React.createElement(Result, {
+    status: "404",
+    title: "404",
+    subTitle: "Sorry, the page you visited does not exist."
+  });
 };
 
 var settings = {
@@ -266,16 +275,17 @@ var settings = {
     icon: 'LockOutlined',
     tabs: {
       roles: {
+        isBookmark: true,
         title: '{{t("Roles & Permissions")}}',
         component: ACLPane
       }
     }
   },
-  'block-templates': {
+  'ui-schema-storage': {
     title: '{{t("Block templates")}}',
     icon: 'LayoutOutlined',
     tabs: {
-      list: {
+      'block-templates': {
         title: '{{t("Block templates")}}',
         component: BlockTemplatesPane
       }
@@ -286,6 +296,7 @@ var settings = {
     title: '{{t("Collection manager")}}',
     tabs: {
       collections: {
+        isBookmark: true,
         title: '{{t("Collections & Fields")}}',
         component: CollectionManagerPane
       }
@@ -296,33 +307,67 @@ var settings = {
     title: '{{t("System settings")}}',
     tabs: {
       'system-settings': {
+        isBookmark: true,
         title: '{{t("System settings")}}',
         component: SystemSettingsPane
       }
     }
   }
 };
+export var getPluginsTabs = function getPluginsTabs(items, snippets) {
+  var pluginsTabs = Object.keys(items).map(function (plugin) {
+    var tabsObj = items[plugin].tabs;
+    var tabs = sortBy(Object.keys(tabsObj).map(function (tab) {
+      return _objectSpread(_objectSpread({
+        key: tab
+      }, tabsObj[tab]), {}, {
+        isAllow: snippets.includes('pm.*') && !(snippets === null || snippets === void 0 ? void 0 : snippets.includes("!pm.".concat(plugin, ".").concat(tab)))
+      });
+    }), function (o) {
+      return !o.isAllow;
+    });
+    return _objectSpread(_objectSpread({}, items[plugin]), {}, {
+      key: plugin,
+      tabs: tabs,
+      isAllow: !tabs.every(function (v) {
+        return !v.isAllow;
+      })
+    });
+  });
+  return sortBy(pluginsTabs, function (o) {
+    return !o.isAllow;
+  });
+};
 
 var SettingsCenter = function SettingsCenter(props) {
-  var _items$pluginName3, _items$pluginName3$ta, _items$pluginName3$ta2, _items$pluginName4, _items$pluginName5;
+  var _activePlugin$tabs$fi, _items$pluginName2, _items$pluginName2$ta, _items$pluginName2$ta2, _items$pluginName3, _plugin$tabs;
+
+  var _useACLRoleContext2 = useACLRoleContext(),
+      _useACLRoleContext2$s = _useACLRoleContext2.snippets,
+      snippets = _useACLRoleContext2$s === void 0 ? [] : _useACLRoleContext2$s;
 
   var match = useRouteMatch();
   var history = useHistory();
   var items = useContext(SettingsCenterContext);
+  var pluginsTabs = getPluginsTabs(items, snippets);
   var compile = useCompile();
   var firstUri = useMemo(function () {
-    var _items$pluginName;
-
-    var keys = Object.keys(items).sort();
-    var pluginName = keys.shift();
-    var tabName = Object.keys((items === null || items === void 0 ? void 0 : (_items$pluginName = items[pluginName]) === null || _items$pluginName === void 0 ? void 0 : _items$pluginName.tabs) || {}).shift();
+    var pluginName = pluginsTabs[0].key;
+    var tabName = pluginsTabs[0].tabs[0].key;
     return "/admin/settings/".concat(pluginName, "/").concat(tabName);
-  }, [items]);
+  }, [pluginsTabs]);
 
   var _ref2 = match.params || {},
       pluginName = _ref2.pluginName,
       tabName = _ref2.tabName;
 
+  var activePlugin = pluginsTabs.find(function (v) {
+    return v.key === pluginName;
+  });
+  var aclPluginTabCheck = (activePlugin === null || activePlugin === void 0 ? void 0 : activePlugin.isAllow) && ((_activePlugin$tabs$fi = activePlugin.tabs.find(function (v) {
+    return v.key === tabName;
+  })) === null || _activePlugin$tabs$fi === void 0 ? void 0 : _activePlugin$tabs$fi.isAllow);
+
   if (!pluginName) {
     return /*#__PURE__*/React.createElement(Redirect, {
       to: firstUri
@@ -336,33 +381,36 @@ var SettingsCenter = function SettingsCenter(props) {
   }
 
   if (!tabName) {
-    var _items$pluginName2;
+    var _items$pluginName;
 
-    var firstTabName = Object.keys((_items$pluginName2 = items[pluginName]) === null || _items$pluginName2 === void 0 ? void 0 : _items$pluginName2.tabs).shift();
+    var firstTabName = Object.keys((_items$pluginName = items[pluginName]) === null || _items$pluginName === void 0 ? void 0 : _items$pluginName.tabs).shift();
     return /*#__PURE__*/React.createElement(Redirect, {
       to: "/admin/settings/".concat(pluginName, "/").concat(firstTabName)
     });
   }
 
-  var component = (_items$pluginName3 = items[pluginName]) === null || _items$pluginName3 === void 0 ? void 0 : (_items$pluginName3$ta = _items$pluginName3.tabs) === null || _items$pluginName3$ta === void 0 ? void 0 : (_items$pluginName3$ta2 = _items$pluginName3$ta[tabName]) === null || _items$pluginName3$ta2 === void 0 ? void 0 : _items$pluginName3$ta2.component;
-  var menuItems = Object.keys(items).sort().map(function (key) {
-    var item = items[key];
-    var tabKey = Object.keys(item.tabs).shift();
+  var component = (_items$pluginName2 = items[pluginName]) === null || _items$pluginName2 === void 0 ? void 0 : (_items$pluginName2$ta = _items$pluginName2.tabs) === null || _items$pluginName2$ta === void 0 ? void 0 : (_items$pluginName2$ta2 = _items$pluginName2$ta[tabName]) === null || _items$pluginName2$ta2 === void 0 ? void 0 : _items$pluginName2$ta2.component;
+  var plugin = pluginsTabs.find(function (v) {
+    return v.key === pluginName;
+  });
+  var menuItems = pluginsTabs.filter(function (plugin) {
+    return plugin.isAllow;
+  }).map(function (plugin) {
     return {
-      label: compile(item.title),
-      key: key,
-      icon: item.icon ? /*#__PURE__*/React.createElement(Icon, {
-        type: item.icon
+      label: compile(plugin.title),
+      key: plugin.key,
+      icon: plugin.icon ? /*#__PURE__*/React.createElement(Icon, {
+        type: plugin.icon
       }) : null
     };
   });
-  return /*#__PURE__*/React.createElement(Layout, null, /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(Layout, null, /*#__PURE__*/React.createElement("div", {
     style: {
       '--side-menu-width': '200px'
     },
-    className: css(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n          width: var(--side-menu-width);\n          overflow: hidden;\n          flex: 0 0 var(--side-menu-width);\n          max-width: var(--side-menu-width);\n          min-width: var(--side-menu-width);\n          pointer-events: none;\n        "])))
+    className: css(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n            width: var(--side-menu-width);\n            overflow: hidden;\n            flex: 0 0 var(--side-menu-width);\n            max-width: var(--side-menu-width);\n            min-width: var(--side-menu-width);\n            pointer-events: none;\n          "])))
   }), /*#__PURE__*/React.createElement(Layout.Sider, {
-    className: css(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n          height: 100%;\n          position: fixed;\n          padding-top: 46px;\n          left: 0;\n          top: 0;\n          background: rgba(0, 0, 0, 0);\n          z-index: 100;\n        "]))),
+    className: css(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n            height: 100%;\n            position: fixed;\n            padding-top: 46px;\n            left: 0;\n            top: 0;\n            background: rgba(0, 0, 0, 0);\n            z-index: 100;\n          "]))),
     theme: 'light'
   }, /*#__PURE__*/React.createElement(Menu, {
     selectedKeys: [pluginName],
@@ -377,28 +425,29 @@ var SettingsCenter = function SettingsCenter(props) {
       history.push("/admin/settings/".concat(e.key, "/").concat(tabKey));
     },
     items: menuItems
-  })), /*#__PURE__*/React.createElement(Layout.Content, null, /*#__PURE__*/React.createElement(PageHeader, {
+  })), /*#__PURE__*/React.createElement(Layout.Content, null, aclPluginTabCheck && /*#__PURE__*/React.createElement(PageHeader, {
     ghost: false,
-    title: compile((_items$pluginName4 = items[pluginName]) === null || _items$pluginName4 === void 0 ? void 0 : _items$pluginName4.title),
+    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) {
         history.push("/admin/settings/".concat(pluginName, "/").concat(activeKey));
       }
-    }, Object.keys((_items$pluginName5 = items[pluginName]) === null || _items$pluginName5 === void 0 ? void 0 : _items$pluginName5.tabs).map(function (tabKey) {
-      var _items$pluginName$tab;
-
-      var tab = (_items$pluginName$tab = items[pluginName].tabs) === null || _items$pluginName$tab === void 0 ? void 0 : _items$pluginName$tab[tabKey];
-      return /*#__PURE__*/React.createElement(Tabs.TabPane, {
+    }, (_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: tabKey
+        key: tab.key
       });
     }))
   }), /*#__PURE__*/React.createElement("div", {
     style: {
       margin: 24
     }
-  }, component && /*#__PURE__*/React.createElement(component))));
+  }, aclPluginTabCheck ? component && /*#__PURE__*/React.createElement(component) : /*#__PURE__*/React.createElement(Result, {
+    status: "404",
+    title: "404",
+    subTitle: "Sorry, the page you visited does not exist."
+  })))));
 };
 
 export var SettingsCenterProvider = function SettingsCenterProvider(props) {

package/es/record-provider/index.d.ts

@@ -3,6 +3,7 @@ export declare const RecordContext: React.Context<{}>;
 export declare const RecordIndexContext: React.Context<any>;
 export declare const RecordProvider: React.FC<{
     record: any;
+    parent?: any;
 }>;
 export declare const RecordIndexProvider: React.FC<{
     index: any;

package/es/record-provider/index.js

@@ -10,14 +10,17 @@ export var RecordContext = /*#__PURE__*/createContext({});
 export var RecordIndexContext = /*#__PURE__*/createContext(null);
 export var RecordProvider = function RecordProvider(props) {
   var record = props.record,
-      children = props.children;
+      children = props.children,
+      _props$parent = props.parent,
+      parent = _props$parent === void 0 ? false : _props$parent;
 
   var __parent = useContext(RecordContext);
 
+  var value = _objectSpread({}, record);
+
+  value['__parent'] = parent ? parent : __parent;
   return /*#__PURE__*/React.createElement(RecordContext.Provider, {
-    value: _objectSpread(_objectSpread({}, record), {}, {
-      __parent: __parent
-    })
+    value: value
   }, children);
 };
 export var RecordIndexProvider = function RecordIndexProvider(props) {

package/es/route-switch/antd/admin-layout/index.d.ts

@@ -1,2 +1,3 @@
+export declare const InternalAdminLayout: (props: any) => JSX.Element;
 export declare const AdminLayout: (props: any) => JSX.Element;
 export default AdminLayout;

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

@@ -24,17 +24,16 @@ import { css } from '@emotion/css';
 import { Layout, Spin } from 'antd';
 import React, { createContext, useContext, useMemo, useRef, useState } from 'react';
 import { useHistory, useRouteMatch } from 'react-router-dom';
-import { ACLAllowConfigure, ACLRolesCheckProvider, CurrentUser, CurrentUserProvider, CurrentAppInfoProvider, findByUid, findMenuItem, RemoteCollectionManagerProvider, RemotePluginManagerToolbar, RemoteSchemaTemplateManagerProvider, SchemaComponent, useACLRoleContext, useDocumentTitle, useRequest, useRoute, useSystemSettings } from '../../../';
+import { ACLRolesCheckProvider, CurrentUser, CurrentUserProvider, CurrentAppInfoProvider, findByUid, findMenuItem, RemoteCollectionManagerProvider, RemotePluginManagerToolbar, RemoteSchemaTemplateManagerProvider, SchemaComponent, useACLRoleContext, useDocumentTitle, useRequest, useRoute, useSystemSettings } from '../../../';
 import { useCollectionManager } from '../../../collection-manager';
 import { useMutationObserver } from 'ahooks';
 
 var filterByACL = function filterByACL(schema, options) {
   var allowAll = options.allowAll,
-      allowConfigure = options.allowConfigure,
       _options$allowMenuIte = options.allowMenuItemIds,
       allowMenuItemIds = _options$allowMenuIte === void 0 ? [] : _options$allowMenuIte;
 
-  if (allowAll || allowConfigure) {
+  if (allowAll) {
     return schema;
   }
 
@@ -159,7 +158,7 @@ var MenuEditor = function MenuEditor(props) {
   }));
 };
 
-var InternalAdminLayout = function InternalAdminLayout(props) {
+export var InternalAdminLayout = function InternalAdminLayout(props) {
   var _result$data, _result$data$data, _result$data$data$log;
 
   var sideMenuRef = useRef();
@@ -218,7 +217,7 @@ var InternalAdminLayout = function InternalAdminLayout(props) {
       top: 0,
       right: 0
     }
-  }, /*#__PURE__*/React.createElement(ACLAllowConfigure, null, /*#__PURE__*/React.createElement(RemotePluginManagerToolbar, null)), /*#__PURE__*/React.createElement(CurrentUser, null)))), /*#__PURE__*/React.createElement("div", {
+  }, /*#__PURE__*/React.createElement(RemotePluginManagerToolbar, null), /*#__PURE__*/React.createElement(CurrentUser, null)))), /*#__PURE__*/React.createElement("div", {
     style: {
       '--side-menu-width': "".concat(sideMenuWidth, "px")
     },
@@ -236,7 +235,6 @@ var InternalAdminLayout = function InternalAdminLayout(props) {
     className: css(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n            height: 46px;\n            line-height: 46px;\n            background: transparent;\n            pointer-events: none;\n          "])))
   }), service.contentLoading ? /*#__PURE__*/React.createElement(Spin, null) : props.children));
 };
-
 export var AdminLayout = function AdminLayout(props) {
   return /*#__PURE__*/React.createElement(CurrentAppInfoProvider, null, /*#__PURE__*/React.createElement(CurrentUserProvider, null, /*#__PURE__*/React.createElement(RemoteSchemaTemplateManagerProvider, null, /*#__PURE__*/React.createElement(RemoteCollectionManagerProvider, null, /*#__PURE__*/React.createElement(ACLRolesCheckProvider, null, /*#__PURE__*/React.createElement(InternalAdminLayout, _objectSpread({}, props)))))));
 };

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

@@ -83,6 +83,7 @@ export var Action = observer(function (props) {
   var form = useForm();
   var designerProps = fieldSchema['x-designer-props'];
   var openMode = fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : _fieldSchema$xCompon['openMode'];
+  var disabled = form.disabled || field.disabled;
   var openSize = fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon2 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon2 === void 0 ? void 0 : _fieldSchema$xCompon2['openSize'];
 
   var renderButton = function renderButton() {
@@ -93,23 +94,25 @@ export var Action = observer(function (props) {
       icon: /*#__PURE__*/React.createElement(Icon, {
         type: icon
       }),
-      disabled: form.disabled,
+      disabled: disabled,
       onClick: function onClick(e) {
-        e.preventDefault();
-        e.stopPropagation();
-
-        var onOk = function onOk() {
-          _onClick === null || _onClick === void 0 ? void 0 : _onClick(e);
-          setVisible(true);
-          run();
-        };
-
-        if (confirm) {
-          Modal.confirm(_objectSpread(_objectSpread({}, confirm), {}, {
-            onOk: onOk
-          }));
-        } else {
-          onOk();
+        if (!disabled) {
+          e.preventDefault();
+          e.stopPropagation();
+
+          var onOk = function onOk() {
+            _onClick === null || _onClick === void 0 ? void 0 : _onClick(e);
+            setVisible(true);
+            run();
+          };
+
+          if (confirm) {
+            Modal.confirm(_objectSpread(_objectSpread({}, confirm), {}, {
+              onOk: onOk
+            }));
+          } else {
+            onOk();
+          }
         }
       },
       component: component || Button,

package/es/schema-component/antd/association-filter/AssociationFilter.Item.js

@@ -2,6 +2,14 @@ var _templateObject, _templateObject2, _templateObject3, _templateObject4, _temp
 
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 
+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 ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -25,10 +33,10 @@ import { css } from '@emotion/css';
 import { useFieldSchema } from '@formily/react';
 import { Col, Collapse, Input, Row, Tree } from 'antd';
 import cls from 'classnames';
-import React, { useContext, useState } from 'react';
+import React, { useState } from 'react';
 import { useRequest } from '../../../api-client';
 import { useBlockRequestContext } from '../../../block-provider';
-import { SharedFilterContext } from '../../../block-provider/SharedFilterProvider';
+import { mergeFilter } from '../../../block-provider/SharedFilterProvider';
 import { SortableItem } from '../../common';
 import { useCompile, useDesigner } from '../../hooks';
 import { AssociationFilter } from './AssociationFilter';
@@ -47,12 +55,8 @@ export var AssociationFilterItem = function AssociationFilterItem(props) {
   var compile = useCompile();
 
   var _useBlockRequestConte = useBlockRequestContext(),
-      service = _useBlockRequestConte.service;
-
-  var _useContext = useContext(SharedFilterContext),
-      setSharedFilterStore = _useContext.setSharedFilterStore,
-      sharedFilterStore = _useContext.sharedFilterStore,
-      getFilterParams = _useContext.getFilterParams;
+      service = _useBlockRequestConte.service,
+      blockProps = _useBlockRequestConte.props;
 
   var _useState = useState(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -107,27 +111,24 @@ export var AssociationFilterItem = function AssociationFilterItem(props) {
   };
 
   var onSelect = function onSelect(selectedKeysValue) {
-    var _service$params;
+    var _service$params, _service$params$, _service$params2, _blockProps$params;
 
     setSelectedKeys(selectedKeysValue);
-    var orList = selectedKeysValue.map(function (item) {
-      return _defineProperty({}, collectionFieldName, _defineProperty({}, valueKey, {
-        $eq: item
-      }));
-    });
-    var newFilter = orList.length > 0 ? {
-      $or: orList
-    } : {};
+    var filters = ((_service$params = service.params) === null || _service$params === void 0 ? void 0 : (_service$params$ = _service$params[1]) === null || _service$params$ === void 0 ? void 0 : _service$params$.filters) || {};
 
-    var newAssociationFilterStore = _objectSpread(_objectSpread({}, sharedFilterStore), {}, _defineProperty({}, collectionFieldName, newFilter));
+    if (selectedKeysValue.length) {
+      filters["af.".concat(collectionFieldName)] = _defineProperty({}, "".concat(collectionFieldName, ".").concat(valueKey, ".$in"), selectedKeysValue);
+    } else {
+      delete filters["af.".concat(collectionFieldName)];
+    }
 
-    setSharedFilterStore(newAssociationFilterStore);
-    var paramFilter = getFilterParams(newAssociationFilterStore);
-    service.run(_objectSpread(_objectSpread({}, (_service$params = service.params) === null || _service$params === void 0 ? void 0 : _service$params[0]), {}, {
+    service.run(_objectSpread(_objectSpread({}, (_service$params2 = service.params) === null || _service$params2 === void 0 ? void 0 : _service$params2[0]), {}, {
       pageSize: 200,
       page: 1,
-      filter: paramFilter
-    }));
+      filter: mergeFilter([].concat(_toConsumableArray(Object.values(filters)), [blockProps === null || blockProps === void 0 ? void 0 : (_blockProps$params = blockProps.params) === null || _blockProps$params === void 0 ? void 0 : _blockProps$params.filter]))
+    }), {
+      filters: filters
+    });
   };
 
   var handleSearchToggle = function handleSearchToggle(e) {

package/es/schema-component/antd/cron/Cron.d.ts

@@ -1,6 +1,5 @@
 import React from 'react';
 import { CronProps } from 'react-js-cron';
-import 'cronstrue/locales/zh_CN';
 declare type ComposedCron = React.FC<CronProps> & {};
 export declare const Cron: ComposedCron;
 export default Cron;