@nocobase/client 0.9.0-alpha.2 → 0.9.1-alpha.1

package/es/acl/ACLProvider.js

@@ -1,7 +1,3 @@
-function _toArray(arr) { return _arrayWithHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableRest(); }
-
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
 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; }
@@ -364,10 +360,11 @@ export var useACLFieldWhitelist = function useACLFieldWhitelist() {
       }
 
       var _fieldSchema$xCollec = fieldSchema['x-collection-field'].split('.'),
-          _fieldSchema$xCollec2 = _toArray(_fieldSchema$xCollec),
-          keys = _fieldSchema$xCollec2.slice(1);
+          _fieldSchema$xCollec2 = _slicedToArray(_fieldSchema$xCollec, 2),
+          key1 = _fieldSchema$xCollec2[0],
+          key2 = _fieldSchema$xCollec2[1];
 
-      return whitelist === null || whitelist === void 0 ? void 0 : whitelist.includes(keys.join('.'));
+      return whitelist === null || whitelist === void 0 ? void 0 : whitelist.includes(key2 || key1);
     }
   };
 };

package/es/api-client/APIClient.js

@@ -76,6 +76,12 @@ export var APIClient = /*#__PURE__*/function (_APIClientSDK) {
     value: function interceptors() {
       this.axios.interceptors.request.use(function (config) {
         config.headers['X-With-ACL-Meta'] = true;
+        var match = location.pathname.match(/^\/apps\/([^/]*)\//);
+
+        if (match) {
+          config.headers['X-App'] = match[1];
+        }
+
         return config;
       });
 

package/es/block-provider/BlockProvider.js

@@ -1,6 +1,6 @@
 var _excluded = ["title", "to"];
 
-var _templateObject, _templateObject2;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4;
 
 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; }
 
@@ -31,7 +31,7 @@ import { useRecordIndex } from '../record-provider';
 import { SharedFilterProvider } from './SharedFilterProvider';
 export var BlockResourceContext = /*#__PURE__*/createContext(null);
 export var BlockAssociationContext = /*#__PURE__*/createContext(null);
-export var BlockRequestContext = /*#__PURE__*/createContext(null);
+export var BlockRequestContext = /*#__PURE__*/createContext({});
 export var useBlockResource = function useBlockResource() {
   return useContext(BlockResourceContext);
 };
@@ -108,7 +108,7 @@ export var useResourceAction = function useResourceAction(props) {
       fields = _useCollection.fields;
 
   var appends = fields === null || fields === void 0 ? void 0 : fields.filter(function (field) {
-    return field.target && field.interface !== 'snapshot';
+    return field.target;
   }).map(function (field) {
     return field.name;
   });
@@ -222,10 +222,11 @@ export var RenderChildrenWithAssociationFilter = function RenderChildrenWithAsso
 
   if (associationFilterSchema) {
     return /*#__PURE__*/React.createElement(Component, _objectSpread({}, field.componentProps), /*#__PURE__*/React.createElement(Row, {
+      className: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n            height: 100%;\n          "]))),
       gutter: 16,
       wrap: false
     }, /*#__PURE__*/React.createElement(Col, {
-      className: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n              width: 200px;\n              flex: 0 0 auto;\n            "])))
+      className: css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n              width: 200px;\n              flex: 0 0 auto;\n            "])))
     }, /*#__PURE__*/React.createElement(RecursionField, {
       schema: fieldSchema,
       onlyRenderProperties: true,
@@ -233,14 +234,16 @@ export var RenderChildrenWithAssociationFilter = function RenderChildrenWithAsso
         return s['x-component'] === 'AssociationFilter';
       }
     })), /*#__PURE__*/React.createElement(Col, {
-      className: css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n              flex: 1 1 auto;\n              min-width: 0;\n            "])))
+      className: css(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n              flex: 1 1 auto;\n              min-width: 0;\n            "])))
+    }, /*#__PURE__*/React.createElement("div", {
+      className: css(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n                display: flex;\n                flex-direction: column;\n                height: 100%;\n              "])))
     }, /*#__PURE__*/React.createElement(RecursionField, {
       schema: fieldSchema,
       onlyRenderProperties: true,
       filterProperties: function filterProperties(s) {
         return s['x-component'] !== 'AssociationFilter';
       }
-    }))));
+    })))));
   }
 
   return props.children;

