@nocobase/client 0.9.4-alpha.2 → 0.10.0-alpha.3

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

@@ -12,8 +12,8 @@ var _antd = require("antd");
 var _react2 = _interopRequireWildcard(require("react"));
 var _reactI18next = require("react-i18next");
 var _ = require("../..");
-var _context = require("./context");
 var _DynamicComponent = require("./DynamicComponent");
+var _context = require("./context");
 var _useValues2 = require("./useValues");
 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); }
@@ -34,45 +34,50 @@ var FilterItem = (0, _react.observer)(function (props) {
     setOperator = _useValues.setOperator,
     value = _useValues.value,
     setValue = _useValues.setValue;
-  return /*#__PURE__*/_react2.default.createElement("div", {
-    style: {
-      marginBottom: 8
-    }
-  }, /*#__PURE__*/_react2.default.createElement(_antd.Space, null, /*#__PURE__*/_react2.default.createElement(_antd.Cascader, {
-    className: (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n            width: 160px;\n          "]))),
-    fieldNames: {
-      label: 'title',
-      value: 'name',
-      children: 'children'
-    },
-    changeOnSelect: false,
-    value: dataIndex,
-    options: compile(fields),
-    onChange: function onChange(value) {
-      setDataIndex(value);
-    },
-    placeholder: t('Select Field')
-  }), /*#__PURE__*/_react2.default.createElement(_antd.Select, {
-    className: (0, _css.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n            min-width: 110px;\n          "]))),
-    value: operator === null || operator === void 0 ? void 0 : operator.value,
-    options: compile(operators),
-    onChange: function onChange(value) {
-      setOperator(value);
-    },
-    placeholder: t('Comparision')
-  }), !(operator === null || operator === void 0 ? void 0 : operator.noValue) && /*#__PURE__*/_react2.default.createElement(_DynamicComponent.DynamicComponent, {
-    value: value ? value : undefined,
-    schema: schema,
-    onChange: function onChange(value) {
-      setValue(value);
-    }
-  }), !props.disabled && /*#__PURE__*/_react2.default.createElement("a", null, /*#__PURE__*/_react2.default.createElement(_icons.CloseCircleOutlined, {
-    onClick: function onClick() {
-      return remove();
-    },
-    style: {
-      color: '#bfbfbf'
-    }
-  }))));
+  return (
+    /*#__PURE__*/
+    // 添加 nc-filter-item 类名是为了帮助编写测试时更容易选中该元素
+    _react2.default.createElement("div", {
+      style: {
+        marginBottom: 8
+      },
+      className: "nc-filter-item"
+    }, /*#__PURE__*/_react2.default.createElement(_antd.Space, null, /*#__PURE__*/_react2.default.createElement(_antd.Cascader, {
+      className: (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n              width: 160px;\n            "]))),
+      fieldNames: {
+        label: 'title',
+        value: 'name',
+        children: 'children'
+      },
+      changeOnSelect: false,
+      value: dataIndex,
+      options: compile(fields),
+      onChange: function onChange(value) {
+        setDataIndex(value);
+      },
+      placeholder: t('Select field')
+    }), /*#__PURE__*/_react2.default.createElement(_antd.Select, {
+      className: (0, _css.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n              min-width: 110px;\n            "]))),
+      value: operator === null || operator === void 0 ? void 0 : operator.value,
+      options: compile(operators),
+      onChange: function onChange(value) {
+        setOperator(value);
+      },
+      placeholder: t('Comparision')
+    }), !(operator === null || operator === void 0 ? void 0 : operator.noValue) ? /*#__PURE__*/_react2.default.createElement(_DynamicComponent.DynamicComponent, {
+      value: value,
+      schema: schema,
+      onChange: setValue
+    }) : null, !props.disabled && /*#__PURE__*/_react2.default.createElement("a", null, /*#__PURE__*/_react2.default.createElement(_icons.CloseCircleOutlined, {
+      onClick: function onClick() {
+        return remove();
+      },
+      style: {
+        color: '#bfbfbf'
+      }
+    }))))
+  );
+}, {
+  displayName: 'FilterItem'
 });
 exports.FilterItem = FilterItem;

package/lib/schema-component/antd/filter/FilterItems.d.ts

@@ -1,2 +1,2 @@
 import React from 'react';
-export declare const FilterItems: React.MemoExoticComponent<React.FunctionComponent<unknown>>;
+export declare const FilterItems: React.MemoExoticComponent<import("@formily/react").ReactFC<unknown>>;

package/lib/schema-component/antd/filter/FilterItems.js

@@ -24,5 +24,7 @@ var FilterItems = (0, _react.observer)(function (props) {
       component: [item.$and || item.$or ? _FilterGroup.FilterGroup : _FilterItem.FilterItem]
     }));
   }));
