@nocobase/client 0.9.2-alpha.4 → 0.9.4-alpha.1

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

@@ -31,12 +31,13 @@ var useLabelFields = function useLabelFields(collectionName) {
   });
 };
 export var TableColumnDesigner = function TableColumnDesigner(props) {
-  var _fieldSchema$xCompon, _uiSchema$xComponent, _collectionField$targ, _collectionField$uiSc, _columnSchema$xCompo, _fieldSchema$xCompon2, _fieldSchema$xCompon3;
+  var _fieldSchema$xCompon, _uiSchema$xComponent, _collectionField$targ, _collectionField$uiSc, _columnSchema$xCompo, _fieldSchema$xCompon2;
   var uiSchema = props.uiSchema,
     fieldSchema = props.fieldSchema,
     collectionField = props.collectionField;
   var _useCollectionManager2 = useCollectionManager(),
-    getInterface = _useCollectionManager2.getInterface;
+    getInterface = _useCollectionManager2.getInterface,
+    getCollection = _useCollectionManager2.getCollection;
   var field = useField();
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
@@ -46,6 +47,8 @@ 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$targ = collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) !== null && _collectionField$targ !== void 0 ? _collectionField$targ : collectionField === null || collectionField === void 0 ? void 0 : collectionField.targetCollection);
   var intefaceCfg = getInterface(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface);
+  var targetCollection = getCollection(collectionField === null || collectionField === void 0 ? void 0 : collectionField.target);
+  var isFileField = isFileCollection(targetCollection);
   return /*#__PURE__*/React.createElement(GeneralSchemaDesigner, {
     disableInitializer: true
   }, /*#__PURE__*/React.createElement(SchemaSettings.ModalItem, {
@@ -120,17 +123,20 @@ export var TableColumnDesigner = function TableColumnDesigner(props) {
       });
       dn.refresh();
     }
-  }), ['linkTo', 'm2m', 'm2o', 'o2m', 'obo', 'oho', 'snapshot', 'createdBy', 'updatedBy'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) && /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
+  }), ['linkTo', 'm2m', 'm2o', 'o2m', 'obo', 'oho', 'snapshot', 'createdBy', 'updatedBy'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) && !isFileField && /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
     title: t('Enable link'),
