@nocobase/client 0.9.2-alpha.4 → 0.9.4-alpha.1

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

@@ -4,75 +4,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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); }
-import { cloneDeep } from 'lodash';
-import { constraintsProps, recordPickerSelector, recordPickerViewer, relationshipType, reverseFieldProperties } from './properties';
-var internalSchameInitialize = function internalSchameInitialize(schema, _ref) {
-  var field = _ref.field,
-    block = _ref.block,
-    readPretty = _ref.readPretty,
-    action = _ref.action;
-  if (block === 'Form') {
-    if (schema['x-component'] === 'FormField') {
-      var association = "".concat(field.collectionName, ".").concat(field.name);
-      schema.type = 'void';
-      schema.properties = {
-        block: {
-          type: 'void',
-          'x-decorator': 'FormFieldProvider',
-          'x-decorator-props': {
-            collection: field.target,
-            association: association,
-            resource: association,
-            action: action,
-            fieldName: field.name,
-            readPretty: readPretty
-          },
-          'x-component': 'CardItem',
-          'x-component-props': {
-            bordered: true
-          },
-          properties: _defineProperty({}, field.name, {
-            type: 'object',
-            'x-component': 'FormV2',
-            'x-component-props': {
-              useProps: '{{ useFormFieldProps }}'
-            },
-            properties: {
-              __form_grid: {
-                type: 'void',
-                'x-component': 'Grid',
-                'x-initializer': 'FormItemInitializers',
-                properties: {}
-              }
-            }
-          })
-        }
-      };
-    } else if (schema['x-component'] === 'AssociationSelect') {
-      Object.assign(schema, {
-        type: 'string',
-        'x-designer': 'AssociationSelect.Designer'
-      });
-    } else {
-      schema.type = 'string';
-      schema['properties'] = {
-        viewer: cloneDeep(recordPickerViewer),
-        selector: cloneDeep(recordPickerSelector)
-      };
-    }
-    return schema;
-  }
-  schema.type = 'string';
-  if (readPretty) {
-    schema['properties'] = {
-      viewer: cloneDeep(recordPickerViewer)
-    };
-  } else {
-    schema['properties'] = {
-      selector: cloneDeep(recordPickerSelector)
-    };
-  }
-};
+import { constraintsProps, relationshipType, reverseFieldProperties } from './properties';
 export var o2o = {
   name: 'o2o',
   type: 'object',
@@ -86,7 +18,7 @@ export var o2o = {
     // name,
     uiSchema: {
       // title,
-      'x-component': 'RecordPicker',
+      'x-component': 'AssociationField',
       'x-component-props': {
         // mode: 'tags',
         multiple: false,
@@ -103,7 +35,7 @@ export var o2o = {
       // name,
       uiSchema: {
         // title,
-        'x-component': 'RecordPicker',
+        'x-component': 'AssociationField',
         'x-component-props': {
           // mode: 'tags',
           multiple: false,
@@ -116,17 +48,11 @@ export var o2o = {
     }
   },
   availableTypes: ['hasOne'],
-  schemaInitialize: function schemaInitialize(schema, _ref2) {
-    var field = _ref2.field,
-      block = _ref2.block,
-      readPretty = _ref2.readPretty,
-      action = _ref2.action;
-    internalSchameInitialize(schema, {
-      field: field,
-      block: block,
-      readPretty: readPretty,
-      action: action
-    });
+  schemaInitialize: function schemaInitialize(schema, _ref) {
+    var field = _ref.field,
+      block = _ref.block,
+      readPretty = _ref.readPretty,
+      action = _ref.action;
     if (['Table', 'Kanban'].includes(block)) {
       schema['x-component-props'] = schema['x-component-props'] || {};
       schema['x-component-props']['ellipsis'] = true;
@@ -270,7 +196,7 @@ export var oho = {
     // name,
     uiSchema: {
       // title,
-      'x-component': 'RecordPicker',
+      'x-component': 'AssociationField',
       'x-component-props': {
         // mode: 'tags',
         multiple: false,
@@ -287,7 +213,7 @@ export var oho = {
       // name,
       uiSchema: {
         // title,
-        'x-component': 'RecordPicker',
+        'x-component': 'AssociationField',
         'x-component-props': {
           // mode: 'tags',
           multiple: false,
@@ -299,17 +225,12 @@ export var oho = {
       }
     }
   },
-  schemaInitialize: function schemaInitialize(schema, _ref3) {
-    var field = _ref3.field,
-      block = _ref3.block,
-      readPretty = _ref3.readPretty,
-      action = _ref3.action;
-    internalSchameInitialize(schema, {
-      field: field,
-      block: block,
-      readPretty: readPretty,
-      action: action
-    });
+  schemaInitialize: function schemaInitialize(schema, _ref2) {
+    var field = _ref2.field,
+      block = _ref2.block,
+      readPretty = _ref2.readPretty,
+      action = _ref2.action;
+    // schema['type'] = 'object';
     if (['Table', 'Kanban'].includes(block)) {
       schema['x-component-props'] = schema['x-component-props'] || {};
       schema['x-component-props']['ellipsis'] = true;
@@ -444,7 +365,7 @@ export var obo = {
     // name,
     uiSchema: {
       // title,
-      'x-component': 'RecordPicker',
+      'x-component': 'AssociationField',
       'x-component-props': {
         // mode: 'tags',
         multiple: false,
@@ -460,7 +381,7 @@ export var obo = {
       // name,
       uiSchema: {
         // title,
-        'x-component': 'RecordPicker',
+        'x-component': 'AssociationField',
         'x-component-props': {
           // mode: 'tags',
           multiple: false,
@@ -472,18 +393,13 @@ export var obo = {
       }
     }
   },
-  schemaInitialize: function schemaInitialize(schema, _ref4) {
-    var field = _ref4.field,
-      block = _ref4.block,
-      readPretty = _ref4.readPretty,
-      action = _ref4.action,
-      targetCollection = _ref4.targetCollection;
-    internalSchameInitialize(schema, {
-      field: field,
-      block: block,
-      readPretty: readPretty,
-      action: action
-    });
+  schemaInitialize: function schemaInitialize(schema, _ref3) {
+    var field = _ref3.field,
+      block = _ref3.block,
+      readPretty = _ref3.readPretty,
+      action = _ref3.action,
+      targetCollection = _ref3.targetCollection;
+    // schema['type'] = 'object';
     if (['Table', 'Kanban'].includes(block)) {
       schema['x-component-props'] = schema['x-component-props'] || {};
       schema['x-component-props']['ellipsis'] = true;
@@ -496,16 +412,6 @@ export var obo = {
       };
       schema['x-component-props'].fieldNames.label = targetCollection.titleField;
     }
-    if ((targetCollection === null || targetCollection === void 0 ? void 0 : targetCollection.template) === 'file') {
-      var fieldNames = schema['x-component-props']['fieldNames'] || {
-        label: 'preview',
-        value: 'id'
-      };
-      fieldNames.label = 'preview';
-      schema['x-component-props']['fieldNames'] = fieldNames;
-      schema['x-component-props'].quickUpload = true;
-      schema['x-component-props'].selectFile = true;
-    }
   },
   properties: _objectSpread(_objectSpread({
     'uiSchema.title': {

package/es/collection-manager/interfaces/updatedBy.js

@@ -20,7 +20,7 @@ export var updatedBy = {
     uiSchema: {
       type: 'object',
       title: '{{t("Last updated by")}}',
-      'x-component': 'RecordPicker',
+      'x-component': 'AssociationField',
       'x-component-props': {
         fieldNames: {
           value: 'id',

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

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

package/es/collection-manager/templates/tree.js

@@ -26,7 +26,7 @@ export var tree = {
       onDelete: 'CASCADE',
       uiSchema: {
         title: '{{t("Parent")}}',
-        'x-component': 'RecordPicker',
+        'x-component': 'AssociationField',
         'x-component-props': {
           // mode: 'tags',
           multiple: false,
@@ -45,7 +45,7 @@ export var tree = {
       onDelete: 'CASCADE',
       uiSchema: {
         title: '{{t("Children")}}',
-        'x-component': 'RecordPicker',
+        'x-component': 'AssociationField',
         'x-component-props': {
           // mode: 'tags',
           multiple: true,

package/es/filter-provider/FilterProvider.js

@@ -21,6 +21,7 @@ import { mergeFilter } from '../block-provider/SharedFilterProvider';
 import { useCollection } from '../collection-manager';
 import { removeNullCondition } from '../schema-component';
 import { useAssociatedFields } from './utils';
+import { uniqBy } from 'lodash';
 var FilterContext = /*#__PURE__*/createContext(null);
 /**
  * 主要用于记录当前页面中的数据区块的信息，用于在过滤区块中使用
@@ -121,8 +122,9 @@ export var useFilterBlock = function useFilterBlock() {
       existingBlock.defaultFilter = block.defaultFilter;
       return;
     }
+    // 由于 setDataBlocks 是异步操作，所以上面的 existingBlock 在判断时有可能用的是旧的 dataBlocks,所以下面还需要根据 uid 进行去重操作
     setDataBlocks(function (prev) {
-      return [].concat(_toConsumableArray(prev), [block]);
+      return uniqBy([].concat(_toConsumableArray(prev), [block]), 'uid');
     });
   };
   var getDataBlocks = function getDataBlocks() {

package/es/filter-provider/utils.js

@@ -84,7 +84,7 @@ export var transformToFilter = function transformToFilter(values, fieldSchema, g
         value = 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/es/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/es/index.js

@@ -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/es/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;
@@ -241,6 +252,7 @@ declare const _default: {
     "Link to": string;
     "Link to description": string;
     "Sub-table": string;
+    "Sub-details": string;
     "System info": string;
     "Created at": string;
     "Last updated at": string;
@@ -280,8 +292,13 @@ 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;
+    "Allow add new data": string;
     "Record picker": string;
     "Toggles the subfield mode": string;
     "Selector mode": string;
@@ -498,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;
@@ -691,5 +708,6 @@ declare const _default: {
     "Render Failed": string;
     Feedback: string;
     "Try again": string;
+    "Data template": string;
 };
 export default _default;

package/es/locale/en_US.js

@@ -104,6 +104,17 @@ export 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",
@@ -241,6 +252,7 @@ export default {
   "Link to": "Link to",
   "Link to description": "Used to create collection relationships quickly and compatible with most common scenarios. Suitable for non-developer use. When present as a field, it is a drop-down selection used to select records from the target collection. Once created, it will simultaneously generate the associated fields of the current collection in the target collection.",
   "Sub-table": "Sub-table",
+  "Sub-details": "Sub-details",
   "System info": "System info",
   "Created at": "Created at",
   "Last updated at": "Last updated at",
@@ -280,13 +292,18 @@ export 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": "Subform",
+  "Subform": "Sub-form",
+  "Field mode": "Field mode",
+  "Allow add new data": "Allow add new data",
   "Record picker": "Record picker",
   "Toggles the subfield mode": "Toggles the subfield mode",
   "Selector mode": "Selector mode",
   "Subtable mode": "Subtable mode",
-  "Subform mode": "Subform mode",
+  "Subform mode": "Sub-form mode",
   "Edit block title": "Edit block title",
   "Block title": "Block title",
   "Pattern": "Pattern",
@@ -498,7 +515,7 @@ export 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",
@@ -690,5 +707,6 @@ export 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"
 };