@nocobase/client 0.9.3-alpha.1 → 0.9.4-alpha.2

package/lib/block-provider/hooks/index.js

@@ -22,13 +22,13 @@ var _utils = require("../../filter-provider/utils");
 var _recordProvider = require("../../record-provider");
 var _schemaComponent = require("../../schema-component");
 var _components = require("../../schema-initializer/components");
+var _schemaTemplates = require("../../schema-templates");
 var _user = require("../../user");
 var _BlockProvider = require("../BlockProvider");
 var _DetailsBlockProvider = require("../DetailsBlockProvider");
 var _SharedFilterProvider = require("../SharedFilterProvider");
 var _TableFieldProvider = require("../TableFieldProvider");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _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 _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); }
@@ -203,7 +203,7 @@ var useCreateActionProps = function useCreateActionProps() {
               _context2.next = 7;
               return form.submit();
             case 7:
-              values = getFormValues(filterByTk, field, form, fieldNames, getField, resource);
+              values = getFormValues(filterByTk, field, form, fieldNames, getField, resource); // const values = omitBy(formValues, (value) => isEqual(JSON.stringify(value), '[{}]'));
               if (addChild) {
                 treeParentField = getTreeParentField();
                 values[(_treeParentField$name = treeParentField === null || treeParentField === void 0 ? void 0 : treeParentField.name) !== null && _treeParentField$name !== void 0 ? _treeParentField$name : 'parent'] = currentRecord;
@@ -347,13 +347,14 @@ var useAssociationCreateActionProps = function useAssociationCreateActionProps()
               return _context3.abrupt("return");
             case 20:
               _antd.message.success(compile(onSuccess === null || onSuccess === void 0 ? void 0 : onSuccess.successMessage));
-              _context3.next = 26;
+              _context3.next = 27;
               break;
             case 23:
               _context3.prev = 23;
               _context3.t0 = _context3["catch"](11);
+              actionField.data.data = null;
               actionField.data.loading = false;
-            case 26:
+            case 27:
             case "end":
               return _context3.stop();
           }
@@ -1549,74 +1550,70 @@ var useAssociationFilterBlockProps = function useAssociationFilterBlockProps() {
   };
 };
 exports.useAssociationFilterBlockProps = useAssociationFilterBlockProps;