-    checked: ((_fieldSchema$xCompon2 = (_fieldSchema$xCompon3 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon3 === void 0 ? void 0 : _fieldSchema$xCompon3.mode) !== null && _fieldSchema$xCompon2 !== void 0 ? _fieldSchema$xCompon2 : 'links') === 'links',
+    checked: ((_fieldSchema$xCompon2 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon2 === void 0 ? void 0 : _fieldSchema$xCompon2.enableLink) !== false,
     onChange: function onChange(flag) {
       fieldSchema['x-component-props'] = _objectSpread(_objectSpread({}, fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-component-props']), {}, {
-        mode: flag ? 'links' : 'tags'
+        enableLink: flag
+      });
+      field.componentProps = _objectSpread(_objectSpread({}, fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-component-props']), {}, {
+        enableLink: flag
       });
       dn.emit('patch', {
         schema: {
           'x-uid': fieldSchema['x-uid'],
-          'x-component-props': _objectSpread({}, fieldSchema['x-component-props'])
+          'x-component-props': _objectSpread({}, fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-component-props'])
         }
       });
       dn.refresh();
@@ -140,8 +146,8 @@ export var TableColumnDesigner = function TableColumnDesigner(props) {
     options: options,
     value: fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames['label'],
     onChange: function onChange(label) {
-      var _collectionField$uiSc2, _fieldSchema$xCompon4;
-      var fieldNames = _objectSpread(_objectSpread(_objectSpread({}, collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc2 = collectionField.uiSchema) === null || _collectionField$uiSc2 === void 0 ? void 0 : _collectionField$uiSc2['x-component-props']['fieldNames']), fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon4 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon4 === void 0 ? void 0 : _fieldSchema$xCompon4['fieldNames']), {}, {
+      var _collectionField$uiSc2, _fieldSchema$xCompon3;
+      var fieldNames = _objectSpread(_objectSpread(_objectSpread({}, collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc2 = collectionField.uiSchema) === null || _collectionField$uiSc2 === void 0 ? void 0 : _collectionField$uiSc2['x-component-props']['fieldNames']), fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon3 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon3 === void 0 ? void 0 : _fieldSchema$xCompon3['fieldNames']), {}, {
         label: label
       });
       fieldSchema['x-component-props']['fieldNames'] = fieldNames;
@@ -165,4 +171,7 @@ export var TableColumnDesigner = function TableColumnDesigner(props) {
       title: t('Delete table column')
     }
   }));
-};
+};
+function isFileCollection(collection) {
+  return (collection === null || collection === void 0 ? void 0 : collection.template) === 'file';
+}

package/es/schema-component/antd/table-v2/Table.Index.d.ts

@@ -0,0 +1 @@
+export declare const TableIndex: (props: any) => JSX.Element;

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

@@ -0,0 +1,6 @@
+import React from 'react';
+import { useRecordIndex } from '../../../record-provider';
+export var TableIndex = function TableIndex(props) {
+  var recordIndex = useRecordIndex();
+  return /*#__PURE__*/React.createElement("div", null, recordIndex + 1);
+};

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

@@ -35,9 +35,13 @@ import { DndContext, useDesignable, useTableSize } from '../..';
 import { RecordIndexProvider, RecordProvider, useSchemaInitializer, useTableBlockContext, useTableSelectorContext } from '../../../';
 import { useACLFieldWhitelist } from '../../../acl/ACLProvider';
 import { extractIndex, getIdsWithChildren, isCollectionFieldComponent, isColumnComponent } from './utils';
-var useTableColumns = function useTableColumns() {
-  var _schema$reducePropert;
+var useArrayField = function useArrayField(props) {
   var field = useField();
+  return props.field || field;
+};
+var useTableColumns = function useTableColumns(props) {
+  var _schema$reducePropert;
+  var field = useArrayField(props);
   var schema = useFieldSchema();
   var _useACLFieldWhitelist = useACLFieldWhitelist(),
     schemaInWhitelist = _useACLFieldWhitelist.schemaInWhitelist;
@@ -78,8 +82,8 @@ var useTableColumns = function useTableColumns() {
         }, /*#__PURE__*/React.createElement(RecordProvider, {
           record: record
         }, /*#__PURE__*/React.createElement(RecursionField, {
+          basePath: field.address.concat(record.__index || index),
           schema: s,
-          name: record.__index || index,
           onlyRenderProperties: true
         })));
       }
@@ -179,8 +183,6 @@ var useValidator = function useValidator(validator) {
 };
 export var Table = observer(function (props) {
   var _schema$parent, _schema$parent2, _field$data, _fieldSchema$parent, _fieldSchema$parent$x, _field$value4, _field$value4$slice;
-  var field = useField();
-  var columns = useTableColumns();
   var pagination1 = props.pagination,
     useProps = props.useProps,
     onChange = props.onChange,
@@ -201,6 +203,8 @@ export var Table = observer(function (props) {
     required = _others1$others.required,
     _onExpand = _others1$others.onExpand,
     others = _objectWithoutProperties(_others1$others, _excluded3);
+  var field = useArrayField(others);
+  var columns = useTableColumns(others);
   var schema = useFieldSchema();
   var isTableSelector = (schema === null || schema === void 0 ? void 0 : (_schema$parent = schema.parent) === null || _schema$parent === void 0 ? void 0 : _schema$parent['x-decorator']) === 'TableSelectorProvider';
   var ctx = isTableSelector ? useTableSelectorContext() : useTableBlockContext();

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

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

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

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

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

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

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

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

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

@@ -4,6 +4,7 @@ import { TableColumn } from './Table.Column';
 import { TableColumnActionBar } from './Table.Column.ActionBar';
 import { TableColumnDecorator } from './Table.Column.Decorator';
 import { TableColumnDesigner } from './Table.Column.Designer';
+import { TableIndex } from './Table.Index';
 import { TableSelector } from './TableSelector';
 export * from './TableBlockDesigner';
 export * from './TableField';
@@ -14,4 +15,5 @@ TableV2.Column.ActionBar = TableColumnActionBar;
 TableV2.Column.Decorator = TableColumnDecorator;
 TableV2.Column.Designer = TableColumnDesigner;
 TableV2.ActionColumnDesigner = TableActionColumnDesigner;
-TableV2.Selector = TableSelector;
+TableV2.Selector = TableSelector;
+TableV2.Index = TableIndex;

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

@@ -31,7 +31,7 @@ export function getIdsWithChildren(nodes) {
         var node = _step.value;
         if (node.children && node.children.length > 0) {
           ids.push(node.id);
-          ids.push.apply(ids, _toConsumableArray(getIdsWithChildren(node.children)));
+          ids.push.apply(ids, _toConsumableArray(getIdsWithChildren(node === null || node === void 0 ? void 0 : node.children)));
         }
       }
     } catch (err) {

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

@@ -45,7 +45,7 @@ var ConstantTypes = {
   string: {
     label: "{{t(\"String\")}}",
     value: 'string',
-    component: function component(_ref) {
+    component: function StringComponent(_ref) {
       var _onChange = _ref.onChange,
         value = _ref.value;
       return /*#__PURE__*/React.createElement(AntInput, {
@@ -60,7 +60,7 @@ var ConstantTypes = {
   number: {
     label: '{{t("Number")}}',
     value: 'number',
-    component: function component(_ref2) {
+    component: function NumberComponent(_ref2) {
       var onChange = _ref2.onChange,
         value = _ref2.value;
       return /*#__PURE__*/React.createElement(InputNumber, {
@@ -73,7 +73,7 @@ var ConstantTypes = {
   boolean: {
     label: "{{t(\"Boolean\")}}",
     value: 'boolean',
-    component: function Com(_ref3) {
+    component: function BooleanComponent(_ref3) {
       var onChange = _ref3.onChange,
         value = _ref3.value;
       var _useTranslation = useTranslation(),
@@ -96,7 +96,7 @@ var ConstantTypes = {
   date: {
     label: '{{t("Date")}}',
     value: 'date',
-    component: function component(_ref4) {
+    component: function DateComponent(_ref4) {
       var _onChange2 = _ref4.onChange,
         value = _ref4.value;
       return /*#__PURE__*/React.createElement(DatePicker, {
@@ -116,7 +116,7 @@ var ConstantTypes = {
   null: {
     label: "{{t(\"Null\")}}",
     value: 'null',
-    component: function Com() {
+    component: function NullComponent() {
       var _useTranslation2 = useTranslation(),
         t = _useTranslation2.t;
       return /*#__PURE__*/React.createElement(AntInput, {
@@ -128,12 +128,15 @@ var ConstantTypes = {
     default: null
   }
 };
-function getTypedConstantOption(type) {
+function getTypedConstantOption(type, types) {
   var _ConstantTypes$type;
+  var allTypes = Object.values(ConstantTypes);
   return {
     value: '',
     label: '{{t("Constant")}}',
-    children: Object.values(ConstantTypes),
+    children: types ? allTypes.filter(function (item) {
+      return Array.isArray(types) && types.includes(item.value) || types === true;
+    }) : allTypes,
     component: (_ConstantTypes$type = ConstantTypes[type]) === null || _ConstantTypes$type === void 0 ? void 0 : _ConstantTypes$type.component
   };
 }
@@ -158,7 +161,7 @@ export function Input(props) {
   var _ref5 = children ? {
       value: '',
       label: '{{t("Constant")}}'
-    } : useTypedConstant ? getTypedConstantOption(type) : {
+    } : useTypedConstant ? getTypedConstantOption(type, useTypedConstant) : {
       value: '',
       label: '{{t("Null")}}',
       component: ConstantTypes.null.component

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

@@ -15,7 +15,6 @@ import React, { useState, useEffect, useRef, useMemo } from 'react';
 import { Input } from 'antd';
 import { useForm } from '@formily/react';
 import { cx, css } from '@emotion/css';
-import { useTranslation } from 'react-i18next';
 import * as sanitizeHTML from 'sanitize-html';
 import { EllipsisWithTooltip, useCompile } from '../..';
 import { VariableSelect } from './VariableSelect';
@@ -215,8 +214,6 @@ export function TextArea(props) {
     _props$multiline = props.multiline,
     multiline = _props$multiline === void 0 ? true : _props$multiline;
   var compile = useCompile();
-  var _useTranslation = useTranslation(),
-    t = _useTranslation.t;
   var inputRef = useRef(null);
   var options = compile((_ref2 = typeof scope === 'function' ? scope() : scope) !== null && _ref2 !== void 0 ? _ref2 : []);
   var form = useForm();
@@ -334,7 +331,7 @@ export function TextArea(props) {
     if (ev.key === 'Enter') {
       ev.preventDefault();
     }
-    setIME(ev.keyCode === 229);
+    setIME(ev.keyCode === 229 && ![' ', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', 'Enter'].includes(ev.key));
     // if (ev.key === 'Control') {
     //   console.debug(getSelection().getRangeAt(0));
     // }
@@ -392,7 +389,7 @@ export function TextArea(props) {
     onInsert: onInsert
   }) : null);
 }
-TextArea.ReadPretty = function (props) {
+TextArea.ReadPretty = function ReadPretty(props) {
   var _ref5;
   var value = props.value,
     _props$multiline2 = props.multiline,

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

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

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

@@ -72,15 +72,18 @@ var useSortableItemId = function useSortableItemId(props) {
   return field.address.toString();
 };
 export var SortableItem = observer(function (props) {
+  var _others$removeParents;
   var _useSortableItemProps = useSortableItemProps(props),
     schema = _useSortableItemProps.schema,
     id = _useSortableItemProps.id,
     others = _objectWithoutProperties(_useSortableItemProps, _excluded2);
+  var removeParentsIfNoChildren = (_others$removeParents = others.removeParentsIfNoChildren) !== null && _others$removeParents !== void 0 ? _others$removeParents : true;
   return /*#__PURE__*/React.createElement(SortableProvider, {
     id: id,
     data: {
       insertAdjacent: 'afterEnd',
-      schema: schema
+      schema: schema,
+      removeParentsIfNoChildren: removeParentsIfNoChildren
     }
   }, /*#__PURE__*/React.createElement(Sortable, _objectSpread({}, others), props.children));
 });

package/es/schema-component/common/utils/uitls.js

@@ -62,7 +62,7 @@ var getValue = function getValue(str, values) {
   var regex = /{{(.*?)}}/;
   var matches = str === null || str === void 0 ? void 0 : (_str$match3 = str.match) === null || _str$match3 === void 0 ? void 0 : _str$match3.call(str, regex);
   if (matches) {
-    return getVariableValue(str, values);
+    return getVariableValue(str, flat(values));
   } else {
     return str;
   }

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

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

package/es/schema-component/hooks/index.d.ts

@@ -9,3 +9,4 @@ export * from './useFieldComponentOptions';
 export * from './useFieldTitle';
 export * from './useProps';
 export * from './useTableSize';
+export * from './useFieldModeOptions';

package/es/schema-component/hooks/index.js

@@ -8,4 +8,5 @@ export * from './useSchemaComponentContext';
 export * from './useFieldComponentOptions';
 export * from './useFieldTitle';
 export * from './useProps';
-export * from './useTableSize';
+export * from './useTableSize';
+export * from './useFieldModeOptions';

package/es/schema-component/hooks/useFieldModeOptions.d.ts

@@ -0,0 +1,4 @@
+export declare const useFieldModeOptions: () => {
+    label: string;
+    value: string;
+}[];

package/es/schema-component/hooks/useFieldModeOptions.js

@@ -0,0 +1,105 @@
+import { useFieldSchema, useField } from '@formily/react';
+import { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+import { useCollection, useCollectionManager } from '../../collection-manager';
+export var useFieldModeOptions = function useFieldModeOptions() {
+  var _fieldSchema$xCompon;
+  var _useCollectionManager = useCollectionManager(),
+    getCollectionJoinField = _useCollectionManager.getCollectionJoinField,
+    getCollection = _useCollectionManager.getCollection;
+  var fieldSchema = useFieldSchema();
+  var field = useField();
+  var isReadPretty = field.readPretty;
+  var _useCollection = useCollection(),
+    getField = _useCollection.getField;
+  var collectionField = getField(fieldSchema['name']) || getCollectionJoinField(fieldSchema['x-collection-field']);
+  var _useTranslation = useTranslation(),
+    t = _useTranslation.t;
+  var _ref = ((_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : _fieldSchema$xCompon.fieldNames) || {},
+    label = _ref.label;
+  var fieldModeOptions = useMemo(function () {
+    if (!collectionField || !(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface)) {
+      return;
+    }
+    if (!['o2o', 'oho', 'obo', 'o2m', 'linkTo', 'm2o', 'm2m'].includes(collectionField.interface)) return;
+    var collection = getCollection(collectionField.target);
+    if ((collection === null || collection === void 0 ? void 0 : collection.template) === 'file') {
+      return isReadPretty ? [{
+        label: t('Title'),
+        value: 'Select'
+      }, {
+        label: t('File manager'),
+        value: 'FileManager'
+      }] : [{
+        label: t('File manager'),
+        value: 'FileManager'
+      }, {
+        label: t('Record picker'),
+        value: 'Picker'
+      }, {
+        label: t('Select'),
+        value: 'Select'
+      }];
+    }
+    switch (collectionField.interface) {
+      case 'o2m':
+        return isReadPretty ? [{
+          label: t('Title'),
+          value: 'Select'
+        },
+        // { label: t('Subtable'), value: 'SubTable' },
+        {
+          label: t('Sub-details'),
+          value: 'Nester'
+        }] : [{
+          label: t('Record picker'),
+          value: 'Picker'
+        },
+        // { label: t('Subtable'), value: 'SubTable' },
+        {
+          label: t('Select'),
+          value: 'Select'
+        }, {
+          label: t('Subform'),
+          value: 'Nester'
+        }];
+      case 'm2o':
+      case 'm2m':
+      case 'linkTo':
+        return isReadPretty ? [{
+          label: t('Title'),
+          value: 'Select'
+        }, {
+          label: t('Sub-details'),
+          value: 'Nester'
+        }] : [{
+          label: t('Record picker'),
+          value: 'Picker'
+        }, {
+          label: t('Select'),
+          value: 'Select'
+        }, {
+          label: t('Subform'),
+          value: 'Nester'
+        }];
+      default:
+        return isReadPretty ? [{
+          label: t('Title'),
+          value: 'Select'
+        }, {
+          label: t('Sub-details'),
+          value: 'Nester'
+        }] : [{
+          label: t('Record picker'),
+          value: 'Picker'
+        }, {
+          label: t('Select'),
+          value: 'Select'
+        }, {
+          label: t('Subform'),
+          value: 'Nester'
+        }];
+    }
+  }, [t, collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface, label]);
+  return fieldModeOptions;
+};

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

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

package/es/schema-initializer/SchemaInitializerProvider.js

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