package/es/block-provider/FormBlockProvider.js

@@ -71,7 +71,9 @@ export var FormBlockProvider = function FormBlockProvider(props) {
       designable = _useDesignable.designable;
 
   var flag = !designable && __tableName && !inheritCollections.includes(props.collection) && __tableName !== props.collection;
-  return !flag && /*#__PURE__*/React.createElement(BlockProvider, _objectSpread({}, props), /*#__PURE__*/React.createElement(InternalFormBlockProvider, _objectSpread({}, props)));
+  return !flag && /*#__PURE__*/React.createElement(BlockProvider, _objectSpread(_objectSpread({}, props), {}, {
+    block: 'form'
+  }), /*#__PURE__*/React.createElement(InternalFormBlockProvider, _objectSpread({}, props)));
 };
 export var useFormBlockContext = function useFormBlockContext() {
   return useContext(FormBlockContext);

package/es/block-provider/KanbanBlockProvider.js

@@ -124,7 +124,7 @@ var useAssociationNames = function useAssociationNames(collection) {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
       var collectionField = _step.value;
 
-      if (collectionField.target && collectionField.interface !== 'snapshot') {
+      if (collectionField.target) {
         associationFields.add(collectionField.name);
         var fields = getCollectionFields(collectionField.target);
 

package/es/block-provider/SharedFilterProvider.js

@@ -12,6 +12,8 @@ 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; }
 
+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 React, { createContext, useState } from 'react';
 export var SHARED_FILTER_CONDITION;
 
@@ -22,7 +24,13 @@ export var SHARED_FILTER_CONDITION;
 
 export var mergeFilter = function mergeFilter(filters) {
   var op = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '$and';
-  var items = filters.filter(Boolean);
+  var items = filters.filter(function (f) {
+    if (f && _typeof(f) === 'object' && !Array.isArray(f)) {
+      return Object.values(f).filter(function (v) {
+        return v !== undefined;
+      }).length;
+    }
+  });
 
   if (items.length === 0) {
     return {};

package/es/block-provider/TableBlockProvider.js

@@ -73,7 +73,7 @@ export var useAssociationNames = function useAssociationNames(collection) {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
       var collectionField = _step.value;
 
-      if (collectionField.target && collectionField.interface !== 'snapshot') {
+      if (collectionField.target) {
         associationFields.add(collectionField.name);
         var fields = getCollectionFields(collectionField.target);
 

package/es/block-provider/TableSelectorProvider.js

@@ -65,7 +65,7 @@ var useAssociationNames2 = function useAssociationNames2(collection) {
       getCollectionFields = _useCollectionManager.getCollectionFields;
 
   var names = (_getCollectionFields = getCollectionFields(collection)) === null || _getCollectionFields === void 0 ? void 0 : _getCollectionFields.filter(function (field) {
-    return field.target && field.interface !== 'snapshot';
+    return field.target;
   }).map(function (field) {
     return field.name;
   });
@@ -90,7 +90,7 @@ var useAssociationNames = function useAssociationNames(collection) {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
       var collectionField = _step.value;
 
-      if (collectionField.target && collectionField.interface !== 'snapshot') {
+      if (collectionField.target) {
         associationFields.add(collectionField.name);
         var fields = getCollectionFields(collectionField.target);
 

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

@@ -1,13 +1,13 @@
+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); }); }; }
+
 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 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); }); }; }
-
 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 { useField, useFieldSchema, useForm } from '@formily/react';
@@ -15,6 +15,7 @@ import { message, Modal } from 'antd';
 import parse from 'json-templates';
 import { cloneDeep } from 'lodash';
 import get from 'lodash/get';
+import omit from 'lodash/omit';
 import { useTranslation } from 'react-i18next';
 import { useHistory } from 'react-router-dom';
 import { useReactToPrint } from 'react-to-print';
@@ -89,6 +90,20 @@ var filterValue = function filterValue(value) {
 };
 
 function getFormValues(filterByTk, field, form, fieldNames, getField, resource) {
+  if (filterByTk) {
+    var _field$data;
+
+    var actionFields = field === null || field === void 0 ? void 0 : (_field$data = field.data) === null || _field$data === void 0 ? void 0 : _field$data.activeFields;
+
+    if (actionFields) {
+      var keys = Object.keys(form.values).filter(function (key) {
+        var f = getField(key);
+        return !actionFields.has(key) && ['hasOne', 'hasMany', 'belongsTo', 'belongsToMany'].includes(f === null || f === void 0 ? void 0 : f.type);
+      });
+      return omit(_objectSpread({}, form.values), keys);
+    }
+  }
+
   return form.values;
   var values = {};
 
@@ -1166,13 +1181,13 @@ export var useBulkDestroyActionProps = function useBulkDestroyActionProps() {
   return {
     onClick: function onClick() {
       return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee17() {
-        var _field$data, _field$data$selectedR, _field$data2, _service$refresh5;
+        var _field$data2, _field$data2$selected, _field$data3, _service$refresh5;
 
         return regeneratorRuntime.wrap(function _callee17$(_context17) {
           while (1) {
             switch (_context17.prev = _context17.next) {
               case 0:
-                if (field === null || field === void 0 ? void 0 : (_field$data = field.data) === null || _field$data === void 0 ? void 0 : (_field$data$selectedR = _field$data.selectedRowKeys) === null || _field$data$selectedR === void 0 ? void 0 : _field$data$selectedR.length) {
+                if (field === null || field === void 0 ? void 0 : (_field$data2 = field.data) === null || _field$data2 === void 0 ? void 0 : (_field$data2$selected = _field$data2.selectedRowKeys) === null || _field$data2$selected === void 0 ? void 0 : _field$data2$selected.length) {
                   _context17.next = 2;
                   break;
                 }
@@ -1182,7 +1197,7 @@ export var useBulkDestroyActionProps = function useBulkDestroyActionProps() {
               case 2:
                 _context17.next = 4;
                 return resource.destroy({
-                  filterByTk: (_field$data2 = field.data) === null || _field$data2 === void 0 ? void 0 : _field$data2.selectedRowKeys
+                  filterByTk: (_field$data3 = field.data) === null || _field$data3 === void 0 ? void 0 : _field$data3.selectedRowKeys
                 });
 
               case 4:

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

@@ -2,3 +2,4 @@ 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;

package/es/collection-manager/CollectionManagerProvider.js

@@ -6,13 +6,21 @@ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArra
 
 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 _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
 function _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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+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 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; }
 
@@ -21,14 +29,14 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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 { Spin } from 'antd';
-import React, { useContext, useState } from 'react';
 import { keyBy } from 'lodash';
+import React, { useContext, useState } from 'react';
 import { useAPIClient, useRequest } from '../api-client';
-import { CollectionManagerSchemaComponentProvider } from './CollectionManagerSchemaComponentProvider';
-import { CollectionManagerContext } from './context';
 import { templateOptions } from '../collection-manager/Configuration/templates';
-import * as defaultInterfaces from './interfaces';
 import { useCollectionHistory } from './CollectionHistoryProvider';
+import { CollectionManagerSchemaComponentProvider } from './CollectionManagerSchemaComponentProvider';
+import { CollectionCategroriesContext, CollectionManagerContext } from './context';
+import * as defaultInterfaces from './interfaces';
 export var CollectionManagerProvider = function CollectionManagerProvider(props) {
   var service = props.service,
       interfaces = props.interfaces,
@@ -45,7 +53,7 @@ export var CollectionManagerProvider = function CollectionManagerProvider(props)
       service: service,
       interfaces: _objectSpread(_objectSpread(_objectSpread({}, defaultInterfaces), ctx.interfaces), interfaces),
       templates: _objectSpread(_objectSpread({}, defaultTemplates), templates),
-      collections: collections,
+      collections: [].concat(_toConsumableArray(ctx.collections), _toConsumableArray(collections)),
       refreshCM: refreshCM
     })
   }, /*#__PURE__*/React.createElement(CollectionManagerSchemaComponentProvider, null, props.children));
@@ -68,7 +76,7 @@ export var RemoteCollectionManagerProvider = function RemoteCollectionManagerPro
     action: 'list',
     params: {
       paginate: false,
-      appends: ['fields', 'fields.uiSchema'],
+      appends: ['fields', 'fields.uiSchema', 'category'],
       filter: {// inherit: false,
       },
       sort: ['sort']
@@ -130,4 +138,58 @@ export var RemoteCollectionManagerProvider = function RemoteCollectionManagerPro
     collections: service === null || service === void 0 ? void 0 : (_service$data = service.data) === null || _service$data === void 0 ? void 0 : _service$data.data,
     refreshCM: refreshCM
   }, props));
+};
+export var CollectionCategroriesProvider = function CollectionCategroriesProvider(props) {
+  var _result$data;
+
+  var api = useAPIClient();
+  var options = {
+    url: 'collectionCategories:list',
+    params: {
+      paginate: false,
+      sort: ['sort']
+    }
+  };
+  var result = useRequest(options);
+
+  if (result.loading) {
+    return /*#__PURE__*/React.createElement(Spin, null);
+  }
+
+  return /*#__PURE__*/React.createElement(CollectionCategroriesContext.Provider, {
+    value: _objectSpread(_objectSpread({}, result), {}, {
+      data: result === null || result === void 0 ? void 0 : (_result$data = result.data) === null || _result$data === void 0 ? void 0 : _result$data.data,
+      refresh: function () {
+        var _refresh = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
+          var _yield$api$request2, data;
+
+          return regeneratorRuntime.wrap(function _callee2$(_context2) {
+            while (1) {
+              switch (_context2.prev = _context2.next) {
+                case 0:
+                  _context2.next = 2;
+                  return api.request(options);
+
+                case 2:
+                  _yield$api$request2 = _context2.sent;
+                  data = _yield$api$request2.data;
+                  result.mutate(data);
+                  return _context2.abrupt("return", (data === null || data === void 0 ? void 0 : data.data) || []);
+
+                case 6:
+                case "end":
+                  return _context2.stop();
+              }
+            }
+          }, _callee2);
+        }));
+
+        function refresh() {
+          return _refresh.apply(this, arguments);
+        }
+
+        return refresh;
+      }()
+    })
+  }, props.children);
 };

package/es/collection-manager/CollectionManagerShortcut.js

@@ -14,13 +14,13 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import { DatabaseOutlined } from '@ant-design/icons';
 import { uid } from '@formily/shared';
-import { Card } from 'antd';
 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, EditCollection, EditCollectionAction } from './Configuration';
+import { AddCollectionField, AddFieldAction, ConfigurationTable, EditFieldAction, EditCollectionField, OverridingFieldAction, OverridingCollectionField, ViewCollectionField, ViewFieldAction, AddCollection, AddCollectionAction, AddCategoryAction, AddCategory, EditCollection, EditCollectionAction, ConfigurationTabs, EditCategory, EditCategoryAction } from './Configuration';
+import { CollectionCategroriesProvider } from './CollectionManagerProvider';
 var schema = {
   type: 'object',
   properties: _defineProperty({}, uid(), {
@@ -37,30 +37,40 @@ var schema = {
 var schema2 = {
   type: 'object',
   properties: _defineProperty({}, uid(), {
+    'x-decorator': 'CollectionCategroriesProvider',
     'x-component': 'ConfigurationTable'
   })
 };
 export var CollectionManagerPane = function CollectionManagerPane() {
-  return /*#__PURE__*/React.createElement(Card, {
-    bordered: false
-  }, /*#__PURE__*/React.createElement(SchemaComponent, {
-    schema: schema2,
-    components: {
-      ConfigurationTable: ConfigurationTable,
-      AddFieldAction: AddFieldAction,
-      AddCollectionField: AddCollectionField,
-      AddCollection: AddCollection,
-      AddCollectionAction: AddCollectionAction,
-      EditCollection: EditCollection,
-      EditCollectionAction: EditCollectionAction,
-      EditFieldAction: EditFieldAction,
-      EditCollectionField: EditCollectionField,
-      OverridingCollectionField: OverridingCollectionField,
-      OverridingFieldAction: OverridingFieldAction,
-      ViewCollectionField: ViewCollectionField,
-      ViewFieldAction: ViewFieldAction
-    }
-  }));
+  return (
+    /*#__PURE__*/
+    // <Card bordered={false}>
+    React.createElement(SchemaComponent, {
+      schema: schema2,
+      components: {
+        CollectionCategroriesProvider: CollectionCategroriesProvider,
+        ConfigurationTable: ConfigurationTable,
+        ConfigurationTabs: ConfigurationTabs,
+        AddFieldAction: AddFieldAction,
+        AddCollectionField: AddCollectionField,
+        AddCollection: AddCollection,
+        AddCollectionAction: AddCollectionAction,
+        AddCategoryAction: AddCategoryAction,
+        AddCategory: AddCategory,
+        EditCollection: EditCollection,
+        EditCollectionAction: EditCollectionAction,
+        EditFieldAction: EditFieldAction,
+        EditCollectionField: EditCollectionField,
+        OverridingCollectionField: OverridingCollectionField,
+        OverridingFieldAction: OverridingFieldAction,
+        ViewCollectionField: ViewCollectionField,
+        ViewFieldAction: ViewFieldAction,
+        EditCategory: EditCategory,
+        EditCategoryAction: EditCategoryAction
+      }
+    }) // </Card>
+
+  );
 };
 export var CollectionManagerShortcut = function CollectionManagerShortcut() {
   var _useTranslation = useTranslation(),
@@ -99,12 +109,15 @@ export var CollectionManagerShortcut2 = function CollectionManagerShortcut2() {
     schema: schema,
     components: {
       ConfigurationTable: ConfigurationTable,
+      ConfigurationTabs: ConfigurationTabs,
       AddFieldAction: AddFieldAction,
       EditFieldAction: EditFieldAction,
       OverridingFieldAction: OverridingFieldAction,
       ViewFieldAction: ViewFieldAction,
       AddCollectionAction: AddCollectionAction,
-      EditCollectionAction: EditCollectionAction
+      EditCollectionAction: EditCollectionAction,
+      AddCategoryAction: AddCategoryAction,
+      EditCategoryAction: EditCategoryAction
     }
   }));
 };

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

@@ -0,0 +1,2 @@
+export declare const AddCategory: (props: any) => JSX.Element;
+export declare const AddCategoryAction: (props: any) => JSX.Element;

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

@@ -0,0 +1,117 @@
+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 = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return 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; }
+
+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 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 { PlusOutlined } from '@ant-design/icons';
+import { useForm } from '@formily/react';
+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 { useCancelAction } from '../action-hooks';
+import { CollectionCategroriesContext } from '../context';
+import * as components from './components';
+import { collectionCategorySchema } from './schemas/collections';
+
+var useCreateCategry = function useCreateCategry() {
+  var form = useForm();
+  var ctx = useActionContext();
+
+  var _useContext = useContext(CollectionCategroriesContext),
+      refresh = _useContext.refresh;
+
+  var api = useAPIClient();
+  return {
+    run: function run() {
+      return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+        var values;
+        return regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) {
+            switch (_context.prev = _context.next) {
+              case 0:
+                _context.next = 2;
+                return form.submit();
+
+              case 2:
+                values = cloneDeep(form.values);
+                _context.next = 5;
+                return api.resource('collectionCategories').create({
+                  values: _objectSpread({}, values)
+                });
+
+              case 5:
+                ctx.setVisible(false);
+                _context.next = 8;
+                return form.reset();
+
+              case 8:
+                _context.next = 10;
+                return refresh();
+
+              case 10:
+              case "end":
+                return _context.stop();
+            }
+          }
+        }, _callee);
+      }))();
+    }
+  };
+};
+
+export var AddCategory = function AddCategory(props) {
+  return /*#__PURE__*/React.createElement(AddCategoryAction, _objectSpread({}, props));
+};
+export var AddCategoryAction = function AddCategoryAction(props) {
+  var scope = props.scope,
+      getContainer = props.getContainer,
+      children = props.children;
+
+  var _useState = useState(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      visible = _useState2[0],
+      setVisible = _useState2[1];
+
+  var _useTranslation = useTranslation(),
+      t = _useTranslation.t;
+
+  return /*#__PURE__*/React.createElement(ActionContext.Provider, {
+    value: {
+      visible: visible,
+      setVisible: setVisible
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    onClick: function onClick() {
+      return setVisible(true);
+    },
+    title: t('Add category')
+  }, children || /*#__PURE__*/React.createElement(PlusOutlined, null)), /*#__PURE__*/React.createElement(SchemaComponent, {
+    schema: collectionCategorySchema,
+    components: _objectSpread({}, components),
+    scope: _objectSpread({
+      getContainer: getContainer,
+      useCancelAction: useCancelAction,
+      createOnly: true,
+      useCreateCategry: useCreateCategry
+    }, scope)
+  }));
+};

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

@@ -45,7 +45,7 @@ import { useResourceActionContext, useResourceContext } from '../ResourceActionP
 import * as components from './components';
 import { templateOptions } from './templates';
 
-var getSchema = function getSchema(schema, record, compile) {
+var getSchema = function getSchema(schema, category, compile) {
   if (!schema) {
     return;
   }
@@ -60,7 +60,8 @@ var getSchema = function getSchema(schema, record, compile) {
 
   var initialValue = _objectSpread({
     name: "t_".concat(uid()),
-    template: schema.name
+    template: schema.name,
+    category: category
   }, cloneDeep(schema.default));
 
   if (initialValue.reverseField) {
@@ -342,6 +343,10 @@ export var AddCollectionAction = function AddCollectionAction(props) {
       key: option.name
     };
   });
+
+  var _useResourceActionCon2 = useResourceActionContext(),
+      category = _useResourceActionCon2.state.category;
+
   return /*#__PURE__*/React.createElement(RecordProvider, {
     record: record
   }, /*#__PURE__*/React.createElement(ActionContext.Provider, {
@@ -359,7 +364,7 @@ export var AddCollectionAction = function AddCollectionAction(props) {
         overflow: 'auto'
       },
       onClick: function onClick(info) {
-        var schema = getSchema(getTemplate(info.key), record, compile);
+        var schema = getSchema(getTemplate(info.key), category, compile);
         setSchema(schema);
         setVisible(true);
       },

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

@@ -334,6 +334,7 @@ export var AddFieldAction = function AddFieldAction(props) {
       useCancelAction: useCancelAction,
       createOnly: true,
       isOverride: false,
+      override: false,
       useCreateCollectionField: useCreateCollectionField,
       record: record,
       showReverseFieldConfig: true,