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

package/es/collection-manager/Configuration/ConfigurationTabs.js

@@ -17,7 +17,8 @@ import { MenuOutlined } from '@ant-design/icons';
 import { DndContext, DragOverlay, MouseSensor, useDraggable, useDroppable, useSensor, useSensors } from '@dnd-kit/core';
 import { RecursionField, observer } from '@formily/react';
 import { uid } from '@formily/shared';
-import { Badge, Card, Dropdown, Menu, Modal, Tabs } from 'antd';
+import { Badge, Card, Dropdown, Modal, Tabs } from 'antd';
+import _ from 'lodash';
 import React, { useContext, useState } from 'react';
 import { useAPIClient } from '../../api-client';
 import { SchemaComponent, SchemaComponentOptions, useCompile } from '../../schema-component';
@@ -262,26 +263,30 @@ export var ConfigurationTabs = function ConfigurationTabs() {
       return _ref4.apply(this, arguments);
     };
   }();
-  var menu = function menu(item) {
-    return /*#__PURE__*/React.createElement(Menu, null, /*#__PURE__*/React.createElement(Menu.Item, {
-      key: 'edit'
-    }, /*#__PURE__*/React.createElement(SchemaComponent, {
-      schema: {
-        type: 'void',
-        properties: _defineProperty({}, uid(), {
-          'x-component': 'EditCategory',
-          'x-component-props': {
-            item: item
+  var menu = _.memoize(function (item) {
+    return {
+      items: [{
+        key: 'edit',
+        label: /*#__PURE__*/React.createElement(SchemaComponent, {
+          schema: {
+            type: 'void',
+            properties: _defineProperty({}, uid(), {
+              'x-component': 'EditCategory',
+              'x-component-props': {
+                item: item
+              }
+            })
           }
         })
-      }
-    })), /*#__PURE__*/React.createElement(Menu.Item, {
-      key: "delete",
-      onClick: function onClick() {
-        return remove(item.id);
-      }
-    }, compile("{{t('Delete category')}}")));
-  };
+      }, {
+        key: 'delete',
+        label: compile("{{t('Delete category')}}"),
+        onClick: function onClick() {
+          return remove(item.id);
+        }
+      }]
+    };
+  });
   return /*#__PURE__*/React.createElement(DndProvider, null, /*#__PURE__*/React.createElement(Tabs, {
     addIcon: /*#__PURE__*/React.createElement(SchemaComponent, {
       schema: {
@@ -304,35 +309,37 @@ export var ConfigurationTabs = function ConfigurationTabs() {
     destroyInactiveTabPane: true,
     tabBarStyle: {
       marginBottom: '0px'
-    }
-  }, tabsItems.map(function (item) {
-    return /*#__PURE__*/React.createElement(Tabs.TabPane, {
-      tab: item.id !== 'all' ? /*#__PURE__*/React.createElement("div", {
-        "data-no-dnd": "true"
-      }, /*#__PURE__*/React.createElement(TabTitle, {
-        item: item
-      })) : compile(item.name),
-      key: item.id,
-      closable: item.closable,
-      closeIcon: /*#__PURE__*/React.createElement(Dropdown, {
-        overlay: menu(item)
-      }, /*#__PURE__*/React.createElement(MenuOutlined, null))
-    }, /*#__PURE__*/React.createElement(Card, {
-      bordered: false
-    }, /*#__PURE__*/React.createElement(SchemaComponentOptions, {
-      components: {
-        CollectionFields: CollectionFields
-      },
-      inherit: true,
-      scope: {
-        loadCategories: loadCategories,
-        categoryVisible: item.id === 'all',
-        categoryId: item.id
-      }
-    }, /*#__PURE__*/React.createElement(RecursionField, {
-      name: key,
-      schema: item.schema,
-      onlyRenderProperties: true
-    }))));
-  })));
+    },
+    items: tabsItems.map(function (item) {
+      return {
+        label: item.id !== 'all' ? /*#__PURE__*/React.createElement("div", {
+          "data-no-dnd": "true"
+        }, /*#__PURE__*/React.createElement(TabTitle, {
+          item: item
+        })) : compile(item.name),
+        key: item.id,
+        closable: item.closable,
+        closeIcon: /*#__PURE__*/React.createElement(Dropdown, {
+          menu: menu(item)
+        }, /*#__PURE__*/React.createElement(MenuOutlined, null)),
+        children: /*#__PURE__*/React.createElement(Card, {
+          bordered: false
+        }, /*#__PURE__*/React.createElement(SchemaComponentOptions, {
+          components: {
+            CollectionFields: CollectionFields
+          },
+          inherit: true,
+          scope: {
+            loadCategories: loadCategories,
+            categoryVisible: item.id === 'all',
+            categoryId: item.id
+          }
+        }, /*#__PURE__*/React.createElement(RecursionField, {
+          name: key,
+          schema: item.schema,
+          onlyRenderProperties: true
+        })))
+      };
+    })
+  }));
 };

package/es/collection-manager/hooks/useOptions.js

@@ -5,45 +5,48 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import set from 'lodash/set';
+import { useMemo } from 'react';
 import { useCollectionManager } from './useCollectionManager';
 export var useOptions = function useOptions() {
   var _useCollectionManager = useCollectionManager(),
     interfaces = _useCollectionManager.interfaces;
-  var fields = {};
-  Object.keys(interfaces).forEach(function (type) {
-    var schema = interfaces[type];
-    registerField(schema.group || 'others', type, _objectSpread({
-      order: 0
-    }, schema));
-  });
-  function registerField(group, type, schema) {
-    fields[group] = fields[group] || {};
-    set(fields, [group, type], schema);
-  }
-  var groupLabels = {
-    basic: '{{t("Basic")}}',
-    choices: '{{t("Choices")}}',
-    media: '{{t("Media")}}',
-    datetime: '{{t("Date & Time")}}',
-    relation: '{{t("Relation")}}',
-    advanced: '{{t("Advanced type")}}',
-    systemInfo: '{{t("System info")}}',
-    others: '{{t("Others")}}'
-  };
-  return Object.keys(groupLabels).map(function (groupName) {
-    return {
-      label: groupLabels[groupName],
-      key: groupName,
-      children: Object.keys(fields[groupName] || {}).map(function (type) {
-        var field = fields[groupName][type];
-        return _objectSpread({
-          value: type,
-          label: field.title,
-          name: type
-        }, fields[groupName][type]);
-      }).sort(function (a, b) {
-        return a.order - b.order;
-      })
+  return useMemo(function () {
+    var fields = {};
+    Object.keys(interfaces).forEach(function (type) {
+      var schema = interfaces[type];
+      registerField(schema.group || 'others', type, _objectSpread({
+        order: 0
+      }, schema));
+    });
+    function registerField(group, type, schema) {
+      fields[group] = fields[group] || {};
+      set(fields, [group, type], schema);
+    }
+    var groupLabels = {
+      basic: '{{t("Basic")}}',
+      choices: '{{t("Choices")}}',
+      media: '{{t("Media")}}',
+      datetime: '{{t("Date & Time")}}',
+      relation: '{{t("Relation")}}',
+      advanced: '{{t("Advanced type")}}',
+      systemInfo: '{{t("System info")}}',
+      others: '{{t("Others")}}'
     };
-  });
+    return Object.keys(groupLabels).map(function (groupName) {
+      return {
+        label: groupLabels[groupName],
+        key: groupName,
+        children: Object.keys(fields[groupName] || {}).map(function (type) {
+          var field = fields[groupName][type];
+          return _objectSpread({
+            value: type,
+            label: field.title,
+            name: type
+          }, fields[groupName][type]);
+        }).sort(function (a, b) {
+          return a.order - b.order;
+        })
+      };
+    });
+  }, [interfaces]);
 };

package/es/collection-manager/interfaces/integer.js

@@ -27,7 +27,7 @@ export var integer = {
       'x-component': 'InputNumber',
       'x-component-props': {
         stringMode: true,
-        step: '0'
+        step: '1'
       },
       'x-validator': 'integer'
     }

package/es/collection-manager/interfaces/number.js

@@ -22,7 +22,7 @@ export var number = {
       'x-component': 'InputNumber',
       'x-component-props': {
         stringMode: true,
-        step: '0'
+        step: '1'
       }
     }
   },
@@ -35,9 +35,9 @@ export var number = {
       title: '{{t("Precision")}}',
       'x-component': 'Select',
       'x-decorator': 'FormItem',
-      default: '0',
+      default: '1',
       enum: [{
-        value: '0',
+        value: '1',
         label: '1'
       }, {
         value: '0.1',

package/es/collection-manager/interfaces/percent.js

@@ -59,7 +59,7 @@ export var percent = {
       'x-component': 'Percent',
       'x-component-props': {
         stringMode: true,
-        step: '0',
+        step: '1',
         addonAfter: '%'
       }
     }
@@ -83,9 +83,9 @@ export var percent = {
       title: '{{t("Precision")}}',
       'x-component': 'Select',
       'x-decorator': 'FormItem',
-      default: '0',
+      default: '1',
       enum: [{
-        value: '0',
+        value: '1',
         label: '1%'
       }, {
         value: '0.1',

package/es/formula/Expression.js

@@ -14,8 +14,8 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 import { css } from '@emotion/css';
 import { onFormSubmitValidateStart } from '@formily/core';
 import { useField, useFormEffects } from '@formily/react';
-import { Dropdown, Menu } from 'antd';
-import React, { useEffect, useRef, useState } from 'react';
+import { Dropdown } from 'antd';
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 function pasteHtml(html) {
   var selectPastedContent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
@@ -97,18 +97,26 @@ export var Expression = function Expression(props) {
     _useState2 = _slicedToArray(_useState, 2),
     changed = _useState2[0],
     setChanged = _useState2[1];
-  var onChange = function onChange(value) {
+  var onChange = useCallback(function (value) {
     setChanged(true);
     props.onChange(value);
-  };
-  var numColumns = new Map();
-  var scope = {};
-  fields.filter(function (field) {
-    return supports.includes(field.interface);
-  }).forEach(function (field) {
-    numColumns.set(field.name, field.uiSchema.title);
-    scope[field.name] = 1;
-  });
+  }, [props.onChange]);
+  var _useMemo = useMemo(function () {
+      var numColumns = new Map();
+      var scope = {};
+      fields.filter(function (field) {
+        return supports.includes(field.interface);
+      }).forEach(function (field) {
+        numColumns.set(field.name, field.uiSchema.title);
+        scope[field.name] = 1;
+      });
+      return {
+        numColumns: numColumns,
+        scope: scope
+      };
+    }, [fields, supports]),
+    numColumns = _useMemo.numColumns,
+    scope = _useMemo.scope;
   var keys = Array.from(numColumns.keys());
   var _useState3 = useState(function () {
       var scope = {};
@@ -135,39 +143,51 @@ export var Expression = function Expression(props) {
     var val = renderExp(value || '', scope);
     setHtml(val);
   }, [value]);
-  var menu = /*#__PURE__*/React.createElement(Menu, null, keys.length > 0 ? keys.map(function (key) {
-    return /*#__PURE__*/React.createElement(Menu.Item, {
-      disabled: true,
-      key: key
-    }, /*#__PURE__*/React.createElement("button", {
-      onClick: function () {
-        var _onClick = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(args) {
-          var val, text;
-          return _regeneratorRuntime().wrap(function _callee$(_context) {
-            while (1) switch (_context.prev = _context.next) {
-              case 0:
-                inputRef.current.focus();
-                val = numColumns.get(key);
-                pasteHtml("  <span class=\"ant-tag\" style=\"margin: 0 3px;\" contentEditable=\"false\" data-key=\"".concat(key, "\">").concat(val, "</span>  "));
-                text = getValue(inputRef.current);
-                onChange(text);
-                console.log('onChange', text);
-              case 6:
-              case "end":
-                return _context.stop();
-            }
-          }, _callee);
-        }));
-        function onClick(_x2) {
-          return _onClick.apply(this, arguments);
-        }
-        return onClick;
-      }()
-    }, numColumns.get(key)));
-  }) : /*#__PURE__*/React.createElement(Menu.Item, {
-    disabled: true,
-    key: 0
-  }, t('No available fields')));
+  var menuItems = useMemo(function () {
+    if (keys.length > 0) {
+      return keys.map(function (key) {
+        return {
+          key: key,
+          disabled: true,
+          label: /*#__PURE__*/React.createElement("button", {
+            onClick: function () {
+              var _onClick = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(args) {
+                var val, text;
+                return _regeneratorRuntime().wrap(function _callee$(_context) {
+                  while (1) switch (_context.prev = _context.next) {
+                    case 0:
+                      inputRef.current.focus();
+                      val = numColumns.get(key);
+                      pasteHtml("  <span class=\"ant-tag\" style=\"margin: 0 3px;\" contentEditable=\"false\" data-key=\"".concat(key, "\">").concat(val, "</span>  "));
+                      text = getValue(inputRef.current);
+                      onChange(text);
+                    case 5:
+                    case "end":
+                      return _context.stop();
+                  }
+                }, _callee);
+              }));
+              function onClick(_x2) {
+                return _onClick.apply(this, arguments);
+              }
+              return onClick;
+            }()
+          }, numColumns.get(key))
+        };
+      });
+    } else {
+      return [{
+        key: 0,
+        disabled: true,
+        label: t('No available fields')
+      }];
+    }
+  }, [keys, numColumns, onChange]);
+  var menu = useMemo(function () {
+    return {
+      items: menuItems
+    };
+  }, [menuItems]);
   useFormEffects(function () {
     onFormSubmitValidateStart(function () {
       try {
@@ -185,7 +205,7 @@ export var Expression = function Expression(props) {
   });
   return /*#__PURE__*/React.createElement(Dropdown, {
     trigger: ['click'],
-    overlay: menu,
+    menu: menu,
     overlayClassName: css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n        .ant-dropdown-menu-item {\n          padding: 0;\n        }\n        button {\n          cursor: pointer;\n          padding: 5px 12px;\n          text-align: left;\n          color: rgba(0, 0, 0, 0.85);\n          width: 100%;\n          line-height: inherit;\n          height: auto;\n          border: 0px;\n          background-color: transparent;\n          &:hover {\n            background-color: #f5f5f5;\n          }\n        }\n      "])))
   }, /*#__PURE__*/React.createElement("div", {
     onKeyDown: function onKeyDown(e) {

package/es/hooks/index.d.ts

@@ -1 +1,2 @@
+export * from './useAdminSchemaUid';
 export * from './useViewport';

package/es/hooks/index.js

@@ -1 +1,2 @@
+export * from './useAdminSchemaUid';
 export * from './useViewport';

package/es/hooks/useAdminSchemaUid.d.ts

@@ -0,0 +1 @@
+export declare const useAdminSchemaUid: () => any;

package/es/hooks/useAdminSchemaUid.js

@@ -0,0 +1,6 @@
+import { useSystemSettings } from '../system-settings';
+export var useAdminSchemaUid = function useAdminSchemaUid() {
+  var _ctx$data, _ctx$data$data, _ctx$data$data$option;
+  var ctx = useSystemSettings();
+  return ctx === null || ctx === void 0 ? void 0 : (_ctx$data = ctx.data) === null || _ctx$data === void 0 ? void 0 : (_ctx$data$data = _ctx$data.data) === null || _ctx$data$data === void 0 ? void 0 : (_ctx$data$data$option = _ctx$data$data.options) === null || _ctx$data$data$option === void 0 ? void 0 : _ctx$data$data$option.adminSchemaUid;
+};

package/es/hooks/useMenuItem.d.ts

@@ -0,0 +1,37 @@
+import { MenuProps } from 'antd';
+import React, { ReactNode } from 'react';
+declare type Item = MenuProps['items'][0] & {
+    /** 在清空数组时，如果该字段为 true 则保留该选项 */
+    notdelete?: boolean;
+    /** 用于给列表排序 */
+    order?: number;
+};
+export declare const GetMenuItemContext: React.Context<{
+    collectMenuItem?(item: Item): void;
+    onChange?: () => void;
+}>;
+export declare const GetMenuItemsContext: React.Context<{
+    pushMenuItem?(item: Item): void;
+}>;
+/**
+ * 用于为 SchemaInitializer.Item 组件提供一些方法，比如收集菜单项数据
+ * @returns
+ */
+export declare const useCollectMenuItem: () => {
+    collectMenuItem?(item: Item): void;
+    onChange?: () => void;
+};
+export declare const useCollectMenuItems: () => {
+    pushMenuItem?(item: Item): void;
+};
+/**
+ * 用于在 antd 从 4.x 升级到 5.x 中，用于把 SchemaInitializer.Item 组件这种写法转换成 Menu 组件的 items 写法
+ * @returns
+ */
+export declare const useMenuItem: () => {
+    Component: () => React.JSX.Element;
+    getMenuItems: (Com: () => ReactNode) => Item[];
+    getMenuItem: (Com: () => JSX.Element) => Item;
+    clean: () => void;
+};
+export {};

package/es/hooks/useMenuItem.js

@@ -0,0 +1,93 @@
+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 _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+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 _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+import _ from 'lodash';
+import React, { createContext, useCallback, useContext, useRef } from 'react';
+export var GetMenuItemContext = /*#__PURE__*/createContext(null);
+export var GetMenuItemsContext = /*#__PURE__*/createContext(null);
+/**
+ * 用于为 SchemaInitializer.Item 组件提供一些方法，比如收集菜单项数据
+ * @returns
+ */
+export var useCollectMenuItem = function useCollectMenuItem() {
+  return useContext(GetMenuItemContext) || {};
+};
+export var useCollectMenuItems = function useCollectMenuItems() {
+  return useContext(GetMenuItemsContext) || {};
+};
+/**
+ * 用于在 antd 从 4.x 升级到 5.x 中，用于把 SchemaInitializer.Item 组件这种写法转换成 Menu 组件的 items 写法
+ * @returns
+ */
+export var useMenuItem = function useMenuItem() {
+  var list = useRef([]);
+  var renderItems = useRef(null);
+  var shouldRerender = useRef(false);
+  var Component = useCallback(function () {
+    if (!shouldRerender.current) {
+      return null;
+    }
+    shouldRerender.current = false;
+    if (renderItems.current) {
+      return renderItems.current();
+    }
+    return /*#__PURE__*/React.createElement(React.Fragment, null, list.current.map(function (Com, index) {
+      return /*#__PURE__*/React.createElement(Com, {
+        key: index
+      });
+    }));
+  }, []);
+  var getMenuItems = useCallback(function (Com) {
+    var items = [];
+    var pushMenuItem = function pushMenuItem(item) {
+      items.push(item);
+      items.sort(function (a, b) {
+        return (a.order || 0) - (b.order || 0);
+      });
+    };
+    shouldRerender.current = true;
+    renderItems.current = function () {
+      var notDeleteItems = items.filter(function (item) {
+        return item.notdelete;
+      }).map(function (item) {
+        return _.omit(item, 'notdelete');
+      });
+      items.length = 0;
+      items.push.apply(items, _toConsumableArray(notDeleteItems));
+      return /*#__PURE__*/React.createElement(GetMenuItemsContext.Provider, {
+        value: {
+          pushMenuItem: pushMenuItem
+        }
+      }, Com());
+    };
+    return items;
+  }, []);
+  var getMenuItem = useCallback(function (Com) {
+    var item = {};
+    var collectMenuItem = function collectMenuItem(menuItem) {
+      Object.assign(item, menuItem);
+    };
+    shouldRerender.current = true;
+    list.current.push(function () {
+      return /*#__PURE__*/React.createElement(GetMenuItemContext.Provider, {
+        value: {
+          collectMenuItem: collectMenuItem
+        }
+      }, Com());
+    });
+    return item;
+  }, []);
+  // 防止 list 有重复元素
+  var clean = useCallback(function () {
+    list.current = [];
+  }, []);
+  return {
+    Component: Component,
+    getMenuItems: getMenuItems,
+    getMenuItem: getMenuItem,
+    clean: clean
+  };
+};

package/es/index.d.ts

@@ -13,6 +13,7 @@ export * from './collection-manager';
 export * from './document-title';
 export * from './filter-provider';
 export * from './formula';
+export * from './hooks';
 export * from './i18n';
 export * from './icon';
 export * from './plugin-manager';
@@ -22,10 +23,8 @@ export * from './record-provider';
 export * from './route-switch';
 export * from './schema-component';
 export * from './schema-initializer';
+export * from './schema-items';
 export * from './schema-settings';
 export * from './schema-templates';
-export * from './schema-items';
-export * from './settings-form';
 export * from './system-settings';
 export * from './user';
-export * from './hooks';

package/es/index.js

@@ -13,6 +13,7 @@ export * from './collection-manager';
 export * from './document-title';
 export * from './filter-provider';
 export * from './formula';
+export * from './hooks';
 export * from './i18n';
 export * from './icon';
 export * from './plugin-manager';
@@ -22,10 +23,8 @@ export * from './record-provider';
 export * from './route-switch';
 export * from './schema-component';
 export * from './schema-initializer';
+export * from './schema-items';
 export * from './schema-settings';
 export * from './schema-templates';
-export * from './schema-items';
-export * from './settings-form';
 export * from './system-settings';
-export * from './user';
-export * from './hooks';
+export * from './user';

package/es/locale/en_US.d.ts

@@ -294,7 +294,7 @@ declare const _default: {
     "Quick upload": string;
     "Select file": string;
     Subtable: string;
-    Subform: string;
+    "Sub-form": string;
     "Field mode": string;
     "Allow add new data": string;
     "Record picker": string;
@@ -704,5 +704,7 @@ declare const _default: {
     "Update or create": string;
     "Find by the following fields": string;
     Create: string;
+    "Current form": string;
+    "Current object": string;
 };
 export default _default;

package/es/locale/en_US.js

@@ -294,7 +294,7 @@ export default {
   "Quick upload": "Quick upload",
   "Select file": "Select file",
   "Subtable": "Sub-table",
-  "Subform": "Sub-form",
+  "Sub-form": "Sub-form",
   "Field mode": "Field mode",
   "Allow add new data": "Allow add new data",
   "Record picker": "Record picker",
@@ -703,5 +703,7 @@ export default {
   "First or create": "First or create",
   "Update or create": "Update or create",
   "Find by the following fields": "Find by the following fields",
-  "Create": "Create"
+  "Create": "Create",
+  "Current form": "Current form",
+  "Current object": "Current object"
 };

package/es/locale/es_ES.d.ts

@@ -280,7 +280,7 @@ declare const _default: {
     "Display field title": string;
     "Field component": string;
     Subtable: string;
-    Subform: string;
+    "Sub-form": string;
     "Record picker": string;
     "Toggles the subfield mode": string;
     "Selector mode": string;