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

package/lib/schema-settings/DataTemplates/hooks/useCollectionState.js

@@ -5,15 +5,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useCollectionState = void 0;
-var _client = require("@nocobase/utils/client");
-var _lodash = _interopRequireDefault(require("lodash"));
 var _react = _interopRequireWildcard(require("react"));
 var _collectionManager = require("../../../collection-manager");
 var _schemaComponent = require("../../../schema-component");
 var _TreeLabel = require("../TreeLabel");
 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); }
 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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
@@ -33,13 +30,11 @@ var useCollectionState = function useCollectionState(currentCollectionName) {
   var _useCollectionManager = (0, _collectionManager.useCollectionManager)(),
     getCollectionFields = _useCollectionManager.getCollectionFields,
     getAllCollectionsInheritChain = _useCollectionManager.getAllCollectionsInheritChain,
-    getCollection = _useCollectionManager.getCollection,
-    getCollectionFieldsOptions = _useCollectionManager.getCollectionFieldsOptions;
+    getCollection = _useCollectionManager.getCollection;
   var _useState = (0, _react.useState)(getCollectionList),
     _useState2 = _slicedToArray(_useState, 1),
     collectionList = _useState2[0];
   var compile = (0, _schemaComponent.useCompile)();
-  var dataFields = {};
   function getCollectionList() {
     var collections = getAllCollectionsInheritChain(currentCollectionName);
     return collections.map(function (name) {
@@ -152,11 +147,7 @@ var useCollectionState = function useCollectionState(currentCollectionName) {
       };
     }).filter(Boolean);
   };
-  /**
-   * fields: 通过在 x-reactions 字段中传递 $self 得到的，相当于 useField 的返回值，目的是修改其中的状态页面会更新
-   */
-  var getEnableFieldTree = (0, _react.useCallback)(function (collectionName, fields) {
-    dataFields = fields;
+  var getEnableFieldTree = (0, _react.useCallback)(function (collectionName) {
     if (!collectionName) {
       return [];
     }
@@ -170,57 +161,46 @@ var useCollectionState = function useCollectionState(currentCollectionName) {
       return [];
     }
   }, []);
-  var onLoadData = (0, _react.useCallback)(function (node) {
-    return new Promise(function (resolve) {
-      if (node.children.length) {
-        node.children.forEach(function (child) {
-          loadChildren({
-            node: child,
-            traverseAssociations: traverseAssociations,
-            traverseFields: traverseFields,
-            systemKeys: systemKeys,
-            dataFields: dataFields
+  var getOnLoadData = (0, _react.useCallback)(function (fields) {
+    return function (node) {
+      return new Promise(function (resolve) {
+        if (node.children.length) {
+          node.children.forEach(function (child) {
+            loadChildren({
+              node: child,
+              traverseAssociations: traverseAssociations,
+              traverseFields: traverseFields,
+              systemKeys: systemKeys,
+              fields: fields
+            });
           });
+          return resolve(void 0);
+        }
+        loadChildren({
+          node: node,
+          traverseAssociations: traverseAssociations,
+          traverseFields: traverseFields,
+          systemKeys: systemKeys,
+          fields: fields
         });
-        return resolve(void 0);
-      }
-      loadChildren({
-        node: node,
-        traverseAssociations: traverseAssociations,
-        traverseFields: traverseFields,
-        systemKeys: systemKeys,
-        dataFields: dataFields
+        resolve(void 0);
       });
-      resolve(void 0);
-    });
+    };
   }, []);
-  var onCheck = (0, _react.useCallback)(function (checkedKeys, _ref3) {
-    var node = _ref3.node,
-      checked = _ref3.checked;
-    if (checked) {
-      var parentKey = node.key.split('.').slice(0, -1).join('.');
-      try {
-        // 当子节点被选中时，也选中所有祖先节点，提高用户辨识度
-        while (parentKey) {
-          if (parentKey) {
-            checkedKeys.checked = _lodash.default.uniq([].concat(_toConsumableArray(checkedKeys.checked), [parentKey]));
-          }
-          parentKey = parentKey.split('.').slice(0, -1).join('.');
-        }
-      } catch (err) {
-        (0, _client.error)(err);
-      }
-    }
-    dataFields.value = checkedKeys;
+  var getOnCheck = (0, _react.useCallback)(function (fields) {
+    return function (checkedKeys) {
+      fields.value = checkedKeys;
+    };
   }, []);
   return {
     collectionList: collectionList,
     getEnableFieldTree: getEnableFieldTree,
-    onLoadData: onLoadData,
-    onCheck: onCheck
+    getOnLoadData: getOnLoadData,
+    getOnCheck: getOnCheck
   };
 };
 // 广度优先遍历查找一个 key 相等的节点并返回
+// 注意：返回的 node 是一个响应式对象，修改它的属性会触发页面更新
 exports.useCollectionState = useCollectionState;
 function findNode(treeData, item) {
   var queue = _toConsumableArray(treeData);
@@ -234,13 +214,13 @@ function findNode(treeData, item) {
     }
   }
 }
-function loadChildren(_ref4) {
-  var node = _ref4.node,
-    traverseAssociations = _ref4.traverseAssociations,
-    traverseFields = _ref4.traverseFields,
-    systemKeys = _ref4.systemKeys,
-    dataFields = _ref4.dataFields;
-  var activeNode = findNode(dataFields.componentProps.treeData, node);
+function loadChildren(_ref3) {
+  var node = _ref3.node,
+    traverseAssociations = _ref3.traverseAssociations,
+    traverseFields = _ref3.traverseFields,
+    systemKeys = _ref3.systemKeys,
+    fields = _ref3.fields;
+  var activeNode = findNode(fields.componentProps.treeData, node);
   var children = [];
   // 多对多和多对一只展示关系字段
   if (['belongsTo', 'belongsToMany'].includes(node.field.type)) {

package/lib/schema-settings/EnableChildCollections/index.d.ts

@@ -1,2 +1,2 @@
 import React from 'react';
-export declare const EnableChildCollections: React.MemoExoticComponent<React.FunctionComponent<Pick<any, string | number | symbol>>>;
+export declare const EnableChildCollections: React.MemoExoticComponent<import("@formily/react").ReactFC<Pick<any, string | number | symbol>>>;

package/lib/schema-settings/EnableChildCollections/index.js

@@ -135,5 +135,7 @@ var EnableChildCollections = (0, _react.observer)(function (props) {
       loadData: loadData
     }
   });
+}, {
+  displayName: 'EnableChildCollections'
 });
 exports.EnableChildCollections = EnableChildCollections;

package/lib/schema-settings/GeneralSchemaDesigner.d.ts

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

package/lib/schema-settings/GeneralSchemaDesigner.js

@@ -15,7 +15,7 @@ var _reactI18next = require("react-i18next");
 var _schemaComponent = require("../schema-component");
 var _utils = require("../schema-initializer/utils");
 var _SchemaSettings = require("./SchemaSettings");
-var _templateObject;
+var _templateObject, _templateObject2;
 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); }
 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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -26,6 +26,7 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 var titleCss = (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  pointer-events: none;\n  position: absolute;\n  font-size: 12px;\n  /* background: #f18b62;\n  color: #fff; */\n  padding: 0;\n  line-height: 16px;\n  height: 16px;\n  border-bottom-right-radius: 2px;\n  border-radius: 2px;\n  top: 2px;\n  left: 2px;\n  .title-tag {\n    padding: 0 3px;\n    border-radius: 2px;\n    background: #f18b62;\n    color: #fff;\n    display: block;\n  }\n"])));
+var overrideAntdCSS = (0, _css.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  & .ant-space-item .anticon {\n    margin: 0;\n  }\n"])));
 var GeneralSchemaDesigner = function GeneralSchemaDesigner(props) {
   var _rowCtx$cols2, _ctx$renderSchemaInit;
   var disableInitializer = props.disableInitializer,
@@ -66,7 +67,7 @@ var GeneralSchemaDesigner = function GeneralSchemaDesigner(props) {
     return null;
   }
   return /*#__PURE__*/_react2.default.createElement("div", {
-    className: 'general-schema-designer'
+    className: (0, _classnames.default)('general-schema-designer', overrideAntdCSS)
   }, title && /*#__PURE__*/_react2.default.createElement("div", {
     className: (0, _classnames.default)('general-schema-designer-title', titleCss)
   }, /*#__PURE__*/_react2.default.createElement(_antd.Space, {

package/lib/schema-settings/LinkageRules/DynamicComponent.d.ts

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

package/lib/schema-settings/LinkageRules/FilterDynamicComponent.d.ts

@@ -5,5 +5,5 @@ declare type Props = {
     renderSchemaComponent: () => React.ReactNode;
     collectionName: string;
 };
-export declare function FilterDynamicComponent(props: Props): JSX.Element;
+export declare function FilterDynamicComponent(props: Props): React.JSX.Element;
 export {};

package/lib/schema-settings/LinkageRules/LinkageRuleAction.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-export declare const FormFieldLinkageRuleAction: React.MemoExoticComponent<React.FunctionComponent<Pick<any, string | number | symbol>>>;
-export declare const FormButtonLinkageRuleAction: React.MemoExoticComponent<React.FunctionComponent<Pick<any, string | number | symbol>>>;
+export declare const FormFieldLinkageRuleAction: React.MemoExoticComponent<import("@formily/react").ReactFC<Pick<any, string | number | symbol>>>;
+export declare const FormButtonLinkageRuleAction: React.MemoExoticComponent<import("@formily/react").ReactFC<Pick<any, string | number | symbol>>>;

package/lib/schema-settings/LinkageRules/LinkageRuleAction.js

@@ -7,18 +7,18 @@ Object.defineProperty(exports, "__esModule", {
 exports.FormFieldLinkageRuleAction = exports.FormButtonLinkageRuleAction = void 0;
 var _icons = require("@ant-design/icons");
 var _css = require("@emotion/css");
-var _react = require("@formily/react");
 var _antd = require("@formily/antd");
+var _react = require("@formily/react");
+var _shared = require("@formily/shared");
 var _antd2 = require("antd");
 var _react2 = _interopRequireWildcard(require("react"));
 var _reactI18next = require("react-i18next");
-var _shared = require("@formily/shared");
 var _ = require("../..");
-var _context = require("./context");
 var _DynamicComponent = require("./DynamicComponent");
-var _useValues3 = require("./useValues");
-var _type = require("./type");
 var _ValueDynamicComponent = require("./ValueDynamicComponent");
+var _context = require("./context");
+var _type = require("./type");
+var _useValues3 = require("./useValues");
 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); }
 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; }
@@ -52,11 +52,11 @@ var FormFieldLinkageRuleAction = (0, _react.observer)(function (props) {
     style: {
       marginBottom: 8
     },
-    className: (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n          .ant-space {\n            display: inline-block;\n          }\n        "])))
+    className: (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n            .ant-space {\n              display: inline-block;\n            }\n          "])))
   }, /*#__PURE__*/_react2.default.createElement(_antd2.Space, {
-    className: (0, _css.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n            .ant-space {\n              display: inline-block;\n            }\n            .ant-space-item {\n              max-width: 95%;\n              display: inline-block;\n              margin: 2px;\n              vertical-align: top;\n            }\n          "])))
+    className: (0, _css.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n              .ant-space {\n                display: inline-block;\n              }\n              .ant-space-item {\n                max-width: 95%;\n                display: inline-block;\n                margin: 2px;\n                vertical-align: top;\n              }\n            "])))
   }, /*#__PURE__*/_react2.default.createElement(_antd.TreeSelect, {
-    className: (0, _css.css)(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n              min-width: 160px;\n            "]))),
+    className: (0, _css.css)(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n                min-width: 160px;\n              "]))),
     fieldNames: {
       label: 'title',
       value: 'name',
@@ -70,10 +70,10 @@ var FormFieldLinkageRuleAction = (0, _react.observer)(function (props) {
     onChange: function onChange(value) {
       setDataIndex(value);
     },
-    placeholder: t('Select Field')
+    placeholder: t('Select field')
   }), /*#__PURE__*/_react2.default.createElement(_antd2.Select, {
     value: operator,
-    className: (0, _css.css)(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n              min-width: 120px;\n            "]))),
+    className: (0, _css.css)(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n                min-width: 120px;\n              "]))),
     options: compile(operators),
     onChange: function onChange(value) {
       setOperator(value);
@@ -92,6 +92,8 @@ var FormFieldLinkageRuleAction = (0, _react.observer)(function (props) {
       color: '#bfbfbf'
     }
   })))));
+}, {
+  displayName: 'FormFieldLinkageRuleAction'
 });
 exports.FormFieldLinkageRuleAction = FormFieldLinkageRuleAction;
 var FormButtonLinkageRuleAction = (0, _react.observer)(function (props) {
@@ -154,5 +156,7 @@ var FormButtonLinkageRuleAction = (0, _react.observer)(function (props) {
       color: '#bfbfbf'
     }
   }))));
+}, {
+  displayName: 'FormButtonLinkageRuleAction'
 });
 exports.FormButtonLinkageRuleAction = FormButtonLinkageRuleAction;

package/lib/schema-settings/LinkageRules/LinkageRuleActionGroup.d.ts

@@ -1,3 +1,3 @@
 import React from 'react';
-export declare const LinkageRuleActions: React.MemoExoticComponent<React.FunctionComponent<Pick<any, string | number | symbol>>>;
-export declare const LinkageRuleActionGroup: (props: any) => JSX.Element;
+export declare const LinkageRuleActions: React.MemoExoticComponent<import("@formily/react").ReactFC<Pick<any, string | number | symbol>>>;
+export declare const LinkageRuleActionGroup: (props: any) => React.JSX.Element;

package/lib/schema-settings/LinkageRules/LinkageRuleActionGroup.js

@@ -35,6 +35,8 @@ var LinkageRuleActions = (0, _react.observer)(function (props) {
       })]
     }));
   });
+}, {
+  displayName: 'LinkageRuleActions'
 });
 exports.LinkageRuleActions = LinkageRuleActions;
 var LinkageRuleActionGroup = function LinkageRuleActionGroup(props) {

package/lib/schema-settings/LinkageRules/ValueDynamicComponent.d.ts

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

package/lib/schema-settings/LinkageRules/components/LinkageHeader.js

@@ -217,6 +217,8 @@ var ArrayCollapse = (0, _react.observer)(function (props) {
       setActiveKeys(insertActiveKeys(activeKeys, index));
     }
   }, renderEmpty(), renderItems(), renderAddition());
+}, {
+  displayName: 'ArrayCollapse'
 });
 exports.ArrayCollapse = ArrayCollapse;
 var CollapsePanel = function CollapsePanel(_ref) {

package/lib/schema-settings/LinkageRules/index.d.ts

@@ -1,2 +1,2 @@
 import React from 'react';
-export declare const FormLinkageRules: React.MemoExoticComponent<React.FunctionComponent<Pick<any, string | number | symbol>>>;
+export declare const FormLinkageRules: React.MemoExoticComponent<import("@formily/react").ReactFC<Pick<any, string | number | symbol>>>;

package/lib/schema-settings/LinkageRules/index.js

@@ -80,7 +80,7 @@ var FormLinkageRules = (0, _react.observer)(function (props) {
                       useProps: function useProps() {
                         return {
                           options: options,
-                          className: (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n                                position: relative;\n                                width: 100%;\n                                margin-left: 10px;\n                              "])))
+                          className: (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n                                  position: relative;\n                                  width: 100%;\n                                  margin-left: 10px;\n                                "])))
                         };
                       },
                       dynamicComponent: function dynamicComponent(props) {
@@ -138,5 +138,7 @@ var FormLinkageRules = (0, _react.observer)(function (props) {
       }
     }
   }));
+}, {
+  displayName: 'FormLinkageRules'
 });
 exports.FormLinkageRules = FormLinkageRules;

package/lib/schema-settings/SchemaSettings.d.ts

@@ -1,13 +1,14 @@
 import { GeneralField } from '@formily/core';
 import { ISchema, Schema } from '@formily/react';
 import { CascaderProps, MenuItemProps } from 'antd';
-import React from 'react';
+import React, { ReactNode } from 'react';
 import { CollectionFieldOptions, Designable } from '..';
 interface SchemaSettingsProps {
     title?: any;
     dn?: Designable;
     field?: GeneralField;
     fieldSchema?: Schema;
+    children?: ReactNode;
 }
 interface SchemaSettingsContextProps {
     dn?: Designable;

package/lib/schema-settings/SchemaSettings.js

@@ -10,6 +10,7 @@ var _antd = require("@formily/antd");
 var _core = require("@formily/core");
 var _react = require("@formily/react");
 var _shared = require("@formily/shared");
+var _client = require("@nocobase/utils/client");
 var _antd2 = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _lodash = _interopRequireWildcard(require("lodash"));
@@ -112,7 +113,8 @@ exports.SchemaSettings = SchemaSettings;
 SchemaSettings.Template = function Template(props) {
   var componentName = props.componentName,
     collectionName = props.collectionName,
-    resourceName = props.resourceName;
+    resourceName = props.resourceName,
+    needRender = props.needRender;
   var _useTranslation = (0, _reactI18next.useTranslation)(),
     t = _useTranslation.t;
   var _useCollectionManager = (0, _2.useCollectionManager)(),
@@ -129,7 +131,7 @@ SchemaSettings.Template = function Template(props) {
   var _useSchemaTemplateMan2 = (0, _schemaTemplates.useSchemaTemplateManager)(),
     saveAsTemplate = _useSchemaTemplateMan2.saveAsTemplate,
     copyTemplateSchema = _useSchemaTemplateMan2.copyTemplateSchema;
-  if (!collectionName) {
+  if (!collectionName && !needRender) {
     return null;
   }
   if (template) {
@@ -179,12 +181,14 @@ SchemaSettings.Template = function Template(props) {
   return /*#__PURE__*/_react2.default.createElement(SchemaSettings.Item, {
     onClick: function () {
       var _onClick3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-        var _getCollection, title, values, sdn, _yield$saveAsTemplate, key;
+        var _ref, title, values, sdn, _yield$saveAsTemplate, key;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               setVisible(false);
-              _getCollection = getCollection(collectionName), title = _getCollection.title;
+              _ref = collectionName ? getCollection(collectionName) : {
+                title: ''
+              }, title = _ref.title;
               _context3.next = 4;
               return (0, _antd.FormDialog)(t('Save as template'), function () {
                 return /*#__PURE__*/_react2.default.createElement(_antd.FormLayout, {
@@ -200,7 +204,7 @@ SchemaSettings.Template = function Template(props) {
                       name: {
                         title: t('Template name'),
                         required: true,
-                        default: "".concat(compile(title), "_").concat(t(componentName)),
+                        default: title ? "".concat(compile(title), "_").concat(t(componentName)) : t(componentName),
                         'x-decorator': 'FormItem',
                         'x-component': 'Input'
                       }
@@ -371,12 +375,12 @@ SchemaSettings.FormItemTemplate = function FormItemTemplate(props) {
   return /*#__PURE__*/_react2.default.createElement(SchemaSettings.Item, {
     onClick: function () {
       var _onClick5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-        var _getCollection2, title, gridSchema, values, sdn, _yield$saveAsTemplate2, key;
+        var _getCollection, 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;
+              _getCollection = getCollection(collectionName), title = _getCollection.title;
               gridSchema = findGridSchema(fieldSchema);
               _context6.next = 5;
               return (0, _antd.FormDialog)(t('Save as template'), function () {
@@ -534,12 +538,17 @@ SchemaSettings.ConnectDataBlocks = function ConnectDataBlocks(props) {
   var _useTranslation4 = (0, _reactI18next.useTranslation)(),
     t = _useTranslation4.t;
   var collection = (0, _2.useCollection)();
+  var _useFilterBlock = (0, _2.useFilterBlock)(),
+    inProvider = _useFilterBlock.inProvider;
   var dataBlocks = (0, _utils.useSupportedBlocks)(type);
   var _findFilterTargets = (0, _hooks.findFilterTargets)(fieldSchema),
     _findFilterTargets$ta = _findFilterTargets.targets,
     targets = _findFilterTargets$ta === void 0 ? [] : _findFilterTargets$ta,
     uid = _findFilterTargets.uid;
   var compile = (0, _2.useCompile)();
+  if (!inProvider) {
+    return null;
+  }
   var Content = dataBlocks.map(function (block) {
     var title = "".concat(compile(block.collection.title), " #").concat(block.uid.slice(0, 4));
     var onHover = function onHover() {
@@ -584,7 +593,7 @@ SchemaSettings.ConnectDataBlocks = function ConnectDataBlocks(props) {
           (0, _hooks.updateFilterTargets)(fieldSchema, targets);
           dn.emit('patch', {
             schema: (_schema = {}, _defineProperty(_schema, 'x-uid', uid), _defineProperty(_schema, 'x-filter-targets', targets), _schema)
-          });
+          }).catch(_client.error);
           dn.refresh();
         },
         onMouseEnter: onHover,
@@ -684,6 +693,7 @@ SchemaSettings.SelectItem = function SelectItem(props) {
       justifyContent: 'space-between'
     }
   }, title, /*#__PURE__*/_react2.default.createElement(_antd2.Select, _objectSpread({
+    dropdownMatchSelectWidth: false,
     bordered: false,
     defaultValue: value,
     onChange: function onChange() {
@@ -755,7 +765,7 @@ SchemaSettings.PopupItem = function PopupItem(props) {
     visible = _useState8[0],
     setVisible = _useState8[1];
   var ctx = (0, _react2.useContext)(SchemaSettingsContext);
-  return /*#__PURE__*/_react2.default.createElement(_2.ActionContext.Provider, {
+  return /*#__PURE__*/_react2.default.createElement(_2.ActionContextProvider, {
     value: {
       visible: visible,
       setVisible: setVisible
@@ -807,7 +817,7 @@ SchemaSettings.ActionModalItem = /*#__PURE__*/_react2.default.memo(function (pro
     setVisible(false);
   };
   var submitHandler = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
       return _regeneratorRuntime().wrap(function _callee7$(_context7) {
         while (1) switch (_context7.prev = _context7.next) {
           case 0:
@@ -823,11 +833,11 @@ SchemaSettings.ActionModalItem = /*#__PURE__*/_react2.default.memo(function (pro
       }, _callee7);
     }));
     return function submitHandler() {
-      return _ref.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }();
   var openAssignedFieldValueHandler = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
       return _regeneratorRuntime().wrap(function _callee8$(_context8) {
         while (1) switch (_context8.prev = _context8.next) {
           case 0:
@@ -855,7 +865,7 @@ SchemaSettings.ActionModalItem = /*#__PURE__*/_react2.default.memo(function (pro
       }, _callee8);
     }));
     return function openAssignedFieldValueHandler() {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
   return /*#__PURE__*/_react2.default.createElement(_react2.default.Fragment, null, /*#__PURE__*/_react2.default.createElement(SchemaSettings.Item, _objectSpread(_objectSpread({}, others), {}, {
@@ -898,6 +908,7 @@ SchemaSettings.ActionModalItem = /*#__PURE__*/_react2.default.memo(function (pro
     schema: schema
   }))))), document.body));
 });
+SchemaSettings.ActionModalItem.displayName = 'SchemaSettings.ActionModalItem';
 SchemaSettings.ModalItem = function ModalItem(props) {
   var hidden = props.hidden,
     title = props.title,
@@ -1004,9 +1015,9 @@ SchemaSettings.BlockTitleItem = function BlockTitleItem() {
         }
       }
     },
-    onSubmit: function onSubmit(_ref3) {
+    onSubmit: function onSubmit(_ref4) {
       var _schema3;
-      var title = _ref3.title;
+      var title = _ref4.title;
       var componentProps = fieldSchema['x-component-props'] || {};
       componentProps.title = title;
       fieldSchema['x-component-props'] = componentProps;

package/lib/schema-settings/VariableInput/VariableInput.d.ts

@@ -10,5 +10,5 @@ declare type Props = {
     className?: string;
     style?: React.CSSProperties;
 };
-export declare const VariableInput: (props: Props) => JSX.Element;
+export declare const VariableInput: (props: Props) => React.JSX.Element;
 export {};

package/lib/schema-settings/VariableInput/VariableInput.js

@@ -20,7 +20,7 @@ var VariableInput = function VariableInput(props) {
   var compile = (0, _schemaComponent.useCompile)();
   var userVariable = (0, _useUserVariable.useUserVariable)({
     schema: schema,
-    level: 1
+    maxDepth: 1
   });
   var scope = (0, _react.useMemo)(function () {
     return [userVariable, compile({

package/lib/schema-settings/VariableInput/hooks/useDateVariable.d.ts

@@ -1,4 +1,15 @@
 export declare const useDateVariable: ({ operator, schema }: {
     operator: any;
     schema: any;
-}) => any;
+}) => {
+    label: string;
+    value: string;
+    key: string;
+    disabled: boolean;
+    children: {
+        key: string;
+        value: string;
+        label: string;
+        disabled: boolean;
+    }[];
+};