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

package/es/schema-component/antd/form-item/SchemaSettingOptions.js

@@ -13,11 +13,12 @@ import { uid } from '@formily/shared';
 import _ from 'lodash';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
-import { useFilterByTk, useFormBlockContext } from '../../../block-provider';
+import { useFormBlockContext } from '../../../block-provider';
 import { useCollection, useCollectionManager } from '../../../collection-manager';
 import { SchemaSettings, isPatternDisabled } from '../../../schema-settings';
-import { useCompile, useDesignable, useFieldComponentOptions } from '../../hooks';
+import { useCompile, useDesignable, useFieldModeOptions } from '../../hooks';
 import { useOperatorList } from '../filter/useOperators';
+import { isFileCollection } from './FormItem';
 export var findFilterOperators = function findFilterOperators(schema) {
   while (schema) {
     if (schema['x-filter-operators']) {
@@ -387,64 +388,39 @@ export var EditDefaultValue = function EditDefaultValue() {
   }) : null;
 };
 export var EditComponent = function EditComponent() {
+  var _field$componentProps;
   var _useCollectionManager4 = useCollectionManager(),
-    getInterface = _useCollectionManager4.getInterface,
     getCollectionJoinField = _useCollectionManager4.getCollectionJoinField,
     getCollection = _useCollectionManager4.getCollection;
   var _useCollection4 = useCollection(),
-    getField = _useCollection4.getField,
-    template = _useCollection4.template;
-  var tk = useFilterByTk();
-  var _useFormBlockContext3 = useFormBlockContext(),
-    form = _useFormBlockContext3.form;
+    getField = _useCollection4.getField;
   var field = useField();
   var fieldSchema = useFieldSchema();
   var _useTranslation7 = useTranslation(),
     t = _useTranslation7.t;
   var _useDesignable7 = useDesignable(),
-    dn = _useDesignable7.dn,
-    insertAdjacent = _useDesignable7.insertAdjacent;
+    dn = _useDesignable7.dn;
   var collectionField = getField(fieldSchema['name']) || getCollectionJoinField(fieldSchema['x-collection-field']);
-  var interfaceConfig = getInterface(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface);
-  var fieldComponentOptions = useFieldComponentOptions();
-  var isSubFormAssociationField = field.address.segments.includes('__form_grid');
-  return form && !isSubFormAssociationField && fieldComponentOptions ? /*#__PURE__*/React.createElement(SchemaSettings.SelectItem, {
-    title: t('Field component'),
-    options: fieldComponentOptions,
-    value: fieldSchema['x-component'],
-    onChange: function onChange(type) {
-      var _collectionField$uiSc4, _interfaceConfig$sche;
-      var schema = {
-        name: collectionField.name,
-        type: 'void',
-        required: fieldSchema['required'],
-        description: fieldSchema['description'],
-        default: fieldSchema['default'],
-        'x-decorator': 'FormItem',
-        'x-designer': 'FormItem.Designer',
-        'x-component': type,
-        'x-validator': fieldSchema['x-validator'],
-        'x-collection-field': fieldSchema['x-collection-field'],
-        'x-decorator-props': fieldSchema['x-decorator-props'],
-        'x-component-props': _objectSpread(_objectSpread({}, collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc4 = collectionField.uiSchema) === null || _collectionField$uiSc4 === void 0 ? void 0 : _collectionField$uiSc4['x-component-props']), fieldSchema['x-component-props'])
-      };
-      interfaceConfig === null || interfaceConfig === void 0 ? void 0 : (_interfaceConfig$sche = interfaceConfig.schemaInitialize) === null || _interfaceConfig$sche === void 0 ? void 0 : _interfaceConfig$sche.call(interfaceConfig, schema, {
-        field: collectionField,
-        block: 'Form',
-        readPretty: field.readPretty,
-        action: tk ? 'get' : null,
-        targetCollection: getCollection(collectionField.target)
-      });
-      insertAdjacent('beforeBegin', divWrap(schema), {
-        onSuccess: function onSuccess() {
-          dn.remove(null, {
-            removeParentsIfNoChildren: true,
-            breakRemoveOn: {
-              'x-component': 'Grid'
-            }
-          });
-        }
+  var fieldModeOptions = useFieldModeOptions();
+  var isAssociationField = ['belongsTo', 'hasOne', 'hasMany', 'belongsToMany'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.type);
+  var targetCollection = getCollection(collectionField === null || collectionField === void 0 ? void 0 : collectionField.target);
+  var isFileField = isFileCollection(targetCollection);
+  return isAssociationField && fieldModeOptions ? /*#__PURE__*/React.createElement(SchemaSettings.SelectItem, {
+    key: "field-mode",
+    title: t('Field mode'),
+    options: fieldModeOptions,
+    value: (field === null || field === void 0 ? void 0 : (_field$componentProps = field.componentProps) === null || _field$componentProps === void 0 ? void 0 : _field$componentProps['mode']) || (isFileField ? 'FileManager' : 'Select'),
+    onChange: function onChange(mode) {
+      var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
+      fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
+      fieldSchema['x-component-props']['mode'] = mode;
+      schema['x-component-props'] = fieldSchema['x-component-props'];
+      field.componentProps = field.componentProps || {};
+      field.componentProps.mode = mode;
+      dn.emit('patch', {
+        schema: schema
       });
+      dn.refresh();
     }
   }) : null;
 };
@@ -453,8 +429,8 @@ export var EditPattern = function EditPattern() {
     getCollectionJoinField = _useCollectionManager5.getCollectionJoinField;
   var _useCollection5 = useCollection(),
     getField = _useCollection5.getField;
-  var _useFormBlockContext4 = useFormBlockContext(),
-    form = _useFormBlockContext4.form;
+  var _useFormBlockContext3 = useFormBlockContext(),
+    form = _useFormBlockContext3.form;
   var field = useField();
   var fieldSchema = useFieldSchema();
   var _useTranslation8 = useTranslation(),
@@ -545,7 +521,8 @@ export var EditOperator = function EditOperator() {
     dn = _useDesignable9.dn;
   var operatorList = useOperatorList();
   var _findFilterOperators2 = findFilterOperators(fieldSchema),
-    storedOperators = _findFilterOperators2.operators,
+    _findFilterOperators3 = _findFilterOperators2.operators,
+    storedOperators = _findFilterOperators3 === void 0 ? {} : _findFilterOperators3,
     uid = _findFilterOperators2.uid;
   if (operatorList.length && !storedOperators[fieldSchema.name]) {
     storedOperators[fieldSchema.name] = operatorList[0].value;
@@ -556,9 +533,9 @@ export var EditOperator = function EditOperator() {
     value: storedOperators[fieldSchema.name],
     options: compile(operatorList),
     onChange: function onChange(v) {
-      var _schema5;
+      var _schema6;
       storedOperators[fieldSchema.name] = v;
-      var schema = (_schema5 = {}, _defineProperty(_schema5, 'x-uid', uid), _defineProperty(_schema5, 'x-filter-operators', storedOperators), _schema5);
+      var schema = (_schema6 = {}, _defineProperty(_schema6, 'x-uid', uid), _defineProperty(_schema6, 'x-filter-operators', storedOperators), _schema6);
       dn.emit('patch', {
         schema: schema
       });
@@ -567,7 +544,7 @@ export var EditOperator = function EditOperator() {
   }) : null;
 };
 export var EditTitleField = function EditTitleField() {
-  var _getCollectionFields, _field$componentProps, _field$componentProps2;
+  var _getCollectionFields, _field$componentProps2, _field$componentProps3;
   var _useCollectionManager6 = useCollectionManager(),
     getCollectionFields = _useCollectionManager6.getCollectionFields,
     getCollectionJoinField = _useCollectionManager6.getCollectionJoinField;
@@ -595,16 +572,17 @@ export var EditTitleField = function EditTitleField() {
     key: "title-field",
     title: t('Title field'),
     options: options,
-    value: field === null || field === void 0 ? void 0 : (_field$componentProps = field.componentProps) === null || _field$componentProps === void 0 ? void 0 : (_field$componentProps2 = _field$componentProps.fieldNames) === null || _field$componentProps2 === void 0 ? void 0 : _field$componentProps2.label,
+    value: field === null || field === void 0 ? void 0 : (_field$componentProps2 = field.componentProps) === null || _field$componentProps2 === void 0 ? void 0 : (_field$componentProps3 = _field$componentProps2.fieldNames) === null || _field$componentProps3 === void 0 ? void 0 : _field$componentProps3.label,
     onChange: function onChange(label) {
-      var _collectionField$uiSc5, _collectionField$uiSc6;
+      var _collectionField$uiSc4, _collectionField$uiSc5;
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
-      var fieldNames = _objectSpread(_objectSpread(_objectSpread({}, collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc5 = collectionField.uiSchema) === null || _collectionField$uiSc5 === void 0 ? void 0 : (_collectionField$uiSc6 = _collectionField$uiSc5['x-component-props']) === null || _collectionField$uiSc6 === void 0 ? void 0 : _collectionField$uiSc6['fieldNames']), field.componentProps.fieldNames), {}, {
+      var fieldNames = _objectSpread(_objectSpread(_objectSpread({}, collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc4 = collectionField.uiSchema) === null || _collectionField$uiSc4 === void 0 ? void 0 : (_collectionField$uiSc5 = _collectionField$uiSc4['x-component-props']) === null || _collectionField$uiSc5 === void 0 ? void 0 : _collectionField$uiSc5['fieldNames']), field.componentProps.fieldNames), {}, {
         label: label
       });
       fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
       fieldSchema['x-component-props']['fieldNames'] = fieldNames;
       schema['x-component-props'] = fieldSchema['x-component-props'];
+      field.componentProps.fieldNames = fieldSchema['x-component-props'].fieldNames;
       dn.emit('patch', {
         schema: schema
       });

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

@@ -4,10 +4,10 @@ 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); }
-import { last, cloneDeep } from 'lodash';
-import { conditionAnalyse } from '../../common/utils/uitls';
+import { evaluators } from '@nocobase/evaluators/client';
+import { cloneDeep, last } from 'lodash';
 import { ActionType } from '../../../schema-settings/LinkageRules/type';
-import evaluators from '@nocobase/evaluators/client';
+import { conditionAnalyse } from '../../common/utils/uitls';
 export var linkageMergeAction = function linkageMergeAction(_ref, field, condition, values) {
   var _field$linkagePropert, _field$initProperty, _field$linkagePropert2, _field$initProperty2, _field$linkagePropert3, _field$initProperty3, _field$linkagePropert4, _field$initProperty4, _field$linkagePropert5, _field$linkagePropert6, _field$linkagePropert7;
   var operator = _ref.operator,
@@ -70,7 +70,9 @@ export var linkageMergeAction = function linkageMergeAction(_ref, field, conditi
               }
             }));
             valueResult.push(result);
-          } catch (error) {}
+          } catch (error) {
+            console.log(error);
+          }
         } else if ((value === null || value === void 0 ? void 0 : value.mode) === 'constant') {
           valueResult.push((value === null || value === void 0 ? void 0 : value.value) || value);
         } else {

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

@@ -475,7 +475,7 @@ export 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:
             message.success(t('Saved successfully'));
@@ -493,14 +493,14 @@ export 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:
             message.success(t('Saved successfully'));

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

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

package/es/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/es/schema-component/antd/index.js

@@ -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/es/schema-component/antd/menu/Menu.js

@@ -232,7 +232,8 @@ Menu.Item = observer(function (props) {
     eventKey: schema.name,
     schema: schema
   }), /*#__PURE__*/React.createElement(SortableItem, {
-    className: designerCss
+    className: designerCss,
+    removeParentsIfNoChildren: false
   }, /*#__PURE__*/React.createElement(Icon, {
     type: icon
   }), /*#__PURE__*/React.createElement("span", {
@@ -254,7 +255,8 @@ Menu.URL = observer(function (props) {
       window.open(props.href, '_blank');
     }
   }), /*#__PURE__*/React.createElement(SortableItem, {
-    className: designerCss
+    className: designerCss,
+    removeParentsIfNoChildren: false
   }, /*#__PURE__*/React.createElement(Icon, {
     type: icon
   }), /*#__PURE__*/React.createElement("span", {
@@ -276,7 +278,8 @@ Menu.SubMenu = observer(function (props) {
     key: schema.name,
     eventKey: schema.name,
     title: /*#__PURE__*/React.createElement(SortableItem, {
-      className: subMenuDesignerCss
+      className: subMenuDesignerCss,
+      removeParentsIfNoChildren: false
     }, /*#__PURE__*/React.createElement(Icon, {
       type: icon
     }), field.title, /*#__PURE__*/React.createElement(Designer, null))

package/es/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/es/schema-component/antd/record-picker/InputRecordPicker.js

@@ -1,6 +1,7 @@
 function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 var _excluded = ["onRowSelectionChange", "rowKey"],
-  _excluded2 = ["value", "multiple", "onChange", "quickUpload", "selectFile"];
+  _excluded2 = ["value", "multiple", "onChange", "quickUpload", "selectFile"],
+  _excluded3 = ["multiple", "onChange", "selectedRows", "setSelectedRows", "options", "collectionField"];
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
@@ -63,7 +64,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];
         });
@@ -208,12 +209,16 @@ export 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]);
         });
@@ -236,6 +241,25 @@ export var InputRecordPicker = function InputRecordPicker(props) {
     options: options
   }));
 };
+export 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__*/React.createElement(RecordPickerContext.Provider, {
+    value: _objectSpread({
+      multiple: multiple,
+      onChange: onChange,
+      selectedRows: selectedRows,
+      setSelectedRows: setSelectedRows,
+      options: options,
+      collectionField: collectionField
+    }, other)
+  }, props.children);
+};
 var Drawer = function Drawer(_ref) {
   var multiple = _ref.multiple,
     onChange = _ref.onChange,
@@ -256,16 +280,15 @@ var Drawer = function Drawer(_ref) {
     } : {};
     return filter;
   };
-  return /*#__PURE__*/React.createElement(RecordPickerContext.Provider, {
-    value: {
-      multiple: multiple,
-      onChange: onChange,
-      selectedRows: selectedRows,
-      setSelectedRows: setSelectedRows,
-      options: options,
-      collectionField: collectionField
-    }
-  }, /*#__PURE__*/React.createElement(CollectionProvider, {
+  var recordPickerProps = {
+    multiple: multiple,
+    onChange: onChange,
+    selectedRows: selectedRows,
+    setSelectedRows: setSelectedRows,
+    options: options,
+    collectionField: collectionField
+  };
+  return /*#__PURE__*/React.createElement(RecordPickerProvider, _objectSpread({}, recordPickerProps), /*#__PURE__*/React.createElement(CollectionProvider, {
     allowNull: true,
     name: collectionField === null || collectionField === void 0 ? void 0 : collectionField.target
   }, /*#__PURE__*/React.createElement(ActionContext.Provider, {

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

@@ -11,9 +11,10 @@ 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; }
 import { LoadingOutlined } from '@ant-design/icons';
-import { connect, mapProps, mapReadPretty, useFieldSchema } from '@formily/react';
+import { connect, mapProps, mapReadPretty, useFieldSchema, useField } from '@formily/react';
 import { Tag } from 'antd';
 import moment from 'moment';
+import { uniqBy } from 'lodash';
 import React, { useCallback, useEffect, useMemo, useRef } from 'react';
 import { useRequest } from '../../../api-client';
 import { mergeFilter } from '../../../block-provider/SharedFilterProvider';
@@ -22,7 +23,7 @@ import { useCompile } from '../../hooks';
 import { Select, defaultFieldNames } from '../select';
 import { ReadPretty } from './ReadPretty';
 var InternalRemoteSelect = 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,
@@ -39,6 +40,7 @@ var InternalRemoteSelect = connect(function (props) {
   var compile = useCompile();
   var firstRun = useRef(false);
   var fieldSchema = useFieldSchema();
+  var field = useField();
   var _useCollection = useCollection(),
     getField = _useCollection.getField;
   var _useCollectionManager = useCollectionManager(),
@@ -56,7 +58,7 @@ var InternalRemoteSelect = connect(function (props) {
   var mapOptionsToTags = 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)) {
@@ -94,7 +96,7 @@ var InternalRemoteSelect = 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);
@@ -109,7 +111,7 @@ var InternalRemoteSelect = connect(function (props) {
       }, service === null || service === void 0 ? void 0 : service.params), {}, {
         // fields: [fieldNames.label, fieldNames.value, ...(service?.params?.fields || [])],
         // search needs
-        filter: mergeFilter([service === null || service === void 0 ? void 0 : (_service$params = service.params) === null || _service$params === void 0 ? void 0 : _service$params.filter])
+        filter: 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,
@@ -131,13 +133,13 @@ var InternalRemoteSelect = 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: 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: 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":
@@ -146,32 +148,28 @@ var InternalRemoteSelect = connect(function (props) {
       }, _callee);
     }));
     return function onSearch(_x) {
-      return _ref2.apply(this, arguments);
+      return _ref.apply(this, arguments);
     };
   }();
   var getOptionsByFieldNames = 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 = 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 = 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 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/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);
+};