+var getTemplateSchema = function getTemplateSchema(schema) {
+  var conf = {
+    url: "/uiSchemas:getJsonSchema/".concat(schema === null || schema === void 0 ? void 0 : schema.uid)
+  };
+  var _useRequest3 = (0, _apiClient.useRequest)(conf, {
+      manual: true
+    }),
+    data = _useRequest3.data,
+    loading = _useRequest3.loading,
+    run = _useRequest3.run;
+  if (loading) {}
+  (0, _react2.useEffect)(function () {
+    if (schema === null || schema === void 0 ? void 0 : schema.uid) {
+      run();
+    }
+  }, [schema === null || schema === void 0 ? void 0 : schema.uid]);
+  return (schema === null || schema === void 0 ? void 0 : schema.uid) ? new _react.Schema(data === null || data === void 0 ? void 0 : data.data) : null;
+};
 var useAssociationNames = function useAssociationNames(collection) {
+  var _templateSchema$xCom;
   var _useCollectionManager2 = (0, _collectionManager.useCollectionManager)(),
-    getCollectionFields = _useCollectionManager2.getCollectionFields,
     getCollectionJoinField = _useCollectionManager2.getCollectionJoinField;
-  var collectionFields = getCollectionFields(collection);
-  var associationFields = new Set();
-  var _iterator = _createForOfIteratorHelper(collectionFields),
-    _step;
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var collectionField = _step.value;
-      if (collectionField.target) {
-        associationFields.add(collectionField.name);
-        var fields = getCollectionFields(collectionField.target);
-        var _iterator2 = _createForOfIteratorHelper(fields),
-          _step2;
-        try {
-          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-            var field = _step2.value;
-            if (field.target) {
-              associationFields.add("".concat(collectionField.name, ".").concat(field.name));
-            }
-          }
-        } catch (err) {
-          _iterator2.e(err);
-        } finally {
-          _iterator2.f();
-        }
-      }
-    }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
-  }
+  var _useSchemaTemplateMan = (0, _schemaTemplates.useSchemaTemplateManager)(),
+    getTemplateById = _useSchemaTemplateMan.getTemplateById;
   var fieldSchema = (0, _react.useFieldSchema)();
   var associationValues = [];
   var formSchema = fieldSchema.reduceProperties(function (buf, schema) {
-    if (['FormV2', 'Details'].includes(schema['x-component'])) {
+    if (['FormV2', 'Details', 'List', 'GridCard'].includes(schema['x-component'])) {
       return schema;
     }
     return buf;
   }, new _react.Schema({}));
+  var templateSchema = formSchema.reduceProperties(function (buf, schema) {
+    if (schema['x-component'] === 'BlockTemplate') {
+      return schema;
+    }
+    return buf;
+  }, null);
   var getAssociationAppends = function getAssociationAppends(schema) {
     var arr = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-    return schema.reduceProperties(function (buf, s) {
+    var data = schema.reduceProperties(function (buf, s) {
       var collectionfield = s['x-collection-field'] && getCollectionJoinField(s['x-collection-field']);
-      if (collectionfield && ['createdBy', 'updatedBy', 'o2m', 'obo', 'oho', 'm2o', 'm2m'].includes(collectionfield.interface)) {
+      if (collectionfield && ['hasOne', 'hasMany', 'belongsTo', 'belongsToMany'].includes(collectionfield.type) && s['x-component'] !== 'TableField') {
         var _s$xComponentProps;
+        buf.push(s.name);
         if (['Nester', 'SubTable'].includes((_s$xComponentProps = s['x-component-props']) === null || _s$xComponentProps === void 0 ? void 0 : _s$xComponentProps.mode)) {
           associationValues.push(s.name);
         }
-        buf.push(s.name);
-        if (s['x-component-props'].mode === 'Nester' || s['x-component'] === 'TableField') {
+        if (s['x-component-props'].mode === 'Nester') {
           return getAssociationAppends(s, buf);
         }
         return buf;
       } else {
-        if (s['x-component'] === 'Grid' || s['x-component'] === 'TableV2') {
+        if (s['x-component'] === 'Grid.Row') {
           var _buf$concat;
           var kk = buf === null || buf === void 0 ? void 0 : (_buf$concat = buf.concat) === null || _buf$concat === void 0 ? void 0 : _buf$concat.call(buf);
           return getNesterAppends(s, kk || []);
         } else {
           var _s$xComponent;
-          return !((_s$xComponent = s['x-component']) === null || _s$xComponent === void 0 ? void 0 : _s$xComponent.includes('Action.')) && getAssociationAppends(s, buf);
+          return !((_s$xComponent = s['x-component']) === null || _s$xComponent === void 0 ? void 0 : _s$xComponent.includes('Action.')) && s['x-component'] !== 'TableField' ? getAssociationAppends(s, buf) : buf;
         }
       }
     }, arr);
+    return data || [];
   };
   function flattenNestedList(nestedList) {
     var flattenedList = [];
@@ -1625,17 +1622,26 @@ var useAssociationNames = function useAssociationNames(collection) {
         if (Array.isArray(list[i])) {
           "".concat(prefix) !== "".concat(list[i][0]) && flattenHelper(list[i], "".concat(prefix, ".").concat(list[i][0]));
         } else {
-          var str = prefix.replaceAll("".concat(list[i]), '').replace('..', '.').trim();
-          !list.includes(str) && flattenedList.push("".concat(str).concat(list[i]));
+          var searchTerm = ".".concat(list[i]);
+          var lastIndex = prefix.lastIndexOf(searchTerm);
+          var str = '';
+          if (lastIndex !== -1) {
+            str = prefix.slice(0, lastIndex) + prefix.slice(lastIndex + searchTerm.length);
+          }
+          if (!str) {
+            !list.includes(str) && flattenedList.push("".concat(list[i]));
+          } else {
+            !list.includes(str) ? flattenedList.push("".concat(str, ".").concat(list[i])) : flattenedList.push(str);
+          }
         }
       }
     }
     for (var i = 0; i < nestedList.length; i++) {
       flattenHelper(nestedList[i], nestedList[i][0]);
     }
-    return flattenedList.filter(function (obj) {
-      return !obj.startsWith('.');
-    });
+    return (0, _lodash.uniq)(flattenedList.filter(function (obj) {
+      return !(obj === null || obj === void 0 ? void 0 : obj.startsWith('.'));
+    }));
   }
   var getNesterAppends = function getNesterAppends(gridSchema, data) {
     gridSchema.reduceProperties(function (buf, s) {
@@ -1646,16 +1652,31 @@ var useAssociationNames = function useAssociationNames(collection) {
       return g.length;
     });
   };
-  var data = getAssociationAppends(formSchema);
-  var associations = data.filter(function (g) {
-    return g.length;
-  });
-  var appends = flattenNestedList(associations);
-  return {
-    appends: appends,
-    updateAssociationValues: appends.filter(function (v) {
-      return associationValues.includes(v);
-    })
-  };
+  var template = getTemplateById(templateSchema === null || templateSchema === void 0 ? void 0 : (_templateSchema$xCom = templateSchema['x-component-props']) === null || _templateSchema$xCom === void 0 ? void 0 : _templateSchema$xCom.templateId);
+  var schema = getTemplateSchema(template);
+  if (schema) {
+    var associations = getAssociationAppends(schema);
+    var appends = flattenNestedList(associations);
+    return {
+      appends: appends,
+      updateAssociationValues: appends.filter(function (item) {
+        return associationValues.some(function (suffix) {
+          return item.endsWith(suffix);
+        });
+      })
+    };
+  }
+  if (!schema) {
+    var _associations = getAssociationAppends(formSchema);
+    var _appends = flattenNestedList(_associations);
+    return {
+      appends: _appends,
+      updateAssociationValues: _appends.filter(function (item) {
+        return associationValues.some(function (suffix) {
+          return item.endsWith(suffix);
+        });
+      })
+    };
+  }
 };
 exports.useAssociationNames = useAssociationNames;

package/lib/collection-manager/CollectionField.js

@@ -14,12 +14,12 @@ var _CollectionFieldProvider = require("./CollectionFieldProvider");
 var _hooks = require("./hooks");
 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; }
 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 _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); }
 // TODO: 初步适配
 var InternalField = function InternalField(props) {
   var component = props.component;
@@ -76,7 +76,7 @@ var InternalField = function InternalField(props) {
   if (!uiSchema) {
     return null;
   }
-  return /*#__PURE__*/_react2.default.createElement(Component, props, props.children);
+  return /*#__PURE__*/_react2.default.createElement(Component, _objectSpread({}, props));
 };
 var InternalFallbackField = function InternalFallbackField() {
   var _fieldSchema$xCompon, _fieldSchema$xCompon2, _fieldSchema$xCompon3;
@@ -108,7 +108,7 @@ var DeletedField = function DeletedField() {
     style: {
       color: '#ccc'
     }
-  }, t('The field has bee deleted'));
+  }, t('The field has been deleted'));
 };
 var CollectionField = (0, _react.connect)(function (props) {
   var _fieldSchema$xCompon4;

package/lib/collection-manager/CollectionFieldProvider.js

@@ -13,7 +13,8 @@ var CollectionFieldProvider = function CollectionFieldProvider(props) {
   var name = props.name,
     field = props.field,
     children = props.children,
-    fallback = props.fallback;
+    _props$fallback = props.fallback,
+    fallback = _props$fallback === void 0 ? null : _props$fallback;
   var fieldSchema = (0, _react.useFieldSchema)();
   var _useCollection = (0, _hooks.useCollection)(),
     getField = _useCollection.getField;

package/lib/collection-manager/Configuration/AddFieldAction.js

@@ -15,10 +15,10 @@ var _reactI18next = require("react-i18next");
 var _apiClient = require("../../api-client");
 var _recordProvider = require("../../record-provider");
 var _schemaComponent = require("../../schema-component");
+var _ResourceActionProvider = require("../ResourceActionProvider");
 var _actionHooks = require("../action-hooks");
 var _hooks = require("../hooks");
 var _useOptions = require("../hooks/useOptions");
-var _ResourceActionProvider = require("../ResourceActionProvider");
 var components = _interopRequireWildcard(require("./components"));
 var _interfaces = require("./interfaces");
 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); }
@@ -302,7 +302,7 @@ var AddFieldAction = function AddFieldAction(props) {
         key: option.label,
         title: compile(option.label)
       }, option.children.filter(function (child) {
-        return !['o2o', 'subTable'].includes(child.name);
+        return !['o2o', 'subTable', 'linkTo'].includes(child.name);
       }).map(function (child) {
         return /*#__PURE__*/_react2.default.createElement(_antd2.Menu.Item, {
           key: child.name,

package/lib/collection-manager/Configuration/CollectionFields.d.ts

@@ -1,2 +1,2 @@
 export declare const isTitleField: (field: any) => boolean;
-export declare const CollectionFields: (props: any) => JSX.Element;
+export declare const CollectionFields: () => JSX.Element;

package/lib/collection-manager/Configuration/CollectionFields.js

@@ -76,7 +76,6 @@ var CurrentFields = function CurrentFields(props) {
     loadingRecord = _React$useState2[0],
     setLoadingRecord = _React$useState2[1];
   var _useCollectionManager2 = (0, _useCollectionManager6.useCollectionManager)(),
-    updateCollection = _useCollectionManager2.updateCollection,
     refreshCM = _useCollectionManager2.refreshCM;
   var columns = [{
     dataIndex: ['uiSchema', 'title'],
@@ -201,7 +200,6 @@ var InheritFields = function InheritFields(props) {
   var _useTranslation2 = (0, _reactI18next.useTranslation)(),
     t = _useTranslation2.t;
   var _useCollectionManager4 = (0, _useCollectionManager6.useCollectionManager)(),
-    updateCollection = _useCollectionManager4.updateCollection,
     refreshCM = _useCollectionManager4.refreshCM;
   var columns = [{
     dataIndex: ['uiSchema', 'title'],
@@ -295,7 +293,7 @@ var InheritFields = function InheritFields(props) {
     })
   });
 };
-var CollectionFields = function CollectionFields(props) {
+var CollectionFields = function CollectionFields() {
   var compile = (0, _schemaComponent.useCompile)();
   var field = (0, _react.useField)();
   var _useRecord3 = (0, _recordProvider.useRecord)(),

package/lib/collection-manager/Configuration/ConfigurationTabs.js

@@ -159,6 +159,13 @@ var ConfigurationTabs = function ConfigurationTabs() {
     _useState4 = _slicedToArray(_useState3, 2),
     key = _useState4[0],
     setKey = _useState4[1];
+  var _useState5 = (0, _react2.useState)('all'),
+    _useState6 = _slicedToArray(_useState5, 2),
+    activeKey = _useState6[0],
+    setActiveKey = _useState6[1];
+  var compile = (0, _schemaComponent.useCompile)();
+  var api = (0, _apiClient.useAPIClient)();
+  if (!data) return null;
   var tabsItems = data.sort(function (a, b) {
     return b.sort - a.sort;
   }).concat().map(function (v) {
@@ -175,12 +182,6 @@ var ConfigurationTabs = function ConfigurationTabs() {
     closable: false,
     schema: _collections.collectionTableSchema
   });
-  var compile = (0, _schemaComponent.useCompile)();
-  var _useState5 = (0, _react2.useState)('all'),
-    _useState6 = _slicedToArray(_useState5, 2),
-    activeKey = _useState6[0],
-    setActiveKey = _useState6[1];
-  var api = (0, _apiClient.useAPIClient)();
   var onChange = function onChange(key) {
     setActiveKey(key);
     setKey((0, _shared.uid)());

package/lib/collection-manager/hooks/useCollection.d.ts

@@ -3,7 +3,7 @@ import { CollectionFieldOptions } from '../types';
 export declare type Collection = ReturnType<typeof useCollection>;
 export declare const useCollection: () => {
     resource: import("@nocobase/sdk").IResource;
-    getField(name: SchemaKey): CollectionFieldOptions;
+    getField(name: SchemaKey): CollectionFieldOptions | null;
     getTreeParentField(): import("../types").FieldOptions;
     fields: import("../types").FieldOptions[];
     getPrimaryKey: () => any;

package/lib/collection-manager/hooks/useCollectionDataSource.js

@@ -8,11 +8,11 @@ var _reactive = require("@formily/reactive");
 var _ = require(".");
 var _schemaComponent = require("../../schema-component");
 function useCollectionDataSource(filter) {
+  var compile = (0, _schemaComponent.useCompile)();
+  var _useCollectionManager = (0, _.useCollectionManager)(),
+    _useCollectionManager2 = _useCollectionManager.collections,
+    collections = _useCollectionManager2 === void 0 ? [] : _useCollectionManager2;
   return function (field) {
-    var compile = (0, _schemaComponent.useCompile)();
-    var _useCollectionManager = (0, _.useCollectionManager)(),
-      _useCollectionManager2 = _useCollectionManager.collections,
-      collections = _useCollectionManager2 === void 0 ? [] : _useCollectionManager2;
     _reactive.action.bound(function (data) {
       var filtered = typeof filter === 'function' ? data.filter(filter) : data;
       field.dataSource = filtered.map(function (item) {

package/lib/collection-manager/interfaces/m2m.js

@@ -58,7 +58,7 @@ var m2m = {
     var readPretty = _ref.readPretty,
       block = _ref.block,
       targetCollection = _ref.targetCollection;
-    schema['type'] = 'array';
+    // schema['type'] = 'array';
     if ((targetCollection === null || targetCollection === void 0 ? void 0 : targetCollection.titleField) && schema['x-component-props']) {
       schema['x-component-props'].fieldNames = schema['x-component-props'].fieldNames || {
         value: 'id'

package/lib/collection-manager/interfaces/m2o.js

@@ -57,7 +57,7 @@ var m2o = {
     var block = _ref.block,
       readPretty = _ref.readPretty,
       targetCollection = _ref.targetCollection;
-    schema['type'] = 'object';
+    // schema['type'] = 'object';
     if ((targetCollection === null || targetCollection === void 0 ? void 0 : targetCollection.titleField) && schema['x-component-props']) {
       schema['x-component-props'].fieldNames = schema['x-component-props'].fieldNames || {
         value: 'id'

package/lib/collection-manager/interfaces/o2m.js

@@ -58,7 +58,7 @@ var o2m = {
       block = _ref.block,
       readPretty = _ref.readPretty,
       targetCollection = _ref.targetCollection;
-    schema['type'] = 'array';
+    // schema['type'] = 'array';
     if ((targetCollection === null || targetCollection === void 0 ? void 0 : targetCollection.titleField) && schema['x-component-props']) {
       schema['x-component-props'].fieldNames = schema['x-component-props'].fieldNames || {
         value: 'id'

package/lib/collection-manager/interfaces/o2o.js

@@ -237,7 +237,7 @@ var oho = {
       block = _ref2.block,
       readPretty = _ref2.readPretty,
       action = _ref2.action;
-    schema['type'] = 'object';
+    // schema['type'] = 'object';
     if (['Table', 'Kanban'].includes(block)) {
       schema['x-component-props'] = schema['x-component-props'] || {};
       schema['x-component-props']['ellipsis'] = true;
@@ -407,7 +407,7 @@ var obo = {
       readPretty = _ref3.readPretty,
       action = _ref3.action,
       targetCollection = _ref3.targetCollection;
-    schema['type'] = 'object';
+    // schema['type'] = 'object';
     if (['Table', 'Kanban'].includes(block)) {
       schema['x-component-props'] = schema['x-component-props'] || {};
       schema['x-component-props']['ellipsis'] = true;

package/lib/collection-manager/templates/expression.js

@@ -37,7 +37,7 @@ var expression = {
         title: '{{t("Collection")}}',
         'x-component': 'CollectionSelect',
         'x-component-props': {
-          multiple: true
+          // multiple: true,
         }
       }
     }, {

package/lib/filter-provider/utils.js

@@ -93,7 +93,7 @@ var transformToFilter = function transformToFilter(values, fieldSchema, getColle
         value = (0, _client.getValuesByPath)(value, collectionField.targetKey || 'id');
         key = "".concat(key, ".").concat(collectionField.targetKey || 'id');
       }
-      if (!value || value.length === 0) {
+      if (!value) {
         return null;
       }
       return _defineProperty({}, key, _defineProperty({}, operators[key] || '$eq', value));

package/lib/index.d.ts

@@ -23,6 +23,7 @@ export * from './schema-component';
 export * from './schema-initializer';
 export * from './schema-settings';
 export * from './schema-templates';
+export * from './schema-items';
 export * from './settings-form';
 export * from './system-settings';
 export * from './user';

package/lib/index.js

@@ -268,6 +268,17 @@ Object.keys(_schemaTemplates).forEach(function (key) {
     }
   });
 });
+var _schemaItems = require("./schema-items");
+Object.keys(_schemaItems).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _schemaItems[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _schemaItems[key];
+    }
+  });
+});
 var _settingsForm = require("./settings-form");
 Object.keys(_settingsForm).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/lib/locale/en_US.d.ts

@@ -104,6 +104,17 @@ declare const _default: {
     Table: string;
     "Table OID(Inheritance)": string;
     Form: string;
+    List: string;
+    "Grid Card": string;
+    pixels: string;
+    "Screen size": string;
+    "Display title": string;
+    'Set the count of columns displayed in a row': string;
+    Column: string;
+    'Phone device': string;
+    'Tablet device': string;
+    'Desktop device': string;
+    'Large screen device': string;
     Collapse: string;
     "Select data source": string;
     Calendar: string;
@@ -281,6 +292,9 @@ declare const _default: {
     "Display association fields": string;
     "Display field title": string;
     "Field component": string;
+    "Allow multiple": string;
+    "Quick upload": string;
+    "Select file": string;
     Subtable: string;
     Subform: string;
     "Field mode": string;
@@ -501,7 +515,7 @@ declare const _default: {
     "Skip required validation": string;
     "Form values": string;
     "Fields values": string;
-    'The field has bee deleted': string;
+    'The field has been deleted': string;
     "When submitting the following fields, the saved values are": string;
     "After successful submission": string;
     Then: string;
@@ -694,5 +708,6 @@ declare const _default: {
     "Render Failed": string;
     Feedback: string;
     "Try again": string;
+    "Data template": string;
 };
 export default _default;

package/lib/locale/en_US.js

@@ -110,6 +110,17 @@ var _default = {
   "Table": "Table",
   "Table OID(Inheritance)": "Table OID(Inheritance)",
   "Form": "Form",
+  "List": "List",
+  "Grid Card": "Grid Card",
+  "pixels": "pixels",
+  "Screen size": "Screen size",
+  "Display title": "Display title",
+  'Set the count of columns displayed in a row': "Set the count of columns displayed in a row",
+  'Column': 'Column',
+  'Phone device': 'Phone device',
+  'Tablet device': 'Tablet device',
+  'Desktop device': 'Desktop device',
+  'Large screen device': 'Large screen device',
   "Collapse": "Collapse",
   "Select data source": "Select data source",
   "Calendar": "Calendar",
@@ -287,6 +298,9 @@ var _default = {
   "Display association fields": "Display association fields",
   "Display field title": "Display field title",
   "Field component": "Field component",
+  "Allow multiple": "Allow multiple",
+  "Quick upload": "Quick upload",
+  "Select file": "Select file",
   "Subtable": "Subtable",
   "Subform": "Sub-form",
   "Field mode": "Field mode",
@@ -507,7 +521,7 @@ var _default = {
   "Skip required validation": "Skip required validation",
   "Form values": "Form values",
   "Fields values": "Fields values",
-  'The field has bee deleted': 'The field has bee deleted',
+  'The field has been deleted': 'The field has been deleted',
   "When submitting the following fields, the saved values are": "When submitting the following fields, the saved values are",
   "After successful submission": "After successful submission",
   "Then": "Then",
@@ -699,6 +713,7 @@ var _default = {
   "This is likely a NocoBase internals bug. Please open an issue at <1>here</1>": "This is likely a NocoBase internals bug. Please open an issue at <1>here</1>",
   "Render Failed": "Render Failed",
   "Feedback": "Feedback",
-  "Try again": "Try again"
+  "Try again": "Try again",
+  "Data template": "Data template"
 };
 exports.default = _default;