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

package/lib/schema-component/antd/form-item/FormItem.js

@@ -1,15 +1,18 @@
 "use strict";
 
+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); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.FormItem = void 0;
 exports.getFieldDefaultValue = getFieldDefaultValue;
+exports.isFileCollection = isFileCollection;
 var _css = require("@emotion/css");
 var _antd = require("@formily/antd");
 var _react = require("@formily/react");
 var _shared = require("@formily/shared");
 var _lodash = _interopRequireDefault(require("lodash"));
+var _moment = _interopRequireDefault(require("moment"));
 var _react2 = _interopRequireWildcard(require("react"));
 var _reactI18next = require("react-i18next");
 var _ACLProvider = require("../../../acl/ACLProvider");
@@ -18,27 +21,30 @@ var _collectionManager = require("../../../collection-manager");
 var _CollectionFields = require("../../../collection-manager/Configuration/CollectionFields");
 var _schemaSettings = require("../../../schema-settings");
 var _VariableInput = require("../../../schema-settings/VariableInput/VariableInput");
+var _FilterDynamicComponent = require("../table-v2/FilterDynamicComponent");
 var _uitls = require("../../common/utils/uitls");
 var _core = require("../../core");
+var _filter = require("../filter");
 var _hooks = require("../../hooks");
 var _blockItem = require("../block-item");
 var _shared2 = require("../input/shared");
+var _variable = require("../variable");
 var _FormItem = require("./FormItem.FilterFormDesigner");
 var _SchemaSettingOptions = require("./SchemaSettingOptions");
-var _templateObject;
+var _templateObject, _templateObject2;
 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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-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); }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 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); }