+}, {
+  displayName: 'FilterItems'
 });
 exports.FilterItems = FilterItems;

package/lib/schema-component/antd/filter/SaveDefaultValue.d.ts

@@ -1 +1,2 @@
-export declare const SaveDefaultValue: (props: any) => JSX.Element;
+import React from 'react';
+export declare const SaveDefaultValue: (props: any) => React.JSX.Element;

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

@@ -1,2 +1,3 @@
 export * from './Filter';
+export * from './FilterAction';
 export * from './useFilterActionProps';

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

@@ -14,6 +14,17 @@ Object.keys(_Filter).forEach(function (key) {
     }
   });
 });
+var _FilterAction = require("./FilterAction");
+Object.keys(_FilterAction).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _FilterAction[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _FilterAction[key];
+    }
+  });
+});
 var _useFilterActionProps = require("./useFilterActionProps");
 Object.keys(_useFilterActionProps).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/lib/schema-component/antd/filter/useValues.js

@@ -6,12 +6,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.useValues = void 0;
 var _react = require("@formily/react");
 var _shared = require("@formily/shared");
-var _flat = _interopRequireDefault(require("flat"));
+var _flat = _interopRequireWildcard(require("flat"));
 var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 var _get = _interopRequireDefault(require("lodash/get"));
 var _react2 = require("react");
 var _context = require("./context");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+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 _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; }
@@ -53,7 +55,7 @@ var useValues = function useValues() {
   var value2data = function value2data() {
     var _operators$find;
     field.data = field.data || {};
-    var values = (0, _flat.default)(field.value);
+    var values = (0, _flat.default)(field.value || {});
     var path = Object.keys(values).shift() || '';
     if (!path || !options) {
       return;
@@ -77,7 +79,7 @@ var useValues = function useValues() {
     field.data.operators = operators;
     field.data.operator = operator;
     field.data.schema = (0, _shared.merge)(option === null || option === void 0 ? void 0 : option.schema, operator === null || operator === void 0 ? void 0 : operator.schema);
-    field.data.value = (0, _get.default)(field.value, "".concat(fieldPath, ".$").concat(operatorValue));
+    field.data.value = (0, _get.default)((0, _flat.unflatten)(field.value), "".concat(fieldPath, ".$").concat(operatorValue));
   };
   (0, _react2.useEffect)(value2data, [field.path.entire]);
   return _objectSpread(_objectSpread({

package/lib/schema-component/antd/form/Form.Designer.d.ts

@@ -1 +1,2 @@
-export declare const FormDesigner: () => JSX.Element;
+import React from 'react';
+export declare const FormDesigner: () => React.JSX.Element;

package/lib/schema-component/antd/form/Form.d.ts

@@ -1,4 +1,4 @@
-import { Options, Result } from 'ahooks/lib/useRequest/src/types';
+import { Options, Result } from 'ahooks/es/useRequest/src/types';
 import React from 'react';
 declare type Opts = Options<any, any> & {
     uid?: string;

package/lib/schema-component/antd/form/Form.js

@@ -153,6 +153,8 @@ var Form = (0, _react.observer)(function (props) {
   }, others)) : /*#__PURE__*/_react2.default.createElement(FormComponent, _objectSpread({
     form: form
   }, others))));
+}, {
+  displayName: 'Form'
 });
 exports.Form = Form;
 Form.Designer = function () {

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

@@ -1 +1,2 @@
-export declare const FilterFormDesigner: () => JSX.Element;
+import React from 'react';
+export declare const FilterFormDesigner: () => React.JSX.Element;

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

@@ -10,14 +10,14 @@ exports.isFileCollection = isFileCollection;
 var _css = require("@emotion/css");
 var _antd = require("@formily/antd");
 var _react = require("@formily/react");
-var _shared = require("@formily/shared");
 var _antd2 = require("antd");
 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");
-var _blockProvider = require("../../../block-provider");
+var _BlockProvider = require("../../../block-provider/BlockProvider");
+var _FormBlockProvider = require("../../../block-provider/FormBlockProvider");
 var _collectionManager = require("../../../collection-manager");
 var _CollectionFields = require("../../../collection-manager/Configuration/CollectionFields");
 var _GeneralSchemaItems = require("../../../schema-items/GeneralSchemaItems");
@@ -29,7 +29,7 @@ var _core = require("../../core");
 var _hooks = require("../../hooks");
 var _blockItem = require("../block-item");
 var _filter = require("../filter");
-var _shared2 = require("../input/shared");
+var _shared = require("../input/shared");
 var _FilterDynamicComponent = require("../table-v2/FilterDynamicComponent");
 var _variable = require("../variable");
 var _FormItem = require("./FormItem.FilterFormDesigner");
@@ -48,20 +48,11 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _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',
-    'x-component': 'div',
-    'x-component-props': {
-      className: 'nb-block-wrap'
-    },
-    properties: _defineProperty({}, schema.name || (0, _shared.uid)(), schema)
-  };
-};
 var FormItem = (0, _react.observer)(function (props) {
+  var _schema$xDecoratorP, _schema$xDecoratorP2;
   (0, _SchemaSettingOptions.useEnsureOperatorsValid)();
   var field = (0, _react.useField)();
-  var ctx = (0, _react2.useContext)(_blockProvider.BlockRequestContext);
+  var ctx = (0, _BlockProvider.useBlockRequestContext)();
   var schema = (0, _react.useFieldSchema)();
   var variablesCtx = (0, _uitls.useVariablesCtx)();
   (0, _react2.useEffect)(function () {
@@ -76,23 +67,25 @@ var FormItem = (0, _react.observer)(function (props) {
       }
     }
   }, []);
-  var _props$showTitle = props.showTitle,
-    showTitle = _props$showTitle === void 0 ? true : _props$showTitle;
+  var showTitle = (_schema$xDecoratorP = (_schema$xDecoratorP2 = schema['x-decorator-props']) === null || _schema$xDecoratorP2 === void 0 ? void 0 : _schema$xDecoratorP2.showTitle) !== null && _schema$xDecoratorP !== void 0 ? _schema$xDecoratorP : true;
   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: (0, _css.cx)((0, _css.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n              & .ant-space {\n                flex-wrap: wrap;\n              }\n            "]))), _defineProperty({}, (0, _css.css)(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n                > .ant-formily-item-label {\n                  display: none;\n                }\n              "]))), showTitle === false))
