@nocobase/client 0.7.1-alpha.5 → 0.7.2-alpha.1

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

@@ -42,6 +42,10 @@ export var TableColumnDesigner = function TableColumnDesigner(props) {
   var uiSchema = props.uiSchema,
       fieldSchema = props.fieldSchema,
       collectionField = props.collectionField;
+
+  var _useCollectionManager2 = useCollectionManager(),
+      getInterface = _useCollectionManager2.getInterface;
+
   var field = useField();
 
   var _useTranslation = useTranslation(),
@@ -54,6 +58,7 @@ export var TableColumnDesigner = function TableColumnDesigner(props) {
 
   var fieldNames = (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : _fieldSchema$xCompon['fieldNames']) || (uiSchema === null || uiSchema === void 0 ? void 0 : (_uiSchema$xComponent = uiSchema['x-component-props']) === null || _uiSchema$xComponent === void 0 ? void 0 : _uiSchema$xComponent['fieldNames']);
   var options = useLabelFields(collectionField === null || collectionField === void 0 ? void 0 : collectionField.target);
+  var intefaceCfg = getInterface(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface);
   return /*#__PURE__*/React.createElement(GeneralSchemaDesigner, {
     disableInitializer: true
   }, /*#__PURE__*/React.createElement(SchemaSettings.ModalItem, {
@@ -65,7 +70,7 @@ export var TableColumnDesigner = function TableColumnDesigner(props) {
         title: {
           // title: t('Column title'),
           default: columnSchema === null || columnSchema === void 0 ? void 0 : columnSchema.title,
-          description: "".concat(t('Original title: ')).concat(collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc = collectionField.uiSchema) === null || _collectionField$uiSc === void 0 ? void 0 : _collectionField$uiSc.title),
+          description: "".concat(t('Original title: ')).concat((collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc = collectionField.uiSchema) === null || _collectionField$uiSc === void 0 ? void 0 : _collectionField$uiSc.title) || (fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema.title)),
           'x-decorator': 'FormItem',
           'x-component': 'Input',
           'x-component-props': {}
@@ -88,7 +93,7 @@ export var TableColumnDesigner = function TableColumnDesigner(props) {
 
       dn.refresh();
     }
-  }), /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
+  }), intefaceCfg && intefaceCfg.sortable === true && /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
     title: t('Sortable'),
     checked: field.componentProps.sorter,
     onChange: function onChange(v) {

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

@@ -64,6 +64,7 @@ var useTableColumns = function useTableColumns() {
       }
     }, []);
     var dataIndex = (collectionFields === null || collectionFields === void 0 ? void 0 : collectionFields.length) > 0 ? collectionFields[0].name : s.name;
