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

package/es/schema-settings/SchemaSettings.js

@@ -3,10 +3,13 @@ var _templateObject;
 var _excluded = ["children", "fieldSchema"],
     _excluded2 = ["title", "dn"],
     _excluded3 = ["title", "options", "value", "onChange"],
-    _excluded4 = ["title", "onChange"],
-    _excluded5 = ["schema"],
-    _excluded6 = ["title", "onSubmit", "initialValues", "initialSchema", "schema", "modalTip", "components"],
-    _excluded7 = ["hidden", "title", "components", "scope", "effects", "schema", "onSubmit", "asyncGetInitialValues", "initialValues"];
+    _excluded4 = ["title", "options", "value", "onChange"],
+    _excluded5 = ["title", "onChange"],
+    _excluded6 = ["schema"],
+    _excluded7 = ["title", "onSubmit", "initialValues", "initialSchema", "schema", "modalTip", "components"],
+    _excluded8 = ["hidden", "title", "components", "scope", "effects", "schema", "onSubmit", "asyncGetInitialValues", "initialValues", "width"];
+
+function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 
 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); } }
 
@@ -37,19 +40,23 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
 import { css } from '@emotion/css';
-import { FormDialog, FormItem, FormLayout, Input } from '@formily/antd';
+import { FormDialog, FormItem, FormLayout, Input, ArrayCollapse, ArrayItems } from '@formily/antd';
 import { createForm } from '@formily/core';
 import { SchemaOptionsContext, useField, useFieldSchema, useForm } from '@formily/react';
+import _ from 'lodash';
 import { uid } from '@formily/shared';
-import { Alert, Button, Dropdown, Menu, Modal, Select, Space, Switch } from 'antd';
+import { Alert, Button, Cascader, Dropdown, Menu, Modal, Select, Space, Switch } from 'antd';
 import classNames from 'classnames';
 import { cloneDeep } from 'lodash';
 import React, { createContext, useContext, useMemo, useState } from 'react';
 import { createPortal } from 'react-dom';
 import { useTranslation } from 'react-i18next';
-import { ActionContext, CollectionManagerContext, createDesignable, FormProvider, RemoteSchemaComponent, SchemaComponent, SchemaComponentOptions, useActionContext, useAPIClient, useCollection, useCompile, useDesignable } from '..';
+import { ActionContext, CollectionManagerContext, createDesignable, FormProvider, RemoteSchemaComponent, SchemaComponent, SchemaComponentOptions, useActionContext, useAPIClient, useCollection, useCollectionManager, useCompile, useDesignable, useCollectionFilterOptions } from '..';
 import { useSchemaTemplateManager } from '../schema-templates';
 import { useBlockTemplateContext } from '../schema-templates/BlockTemplate';