+    className: (0, _css.cx)((0, _css.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n                & .ant-space {\n                  flex-wrap: wrap;\n                }\n              "]))), _defineProperty({}, (0, _css.css)(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n                  > .ant-formily-item-label {\n                    display: none;\n                  }\n                "]))), showTitle === false))
   }, props), {}, {
     extra: typeof field.description === 'string' ? /*#__PURE__*/_react2.default.createElement("div", {
       dangerouslySetInnerHTML: {
-        __html: (0, _shared2.HTMLEncode)(field.description).split('\n').join('<br/>')
+        __html: (0, _shared.HTMLEncode)(field.description).split('\n').join('<br/>')
       }
     }) : field.description
   }))));
+}, {
+  displayName: 'FormItem'
 });
 exports.FormItem = FormItem;
 FormItem.Designer = function Designer() {
-  var _interfaceConfig$vali, _collectionField$uiSc, _getCollectionFields, _field$componentProps, _field$componentProps2, _field$componentProps3, _field$componentProps4, _field$componentProps5, _field$componentProps6, _field$componentProps7, _fieldSchema$xCompon, _fieldSchema$xCompon2, _fieldSchema$xCompon3, _fieldSchema$xCompon4, _fieldSchema$xCompon5, _fieldSchema$xCompon6, _fieldSchema$xCompon7, _fieldSchema$xCompon8, _fieldSchema$xCompon9, _fieldSchema$xCompon10, _field$componentProps8, _field$componentProps9;
+  var _interfaceConfig$vali, _collectionField$uiSc, _getCollectionFields, _field$componentProps, _field$componentProps2, _field$componentProps3, _field$componentProps4, _field$componentProps5, _field$componentProps6, _field$componentProps7, _fieldSchema$xCompon2, _fieldSchema$xCompon3, _fieldSchema$xCompon4, _fieldSchema$xCompon5, _fieldSchema$xCompon6, _fieldSchema$xCompon7, _fieldSchema$xCompon8, _field$componentProps8, _fieldSchema$xCompon9, _fieldSchema$xCompon10, _fieldSchema$xCompon11, _field$componentProps9, _field$componentProps10;
+  var targetField;
   var _useCollectionManager = (0, _collectionManager.useCollectionManager)(),
     getCollectionFields = _useCollectionManager.getCollectionFields,
     getInterface = _useCollectionManager.getInterface,
@@ -100,8 +93,9 @@ FormItem.Designer = function Designer() {
     getCollection = _useCollectionManager.getCollection;
   var _useCollection = (0, _collectionManager.useCollection)(),
     getField = _useCollection.getField;
-  var _useFormBlockContext = (0, _blockProvider.useFormBlockContext)(),
+  var _useFormBlockContext = (0, _FormBlockProvider.useFormBlockContext)(),
     form = _useFormBlockContext.form;
+  var ctx = (0, _BlockProvider.useBlockRequestContext)();
   var field = (0, _react.useField)();
   var fieldSchema = (0, _react.useFieldSchema)();
   var _useTranslation = (0, _reactI18next.useTranslation)(),
@@ -114,13 +108,17 @@ FormItem.Designer = function Designer() {
   var variablesCtx = (0, _uitls.useVariablesCtx)();
   var IsShowMultipleSwitch = (0, _useIsShowMultipleSwitch.useIsShowMultipleSwitch)();
   var collectionField = getField(fieldSchema['name']) || getCollectionJoinField(fieldSchema['x-collection-field']);
+  if (collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) {
+    var _fieldSchema$xCompon, _fieldSchema$xCompon$;
+    targetField = getCollectionJoinField("".concat(collectionField.target, ".").concat(((_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : (_fieldSchema$xCompon$ = _fieldSchema$xCompon.fieldNames) === null || _fieldSchema$xCompon$ === void 0 ? void 0 : _fieldSchema$xCompon$.label) || 'id'));
+  }
   var targetCollection = getCollection(collectionField === null || collectionField === void 0 ? void 0 : collectionField.target);
   var interfaceConfig = getInterface(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface);
   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 fieldModeOptions = (0, _hooks.useFieldModeOptions)();
-  var isAssociationField = ['belongsTo', 'hasOne', 'hasMany', 'belongsToMany'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.type);
+  var isAssociationField = ['obo', 'oho', 'o2o', 'o2m', 'm2m', 'm2o'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface);
   var isTableField = fieldSchema['x-component'] === 'TableField';
   var isFileField = isFileCollection(targetCollection);
   var initialValue = {
@@ -150,7 +148,7 @@ FormItem.Designer = function Designer() {
   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 isSelectFieldMode = isAssociationField && fieldMode === 'Select';
   var sort = defaultSort === null || defaultSort === void 0 ? void 0 : defaultSort.map(function (item) {
     return (item === null || item === void 0 ? void 0 : item.startsWith('-')) ? {
       field: item.substring(1),
@@ -161,14 +159,14 @@ FormItem.Designer = function Designer() {
     };
   });
   var fieldSchemaWithoutRequired = _lodash.default.omit(fieldSchema, 'required');
-  var isSubFormMode = ((_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : _fieldSchema$xCompon.mode) === 'Nester';
-  var isPickerMode = ((_fieldSchema$xCompon2 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon2 === void 0 ? void 0 : _fieldSchema$xCompon2.mode) === 'Picker';
+  var isSubFormMode = ((_fieldSchema$xCompon2 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon2 === void 0 ? void 0 : _fieldSchema$xCompon2.mode) === 'Nester';
+  var isPickerMode = ((_fieldSchema$xCompon3 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon3 === void 0 ? void 0 : _fieldSchema$xCompon3.mode) === 'Picker';
   var showFieldMode = isAssociationField && fieldModeOptions && !isTableField;
   var showModeSelect = showFieldMode && isPickerMode;
   return /*#__PURE__*/_react2.default.createElement(_schemaSettings.GeneralSchemaDesigner, null, /*#__PURE__*/_react2.default.createElement(_GeneralSchemaItems.GeneralSchemaItems, null), !(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$xCompon3 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon3 === void 0 ? void 0 : _fieldSchema$xCompon3.quickUpload) !== false,
+    checked: ((_fieldSchema$xCompon4 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon4 === void 0 ? void 0 : _fieldSchema$xCompon4.quickUpload) !== false,
     onChange: function onChange(value) {
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
       field.componentProps.quickUpload = value;
@@ -183,7 +181,7 @@ FormItem.Designer = function Designer() {
   }) : 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$xCompon4 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon4 === void 0 ? void 0 : _fieldSchema$xCompon4.selectFile) !== false,
+    checked: ((_fieldSchema$xCompon5 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon5 === void 0 ? void 0 : _fieldSchema$xCompon5.selectFile) !== false,
     onChange: function onChange(value) {
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
       field.componentProps.selectFile = value;
@@ -345,6 +343,7 @@ FormItem.Designer = function Designer() {
         default: (0, _variable.isInvariable)(interfaceConfig) ? _objectSpread(_objectSpread({}, fieldSchemaWithoutRequired || {}), {}, {
           'x-decorator': 'FormItem',
           'x-component-props': _objectSpread(_objectSpread({}, fieldSchema['x-component-props']), {}, {
+            targetField: targetField,
             component: (collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) && (collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) !== 'chinaRegion' ? 'AssociationSelect' : undefined,
             service: {
               resource: collectionField === null || collectionField === void 0 ? void 0 : collectionField.target
@@ -363,6 +362,7 @@ FormItem.Designer = function Designer() {
           'x-decorator': 'FormItem',
           'x-component': 'VariableInput',
           'x-component-props': _objectSpread(_objectSpread({}, (fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-component-props']) || {}), {}, {
+            targetField: targetField,
             collectionName: collectionField === null || collectionField === void 0 ? void 0 : collectionField.collectionName,
             schema: collectionField === null || collectionField === void 0 ? void 0 : collectionField.uiSchema,
             className: defaultInputStyle,
@@ -412,12 +412,15 @@ FormItem.Designer = function Designer() {
       properties: {
         filter: {
           default: defaultFilter,
-          // title: '数据范围',
           enum: dataSource,
           'x-component': 'Filter',
           'x-component-props': {
             dynamicComponent: function dynamicComponent(props) {
-              return (0, _FilterDynamicComponent.FilterDynamicComponent)(_objectSpread({}, props));
+              return (0, _FilterDynamicComponent.FilterDynamicComponent)(_objectSpread(_objectSpread({}, props), {}, {
+                form: form,
+                collectionField: collectionField,
+                rootCollection: ctx.props.collection || ctx.props.resource
+              }));
             }
           }
         }
@@ -429,7 +432,6 @@ FormItem.Designer = function Designer() {
       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: (_schema5 = {}, _defineProperty(_schema5, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema5, 'x-component-props', field.componentProps), _schema5)
       });
@@ -520,7 +522,7 @@ FormItem.Designer = function Designer() {
     }
   }), showFieldMode && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
     key: "field-mode",
-    title: t('Field mode'),
+    title: t('Field component'),
     options: fieldModeOptions,
     value: fieldMode,
     onChange: function onChange(mode) {
@@ -557,7 +559,7 @@ FormItem.Designer = function Designer() {
       label: t('Large'),
       value: 'large'
     }],
-    value: (_fieldSchema$xCompon5 = fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon6 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon6 === void 0 ? void 0 : _fieldSchema$xCompon6['openSize']) !== null && _fieldSchema$xCompon5 !== void 0 ? _fieldSchema$xCompon5 : (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon7 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon7 === void 0 ? void 0 : _fieldSchema$xCompon7['openMode']) == 'modal' ? 'large' : 'middle',
+    value: (_fieldSchema$xCompon6 = fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon7 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon7 === void 0 ? void 0 : _fieldSchema$xCompon7['openSize']) !== null && _fieldSchema$xCompon6 !== void 0 ? _fieldSchema$xCompon6 : (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon8 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon8 === void 0 ? void 0 : _fieldSchema$xCompon8['openMode']) == 'modal' ? 'large' : 'middle',
     onChange: function onChange(value) {
       field.componentProps.openSize = value;
       fieldSchema['x-component-props'] = field.componentProps;
@@ -573,7 +575,7 @@ FormItem.Designer = function Designer() {
       textAlign: 'right',
       minWidth: 100
     }
-  }))), !field.readPretty && isAssociationField && ['Select', 'Picker'].includes(fieldMode) && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
+  }))), !field.readPretty && isAssociationField && ['Picker'].includes(fieldMode) && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
     key: "allowAddNew",
     title: t('Allow add new data'),
     checked: fieldSchema['x-add-new'],
@@ -608,10 +610,59 @@ FormItem.Designer = function Designer() {
       });
       refresh();
     }
-  }), IsShowMultipleSwitch() ? /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
+  }), !field.readPretty && isAssociationField && ['Select'].includes(fieldMode) && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
+    key: "add-mode",
+    title: t('Quick create'),
+    options: [{
+      label: t('None'),
+      value: 'none'
+    }, {
+      label: t('Dropdown'),
+      value: 'quickAdd'
+    }, {
+      label: t('Pop-up'),
+      value: 'modalAdd'
+    }],
+    value: ((_field$componentProps8 = field.componentProps) === null || _field$componentProps8 === void 0 ? void 0 : _field$componentProps8.addMode) || 'none',
+    onChange: function onChange(mode) {
+      if (mode === 'modalAdd') {
+        var hasAddNew = fieldSchema.reduceProperties(function (buf, schema) {
+          if (schema['x-component'] === 'Action') {
+            return schema;
+          }
+          return buf;
+        }, null);
+        if (!hasAddNew) {
+          var addNewActionschema = {
+            'x-action': 'create',
+            title: "{{t('Add new')}}",
+            'x-designer': 'Action.Designer',
+            'x-component': 'Action',
+            'x-decorator': 'ACLActionProvider',
+            'x-component-props': {
+              openMode: 'drawer',
+              type: 'default',
+              component: 'CreateRecordAction'
+            }
+          };
+          insertAdjacent('afterBegin', addNewActionschema);
+        }
+      }
+      var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
+      fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
+      fieldSchema['x-component-props']['addMode'] = mode;
+      schema['x-component-props'] = fieldSchema['x-component-props'];
+      field.componentProps = field.componentProps || {};
+      field.componentProps.addMode = mode;
+      dn.emit('patch', {
+        schema: schema
+      });
+      dn.refresh();
+    }
+  }), isAssociationField && IsShowMultipleSwitch() ? /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
     key: "multiple",
     title: t('Allow multiple'),
-    checked: ((_fieldSchema$xCompon8 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon8 === void 0 ? void 0 : _fieldSchema$xCompon8.multiple) === undefined ? true : fieldSchema['x-component-props'].multiple,
+    checked: ((_fieldSchema$xCompon9 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon9 === void 0 ? void 0 : _fieldSchema$xCompon9.multiple) === undefined ? true : fieldSchema['x-component-props'].multiple,
     onChange: function onChange(value) {
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
       fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
@@ -627,7 +678,7 @@ FormItem.Designer = function Designer() {
   }) : null, IsShowMultipleSwitch() && isSubFormMode ? /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
     key: "allowDissociate",
     title: t('Allow dissociate'),
-    checked: ((_fieldSchema$xCompon9 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon9 === void 0 ? void 0 : _fieldSchema$xCompon9.allowDissociate) !== false,
+    checked: ((_fieldSchema$xCompon10 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon10 === void 0 ? void 0 : _fieldSchema$xCompon10.allowDissociate) !== false,
     onChange: function onChange(value) {
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
       fieldSchema['x-component-props'] = fieldSchema['x-component-props'] || {};
@@ -642,7 +693,7 @@ FormItem.Designer = function Designer() {
     }
   }) : null, field.readPretty && options.length > 0 && fieldSchema['x-component'] === 'CollectionField' && !isFileField && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
     title: t('Enable link'),
-    checked: ((_fieldSchema$xCompon10 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon10 === void 0 ? void 0 : _fieldSchema$xCompon10.enableLink) !== false,
+    checked: ((_fieldSchema$xCompon11 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon11 === void 0 ? void 0 : _fieldSchema$xCompon11.enableLink) !== false,
     onChange: function onChange(flag) {
       fieldSchema['x-component-props'] = _objectSpread(_objectSpread({}, fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-component-props']), {}, {
         enableLink: flag
@@ -708,11 +759,11 @@ FormItem.Designer = function Designer() {
       });
       dn.refresh();
     }
-  }), options.length > 0 && isAssociationField && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
+  }), options.length > 0 && isAssociationField && fieldMode !== 'SubTable' && /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
     key: "title-field",
     title: t('Title field'),
     options: options,
-    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,
+    value: field === null || field === void 0 ? void 0 : (_field$componentProps9 = field.componentProps) === null || _field$componentProps9 === void 0 ? void 0 : (_field$componentProps10 = _field$componentProps9.fieldNames) === null || _field$componentProps10 === void 0 ? void 0 : _field$componentProps10.label,
     onChange: function onChange(label) {
       var _collectionField$uiSc3, _collectionField$uiSc4;
       var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
@@ -742,10 +793,14 @@ FormItem.Designer = function Designer() {
 function isFileCollection(collection) {
   return (collection === null || collection === void 0 ? void 0 : collection.template) === 'file';
 }
+function extractFirstPart(path) {
+  var firstDotIndex = path.indexOf('.');
+  return firstDotIndex !== -1 ? path.slice(0, firstDotIndex) : path;
+}
 FormItem.FilterFormDesigner = _FormItem.FilterFormDesigner;
 function getFieldDefaultValue(fieldSchema, collectionField) {
-  var _collectionField$uiSc5;
-  var result = (fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema.default) || (collectionField === null || collectionField === void 0 ? void 0 : collectionField.defaultValue);
+  var _fieldSchema$default, _collectionField$uiSc5;
+  var result = (_fieldSchema$default = fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema.default) !== null && _fieldSchema$default !== void 0 ? _fieldSchema$default : collectionField === null || collectionField === void 0 ? void 0 : collectionField.defaultValue;
   if ((collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc5 = collectionField.uiSchema) === null || _collectionField$uiSc5 === void 0 ? void 0 : _collectionField$uiSc5['x-component']) === 'DatePicker' && result) {
     return (0, _moment.default)(result);
   }

package/lib/schema-component/antd/form-item/SchemaSettingOptions.d.ts

@@ -1,4 +1,5 @@
 import { Schema } from '@formily/react';
+import React from 'react';
 export declare const findFilterOperators: (schema: Schema) => {
     operators: any;
     uid: any;
@@ -6,18 +7,18 @@ export declare const findFilterOperators: (schema: Schema) => {
     operators?: undefined;
     uid?: undefined;
 };
-export declare const EditTitle: () => JSX.Element;
-export declare const EditDescription: () => JSX.Element;
-export declare const EditTooltip: () => JSX.Element;
-export declare const EditRequired: () => JSX.Element;
-export declare const EditValidationRules: () => JSX.Element;
-export declare const EditDefaultValue: () => JSX.Element;
-export declare const EditComponent: () => JSX.Element;
-export declare const EditPattern: () => JSX.Element;
+export declare const EditTitle: () => React.JSX.Element;
+export declare const EditDescription: () => React.JSX.Element;
+export declare const EditTooltip: () => React.JSX.Element;
+export declare const EditRequired: () => React.JSX.Element;
+export declare const EditValidationRules: () => React.JSX.Element;
+export declare const EditDefaultValue: () => React.JSX.Element;
+export declare const EditComponent: () => React.JSX.Element;
+export declare const EditPattern: () => React.JSX.Element;
 /**
  * 如果用户没有手动设置过 operator，那么在筛选的时候 operator 会是空的，
  * 该方法确保 operator 一定有值（需要在 FormItem 中调用）
  */
 export declare const useEnsureOperatorsValid: () => void;
-export declare const EditOperator: () => JSX.Element;
-export declare const EditTitleField: () => JSX.Element;
+export declare const EditOperator: () => React.JSX.Element;
+export declare const EditTitleField: () => React.JSX.Element;

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

@@ -421,7 +421,7 @@ var EditComponent = function EditComponent() {
   var isFileField = (0, _FormItem.isFileCollection)(targetCollection);
   return isAssociationField && fieldModeOptions ? /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
     key: "field-mode",
-    title: t('Field mode'),
+    title: t('Field component'),
     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) {

package/lib/schema-component/antd/form-v2/Form.Designer.d.ts

@@ -1,3 +1,4 @@
-export declare const FormDesigner: () => JSX.Element;
-export declare const ReadPrettyFormDesigner: () => JSX.Element;
-export declare const DetailsDesigner: () => JSX.Element;
+import React from 'react';
+export declare const FormDesigner: () => React.JSX.Element;
+export declare const ReadPrettyFormDesigner: () => React.JSX.Element;
+export declare const DetailsDesigner: () => React.JSX.Element;

package/lib/schema-component/antd/form-v2/Form.FilterDesigner.d.ts

@@ -1,5 +1,6 @@
+import React from 'react';
 /**
  * 筛选区块所使用的表单设计器
  * @returns
  */
-export declare const FilterDesigner: () => JSX.Element;
+export declare const FilterDesigner: () => React.JSX.Element;