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

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

@@ -7,12 +7,12 @@ exports.default = exports.RemoteSelect = void 0;
 var _icons = require("@ant-design/icons");
 var _react = require("@formily/react");
 var _antd = require("antd");
+var _lodash = require("lodash");
 var _moment = _interopRequireDefault(require("moment"));
 var _react2 = _interopRequireWildcard(require("react"));
 var _apiClient = require("../../../api-client");
 var _SharedFilterProvider = require("../../../block-provider/SharedFilterProvider");
 var _collectionManager = require("../../../collection-manager");
-var _hooks = require("../../hooks");
 var _select = require("../select");
 var _ReadPretty = require("./ReadPretty");
 var _excluded = ["fieldNames", "service", "wait", "value", "objectValue", "manual", "mapOptions", "targetField"];
@@ -30,8 +30,9 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 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); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+var EMPTY = 'N/A';
 var InternalRemoteSelect = (0, _react.connect)(function (props) {
-  var _service$params;
+  var _field$componentProps, _field$componentProps2, _field$componentProps3, _service$params;
   var _props$fieldNames = props.fieldNames,
     fieldNames = _props$fieldNames === void 0 ? {} : _props$fieldNames,
     _props$service = props.service,
@@ -45,9 +46,9 @@ var InternalRemoteSelect = (0, _react.connect)(function (props) {
     mapOptions = props.mapOptions,
     _targetField = props.targetField,
     others = _objectWithoutProperties(props, _excluded);
-  var compile = (0, _hooks.useCompile)();
   var firstRun = (0, _react2.useRef)(false);
   var fieldSchema = (0, _react.useFieldSchema)();
+  var field = (0, _react.useField)();
   var _useCollection = (0, _collectionManager.useCollection)(),
     getField = _useCollection.getField;
   var _useCollectionManager = (0, _collectionManager.useCollectionManager)(),
@@ -65,7 +66,7 @@ var InternalRemoteSelect = (0, _react.connect)(function (props) {
   var mapOptionsToTags = (0, _react2.useCallback)(function (options) {
     try {
       return options.map(function (option) {
-        var _targetField$uiSchema, _ref;
+        var _targetField$uiSchema, _objectSpread2;
         var label = option[fieldNames.label];
         if (targetField === null || targetField === void 0 ? void 0 : (_targetField$uiSchema = targetField.uiSchema) === null || _targetField$uiSchema === void 0 ? void 0 : _targetField$uiSchema.enum) {
           if (Array.isArray(label)) {
@@ -82,7 +83,9 @@ var InternalRemoteSelect = (0, _react.connect)(function (props) {
                   }
                 }, (option === null || option === void 0 ? void 0 : option.label) || item);
               } else {
-                return /*#__PURE__*/_react2.default.createElement(_antd.Tag, null, item);
+                return /*#__PURE__*/_react2.default.createElement(_antd.Tag, {
+                  key: item
+                }, item);
               }
             }).reverse();
           } else {
@@ -101,10 +104,10 @@ var InternalRemoteSelect = (0, _react.connect)(function (props) {
         }
         if (mapOptions) {
           var _mapOptions;
-          return mapOptions((_mapOptions = {}, _defineProperty(_mapOptions, fieldNames.label, label), _defineProperty(_mapOptions, fieldNames.value, option[fieldNames.value]), _mapOptions));
+          return mapOptions((_mapOptions = {}, _defineProperty(_mapOptions, fieldNames.label, label || EMPTY), _defineProperty(_mapOptions, fieldNames.value, option[fieldNames.value]), _mapOptions));
         }
-        return _ref = {}, _defineProperty(_ref, fieldNames.label, label || option[fieldNames.value]), _defineProperty(_ref, fieldNames.value, option[fieldNames.value]), _ref;
-      });
+        return _objectSpread(_objectSpread({}, option), {}, (_objectSpread2 = {}, _defineProperty(_objectSpread2, fieldNames.label, label || EMPTY), _defineProperty(_objectSpread2, fieldNames.value, option[fieldNames.value]), _objectSpread2));
+      }).filter(Boolean);
     } catch (err) {
       console.error(err);
       return options;
@@ -118,7 +121,7 @@ var InternalRemoteSelect = (0, _react.connect)(function (props) {
       }, service === null || service === void 0 ? void 0 : service.params), {}, {
         // fields: [fieldNames.label, fieldNames.value, ...(service?.params?.fields || [])],
         // search needs
-        filter: (0, _SharedFilterProvider.mergeFilter)([service === null || service === void 0 ? void 0 : (_service$params = service.params) === null || _service$params === void 0 ? void 0 : _service$params.filter])
+        filter: (0, _SharedFilterProvider.mergeFilter)([((_field$componentProps = field.componentProps) === null || _field$componentProps === void 0 ? void 0 : (_field$componentProps2 = _field$componentProps.service) === null || _field$componentProps2 === void 0 ? void 0 : (_field$componentProps3 = _field$componentProps2.params) === null || _field$componentProps3 === void 0 ? void 0 : _field$componentProps3.filter) || (service === null || service === void 0 ? void 0 : (_service$params = service.params) === null || _service$params === void 0 ? void 0 : _service$params.filter)])
       })
     }), {
       manual: manual,
@@ -140,13 +143,13 @@ var InternalRemoteSelect = (0, _react.connect)(function (props) {
     }
   }, [runDep]);
   var onSearch = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(search) {
-      var _service$params2;
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(search) {
+      var _field$componentProps4, _field$componentProps5, _field$componentProps6, _service$params2;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             run({
-              filter: (0, _SharedFilterProvider.mergeFilter)([_defineProperty({}, fieldNames.label, _defineProperty({}, operator, search)), service === null || service === void 0 ? void 0 : (_service$params2 = service.params) === null || _service$params2 === void 0 ? void 0 : _service$params2.filter])
+              filter: (0, _SharedFilterProvider.mergeFilter)([search ? _defineProperty({}, fieldNames.label, _defineProperty({}, operator, search)) : {}, ((_field$componentProps4 = field.componentProps) === null || _field$componentProps4 === void 0 ? void 0 : (_field$componentProps5 = _field$componentProps4.service) === null || _field$componentProps5 === void 0 ? void 0 : (_field$componentProps6 = _field$componentProps5.params) === null || _field$componentProps6 === void 0 ? void 0 : _field$componentProps6.filter) || (service === null || service === void 0 ? void 0 : (_service$params2 = service.params) === null || _service$params2 === void 0 ? void 0 : _service$params2.filter)])
             });
           case 1:
           case "end":
@@ -155,32 +158,28 @@ var InternalRemoteSelect = (0, _react.connect)(function (props) {
       }, _callee);
     }));
     return function onSearch(_x) {
-      return _ref2.apply(this, arguments);
+      return _ref.apply(this, arguments);
     };
   }();
   var getOptionsByFieldNames = (0, _react2.useCallback)(function (item) {
     return Object.keys(fieldNames).reduce(function (obj, key) {
-      var value = item[fieldNames[key]];
-      if (value) {
-        // support hidden, disabled, etc.
-        obj[['label', 'value', 'options'].includes(key) ? fieldNames[key] : key] = key === 'label' ? compile(value) : value;
-      }
       return obj;
     }, {});
   }, [fieldNames]);
   var normalizeOptions = (0, _react2.useCallback)(function (obj) {
-    var _ref4;
+    var _ref3;
     if (objectValue || _typeof(obj) === 'object') {
       return getOptionsByFieldNames(obj);
     }
-    return _ref4 = {}, _defineProperty(_ref4, fieldNames.value, obj), _defineProperty(_ref4, fieldNames.label, obj), _ref4;
+    return _ref3 = {}, _defineProperty(_ref3, fieldNames.value, obj), _defineProperty(_ref3, fieldNames.label, obj), _ref3;
   }, [objectValue, getOptionsByFieldNames]);
   var options = (0, _react2.useMemo)(function () {
     var _data$data, _data$data2;
     if (!(data === null || data === void 0 ? void 0 : (_data$data = data.data) === null || _data$data === void 0 ? void 0 : _data$data.length)) {
-      return value !== undefined && value !== null ? Array.isArray(value) ? value.map(normalizeOptions) : [normalizeOptions(value)] : [];
+      return value !== undefined && value !== null ? Array.isArray(value) ? value : [value] : [];
     }
-    return (data === null || data === void 0 ? void 0 : (_data$data2 = data.data) === null || _data$data2 === void 0 ? void 0 : _data$data2.map(getOptionsByFieldNames)) || [];
+    var valueOptions = value !== undefined && value !== null && (Array.isArray(value) ? value : [value]) || [];
+    return (0, _lodash.uniqBy)((data === null || data === void 0 ? void 0 : (_data$data2 = data.data) === null || _data$data2 === void 0 ? void 0 : _data$data2.concat(valueOptions)) || [], fieldNames.value);
   }, [data === null || data === void 0 ? void 0 : data.data, getOptionsByFieldNames, normalizeOptions, value]);
   var onDropdownVisibleChange = function onDropdownVisibleChange() {
     if (firstRun.current) {
@@ -190,6 +189,7 @@ var InternalRemoteSelect = (0, _react.connect)(function (props) {
     firstRun.current = true;
   };
   return /*#__PURE__*/_react2.default.createElement(_select.Select, _objectSpread(_objectSpread({
+    dropdownMatchSelectWidth: false,
     autoClearSearchValue: true,
     filterOption: false,
     filterSort: null,

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

@@ -60,6 +60,7 @@ var ObjectSelect = function ObjectSelect(props) {
     options: options,
     fieldNames: fieldNames,
     showSearch: true,
+    dropdownMatchSelectWidth: false,
     filterOption: function filterOption(input, option) {
       var _option;
       return ((_option = option === null || option === void 0 ? void 0 : option[fieldNames.label || 'label']) !== null && _option !== void 0 ? _option : '').includes(input);
@@ -103,6 +104,7 @@ var InternalSelect = (0, _react.connect)(function (props) {
     showSearch: true,
     filterOption: filterOption,
     allowClear: true,
+    dropdownMatchSelectWidth: false,
     value: value
   }, others), {}, {
     onChange: function onChange(changed) {

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

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

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

@@ -38,12 +38,13 @@ var useLabelFields = function useLabelFields(collectionName) {
   });
 };
 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 = (0, _collectionManager.useCollectionManager)(),
-    getInterface = _useCollectionManager2.getInterface;
+    getInterface = _useCollectionManager2.getInterface,
+    getCollection = _useCollectionManager2.getCollection;
   var field = (0, _react.useField)();
   var _useTranslation = (0, _reactI18next.useTranslation)(),
     t = _useTranslation.t;
@@ -53,6 +54,8 @@ 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__*/_react2.default.createElement(_schemaSettings.GeneralSchemaDesigner, {
     disableInitializer: true
   }, /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.ModalItem, {
@@ -127,17 +130,20 @@ 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__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
+  }), ['linkTo', 'm2m', 'm2o', 'o2m', 'obo', 'oho', 'snapshot', 'createdBy', 'updatedBy'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) && !isFileField && /*#__PURE__*/_react2.default.createElement(_schemaSettings.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();
@@ -147,8 +153,8 @@ 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;
@@ -173,4 +179,7 @@ var TableColumnDesigner = function TableColumnDesigner(props) {
     }
   }));
 };
-exports.TableColumnDesigner = TableColumnDesigner;
+exports.TableColumnDesigner = TableColumnDesigner;
+function isFileCollection(collection) {
+  return (collection === null || collection === void 0 ? void 0 : collection.template) === 'file';
+}

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

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

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

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.TableIndex = void 0;
+var _react = _interopRequireDefault(require("react"));
+var _recordProvider = require("../../../record-provider");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var TableIndex = function TableIndex(props) {
+  var recordIndex = (0, _recordProvider.useRecordIndex)();
+  return /*#__PURE__*/_react.default.createElement("div", null, recordIndex + 1);
+};
+exports.TableIndex = TableIndex;

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

@@ -44,9 +44,13 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 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); }
-var useTableColumns = function useTableColumns() {
-  var _schema$reducePropert;
+var useArrayField = function useArrayField(props) {
   var field = (0, _react.useField)();
+  return props.field || field;
+};
+var useTableColumns = function useTableColumns(props) {
+  var _schema$reducePropert;
+  var field = useArrayField(props);
   var schema = (0, _react.useFieldSchema)();
   var _useACLFieldWhitelist = (0, _ACLProvider.useACLFieldWhitelist)(),
     schemaInWhitelist = _useACLFieldWhitelist.schemaInWhitelist;
@@ -87,8 +91,8 @@ var useTableColumns = function useTableColumns() {
         }, /*#__PURE__*/_react2.default.createElement(_2.RecordProvider, {
           record: record
         }, /*#__PURE__*/_react2.default.createElement(_react.RecursionField, {
+          basePath: field.address.concat(record.__index || index),
           schema: s,
-          name: record.__index || index,
           onlyRenderProperties: true
         })));
       }
@@ -188,8 +192,6 @@ var useValidator = function useValidator(validator) {
 };
 var Table = (0, _react.observer)(function (props) {
   var _schema$parent, _schema$parent2, _field$data, _fieldSchema$parent, _fieldSchema$parent$x, _field$value4, _field$value4$slice;
-  var field = (0, _react.useField)();
-  var columns = useTableColumns();
   var pagination1 = props.pagination,
     useProps = props.useProps,
     onChange = props.onChange,
@@ -210,6 +212,8 @@ var Table = (0, _react.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 = (0, _react.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 ? (0, _2.useTableSelectorContext)() : (0, _2.useTableBlockContext)();

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

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

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

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

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

@@ -0,0 +1,73 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useUserVariable = exports.useOptions = void 0;
+var _filter = require("../../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';
+};
+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 = (0, _filter.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;
+};
+exports.useOptions = useOptions;
+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
+  };
+};
+exports.useUserVariable = useUserVariable;

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

@@ -13,6 +13,7 @@ var _Table3 = require("./Table.Column");
 var _TableColumn = require("./Table.Column.ActionBar");
 var _TableColumn2 = require("./Table.Column.Decorator");
 var _TableColumn3 = require("./Table.Column.Designer");
+var _Table4 = require("./Table.Index");
 var _TableSelector = require("./TableSelector");
 var _TableBlockDesigner = require("./TableBlockDesigner");
 Object.keys(_TableBlockDesigner).forEach(function (key) {
@@ -57,4 +58,5 @@ TableV2.Column.ActionBar = _TableColumn.TableColumnActionBar;
 TableV2.Column.Decorator = _TableColumn2.TableColumnDecorator;
 TableV2.Column.Designer = _TableColumn3.TableColumnDesigner;
 TableV2.ActionColumnDesigner = _Table2.TableActionColumnDesigner;
-TableV2.Selector = _TableSelector.TableSelector;
+TableV2.Selector = _TableSelector.TableSelector;
+TableV2.Index = _Table4.TableIndex;

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

@@ -41,7 +41,7 @@ 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/lib/schema-component/antd/variable/Input.js

@@ -52,7 +52,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__*/_react2.default.createElement(_antd.Input, {
@@ -67,7 +67,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__*/_react2.default.createElement(_antd.InputNumber, {
@@ -80,7 +80,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 = (0, _reactI18next.useTranslation)(),
@@ -103,7 +103,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__*/_react2.default.createElement(_antd.DatePicker, {
@@ -123,7 +123,7 @@ var ConstantTypes = {
   null: {
     label: "{{t(\"Null\")}}",
     value: 'null',
-    component: function Com() {
+    component: function NullComponent() {
       var _useTranslation2 = (0, _reactI18next.useTranslation)(),
         t = _useTranslation2.t;
       return /*#__PURE__*/_react2.default.createElement(_antd.Input, {
@@ -135,12 +135,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
   };
 }
@@ -165,7 +168,7 @@ 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/lib/schema-component/antd/variable/TextArea.js

@@ -9,7 +9,6 @@ var _react = _interopRequireWildcard(require("react"));
 var _antd = require("antd");
 var _react2 = require("@formily/react");
 var _css = require("@emotion/css");
-var _reactI18next = require("react-i18next");
 var sanitizeHTML = _interopRequireWildcard(require("sanitize-html"));
 var _2 = require("../..");
 var _VariableSelect = require("./VariableSelect");
@@ -224,8 +223,6 @@ function TextArea(props) {
     _props$multiline = props.multiline,
     multiline = _props$multiline === void 0 ? true : _props$multiline;
   var compile = (0, _2.useCompile)();
-  var _useTranslation = (0, _reactI18next.useTranslation)(),
-    t = _useTranslation.t;
   var inputRef = (0, _react.useRef)(null);
   var options = compile((_ref2 = typeof scope === 'function' ? scope() : scope) !== null && _ref2 !== void 0 ? _ref2 : []);
   var form = (0, _react2.useForm)();
@@ -343,7 +340,7 @@ 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));
     // }
@@ -401,7 +398,7 @@ 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/lib/schema-component/common/dnd-context/index.js

@@ -31,7 +31,7 @@ var useDragEnd = function useDragEnd(props) {
   var _useTranslation = (0, _reactI18next.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;
@@ -40,6 +40,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);
@@ -68,7 +69,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/lib/schema-component/common/sortable-item/SortableItem.js

@@ -84,15 +84,18 @@ var useSortableItemId = function useSortableItemId(props) {
   return field.address.toString();
 };
 var SortableItem = (0, _react.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__*/_react2.default.createElement(SortableProvider, {
     id: id,
     data: {
       insertAdjacent: 'afterEnd',
-      schema: schema
+      schema: schema,
+      removeParentsIfNoChildren: removeParentsIfNoChildren
     }
   }, /*#__PURE__*/_react2.default.createElement(Sortable, _objectSpread({}, others), props.children));
 });

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

@@ -74,7 +74,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, (0, _flat2.default)(values));
   } else {
     return str;
   }

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

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

package/lib/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';