npm - @nocobase/client - Versions diffs - 0.9.4-alpha.2 → 0.10.0-alpha.2 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (1323) hide show

package/es/schema-initializer/utils.js CHANGED Viewed

@@ -1,7 +1,7 @@
 var _excluded = ["formItemInitializers", "actionInitializers", "collection", "association", "resource", "template"],
   _excluded2 = ["formItemInitializers", "actionInitializers", "itemActionInitializers", "collection", "association", "resource", "template"],
   _excluded3 = ["formItemInitializers", "actionInitializers", "itemActionInitializers", "collection", "association", "resource", "template"],
-  _excluded4 = ["formItemInitializers", "actionInitializers", "collection", "resource", "association", "action", "template"],
+  _excluded4 = ["formItemInitializers", "actionInitializers", "collection", "resource", "association", "action", "actions", "x-designer", "template", "title"],
   _excluded5 = ["formItemInitializers", "actionInitializers", "collection", "resource", "association", "action", "template"],
   _excluded6 = ["formItemInitializers", "actionInitializers", "collection", "association", "resource", "template"],
   _excluded7 = ["collection", "resource", "rowKey", "tableActionInitializers", "tableColumnInitializers", "tableActionColumnInitializers", "tableBlockProvider", "disableTemplate", "TableBlockDesigner", "blockType", "pageSize"],
@@ -93,6 +93,7 @@ export var findTableColumn = function findTableColumn(schema, key, action) {
     return buf;
   });
 };
+var quickEditField = ['attachment', 'textarea', 'markdown', 'json', 'richText', 'polygon', 'circle', 'point', 'lineString'];
 export var useTableColumnInitializerFields = function useTableColumnInitializerFields() {
   var _useCollection = useCollection(),
     name = _useCollection.name,
@@ -101,22 +102,38 @@ export var useTableColumnInitializerFields = function useTableColumnInitializerF
   var _useCollectionManager = useCollectionManager(),
     getInterface = _useCollectionManager.getInterface,
     getCollection = _useCollectionManager.getCollection;
+  var fieldSchema = useFieldSchema();
+  var isSubTable = fieldSchema['x-component'] === 'AssociationField.SubTable';
+  var form = useForm();
+  var isReadPretty = isSubTable ? form.readPretty : true;
   return currentFields.filter(function (field) {
     return (field === null || field === void 0 ? void 0 : field.interface) && (field === null || field === void 0 ? void 0 : field.interface) !== 'subTable' && !(field === null || field === void 0 ? void 0 : field.isForeignKey) && !(field === null || field === void 0 ? void 0 : field.treeChildren);
   }).map(function (field) {
-    var _field$uiSchema;
+    var _getCollection, _field$uiSchema, _field$uiSchema2;
     var interfaceConfig = getInterface(field.interface);
+    var isFileCollection = (field === null || field === void 0 ? void 0 : field.target) && ((_getCollection = getCollection(field === null || field === void 0 ? void 0 : field.target)) === null || _getCollection === void 0 ? void 0 : _getCollection.template) === 'file';
     var schema = {
       name: field.name,
       'x-collection-field': "".concat(name, ".").concat(field.name),
       'x-component': 'CollectionField',
-      'x-read-pretty': true,
-      'x-component-props': {}
+      'x-component-props': isFileCollection ? {
+        fieldNames: {
+          label: 'preview',
+          value: 'id'
+        }
+      } : {},
+      'x-read-pretty': isReadPretty || ((_field$uiSchema = field.uiSchema) === null || _field$uiSchema === void 0 ? void 0 : _field$uiSchema['x-read-pretty']),
+      'x-decorator': isSubTable ? quickEditField.includes(field.interface) || isFileCollection ? 'QuickEdit' : 'FormItem' : null,
+      'x-decorator-props': {
+        labelStyle: {
+          display: 'none'
+        }
+      }
     };
     // interfaceConfig?.schemaInitialize?.(schema, { field, readPretty: true, block: 'Table' });
     return {
       type: 'item',
-      title: (field === null || field === void 0 ? void 0 : (_field$uiSchema = field.uiSchema) === null || _field$uiSchema === void 0 ? void 0 : _field$uiSchema.title) || field.name,
+      title: (field === null || field === void 0 ? void 0 : (_field$uiSchema2 = field.uiSchema) === null || _field$uiSchema2 === void 0 ? void 0 : _field$uiSchema2.title) || field.name,
       component: 'TableCollectionFieldInitializer',
       find: findTableColumn,
       remove: removeTableColumn,
@@ -124,7 +141,7 @@ export var useTableColumnInitializerFields = function useTableColumnInitializerF
         var _interfaceConfig$sche;
         interfaceConfig === null || interfaceConfig === void 0 ? void 0 : (_interfaceConfig$sche = interfaceConfig.schemaInitialize) === null || _interfaceConfig$sche === void 0 ? void 0 : _interfaceConfig$sche.call(interfaceConfig, s, {
           field: field,
-          readPretty: true,
+          readPretty: isReadPretty,
           block: 'Table',
           targetCollection: getCollection(field.target)
         });
@@ -146,7 +163,7 @@ export var useAssociatedTableColumnInitializerFields = function useAssociatedTab
   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$filter, _field$uiSchema3;
     var subFields = getCollectionFields(field.target);
     var items = subFields
     // ?.filter((subField) => subField?.interface && !['o2o', 'oho', 'obo', 'o2m', 'm2o', 'subTable', 'linkTo'].includes(subField?.interface))
@@ -189,7 +206,7 @@ export var useAssociatedTableColumnInitializerFields = function useAssociatedTab
     });
     return {
       type: 'subMenu',
-      title: (_field$uiSchema2 = field.uiSchema) === null || _field$uiSchema2 === void 0 ? void 0 : _field$uiSchema2.title,
+      title: (_field$uiSchema3 = field.uiSchema) === null || _field$uiSchema3 === void 0 ? void 0 : _field$uiSchema3.title,
       children: items
     };
   });
