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

package/es/schema-component/antd/expand-action/Expand.Action.js

@@ -0,0 +1,40 @@
+var _templateObject;
+function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+import React from 'react';
+import { useFieldSchema } from '@formily/react';
+import { useTranslation } from 'react-i18next';
+import { useTableBlockContext, useTableSelectorContext } from '../../../block-provider';
+import { Button } from 'antd';
+import { css } from '@emotion/css';
+import { Icon } from '../../../icon';
+var actionDesignerCss = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  position: relative;\n  &:hover {\n    .general-schema-designer {\n      display: block;\n    }\n  }\n  .general-schema-designer {\n    position: absolute;\n    z-index: 999;\n    top: 0;\n    bottom: 0;\n    left: 0;\n    right: 0;\n    display: none;\n    background: rgba(241, 139, 98, 0.06);\n    border: 0;\n    top: 0;\n    bottom: 0;\n    left: 0;\n    right: 0;\n    pointer-events: none;\n    > .general-schema-designer-icons {\n      position: absolute;\n      right: 2px;\n      top: 2px;\n      line-height: 16px;\n      pointer-events: all;\n      .ant-space-item {\n        background-color: #f18b62;\n        color: #fff;\n        line-height: 16px;\n        width: 16px;\n        padding-left: 1px;\n      }\n    }\n  }\n"])));
+export var ExpandAction = function ExpandAction(props) {
+  var _schema$parent, _schema$parent$parent;
+  var _useTranslation = useTranslation(),
+    t = _useTranslation.t;
+  var schema = useFieldSchema();
+  var ctxSelector = useTableSelectorContext();
+  var ctxBlock = useTableBlockContext();
+  var isTableSelector = ((_schema$parent = schema.parent) === null || _schema$parent === void 0 ? void 0 : (_schema$parent$parent = _schema$parent.parent) === null || _schema$parent$parent === void 0 ? void 0 : _schema$parent$parent['x-decorator']) === 'TableSelectorProvider';
+  var ctx = isTableSelector ? ctxSelector : ctxBlock;
+  var _ref = schema['x-component-props'] || {},
+    titleExpand = _ref.titleExpand,
+    titleCollapse = _ref.titleCollapse,
+    iconExpand = _ref.iconExpand,
+    iconCollapse = _ref.iconCollapse;
+  return /*#__PURE__*/React.createElement("div", {
+    className: actionDesignerCss
+  }, (ctx === null || ctx === void 0 ? void 0 : ctx.params['tree']) && /*#__PURE__*/React.createElement(Button, {
+    onClick: function onClick() {
+      ctx === null || ctx === void 0 ? void 0 : ctx.setExpandFlag();
+    },
+    icon: /*#__PURE__*/React.createElement(Icon, {
+      type: (ctx === null || ctx === void 0 ? void 0 : ctx.expandFlag) ? iconCollapse : iconExpand
+    }),
+    type: props.type
+  }, props.children[1], /*#__PURE__*/React.createElement("span", {
+    style: {
+      marginLeft: 10
+    }
+  }, (ctx === null || ctx === void 0 ? void 0 : ctx.expandFlag) ? titleCollapse : titleExpand)));
+};

package/es/schema-component/antd/expand-action/index.d.ts

@@ -0,0 +1 @@
+export declare const Expand: any;

package/es/schema-component/antd/expand-action/index.js

@@ -0,0 +1,5 @@
+import { ExpandAction } from './Expand.Action';
+import { ExpandActionDesign } from './Expand.Action.Design';
+export var Expand = ExpandAction;
+Expand.Action = ExpandAction;
+Expand.Action.Design = ExpandActionDesign;

package/es/schema-component/antd/filter/Filter.Action.Designer.js

@@ -92,20 +92,18 @@ export var FilterActionDesigner = function FilterActionDesigner(props) {
       }
     },
     onSubmit: function onSubmit(_ref) {
+      var _schema2;
       var title = _ref.title,
         icon = _ref.icon;
-      if (title) {
-        var _schema2;
-        fieldSchema.title = title;
-        field.title = title;
-        field.componentProps.icon = icon;
-        fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
-        fieldSchema['x-component-props'].icon = icon;
-        dn.emit('patch', {
-          schema: (_schema2 = {}, _defineProperty(_schema2, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema2, "title", title), _defineProperty(_schema2, 'x-component-props', _objectSpread({}, fieldSchema['x-component-props'])), _schema2)
-        });
-        dn.refresh();
-      }
+      fieldSchema.title = title;
+      field.title = title;
+      field.componentProps.icon = icon;
+      fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
+      fieldSchema['x-component-props'].icon = icon;
+      dn.emit('patch', {
+        schema: (_schema2 = {}, _defineProperty(_schema2, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema2, "title", title), _defineProperty(_schema2, 'x-component-props', _objectSpread({}, fieldSchema['x-component-props'])), _schema2)
+      });
+      dn.refresh();
     }
   }), /*#__PURE__*/React.createElement(SchemaSettings.Divider, null), /*#__PURE__*/React.createElement(SchemaSettings.Remove, {
     removeParentsIfNoChildren: true,

package/es/schema-component/antd/filter/FilterItem.js

@@ -52,7 +52,7 @@ export var FilterItem = observer(function (props) {
     },
     placeholder: t('Comparision')
   }), !(operator === null || operator === void 0 ? void 0 : operator.noValue) && /*#__PURE__*/React.createElement(DynamicComponent, {
-    value: value,
+    value: value ? value : undefined,
     schema: schema,
     onChange: function onChange(value) {
       setValue(value);

package/es/schema-component/antd/filter/useOperators.d.ts

@@ -2,4 +2,4 @@
  * 获取当前字段所支持的操作符列表
  * @returns
  */
-export declare const useOperatorList: () => any;
+export declare const useOperatorList: () => any[];

package/es/schema-component/antd/form-item/FormItem.d.ts

@@ -1,4 +1,5 @@
 import { ISchema } from '@formily/react';
-import { CollectionFieldOptions } from '../../../collection-manager';
+import { Collection, CollectionFieldOptions } from '../../../collection-manager';
 export declare const FormItem: any;
+export declare function isFileCollection(collection: Collection): boolean;
 export declare function getFieldDefaultValue(fieldSchema: ISchema, collectionField: CollectionFieldOptions): any;

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

@@ -1,34 +1,39 @@
-var _templateObject;
 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 _templateObject, _templateObject2;
 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) } })); }
 import { css } from '@emotion/css';
