@nocobase/client 0.9.2-alpha.3 → 0.9.3-alpha.1

package/lib/schema-component/antd/gantt/components/gantt/gantt.js

@@ -484,7 +484,7 @@ var Gantt = function Gantt(props) {
             _context.next = 2;
             return resource.update({
               filterByTk: task.id,
-              values: _objectSpread(_objectSpread({}, task), {}, _defineProperty({}, fieldNames.progress, task.progress / 100))
+              values: _defineProperty({}, fieldNames.progress, task.progress / 100)
             });
           case 2:
             _antd.message.success(t('Saved successfully'));
@@ -502,14 +502,14 @@ var Gantt = function Gantt(props) {
   }();
   var handleTaskChange = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(task) {
-      var _objectSpread3;
+      var _values2;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             _context2.next = 2;
             return resource.update({
               filterByTk: task.id,
-              values: _objectSpread(_objectSpread({}, task), {}, (_objectSpread3 = {}, _defineProperty(_objectSpread3, fieldNames.start, task.start), _defineProperty(_objectSpread3, fieldNames.end, task.end), _objectSpread3))
+              values: (_values2 = {}, _defineProperty(_values2, fieldNames.start, task.start), _defineProperty(_values2, fieldNames.end, task.end), _values2)
             });
           case 2:
             _antd.message.success(t('Saved successfully'));

package/lib/schema-component/antd/gantt/components/other/tooltip.js

@@ -107,7 +107,7 @@ var StandardTooltipContent = function StandardTooltipContent(_ref2) {
     }
   }, task.name, ": ", (0, _otherHelper.getYmd)(task.start), " ~ ", (0, _otherHelper.getYmd)(task.end)), task.end.getTime() - task.start.getTime() !== 0 && /*#__PURE__*/_react.default.createElement("p", {
     className: (0, _css.cx)(_style.tooltipDefaultContainerParagraph)
-  }, "Duration: ".concat(~~((task.end.getTime() - task.start.getTime()) / (1000 * 60 * 60 * 24)), " day(s)")), /*#__PURE__*/_react.default.createElement("p", {
+  }, "Duration: ".concat(Math.round((task.end.getTime() - task.start.getTime()) / (1000 * 60 * 60 * 24) * 10) / 10, " day(s)")), /*#__PURE__*/_react.default.createElement("p", {
     className: (0, _css.cx)(_style.tooltipDefaultContainerParagraph)
   }, !!task.progress && "Progress: ".concat(task.progress, "%")));
 };

package/lib/schema-component/antd/index.d.ts

@@ -1,4 +1,5 @@
 export * from './action';
+export * from './association-field';
 export * from './association-select';
 export * from './block-item';
 export * from './calendar';
@@ -10,11 +11,13 @@ export * from './color-select';
 export * from './cron';
 export * from './date-picker';
 export * from './details';
+export * from './expand-action';
 export * from './filter';
 export * from './form';
 export * from './form-item';
 export * from './form-v2';
 export * from './g2plot';
+export * from './gantt';
 export * from './grid';
 export * from './icon-picker';
 export * from './input';
@@ -40,5 +43,4 @@ export * from './time-picker';
 export * from './tree-select';
 export * from './upload';
 export * from './variable';
-export * from './gantt';
 import './index.less';

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

@@ -14,6 +14,17 @@ Object.keys(_action).forEach(function (key) {
     }
   });
 });
+var _associationField = require("./association-field");
+Object.keys(_associationField).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _associationField[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _associationField[key];
+    }
+  });
+});
 var _associationSelect = require("./association-select");
 Object.keys(_associationSelect).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -135,6 +146,17 @@ Object.keys(_details).forEach(function (key) {
     }
   });
 });
+var _expandAction = require("./expand-action");
+Object.keys(_expandAction).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _expandAction[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _expandAction[key];
+    }
+  });
+});
 var _filter = require("./filter");
 Object.keys(_filter).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -190,6 +212,17 @@ Object.keys(_g2plot).forEach(function (key) {
     }
   });
 });
