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

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

@@ -173,14 +173,13 @@ var getIsOverriding = function getIsOverriding(currentFields, record) {
 };
 
 export var OverridingFieldAction = function OverridingFieldAction(props) {
-  var _getChildrenCollectio;
-
   var scope = props.scope,
       getContainer = props.getContainer,
       record = props.item,
       children = props.children,
       currentCollection = props.currentCollection;
-  var target = record.target;
+  var target = record.target,
+      through = record.through;
 
   var _useCollectionManager2 = useCollectionManager(),
       getInterface = _useCollectionManager2.getInterface,
@@ -203,9 +202,15 @@ export var OverridingFieldAction = function OverridingFieldAction(props) {
       t = _useTranslation.t;
 
   var compile = useCompile();
-  var childCollections = target && ((_getChildrenCollectio = getChildrenCollections(target)) === null || _getChildrenCollectio === void 0 ? void 0 : _getChildrenCollectio.map(function (v) {
-    return v.name;
-  }).concat([target]));
+
+  var getFilterCollections = function getFilterCollections(filterKey) {
+    var _getChildrenCollectio;
+
+    var childCollections = filterKey && ((_getChildrenCollectio = getChildrenCollections(filterKey)) === null || _getChildrenCollectio === void 0 ? void 0 : _getChildrenCollectio.map(function (v) {
+      return v.name;
+    }).concat([filterKey]));
+    return childCollections;
+  };
 
   var _useState5 = useState({}),
       _useState6 = _slicedToArray(_useState5, 2),
@@ -215,7 +220,9 @@ export var OverridingFieldAction = function OverridingFieldAction(props) {
   var currentFields = getCurrentCollectionFields(currentCollection);
   var disabled = getIsOverriding(currentFields, record);
   return /*#__PURE__*/React.createElement(RecordProvider, {
-    record: record
+    record: _objectSpread(_objectSpread({}, record), {}, {
+      collectionName: record.__parent.name
+    })
   }, /*#__PURE__*/React.createElement(ActionContext.Provider, {
     value: {
       visible: visible,
@@ -288,9 +295,11 @@ export var OverridingFieldAction = function OverridingFieldAction(props) {
       useCancelAction: useCancelAction,
       showReverseFieldConfig: !(data === null || data === void 0 ? void 0 : data.reverseField),
       createOnly: true,
+      override: true,
       isOverride: true,
       targetScope: {
-        name: childCollections
+        target: getFilterCollections(target),
+        through: getFilterCollections(through)
       }
     }, scope)
   })));

package/es/collection-manager/Configuration/components/CollectionCategory.d.ts

@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const CollectionCategory: React.MemoExoticComponent<React.FunctionComponent<Pick<any, string | number | symbol>>>;

package/es/collection-manager/Configuration/components/CollectionCategory.js

@@ -0,0 +1,13 @@
+import { observer } from '@formily/react';
+import { Tag } from 'antd';
+import React from 'react';
+import { useCompile } from '../../../schema-component';
+export var CollectionCategory = observer(function (props) {
+  var value = props.value;
+  var compile = useCompile();
+  return /*#__PURE__*/React.createElement(React.Fragment, null, value.map(function (item) {
+    return /*#__PURE__*/React.createElement(Tag, {
+      color: item.color
+    }, compile(item === null || item === void 0 ? void 0 : item.name));
+  }));
+});

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

@@ -9,3 +9,6 @@ export * from './OverridingCollectionField';
 export * from './ViewInheritedField';
 export * from './AddCollectionAction';
 export * from './EditCollectionAction';
+export * from './ConfigurationTabs';
+export * from './AddCategoryAction';
+export * from './EditCategoryAction';

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

@@ -10,6 +10,9 @@ export * from './OverridingCollectionField';
 export * from './ViewInheritedField';
 export * from './AddCollectionAction';
 export * from './EditCollectionAction';
+export * from './ConfigurationTabs';
+export * from './AddCategoryAction';
+export * from './EditCategoryAction';
 registerValidateFormats({
   uid: /^[A-Za-z0-9][A-Za-z0-9_-]*$/
 });

package/es/collection-manager/Configuration/schemas/collections.d.ts

@@ -2,3 +2,6 @@ import { ISchema } from '@formily/react';
 import { CollectionOptions } from '../../types';
 export declare const collection: CollectionOptions;
 export declare const collectionSchema: ISchema;
+export declare const collectionTableSchema: ISchema;
+export declare const collectionCategorySchema: ISchema;
+export declare const collectionCategoryEditSchema: ISchema;

package/es/collection-manager/Configuration/schemas/collections.js

@@ -1,13 +1,19 @@
+var _properties;
+
+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 { Schema } from '@formily/react';
 import { message } from 'antd';
+import { uid } from '@formily/shared';
 import { useTranslation } from 'react-i18next';
 import { useAPIClient } from '../../../api-client';
 import { i18n } from '../../../i18n';
 import { CollectionTemplate } from '../components/CollectionTemplate';
+import { CollectionCategory } from '../components/CollectionCategory';
 import { collectionFieldSchema } from './collectionFields';
 
 var compile = function compile(source) {
@@ -91,205 +97,332 @@ export var collectionSchema = {
             filter: {
               'hidden.$isFalsy': true
             },
-            appends: []
+            appends: ['category']
           }
         }
       },
       properties: {
-        actions: {
+        tabs: {
           type: 'void',
-          'x-component': 'ActionBar',
-          'x-component-props': {
-            style: {
-              marginBottom: 16
+          'x-component': 'ConfigurationTabs'
+        }
+      }
+    }
+  }
+};
+export var collectionTableSchema = {
+  type: 'object',
+  properties: (_properties = {}, _defineProperty(_properties, uid(), {
+    type: 'void',
+    'x-component': 'ActionBar',
+    'x-component-props': {
+      style: {
+        marginBottom: 16
+      }
+    },
+    properties: {
+      filter: {
+        type: 'void',
+        title: '{{ t("Filter") }}',
+        default: {
+          $and: [{
+            title: {
+              $includes: ''
             }
-          },
-          properties: {
-            filter: {
-              type: 'void',
-              title: '{{ t("Filter") }}',
-              default: {
-                $and: [{
-                  title: {
-                    $includes: ''
+          }, {
+            name: {
+              $includes: ''
+            }
+          }]
+        },
+        'x-action': 'filter',
+        'x-component': 'Filter.Action',
+        'x-component-props': {
+          icon: 'FilterOutlined',
+          useProps: '{{ cm.useFilterActionProps }}'
+        },
+        'x-align': 'left'
+      },
+      delete: {
+        type: 'void',
+        title: '{{ t("Delete") }}',
+        'x-component': 'Action',
+        'x-component-props': {
+          icon: 'DeleteOutlined',
+          useAction: '{{ cm.useBulkDestroyActionAndRefreshCM }}',
+          confirm: {
+            title: "{{t('Delete record')}}",
+            content: "{{t('Are you sure you want to delete it?')}}"
+          }
+        }
+      },
+      create: {
+        type: 'void',
+        title: '{{ t("Create collection") }}',
+        'x-component': 'AddCollection',
+        'x-component-props': {
+          type: 'primary'
+        }
+      }
+    }
+  }), _defineProperty(_properties, uid(), {
+    type: 'void',
+    'x-uid': 'input',
+    'x-component': 'Table.Void',
+    'x-component-props': {
+      rowKey: 'name',
+      rowSelection: {
+        type: 'checkbox'
+      },
+      useDataSource: '{{ cm.useDataSourceFromRAC }}',
+      useAction: function useAction() {
+        var api = useAPIClient();
+
+        var _useTranslation = useTranslation(),
+            t = _useTranslation.t;
+
+        return {
+          move: function move(from, to) {
+            return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+              return regeneratorRuntime.wrap(function _callee$(_context) {
+                while (1) {
+                  switch (_context.prev = _context.next) {
+                    case 0:
+                      _context.next = 2;
+                      return api.resource('collections').move({
+                        sourceId: from.key,
+                        targetId: to.key
+                      });
+
+                    case 2:
+                      message.success(t('Saved successfully'), 0.2);
+
+                    case 3:
+                    case "end":
+                      return _context.stop();
                   }
-                }, {
-                  name: {
-                    $includes: ''
+                }
+              }, _callee);
+            }))();
+          }
+        };
+      }
+    },
+    properties: {
+      column1: {
+        type: 'void',
+        'x-decorator': 'Table.Column.Decorator',
+        'x-component': 'Table.Column',
+        properties: {
+          title: {
+            'x-component': 'CollectionField',
+            'x-read-pretty': true
+          }
+        }
+      },
+      column2: {
+        type: 'void',
+        'x-decorator': 'Table.Column.Decorator',
+        'x-component': 'Table.Column',
+        properties: {
+          name: {
+            type: 'string',
+            'x-component': 'CollectionField',
+            'x-read-pretty': true
+          }
+        }
+      },
+      column3: {
+        type: 'void',
+        'x-decorator': 'Table.Column.Decorator',
+        'x-component': 'Table.Column',
+        title: '{{t("Collection template")}}',
+        properties: {
+          template: {
+            'x-component': CollectionTemplate,
+            'x-read-pretty': true
+          }
+        }
+      },
+      column4: {
+        type: 'void',
+        'x-decorator': 'Table.Column.Decorator',
+        'x-component': 'Table.Column',
+        'x-visible': 'categoryVisible',
+        title: '{{t("Collection category")}}',
+        properties: {
+          category: {
+            'x-component': CollectionCategory,
+            'x-read-pretty': true
+          }
+        }
+      },
+      column5: {
+        type: 'void',
+        title: '{{ t("Actions") }}',
+        'x-component': 'Table.Column',
+        properties: {
+          actions: {
+            type: 'void',
+            'x-component': 'Space',
+            'x-component-props': {
+              split: '|'
+            },
+            properties: {
+              view: {
+                type: 'void',
+                title: '{{ t("Configure fields") }}',
+                'x-component': 'Action.Link',
+                'x-component-props': {},
+                properties: {
+                  drawer: {
+                    type: 'void',
+                    'x-component': 'Action.Drawer',
+                    'x-component-props': {
+                      destroyOnClose: true
+                    },
+                    'x-reactions': function xReactions(field) {
+                      var i = field.path.segments[1];
+                      var table = field.form.getValuesIn("table.".concat(i));
+
+                      if (table) {
+                        field.title = "".concat(compile(table.title), " - ").concat(compile('{{ t("Configure fields") }}'));
+                      }
+                    },
+                    properties: {
+                      collectionFieldSchema: collectionFieldSchema
+                    }
                   }
-                }]
+                }
               },
-              'x-action': 'filter',
-              'x-component': 'Filter.Action',
-              'x-component-props': {
-                icon: 'FilterOutlined',
-                useProps: '{{ cm.useFilterActionProps }}'
+              update: {
+                type: 'void',
+                title: '{{ t("Edit") }}',
+                'x-component': 'EditCollection',
+                'x-component-props': {
+                  type: 'primary'
+                }
               },
-              'x-align': 'left'
-            },
-            delete: {
-              type: 'void',
-              title: '{{ t("Delete") }}',
+              delete: {
+                type: 'void',
+                title: '{{ t("Delete") }}',
+                'x-component': 'Action.Link',
+                'x-component-props': {
+                  confirm: {
+                    title: "{{t('Delete record')}}",
+                    content: "{{t('Are you sure you want to delete it?')}}"
+                  },
+                  useAction: '{{ cm.useDestroyActionAndRefreshCM }}'
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }), _properties)
+};
+export var collectionCategorySchema = {
+  type: 'object',
+  properties: {
+    form: {
+      type: 'void',
+      'x-decorator': 'Form',
+      'x-component': 'Action.Modal',
+      title: '{{ t("Add category") }}',
+      'x-component-props': {
+        width: 520,
+        getContainer: '{{ getContainer }}'
+      },
+      properties: {
+        name: {
+          type: 'string',
+          title: '{{t("Category name")}}',
+          required: true,
+          'x-disabled': '{{ !createOnly }}',
+          'x-decorator': 'FormItem',
+          'x-component': 'Input'
+        },
+        color: {
+          type: 'string',
+          title: '{{t("Color")}}',
+          required: false,
+          'x-decorator': 'FormItem',
+          'x-component': 'ColorSelect'
+        },
+        footer: {
+          type: 'void',
+          'x-component': 'Action.Modal.Footer',
+          properties: {
+            action1: {
+              title: '{{ t("Cancel") }}',
               'x-component': 'Action',
               'x-component-props': {
-                icon: 'DeleteOutlined',
-                useAction: '{{ cm.useBulkDestroyActionAndRefreshCM }}',
-                confirm: {
-                  title: "{{t('Delete record')}}",
-                  content: "{{t('Are you sure you want to delete it?')}}"
-                }
+                useAction: '{{ useCancelAction }}'
               }
             },
-            create: {
-              type: 'void',
-              title: '{{ t("Create collection") }}',
-              'x-component': 'AddCollection',
+            action2: {
+              title: '{{ t("Submit") }}',
+              'x-component': 'Action',
               'x-component-props': {
-                type: 'primary'
+                type: 'primary',
+                useAction: '{{ useCreateCategry }}'
               }
             }
           }
+        }
+      }
+    }
+  }
+};
+export var collectionCategoryEditSchema = {
+  type: 'object',
+  properties: {
+    form: {
+      type: 'void',
+      'x-decorator': 'Form',
+      'x-decorator-props': {
+        useValues: '{{ useValuesFromRecord }}'
+      },
+      'x-component': 'Action.Modal',
+      title: '{{ t("Edit category") }}',
+      'x-component-props': {
+        width: 520,
+        getContainer: '{{ getContainer }}'
+      },
+      properties: {
+        name: {
+          type: 'string',
+          title: '{{t("Category name")}}',
+          required: true,
+          'x-disabled': '{{ !createOnly }}',
+          'x-decorator': 'FormItem',
+          'x-component': 'Input'
+        },
+        color: {
+          type: 'string',
+          title: '{{t("Color")}}',
+          required: false,
+          'x-decorator': 'FormItem',
+          'x-component': 'ColorSelect'
         },
-        table: {
+        footer: {
           type: 'void',
-          'x-uid': 'input',
-          'x-component': 'Table.Void',
-          'x-component-props': {
-            rowKey: 'name',
-            rowSelection: {
-              type: 'checkbox'
-            },
-            useDataSource: '{{ cm.useDataSourceFromRAC }}',
-            useAction: function useAction() {
-              var api = useAPIClient();
-
-              var _useTranslation = useTranslation(),
-                  t = _useTranslation.t;
-
-              return {
-                move: function move(from, to) {
-                  return _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
-                    return regeneratorRuntime.wrap(function _callee$(_context) {
-                      while (1) {
-                        switch (_context.prev = _context.next) {
-                          case 0:
-                            console.log(from, to);
-                            _context.next = 3;
-                            return api.resource('collections').move({
-                              sourceId: from.key,
-                              targetId: to.key
-                            });
-
-                          case 3:
-                            message.success(t('Saved successfully'), 0.2);
-
-                          case 4:
-                          case "end":
-                            return _context.stop();
-                        }
-                      }
-                    }, _callee);
-                  }))();
-                }
-              };
-            }
-          },
+          'x-component': 'Action.Modal.Footer',
           properties: {
-            column1: {
-              type: 'void',
-              'x-decorator': 'Table.Column.Decorator',
-              'x-component': 'Table.Column',
-              properties: {
-                title: {
-                  'x-component': 'CollectionField',
-                  'x-read-pretty': true
-                }
-              }
-            },
-            column2: {
-              type: 'void',
-              'x-decorator': 'Table.Column.Decorator',
-              'x-component': 'Table.Column',
-              properties: {
-                name: {
-                  type: 'string',
-                  'x-component': 'CollectionField',
-                  'x-read-pretty': true
-                }
-              }
-            },
-            column3: {
-              type: 'void',
-              'x-decorator': 'Table.Column.Decorator',
-              'x-component': 'Table.Column',
-              title: '{{t("Collection template")}}',
-              properties: {
-                template: {
-                  'x-component': CollectionTemplate,
-                  'x-read-pretty': true
-                }
+            action1: {
+              title: '{{ t("Cancel") }}',
+              'x-component': 'Action',
+              'x-component-props': {
+                useAction: '{{ useCancelAction }}'
               }
             },
-            column4: {
-              type: 'void',
-              title: '{{ t("Actions") }}',
-              'x-component': 'Table.Column',
-              properties: {
-                actions: {
-                  type: 'void',
-                  'x-component': 'Space',
-                  'x-component-props': {
-                    split: '|'
-                  },
-                  properties: {
-                    view: {
-                      type: 'void',
-                      title: '{{ t("Configure fields") }}',
-                      'x-component': 'Action.Link',
-                      'x-component-props': {},
-                      properties: {
-                        drawer: {
-                          type: 'void',
-                          'x-component': 'Action.Drawer',
-                          'x-component-props': {
-                            destroyOnClose: true
-                          },
-                          'x-reactions': function xReactions(field) {
-                            var i = field.path.segments[1];
-                            var table = field.form.getValuesIn("table.".concat(i));
-
-                            if (table) {
-                              field.title = "".concat(compile(table.title), " - ").concat(compile('{{ t("Configure fields") }}'));
-                            }
-                          },
-                          properties: {
-                            collectionFieldSchema: collectionFieldSchema
-                          }
-                        }
-                      }
-                    },
-                    update: {
-                      type: 'void',
-                      title: '{{ t("Edit") }}',
-                      'x-component': 'EditCollection',
-                      'x-component-props': {
-                        type: 'primary'
-                      }
-                    },
-                    delete: {
-                      type: 'void',
-                      title: '{{ t("Delete") }}',
-                      'x-component': 'Action.Link',
-                      'x-component-props': {
-                        confirm: {
-                          title: "{{t('Delete record')}}",
-                          content: "{{t('Are you sure you want to delete it?')}}"
-                        },
-                        useAction: '{{ cm.useDestroyActionAndRefreshCM }}'
-                      }
-                    }
-                  }
-                }
+            action2: {
+              title: '{{ t("Submit") }}',
+              'x-component': 'Action',
+              'x-component-props': {
+                type: 'primary',
+                useAction: '{{ useEditCategry }}'
               }
             }
           }

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

@@ -54,5 +54,6 @@ export declare const templates: Map<string, import("@formily/react").Stringify<{
     "x-read-only"?: boolean;
     "x-read-pretty"?: boolean;
 }>>;
+export declare const collectionTemplates: any;
 export declare function registerTemplate(key: string, schema: any): void;
 export declare const templateOptions: () => any[];

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

@@ -6,7 +6,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import * as types from '../templates';
 export var templates = new Map();
-var collectionTemplates = {};
+export var collectionTemplates = {};
 export function registerTemplate(key, schema) {
   collectionTemplates[key] = schema;
 }

package/es/collection-manager/action-hooks.js

@@ -718,6 +718,8 @@ export var useBulkDestroyActionAndRefreshCM = function useBulkDestroyActionAndRe
   };
 };
 export var useFilterActionProps = function useFilterActionProps() {
+  var _service$state, _service$state$params;
+
   var _useResourceContext8 = useResourceContext(),
       collection = _useResourceContext8.collection;
 
@@ -725,7 +727,7 @@ export var useFilterActionProps = function useFilterActionProps() {
   var service = useResourceActionContext();
   return useFilterFieldProps({
     options: options,
-    params: service.params,
+    params: ((_service$state = service.state) === null || _service$state === void 0 ? void 0 : (_service$state$params = _service$state.params) === null || _service$state$params === void 0 ? void 0 : _service$state$params[0]) || service.params,
     service: service
   });
 };

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

@@ -3,3 +3,7 @@ import { CollectionFieldOptions, CollectionManagerOptions, CollectionOptions } f
 export declare const CollectionManagerContext: import("react").Context<CollectionManagerOptions>;
 export declare const CollectionContext: import("react").Context<CollectionOptions>;
 export declare const CollectionFieldContext: import("react").Context<CollectionFieldOptions>;
+export declare const CollectionCategroriesContext: import("react").Context<{
+    data: any[];
+    refresh: () => void;
+}>;