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

package/es/block-provider/hooks/index.js

@@ -13,15 +13,15 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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); }
 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); }
-import { Schema, SchemaExpressionScopeContext, useField, useFieldSchema, useForm } from '@formily/react';
+import { SchemaExpressionScopeContext, useField, useFieldSchema, useForm } from '@formily/react';
 import { parse } from '@nocobase/utils/client';
 import { Modal, message } from 'antd';
-import { cloneDeep, uniq } from 'lodash';
+import { cloneDeep } from 'lodash';
 import get from 'lodash/get';
 import omit from 'lodash/omit';
 import { useContext, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
-import { useHistory } from 'react-router-dom';
+import { useNavigate } from 'react-router-dom';
 import { useReactToPrint } from 'react-to-print';
 import { AssociationFilter, useFormBlockContext, useTableBlockContext } from '../..';
 import { useAPIClient, useRequest } from '../../api-client';
@@ -31,7 +31,6 @@ import { transformToFilter } from '../../filter-provider/utils';
 import { useRecord } from '../../record-provider';
 import { removeNullCondition, useActionContext, useCompile } from '../../schema-component';
 import { BulkEditFormItemValueType } from '../../schema-initializer/components';
-import { useSchemaTemplateManager } from '../../schema-templates';
 import { useCurrentUserContext } from '../../user';
 import { useBlockRequestContext, useFilterByTk } from '../BlockProvider';
 import { useDetailsBlockContext } from '../DetailsBlockProvider';
@@ -156,7 +155,7 @@ export var useCreateActionProps = function useCreateActionProps() {
   var _useActionContext = useActionContext(),
     setVisible = _useActionContext.setVisible,
     fieldSchema = _useActionContext.fieldSchema;
-  var history = useHistory();
+  var navigate = useNavigate();
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
   var actionSchema = useFieldSchema();
@@ -170,6 +169,8 @@ export var useCreateActionProps = function useCreateActionProps() {
   var currentRecord = useRecord();
   var currentUserContext = useCurrentUserContext();
   var currentUser = currentUserContext === null || currentUserContext === void 0 ? void 0 : (_currentUserContext$d = currentUserContext.data) === null || _currentUserContext$d === void 0 ? void 0 : _currentUserContext$d.data;
+  var action = actionField.componentProps.saveMode || 'create';
+  var filterKeys = actionField.componentProps.filterKeys || [];
   return {
     onClick: function onClick() {
       return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
@@ -205,8 +206,9 @@ export var useCreateActionProps = function useCreateActionProps() {
               actionField.data.loading = true;
               _context2.prev = 11;
               _context2.next = 14;
-              return resource.create({
-                values: _objectSpread(_objectSpread(_objectSpread({}, values), overwriteValues), assignedValues)
+              return resource[action]({
+                values: _objectSpread(_objectSpread(_objectSpread({}, values), overwriteValues), assignedValues),
+                filterKeys: filterKeys
               });
             case 14:
               data = _context2.sent;
@@ -235,7 +237,7 @@ export var useCreateActionProps = function useCreateActionProps() {
                               if (isURL(onSuccess.redirectTo)) {
                                 window.location.href = onSuccess.redirectTo;
                               } else {
-                                history.push(onSuccess.redirectTo);
+                                navigate(onSuccess.redirectTo);
                               }
                             }
                           case 3:
@@ -536,7 +538,7 @@ export var useCustomizeUpdateActionProps = function useCustomizeUpdateActionProp
   var currentRecord = useRecord();
   var currentUserContext = useCurrentUserContext();
   var currentUser = currentUserContext === null || currentUserContext === void 0 ? void 0 : (_currentUserContext$d3 = currentUserContext.data) === null || _currentUserContext$d3 === void 0 ? void 0 : _currentUserContext$d3.data;
-  var history = useHistory();
+  var navigate = useNavigate();
   var compile = useCompile();
   var form = useForm();
   return {
@@ -588,7 +590,7 @@ export var useCustomizeUpdateActionProps = function useCustomizeUpdateActionProp
                               if (isURL(onSuccess.redirectTo)) {
                                 window.location.href = onSuccess.redirectTo;
                               } else {
-                                history.push(onSuccess.redirectTo);
+                                navigate(onSuccess.redirectTo);
                               }
                             }
                           case 1:
@@ -629,7 +631,7 @@ export var useCustomizeBulkUpdateActionProps = function useCustomizeBulkUpdateAc
   var selectedRecordKeys = (_ref6 = (_tableBlockContext$fi = (_tableBlockContext$fi2 = tableBlockContext.field) === null || _tableBlockContext$fi2 === void 0 ? void 0 : (_tableBlockContext$fi3 = _tableBlockContext$fi2.data) === null || _tableBlockContext$fi3 === void 0 ? void 0 : _tableBlockContext$fi3.selectedRowKeys) !== null && _tableBlockContext$fi !== void 0 ? _tableBlockContext$fi : expressionScope === null || expressionScope === void 0 ? void 0 : expressionScope.selectedRecordKeys) !== null && _ref6 !== void 0 ? _ref6 : {};
   var currentUserContext = useCurrentUserContext();
   var currentUser = currentUserContext === null || currentUserContext === void 0 ? void 0 : (_currentUserContext$d4 = currentUserContext.data) === null || _currentUserContext$d4 === void 0 ? void 0 : _currentUserContext$d4.data;
-  var history = useHistory();
+  var navigate = useNavigate();
   var compile = useCompile();
   var _useTranslation2 = useTranslation(),
     t = _useTranslation2.t;
@@ -722,7 +724,7 @@ export var useCustomizeBulkUpdateActionProps = function useCustomizeBulkUpdateAc
                                           if (isURL(onSuccess.redirectTo)) {
                                             window.location.href = onSuccess.redirectTo;
                                           } else {
-                                            history.push(onSuccess.redirectTo);
+                                            navigate(onSuccess.redirectTo);
                                           }
                                         }
                                       case 1:
@@ -781,7 +783,7 @@ export var useCustomizeBulkEditActionProps = function useCustomizeBulkEditAction
     __parent = _useBlockRequestConte5.__parent;
   var expressionScope = useContext(SchemaExpressionScopeContext);
   var actionContext = useActionContext();
-  var history = useHistory();
+  var navigate = useNavigate();
   var compile = useCompile();
   var actionField = useField();
   var tableBlockContext = useTableBlockContext();
@@ -877,7 +879,7 @@ export var useCustomizeBulkEditActionProps = function useCustomizeBulkEditAction
                               if (isURL(onSuccess.redirectTo)) {
                                 window.location.href = onSuccess.redirectTo;
                               } else {
-                                history.push(onSuccess.redirectTo);
+                                navigate(onSuccess.redirectTo);
                               }
                             }
                           case 3:
@@ -911,7 +913,7 @@ export var useCustomizeBulkEditActionProps = function useCustomizeBulkEditAction
 export var useCustomizeRequestActionProps = function useCustomizeRequestActionProps() {
   var _currentUserContext$d5;
   var apiClient = useAPIClient();
-  var history = useHistory();
+  var navigate = useNavigate();
   var filterByTk = useFilterByTk();
   var actionSchema = useFieldSchema();
   var compile = useCompile();
@@ -1015,7 +1017,7 @@ export var useCustomizeRequestActionProps = function useCustomizeRequestActionPr
                               if (isURL(onSuccess.redirectTo)) {
                                 window.location.href = onSuccess.redirectTo;
                               } else {
-                                history.push(onSuccess.redirectTo);
+                                navigate(onSuccess.redirectTo);
                               }
                             }
                           case 1:
@@ -1057,7 +1059,7 @@ export var useUpdateActionProps = function useUpdateActionProps() {
   var _useActionContext4 = useActionContext(),
     setVisible = _useActionContext4.setVisible;
   var actionSchema = useFieldSchema();
-  var history = useHistory();
+  var navigate = useNavigate();
   var _useCollection5 = useCollection(),
     fields = _useCollection5.fields,
     getField = _useCollection5.getField;
@@ -1127,7 +1129,7 @@ export var useUpdateActionProps = function useUpdateActionProps() {
                               if (isURL(onSuccess.redirectTo)) {
                                 window.location.href = onSuccess.redirectTo;
                               } else {
-                                history.push(onSuccess.redirectTo);
+                                navigate(onSuccess.redirectTo);
                               }
                             }
                           case 3:
@@ -1183,7 +1185,7 @@ export var useDestroyActionProps = function useDestroyActionProps() {
               });
             case 2:
               _ref16 = (service === null || service === void 0 ? void 0 : (_service$data = service.data) === null || _service$data === void 0 ? void 0 : _service$data.meta) || {}, _ref16$count = _ref16.count, count = _ref16$count === void 0 ? 0 : _ref16$count, _ref16$page = _ref16.page, page = _ref16$page === void 0 ? 0 : _ref16$page, _ref16$pageSize = _ref16.pageSize, pageSize = _ref16$pageSize === void 0 ? 0 : _ref16$pageSize;
-              if (count % pageSize === 1) {
+              if (count % pageSize === 1 && page !== 1) {
                 service.run(_objectSpread(_objectSpread({}, service === null || service === void 0 ? void 0 : (_service$params2 = service.params) === null || _service$params2 === void 0 ? void 0 : _service$params2[0]), {}, {
                   page: page - 1
                 }));
@@ -1412,6 +1414,9 @@ var isOptionalField = function isOptionalField(field) {
 export var useAssociationFilterBlockProps = function useAssociationFilterBlockProps() {
   var _fieldSchema$xCompon5, _fieldSchema$xCompon6, _field$componentProps3, _field$componentProps4;
   var collectionField = AssociationFilter.useAssociationField();
+  if (!collectionField) {
+    return {};
+  }
   var fieldSchema = useFieldSchema();
   var optionalFieldList = useOptionalFieldList();
   var _useFilterBlock3 = useFilterBlock(),
@@ -1522,132 +1527,43 @@ export var useAssociationFilterBlockProps = function useAssociationFilterBlockPr
     labelKey: labelKey
   };
 };
-var getTemplateSchema = function getTemplateSchema(schema) {
-  var conf = {
-    url: "/uiSchemas:getJsonSchema/".concat(schema === null || schema === void 0 ? void 0 : schema.uid)
-  };
-  var _useRequest3 = useRequest(conf, {
-      manual: true
-    }),
-    data = _useRequest3.data,
-    loading = _useRequest3.loading,
-    run = _useRequest3.run;
-  if (loading) {}
-  useEffect(function () {
-    if (schema === null || schema === void 0 ? void 0 : schema.uid) {
-      run();
-    }
-  }, [schema === null || schema === void 0 ? void 0 : schema.uid]);
-  return (schema === null || schema === void 0 ? void 0 : schema.uid) ? new Schema(data === null || data === void 0 ? void 0 : data.data) : null;
-};
-export var useAssociationNames = function useAssociationNames(collection) {
-  var _templateSchema$xCom;
+function getAssociationPath(str) {
+  var lastIndex = str.lastIndexOf('.');
+  if (lastIndex !== -1) {
+    return str.substring(0, lastIndex);
+  }
+  return str;
+}
+export var useAssociationNames = function useAssociationNames() {
   var _useCollectionManager2 = useCollectionManager(),
     getCollectionJoinField = _useCollectionManager2.getCollectionJoinField;
-  var _useSchemaTemplateMan = useSchemaTemplateManager(),
-    getTemplateById = _useSchemaTemplateMan.getTemplateById;
   var fieldSchema = useFieldSchema();
-  var associationValues = [];
-  var formSchema = fieldSchema.reduceProperties(function (buf, schema) {
-    if (['FormV2', 'Details', 'List', 'GridCard'].includes(schema['x-component'])) {
-      return schema;
-    }
-    return buf;
-  }, new Schema({}));
-  var templateSchema = formSchema.reduceProperties(function (buf, schema) {
-    if (schema['x-component'] === 'BlockTemplate') {
-      return schema;
-    }
-    return buf;
-  }, null);
-  var getAssociationAppends = function getAssociationAppends(schema) {
-    var arr = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-    var data = schema.reduceProperties(function (buf, s) {
+  var updateAssociationValues = new Set([]);
+  var appends = new Set([]);
+  var getAssociationAppends = function getAssociationAppends(schema, str) {
+    schema.reduceProperties(function (pre, s) {
+      var prefix = pre || str;
       var collectionfield = s['x-collection-field'] && getCollectionJoinField(s['x-collection-field']);
-      if (collectionfield && ['hasOne', 'hasMany', 'belongsTo', 'belongsToMany'].includes(collectionfield.type) && s['x-component'] !== 'TableField') {
+      var isAssociationSubfield = s.name.includes('.');
+      var isAssociationField = collectionfield && ['hasOne', 'hasMany', 'belongsTo', 'belongsToMany'].includes(collectionfield.type);
+      if (collectionfield && (isAssociationField || isAssociationSubfield) && s['x-component'] !== 'TableField') {
         var _s$xComponentProps;
-        buf.push(s.name);
+        var fieldPath = !isAssociationField && isAssociationSubfield ? getAssociationPath(s.name) : s.name;
+        var path = prefix === '' || !prefix ? fieldPath : prefix + '.' + fieldPath;
+        appends.add(path);
         if (['Nester', 'SubTable'].includes((_s$xComponentProps = s['x-component-props']) === null || _s$xComponentProps === void 0 ? void 0 : _s$xComponentProps.mode)) {
-          associationValues.push(s.name);
-        }
-        if (s['x-component-props'].mode === 'Nester') {
-          return getAssociationAppends(s, buf);
-        }
-        return buf;
-      } else {
-        if (s['x-component'] === 'Grid.Row') {
-          var _buf$concat;
-          var kk = buf === null || buf === void 0 ? void 0 : (_buf$concat = buf.concat) === null || _buf$concat === void 0 ? void 0 : _buf$concat.call(buf);
-          return getNesterAppends(s, kk || []);
-        } else {
-          var _s$xComponent;
-          return !((_s$xComponent = s['x-component']) === null || _s$xComponent === void 0 ? void 0 : _s$xComponent.includes('Action.')) && s['x-component'] !== 'TableField' ? getAssociationAppends(s, buf) : buf;
+          updateAssociationValues.add(path);
+          var bufPrefix = prefix && prefix !== '' ? prefix + '.' + s.name : s.name;
+          getAssociationAppends(s, bufPrefix);
         }
+      } else if (!['ActionBar', 'Action', 'Action.Link', 'Action.Modal', 'Selector', 'Viewer', 'AddNewer', 'AssociationField.Selector', 'AssociationField.AddNewer', 'TableField'].includes(s['x-component'])) {
+        getAssociationAppends(s, str);
       }
-    }, arr);
-    return data || [];
+    }, str);
   };
-  function flattenNestedList(nestedList) {
-    var flattenedList = [];
-    function flattenHelper(list, prefix) {
-      for (var i = 0; i < list.length; i++) {
-        if (Array.isArray(list[i])) {
-          "".concat(prefix) !== "".concat(list[i][0]) && flattenHelper(list[i], "".concat(prefix, ".").concat(list[i][0]));
-        } else {
-          var searchTerm = ".".concat(list[i]);
-          var lastIndex = prefix.lastIndexOf(searchTerm);
-          var str = '';
-          if (lastIndex !== -1) {
-            str = prefix.slice(0, lastIndex) + prefix.slice(lastIndex + searchTerm.length);
-          }
-          if (!str) {
-            !list.includes(str) && flattenedList.push("".concat(list[i]));
-          } else {
-            !list.includes(str) ? flattenedList.push("".concat(str, ".").concat(list[i])) : flattenedList.push(str);
-          }
-        }
-      }
-    }
-    for (var i = 0; i < nestedList.length; i++) {
-      flattenHelper(nestedList[i], nestedList[i][0]);
-    }
-    return uniq(flattenedList.filter(function (obj) {
-      return !(obj === null || obj === void 0 ? void 0 : obj.startsWith('.'));
-    }));
-  }
-  var getNesterAppends = function getNesterAppends(gridSchema, data) {
-    gridSchema.reduceProperties(function (buf, s) {
-      buf.push(getAssociationAppends(s));
-      return buf;
-    }, data);
-    return data.filter(function (g) {
-      return g.length;
-    });
+  getAssociationAppends(fieldSchema, '');
+  return {
+    appends: _toConsumableArray(appends),
+    updateAssociationValues: _toConsumableArray(updateAssociationValues)
   };
-  var template = getTemplateById(templateSchema === null || templateSchema === void 0 ? void 0 : (_templateSchema$xCom = templateSchema['x-component-props']) === null || _templateSchema$xCom === void 0 ? void 0 : _templateSchema$xCom.templateId);
-  var schema = getTemplateSchema(template);
-  if (schema) {
-    var associations = getAssociationAppends(schema);
-    var appends = flattenNestedList(associations);
-    return {
-      appends: appends,
-      updateAssociationValues: appends.filter(function (item) {
-        return associationValues.some(function (suffix) {
-          return item.endsWith(suffix);
-        });
-      })
-    };
-  }
-  if (!schema) {
-    var _associations = getAssociationAppends(formSchema);
-    var _appends = flattenNestedList(_associations);
-    return {
-      appends: _appends,
-      updateAssociationValues: _appends.filter(function (item) {
-        return associationValues.some(function (suffix) {
-          return item.endsWith(suffix);
-        });
-      })
-    };
-  }
 };

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

@@ -11,3 +11,4 @@ export * from './TableSelectorProvider';
 export * from './FormFieldProvider';
 export * from './GanttBlockProvider';
 export * from './SharedFilterProvider';
+export * from './hooks';

package/es/block-provider/index.js

@@ -10,4 +10,5 @@ export * from './TableFieldProvider';
 export * from './TableSelectorProvider';
 export * from './FormFieldProvider';
 export * from './GanttBlockProvider';
-export * from './SharedFilterProvider';
+export * from './SharedFilterProvider';
+export * from './hooks';

package/es/board/Card.d.ts

@@ -1,8 +1,8 @@
-/// <reference types="react" />
+import React from 'react';
 declare function Card({ children, index, renderCard, disableCardDrag }: {
     children: any;
     index: any;
     renderCard: any;
     disableCardDrag: any;
-}): JSX.Element;
+}): React.JSX.Element;
 export default Card;

package/es/board/CardAdder.d.ts

@@ -1,6 +1,6 @@
-/// <reference types="react" />
+import React from 'react';
 declare function CardAdder({ column, onConfirm }: {
     column: any;
     onConfirm: any;
-}): JSX.Element;
+}): React.JSX.Element;
 export default CardAdder;

package/es/board/CardForm.d.ts

@@ -1,6 +1,6 @@
-/// <reference types="react" />
+import React from 'react';
 declare function CardForm({ onConfirm, onCancel }: {
     onConfirm: any;
     onCancel: any;
-}): JSX.Element;
+}): React.JSX.Element;
 export default CardForm;

package/es/board/Column.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from 'react';
 declare function Column({ children, index: columnIndex, renderCard, renderCardAdder, renderColumnHeader, disableColumnDrag, disableCardDrag, onCardNew, allowAddCard, cardAdderPosition, }: {
     children: any;
     index: any;
@@ -6,12 +6,12 @@ declare function Column({ children, index: columnIndex, renderCard, renderCardAd
     renderCardAdder?: ({ column, onConfirm }: {
         column: any;
         onConfirm: any;
-    }) => JSX.Element;
+    }) => React.JSX.Element;
     renderColumnHeader: any;
     disableColumnDrag: any;
     disableCardDrag: any;
     onCardNew: any;
     allowAddCard: any;
     cardAdderPosition?: string;
-}): JSX.Element;
+}): React.JSX.Element;
 export default Column;

package/es/board/ColumnAdder.d.ts

@@ -1,5 +1,5 @@
-/// <reference types="react" />
+import React from 'react';
 declare function ColumnAdder({ onConfirm }: {
     onConfirm: any;
-}): JSX.Element;
+}): React.JSX.Element;
 export default ColumnAdder;

package/es/board/ColumnForm.d.ts

@@ -1,6 +1,6 @@
-/// <reference types="react" />
+import React from 'react';
 declare function ColumnForm({ onConfirm, onCancel }: {
     onConfirm: any;
     onCancel: any;
-}): JSX.Element;
+}): React.JSX.Element;
 export default ColumnForm;

