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

package/lib/schema-component/antd/remote-select/RemoteSelect.js

@@ -7,13 +7,12 @@ exports.default = exports.RemoteSelect = void 0;
 var _icons = require("@ant-design/icons");
 var _react = require("@formily/react");
 var _antd = require("antd");
-var _moment = _interopRequireDefault(require("moment"));
 var _lodash = require("lodash");
+var _moment = _interopRequireDefault(require("moment"));
 var _react2 = _interopRequireWildcard(require("react"));
 var _apiClient = require("../../../api-client");
 var _SharedFilterProvider = require("../../../block-provider/SharedFilterProvider");
 var _collectionManager = require("../../../collection-manager");
-var _hooks = require("../../hooks");
 var _select = require("../select");
 var _ReadPretty = require("./ReadPretty");
 var _excluded = ["fieldNames", "service", "wait", "value", "objectValue", "manual", "mapOptions", "targetField"];
@@ -31,6 +30,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 _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; }
 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; }
+var EMPTY = 'N/A';
 var InternalRemoteSelect = (0, _react.connect)(function (props) {
   var _field$componentProps, _field$componentProps2, _field$componentProps3, _service$params;
   var _props$fieldNames = props.fieldNames,
@@ -46,7 +46,6 @@ var InternalRemoteSelect = (0, _react.connect)(function (props) {
     mapOptions = props.mapOptions,
     _targetField = props.targetField,
     others = _objectWithoutProperties(props, _excluded);
-  var compile = (0, _hooks.useCompile)();
   var firstRun = (0, _react2.useRef)(false);
   var fieldSchema = (0, _react.useFieldSchema)();
   var field = (0, _react.useField)();
@@ -84,7 +83,9 @@ var InternalRemoteSelect = (0, _react.connect)(function (props) {
                   }
                 }, (option === null || option === void 0 ? void 0 : option.label) || item);
               } else {
-                return /*#__PURE__*/_react2.default.createElement(_antd.Tag, null, item);
+                return /*#__PURE__*/_react2.default.createElement(_antd.Tag, {
+                  key: item
+                }, item);
               }
             }).reverse();
           } else {
@@ -103,10 +104,10 @@ var InternalRemoteSelect = (0, _react.connect)(function (props) {
         }
         if (mapOptions) {
           var _mapOptions;
-          return mapOptions((_mapOptions = {}, _defineProperty(_mapOptions, fieldNames.label, label), _defineProperty(_mapOptions, fieldNames.value, option[fieldNames.value]), _mapOptions));
+          return mapOptions((_mapOptions = {}, _defineProperty(_mapOptions, fieldNames.label, label || EMPTY), _defineProperty(_mapOptions, fieldNames.value, option[fieldNames.value]), _mapOptions));
         }
-        return _objectSpread(_objectSpread({}, option), {}, (_objectSpread2 = {}, _defineProperty(_objectSpread2, fieldNames.label, label || option[fieldNames.value]), _defineProperty(_objectSpread2, fieldNames.value, option[fieldNames.value]), _objectSpread2));
-      });
+        return _objectSpread(_objectSpread({}, option), {}, (_objectSpread2 = {}, _defineProperty(_objectSpread2, fieldNames.label, label || EMPTY), _defineProperty(_objectSpread2, fieldNames.value, option[fieldNames.value]), _objectSpread2));
+      }).filter(Boolean);
     } catch (err) {
       console.error(err);
       return options;
@@ -148,7 +149,7 @@ var InternalRemoteSelect = (0, _react.connect)(function (props) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             run({
-              filter: (0, _SharedFilterProvider.mergeFilter)([_defineProperty({}, fieldNames.label, _defineProperty({}, operator, search)), ((_field$componentProps4 = field.componentProps) === null || _field$componentProps4 === void 0 ? void 0 : (_field$componentProps5 = _field$componentProps4.service) === null || _field$componentProps5 === void 0 ? void 0 : (_field$componentProps6 = _field$componentProps5.params) === null || _field$componentProps6 === void 0 ? void 0 : _field$componentProps6.filter) || (service === null || service === void 0 ? void 0 : (_service$params2 = service.params) === null || _service$params2 === void 0 ? void 0 : _service$params2.filter)])
+              filter: (0, _SharedFilterProvider.mergeFilter)([search ? _defineProperty({}, fieldNames.label, _defineProperty({}, operator, search)) : {}, ((_field$componentProps4 = field.componentProps) === null || _field$componentProps4 === void 0 ? void 0 : (_field$componentProps5 = _field$componentProps4.service) === null || _field$componentProps5 === void 0 ? void 0 : (_field$componentProps6 = _field$componentProps5.params) === null || _field$componentProps6 === void 0 ? void 0 : _field$componentProps6.filter) || (service === null || service === void 0 ? void 0 : (_service$params2 = service.params) === null || _service$params2 === void 0 ? void 0 : _service$params2.filter)])
             });
           case 1:
           case "end":
@@ -188,6 +189,7 @@ var InternalRemoteSelect = (0, _react.connect)(function (props) {
     firstRun.current = true;
   };
   return /*#__PURE__*/_react2.default.createElement(_select.Select, _objectSpread(_objectSpread({
+    dropdownMatchSelectWidth: false,
     autoClearSearchValue: true,
     filterOption: false,
     filterSort: null,
@@ -197,7 +199,7 @@ var InternalRemoteSelect = (0, _react.connect)(function (props) {
     objectValue: objectValue,
     value: value
   }, others), {}, {
-    loading: loading,
+    loading: data ? loading : true,
     options: mapOptionsToTags(options)
   }));
 }, (0, _react.mapProps)({

package/lib/schema-component/antd/select/Select.js

@@ -11,8 +11,8 @@ var _antd = require("antd");
 var _react2 = _interopRequireDefault(require("react"));
 var _ReadPretty = require("./ReadPretty");
 var _shared2 = require("./shared");
-var _excluded = ["value", "options", "onChange", "fieldNames", "mode"],
-  _excluded2 = ["objectValue", "value"];
+var _excluded = ["value", "options", "onChange", "fieldNames", "mode", "loading"],
+  _excluded2 = ["objectValue", "loading", "value"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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; }
@@ -31,6 +31,7 @@ var ObjectSelect = function ObjectSelect(props) {
     _onChange = props.onChange,
     fieldNames = props.fieldNames,
     mode = props.mode,
+    loading = props.loading,
     others = _objectWithoutProperties(props, _excluded);
   var toValue = function toValue(v) {
     var _getCurrentOptions;
@@ -57,9 +58,13 @@ var ObjectSelect = function ObjectSelect(props) {
     value: toValue(value),
     allowClear: true,
     labelInValue: true,
+    notFoundContent: loading ? /*#__PURE__*/_react2.default.createElement(_antd.Spin, null) : /*#__PURE__*/_react2.default.createElement(_antd.Empty, {
+      image: _antd.Empty.PRESENTED_IMAGE_SIMPLE
+    }),
     options: options,
     fieldNames: fieldNames,
     showSearch: true,
+    dropdownMatchSelectWidth: false,
     filterOption: function filterOption(input, option) {
       var _option;
       return ((_option = option === null || option === void 0 ? void 0 : option[fieldNames.label || 'label']) !== null && _option !== void 0 ? _option : '').includes(input);
@@ -87,6 +92,7 @@ var filterOption = function filterOption(input, option) {
 };
 var InternalSelect = (0, _react.connect)(function (props) {
   var objectValue = props.objectValue,
+    loading = props.loading,
     value = props.value,
     others = _objectWithoutProperties(props, _excluded2);
   var mode = props.multiple ? 'multiple' : props.mode;
@@ -96,13 +102,18 @@ var InternalSelect = (0, _react.connect)(function (props) {
   if (objectValue) {
     return /*#__PURE__*/_react2.default.createElement(ObjectSelect, _objectSpread(_objectSpread({}, others), {}, {
       value: value,
-      mode: mode
+      mode: mode,
+      loading: loading
     }));
   }
   return /*#__PURE__*/_react2.default.createElement(_antd.Select, _objectSpread(_objectSpread({
     showSearch: true,
     filterOption: filterOption,
     allowClear: true,
+    dropdownMatchSelectWidth: false,
+    notFoundContent: loading ? /*#__PURE__*/_react2.default.createElement(_antd.Spin, null) : /*#__PURE__*/_react2.default.createElement(_antd.Empty, {
+      image: _antd.Empty.PRESENTED_IMAGE_SIMPLE
+    }),
     value: value
   }, others), {}, {
     onChange: function onChange(changed) {

package/lib/schema-component/antd/table/Table.Void.Designer.js

@@ -121,6 +121,7 @@ var TableVoidDesigner = function TableVoidDesigner() {
                   field: {
                     type: 'string',
                     enum: sortFields,
+                    required: true,
                     'x-decorator': 'FormItem',
                     'x-component': 'Select',
                     'x-component-props': {

package/lib/schema-component/antd/table-v2/TableBlockDesigner.js

@@ -55,7 +55,7 @@ var TableBlockDesigner = function TableBlockDesigner() {
   var defaultResource = fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xDecora4 = fieldSchema['x-decorator-props']) === null || _fieldSchema$xDecora4 === void 0 ? void 0 : _fieldSchema$xDecora4.resource;
   var supportTemplate = !(fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xDecora5 = fieldSchema['x-decorator-props']) === null || _fieldSchema$xDecora5 === void 0 ? void 0 : _fieldSchema$xDecora5.disableTemplate);
   var sort = defaultSort === null || defaultSort === void 0 ? void 0 : defaultSort.map(function (item) {
-    return item.startsWith('-') ? {
+    return (item === null || item === void 0 ? void 0 : item.startsWith('-')) ? {
       field: item.substring(1),
       direction: 'desc'
     } : {
@@ -170,6 +170,7 @@ var TableBlockDesigner = function TableBlockDesigner() {
                   field: {
                     type: 'string',
                     enum: sortFields,
+                    required: true,
                     'x-decorator': 'FormItem',
                     'x-component': 'Select',
                     'x-component-props': {

package/lib/schema-component/antd/table-v2/TableSelectorDesigner.js

@@ -150,6 +150,7 @@ var TableSelectorDesigner = function TableSelectorDesigner() {
                   field: {
                     type: 'string',
                     enum: sortFields,
+                    required: true,
                     'x-decorator': 'FormItem',
                     'x-component': 'Select',
                     'x-component-props': {

package/lib/schema-component/antd/table-v2/hooks/useUserVariable.d.ts

@@ -0,0 +1,22 @@
+interface Operator {
+    label: string;
+    value: string;
+}
+interface GetOptionsParams {
+    schema: any;
+    operator: Operator;
+    maxDepth: number;
+    count?: number;
+}
+export declare const useOptions: (collectionName: string, { schema, operator, maxDepth, count }: GetOptionsParams) => any;
+export declare const useUserVariable: ({ schema, operator }: {
+    schema: any;
+    operator: any;
+}) => {
+    label: string;
+    value: string;
+    key: string;
+    disabled: any;
+    children: any;
+};
+export {};

package/lib/schema-component/antd/table-v2/hooks/useUserVariable.js

@@ -0,0 +1,73 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useUserVariable = exports.useOptions = void 0;
+var _filter = require("../../filter");
+var isOperatorSupportMultiRelation = function isOperatorSupportMultiRelation(operator) {
+  if (!operator) return false;
+  return ['$eq', '$ne'].includes(operator.value);
+};
+var isSingleRelationField = function isSingleRelationField(field) {
+  if (!field) return false;
+  return field.type === 'belongsTo' || field.type === 'hasOne';
+};
+var useOptions = function useOptions(collectionName, _ref) {
+  var schema = _ref.schema,
+    operator = _ref.operator,
+    maxDepth = _ref.maxDepth,
+    _ref$count = _ref.count,
+    count = _ref$count === void 0 ? 1 : _ref$count;
+  if (count > maxDepth) {
+    return [];
+  }
+  var result = (0, _filter.useFilterOptions)(collectionName).map(function (option) {
+    if (!option.target) {
+      var _option$schema;
+      return {
+        key: option.name,
+        value: option.name,
+        label: option.title,
+        // TODO: 现在是通过组件的名称来过滤能够被选择的选项，这样的坏处是不够精确，后续可以优化
+        disabled: (schema === null || schema === void 0 ? void 0 : schema['x-component']) !== ((_option$schema = option.schema) === null || _option$schema === void 0 ? void 0 : _option$schema['x-component'])
+      };
+    }
+    var children = useOptions(option.target, {
+      schema: schema,
+      operator: operator,
+      maxDepth: maxDepth,
+      count: count + 1
+    }) || [];
+    return {
+      key: option.name,
+      value: option.name,
+      label: option.title,
+      children: children,
+      disabled: !isSingleRelationField(option) && !isOperatorSupportMultiRelation(operator) || children.every(function (child) {
+        return child.disabled;
+      })
+    };
+  });
+  return result;
+};
+exports.useOptions = useOptions;
+var useUserVariable = function useUserVariable(_ref2) {
+  var schema = _ref2.schema,
+    operator = _ref2.operator;
+  var options = useOptions('users', {
+    schema: schema,
+    operator: operator,
+    maxDepth: 3
+  }) || [];
+  return {
+    label: "{{t(\"Current user\")}}",
+    value: '$user',
+    key: '$user',
+    disabled: options.every(function (option) {
+      return option.disabled;
+    }),
+    children: options
+  };
+};
+exports.useUserVariable = useUserVariable;

package/lib/schema-component/antd/variable/Input.js

@@ -135,12 +135,15 @@ var ConstantTypes = {
     default: null
   }
 };
-function getTypedConstantOption(type) {
+function getTypedConstantOption(type, types) {
   var _ConstantTypes$type;
+  var allTypes = Object.values(ConstantTypes);
   return {
     value: '',
     label: '{{t("Constant")}}',
-    children: Object.values(ConstantTypes),
+    children: types ? allTypes.filter(function (item) {
+      return Array.isArray(types) && types.includes(item.value) || types === true;
+    }) : allTypes,
     component: (_ConstantTypes$type = ConstantTypes[type]) === null || _ConstantTypes$type === void 0 ? void 0 : _ConstantTypes$type.component
   };
 }
@@ -165,7 +168,7 @@ function Input(props) {
   var _ref5 = children ? {
       value: '',
       label: '{{t("Constant")}}'
-    } : useTypedConstant ? getTypedConstantOption(type) : {
+    } : useTypedConstant ? getTypedConstantOption(type, useTypedConstant) : {
       value: '',
       label: '{{t("Null")}}',
       component: ConstantTypes.null.component

package/lib/schema-component/common/dnd-context/index.js

@@ -31,7 +31,7 @@ var useDragEnd = function useDragEnd(props) {
   var _useTranslation = (0, _reactI18next.useTranslation)(),
     t = _useTranslation.t;
   return function (event) {
-    var _active$data, _active$data$current, _over$data, _over$data$current, _over$data2, _over$data2$current, _over$data3, _over$data3$current, _over$data4, _over$data4$current, _over$data5, _over$data5$current, _over$data$current$re;
+    var _active$data, _active$data$current, _over$data, _over$data$current, _over$data2, _over$data2$current, _over$data3, _over$data3$current, _over$data4, _over$data4$current, _over$data5, _over$data5$current, _over$data$current$re, _over$data6, _over$data6$current;
     var active = event.active,
       over = event.over;
     var activeSchema = active === null || active === void 0 ? void 0 : (_active$data = active.data) === null || _active$data === void 0 ? void 0 : (_active$data$current = _active$data.current) === null || _active$data$current === void 0 ? void 0 : _active$data$current.schema;
@@ -40,7 +40,7 @@ var useDragEnd = function useDragEnd(props) {
     var breakRemoveOn = over === null || over === void 0 ? void 0 : (_over$data3 = over.data) === null || _over$data3 === void 0 ? void 0 : (_over$data3$current = _over$data3.current) === null || _over$data3$current === void 0 ? void 0 : _over$data3$current.breakRemoveOn;
     var wrapSchema = over === null || over === void 0 ? void 0 : (_over$data4 = over.data) === null || _over$data4 === void 0 ? void 0 : (_over$data4$current = _over$data4.current) === null || _over$data4$current === void 0 ? void 0 : _over$data4$current.wrapSchema;
     var onSuccess = over === null || over === void 0 ? void 0 : (_over$data5 = over.data) === null || _over$data5 === void 0 ? void 0 : (_over$data5$current = _over$data5.current) === null || _over$data5$current === void 0 ? void 0 : _over$data5$current.onSuccess;
-    var removeParentsIfNoChildren = (_over$data$current$re = over.data.current.removeParentsIfNoChildren) !== null && _over$data$current$re !== void 0 ? _over$data$current$re : true;
+    var removeParentsIfNoChildren = (_over$data$current$re = over === null || over === void 0 ? void 0 : (_over$data6 = over.data) === null || _over$data6 === void 0 ? void 0 : (_over$data6$current = _over$data6.current) === null || _over$data6$current === void 0 ? void 0 : _over$data6$current.removeParentsIfNoChildren) !== null && _over$data$current$re !== void 0 ? _over$data$current$re : true;
     if (!activeSchema || !overSchema) {
       var _props$onDragEnd;
       props === null || props === void 0 ? void 0 : (_props$onDragEnd = props.onDragEnd) === null || _props$onDragEnd === void 0 ? void 0 : _props$onDragEnd.call(props, event);

package/lib/schema-component/common/sortable-item/SortableItem.js

@@ -9,7 +9,7 @@ var _core = require("@dnd-kit/core");
 var _react = require("@formily/react");
 var _react2 = _interopRequireWildcard(require("react"));
 var _excluded = ["component", "style", "children", "openMode"],
-  _excluded2 = ["schema", "id"];
+  _excluded2 = ["schema", "id", "removeParentsIfNoChildren"];
 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 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; }
@@ -84,18 +84,17 @@ var useSortableItemId = function useSortableItemId(props) {
   return field.address.toString();
 };
 var SortableItem = (0, _react.observer)(function (props) {
-  var _others$removeParents;
   var _useSortableItemProps = useSortableItemProps(props),
     schema = _useSortableItemProps.schema,
     id = _useSortableItemProps.id,
+    removeParentsIfNoChildren = _useSortableItemProps.removeParentsIfNoChildren,
     others = _objectWithoutProperties(_useSortableItemProps, _excluded2);
-  var removeParentsIfNoChildren = (_others$removeParents = others.removeParentsIfNoChildren) !== null && _others$removeParents !== void 0 ? _others$removeParents : true;
   return /*#__PURE__*/_react2.default.createElement(SortableProvider, {
     id: id,
     data: {
       insertAdjacent: 'afterEnd',
       schema: schema,
-      removeParentsIfNoChildren: removeParentsIfNoChildren
+      removeParentsIfNoChildren: removeParentsIfNoChildren !== null && removeParentsIfNoChildren !== void 0 ? removeParentsIfNoChildren : true
     }
   }, /*#__PURE__*/_react2.default.createElement(Sortable, _objectSpread({}, others), props.children));
 });

package/lib/schema-component/core/SchemaComponentProvider.js

@@ -58,8 +58,8 @@ var SchemaComponentProvider = function SchemaComponentProvider(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     formId = _useState4[0],
     setFormId = _useState4[1];
-  var form = props.form || (0, _react2.useMemo)(function () {
-    return (0, _core.createForm)();
+  var form = (0, _react2.useMemo)(function () {
+    return props.form || (0, _core.createForm)();
   }, [formId]);
   var _useTranslation = (0, _reactI18next.useTranslation)(),
     t = _useTranslation.t;

package/lib/schema-initializer/SchemaInitializerProvider.d.ts

@@ -6,6 +6,7 @@ export interface SchemaInitializerProviderProps {
 }
 export declare const useSchemaInitializer: (name: string, props?: {}) => {
     exists: boolean;
+    InitializerComponent: (p: any) => JSX.Element;
     render: (props?: any) => React.CElement<any, React.Component<any, any, any>>;
 };
 export declare const SchemaInitializerPluginContext: React.Context<any>;

package/lib/schema-initializer/SchemaInitializerProvider.js

@@ -31,19 +31,30 @@ var useSchemaInitializer = function useSchemaInitializer(name) {
   var _render = function render(component, props) {
     return component && /*#__PURE__*/_react2.default.createElement(component, props);
   };
-  if (!name) {
-    return {
-      exists: false,
-      render: function render(props) {
-        return _render(null);
-      }
-    };
-  }
-  var initializer = (0, _get.default)(initializers, name || (fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-initializer']));
+  var initializerPropsRef = (0, _react2.useRef)({});
+  var initializer = name ? (0, _get.default)(initializers, name || (fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-initializer'])) : null;
   var initializerProps = _objectSpread(_objectSpread({}, props), fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-initializer-props']);
+  initializerPropsRef.current = initializerProps;
+  var InitializerComponent = (0, _react2.useMemo)(function () {
+    var C = _react2.default.Fragment;
+    if (!initializer) {
+      return C;
+    } else if ((0, _shared.isPlainObj)(initializer)) {
+      C = initializer.component || _SchemaInitializer.SchemaInitializer.Button;
+      return function (p) {
+        return /*#__PURE__*/_react2.default.createElement(C, _objectSpread(_objectSpread(_objectSpread({}, initializer), initializerPropsRef.current), p));
+      };
+    } else {
+      C = initializer;
+      return function (p) {
+        return /*#__PURE__*/_react2.default.createElement(C, _objectSpread(_objectSpread({}, initializerPropsRef.current), p));
+      };
+    }
+  }, [initializer]);
   if (!initializer) {
     return {
       exists: false,
+      InitializerComponent: InitializerComponent,
       render: function render(props) {
         return _render(null);
       }
@@ -52,6 +63,7 @@ var useSchemaInitializer = function useSchemaInitializer(name) {
   if ((0, _shared.isPlainObj)(initializer)) {
     return {
       exists: true,
+      InitializerComponent: InitializerComponent,
       render: function render(props) {
         var component = initializer.component || _SchemaInitializer.SchemaInitializer.Button;
         return _render(component, _objectSpread(_objectSpread(_objectSpread({}, initializer), initializerProps), props));
@@ -60,6 +72,7 @@ var useSchemaInitializer = function useSchemaInitializer(name) {
   }
   return {
     exists: true,
+    InitializerComponent: InitializerComponent,
     render: function render(props) {
       return _render(initializer, _objectSpread(_objectSpread({}, initializerProps), props));
     }

package/lib/schema-initializer/buttons/BlockInitializers.js

@@ -29,6 +29,16 @@ var BlockInitializers = {
       type: 'item',
       title: '{{t("Details")}}',
       component: 'DetailsBlockInitializer'
+    }, {
+      key: 'List',
+      type: 'item',
+      title: '{{t("List")}}',
+      component: 'ListBlockInitializer'
+    }, {
+      key: 'GridCard',
+      type: 'item',
+      title: '{{t("Grid Card")}}',
+      component: 'GridCardBlockInitializer'
     }, {
       key: 'calendar',
       type: 'item',

package/lib/schema-initializer/buttons/CustomFormItemInitializers.js

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", {
 exports.CustomFormItemInitializers = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactI18next = require("react-i18next");
+var _schemaComponent = require("../../schema-component");
 var _SchemaInitializer = require("../SchemaInitializer");
 var _utils = require("../utils");
-var _schemaComponent = require("../../schema-component");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // 表单里配置字段
 var CustomFormItemInitializers = function CustomFormItemInitializers(props) {
@@ -17,7 +17,9 @@ var CustomFormItemInitializers = function CustomFormItemInitializers(props) {
   var compile = (0, _schemaComponent.useCompile)();
   var insertPosition = props.insertPosition,
     component = props.component;
-  var inheritFields = (0, _utils.useInheritsFormItemInitializerFields)();
+  var inheritFields = (0, _utils.useInheritsFormItemInitializerFields)({
+    component: 'AssignedField'
+  });
   var fieldItems = [{
     type: 'itemGroup',
     title: t('Configure fields'),

package/lib/schema-initializer/buttons/FormActionInitializers.d.ts

@@ -20,58 +20,6 @@ export declare const FormActionInitializers: {
         type: string;
         title: string;
         children: ({
-            type: string;
-            title: string;
-            component: string;
-            schema: {
-                type: string;
-                title: string;
-                'x-action': string;
-                'x-designer': string;
-                'x-component': string;
-                'x-component-props': {
-                    openMode: string;
-                    useProps?: undefined;
-                };
-                properties: {
-                    drawer: {
-                        type: string;
-                        title: string;
-                        'x-component': string;
-                        'x-component-props': {
-                            className: string;
-                        };
-                        properties: {
-                            tabs: {
-                                type: string;
-                                'x-component': string;
-                                'x-component-props': {};
-                                'x-initializer': string;
-                                properties: {
-                                    tab1: {
-                                        type: string;
-                                        title: string;
-                                        'x-component': string;
-                                        'x-designer': string;
-                                        'x-component-props': {};
-                                        properties: {
-                                            grid: {
-                                                type: string;
-                                                'x-component': string;
-                                                'x-initializer': string;
-                                                properties: {};
-                                            };
-                                        };
-                                    };
-                                };
-                            };
-                        };
-                    };
-                };
-                'x-designer-props'?: undefined;
-                'x-action-settings'?: undefined;
-            };
-        } | {
             type: string;
             title: string;
             component: string;
@@ -95,10 +43,7 @@ export declare const FormActionInitializers: {
                 };
                 'x-component-props': {
                     useProps: string;
-                    openMode?: undefined;
                 };
-                type?: undefined;
-                properties?: undefined;
             };
         } | {
             type: string;
@@ -121,10 +66,7 @@ export declare const FormActionInitializers: {
                 };
                 'x-component-props': {
                     useProps: string;
-                    openMode?: undefined;
                 };
-                type?: undefined;
-                properties?: undefined;
                 'x-designer-props'?: undefined;
             };
         })[];
@@ -152,58 +94,6 @@ export declare const CreateFormActionInitializers: {
         type: string;
         title: string;
         children: ({
-            type: string;
-            title: string;
-            component: string;
-            schema: {
-                type: string;
-                title: string;
-                'x-action': string;
-                'x-designer': string;
-                'x-component': string;
-                'x-component-props': {
-                    openMode: string;
-                    useProps?: undefined;
-                };
-                properties: {
-                    drawer: {
-                        type: string;
-                        title: string;
-                        'x-component': string;
-                        'x-component-props': {
-                            className: string;
-                        };
-                        properties: {
-                            tabs: {
-                                type: string;
-                                'x-component': string;
-                                'x-component-props': {};
-                                'x-initializer': string;
-                                properties: {
-                                    tab1: {
-                                        type: string;
-                                        title: string;
-                                        'x-component': string;
-                                        'x-designer': string;
-                                        'x-component-props': {};
-                                        properties: {
-                                            grid: {
-                                                type: string;
-                                                'x-component': string;
-                                                'x-initializer': string;
-                                                properties: {};
-                                            };
-                                        };
-                                    };
-                                };
-                            };
-                        };
-                    };
-                };
-                'x-designer-props'?: undefined;
-                'x-action-settings'?: undefined;
-            };
-        } | {
             type: string;
             title: string;
             component: string;
@@ -227,10 +117,7 @@ export declare const CreateFormActionInitializers: {
                 };
                 'x-component-props': {
                     useProps: string;
-                    openMode?: undefined;
                 };
-                type?: undefined;
-                properties?: undefined;
             };
         } | {
             type: string;
@@ -253,10 +140,7 @@ export declare const CreateFormActionInitializers: {
                 };
                 'x-component-props': {
                     useProps: string;
-                    openMode?: undefined;
                 };
-                type?: undefined;
-                properties?: undefined;
                 'x-designer-props'?: undefined;
             };
         })[];