+    console.log('useTableColumns', s.name, s, field.value);
     return {
       title: /*#__PURE__*/React.createElement(RecursionField, {
         name: s.name,
@@ -77,8 +78,9 @@ var useTableColumns = function useTableColumns() {
       render: function render(v, record) {
         var _field$value;
 
-        var index = (_field$value = field.value) === null || _field$value === void 0 ? void 0 : _field$value.indexOf(record);
-        console.log((Date.now() - start) / 1000);
+        var index = (_field$value = field.value) === null || _field$value === void 0 ? void 0 : _field$value.indexOf(record); // console.log((Date.now() - start) / 1000);
+
+        console.log('useTableColumns.index', index, record);
         return /*#__PURE__*/React.createElement(RecordIndexProvider, {
           index: index
         }, /*#__PURE__*/React.createElement(RecordProvider, {

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

@@ -6,6 +6,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 import { observer, useField, useFieldSchema, useForm } from '@formily/react';
 import React, { useEffect } from 'react';
+import { useFormBlockContext } from '../../../block-provider';
 import { useCollection } from '../../../collection-manager';
 import { useCompile } from '../../hooks';
 import { ActionBar } from '../action';
@@ -18,12 +19,18 @@ export var TableField = observer(function (props) {
   var field = useField();
   var collectionField = getField(fieldSchema.name);
   var compile = useCompile();
+  var ctx = useFormBlockContext();
   useEffect(function () {
     if (!field.title) {
       var _collectionField$uiSc;
 
       field.title = compile(collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc = collectionField.uiSchema) === null || _collectionField$uiSc === void 0 ? void 0 : _collectionField$uiSc.title);
     }
+
+    if (ctx === null || ctx === void 0 ? void 0 : ctx.field) {
+      ctx.field.added = ctx.field.added || new Set();
+      ctx.field.added.add(fieldSchema.name);
+    }
   }, []);
   return /*#__PURE__*/React.createElement("div", null, props.children);
 });

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

@@ -7,7 +7,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { SchemaInitializer } from '../SchemaInitializer';
-import { itemsMerge, useTableColumnInitializerFields } from '../utils'; // 表格列配置
+import { itemsMerge, useAssociatedTableColumnInitializerFields, useTableColumnInitializerFields } from '../utils'; // 表格列配置
 
 export var TableColumnInitializers = function TableColumnInitializers(props) {
   var _props$items = props.items,
@@ -16,6 +16,30 @@ export var TableColumnInitializers = function TableColumnInitializers(props) {
   var _useTranslation = useTranslation(),
       t = _useTranslation.t;
 
+  var associatedFields = useAssociatedTableColumnInitializerFields();
+  var fieldItems = [{
+    type: 'itemGroup',
+    title: t('Display fields'),
+    children: useTableColumnInitializerFields()
+  }];
+
+  if ((associatedFields === null || associatedFields === void 0 ? void 0 : associatedFields.length) > 0) {
+    fieldItems.push({
+      type: 'divider'
+    }, {
+      type: 'itemGroup',
+      title: t('Display association fields'),
+      children: associatedFields
+    });
+  }
+
+  fieldItems.push({
+    type: 'divider'
+  }, {
+    type: 'item',
+    title: t('Action column'),
+    component: 'TableActionColumnInitializer'
+  });
   return /*#__PURE__*/React.createElement(SchemaInitializer.Button, {
     insertPosition: 'beforeEnd',
     icon: 'SettingOutlined',
@@ -32,16 +56,6 @@ export var TableColumnInitializers = function TableColumnInitializers(props) {
         properties: _defineProperty({}, s.name, _objectSpread({}, s))
       };
     },
-    items: itemsMerge([{
-      type: 'itemGroup',
-      title: t('Display fields'),
-      children: useTableColumnInitializerFields()
-    }, {
-      type: 'divider'
-    }, {
-      type: 'item',
-      title: t('Action column'),
-      component: 'TableActionColumnInitializer'
-    }], items)
+    items: itemsMerge(fieldItems, items)
   }, t('Configure columns'));
 };

package/es/schema-initializer/components/assigned-field/AssignedField.js

@@ -4,14 +4,6 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-function _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); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -24,11 +16,12 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import { useField, useFieldSchema } from '@formily/react';
-import React, { useEffect, useState } from 'react';
+import { useField, useFieldSchema } from '@formily/react'; // import { Select, Space } from 'antd';
+
+import React, { useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { CollectionField, useCollection } from '../../../collection-manager';
-import { useCompile, useFilterOptions } from '../../../schema-component';
+import { CollectionField } from '../../../collection-manager';
+import { useCompile } from '../../../schema-component';
 export var AssignedField = function AssignedField(props) {
   var _field$value$value, _field$value;
 
@@ -37,46 +30,40 @@ export var AssignedField = function AssignedField(props) {
 
   var compile = useCompile();
   var field = useField();
-  var fieldSchema = useFieldSchema();
+  var fieldSchema = useFieldSchema(); // const [type, setType] = useState<string>('constantValue');
 
-  var _useState = useState('constantValue'),
+  var _useState = useState((_field$value$value = field === null || field === void 0 ? void 0 : (_field$value = field.value) === null || _field$value === void 0 ? void 0 : _field$value.value) !== null && _field$value$value !== void 0 ? _field$value$value : ''),
       _useState2 = _slicedToArray(_useState, 2),
-      type = _useState2[0],
-      setType = _useState2[1];
-
-  var _useState3 = useState((_field$value$value = field === null || field === void 0 ? void 0 : (_field$value = field.value) === null || _field$value === void 0 ? void 0 : _field$value.value) !== null && _field$value$value !== void 0 ? _field$value$value : ''),
-      _useState4 = _slicedToArray(_useState3, 2),
-      value = _useState4[0],
-      setValue = _useState4[1];
-
-  var _useState5 = useState([]),
-      _useState6 = _slicedToArray(_useState5, 2),
-      options = _useState6[0],
-      setOptions = _useState6[1];
-
-  var _useCollection = useCollection(),
-      getField = _useCollection.getField;
-
-  var collectionField = getField(fieldSchema.name);
-  var uiSchema = collectionField.uiSchema;
-  var currentUser = useFilterOptions('users');
-  var currentRecord = useFilterOptions(collectionField.collectionName);
-  useEffect(function () {
-    var opt = [{
-      name: 'currentUser',
-      title: t('Current user'),
-      children: _toConsumableArray(currentUser)
-    }, {
-      name: 'currentRecord',
-      title: t('Current record'),
-      children: _toConsumableArray(currentRecord)
-    }];
-    setOptions(compile(opt));
-  }, []);
+      value = _useState2[0],
+      setValue = _useState2[1]; // const [options, setOptions] = useState<any[]>([]);
+  // const { getField } = useCollection();
+  // const collectionField = getField(fieldSchema.name);
+  // const { uiSchema } = collectionField;
+  // const currentUser = useFilterOptions('users');
+  // const currentRecord = useFilterOptions(collectionField.collectionName);
+  // useEffect(() => {
+  //   const opt = [
+  //     {
+  //       name: 'currentUser',
+  //       title: t('Current user'),
+  //       children: [...currentUser],
+  //     },
+  //     {
+  //       name: 'currentRecord',
+  //       title: t('Current record'),
+  //       children: [...currentRecord],
+  //     },
+  //   ];
+  //   setOptions(compile(opt));
+  // }, []);
+
 
   var valueChangeHandler = function valueChangeHandler(val) {
     setValue(val);
-  };
+  }; // const typeChangeHandler = (val) => {
+  //   setType(val);
+  // };
+
 
   return /*#__PURE__*/React.createElement(CollectionField, _objectSpread(_objectSpread({}, props), {}, {
     value: field.value,

package/es/schema-initializer/utils.d.ts

@@ -74,7 +74,9 @@ export declare const removeGridFormItem: (schema: any, cb: any) => void;
 export declare const useRemoveGridFormItem: () => (schema: any, cb: any) => void;
 export declare const findTableColumn: (schema: Schema, key: string, action: string, deepth?: number) => unknown;
 export declare const useTableColumnInitializerFields: () => SchemaInitializerItemOptions[];
+export declare const useAssociatedTableColumnInitializerFields: () => SchemaInitializerItemOptions[];
 export declare const useFormItemInitializerFields: (options?: any) => SchemaInitializerItemOptions[];
+export declare const useAssociatedFormItemInitializerFields: (options?: any) => SchemaInitializerItemOptions[];
 export declare const useCustomFormItemInitializerFields: (options?: any) => SchemaInitializerItemOptions[];
 export declare const useCurrentSchema: (action: string, key: string, find?: (schema: Schema, key: string, action: string) => any, rm?: (schema: any, cb: any) => any) => {
     schema: any;

package/es/schema-initializer/utils.js

@@ -16,7 +16,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-import { useFieldSchema, useForm } from '@formily/react';
+import { Schema, useFieldSchema, useForm } from '@formily/react';
 import { uid } from '@formily/shared';
 import { useTranslation } from 'react-i18next';
 import { useCollection, useCollectionManager } from '../collection-manager';
@@ -126,7 +126,7 @@ export var useTableColumnInitializerFields = function useTableColumnInitializerF
     };
   });
 };
-export var useFormItemInitializerFields = function useFormItemInitializerFields(options) {
+export var useAssociatedTableColumnInitializerFields = function useAssociatedTableColumnInitializerFields() {
   var _fields$filter;
 
   var _useCollection2 = useCollection(),
@@ -134,7 +134,69 @@ export var useFormItemInitializerFields = function useFormItemInitializerFields(
       fields = _useCollection2.fields;
 
   var _useCollectionManager2 = useCollectionManager(),
-      getInterface = _useCollectionManager2.getInterface;
+      getInterface = _useCollectionManager2.getInterface,
+      getCollectionFields = _useCollectionManager2.getCollectionFields;
+
+  var groups = fields === null || fields === void 0 ? void 0 : (_fields$filter = fields.filter(function (field) {
+    return ['o2o', 'oho', 'obo', 'm2o'].includes(field.interface);
+  })) === null || _fields$filter === void 0 ? void 0 : _fields$filter.map(function (field) {
+    var _subFields$filter, _field$uiSchema2;
+
+    var subFields = getCollectionFields(field.target);
+    var items = subFields // ?.filter((subField) => subField?.interface && !['o2o', 'oho', 'obo', 'o2m', 'm2o', 'subTable', 'linkTo'].includes(subField?.interface))
+    === null || subFields // ?.filter((subField) => subField?.interface && !['o2o', 'oho', 'obo', 'o2m', 'm2o', 'subTable', 'linkTo'].includes(subField?.interface))
+    === void 0 ? void 0 : (_subFields$filter = subFields // ?.filter((subField) => subField?.interface && !['o2o', 'oho', 'obo', 'o2m', 'm2o', 'subTable', 'linkTo'].includes(subField?.interface))
+    .filter(function (subField) {
+      return (subField === null || subField === void 0 ? void 0 : subField.interface) && !['subTable'].includes(subField === null || subField === void 0 ? void 0 : subField.interface);
+    })) === null || _subFields$filter === void 0 ? void 0 : _subFields$filter.map(function (subField) {
+      var _subField$uiSchema;
+
+      var interfaceConfig = getInterface(subField.interface);
+      var schema = {
+        // type: 'string',
+        name: "".concat(field.name, ".").concat(subField.name),
+        // title: subField?.uiSchema?.title || subField.name,
+        'x-component': 'CollectionField',
+        'x-read-pretty': true,
+        'x-collection-field': "".concat(name, ".").concat(field.name, ".").concat(subField.name),
+        'x-component-props': {}
+      };
+      return {
+        type: 'item',
+        title: (subField === null || subField === void 0 ? void 0 : (_subField$uiSchema = subField.uiSchema) === null || _subField$uiSchema === void 0 ? void 0 : _subField$uiSchema.title) || subField.name,
+        component: 'TableCollectionFieldInitializer',
+        find: findTableColumn,
+        remove: removeTableColumn,
+        schemaInitialize: function schemaInitialize(s) {
+          var _interfaceConfig$sche2;
+
+          interfaceConfig === null || interfaceConfig === void 0 ? void 0 : (_interfaceConfig$sche2 = interfaceConfig.schemaInitialize) === null || _interfaceConfig$sche2 === void 0 ? void 0 : _interfaceConfig$sche2.call(interfaceConfig, s, {
+            field: subField,
+            readPretty: true,
+            block: 'Table'
+          });
+        },
+        field: subField,
+        schema: schema
+      };
+    });
+    return {
+      type: 'subMenu',
+      title: (_field$uiSchema2 = field.uiSchema) === null || _field$uiSchema2 === void 0 ? void 0 : _field$uiSchema2.title,
+      children: items
+    };
+  });
+  return groups;
+};
+export var useFormItemInitializerFields = function useFormItemInitializerFields(options) {
+  var _fields$filter2;
+
+  var _useCollection3 = useCollection(),
+      name = _useCollection3.name,
+      fields = _useCollection3.fields;
+
+  var _useCollectionManager3 = useCollectionManager(),
+      getInterface = _useCollectionManager3.getInterface;
 
   var form = useForm();
 
@@ -144,10 +206,10 @@ export var useFormItemInitializerFields = function useFormItemInitializerFields(
       _ref$block = _ref.block,
       block = _ref$block === void 0 ? 'Form' : _ref$block;
 
-  return fields === null || fields === void 0 ? void 0 : (_fields$filter = fields.filter(function (field) {
+  return fields === null || fields === void 0 ? void 0 : (_fields$filter2 = fields.filter(function (field) {
     return field === null || field === void 0 ? void 0 : field.interface;
-  })) === null || _fields$filter === void 0 ? void 0 : _fields$filter.map(function (field) {
-    var _field$uiSchema2;
+  })) === null || _fields$filter2 === void 0 ? void 0 : _fields$filter2.map(function (field) {
+    var _field$uiSchema3;
 
     var interfaceConfig = getInterface(field.interface);
     var schema = {
@@ -155,20 +217,21 @@ export var useFormItemInitializerFields = function useFormItemInitializerFields(
       name: field.name,
       // title: field?.uiSchema?.title || field.name,
       'x-designer': 'FormItem.Designer',
-      'x-component': 'CollectionField',
+      'x-component': field.interface === 'o2m' ? 'TableField' : 'CollectionField',
       'x-decorator': 'FormItem',
-      'x-collection-field': "".concat(name, ".").concat(field.name)
+      'x-collection-field': "".concat(name, ".").concat(field.name),
+      'x-component-props': {}
     }; // interfaceConfig?.schemaInitialize?.(schema, { field, block: 'Form', readPretty: form.readPretty });
 
     return {
       type: 'item',
-      title: (field === null || field === void 0 ? void 0 : (_field$uiSchema2 = field.uiSchema) === null || _field$uiSchema2 === void 0 ? void 0 : _field$uiSchema2.title) || field.name,
+      title: (field === null || field === void 0 ? void 0 : (_field$uiSchema3 = field.uiSchema) === null || _field$uiSchema3 === void 0 ? void 0 : _field$uiSchema3.title) || field.name,
       component: 'CollectionFieldInitializer',
       remove: removeGridFormItem,
       schemaInitialize: function schemaInitialize(s) {
-        var _interfaceConfig$sche2;
+        var _interfaceConfig$sche3;
 
-        interfaceConfig === null || interfaceConfig === void 0 ? void 0 : (_interfaceConfig$sche2 = interfaceConfig.schemaInitialize) === null || _interfaceConfig$sche2 === void 0 ? void 0 : _interfaceConfig$sche2.call(interfaceConfig, s, {
+        interfaceConfig === null || interfaceConfig === void 0 ? void 0 : (_interfaceConfig$sche3 = interfaceConfig.schemaInitialize) === null || _interfaceConfig$sche3 === void 0 ? void 0 : _interfaceConfig$sche3.call(interfaceConfig, s, {
           field: field,
           block: block,
           readPretty: readPretty
@@ -178,15 +241,16 @@ export var useFormItemInitializerFields = function useFormItemInitializerFields(
     };
   });
 };
-export var useCustomFormItemInitializerFields = function useCustomFormItemInitializerFields(options) {
-  var _fields$filter2;
+export var useAssociatedFormItemInitializerFields = function useAssociatedFormItemInitializerFields(options) {
+  var _fields$filter3;
 
-  var _useCollection3 = useCollection(),
-      name = _useCollection3.name,
-      fields = _useCollection3.fields;
+  var _useCollection4 = useCollection(),
+      name = _useCollection4.name,
+      fields = _useCollection4.fields;
 
-  var _useCollectionManager3 = useCollectionManager(),
-      getInterface = _useCollectionManager3.getInterface;
+  var _useCollectionManager4 = useCollectionManager(),
+      getInterface = _useCollectionManager4.getInterface,
+      getCollectionFields = _useCollectionManager4.getCollectionFields;
 
   var form = useForm();
 
@@ -196,19 +260,85 @@ export var useCustomFormItemInitializerFields = function useCustomFormItemInitia
       _ref2$block = _ref2.block,
       block = _ref2$block === void 0 ? 'Form' : _ref2$block;
 
+  var groups = fields === null || fields === void 0 ? void 0 : (_fields$filter3 = fields.filter(function (field) {
+    return ['o2o', 'oho', 'obo', 'm2o'].includes(field.interface);
+  })) === null || _fields$filter3 === void 0 ? void 0 : _fields$filter3.map(function (field) {
+    var _subFields$filter2, _field$uiSchema4;
+
+    var subFields = getCollectionFields(field.target);
+    var items = subFields === null || subFields === void 0 ? void 0 : (_subFields$filter2 = subFields.filter(function (subField) {
+      return (subField === null || subField === void 0 ? void 0 : subField.interface) && !['subTable'].includes(subField === null || subField === void 0 ? void 0 : subField.interface);
+    })) === null || _subFields$filter2 === void 0 ? void 0 : _subFields$filter2.map(function (subField) {
+      var _subField$uiSchema2;
+
+      var interfaceConfig = getInterface(subField.interface);
+      var schema = {
+        type: 'string',
+        name: "".concat(field.name, ".").concat(subField.name),
+        // title: subField?.uiSchema?.title || subField.name,
+        'x-designer': 'FormItem.Designer',
+        'x-component': 'CollectionField',
+        'x-component-props': {},
+        'x-decorator': 'FormItem',
+        'x-collection-field': "".concat(name, ".").concat(field.name, ".").concat(subField.name)
+      }; // interfaceConfig?.schemaInitialize?.(schema, { field, block: 'Form', readPretty: form.readPretty });
+
+      return {
+        type: 'item',
+        title: (subField === null || subField === void 0 ? void 0 : (_subField$uiSchema2 = subField.uiSchema) === null || _subField$uiSchema2 === void 0 ? void 0 : _subField$uiSchema2.title) || subField.name,
+        component: 'CollectionFieldInitializer',
+        remove: removeGridFormItem,
+        schemaInitialize: function schemaInitialize(s) {
+          var _interfaceConfig$sche4;
+
+          interfaceConfig === null || interfaceConfig === void 0 ? void 0 : (_interfaceConfig$sche4 = interfaceConfig.schemaInitialize) === null || _interfaceConfig$sche4 === void 0 ? void 0 : _interfaceConfig$sche4.call(interfaceConfig, s, {
+            field: subField,
+            block: block,
+            readPretty: readPretty
+          });
+        },
+        schema: schema
+      };
+    });
+    return {
+      type: 'subMenu',
+      title: (_field$uiSchema4 = field.uiSchema) === null || _field$uiSchema4 === void 0 ? void 0 : _field$uiSchema4.title,
+      children: items
+    };
+  });
+  return groups;
+};
+export var useCustomFormItemInitializerFields = function useCustomFormItemInitializerFields(options) {
+  var _fields$filter4;
+
+  var _useCollection5 = useCollection(),
+      name = _useCollection5.name,
+      fields = _useCollection5.fields;
+
+  var _useCollectionManager5 = useCollectionManager(),
+      getInterface = _useCollectionManager5.getInterface;
+
+  var form = useForm();
+
+  var _ref3 = options || {},
+      _ref3$readPretty = _ref3.readPretty,
+      readPretty = _ref3$readPretty === void 0 ? form.readPretty : _ref3$readPretty,
+      _ref3$block = _ref3.block,
+      block = _ref3$block === void 0 ? 'Form' : _ref3$block;
+
   var remove = useRemoveGridFormItem();
-  return fields === null || fields === void 0 ? void 0 : (_fields$filter2 = fields.filter(function (field) {
-    var _field$uiSchema3;
+  return fields === null || fields === void 0 ? void 0 : (_fields$filter4 = fields.filter(function (field) {
+    var _field$uiSchema5;
 
-    return (field === null || field === void 0 ? void 0 : field.interface) && !(field === null || field === void 0 ? void 0 : (_field$uiSchema3 = field.uiSchema) === null || _field$uiSchema3 === void 0 ? void 0 : _field$uiSchema3['x-read-pretty']);
-  })) === null || _fields$filter2 === void 0 ? void 0 : _fields$filter2.map(function (field) {
-    var _field$uiSchema4, _field$uiSchema5;
+    return (field === null || field === void 0 ? void 0 : field.interface) && !(field === null || field === void 0 ? void 0 : (_field$uiSchema5 = field.uiSchema) === null || _field$uiSchema5 === void 0 ? void 0 : _field$uiSchema5['x-read-pretty']);
+  })) === null || _fields$filter4 === void 0 ? void 0 : _fields$filter4.map(function (field) {
+    var _field$uiSchema6, _field$uiSchema7;
 
     var interfaceConfig = getInterface(field.interface);
     var schema = {
       type: 'string',
       name: field.name,
-      title: (field === null || field === void 0 ? void 0 : (_field$uiSchema4 = field.uiSchema) === null || _field$uiSchema4 === void 0 ? void 0 : _field$uiSchema4.title) || field.name,
+      title: (field === null || field === void 0 ? void 0 : (_field$uiSchema6 = field.uiSchema) === null || _field$uiSchema6 === void 0 ? void 0 : _field$uiSchema6.title) || field.name,
       'x-designer': 'FormItem.Designer',
       'x-component': 'AssignedField',
       'x-decorator': 'FormItem',
@@ -216,13 +346,13 @@ export var useCustomFormItemInitializerFields = function useCustomFormItemInitia
     };
     return {
       type: 'item',
-      title: (field === null || field === void 0 ? void 0 : (_field$uiSchema5 = field.uiSchema) === null || _field$uiSchema5 === void 0 ? void 0 : _field$uiSchema5.title) || field.name,
+      title: (field === null || field === void 0 ? void 0 : (_field$uiSchema7 = field.uiSchema) === null || _field$uiSchema7 === void 0 ? void 0 : _field$uiSchema7.title) || field.name,
       component: 'CollectionFieldInitializer',
       remove: remove,
       schemaInitialize: function schemaInitialize(s) {
-        var _interfaceConfig$sche3;
+        var _interfaceConfig$sche5;
 
-        interfaceConfig === null || interfaceConfig === void 0 ? void 0 : (_interfaceConfig$sche3 = interfaceConfig.schemaInitialize) === null || _interfaceConfig$sche3 === void 0 ? void 0 : _interfaceConfig$sche3.call(interfaceConfig, s, {
+        interfaceConfig === null || interfaceConfig === void 0 ? void 0 : (_interfaceConfig$sche5 = interfaceConfig.schemaInitialize) === null || _interfaceConfig$sche5 === void 0 ? void 0 : _interfaceConfig$sche5.call(interfaceConfig, s, {
           field: field,
           block: block,
           readPretty: readPretty
@@ -234,6 +364,7 @@ export var useCustomFormItemInitializerFields = function useCustomFormItemInitia
 };
 
 var findSchema = function findSchema(schema, key, action) {
+  if (!Schema.isSchemaInstance(schema)) return null;
   return schema.reduceProperties(function (buf, s) {
     if (s[key] === action) {
       return s;
@@ -342,8 +473,8 @@ export var useCollectionDataSourceItems = function useCollectionDataSourceItems(
   var _useTranslation2 = useTranslation(),
       t = _useTranslation2.t;
 
-  var _useCollectionManager4 = useCollectionManager(),
-      collections = _useCollectionManager4.collections;
+  var _useCollectionManager6 = useCollectionManager(),
+      collections = _useCollectionManager6.collections;
 
   var _useSchemaTemplateMan2 = useSchemaTemplateManager(),
       getTemplatesByCollection = _useSchemaTemplateMan2.getTemplatesByCollection;
@@ -491,7 +622,6 @@ export var createFormBlockSchema = function createFormBlockSchema(options) {
       template = options.template,
       others = _objectWithoutProperties(options, _excluded2);
 
-  console.log('createFormBlockSchema', options);
   var resourceName = resource || association || collection;
   var schema = {
     type: 'void',

package/es/schema-settings/SchemaSettings.js

@@ -47,7 +47,7 @@ import { cloneDeep } from 'lodash';
 import React, { createContext, useContext, useMemo, useState } from 'react';
 import { createPortal } from 'react-dom';
 import { useTranslation } from 'react-i18next';
-import { ActionContext, createDesignable, FormProvider, RemoteSchemaComponent, SchemaComponent, SchemaComponentOptions, useActionContext, useAPIClient, useCollection, useCompile, useDesignable } from '..';
+import { ActionContext, CollectionManagerContext, createDesignable, FormProvider, RemoteSchemaComponent, SchemaComponent, SchemaComponentOptions, useActionContext, useAPIClient, useCollection, useCompile, useDesignable } from '..';
 import { useSchemaTemplateManager } from '../schema-templates';
 import { useBlockTemplateContext } from '../schema-templates/BlockTemplate';
 var SchemaSettingsContext = /*#__PURE__*/createContext(null);
@@ -809,6 +809,7 @@ SchemaSettings.ModalItem = function (props) {
       others = _objectWithoutProperties(props, _excluded7);
 
   var options = useContext(SchemaOptionsContext);
+  var cm = useContext(CollectionManagerContext);
 
   if (hidden) {
     return null;
@@ -817,7 +818,9 @@ SchemaSettings.ModalItem = function (props) {
   return /*#__PURE__*/React.createElement(SchemaSettings.Item, _objectSpread(_objectSpread({}, others), {}, {
     onClick: function onClick() {
       FormDialog(schema.title || title, function () {
-        return /*#__PURE__*/React.createElement(SchemaComponentOptions, {
+        return /*#__PURE__*/React.createElement(CollectionManagerContext.Provider, {
+          value: cm
+        }, /*#__PURE__*/React.createElement(SchemaComponentOptions, {
           scope: options.scope,
           components: options.components
         }, /*#__PURE__*/React.createElement(FormLayout, {
@@ -826,7 +829,7 @@ SchemaSettings.ModalItem = function (props) {
           components: components,
           scope: scope,
           schema: schema
-        })));
+        }))));
       }).open({
         initialValues: initialValues,
         effects: effects

package/lib/application/Application.js

@@ -41,8 +41,6 @@ var _systemSettings = require("../system-settings");
 
 var _user = require("../user");
 
-var _workflow = require("../workflow");
-
 var _compose = require("./compose");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -115,7 +113,6 @@ var Application = /*#__PURE__*/function () {
         RouteSchemaComponent: _routeSwitch.RouteSchemaComponent,
         SigninPage: _user.SigninPage,
         SignupPage: _user.SignupPage,
-        WorkflowPage: _workflow.WorkflowPage,
         BlockTemplatePage: _schemaTemplates.BlockTemplatePage,
         BlockTemplateDetails: _schemaTemplates.BlockTemplateDetails
       }
@@ -126,7 +123,6 @@ var Application = /*#__PURE__*/function () {
         ACLShortcut: _acl.ACLShortcut,
         DesignableSwitch: _schemaComponent.DesignableSwitch,
         CollectionManagerShortcut: _collectionManager.CollectionManagerShortcut,
-        WorkflowShortcut: _workflow.WorkflowShortcut,
         SystemSettingsShortcut: _systemSettings.SystemSettingsShortcut,
         SchemaTemplateShortcut: _schemaTemplates.SchemaTemplateShortcut,
         FileStorageShortcut: _fileManager.FileStorageShortcut
@@ -147,7 +143,6 @@ var Application = /*#__PURE__*/function () {
     this.use(_schemaComponent.AntdSchemaComponentProvider);
     this.use(_acl.ACLProvider);
     this.use(_documentTitle.RemoteDocumentTitleProvider);
-    this.use(_workflow.WorkflowRouteProvider);
 
     var _iterator = _createForOfIteratorHelper(options.plugins),
         _step;

package/lib/block-provider/BlockSchemaComponentProvider.js

@@ -29,6 +29,8 @@ var _TableFieldProvider = require("./TableFieldProvider");
 
 var _TableSelectorProvider = require("./TableSelectorProvider");
 
+var _FormFieldProvider = require("./FormFieldProvider");
+
 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; }
@@ -49,6 +51,7 @@ var BlockSchemaComponentProvider = function BlockSchemaComponentProvider(props)
       TableBlockProvider: _TableBlockProvider.TableBlockProvider,
       TableSelectorProvider: _TableSelectorProvider.TableSelectorProvider,
       FormBlockProvider: _FormBlockProvider.FormBlockProvider,
+      FormFieldProvider: _FormFieldProvider.FormFieldProvider,
       DetailsBlockProvider: _DetailsBlockProvider.DetailsBlockProvider,
       KanbanBlockProvider: _KanbanBlockProvider.KanbanBlockProvider,
       RecordLink: _BlockProvider.RecordLink
@@ -59,6 +62,7 @@ var BlockSchemaComponentProvider = function BlockSchemaComponentProvider(props)
       useParamsFromRecord: _BlockProvider.useParamsFromRecord,
       useCalendarBlockProps: _CalendarBlockProvider.useCalendarBlockProps,
       useFormBlockProps: _FormBlockProvider.useFormBlockProps,
+      useFormFieldProps: _FormFieldProvider.useFormFieldProps,
       useDetailsBlockProps: _DetailsBlockProvider.useDetailsBlockProps,
       useTableFieldProps: _TableFieldProvider.useTableFieldProps,
       useTableBlockProps: _TableBlockProvider.useTableBlockProps,