package/es/board/DefaultCard.d.ts

@@ -1,8 +1,8 @@
-/// <reference types="react" />
+import React from 'react';
 declare function DefaultCard({ children: card, dragging, allowRemoveCard, onCardRemove }: {
     children: any;
     dragging: any;
     allowRemoveCard: any;
     onCardRemove: any;
-}): JSX.Element;
+}): React.JSX.Element;
 export default DefaultCard;

package/es/board/DefaultColumnHeader.d.ts

@@ -1,9 +1,9 @@
-/// <reference types="react" />
+import React from 'react';
 declare function DefaultColumnHeader({ children: column, allowRemoveColumn, onColumnRemove, allowRenameColumn, onColumnRename, }: {
     children: any;
     allowRemoveColumn: any;
     onColumnRemove: any;
     allowRenameColumn: any;
     onColumnRename: any;
-}): JSX.Element;
+}): React.JSX.Element;
 export default DefaultColumnHeader;

package/es/board/Kanban.d.ts

@@ -1,3 +1,3 @@
-/// <reference types="react" />
 import '@asseinfo/react-kanban/dist/styles.css';
-export declare function Kanban(): JSX.Element;
+import React from 'react';
+export declare function Kanban(): React.JSX.Element;

package/es/board/withDroppable.d.ts