+var _gantt = require("./gantt");
+Object.keys(_gantt).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _gantt[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _gantt[key];
+    }
+  });
+});
 var _grid = require("./grid");
 Object.keys(_grid).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -465,15 +498,4 @@ Object.keys(_variable).forEach(function (key) {
     }
   });
 });
-var _gantt = require("./gantt");
-Object.keys(_gantt).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _gantt[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _gantt[key];
-    }
-  });
-});
 require("./index.less");

package/lib/schema-component/antd/menu/Menu.js

@@ -241,7 +241,8 @@ Menu.Item = (0, _react.observer)(function (props) {
     eventKey: schema.name,
     schema: schema
   }), /*#__PURE__*/_react2.default.createElement(_.SortableItem, {
-    className: designerCss
+    className: designerCss,
+    removeParentsIfNoChildren: false
   }, /*#__PURE__*/_react2.default.createElement(_2.Icon, {
     type: icon
   }), /*#__PURE__*/_react2.default.createElement("span", {
@@ -263,7 +264,8 @@ Menu.URL = (0, _react.observer)(function (props) {
       window.open(props.href, '_blank');
     }
   }), /*#__PURE__*/_react2.default.createElement(_.SortableItem, {
-    className: designerCss
+    className: designerCss,
+    removeParentsIfNoChildren: false
   }, /*#__PURE__*/_react2.default.createElement(_2.Icon, {
     type: icon
   }), /*#__PURE__*/_react2.default.createElement("span", {
@@ -285,7 +287,8 @@ Menu.SubMenu = (0, _react.observer)(function (props) {
     key: schema.name,
     eventKey: schema.name,
     title: /*#__PURE__*/_react2.default.createElement(_.SortableItem, {
-      className: subMenuDesignerCss
+      className: subMenuDesignerCss,
+      removeParentsIfNoChildren: false
     }, /*#__PURE__*/_react2.default.createElement(_2.Icon, {
       type: icon
     }), field.title, /*#__PURE__*/_react2.default.createElement(Designer, null))

package/lib/schema-component/antd/record-picker/InputRecordPicker.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
 export declare const RecordPickerContext: React.Context<any>;
 export declare const InputRecordPicker: React.FC<any>;
+export declare const RecordPickerProvider: (props: any) => JSX.Element;
 export declare function isShowFilePicker(labelUiSchema: any): boolean;

package/lib/schema-component/antd/record-picker/InputRecordPicker.js

@@ -4,7 +4,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.RecordPickerContext = exports.InputRecordPicker = void 0;
+exports.RecordPickerProvider = exports.RecordPickerContext = exports.InputRecordPicker = void 0;
 exports.isShowFilePicker = isShowFilePicker;
 var _react = require("@formily/react");
 var _antd = require("antd");
@@ -19,7 +19,8 @@ var _preview = require("../preview");
 var _useFieldNames = require("./useFieldNames");
 var _util = require("./util");
 var _excluded = ["onRowSelectionChange", "rowKey"],
-  _excluded2 = ["value", "multiple", "onChange", "quickUpload", "selectFile"];
+  _excluded2 = ["value", "multiple", "onChange", "quickUpload", "selectFile"],
+  _excluded3 = ["multiple", "onChange", "selectedRows", "setSelectedRows", "options", "collectionField"];
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -73,7 +74,7 @@ var useTableSelectorProps = function useTableSelectorProps() {
     rowKey: rowKey,
     rowSelection: {
       type: multiple ? 'checkbox' : 'radio',
-      selectedRowKeys: rcSelectRows.filter(function (item) {
+      selectedRowKeys: rcSelectRows === null || rcSelectRows === void 0 ? void 0 : rcSelectRows.filter(function (item) {
         return options.every(function (row) {
           return row[rowKey] !== item[rowKey];
         });
@@ -218,12 +219,16 @@ var InputRecordPicker = function InputRecordPicker(props) {
     allowClear: true,
     onChange: function onChange(changed) {
       if (!changed) {
-        _onChange([]);
-        setSelectedRows([]);
-      } else if (!(changed === null || changed === void 0 ? void 0 : changed.length)) {
-        _onChange([]);
-        setSelectedRows([]);
+        var _value = multiple ? [] : null;
+        _onChange(_value);
+        setSelectedRows(_value);
+        setOptions([]);
       } else if (Array.isArray(changed)) {
+        if (!changed.length) {
+          _onChange([]);
+          setSelectedRows([]);
+          return;
+        }
         var values = options === null || options === void 0 ? void 0 : options.filter(function (option) {
           return changed.includes(option[fieldNames.value]);
         });
@@ -247,6 +252,26 @@ var InputRecordPicker = function InputRecordPicker(props) {
   }));
 };
 exports.InputRecordPicker = InputRecordPicker;
+var RecordPickerProvider = function RecordPickerProvider(props) {
+  var multiple = props.multiple,
+    onChange = props.onChange,
+    selectedRows = props.selectedRows,
+    setSelectedRows = props.setSelectedRows,
+    options = props.options,
+    collectionField = props.collectionField,
+    other = _objectWithoutProperties(props, _excluded3);
+  return /*#__PURE__*/_react2.default.createElement(RecordPickerContext.Provider, {
+    value: _objectSpread({
+      multiple: multiple,
+      onChange: onChange,
+      selectedRows: selectedRows,
+      setSelectedRows: setSelectedRows,
+      options: options,
+      collectionField: collectionField
+    }, other)
+  }, props.children);
+};
+exports.RecordPickerProvider = RecordPickerProvider;
 var Drawer = function Drawer(_ref) {
   var multiple = _ref.multiple,
     onChange = _ref.onChange,
@@ -267,16 +292,15 @@ var Drawer = function Drawer(_ref) {
     } : {};
     return filter;
   };
-  return /*#__PURE__*/_react2.default.createElement(RecordPickerContext.Provider, {
-    value: {
-      multiple: multiple,
-      onChange: onChange,
-      selectedRows: selectedRows,
-      setSelectedRows: setSelectedRows,
-      options: options,
-      collectionField: collectionField
-    }
-  }, /*#__PURE__*/_react2.default.createElement(_collectionManager.CollectionProvider, {
+  var recordPickerProps = {
+    multiple: multiple,
+    onChange: onChange,
+    selectedRows: selectedRows,
+    setSelectedRows: setSelectedRows,
+    options: options,
+    collectionField: collectionField
+  };
+  return /*#__PURE__*/_react2.default.createElement(RecordPickerProvider, _objectSpread({}, recordPickerProps), /*#__PURE__*/_react2.default.createElement(_collectionManager.CollectionProvider, {
     allowNull: true,
     name: collectionField === null || collectionField === void 0 ? void 0 : collectionField.target
   }, /*#__PURE__*/_react2.default.createElement(_action.ActionContext.Provider, {

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

@@ -8,6 +8,7 @@ var _icons = require("@ant-design/icons");
 var _react = require("@formily/react");
 var _antd = require("antd");
 var _moment = _interopRequireDefault(require("moment"));
+var _lodash = require("lodash");
 var _react2 = _interopRequireWildcard(require("react"));
 var _apiClient = require("../../../api-client");
 var _SharedFilterProvider = require("../../../block-provider/SharedFilterProvider");
@@ -31,7 +32,7 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || 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 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,
@@ -48,6 +49,7 @@ var InternalRemoteSelect = (0, _react.connect)(function (props) {
   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 +67,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)) {
@@ -103,7 +105,7 @@ var InternalRemoteSelect = (0, _react.connect)(function (props) {
           var _mapOptions;
           return mapOptions((_mapOptions = {}, _defineProperty(_mapOptions, fieldNames.label, label), _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 || option[fieldNames.value]), _defineProperty(_objectSpread2, fieldNames.value, option[fieldNames.value]), _objectSpread2));
       });
     } catch (err) {
       console.error(err);
@@ -118,7 +120,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 +142,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)([_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 +157,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) {

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/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) {