-import { ArrayCollapse, FormLayout, FormItem as Item } from '@formily/antd';
+import { ArrayCollapse, FormLayout, FormItem as Item, ArrayItems } from '@formily/antd';
 import { observer, useField, useFieldSchema } from '@formily/react';
 import { uid } from '@formily/shared';
 import _ from 'lodash';
+import moment from 'moment';
 import React, { useContext, useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { ACLCollectionFieldProvider } from '../../../acl/ACLProvider';
 import { BlockRequestContext, useFilterByTk, useFormBlockContext } from '../../../block-provider';
-import { useCollection, useCollectionManager } from '../../../collection-manager';
+import { useCollection, useCollectionManager, useSortFields, useCollectionFilterOptions } from '../../../collection-manager';
 import { isTitleField } from '../../../collection-manager/Configuration/CollectionFields';
 import { GeneralSchemaDesigner, SchemaSettings, isPatternDisabled, isShowDefaultValue } from '../../../schema-settings';
 import { VariableInput } from '../../../schema-settings/VariableInput/VariableInput';
+import { FilterDynamicComponent } from '../table-v2/FilterDynamicComponent';
 import { isVariable, parseVariables, useVariablesCtx } from '../../common/utils/uitls';
 import { SchemaComponent } from '../../core';
-import { useCompile, useDesignable, useFieldComponentOptions } from '../../hooks';
+import { removeNullCondition } from '../filter';
+import { useCompile, useDesignable, useFieldModeOptions } from '../../hooks';
 import { BlockItem } from '../block-item';
 import { HTMLEncode } from '../input/shared';
+import { isInvariable } from '../variable';
 import { FilterFormDesigner } from './FormItem.FilterFormDesigner';
 import { useEnsureOperatorsValid } from './SchemaSettingOptions';
+var defaultInputStyle = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  & > .nb-form-item {\n    flex: 1;\n  }\n"])));
 var divWrap = function divWrap(schema) {
   return {
     type: 'void',
@@ -60,7 +65,7 @@ export var FormItem = observer(function (props) {
   return /*#__PURE__*/React.createElement(ACLCollectionFieldProvider, null, /*#__PURE__*/React.createElement(BlockItem, {
     className: 'nb-form-item'
   }, /*#__PURE__*/React.createElement(Item, _objectSpread(_objectSpread({
-    className: "".concat(css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n            & .ant-space {\n              flex-wrap: wrap;\n            }\n          "]))))
+    className: "".concat(css(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n            & .ant-space {\n              flex-wrap: wrap;\n            }\n          "]))))
   }, props), {}, {
     extra: typeof field.description === 'string' ? /*#__PURE__*/React.createElement("div", {
       dangerouslySetInnerHTML: {
@@ -70,7 +75,7 @@ export var FormItem = observer(function (props) {
   }))));
 });
 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 = useCollectionManager(),
     getCollectionFields = _useCollectionManager.getCollectionFields,
     getInterface = _useCollectionManager.getInterface,
@@ -97,8 +102,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 = useFieldComponentOptions();
-  var isSubFormAssociationField = field.address.segments.includes('__form_grid');
+  var fieldModeOptions = 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
   };
@@ -121,6 +128,21 @@ FormItem.Designer = function Designer() {
   if (fieldSchema['x-read-pretty'] === true) {
     readOnlyMode = 'read-pretty';
   }
+  var dataSource = 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 = 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__*/React.createElement(GeneralSchemaDesigner, null, collectionField && /*#__PURE__*/React.createElement(SchemaSettings.ModalItem, {
     key: "edit-field-title",
     title: t('Edit field title'),
@@ -222,10 +244,10 @@ FormItem.Designer = function Designer() {
       });
       refresh();
     }
-  }), !(form === null || form === void 0 ? void 0 : form.readPretty) && isFileCollection(targetCollection) ? /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
+  }), !(form === null || form === void 0 ? void 0 : form.readPretty) && isFileField ? /*#__PURE__*/React.createElement(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;
@@ -237,10 +259,10 @@ FormItem.Designer = function Designer() {
       });
       refresh();
     }
-  }) : null, !(form === null || form === void 0 ? void 0 : form.readPretty) && isFileCollection(targetCollection) ? /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
+  }) : null, !(form === null || form === void 0 ? void 0 : form.readPretty) && isFileField ? /*#__PURE__*/React.createElement(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;
@@ -399,27 +421,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: 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 = _.cloneDeep(fieldSchema) || {};
               s.title = '';
+              s['x-read-pretty'] = false;
+              s['x-disabled'] = false;
               return /*#__PURE__*/React.createElement(SchemaComponent, {
                 schema: _objectSpread(_objectSpread({}, s || {}), {}, {
                   'x-component-props': _objectSpread(_objectSpread({}, s['x-component-props']), {}, {
@@ -427,7 +457,8 @@ FormItem.Designer = function Designer() {
                     value: props.value,
                     defaultValue: getFieldDefaultValue(s, collectionField),
                     style: {
-                      width: '100%'
+                      width: '100%',
+                      verticalAlign: 'top'
                     }
                   })
                 })
@@ -452,44 +483,154 @@ FormItem.Designer = function Designer() {
       });
       refresh();
     }
-  }), 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 === 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__*/React.createElement(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 FilterDynamicComponent(_objectSpread({}, props));
+            }
+          }
+        }
+      }
+    },
+    onSubmit: function onSubmit(_ref4) {
+      var _schema6;
+      var filter = _ref4.filter;
+      filter = removeNullCondition(filter);
+      _.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__*/React.createElement(SchemaSettings.ModalItem, {
+    title: t('Set default sorting rules'),
+    components: {
+      ArrayItems: 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;
+      });
+      _.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__*/React.createElement(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__*/React.createElement(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__*/React.createElement(SchemaSettings.SwitchItem, {
     key: "multiple",
     title: t('Multiple'),
@@ -506,13 +647,14 @@ FormItem.Designer = function Designer() {
       });
       refresh();
     }
-  }), field.readPretty && options.length > 0 && fieldSchema['x-component'] === 'CollectionField' && /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
+  }), field.readPretty && options.length > 0 && fieldSchema['x-component'] === 'CollectionField' && !isFileField && /*#__PURE__*/React.createElement(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'],
@@ -577,16 +719,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
       });
@@ -603,10 +746,15 @@ FormItem.Designer = function Designer() {
     }
   }));
 };
-function isFileCollection(collection) {
+export function isFileCollection(collection) {
   return (collection === null || collection === void 0 ? void 0 : collection.template) === 'file';
 }
 FormItem.FilterFormDesigner = FilterFormDesigner;
 export 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 moment(result);
+  }
+  return result;
 }