@@ -262,7 +279,7 @@ export var useFormItemInitializerFields = function useFormItemInitializerFields(
   return currentFields === null || currentFields === void 0 ? void 0 : (_currentFields$filter = currentFields.filter(function (field) {
     return (field === null || field === void 0 ? void 0 : field.interface) && !(field === null || field === void 0 ? void 0 : field.isForeignKey) && !(field === null || field === void 0 ? void 0 : field.treeChildren);
   })) === null || _currentFields$filter === void 0 ? void 0 : _currentFields$filter.map(function (field) {
-    var _field$uiSchema3, _field$uiSchema4;
+    var _field$uiSchema4, _field$uiSchema5;
     var interfaceConfig = getInterface(field.interface);
     var targetCollection = getCollection(field.target);
     // const component =
@@ -277,12 +294,12 @@ export var useFormItemInitializerFields = function useFormItemInitializerFields(
       'x-decorator': 'FormItem',
       'x-collection-field': "".concat(name, ".").concat(field.name),
       'x-component-props': {},
-      'x-read-pretty': field === null || field === void 0 ? void 0 : (_field$uiSchema3 = field.uiSchema) === null || _field$uiSchema3 === void 0 ? void 0 : _field$uiSchema3['x-read-pretty']
+      'x-read-pretty': field === null || field === void 0 ? void 0 : (_field$uiSchema4 = field.uiSchema) === null || _field$uiSchema4 === void 0 ? void 0 : _field$uiSchema4['x-read-pretty']
     };
     // interfaceConfig?.schemaInitialize?.(schema, { field, block: 'Form', readPretty: form.readPretty });
     var resultItem = {
       type: 'item',
-      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$uiSchema5 = field.uiSchema) === null || _field$uiSchema5 === void 0 ? void 0 : _field$uiSchema5.title) || field.name,
       component: 'CollectionFieldInitializer',
       remove: removeGridFormItem,
       schemaInitialize: function schemaInitialize(s) {
@@ -329,7 +346,7 @@ export var useFilterFormItemInitializerFields = function useFilterFormItemInitia
     var _getInterface;
     return (field === null || field === void 0 ? void 0 : field.interface) && !(field === null || field === void 0 ? void 0 : field.isForeignKey) && ((_getInterface = getInterface(field.interface)) === null || _getInterface === void 0 ? void 0 : _getInterface.filterable);
   })) === null || _currentFields$filter2 === void 0 ? void 0 : _currentFields$filter2.map(function (field) {
-    var _field$uiSchema6;
+    var _field$uiSchema7;
     var interfaceConfig = getInterface(field.interface);
     var targetCollection = getCollection(field.target);
     // const component =
@@ -347,7 +364,7 @@ export var useFilterFormItemInitializerFields = function useFilterFormItemInitia
       'x-component-props': {}
     };
     if (isAssocField(field)) {
-      var _field$uiSchema5;
+      var _field$uiSchema6;
       schema = {
         type: 'string',
         name: "".concat(field.name),
@@ -356,12 +373,12 @@ export var useFilterFormItemInitializerFields = function useFilterFormItemInitia
         'x-component': 'CollectionField',
         'x-decorator': 'FormItem',
         'x-collection-field': "".concat(name, ".").concat(field.name),
-        'x-component-props': (_field$uiSchema5 = field.uiSchema) === null || _field$uiSchema5 === void 0 ? void 0 : _field$uiSchema5['x-component-props']
+        'x-component-props': (_field$uiSchema6 = field.uiSchema) === null || _field$uiSchema6 === void 0 ? void 0 : _field$uiSchema6['x-component-props']
       };
     }
     var resultItem = {
       type: 'item',
-      title: (field === null || field === void 0 ? void 0 : (_field$uiSchema6 = field.uiSchema) === null || _field$uiSchema6 === void 0 ? void 0 : _field$uiSchema6.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: removeGridFormItem,
       schemaInitialize: function schemaInitialize(s) {
@@ -398,7 +415,7 @@ export var useAssociatedFormItemInitializerFields = function useAssociatedFormIt
   var groups = fields === null || fields === void 0 ? void 0 : (_fields$filter2 = fields.filter(function (field) {
     return interfaces.includes(field.interface);
   })) === null || _fields$filter2 === void 0 ? void 0 : _fields$filter2.map(function (field) {
-    var _subFields$filter2, _field$uiSchema7;
+    var _subFields$filter2, _field$uiSchema8;
     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) && !subField.treeChildren;
@@ -436,21 +453,21 @@ export var useAssociatedFormItemInitializerFields = function useAssociatedFormIt
     });
     return {
       type: 'subMenu',
-      title: (_field$uiSchema7 = field.uiSchema) === null || _field$uiSchema7 === void 0 ? void 0 : _field$uiSchema7.title,
+      title: (_field$uiSchema8 = field.uiSchema) === null || _field$uiSchema8 === void 0 ? void 0 : _field$uiSchema8.title,
       children: items
     };
   });
   return groups;
 };
 var getItem = function getItem(field, schemaName, collectionName, getCollectionFields, processedCollections) {
-  var _field$uiSchema9;
+  var _field$uiSchema10;
   if (field.interface === 'm2o') {
-    var _field$uiSchema8;
+    var _field$uiSchema9;
     if (processedCollections.includes(field.target)) return null;
     var subFields = getCollectionFields(field.target);
     return {
       type: 'subMenu',
-      title: (_field$uiSchema8 = field.uiSchema) === null || _field$uiSchema8 === void 0 ? void 0 : _field$uiSchema8.title,
+      title: (_field$uiSchema9 = field.uiSchema) === null || _field$uiSchema9 === void 0 ? void 0 : _field$uiSchema9.title,
       children: subFields.map(function (subField) {
         return (
           // 使用 | 分隔，是为了防止 form.values 中出现 { a: { b: 1 } } 的情况
@@ -477,7 +494,7 @@ var getItem = function getItem(field, schemaName, collectionName, getCollectionF
   };
   return {
     type: 'item',
-    title: ((_field$uiSchema9 = field.uiSchema) === null || _field$uiSchema9 === void 0 ? void 0 : _field$uiSchema9.title) || field.name,
+    title: ((_field$uiSchema10 = field.uiSchema) === null || _field$uiSchema10 === void 0 ? void 0 : _field$uiSchema10.title) || field.name,
     component: 'CollectionFieldInitializer',
     remove: removeGridFormItem,
     schema: schema
@@ -525,7 +542,7 @@ export var useInheritsFormItemInitializerFields = function useInheritsFormItemIn
     return _defineProperty({}, targetCollection === null || targetCollection === void 0 ? void 0 : targetCollection.title, fields === null || fields === void 0 ? void 0 : (_fields$filter4 = fields.filter(function (field) {
       return (field === null || field === void 0 ? void 0 : field.interface) && !(field === null || field === void 0 ? void 0 : field.isForeignKey);
     })) === null || _fields$filter4 === void 0 ? void 0 : _fields$filter4.map(function (field) {
-      var _field$uiSchema10, _field$uiSchema11, _field$uiSchema12;
+      var _field$uiSchema11, _field$uiSchema12, _field$uiSchema13;
       var interfaceConfig = getInterface(field.interface);
       var targetCollection = getCollection(field.target);
       // const component =
@@ -535,17 +552,17 @@ export var useInheritsFormItemInitializerFields = function useInheritsFormItemIn
       var schema = {
         type: 'string',
         name: field.name,
-        title: (field === null || field === void 0 ? void 0 : (_field$uiSchema10 = field.uiSchema) === null || _field$uiSchema10 === void 0 ? void 0 : _field$uiSchema10.title) || field.name,
+        title: (field === null || field === void 0 ? void 0 : (_field$uiSchema11 = field.uiSchema) === null || _field$uiSchema11 === void 0 ? void 0 : _field$uiSchema11.title) || field.name,
         'x-designer': 'FormItem.Designer',
         'x-component': component,
         'x-decorator': 'FormItem',
         'x-collection-field': "".concat(name, ".").concat(field.name),
         'x-component-props': {},
-        'x-read-pretty': field === null || field === void 0 ? void 0 : (_field$uiSchema11 = field.uiSchema) === null || _field$uiSchema11 === void 0 ? void 0 : _field$uiSchema11['x-read-pretty']
+        'x-read-pretty': field === null || field === void 0 ? void 0 : (_field$uiSchema12 = field.uiSchema) === null || _field$uiSchema12 === void 0 ? void 0 : _field$uiSchema12['x-read-pretty']
       };
       return {
         type: 'item',
-        title: (field === null || field === void 0 ? void 0 : (_field$uiSchema12 = field.uiSchema) === null || _field$uiSchema12 === void 0 ? void 0 : _field$uiSchema12.title) || field.name,
+        title: (field === null || field === void 0 ? void 0 : (_field$uiSchema13 = field.uiSchema) === null || _field$uiSchema13 === void 0 ? void 0 : _field$uiSchema13.title) || field.name,
         component: 'CollectionFieldInitializer',
         remove: removeGridFormItem,
         schemaInitialize: function schemaInitialize(s) {
@@ -588,7 +605,7 @@ export var useFilterInheritsFormItemInitializerFields = function useFilterInheri
       var _getInterface2;
       return (field === null || field === void 0 ? void 0 : field.interface) && !(field === null || field === void 0 ? void 0 : field.isForeignKey) && ((_getInterface2 = getInterface(field.interface)) === null || _getInterface2 === void 0 ? void 0 : _getInterface2.filterable);
     })) === null || _fields$filter5 === void 0 ? void 0 : _fields$filter5.map(function (field) {
-      var _field$uiSchema13, _field$uiSchema14, _field$uiSchema15;
+      var _field$uiSchema14, _field$uiSchema15, _field$uiSchema16;
       var interfaceConfig = getInterface(field.interface);
       var targetCollection = getCollection(field.target);
       // const component =
@@ -598,18 +615,18 @@ export var useFilterInheritsFormItemInitializerFields = function useFilterInheri
       var schema = {
         type: 'string',
         name: field.name,
-        title: (field === null || field === void 0 ? void 0 : (_field$uiSchema13 = field.uiSchema) === null || _field$uiSchema13 === void 0 ? void 0 : _field$uiSchema13.title) || field.name,
+        title: (field === null || field === void 0 ? void 0 : (_field$uiSchema14 = field.uiSchema) === null || _field$uiSchema14 === void 0 ? void 0 : _field$uiSchema14.title) || field.name,
         required: false,
         'x-designer': 'FormItem.FilterFormDesigner',
         'x-component': 'CollectionField',
         'x-decorator': 'FormItem',
         'x-collection-field': "".concat(name, ".").concat(field.name),
         'x-component-props': {},
-        'x-read-pretty': field === null || field === void 0 ? void 0 : (_field$uiSchema14 = field.uiSchema) === null || _field$uiSchema14 === void 0 ? void 0 : _field$uiSchema14['x-read-pretty']
+        'x-read-pretty': field === null || field === void 0 ? void 0 : (_field$uiSchema15 = field.uiSchema) === null || _field$uiSchema15 === void 0 ? void 0 : _field$uiSchema15['x-read-pretty']
       };
       return {
         type: 'item',
-        title: (field === null || field === void 0 ? void 0 : (_field$uiSchema15 = field.uiSchema) === null || _field$uiSchema15 === void 0 ? void 0 : _field$uiSchema15.title) || field.name,
+        title: (field === null || field === void 0 ? void 0 : (_field$uiSchema16 = field.uiSchema) === null || _field$uiSchema16 === void 0 ? void 0 : _field$uiSchema16.title) || field.name,
         component: 'CollectionFieldInitializer',
         remove: removeGridFormItem,
         schemaInitialize: function schemaInitialize(s) {
@@ -642,15 +659,15 @@ export var useCustomFormItemInitializerFields = function useCustomFormItemInitia
     block = _ref9$block === void 0 ? 'Form' : _ref9$block;
   var remove = useRemoveGridFormItem();
   return currentFields === null || currentFields === void 0 ? void 0 : (_currentFields$filter3 = currentFields.filter(function (field) {
-    var _field$uiSchema16;
-    return (field === null || field === void 0 ? void 0 : field.interface) && !(field === null || field === void 0 ? void 0 : (_field$uiSchema16 = field.uiSchema) === null || _field$uiSchema16 === void 0 ? void 0 : _field$uiSchema16['x-read-pretty']) && field.interface !== 'snapshot' && field.type !== 'sequence';
+    var _field$uiSchema17;
+    return (field === null || field === void 0 ? void 0 : field.interface) && !(field === null || field === void 0 ? void 0 : (_field$uiSchema17 = field.uiSchema) === null || _field$uiSchema17 === void 0 ? void 0 : _field$uiSchema17['x-read-pretty']) && field.interface !== 'snapshot' && field.type !== 'sequence';
   })) === null || _currentFields$filter3 === void 0 ? void 0 : _currentFields$filter3.map(function (field) {
-    var _field$uiSchema17, _field$uiSchema18;
+    var _field$uiSchema18, _field$uiSchema19;
     var interfaceConfig = getInterface(field.interface);
     var schema = {
       type: 'string',
       name: field.name,
-      title: (field === null || field === void 0 ? void 0 : (_field$uiSchema17 = field.uiSchema) === null || _field$uiSchema17 === void 0 ? void 0 : _field$uiSchema17.title) || field.name,
+      title: (field === null || field === void 0 ? void 0 : (_field$uiSchema18 = field.uiSchema) === null || _field$uiSchema18 === void 0 ? void 0 : _field$uiSchema18.title) || field.name,
       'x-designer': 'FormItem.Designer',
       'x-component': 'AssignedField',
       'x-decorator': 'FormItem',
@@ -658,7 +675,7 @@ export var useCustomFormItemInitializerFields = function useCustomFormItemInitia
     };
     return {
       type: 'item',
-      title: (field === null || field === void 0 ? void 0 : (_field$uiSchema18 = field.uiSchema) === null || _field$uiSchema18 === void 0 ? void 0 : _field$uiSchema18.title) || field.name,
+      title: (field === null || field === void 0 ? void 0 : (_field$uiSchema19 = field.uiSchema) === null || _field$uiSchema19 === void 0 ? void 0 : _field$uiSchema19.title) || field.name,
       component: 'CollectionFieldInitializer',
       remove: remove,
       schemaInitialize: function schemaInitialize(s) {
@@ -690,15 +707,15 @@ export var useCustomBulkEditFormItemInitializerFields = function useCustomBulkEd
   var remove = useRemoveGridFormItem();
   var filterFields = useMemo(function () {
     return fields === null || fields === void 0 ? void 0 : fields.filter(function (field) {
-      var _field$uiSchema19;
-      return (field === null || field === void 0 ? void 0 : field.interface) && !(field === null || field === void 0 ? void 0 : (_field$uiSchema19 = field.uiSchema) === null || _field$uiSchema19 === void 0 ? void 0 : _field$uiSchema19['x-read-pretty']) && field.interface !== 'snapshot' && field.type !== 'sequence';
+      var _field$uiSchema20;
+      return (field === null || field === void 0 ? void 0 : field.interface) && !(field === null || field === void 0 ? void 0 : (_field$uiSchema20 = field.uiSchema) === null || _field$uiSchema20 === void 0 ? void 0 : _field$uiSchema20['x-read-pretty']) && field.interface !== 'snapshot' && field.type !== 'sequence';
     }).map(function (field) {
-      var _field$uiSchema20, _field$uiSchema21;
+      var _field$uiSchema21, _field$uiSchema22;
       var interfaceConfig = getInterface(field.interface);
       var schema = {
         type: 'string',
         name: field.name,
-        title: (field === null || field === void 0 ? void 0 : (_field$uiSchema20 = field.uiSchema) === null || _field$uiSchema20 === void 0 ? void 0 : _field$uiSchema20.title) || field.name,
+        title: (field === null || field === void 0 ? void 0 : (_field$uiSchema21 = field.uiSchema) === null || _field$uiSchema21 === void 0 ? void 0 : _field$uiSchema21.title) || field.name,
         'x-designer': 'FormItem.Designer',
         'x-component': 'BulkEditField',
         'x-decorator': 'FormItem',
@@ -706,7 +723,7 @@ export var useCustomBulkEditFormItemInitializerFields = function useCustomBulkEd
       };
       return {
         type: 'item',
-        title: (field === null || field === void 0 ? void 0 : (_field$uiSchema21 = field.uiSchema) === null || _field$uiSchema21 === void 0 ? void 0 : _field$uiSchema21.title) || field.name,
+        title: (field === null || field === void 0 ? void 0 : (_field$uiSchema22 = field.uiSchema) === null || _field$uiSchema22 === void 0 ? void 0 : _field$uiSchema22.title) || field.name,
         component: 'CollectionFieldInitializer',
         remove: remove,
         schemaInitialize: function schemaInitialize(s) {
@@ -999,7 +1016,6 @@ export var createDetailsBlockSchema = function createDetailsBlockSchema(options)
       }), _properties3)
     })
   };
-  console.log(JSON.stringify(schema, null, 2));
   return schema;
 };
 export var createListBlockSchema = function createListBlockSchema(options) {
@@ -1116,6 +1132,9 @@ export var createGridCardBlockSchema = function createGridCardBlockSchema(option
       runWhenParamsChanged: true
     }, others),
     'x-component': 'BlockItem',
+    'x-component-props': {
+      useProps: '{{ useGridCardBlockItemProps }}'
+    },
     'x-designer': 'GridCard.Designer',
     properties: {
       actionBar: {
@@ -1133,7 +1152,7 @@ export var createGridCardBlockSchema = function createGridCardBlockSchema(option
         type: 'array',
         'x-component': 'GridCard',
         'x-component-props': {
-          props: '{{ useGridCardBlockProps }}'
+          useProps: '{{ useGridCardBlockProps }}'
         },
         properties: {
           item: {
@@ -1181,7 +1200,12 @@ export var createFormBlockSchema = function createFormBlockSchema(options) {
     resource = options.resource,
     association = options.association,
     action = options.action,
+    _options$actions = options.actions,
+    actions = _options$actions === void 0 ? {} : _options$actions,
+    _options$xDesigner = options['x-designer'],
+    designer = _options$xDesigner === void 0 ? 'FormV2.Designer' : _options$xDesigner,
     template = options.template,
+    title = options.title,
     others = _objectWithoutProperties(options, _excluded4);
   var resourceName = resource || association || collection;
   var schema = {
@@ -1200,8 +1224,11 @@ export var createFormBlockSchema = function createFormBlockSchema(options) {
       // useParams: '{{ useParamsFromRecord }}',
     }),
-    'x-designer': 'FormV2.Designer',
+    'x-designer': designer,
     'x-component': 'CardItem',
+    'x-component-props': {
+      title: title
+    },
     properties: _defineProperty({}, uid(), {
       type: 'void',
       'x-component': 'FormV2',
@@ -1225,7 +1252,7 @@ export var createFormBlockSchema = function createFormBlockSchema(options) {
               marginTop: 24
             }
           },
-          properties: {}
+          properties: actions
         }
       }
     })

package/es/schema-items/GeneralSchemaItems.js CHANGED Viewed

@@ -11,7 +11,7 @@ import { useCollection, useCollectionManager } from '../collection-manager';
 import { useDesignable } from '../schema-component';
 import { SchemaSettings } from '../schema-settings';
 export var GeneralSchemaItems = observer(function (props) {
-  var _collectionField$uiSc, _field$decoratorProps, _fieldSchema$xDecora;
+  var _collectionField$uiSc, _fieldSchema$xDecora, _fieldSchema$xDecora2, _fieldSchema$xDecora3;
   var _props$required = props.required,
     required = _props$required === void 0 ? true : _props$required;
   var _useCollectionManager = useCollectionManager(),
@@ -58,7 +58,7 @@ export var GeneralSchemaItems = observer(function (props) {
       dn.refresh();
     }
   }), /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
-    checked: (_field$decoratorProps = field.decoratorProps.showTitle) !== null && _field$decoratorProps !== void 0 ? _field$decoratorProps : true,
+    checked: (_fieldSchema$xDecora = (_fieldSchema$xDecora2 = fieldSchema['x-decorator-props']) === null || _fieldSchema$xDecora2 === void 0 ? void 0 : _fieldSchema$xDecora2['showTitle']) !== null && _fieldSchema$xDecora !== void 0 ? _fieldSchema$xDecora : true,
     title: t('Display title'),
     onChange: function onChange(checked) {
       fieldSchema['x-decorator-props'] = fieldSchema['x-decorator-props'] || {};
@@ -110,7 +110,7 @@ export var GeneralSchemaItems = observer(function (props) {
       title: t('Edit description'),
       properties: {
         tooltip: {
-          default: fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xDecora = fieldSchema['x-decorator-props']) === null || _fieldSchema$xDecora === void 0 ? void 0 : _fieldSchema$xDecora.tooltip,
+          default: fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xDecora3 = fieldSchema['x-decorator-props']) === null || _fieldSchema$xDecora3 === void 0 ? void 0 : _fieldSchema$xDecora3.tooltip,
           'x-decorator': 'FormItem',
           'x-component': 'Input.TextArea',
           'x-component-props': {}
@@ -145,4 +145,6 @@ export var GeneralSchemaItems = observer(function (props) {
       refresh();
     }
   }));
+}, {
+  displayName: 'GeneralSchemaItems'
 });

package/es/schema-items/OpenModeSchemaItems.js CHANGED Viewed

@@ -29,14 +29,16 @@ export var OpenModeSchemaItems = function OpenModeSchemaItems(options) {
     value: openModeValue,
     onChange: function onChange(value) {
       field.componentProps.openMode = value;
-      fieldSchema['x-component-props'] = field.componentProps;
+      var schema = {
+        'x-uid': fieldSchema['x-uid']
+      };
+      schema['x-component-props'] = fieldSchema['x-component-props'] || {};
+      schema['x-component-props'].openMode = value;
+      fieldSchema['x-component-props'].openMode = value;
       // when openMode change, set openSize value to default
       Reflect.deleteProperty(fieldSchema['x-component-props'], 'openSize');
       dn.emit('patch', {
-        schema: {
-          'x-uid': fieldSchema['x-uid'],
-          'x-component-props': fieldSchema['x-component-props']
-        }
+        schema: schema
       });
       dn.refresh();
     }
@@ -61,12 +63,14 @@ export var OpenModeSchemaItems = function OpenModeSchemaItems(options) {
     value: (_fieldSchema$xCompon2 = fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon3 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon3 === void 0 ? void 0 : _fieldSchema$xCompon3['openSize']) !== null && _fieldSchema$xCompon2 !== void 0 ? _fieldSchema$xCompon2 : (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon4 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon4 === void 0 ? void 0 : _fieldSchema$xCompon4['openMode']) == 'modal' ? 'large' : 'middle',
     onChange: function onChange(value) {
       field.componentProps.openSize = value;
-      fieldSchema['x-component-props'] = field.componentProps;
+      var schema = {
+        'x-uid': fieldSchema['x-uid']
+      };
+      schema['x-component-props'] = fieldSchema['x-component-props'] || {};
+      schema['x-component-props'].openSize = value;
+      fieldSchema['x-component-props'].openSize = value;
       dn.emit('patch', {
-        schema: {
-          'x-uid': fieldSchema['x-uid'],
-          'x-component-props': fieldSchema['x-component-props']
-        }
+        schema: schema
       });
       dn.refresh();
     },

package/es/schema-settings/DataTemplates/FormDataTemplates.d.ts CHANGED Viewed

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

package/es/schema-settings/DataTemplates/FormDataTemplates.js CHANGED Viewed

@@ -20,9 +20,7 @@ import { useCollectionState } from './hooks/useCollectionState';
 var Tree = connect(AntdTree, mapProps({
   value: 'checkedKeys',
   dataSource: 'treeData'
-  // onInput: 'onCheck',
 }));
 export var FormDataTemplates = observer(function (props) {
   var useProps = props.useProps,
     formSchema = props.formSchema,
@@ -33,8 +31,8 @@ export var FormDataTemplates = observer(function (props) {
   var _useCollectionState = useCollectionState(collectionName),
     collectionList = _useCollectionState.collectionList,
     getEnableFieldTree = _useCollectionState.getEnableFieldTree,
-    onLoadData = _useCollectionState.onLoadData,
-    onCheck = _useCollectionState.onCheck;
+    getOnLoadData = _useCollectionState.getOnLoadData,
+    getOnCheck = _useCollectionState.getOnCheck;
   var _useCollectionManager = useCollectionManager(),
     getCollection = _useCollectionManager.getCollection,
     getCollectionField = _useCollectionManager.getCollectionField;
@@ -81,6 +79,8 @@ export var FormDataTemplates = observer(function (props) {
       getFieldNames: getFieldNames,
       getFilter: getFilter,
       getResource: getResource,
+      getOnLoadData: getOnLoadData,
+      getOnCheck: getOnCheck,
       collectionName: collectionName
     };
   }, []);
@@ -178,8 +178,8 @@ export var FormDataTemplates = observer(function (props) {
                       checkable: true,
                       checkStrictly: true,
                       selectable: false,
-                      loadData: onLoadData,
-                      onCheck: onCheck,
+                      loadData: '{{ getOnLoadData($self) }}',
+                      onCheck: '{{ getOnCheck($self) }}',
                       rootStyle: {
                         padding: '8px 0',
                         border: '1px solid #d9d9d9',
@@ -244,6 +244,8 @@ export var FormDataTemplates = observer(function (props) {
     scope: scope,
     schema: schema
   }));
+}, {
+  displayName: 'FormDataTemplates'
 });
 export function getLabel(titleField) {
   return titleField || 'label';

package/es/schema-settings/DataTemplates/TreeLabel.d.ts CHANGED Viewed

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

package/es/schema-settings/DataTemplates/components/DataTemplateTitle.js CHANGED Viewed

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

package/es/schema-settings/DataTemplates/components/Designer.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import React from 'react';
-export declare const Designer: React.MemoExoticComponent<React.FunctionComponent<unknown>>;
+export declare const Designer: React.MemoExoticComponent<import("@formily/react").ReactFC<unknown>>;
 export declare function getSelectedIdFilter(selectedId: any): {
     id: {
         $eq: any;

package/es/schema-settings/DataTemplates/components/Designer.js CHANGED Viewed

@@ -146,6 +146,8 @@ export var Designer = observer(function () {
       dn.refresh();
     }
   }));
+}, {
+  displayName: 'Designer'
 });
 export function getSelectedIdFilter(selectedId) {
   return selectedId ? {

package/es/schema-settings/DataTemplates/hooks/useCollectionState.d.ts CHANGED Viewed

@@ -5,7 +5,7 @@ export declare const useCollectionState: (currentCollectionName: string) => {
         label: any;
         value: string;
     }[];
-    getEnableFieldTree: (collectionName: string, fields: ArrayField) => {
+    getEnableFieldTree: (collectionName: string) => {
         title: React.FunctionComponentElement<any>;
         key: any;
         isLeaf: boolean;
@@ -13,6 +13,6 @@ export declare const useCollectionState: (currentCollectionName: string) => {
         type: string;
         tag: any;
     }[];
-    onLoadData: (node: any) => Promise<unknown>;
-    onCheck: (checkedKeys: any, { node, checked }: any) => void;
+    getOnLoadData: (fields: ArrayField) => (node: any) => Promise<unknown>;
+    getOnCheck: (fields: ArrayField) => (checkedKeys: any) => void;
 };