@@ -1,5 +1,6 @@
+import React from 'react';
 declare function withDroppable(Component: any): ({ children, ...droppableProps }: {
     [x: string]: any;
     children: any;
-}) => JSX.Element;
+}) => React.JSX.Element;
 export default withDroppable;

package/es/china-region/index.d.ts

@@ -1 +1,2 @@
-export declare const ChinaRegionProvider: (props: any) => JSX.Element;
+import React from 'react';
+export declare const ChinaRegionProvider: (props: any) => React.JSX.Element;

package/es/collection-manager/CollectionField.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
-export declare const InternalFallbackField: () => JSX.Element;
+export declare const InternalFallbackField: () => React.JSX.Element;
 export declare const CollectionField: React.ForwardRefExoticComponent<Pick<Partial<any>, string | number | symbol> & React.RefAttributes<unknown>>;
 export default CollectionField;

package/es/collection-manager/CollectionField.js

@@ -46,7 +46,8 @@ var InternalField = function InternalField(props) {
     setFieldProps('title', uiSchema.title);
     setFieldProps('description', uiSchema.description);
     if (ctx === null || ctx === void 0 ? void 0 : ctx.form) {
-      setFieldProps('initialValue', fieldSchema.default || defaultValue);
+      var defaultVal = fieldSchema.default || defaultValue;
+      defaultVal !== null && defaultVal !== undefined && setFieldProps('initialValue', defaultVal);
     }
     if (!field.validator && (uiSchema['x-validator'] || fieldSchema['x-validator'])) {
       var concatSchema = concat([], uiSchema['x-validator'] || [], fieldSchema['x-validator'] || []);

package/es/collection-manager/CollectionManagerProvider.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
 import { CollectionManagerOptions } from './types';
 export declare const CollectionManagerProvider: React.FC<CollectionManagerOptions>;
-export declare const RemoteCollectionManagerProvider: (props: any) => JSX.Element;
-export declare const CollectionCategroriesProvider: (props: any) => JSX.Element;
+export declare const RemoteCollectionManagerProvider: (props: any) => React.JSX.Element;
+export declare const CollectionCategroriesProvider: (props: any) => React.JSX.Element;

package/es/collection-manager/CollectionManagerShortcut.d.ts

@@ -1,3 +1,2 @@
-export declare const CollectionManagerPane: () => JSX.Element;
-export declare const CollectionManagerShortcut: () => JSX.Element;
-export declare const CollectionManagerShortcut2: () => JSX.Element;
+import React from 'react';
+export declare const CollectionManagerPane: () => React.JSX.Element;

package/es/collection-manager/CollectionManagerShortcut.js

@@ -1,21 +1,11 @@
 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 _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 _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 { DatabaseOutlined } from '@ant-design/icons';
 import { uid } from '@formily/shared';
-import React, { useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { useHistory } from 'react-router-dom';
-import { PluginManager } from '../plugin-manager';
-import { ActionContext, SchemaComponent } from '../schema-component';
-import { AddCollectionField, AddFieldAction, ConfigurationTable, EditFieldAction, EditCollectionField, OverridingFieldAction, OverridingCollectionField, ViewCollectionField, ViewFieldAction, AddCollection, AddCollectionAction, AddCategoryAction, AddCategory, EditCollection, EditCollectionAction, ConfigurationTabs, EditCategory, EditCategoryAction, SyncFieldsAction, SyncFieldsActionCom } from './Configuration';
+import React from 'react';
+import { SchemaComponent } from '../schema-component';
+import { AddCategory, AddCategoryAction, AddCollection, AddCollectionAction, AddCollectionField, AddFieldAction, ConfigurationTable, ConfigurationTabs, EditCategory, EditCategoryAction, EditCollection, EditCollectionAction, EditCollectionField, EditFieldAction, OverridingCollectionField, OverridingFieldAction, SyncFieldsAction, SyncFieldsActionCom, ViewCollectionField, ViewFieldAction } from './Configuration';
 import { CollectionCategroriesProvider } from './CollectionManagerProvider';
 var schema = {
   type: 'object',
@@ -69,51 +59,4 @@ export var CollectionManagerPane = function CollectionManagerPane() {
     })
     // </Card>
   );
-};
-
-export var CollectionManagerShortcut = function CollectionManagerShortcut() {
-  var _useTranslation = useTranslation(),
-    t = _useTranslation.t;
-  var history = useHistory();
-  return /*#__PURE__*/React.createElement(PluginManager.Toolbar.Item, {
-    icon: /*#__PURE__*/React.createElement(DatabaseOutlined, null),
-    title: t('Collections & Fields'),
-    onClick: function onClick() {
-      history.push('/admin/settings/collection-manager/collections');
-    }
-  });
-};
-export var CollectionManagerShortcut2 = function CollectionManagerShortcut2() {
-  var _useState = useState(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    visible = _useState2[0],
-    setVisible = _useState2[1];
-  var _useTranslation2 = useTranslation(),
-    t = _useTranslation2.t;
-  return /*#__PURE__*/React.createElement(ActionContext.Provider, {
-    value: {
-      visible: visible,
-      setVisible: setVisible
-    }
-  }, /*#__PURE__*/React.createElement(PluginManager.Toolbar.Item, {
-    icon: /*#__PURE__*/React.createElement(DatabaseOutlined, null),
-    title: t('Collections & Fields'),
-    onClick: function onClick() {
-      setVisible(true);
-    }
-  }), /*#__PURE__*/React.createElement(SchemaComponent, {
-    schema: schema,
-    components: {
-      ConfigurationTable: ConfigurationTable,
-      ConfigurationTabs: ConfigurationTabs,
-      AddFieldAction: AddFieldAction,
-      EditFieldAction: EditFieldAction,
-      OverridingFieldAction: OverridingFieldAction,
-      ViewFieldAction: ViewFieldAction,
-      AddCollectionAction: AddCollectionAction,
-      EditCollectionAction: EditCollectionAction,
-      AddCategoryAction: AddCategoryAction,
-      EditCategoryAction: EditCategoryAction
-    }
-  }));
 };

package/es/collection-manager/Configuration/AddCategoryAction.d.ts

@@ -1,2 +1,3 @@
-export declare const AddCategory: (props: any) => JSX.Element;
-export declare const AddCategoryAction: (props: any) => JSX.Element;
+import React from 'react';
+export declare const AddCategory: (props: any) => React.JSX.Element;
+export declare const AddCategoryAction: (props: any) => React.JSX.Element;

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

@@ -19,7 +19,7 @@ import { cloneDeep } from 'lodash';
 import React, { useContext, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useAPIClient } from '../../api-client';
-import { ActionContext, SchemaComponent, useActionContext } from '../../schema-component';
+import { ActionContextProvider, SchemaComponent, useActionContext } from '../../schema-component';
 import { useCancelAction } from '../action-hooks';
 import { CollectionCategroriesContext } from '../context';
 import * as components from './components';
@@ -74,7 +74,7 @@ export var AddCategoryAction = function AddCategoryAction(props) {
     setVisible = _useState2[1];
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
-  return /*#__PURE__*/React.createElement(ActionContext.Provider, {
+  return /*#__PURE__*/React.createElement(ActionContextProvider, {
     value: {
       visible: visible,
       setVisible: setVisible

package/es/collection-manager/Configuration/AddCollectionAction.d.ts

@@ -1,2 +1,3 @@
-export declare const AddCollection: (props: any) => JSX.Element;
-export declare const AddCollectionAction: (props: any) => JSX.Element;
+import React from 'react';
+export declare const AddCollection: (props: any) => React.JSX.Element;
+export declare const AddCollectionAction: (props: any) => React.JSX.Element;

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

@@ -27,7 +27,7 @@ import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useRequest } from '../../api-client';
 import { RecordProvider, useRecord } from '../../record-provider';
-import { ActionContext, SchemaComponent, useActionContext, useCompile } from '../../schema-component';
+import { ActionContextProvider, SchemaComponent, useActionContext, useCompile } from '../../schema-component';
 import { useResourceActionContext, useResourceContext } from '../ResourceActionProvider';
 import { useCancelAction } from '../action-hooks';
 import { useCollectionManager } from '../hooks';
@@ -325,7 +325,7 @@ export var AddCollectionAction = function AddCollectionAction(props) {
     category = _useResourceActionCon2.state.category;
   return /*#__PURE__*/React.createElement(RecordProvider, {
     record: record
-  }, /*#__PURE__*/React.createElement(ActionContext.Provider, {
+  }, /*#__PURE__*/React.createElement(ActionContextProvider, {
     value: {
       visible: visible,
       setVisible: setVisible