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

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

@@ -11,17 +11,17 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || 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; }
 import { LoadingOutlined } from '@ant-design/icons';
-import { connect, mapProps, mapReadPretty, useFieldSchema, useField } from '@formily/react';
+import { connect, mapProps, mapReadPretty, useField, useFieldSchema } from '@formily/react';
 import { Tag } from 'antd';
-import moment from 'moment';
 import { uniqBy } from 'lodash';
+import moment from 'moment';
 import React, { useCallback, useEffect, useMemo, useRef } from 'react';
 import { useRequest } from '../../../api-client';
 import { mergeFilter } from '../../../block-provider/SharedFilterProvider';
 import { useCollection, useCollectionManager } from '../../../collection-manager';
-import { useCompile } from '../../hooks';
 import { Select, defaultFieldNames } from '../select';
 import { ReadPretty } from './ReadPretty';
+var EMPTY = 'N/A';
 var InternalRemoteSelect = connect(function (props) {
   var _field$componentProps, _field$componentProps2, _field$componentProps3, _service$params;
   var _props$fieldNames = props.fieldNames,
@@ -37,7 +37,6 @@ var InternalRemoteSelect = connect(function (props) {
     mapOptions = props.mapOptions,
     _targetField = props.targetField,
     others = _objectWithoutProperties(props, _excluded);
-  var compile = useCompile();
   var firstRun = useRef(false);
   var fieldSchema = useFieldSchema();
   var field = useField();
@@ -75,7 +74,9 @@ var InternalRemoteSelect = connect(function (props) {
                   }
                 }, (option === null || option === void 0 ? void 0 : option.label) || item);
               } else {
-                return /*#__PURE__*/React.createElement(Tag, null, item);
+                return /*#__PURE__*/React.createElement(Tag, {
+                  key: item
+                }, item);
               }
             }).reverse();
           } else {
@@ -94,10 +95,10 @@ var InternalRemoteSelect = 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;
@@ -139,7 +140,7 @@ var InternalRemoteSelect = connect(function (props) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             run({
-              filter: 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: 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":
@@ -179,6 +180,7 @@ var InternalRemoteSelect = connect(function (props) {
     firstRun.current = true;
   };
   return /*#__PURE__*/React.createElement(Select, _objectSpread(_objectSpread({
+    dropdownMatchSelectWidth: false,
     autoClearSearchValue: true,
     filterOption: false,
     filterSort: null,
@@ -188,7 +190,7 @@ var InternalRemoteSelect = connect(function (props) {
     objectValue: objectValue,
     value: value
   }, others), {}, {
-    loading: loading,
+    loading: data ? loading : true,
     options: mapOptionsToTags(options)
   }));
 }, mapProps({

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

@@ -1,5 +1,5 @@
-var _excluded = ["value", "options", "onChange", "fieldNames", "mode"],
-  _excluded2 = ["objectValue", "value"];
+var _excluded = ["value", "options", "onChange", "fieldNames", "mode", "loading"],
+  _excluded2 = ["objectValue", "loading", "value"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -11,7 +11,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 import { LoadingOutlined } from '@ant-design/icons';
 import { connect, mapProps, mapReadPretty } from '@formily/react';
 import { isValid, toArr } from '@formily/shared';
-import { Select as AntdSelect } from 'antd';
+import { Select as AntdSelect, Spin, Empty } from 'antd';
 import React from 'react';
 import { ReadPretty } from './ReadPretty';
 import { defaultFieldNames, getCurrentOptions } from './shared';
@@ -24,6 +24,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;
@@ -50,9 +51,13 @@ var ObjectSelect = function ObjectSelect(props) {
     value: toValue(value),
     allowClear: true,
     labelInValue: true,
+    notFoundContent: loading ? /*#__PURE__*/React.createElement(Spin, null) : /*#__PURE__*/React.createElement(Empty, {
+      image: 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);
@@ -80,6 +85,7 @@ var filterOption = function filterOption(input, option) {
 };
 var InternalSelect = connect(function (props) {
   var objectValue = props.objectValue,
+    loading = props.loading,
     value = props.value,
     others = _objectWithoutProperties(props, _excluded2);
   var mode = props.multiple ? 'multiple' : props.mode;
@@ -89,13 +95,18 @@ var InternalSelect = connect(function (props) {
   if (objectValue) {
     return /*#__PURE__*/React.createElement(ObjectSelect, _objectSpread(_objectSpread({}, others), {}, {
       value: value,
-      mode: mode
+      mode: mode,
+      loading: loading
     }));
   }
   return /*#__PURE__*/React.createElement(AntdSelect, _objectSpread(_objectSpread({
     showSearch: true,
     filterOption: filterOption,
     allowClear: true,
+    dropdownMatchSelectWidth: false,
+    notFoundContent: loading ? /*#__PURE__*/React.createElement(Spin, null) : /*#__PURE__*/React.createElement(Empty, {
+      image: Empty.PRESENTED_IMAGE_SIMPLE
+    }),
     value: value
   }, others), {}, {
     onChange: function onChange(changed) {

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

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

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

@@ -48,7 +48,7 @@ export 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'
     } : {
@@ -163,6 +163,7 @@ export var TableBlockDesigner = function TableBlockDesigner() {
                   field: {
                     type: 'string',
                     enum: sortFields,
+                    required: true,
                     'x-decorator': 'FormItem',
                     'x-component': 'Select',
                     'x-component-props': {

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

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

package/es/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/es/schema-component/antd/table-v2/hooks/useUserVariable.js

@@ -0,0 +1,65 @@
+import { useFilterOptions } from '../../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';
+};
+export 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 = 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;
+};
+export 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
+  };
+};

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

@@ -128,12 +128,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
   };
 }
@@ -158,7 +161,7 @@ export 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/es/schema-component/common/dnd-context/index.js

@@ -23,7 +23,7 @@ var useDragEnd = function useDragEnd(props) {
   var _useTranslation = 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;
@@ -32,7 +32,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/es/schema-component/common/sortable-item/SortableItem.js

@@ -1,6 +1,6 @@
 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 _excluded = ["component", "style", "children", "openMode"],
-  _excluded2 = ["schema", "id"];
+  _excluded2 = ["schema", "id", "removeParentsIfNoChildren"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -72,18 +72,17 @@ var useSortableItemId = function useSortableItemId(props) {
   return field.address.toString();
 };
 export var SortableItem = 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__*/React.createElement(SortableProvider, {
     id: id,
     data: {
       insertAdjacent: 'afterEnd',
       schema: schema,
-      removeParentsIfNoChildren: removeParentsIfNoChildren
+      removeParentsIfNoChildren: removeParentsIfNoChildren !== null && removeParentsIfNoChildren !== void 0 ? removeParentsIfNoChildren : true
     }
   }, /*#__PURE__*/React.createElement(Sortable, _objectSpread({}, others), props.children));
 });

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

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

package/es/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/es/schema-initializer/SchemaInitializerProvider.js

@@ -7,7 +7,7 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 import { useFieldSchema } from '@formily/react';
 import { isPlainObj } from '@formily/shared';
 import get from 'lodash/get';
-import React, { createContext, useContext } from 'react';
+import React, { createContext, useContext, useMemo, useRef } from 'react';
 import { SchemaComponentOptions } from '../schema-component';
 import { SchemaInitializer } from './SchemaInitializer';
 import * as globals from './buttons';
@@ -21,19 +21,30 @@ export var useSchemaInitializer = function useSchemaInitializer(name) {
   var _render = function render(component, props) {
     return component && /*#__PURE__*/React.createElement(component, props);
   };
-  if (!name) {
-    return {
-      exists: false,
-      render: function render(props) {
-        return _render(null);
-      }
-    };
-  }
-  var initializer = get(initializers, name || (fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-initializer']));
+  var initializerPropsRef = useRef({});
+  var initializer = name ? get(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 = useMemo(function () {
+    var C = React.Fragment;
+    if (!initializer) {
+      return C;
+    } else if (isPlainObj(initializer)) {
+      C = initializer.component || SchemaInitializer.Button;
+      return function (p) {
+        return /*#__PURE__*/React.createElement(C, _objectSpread(_objectSpread(_objectSpread({}, initializer), initializerPropsRef.current), p));
+      };
+    } else {
+      C = initializer;
+      return function (p) {
+        return /*#__PURE__*/React.createElement(C, _objectSpread(_objectSpread({}, initializerPropsRef.current), p));
+      };
+    }
+  }, [initializer]);
   if (!initializer) {
     return {
       exists: false,
+      InitializerComponent: InitializerComponent,
       render: function render(props) {
         return _render(null);
       }
@@ -42,6 +53,7 @@ export var useSchemaInitializer = function useSchemaInitializer(name) {
   if (isPlainObj(initializer)) {
     return {
       exists: true,
+      InitializerComponent: InitializerComponent,
       render: function render(props) {
         var component = initializer.component || SchemaInitializer.Button;
         return _render(component, _objectSpread(_objectSpread(_objectSpread({}, initializer), initializerProps), props));
@@ -50,6 +62,7 @@ export var useSchemaInitializer = function useSchemaInitializer(name) {
   }
   return {
     exists: true,
+    InitializerComponent: InitializerComponent,
     render: function render(props) {
       return _render(initializer, _objectSpread(_objectSpread({}, initializerProps), props));
     }

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

@@ -23,6 +23,16 @@ export 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/es/schema-initializer/buttons/CustomFormItemInitializers.js

@@ -1,8 +1,8 @@
 import React from 'react';
 import { useTranslation } from 'react-i18next';
+import { useCompile } from '../../schema-component';
 import { SchemaInitializer } from '../SchemaInitializer';
 import { gridRowColWrap, useCustomFormItemInitializerFields, useInheritsFormItemInitializerFields } from '../utils';
-import { useCompile } from '../../schema-component';
 // 表单里配置字段
 export var CustomFormItemInitializers = function CustomFormItemInitializers(props) {
   var _useTranslation = useTranslation(),
@@ -10,7 +10,9 @@ export var CustomFormItemInitializers = function CustomFormItemInitializers(prop
   var compile = useCompile();
   var insertPosition = props.insertPosition,
     component = props.component;
-  var inheritFields = useInheritsFormItemInitializerFields();
+  var inheritFields = useInheritsFormItemInitializerFields({
+    component: 'AssignedField'
+  });
   var fieldItems = [{
     type: 'itemGroup',
     title: t('Configure fields'),

package/es/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;
             };
         })[];