+import { FormLinkageRules } from './LinkageRules';
+import { useLinkageCollectionFieldOptions } from './LinkageRules/action-hooks';
+import { EnableChildCollections } from './EnableChildCollections';
 var SchemaSettingsContext = /*#__PURE__*/createContext(null);
 export var useSchemaSettings = function useSchemaSettings() {
   return useContext(SchemaSettingsContext);
@@ -112,12 +119,16 @@ SchemaSettings.Template = function (props) {
   var _useTranslation = useTranslation(),
       t = _useTranslation.t;
 
+  var _useCollectionManager = useCollectionManager(),
+      getCollection = _useCollectionManager.getCollection;
+
   var _useSchemaSettings = useSchemaSettings(),
       dn = _useSchemaSettings.dn,
       setVisible = _useSchemaSettings.setVisible,
       template = _useSchemaSettings.template,
       fieldSchema = _useSchemaSettings.fieldSchema;
 
+  var compile = useCompile();
   var api = useAPIClient();
 
   var _useBlockTemplateCont = useBlockTemplateContext(),
@@ -188,14 +199,15 @@ SchemaSettings.Template = function (props) {
   return /*#__PURE__*/React.createElement(SchemaSettings.Item, {
     onClick: function () {
       var _onClick2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
-        var values, sdn, _yield$saveAsTemplate, key;
+        var _getCollection, title, values, sdn, _yield$saveAsTemplate, key;
 
         return regeneratorRuntime.wrap(function _callee3$(_context3) {
           while (1) {
             switch (_context3.prev = _context3.next) {
               case 0:
                 setVisible(false);
-                _context3.next = 3;
+                _getCollection = getCollection(collectionName), title = _getCollection.title;
+                _context3.next = 4;
                 return FormDialog(t('Save as template'), function () {
                   return /*#__PURE__*/React.createElement(FormLayout, {
                     layout: 'vertical'
@@ -210,6 +222,7 @@ SchemaSettings.Template = function (props) {
                         name: {
                           title: t('Template name'),
                           required: true,
+                          default: "".concat(compile(title), "_").concat(t(componentName)),
                           'x-decorator': 'FormItem',
                           'x-component': 'Input'
                         }
@@ -218,7 +231,7 @@ SchemaSettings.Template = function (props) {
                   }));
                 }).open({});
 
-              case 3:
+              case 4:
                 values = _context3.sent;
                 sdn = createDesignable({
                   t: t,
@@ -227,7 +240,7 @@ SchemaSettings.Template = function (props) {
                   current: fieldSchema.parent
                 });
                 sdn.loadAPIClientEvents();
-                _context3.next = 8;
+                _context3.next = 9;
                 return saveAsTemplate({
                   collectionName: collectionName,
                   resourceName: resourceName,
@@ -236,7 +249,7 @@ SchemaSettings.Template = function (props) {
                   uid: fieldSchema['x-uid']
                 });
 
-              case 8:
+              case 9:
                 _yield$saveAsTemplate = _context3.sent;
                 key = _yield$saveAsTemplate.key;
                 sdn.removeWithoutEmit(fieldSchema);
@@ -248,7 +261,7 @@ SchemaSettings.Template = function (props) {
                   }
                 });
 
-              case 12:
+              case 13:
               case "end":
                 return _context3.stop();
             }
@@ -269,7 +282,7 @@ var findGridSchema = function findGridSchema(fieldSchema) {
   return fieldSchema.reduceProperties(function (buf, s) {
     if (s['x-component'] === 'FormV2') {
       var f = s.reduceProperties(function (buf, s) {
-        if (s['x-component'] === 'Grid') {
+        if (s['x-component'] === 'Grid' || s['x-component'] === 'BlockTemplate') {
           return s;
         }
 
@@ -315,6 +328,11 @@ SchemaSettings.FormItemTemplate = function (props) {
   var _useTranslation2 = useTranslation(),
       t = _useTranslation2.t;
 
+  var compile = useCompile();
+
+  var _useCollectionManager2 = useCollectionManager(),
+      getCollection = _useCollectionManager2.getCollection;
+
   var _useSchemaSettings2 = useSchemaSettings(),
       dn = _useSchemaSettings2.dn,
       setVisible = _useSchemaSettings2.setVisible,
@@ -409,16 +427,21 @@ SchemaSettings.FormItemTemplate = function (props) {
   return /*#__PURE__*/React.createElement(SchemaSettings.Item, {
     onClick: function () {
       var _onClick4 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6() {
-        var gridSchema, values, sdn, _yield$saveAsTemplate2, key;
+        var _getCollection2, title, gridSchema, values, sdn, _yield$saveAsTemplate2, key;
 
         return regeneratorRuntime.wrap(function _callee6$(_context6) {
           while (1) {
             switch (_context6.prev = _context6.next) {
               case 0:
                 setVisible(false);
+                _getCollection2 = getCollection(collectionName), title = _getCollection2.title;
                 gridSchema = findGridSchema(fieldSchema);
-                _context6.next = 4;
+                _context6.next = 5;
                 return FormDialog(t('Save as template'), function () {
+                  var componentTitle = {
+                    FormItem: t('Form'),
+                    ReadPrettyFormItem: t('Details')
+                  };
                   return /*#__PURE__*/React.createElement(FormLayout, {
                     layout: 'vertical'
                   }, /*#__PURE__*/React.createElement(SchemaComponent, {
@@ -432,6 +455,7 @@ SchemaSettings.FormItemTemplate = function (props) {
                         name: {
                           title: t('Template name'),
                           required: true,
+                          default: "".concat(compile(title), "_").concat(componentTitle[componentName] || componentName),
                           'x-decorator': 'FormItem',
                           'x-component': 'Input'
                         }
@@ -440,7 +464,7 @@ SchemaSettings.FormItemTemplate = function (props) {
                   }));
                 }).open({});
 
-              case 4:
+              case 5:
                 values = _context6.sent;
                 sdn = createDesignable({
                   t: t,
@@ -449,7 +473,7 @@ SchemaSettings.FormItemTemplate = function (props) {
                   current: gridSchema.parent
                 });
                 sdn.loadAPIClientEvents();
-                _context6.next = 9;
+                _context6.next = 10;
                 return saveAsTemplate({
                   collectionName: collectionName,
                   resourceName: resourceName,
@@ -458,7 +482,7 @@ SchemaSettings.FormItemTemplate = function (props) {
                   uid: gridSchema['x-uid']
                 });
 
-              case 9:
+              case 10:
                 _yield$saveAsTemplate2 = _context6.sent;
                 key = _yield$saveAsTemplate2.key;
                 sdn.removeWithoutEmit(gridSchema);
@@ -470,7 +494,7 @@ SchemaSettings.FormItemTemplate = function (props) {
                   }
                 });
                 fieldSchema['x-template-key'] = key;
-                _context6.next = 16;
+                _context6.next = 17;
                 return api.request({
                   url: "uiSchemas:patch",
                   method: 'post',
@@ -480,7 +504,7 @@ SchemaSettings.FormItemTemplate = function (props) {
                   }
                 });
 
-              case 16:
+              case 17:
               case "end":
                 return _context6.stop();
             }
@@ -603,11 +627,36 @@ SchemaSettings.SelectItem = function (props) {
   })));
 };
 
-SchemaSettings.SwitchItem = function (props) {
+SchemaSettings.CascaderItem = function (props) {
   var title = props.title,
+      options = props.options,
+      value = props.value,
       onChange = props.onChange,
       others = _objectWithoutProperties(props, _excluded4);
 
+  return /*#__PURE__*/React.createElement(SchemaSettings.Item, _objectSpread({}, others), /*#__PURE__*/React.createElement("div", {
+    style: {
+      alignItems: 'center',
+      display: 'flex',
+      justifyContent: 'space-between'
+    }
+  }, title, /*#__PURE__*/React.createElement(Cascader, {
+    bordered: false,
+    defaultValue: value,
+    onChange: onChange,
+    options: options,
+    style: {
+      textAlign: 'right',
+      minWidth: 100
+    }
+  })));
+};
+
+SchemaSettings.SwitchItem = function (props) {
+  var title = props.title,
+      onChange = props.onChange,
+      others = _objectWithoutProperties(props, _excluded5);
+
   var _useState3 = useState(!!props.checked),
       _useState4 = _slicedToArray(_useState3, 2),
       checked = _useState4[0],
@@ -635,7 +684,7 @@ SchemaSettings.SwitchItem = function (props) {
 
 SchemaSettings.PopupItem = function (props) {
   var schema = props.schema,
-      others = _objectWithoutProperties(props, _excluded5);
+      others = _objectWithoutProperties(props, _excluded6);
 
   var _useState5 = useState(false),
       _useState6 = _slicedToArray(_useState5, 2),
@@ -670,7 +719,7 @@ SchemaSettings.ActionModalItem = /*#__PURE__*/React.memo(function (props) {
       schema = props.schema,
       modalTip = props.modalTip,
       components = props.components,
-      others = _objectWithoutProperties(props, _excluded6);
+      others = _objectWithoutProperties(props, _excluded7);
 
   var _useState7 = useState(false),
       _useState8 = _slicedToArray(_useState7, 2),
@@ -821,7 +870,8 @@ SchemaSettings.ModalItem = function (props) {
       onSubmit = props.onSubmit,
       asyncGetInitialValues = props.asyncGetInitialValues,
       initialValues = props.initialValues,
-      others = _objectWithoutProperties(props, _excluded7);
+      width = props.width,
+      others = _objectWithoutProperties(props, _excluded8);
 
   var options = useContext(SchemaOptionsContext);
   var cm = useContext(CollectionManagerContext);
@@ -856,7 +906,10 @@ SchemaSettings.ModalItem = function (props) {
 
               case 7:
                 values = _context9.t0;
-                FormDialog(schema.title || title, function () {
+                FormDialog({
+                  title: schema.title || title,
+                  width: width
+                }, function () {
                   return /*#__PURE__*/React.createElement(CollectionManagerContext.Provider, {
                     value: cm
                   }, /*#__PURE__*/React.createElement(SchemaComponentOptions, {
@@ -934,4 +987,144 @@ SchemaSettings.BlockTitleItem = function () {
       dn.refresh();
     }
   });
+};
+
+SchemaSettings.LinkageRules = function (props) {
+  var collectionName = props.collectionName;
+  var fieldSchema = useFieldSchema();
+
+  var _useDesignable2 = useDesignable(),
+      dn = _useDesignable2.dn;
+
+  var _useTranslation6 = useTranslation(),
+      t = _useTranslation6.t;
+
+  var _useSchemaTemplateMan4 = useSchemaTemplateManager(),
+      getTemplateById = _useSchemaTemplateMan4.getTemplateById;
+
+  var type = fieldSchema['x-component'] === 'Action' ? 'button' : 'field';
+  var gridSchema = findGridSchema(fieldSchema) || fieldSchema;
+  return /*#__PURE__*/React.createElement(SchemaSettings.ModalItem, {
+    title: t('Linkage rules'),
+    components: {
+      ArrayCollapse: ArrayCollapse,
+      FormLayout: FormLayout
+    },
+    width: 750,
+    schema: {
+      type: 'object',
+      title: t('Linkage rules'),
+      properties: {
+        fieldReaction: {
+          'x-component': FormLinkageRules,
+          'x-component-props': {
+            useProps: function useProps() {
+              var options = useCollectionFilterOptions(collectionName);
+              return {
+                options: options,
+                defaultValues: (gridSchema === null || gridSchema === void 0 ? void 0 : gridSchema['x-linkage-rules']) || (fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-linkage-rules']),
+                type: type,
+                linkageOptions: useLinkageCollectionFieldOptions(collectionName),
+                collectionName: collectionName
+              };
+            }
+          }
+        }
+      }
+    },
+    onSubmit: function onSubmit(v) {
+      var rules = [];
+
+      var _iterator = _createForOfIteratorHelper(v.fieldReaction.rules),
+          _step;
+
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var rule = _step.value;
+          rules.push(_.pickBy(rule, _.identity));
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+
+      var templateId = gridSchema['x-component'] === 'BlockTemplate' && gridSchema['x-component-props'].templateId;
+      var uid = templateId && getTemplateById(templateId).uid || gridSchema['x-uid'];
+
+      var schema = _defineProperty({}, 'x-uid', uid);
+
+      gridSchema['x-linkage-rules'] = rules;
+      schema['x-linkage-rules'] = rules;
+      dn.emit('patch', {
+        schema: schema
+      });
+      dn.refresh();
+    }
+  });
+};
+
+SchemaSettings.EnableChildCollections = function (props) {
+  var collectionName = props.collectionName;
+  var fieldSchema = useFieldSchema();
+
+  var _useDesignable3 = useDesignable(),
+      dn = _useDesignable3.dn;
+
+  var _useTranslation7 = useTranslation(),
+      t = _useTranslation7.t;
+
+  return /*#__PURE__*/React.createElement(SchemaSettings.ModalItem, {
+    title: t('Enable child collections'),
+    components: {
+      ArrayItems: ArrayItems,
+      FormLayout: FormLayout
+    },
+    width: 600,
+    schema: {
+      type: 'object',
+      title: t('Enable child collections'),
+      properties: {
+        enableChildren: {
+          'x-component': EnableChildCollections,
+          'x-component-props': {
+            useProps: function useProps() {
+              return {
+                defaultValues: fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-enable-children'],
+                collectionName: collectionName
+              };
+            }
+          }
+        }
+      }
+    },
+    onSubmit: function onSubmit(v) {
+      var enableChildren = [];
+
+      var _iterator2 = _createForOfIteratorHelper(v.enableChildren.childrenCollections),
+          _step2;
+
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var item = _step2.value;
+          enableChildren.push(_.pickBy(item, _.identity));
+        }
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
+
+      var uid = fieldSchema['x-uid'];
+
+      var schema = _defineProperty({}, 'x-uid', uid);
+
+      fieldSchema['x-enable-children'] = enableChildren;
+      schema['x-enable-children'] = enableChildren;
+      dn.emit('patch', {
+        schema: schema
+      });
+      dn.refresh();
+    }
+  });
 };

package/es/schema-templates/BlockTemplate.js

@@ -25,6 +25,13 @@ export var BlockTemplate = observer(function (props) {
   var template = useMemo(function () {
     return getTemplateById(templateId);
   }, [templateId]);
+
+  var onSuccess = function onSuccess(data) {
+    var _data$data;
+
+    fieldSchema['x-linkage-rules'] = (data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : _data$data['x-linkage-rules']) || [];
+  };
+
   return template ? /*#__PURE__*/React.createElement(BlockTemplateContext.Provider, {
     value: {
       dn: dn,
@@ -34,6 +41,7 @@ export var BlockTemplate = observer(function (props) {
     }
   }, /*#__PURE__*/React.createElement(RemoteSchemaComponent, {
     noForm: true,
-    uid: template === null || template === void 0 ? void 0 : template.uid
+    uid: template === null || template === void 0 ? void 0 : template.uid,
+    onSuccess: onSuccess
   })) : null;
 });

package/es/system-settings/SystemSettingsShortcut.js

@@ -308,7 +308,7 @@ var schema2 = {
         },
         properties: {
           submit: {
-            title: 'Submit',
+            title: '{{t("Submit")}}',
             'x-component': 'Action',
             'x-component-props': {
               type: 'primary',

package/lib/acl/ACLProvider.js

@@ -33,10 +33,6 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-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; }
@@ -362,6 +358,8 @@ var useRecordPkValue = function useRecordPkValue() {
 exports.useRecordPkValue = useRecordPkValue;
 
 var ACLActionProvider = function ACLActionProvider(props) {
+  var _actionPath;
+
   var recordPkValue = useRecordPkValue();
   var resource = useResourceName();
 
@@ -375,7 +373,7 @@ var ACLActionProvider = function ACLActionProvider(props) {
     actionPath = "".concat(resource, ":").concat(schema['x-action']);
   }
 
-  if (!actionPath.includes(':')) {
+  if (!((_actionPath = actionPath) === null || _actionPath === void 0 ? void 0 : _actionPath.includes(':'))) {
     actionPath = "".concat(resource, ":").concat(actionPath);
   }
 
@@ -418,10 +416,11 @@ 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/lib/api-client/APIClient.js

@@ -87,6 +87,12 @@ 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/lib/block-provider/BlockProvider.js

@@ -31,7 +31,7 @@ var _SharedFilterProvider = require("./SharedFilterProvider");
 
 var _excluded = ["title", "to"];
 
-var _templateObject, _templateObject2;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4;
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -59,7 +59,7 @@ var BlockResourceContext = /*#__PURE__*/(0, _react2.createContext)(null);
 exports.BlockResourceContext = BlockResourceContext;
 var BlockAssociationContext = /*#__PURE__*/(0, _react2.createContext)(null);
 exports.BlockAssociationContext = BlockAssociationContext;
-var BlockRequestContext = /*#__PURE__*/(0, _react2.createContext)(null);
+var BlockRequestContext = /*#__PURE__*/(0, _react2.createContext)({});
 exports.BlockRequestContext = BlockRequestContext;
 
 var useBlockResource = function useBlockResource() {
@@ -140,7 +140,7 @@ 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;
   });
@@ -264,10 +264,11 @@ var RenderChildrenWithAssociationFilter = function RenderChildrenWithAssociation
 
   if (associationFilterSchema) {
     return /*#__PURE__*/_react2.default.createElement(Component, _objectSpread({}, field.componentProps), /*#__PURE__*/_react2.default.createElement(_antd.Row, {
+      className: (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n            height: 100%;\n          "]))),
       gutter: 16,
       wrap: false
     }, /*#__PURE__*/_react2.default.createElement(_antd.Col, {
-      className: (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n              width: 200px;\n              flex: 0 0 auto;\n            "])))
+      className: (0, _css.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n              width: 200px;\n              flex: 0 0 auto;\n            "])))
     }, /*#__PURE__*/_react2.default.createElement(_react.RecursionField, {
       schema: fieldSchema,
       onlyRenderProperties: true,
@@ -275,14 +276,16 @@ var RenderChildrenWithAssociationFilter = function RenderChildrenWithAssociation
         return s['x-component'] === 'AssociationFilter';
       }
     })), /*#__PURE__*/_react2.default.createElement(_antd.Col, {
-      className: (0, _css.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n              flex: 1 1 auto;\n              min-width: 0;\n            "])))
+      className: (0, _css.css)(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n              flex: 1 1 auto;\n              min-width: 0;\n            "])))
+    }, /*#__PURE__*/_react2.default.createElement("div", {
+      className: (0, _css.css)(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n                display: flex;\n                flex-direction: column;\n                height: 100%;\n              "])))
     }, /*#__PURE__*/_react2.default.createElement(_react.RecursionField, {
       schema: fieldSchema,
       onlyRenderProperties: true,
       filterProperties: function filterProperties(s) {
         return s['x-component'] !== 'AssociationFilter';
       }
-    }))));
+    })))));
   }
 
   return props.children;

package/lib/block-provider/FormBlockProvider.js

@@ -85,18 +85,27 @@ var InternalFormBlockProvider = function InternalFormBlockProvider(props) {
 
 var FormBlockProvider = function FormBlockProvider(props) {
   var record = (0, _recordProvider.useRecord)();
-  var __tableName = record.__tableName;
-
-  var _useCollectionManager = (0, _collectionManager.useCollectionManager)(),
-      getInheritCollections = _useCollectionManager.getInheritCollections;
-
-  var inheritCollections = getInheritCollections(__tableName);
+  var collection = props.collection;
+  var __collection = record.__collection;
+  var currentCollection = (0, _collectionManager.useCollection)();
 
   var _useDesignable = (0, _schemaComponent.useDesignable)(),
       designable = _useDesignable.designable;
 
-  var flag = !designable && __tableName && !inheritCollections.includes(props.collection) && __tableName !== props.collection;
-  return !flag && /*#__PURE__*/_react2.default.createElement(_BlockProvider.BlockProvider, _objectSpread({}, props), /*#__PURE__*/_react2.default.createElement(InternalFormBlockProvider, _objectSpread({}, props)));
+  var detailFlag = false;
+
+  if (Object.keys(record).length > 0) {
+    detailFlag = true;
+
+    if (!designable && __collection) {
+      detailFlag = __collection === collection;
+    }
+  }
+
+  var createFlag = currentCollection.name === collection && !Object.keys(record).length || !currentCollection.name;
+  return (detailFlag || createFlag) && /*#__PURE__*/_react2.default.createElement(_BlockProvider.BlockProvider, _objectSpread(_objectSpread({}, props), {}, {
+    block: 'form'
+  }), /*#__PURE__*/_react2.default.createElement(InternalFormBlockProvider, _objectSpread({}, props)));
 };
 
 exports.FormBlockProvider = FormBlockProvider;

package/lib/block-provider/KanbanBlockProvider.js

@@ -149,7 +149,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/lib/block-provider/SharedFilterProvider.js

@@ -1,7 +1,5 @@
 "use strict";
 
-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); }
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -27,6 +25,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); }
+
 var SHARED_FILTER_CONDITION;
 exports.SHARED_FILTER_CONDITION = SHARED_FILTER_CONDITION;
 
@@ -37,7 +37,13 @@ exports.SHARED_FILTER_CONDITION = SHARED_FILTER_CONDITION;
 
 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 {};