@nocobase/client 0.9.1-alpha.2 → 0.9.2-alpha.1

package/lib/schema-component/antd/association-filter/AssociationFilter.Initializer.js

@@ -4,49 +4,37 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.AssociationFilterInitializer = void 0;
-
 var _css = require("@emotion/css");
-
 var _react = _interopRequireDefault(require("react"));
-
 var _reactI18next = require("react-i18next");
-
-var _collectionManager = require("../../../collection-manager");
-
+var _utils = require("../../../filter-provider/utils");
 var _schemaInitializer = require("../../../schema-initializer");
-
 var _templateObject;
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-
 var AssociationFilterInitializer = function AssociationFilterInitializer() {
   var _useTranslation = (0, _reactI18next.useTranslation)(),
-      t = _useTranslation.t;
-
-  var _useCollection = (0, _collectionManager.useCollection)(),
-      fields = _useCollection.fields;
-
-  var associatedFields = fields.filter(function (field) {
-    return ['o2o', 'oho', 'obo', 'm2o', 'createdBy', 'updatedBy', 'o2m', 'm2m', 'linkTo'].includes(field.interface);
-  });
-  var items = associatedFields.map(function (field) {
+    t = _useTranslation.t;
+  var associatedFields = (0, _utils.useAssociatedFields)();
+  var useProps = '{{useAssociationFilterProps}}';
+  var children = associatedFields.map(function (field) {
+    var _field$uiSchema, _field$uiSchema2;
     return {
       type: 'item',
       key: field.key,
-      title: field.uiSchema.title,
+      title: (_field$uiSchema = field.uiSchema) === null || _field$uiSchema === void 0 ? void 0 : _field$uiSchema.title,
       component: 'AssociationFilterDesignerDisplayField',
       schema: {
         name: field.name,
-        title: field.uiSchema.title,
+        title: (_field$uiSchema2 = field.uiSchema) === null || _field$uiSchema2 === void 0 ? void 0 : _field$uiSchema2.title,
         type: 'void',
         'x-designer': 'AssociationFilter.Item.Designer',
         'x-component': 'AssociationFilter.Item',
         'x-component-props': {
           fieldNames: {
             label: field.targetKey || 'id'
-          }
+          },
+          useProps: useProps
         },
         properties: {}
       }
@@ -55,7 +43,7 @@ var AssociationFilterInitializer = function AssociationFilterInitializer() {
   var associatedFieldGroup = {
     type: 'itemGroup',
     title: t('Association fields'),
-    children: items
+    children: children
   };
   var dividerItem = {
     type: 'divider'
@@ -65,12 +53,12 @@ var AssociationFilterInitializer = function AssociationFilterInitializer() {
     title: t('Delete'),
     component: 'AssociationFilterDesignerDelete'
   };
+  var items = [associatedFieldGroup, dividerItem, deleteItem];
   return /*#__PURE__*/_react.default.createElement(_schemaInitializer.SchemaInitializer.Button, {
     className: (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n        margin-top: 16px;\n      "]))),
     icon: 'SettingOutlined',
     title: t('Configure fields'),
-    items: [associatedFieldGroup, dividerItem, deleteItem]
+    items: items
   });
 };
-
 exports.AssociationFilterInitializer = AssociationFilterInitializer;

package/lib/schema-component/antd/association-filter/AssociationFilter.Item.Designer.js

@@ -4,62 +4,54 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.AssociationFilterItemDesigner = void 0;
-
 var _react = require("@formily/react");
-
+var _lodash = _interopRequireDefault(require("lodash"));
 var _react2 = _interopRequireDefault(require("react"));
-
 var _reactI18next = require("react-i18next");
-
 var _collectionManager = require("../../../collection-manager");
-
 var _schemaSettings = require("../../../schema-settings");
-
 var _hooks = require("../../hooks");
-
-var _AssociationFilter = require("./AssociationFilter");
-
 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 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) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 var AssociationFilterItemDesigner = function AssociationFilterItemDesigner(props) {
-  var _getCollectionFields, _collectionField$uiSc, _fieldSchema$xCompon, _fieldSchema$xCompon$;
-
+  var _fieldSchema$xCompon, _fieldSchema$xCompon$, _fieldSchema$xCompon2, _fieldSchema$xCompon3, _collectionField$uiSc, _fieldSchema$xCompon4, _fieldSchema$xCompon5;
   var fieldSchema = (0, _react.useFieldSchema)();
-
+  var field = (0, _react.useField)();
   var _useTranslation = (0, _reactI18next.useTranslation)(),
-      t = _useTranslation.t;
-
-  var collectionField = _AssociationFilter.AssociationFilter.useAssociationField();
-
+    t = _useTranslation.t;
   var _useCollectionManager = (0, _collectionManager.useCollectionManager)(),
-      getCollectionFields = _useCollectionManager.getCollectionFields;
-
+    getCollectionJoinField = _useCollectionManager.getCollectionJoinField;
+  var _useCollection = (0, _collectionManager.useCollection)(),
+    getField = _useCollection.getField;
+  var collectionField = getField(fieldSchema['name']) || getCollectionJoinField(fieldSchema['x-collection-field']);
+  var filterEnum = (collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) ? (0, _collectionManager.useCollectionFilterOptions)(collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) : [];
+  var defaultFilter = (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : (_fieldSchema$xCompon$ = _fieldSchema$xCompon.params) === null || _fieldSchema$xCompon$ === void 0 ? void 0 : _fieldSchema$xCompon$.filter) || {};
+  var _useCollectionManager2 = (0, _collectionManager.useCollectionManager)(),
+    getCollectionFields = _useCollectionManager2.getCollectionFields;
   var compile = (0, _hooks.useCompile)();
-
   var _useDesignable = (0, _hooks.useDesignable)(),
-      dn = _useDesignable.dn;
-
-  var targetFields = (_getCollectionFields = getCollectionFields(collectionField.target)) !== null && _getCollectionFields !== void 0 ? _getCollectionFields : [];
-  var options = targetFields.filter(function (field) {
-    return (field === null || field === void 0 ? void 0 : field.interface) && ['id', 'input', 'phone', 'email', 'integer', 'number'].includes(field === null || field === void 0 ? void 0 : field.interface);
+    dn = _useDesignable.dn;
+  var targetFields = (collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) ? getCollectionFields(collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) : [];
+  var options = targetFields
+  // .filter(
+  //   (field) => field?.interface && ['id', 'input', 'phone', 'email', 'integer', 'number'].includes(field?.interface),
+  // )
+  .filter(function (field) {
+    return !(field === null || field === void 0 ? void 0 : field.target) && field.type !== 'boolean';
   }).map(function (field) {
     var _field$uiSchema;
-
     return {
       value: field === null || field === void 0 ? void 0 : field.name,
       label: compile(field === null || field === void 0 ? void 0 : (_field$uiSchema = field.uiSchema) === null || _field$uiSchema === void 0 ? void 0 : _field$uiSchema.title) || (field === null || field === void 0 ? void 0 : field.name)
     };
   });
-
   var onTitleFieldChange = function onTitleFieldChange(label) {
     var schema = _defineProperty({}, 'x-uid', fieldSchema['x-uid']);
-
     var fieldNames = {
       label: label
     };
@@ -71,7 +63,17 @@ var AssociationFilterItemDesigner = function AssociationFilterItemDesigner(props
     });
     dn.refresh();
   };
-
+  var sortFields = (0, _collectionManager.useSortFields)(collectionField === null || collectionField === void 0 ? void 0 : collectionField.target);
+  var defaultSort = (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon2 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon2 === void 0 ? void 0 : (_fieldSchema$xCompon3 = _fieldSchema$xCompon2.params) === null || _fieldSchema$xCompon3 === void 0 ? void 0 : _fieldSchema$xCompon3.sort) || [];
+  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, _objectSpread(_objectSpread({}, props), {}, {
     disableInitializer: true
   }), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.ModalItem, {
@@ -91,7 +93,6 @@ var AssociationFilterItemDesigner = function AssociationFilterItemDesigner(props
     },
     onSubmit: function onSubmit(_ref) {
       var title = _ref.title;
-
       if (title) {
         // field.title = title;
         fieldSchema.title = title;
@@ -102,14 +103,66 @@ var AssociationFilterItemDesigner = function AssociationFilterItemDesigner(props
           }
         });
       }
-
       dn.refresh();
     }
+  }), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SwitchItem, {
+    title: t('Default collapse'),
+    checked: field.componentProps.defaultCollapse,
+    onChange: function onChange(v) {
+      var _schema2;
+      field.componentProps.defaultCollapse = v;
+      fieldSchema['x-component-props']['defaultCollapse'] = v;
+      dn.emit('patch', {
+        schema: (_schema2 = {}, _defineProperty(_schema2, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema2, 'x-component-props', fieldSchema['x-component-props']), _schema2)
+      });
+      dn.refresh();
+    }
+  }), /*#__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,
+          enum: filterEnum,
+          'x-component': 'Filter',
+          'x-component-props': {}
+        }
+      }
+    },
+    onSubmit: function onSubmit(_ref2) {
+      var _field$componentProps, _schema3;
+      var filter = _ref2.filter;
+      _lodash.default.set(field.componentProps, 'params', _objectSpread(_objectSpread({}, (_field$componentProps = field.componentProps) === null || _field$componentProps === void 0 ? void 0 : _field$componentProps.params), {}, {
+        filter: filter
+      }));
+      fieldSchema['x-component-props']['params'] = field.componentProps.params;
+      dn.emit('patch', {
+        schema: (_schema3 = {}, _defineProperty(_schema3, 'x-uid', fieldSchema['x-uid']), _defineProperty(_schema3, 'x-component-props', fieldSchema['x-component-props']), _schema3)
+      });
+    }
+  }), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.DefaultSortingRules, {
+    sort: sort,
+    sortFields: sortFields,
+    onSubmit: function onSubmit(_ref3) {
+      var _field$componentProps2;
+      var sort = _ref3.sort;
+      _lodash.default.set(field.componentProps, 'params', _objectSpread(_objectSpread({}, (_field$componentProps2 = field.componentProps) === null || _field$componentProps2 === void 0 ? void 0 : _field$componentProps2.params), {}, {
+        sort: sort.map(function (item) {
+          return item.direction === 'desc' ? "-".concat(item.field) : item.field;
+        })
+      }));
+      fieldSchema['x-component-props']['params'] = field.componentProps.params;
+      dn.emit('patch', {
+        schema: fieldSchema
+      });
+    }
   }), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.SelectItem, {
     key: "title-field",
     title: t('Title field'),
     options: options,
-    value: (_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,
+    value: (_fieldSchema$xCompon4 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon4 === void 0 ? void 0 : (_fieldSchema$xCompon5 = _fieldSchema$xCompon4.fieldNames) === null || _fieldSchema$xCompon5 === void 0 ? void 0 : _fieldSchema$xCompon5.label,
     onChange: onTitleFieldChange
   }), /*#__PURE__*/_react2.default.createElement(_schemaSettings.SchemaSettings.Remove, {
     breakRemoveOn: {
@@ -117,5 +170,4 @@ var AssociationFilterItemDesigner = function AssociationFilterItemDesigner(props
     }
   }));
 };
-
 exports.AssociationFilterItemDesigner = AssociationFilterItemDesigner;

package/lib/schema-component/antd/association-filter/AssociationFilter.Item.js

@@ -1,194 +1,113 @@
 "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.AssociationFilterItem = void 0;
-
 var _icons = require("@ant-design/icons");
-
 var _css = require("@emotion/css");
-
 var _react = require("@formily/react");
-
 var _antd = require("antd");
-
 var _classnames = _interopRequireDefault(require("classnames"));
-
 var _react2 = _interopRequireWildcard(require("react"));
-
-var _apiClient = require("../../../api-client");
-
-var _blockProvider = require("../../../block-provider");
-
-var _SharedFilterProvider = require("../../../block-provider/SharedFilterProvider");
-
 var _common = require("../../common");
-
 var _hooks = require("../../hooks");
-
+var _recordPicker = require("../record-picker");
 var _AssociationFilter = require("./AssociationFilter");
-
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8;
-
+var _input = require("../input");
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8, _templateObject9;
 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 _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
 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) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 function _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 _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
+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 _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 var Panel = _antd.Collapse.Panel;
-
 var AssociationFilterItem = function AssociationFilterItem(props) {
   var _fieldSchema$xCompon, _fieldSchema$xCompon$, _fieldSchema$title, _collectionField$uiSc;
-
   var collectionField = _AssociationFilter.AssociationFilter.useAssociationField();
-
-  if (!collectionField) {
-    return null;
-  }
-
+  // 把一些可定制的状态通过 hook 提取出去了，为了兼容之前添加的 Table 区块，这里加了个默认值
   var fieldSchema = (0, _react.useFieldSchema)();
   var Designer = (0, _hooks.useDesigner)();
   var compile = (0, _hooks.useCompile)();
-
-  var _useBlockRequestConte = (0, _blockProvider.useBlockRequestContext)(),
-      service = _useBlockRequestConte.service,
-      blockProps = _useBlockRequestConte.props;
-
+  var _useProps = (0, _hooks.useProps)(props),
+    list = _useProps.list,
+    onSelected = _useProps.onSelected,
+    _handleSearchInput = _useProps.handleSearchInput,
+    params = _useProps.params,
+    run = _useProps.run,
+    _valueKey = _useProps.valueKey,
+    _labelKey = _useProps.labelKey,
+    defaultCollapse = _useProps.defaultCollapse;
   var _useState = (0, _react2.useState)(false),
-      _useState2 = _slicedToArray(_useState, 2),
-      searchVisible = _useState2[0],
-      setSearchVisible = _useState2[1];
-
-  var collectionFieldName = collectionField.name;
-  var valueKey = (collectionField === null || collectionField === void 0 ? void 0 : collectionField.targetKey) || 'id';
-  var labelKey = ((_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) || valueKey;
+    _useState2 = _slicedToArray(_useState, 2),
+    searchVisible = _useState2[0],
+    setSearchVisible = _useState2[1];
+  var defaultActiveKeyCollapse = (0, _react2.useMemo)(function () {
+    return defaultCollapse ? [collectionField.name] : [];
+  }, []);
+  var valueKey = _valueKey || (collectionField === null || collectionField === void 0 ? void 0 : collectionField.targetKey) || 'id';
+  var labelKey = _labelKey || ((_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) || valueKey;
   var fieldNames = {
     title: labelKey || valueKey,
     key: valueKey
   };
-
-  var _useRequest = (0, _apiClient.useRequest)({
-    resource: collectionField.target,
-    action: 'list',
-    params: {
-      fields: [labelKey, valueKey],
-      pageSize: 200,
-      page: 1
-    }
-  }, {
-    refreshDeps: [labelKey, valueKey],
-    debounceWait: 300
-  }),
-      data = _useRequest.data,
-      params = _useRequest.params,
-      loading = _useRequest.loading,
-      run = _useRequest.run;
-
-  var treeData = (data === null || data === void 0 ? void 0 : data.data) || [];
-
   var _useState3 = (0, _react2.useState)([]),
-      _useState4 = _slicedToArray(_useState3, 2),
-      expandedKeys = _useState4[0],
-      setExpandedKeys = _useState4[1];
-
+    _useState4 = _slicedToArray(_useState3, 2),
+    expandedKeys = _useState4[0],
+    setExpandedKeys = _useState4[1];
   var _useState5 = (0, _react2.useState)([]),
-      _useState6 = _slicedToArray(_useState5, 2),
-      selectedKeys = _useState6[0],
-      setSelectedKeys = _useState6[1];
-
+    _useState6 = _slicedToArray(_useState5, 2),
+    selectedKeys = _useState6[0],
+    setSelectedKeys = _useState6[1];
   var _useState7 = (0, _react2.useState)(true),
-      _useState8 = _slicedToArray(_useState7, 2),
-      autoExpandParent = _useState8[0],
-      setAutoExpandParent = _useState8[1];
-
+    _useState8 = _slicedToArray(_useState7, 2),
+    autoExpandParent = _useState8[0],
+    setAutoExpandParent = _useState8[1];
+  if (!collectionField) {
+    return null;
+  }
   var onExpand = function onExpand(expandedKeysValue) {
     setExpandedKeys(expandedKeysValue);
     setAutoExpandParent(false);
   };
-
   var onSelect = function onSelect(selectedKeysValue) {
-    var _service$params, _service$params$, _service$params2, _blockProps$params;
-
     setSelectedKeys(selectedKeysValue);
-    var filters = ((_service$params = service.params) === null || _service$params === void 0 ? void 0 : (_service$params$ = _service$params[1]) === null || _service$params$ === void 0 ? void 0 : _service$params$.filters) || {};
-
-    if (selectedKeysValue.length) {
-      filters["af.".concat(collectionFieldName)] = _defineProperty({}, "".concat(collectionFieldName, ".").concat(valueKey, ".$in"), selectedKeysValue);
-    } else {
-      delete filters["af.".concat(collectionFieldName)];
-    }
-
-    service.run(_objectSpread(_objectSpread({}, (_service$params2 = service.params) === null || _service$params2 === void 0 ? void 0 : _service$params2[0]), {}, {
-      pageSize: 200,
-      page: 1,
-      filter: (0, _SharedFilterProvider.mergeFilter)([].concat(_toConsumableArray(Object.values(filters)), [blockProps === null || blockProps === void 0 ? void 0 : (_blockProps$params = blockProps.params) === null || _blockProps$params === void 0 ? void 0 : _blockProps$params.filter]))
-    }), {
-      filters: filters
-    });
+    onSelected(selectedKeysValue);
   };
-
   var handleSearchToggle = function handleSearchToggle(e) {
     var _params$;
-
     var filter = params === null || params === void 0 ? void 0 : (_params$ = params[0]) === null || _params$ === void 0 ? void 0 : _params$.filter;
-
     if (searchVisible || filter) {
       run(_objectSpread(_objectSpread({}, params === null || params === void 0 ? void 0 : params[0]), {}, {
         filter: undefined
       }));
     }
-
     setSearchVisible(!searchVisible);
     e.stopPropagation();
   };
-
   var handleSearchClick = function handleSearchClick(e) {
     e.stopPropagation();
   };
-
   var handleSearchInput = function handleSearchInput(e) {
-    run(_objectSpread(_objectSpread({}, params === null || params === void 0 ? void 0 : params[0]), {}, {
-      filter: _defineProperty({}, "".concat(labelKey, ".$includes"), e.target.value)
-    }));
+    _handleSearchInput(e);
   };
-
   var title = (_fieldSchema$title = fieldSchema.title) !== null && _fieldSchema$title !== void 0 ? _fieldSchema$title : (_collectionField$uiSc = collectionField.uiSchema) === null || _collectionField$uiSc === void 0 ? void 0 : _collectionField$uiSc.title;
+  var labelUiSchema = (0, _recordPicker.useLabelUiSchema)(collectionField, (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.title) || 'label');
   return /*#__PURE__*/_react2.default.createElement(_common.SortableItem, {
     className: (0, _classnames.default)('nb-block-item', props.className, (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n          position: relative;\n          &:hover {\n            > .general-schema-designer {\n              display: block;\n            }\n          }\n          &.nb-form-item:hover {\n            > .general-schema-designer {\n              background: rgba(241, 139, 98, 0.06) !important;\n              border: 0 !important;\n              top: -5px !important;\n              bottom: -5px !important;\n              left: -5px !important;\n              right: -5px !important;\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            border: 2px solid rgba(241, 139, 98, 0.3);\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        "]))))
   }, /*#__PURE__*/_react2.default.createElement(Designer, null), /*#__PURE__*/_react2.default.createElement(_antd.Collapse, {
-    defaultActiveKey: [collectionField.uiSchemaUid],
+    defaultActiveKey: defaultActiveKeyCollapse,
     ghost: true,
     expandIcon: searchVisible ? function () {
       return null;
@@ -217,23 +136,25 @@ var AssociationFilterItem = function AssociationFilterItem(props) {
       className: (0, _css.css)(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["\n                      color: #aeaeae !important;\n                    "]))),
       onClick: handleSearchToggle
     }))),
-    key: collectionField.uiSchemaUid
+    key: defaultActiveKeyCollapse[0]
   }, /*#__PURE__*/_react2.default.createElement(_antd.Tree, {
     style: {
       padding: '16px 0'
     },
     onExpand: onExpand,
+    rootClassName: (0, _css.css)(_templateObject9 || (_templateObject9 = _taggedTemplateLiteral(["\n              .ant-tree-node-content-wrapper {\n                overflow-x: hidden;\n              }\n            "]))),
     expandedKeys: expandedKeys,
     autoExpandParent: autoExpandParent,
-    treeData: treeData,
+    treeData: list,
     onSelect: onSelect,
     fieldNames: fieldNames,
     titleRender: function titleRender(node) {
-      return compile(node[labelKey]);
+      return /*#__PURE__*/_react2.default.createElement(_input.EllipsisWithTooltip, {
+        ellipsis: true
+      }, (0, _recordPicker.getLabelFormatValue)(labelUiSchema, compile(node[labelKey])));
     },
     selectedKeys: selectedKeys,
     blockNode: true
   }))));
 };
-
 exports.AssociationFilterItem = AssociationFilterItem;

package/lib/schema-component/antd/association-filter/AssociationFilter.d.ts

@@ -1,9 +1,12 @@
 import { AssociationFilterItemDesigner } from './AssociationFilter.Item.Designer';
 export declare const AssociationFilter: {
     (props: any): JSX.Element;
+    Provider: (props: any) => JSX.Element;
     Initializer: () => JSX.Element;
+    FilterBlockInitializer: () => JSX.Element;
     Item: ((props: any) => JSX.Element) & {
         Designer: typeof AssociationFilterItemDesigner;
     };
+    BlockDesigner: () => JSX.Element;
     useAssociationField(): import("../../../collection-manager").CollectionFieldOptions;
 };

package/lib/schema-component/antd/association-filter/AssociationFilter.js

@@ -4,59 +4,43 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.AssociationFilter = void 0;
-
 var _css = require("@emotion/css");
-
 var _react = require("@formily/react");
-
 var _classnames = _interopRequireDefault(require("classnames"));
-
 var _react2 = _interopRequireDefault(require("react"));
-
 var _collectionManager = require("../../../collection-manager");
-
 var _schemaInitializer = require("../../../schema-initializer");
-
 var _common = require("../../common");
-
 var _hooks = require("../../hooks");
-
-var _AssociationFilter = require("./AssociationFilter.Initializer");
-
-var _AssociationFilter2 = require("./AssociationFilter.Item");
-
+var _AssociationFilter = require("./AssociationFilter.BlockDesigner");
+var _AssociationFilter2 = require("./AssociationFilter.FilterBlockInitializer");
+var _AssociationFilter3 = require("./AssociationFilter.Initializer");
+var _AssociationFilter4 = require("./AssociationFilter.Item");
 var _AssociationFilterItem = require("./AssociationFilter.Item.Designer");
-
+var _AssociationFilterProvider = require("./AssociationFilterProvider");
 var _templateObject;
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-
 var AssociationFilter = function AssociationFilter(props) {
   var Designer = (0, _hooks.useDesigner)();
   var filedSchema = (0, _react.useFieldSchema)();
-
   var _useSchemaInitializer = (0, _schemaInitializer.useSchemaInitializer)(filedSchema['x-initializer']),
-      exists = _useSchemaInitializer.exists,
-      render = _useSchemaInitializer.render;
-
+    render = _useSchemaInitializer.render;
   return /*#__PURE__*/_react2.default.createElement(_common.DndContext, null, /*#__PURE__*/_react2.default.createElement(_common.SortableItem, {
-    className: (0, _classnames.default)('nb-block-item', props.className, (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n            position: relative;\n            &:hover {\n              > .general-schema-designer {\n                display: block;\n              }\n            }\n            &.nb-form-item:hover {\n              > .general-schema-designer {\n                background: rgba(241, 139, 98, 0.06) !important;\n                border: 0 !important;\n                top: -5px !important;\n                bottom: -5px !important;\n                left: -5px !important;\n                right: -5px !important;\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              border: 2px solid rgba(241, 139, 98, 0.3);\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          "]))))
+    className: (0, _classnames.default)('nb-block-item', props.className, (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n            height: 100%;\n            overflow-y: auto;\n            position: relative;\n            &:hover {\n              > .general-schema-designer {\n                display: block;\n              }\n            }\n            &.nb-form-item:hover {\n              > .general-schema-designer {\n                background: rgba(241, 139, 98, 0.06) !important;\n                border: 0 !important;\n                top: -5px !important;\n                bottom: -5px !important;\n                left: -5px !important;\n                right: -5px !important;\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              border: 2px solid rgba(241, 139, 98, 0.3);\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          "]))))
   }, /*#__PURE__*/_react2.default.createElement(Designer, null), props.children, render()));
 };
-
 exports.AssociationFilter = AssociationFilter;
-AssociationFilter.Initializer = _AssociationFilter.AssociationFilterInitializer;
-AssociationFilter.Item = _AssociationFilter2.AssociationFilterItem;
+AssociationFilter.Provider = _AssociationFilterProvider.AssociationFilterProvider;
+AssociationFilter.Initializer = _AssociationFilter3.AssociationFilterInitializer;
+AssociationFilter.FilterBlockInitializer = _AssociationFilter2.AssociationFilterFilterBlockInitializer;
+AssociationFilter.Item = _AssociationFilter4.AssociationFilterItem;
 AssociationFilter.Item.Designer = _AssociationFilterItem.AssociationFilterItemDesigner;
-
+AssociationFilter.BlockDesigner = _AssociationFilter.AssociationFilterBlockDesigner;
 AssociationFilter.useAssociationField = function () {
   var fieldSchema = (0, _react.useFieldSchema)();
-
   var _useCollection = (0, _collectionManager.useCollection)(),
-      getField = _useCollection.getField;
-
+    getField = _useCollection.getField;
   return _react2.default.useMemo(function () {
     return getField(fieldSchema.name);
   }, [fieldSchema.name]);