+function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+var defaultInputStyle = (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  & > .nb-form-item {\n    flex: 1;\n  }\n"])));
 var divWrap = function divWrap(schema) {
   return {
     type: 'void',
@@ -70,7 +76,7 @@ var FormItem = (0, _react.observer)(function (props) {
   return /*#__PURE__*/_react2.default.createElement(_ACLProvider.ACLCollectionFieldProvider, null, /*#__PURE__*/_react2.default.createElement(_blockItem.BlockItem, {
     className: 'nb-form-item'
   }, /*#__PURE__*/_react2.default.createElement(_antd.FormItem, _objectSpread(_objectSpread({
-    className: "".concat((0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n            & .ant-space {\n              flex-wrap: wrap;\n            }\n          "]))))
+    className: "".concat((0, _css.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n            & .ant-space {\n              flex-wrap: wrap;\n            }\n          "]))))
   }, props), {}, {
     extra: typeof field.description === 'string' ? /*#__PURE__*/_react2.default.createElement("div", {
       dangerouslySetInnerHTML: {
@@ -81,7 +87,7 @@ var FormItem = (0, _react.observer)(function (props) {
 });
 exports.FormItem = FormItem;
 FormItem.Designer = function Designer() {
-  var _interfaceConfig$vali, _collectionField$uiSc, _getCollectionFields, _collectionField$uiSc2, _fieldSchema$xDecora, _fieldSchema$xCompon, _fieldSchema$xCompon2, _fieldSchema$xCompon3, _fieldSchema$xCompon4, _fieldSchema$xCompon5, _field$componentProps, _field$componentProps2;
+  var _interfaceConfig$vali, _collectionField$uiSc, _getCollectionFields, _field$componentProps, _field$componentProps2, _field$componentProps3, _field$componentProps4, _field$componentProps5, _field$componentProps6, _field$componentProps7, _collectionField$uiSc2, _fieldSchema$xDecora, _fieldSchema$xCompon, _fieldSchema$xCompon2, _fieldSchema$xCompon3, _fieldSchema$xCompon4, _field$componentProps8, _field$componentProps9;
   var _useCollectionManager = (0, _collectionManager.useCollectionManager)(),
     getCollectionFields = _useCollectionManager.getCollectionFields,
     getInterface = _useCollectionManager.getInterface,
@@ -108,8 +114,10 @@ FormItem.Designer = function Designer() {
   var validateSchema = interfaceConfig === null || interfaceConfig === void 0 ? void 0 : (_interfaceConfig$vali = interfaceConfig['validateSchema']) === null || _interfaceConfig$vali === void 0 ? void 0 : _interfaceConfig$vali.call(interfaceConfig, fieldSchema);
   var originalTitle = collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc = collectionField.uiSchema) === null || _collectionField$uiSc === void 0 ? void 0 : _collectionField$uiSc.title;
   var targetFields = (collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) ? getCollectionFields(collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) : (_getCollectionFields = getCollectionFields(collectionField === null || collectionField === void 0 ? void 0 : collectionField.targetCollection)) !== null && _getCollectionFields !== void 0 ? _getCollectionFields : [];
-  var fieldComponentOptions = (0, _hooks.useFieldComponentOptions)();
-  var isSubFormAssociationField = field.address.segments.includes('__form_grid');
+  var fieldModeOptions = (0, _hooks.useFieldModeOptions)();
+  var isAssociationField = ['belongsTo', 'hasOne', 'hasMany', 'belongsToMany'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.type);
+  var isTableField = fieldSchema['x-component'] === 'TableField';
+  var isFileField = isFileCollection(targetCollection);
   var initialValue = {
     title: field.title === originalTitle ? undefined : field.title
   };
@@ -132,6 +140,21 @@ FormItem.Designer = function Designer() {
   if (fieldSchema['x-read-pretty'] === true) {
     readOnlyMode = 'read-pretty';
   }
+  var dataSource = (0, _collectionManager.useCollectionFilterOptions)(collectionField === null || collectionField === void 0 ? void 0 : collectionField.target);
+  var defaultFilter = ((_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) || {};
+  var sortFields = (0, _collectionManager.useSortFields)(collectionField === null || collectionField === void 0 ? void 0 : collectionField.target);
+  var defaultSort = ((_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.sort) || [];
+  var fieldMode = (field === null || field === void 0 ? void 0 : (_field$componentProps7 = field.componentProps) === null || _field$componentProps7 === void 0 ? void 0 : _field$componentProps7['mode']) || (isFileField ? 'FileManager' : 'Select');
+  var isSelectFieldMode = fieldMode === 'Select';
+  var sort = defaultSort === null || defaultSort === void 0 ? void 0 : defaultSort.map(function (item) {
+    return item.startsWith('-') ? {
+      field: item.substring(1),
+      direction: 'desc'
+    } : {
+      field: item,
+      direction: 'asc'
+    };
+  });
   return /*#__PURE__*/_react2.default.createElement(_schemaSettings.GeneralSchemaDesigner, null, collectionField && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.ModalItem, {
     key: "edit-field-title",
     title: t('Edit field title'),
@@ -233,10 +256,10 @@ FormItem.Designer = function Designer() {
       });
       refresh();
     }
-  }), !(form === null || form === void 0 ? void 0 : form.readPretty) && isFileCollection(targetCollection) ? /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
+  }), !(form === null || form === void 0 ? void 0 : form.readPretty) && isFileField ? /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
     key: "quick-upload",
     title: t('Quick upload'),
-    checked: (_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : _fieldSchema$xCompon.quickUpload,
+    checked: ((_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : _fieldSchema$xCompon.quickUpload) !== false,
     onChange: function onChange(value) {
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
       field.componentProps.quickUpload = value;
@@ -248,10 +271,10 @@ FormItem.Designer = function Designer() {
       });
       refresh();
     }
-  }) : null, !(form === null || form === void 0 ? void 0 : form.readPretty) && isFileCollection(targetCollection) ? /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
+  }) : null, !(form === null || form === void 0 ? void 0 : form.readPretty) && isFileField ? /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
     key: "select-file",
     title: t('Select file'),
-    checked: (_fieldSchema$xCompon2 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon2 === void 0 ? void 0 : _fieldSchema$xCompon2.selectFile,
+    checked: ((_fieldSchema$xCompon2 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon2 === void 0 ? void 0 : _fieldSchema$xCompon2.selectFile) !== false,
     onChange: function onChange(value) {
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
       field.componentProps.selectFile = value;
@@ -410,27 +433,35 @@ FormItem.Designer = function Designer() {
       type: 'object',
       title: t('Set default value'),
       properties: {
-        // 关系字段不支持设置变量
-        default: (collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) ? _objectSpread(_objectSpread({}, fieldSchema || {}), {}, {
+        default: (0, _variable.isInvariable)(interfaceConfig) ? _objectSpread(_objectSpread({}, fieldSchema || {}), {}, {
           'x-decorator': 'FormItem',
           'x-component-props': _objectSpread(_objectSpread({}, fieldSchema['x-component-props']), {}, {
             component: (collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) && collectionField.interface !== 'chinaRegion' ? 'AssociationSelect' : undefined,
             service: {
               resource: collectionField === null || collectionField === void 0 ? void 0 : collectionField.target
+            },
+            style: {
+              width: '100%',
+              verticalAlign: 'top'
             }
           }),
           name: 'default',
           title: t('Default value'),
-          default: getFieldDefaultValue(fieldSchema, collectionField)
+          default: getFieldDefaultValue(fieldSchema, collectionField),
+          'x-read-pretty': false,
+          'x-disabled': false
         }) : _objectSpread(_objectSpread({}, fieldSchema || {}), {}, {
           'x-decorator': 'FormItem',
           'x-component': 'VariableInput',
           'x-component-props': _objectSpread(_objectSpread({}, (fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-component-props']) || {}), {}, {
             collectionName: collectionField === null || collectionField === void 0 ? void 0 : collectionField.collectionName,
             schema: collectionField === null || collectionField === void 0 ? void 0 : collectionField.uiSchema,
+            className: defaultInputStyle,
             renderSchemaComponent: function Com(props) {
               var s = _lodash.default.cloneDeep(fieldSchema) || {};
               s.title = '';
+              s['x-read-pretty'] = false;
+              s['x-disabled'] = false;
               return /*#__PURE__*/_react2.default.createElement(_core.SchemaComponent, {
                 schema: _objectSpread(_objectSpread({}, s || {}), {}, {
                   'x-component-props': _objectSpread(_objectSpread({}, s['x-component-props']), {}, {
@@ -438,7 +469,8 @@ FormItem.Designer = function Designer() {
                     value: props.value,
                     defaultValue: getFieldDefaultValue(s, collectionField),
                     style: {
-                      width: '100%'
+                      width: '100%',
+                      verticalAlign: 'top'
                     }
                   })
                 })
@@ -463,43 +495,153 @@ FormItem.Designer = function Designer() {
       });
       refresh();
     }
-  }), form && !isSubFormAssociationField && fieldComponentOptions && /*#__PURE__*/_react2.default.createElement(_schemaSettings.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 === null || collectionField === void 0 ? void 0 : 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: targetCollection
+  }), isSelectFieldMode && !field.readPretty && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.ModalItem, {
+    title: t('Set the data scope'),
+    schema: {
+      type: 'object',
+      title: t('Set the data scope'),
+      properties: {
+        filter: {
+          default: defaultFilter,
+          // title: '数据范围',
+          enum: dataSource,
+          'x-component': 'Filter',
+          'x-component-props': {
+            dynamicComponent: function dynamicComponent(props) {
+              return (0, _FilterDynamicComponent.FilterDynamicComponent)(_objectSpread({}, props));
+            }
+          }
+        }
+      }
+    },
+    onSubmit: function onSubmit(_ref4) {
+      var _schema6;
+      var filter = _ref4.filter;
+      filter = (0, _filter.removeNullCondition)(filter);
+      _lodash.default.set(field.componentProps, 'service.params.filter', filter);
+      fieldSchema['x-component-props'] = field.componentProps;
+      field.componentProps = field.componentProps;
+      dn.emit('patch', {
+        schema: (_schema6 = {}, _defineProperty(_schema6, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema6, 'x-component-props', field.componentProps), _schema6)
       });
-      insertAdjacent('beforeBegin', divWrap(schema), {
-        onSuccess: function onSuccess() {
-          dn.remove(null, {
-            removeParentsIfNoChildren: true,
-            breakRemoveOn: {
-              'x-component': 'Grid'
+    }
+  }), isSelectFieldMode && !field.readPretty && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.ModalItem, {
+    title: t('Set default sorting rules'),
+    components: {
+      ArrayItems: _antd.ArrayItems
+    },
+    schema: {
+      type: 'object',
+      title: t('Set default sorting rules'),
+      properties: {
+        sort: {
+          type: 'array',
+          default: sort,
+          'x-component': 'ArrayItems',
+          'x-decorator': 'FormItem',
+          items: {
+            type: 'object',
+            properties: {
+              space: {
+                type: 'void',
+                'x-component': 'Space',
+                properties: {
+                  sort: {
+                    type: 'void',
+                    'x-decorator': 'FormItem',
+                    'x-component': 'ArrayItems.SortHandle'
+                  },
+                  field: {
+                    type: 'string',
+                    enum: sortFields,
+                    'x-decorator': 'FormItem',
+                    'x-component': 'Select',
+                    'x-component-props': {
+                      style: {
+                        width: 260
+                      }
+                    }
+                  },
+                  direction: {
+                    type: 'string',
+                    'x-decorator': 'FormItem',
+                    'x-component': 'Radio.Group',
+                    'x-component-props': {
+                      optionType: 'button'
+                    },
+                    enum: [{
+                      label: t('ASC'),
+                      value: 'asc'
+                    }, {
+                      label: t('DESC'),
+                      value: 'desc'
+                    }]
+                  },
+                  remove: {
+                    type: 'void',
+                    'x-decorator': 'FormItem',
+                    'x-component': 'ArrayItems.Remove'
+                  }
+                }
+              }
             }
-          });
+          },
+          properties: {
+            add: {
+              type: 'void',
+              title: t('Add sort field'),
+              'x-component': 'ArrayItems.Addition'
+            }
+          }
         }
+      }
+    },
+    onSubmit: function onSubmit(_ref5) {
+      var _schema7;
+      var sort = _ref5.sort;
+      var sortArr = sort.map(function (item) {
+        return item.direction === 'desc' ? "-".concat(item.field) : item.field;
+      });
+      _lodash.default.set(field.componentProps, 'service.params.sort', sortArr);
+      fieldSchema['x-component-props'] = field.componentProps;
+      dn.emit('patch', {
+        schema: (_schema7 = {}, _defineProperty(_schema7, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema7, 'x-component-props', field.componentProps), _schema7)
+      });
+    }
+  }), isAssociationField && fieldModeOptions && !isTableField && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
+    key: "field-mode",
+    title: t('Field mode'),
+    options: fieldModeOptions,
+    value: fieldMode,
+    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;
+      if (mode === 'Nester') {
+        var initValue = ['o2m', 'm2m'].includes(collectionField.interface) ? [] : {};
+        field.value = field.value || initValue;
+      }
+      dn.emit('patch', {
+        schema: schema
       });
+      dn.refresh();
+    }
+  }), !field.readPretty && isAssociationField && ['Select', 'Picker'].includes(fieldMode) && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
+    key: "allowAddNew",
+    title: t('Allow add new data'),
+    checked: fieldSchema['x-add-new'],
+    onChange: function onChange(allowAddNew) {
+      var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
+      field['x-add-new'] = allowAddNew;
+      fieldSchema['x-add-new'] = allowAddNew;
+      schema['x-add-new'] = allowAddNew;
+      dn.emit('patch', {
+        schema: schema
+      });
+      refresh();
     }
   }), form && !(form === null || form === void 0 ? void 0 : form.readPretty) && ['o2m', 'm2m'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) && fieldSchema['x-component'] !== 'TableField' && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
     key: "multiple",
@@ -517,13 +659,14 @@ FormItem.Designer = function Designer() {
       });
       refresh();
     }
-  }), field.readPretty && options.length > 0 && fieldSchema['x-component'] === 'CollectionField' && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
+  }), field.readPretty && options.length > 0 && fieldSchema['x-component'] === 'CollectionField' && !isFileField && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
     title: t('Enable link'),
-    checked: ((_fieldSchema$xCompon4 = (_fieldSchema$xCompon5 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon5 === void 0 ? void 0 : _fieldSchema$xCompon5.mode) !== null && _fieldSchema$xCompon4 !== void 0 ? _fieldSchema$xCompon4 : 'links') === 'links',
+    checked: ((_fieldSchema$xCompon4 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon4 === void 0 ? void 0 : _fieldSchema$xCompon4.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['enableLink'] = flag;
       dn.emit('patch', {
         schema: {
           'x-uid': fieldSchema['x-uid'],
@@ -588,16 +731,17 @@ FormItem.Designer = function Designer() {
     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$componentProps8 = field.componentProps) === null || _field$componentProps8 === void 0 ? void 0 : (_field$componentProps9 = _field$componentProps8.fieldNames) === null || _field$componentProps9 === void 0 ? void 0 : _field$componentProps9.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
       });
@@ -619,5 +763,10 @@ function isFileCollection(collection) {
 }
 FormItem.FilterFormDesigner = _FormItem.FilterFormDesigner;
 function getFieldDefaultValue(fieldSchema, collectionField) {
-  return (fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema.default) || (collectionField === null || collectionField === void 0 ? void 0 : collectionField.defaultValue);
+  var _collectionField$uiSc6;
+  var result = (fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema.default) || (collectionField === null || collectionField === void 0 ? void 0 : collectionField.defaultValue);
+  if ((collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc6 = collectionField.uiSchema) === null || _collectionField$uiSc6 === void 0 ? void 0 : _collectionField$uiSc6['x-component']) === 'DatePicker' && result) {
+    return (0, _moment.default)(result);
+  }
+  return result;
 }

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

@@ -15,6 +15,7 @@ var _collectionManager = require("../../../collection-manager");
 var _schemaSettings = require("../../../schema-settings");
 var _hooks = require("../../hooks");
 var _useOperators = require("../filter/useOperators");
+var _FormItem = require("./FormItem");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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); }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
@@ -401,64 +402,39 @@ var EditDefaultValue = function EditDefaultValue() {
 };
 exports.EditDefaultValue = EditDefaultValue;
 var EditComponent = function EditComponent() {
+  var _field$componentProps;
   var _useCollectionManager4 = (0, _collectionManager.useCollectionManager)(),
-    getInterface = _useCollectionManager4.getInterface,
     getCollectionJoinField = _useCollectionManager4.getCollectionJoinField,
     getCollection = _useCollectionManager4.getCollection;
   var _useCollection4 = (0, _collectionManager.useCollection)(),
-    getField = _useCollection4.getField,
-    template = _useCollection4.template;
-  var tk = (0, _blockProvider.useFilterByTk)();
-  var _useFormBlockContext3 = (0, _blockProvider.useFormBlockContext)(),
-    form = _useFormBlockContext3.form;
+    getField = _useCollection4.getField;
   var field = (0, _react.useField)();
   var fieldSchema = (0, _react.useFieldSchema)();
   var _useTranslation7 = (0, _reactI18next.useTranslation)(),
     t = _useTranslation7.t;
   var _useDesignable7 = (0, _hooks.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 = (0, _hooks.useFieldComponentOptions)();
-  var isSubFormAssociationField = field.address.segments.includes('__form_grid');
-  return form && !isSubFormAssociationField && fieldComponentOptions ? /*#__PURE__*/_react2.default.createElement(_schemaSettings.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 = (0, _hooks.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 = (0, _FormItem.isFileCollection)(targetCollection);
+  return isAssociationField && fieldModeOptions ? /*#__PURE__*/_react2.default.createElement(_schemaSettings.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;
 };
@@ -468,8 +444,8 @@ var EditPattern = function EditPattern() {
     getCollectionJoinField = _useCollectionManager5.getCollectionJoinField;
   var _useCollection5 = (0, _collectionManager.useCollection)(),
     getField = _useCollection5.getField;
-  var _useFormBlockContext4 = (0, _blockProvider.useFormBlockContext)(),
-    form = _useFormBlockContext4.form;
+  var _useFormBlockContext3 = (0, _blockProvider.useFormBlockContext)(),
+    form = _useFormBlockContext3.form;
   var field = (0, _react.useField)();
   var fieldSchema = (0, _react.useFieldSchema)();
   var _useTranslation8 = (0, _reactI18next.useTranslation)(),
@@ -562,7 +538,8 @@ var EditOperator = function EditOperator() {
     dn = _useDesignable9.dn;
   var operatorList = (0, _useOperators.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;
@@ -573,9 +550,9 @@ 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
       });
@@ -585,7 +562,7 @@ var EditOperator = function EditOperator() {
 };
 exports.EditOperator = EditOperator;
 var EditTitleField = function EditTitleField() {
-  var _getCollectionFields, _field$componentProps, _field$componentProps2;
+  var _getCollectionFields, _field$componentProps2, _field$componentProps3;
   var _useCollectionManager6 = (0, _collectionManager.useCollectionManager)(),
     getCollectionFields = _useCollectionManager6.getCollectionFields,
     getCollectionJoinField = _useCollectionManager6.getCollectionJoinField;
@@ -613,16 +590,17 @@ 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/lib/schema-component/antd/form-v2/utils.js

@@ -4,11 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.linkageMergeAction = void 0;
+var _client = require("@nocobase/evaluators/client");
 var _lodash = require("lodash");
-var _uitls = require("../../common/utils/uitls");
 var _type = require("../../../schema-settings/LinkageRules/type");
-var _client = _interopRequireDefault(require("@nocobase/evaluators/client"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _uitls = require("../../common/utils/uitls");
 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); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -23,7 +22,7 @@ var linkageMergeAction = function linkageMergeAction(_ref, field, condition, val
   var displayResult = (field === null || field === void 0 ? void 0 : (_field$linkagePropert2 = field.linkageProperty) === null || _field$linkagePropert2 === void 0 ? void 0 : _field$linkagePropert2.display) || [field === null || field === void 0 ? void 0 : (_field$initProperty2 = field.initProperty) === null || _field$initProperty2 === void 0 ? void 0 : _field$initProperty2.display];
   var patternResult = (field === null || field === void 0 ? void 0 : (_field$linkagePropert3 = field.linkageProperty) === null || _field$linkagePropert3 === void 0 ? void 0 : _field$linkagePropert3.pattern) || [field === null || field === void 0 ? void 0 : (_field$initProperty3 = field.initProperty) === null || _field$initProperty3 === void 0 ? void 0 : _field$initProperty3.pattern];
   var valueResult = (field === null || field === void 0 ? void 0 : (_field$linkagePropert4 = field.linkageProperty) === null || _field$linkagePropert4 === void 0 ? void 0 : _field$linkagePropert4.value) || [field.value || (field === null || field === void 0 ? void 0 : (_field$initProperty4 = field.initProperty) === null || _field$initProperty4 === void 0 ? void 0 : _field$initProperty4.value)];
-  var _evaluators$get = _client.default.get('formula.js'),
+  var _evaluators$get = _client.evaluators.get('formula.js'),
     evaluate = _evaluators$get.evaluate;
   switch (operator) {
     case _type.ActionType.Required:
@@ -77,7 +76,9 @@ var linkageMergeAction = function linkageMergeAction(_ref, field, condition, val
               }
             }));
             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 {