@nocobase/client-v2 2.1.0-alpha.40 → 2.1.0-alpha.46

package/src/collection-manager/interfaces/properties/index.ts

@@ -7,14 +7,10 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { Field } from '@formily/core';
 import { ISchema } from '@formily/react';
-import { uid } from '@formily/shared';
 import { css } from '@emotion/css';
 import { DateFormatCom } from '../../../flow/components/ExpiresRadio';
 
-export * as operators from './operators';
-
 export const type: ISchema = {
   type: 'string',
   title: '{{t("Storage type")}}',
@@ -51,17 +47,6 @@ export const unique = {
   'x-decorator': 'FormItem',
   'x-component': 'Checkbox',
   'x-disabled': '{{ !createMainOnly || primaryKeyOnly }}',
-  'x-reactions': [
-    {
-      dependencies: ['primaryKey'],
-      when: '{{$deps[0]}}',
-      fulfill: {
-        state: {
-          value: false,
-        },
-      },
-    },
-  ],
 };
 export const primaryKey = {
   type: 'boolean',
@@ -69,17 +54,6 @@ export const primaryKey = {
   'x-decorator': 'FormItem',
   'x-component': 'Checkbox',
   'x-disabled': '{{ !createMainOnly || primaryKeyOnly }}',
-  'x-reactions': [
-    {
-      dependencies: ['unique'],
-      when: '{{$deps[0]&&createMainOnly}}',
-      fulfill: {
-        state: {
-          value: false,
-        },
-      },
-    },
-  ],
 };
 
 export const autoIncrement = {
@@ -89,17 +63,6 @@ export const autoIncrement = {
   'x-decorator': 'FormItem',
   'x-component': 'Checkbox',
   'x-disabled': '{{ !createMainOnly }}',
-  'x-reactions': [
-    {
-      dependencies: ['primaryKey'],
-      when: '{{$deps[0]&&createMainOnly}}',
-      fulfill: {
-        state: {
-          value: true,
-        },
-      },
-    },
-  ],
 };
 
 export const autoFill = {
@@ -155,56 +118,6 @@ export const reverseFieldProperties: Record<string, ISchema> = {
         'x-decorator': 'FormItem',
         'x-component': 'Checkbox',
         'x-content': '{{t("Create inverse field in the target collection")}}',
-        'x-reactions': [
-          {
-            target: 'reverseField.type',
-            when: '{{!!$self.value}}',
-            fulfill: {
-              state: {
-                hidden: false,
-              },
-            },
-            otherwise: {
-              state: {
-                hidden: true,
-              },
-            },
-          },
-          {
-            target: 'reverseField.uiSchema.title',
-            when: '{{!!$self.value}}',
-            fulfill: {
-              state: {
-                hidden: false,
-              },
-            },
-            otherwise: {
-              state: {
-                hidden: true,
-              },
-            },
-          },
-          {
-            target: 'reverseField.name',
-            when: '{{!!$self.value}}',
-            fulfill: {
-              state: {
-                hidden: false,
-              },
-            },
-            otherwise: {
-              state: {
-                hidden: true,
-              },
-            },
-          },
-          (field) => {
-            const values = field.form.values;
-            const { reverseField } = values;
-            field.value = !!reverseField?.key;
-            field.disabled = !!reverseField?.key;
-          },
-        ],
       },
       'reverseField.type': {
         ...relationshipType,
@@ -308,44 +221,12 @@ export const dateTimeProps: { [key: string]: ISchema } = {
         value: 'custom',
       },
     ],
-    'x-reactions': {
-      dependencies: ['uiSchema.x-component-props.picker'],
-      fulfill: {
-        state: {
-          value: `{{ getPickerFormat($deps[0])}}`,
-          componentProps: { picker: `{{$deps[0]}}` },
-        },
-      },
-    },
   },
   'uiSchema.x-component-props.showTime': {
     type: 'boolean',
     'x-decorator': 'FormItem',
     'x-component': 'Checkbox',
     'x-content': '{{t("Show time")}}',
-    'x-reactions': [
-      `{{(field) => {
-         field.query('..[].timeFormat').take(f => {
-           f.display = field.value ? 'visible' : 'none';
-           f.value='HH:mm:ss'
-         });
-       }}}`,
-      {
-        dependencies: ['uiSchema.x-component-props.picker'],
-        when: '{{$deps[0]==="date"}}',
-        fulfill: {
-          state: {
-            hidden: false,
-          },
-        },
-        otherwise: {
-          state: {
-            hidden: true,
-            value: false,
-          },
-        },
-      },
-    ],
   },
   'uiSchema.x-component-props.timeFormat': {
     type: 'string',
@@ -363,14 +244,6 @@ export const dateTimeProps: { [key: string]: ISchema } = {
         value: 'HH:mm:ss',
       },
     ],
-    'x-reactions': {
-      dependencies: ['uiSchema.x-component-props.showTime'],
-      fulfill: {
-        state: {
-          hidden: `{{ !$deps[0] }}`,
-        },
-      },
-    },
   },
 };
 
@@ -446,12 +319,6 @@ export const dataSource: ISchema = {
             required: true,
             'x-decorator': 'FormItem',
             'x-component': 'Input',
-            'x-reactions': (field: Field) => {
-              if (!field.initialValue && !field.initialized) {
-                field.initialValue = uid();
-                field.setValue(uid());
-              }
-            },
           },
         },
       },

package/src/collection-manager/interfaces/radioGroup.ts

@@ -8,7 +8,7 @@
  */
 
 import { CollectionFieldInterface } from '../../collection-field-interface/CollectionFieldInterface';
-import { dataSource, defaultProps, operators } from './properties';
+import { dataSource, defaultProps } from './properties';
 
 export class RadioGroupFieldInterface extends CollectionFieldInterface {
   name = 'radioGroup';
@@ -31,7 +31,7 @@ export class RadioGroupFieldInterface extends CollectionFieldInterface {
     'uiSchema.enum': dataSource,
   };
   filterable = {
-    operators: operators.enumType,
+    operators: 'enumType',
   };
   titleUsable = true;
 }

package/src/collection-manager/interfaces/richText.ts

@@ -7,9 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import type { ISchema } from '@formily/react';
-import { i18n } from '../../i18n';
-import { defaultProps, operators } from './properties';
+import { defaultProps } from './properties';
 import { CollectionFieldInterface } from '../../collection-field-interface/CollectionFieldInterface';
 
 export class RichTextFieldInterface extends CollectionFieldInterface {
@@ -31,54 +29,7 @@ export class RichTextFieldInterface extends CollectionFieldInterface {
   properties = {
     ...defaultProps,
   };
-  schemaInitialize(schema: ISchema, { block }) {
-    if (['Table', 'Kanban'].includes(block)) {
-      schema['x-component-props'] = schema['x-component-props'] || {};
-      schema['x-component-props']['ellipsis'] = true;
-    }
-  }
-  validateSchema = (fieldSchema) => {
-    return {
-      max: {
-        type: 'number',
-        title: '{{ t("Max length") }}',
-        minimum: 0,
-        'x-decorator': 'FormItem',
-        'x-component': 'InputNumber',
-        'x-component-props': {
-          precision: 0,
-        },
-        'x-reactions': `{{(field) => {
-          const targetValue = field.query('.min').value();
-          field.selfErrors =
-            !!targetValue && !!field.value && targetValue > field.value ? '${i18n.t(
-              'Max length must greater than min length',
-            )}' : ''
-        }}}`,
-      },
-      min: {
-        type: 'number',
-        title: '{{ t("Min length") }}',
-        minimum: 0,
-        'x-decorator': 'FormItem',
-        'x-component': 'InputNumber',
-        'x-component-props': {
-          precision: 0,
-        },
-        'x-reactions': {
-          dependencies: ['.max'],
-          fulfill: {
-            state: {
-              selfErrors: `{{!!$deps[0] && !!$self.value && $deps[0] < $self.value ? '${i18n.t(
-                'Min length must less than max length',
-              )}' : ''}}`,
-            },
-          },
-        },
-      },
-    };
-  };
   filterable = {
-    operators: operators.bigField,
+    operators: 'bigField',
   };
 }

package/src/collection-manager/interfaces/select.ts

@@ -7,8 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { ISchema } from '@formily/react';
-import { dataSource, defaultProps, operators } from './properties';
+import { dataSource, defaultProps } from './properties';
 import { CollectionFieldInterface } from '../../collection-field-interface/CollectionFieldInterface';
 
 export class SelectFieldInterface extends CollectionFieldInterface {
@@ -33,18 +32,7 @@ export class SelectFieldInterface extends CollectionFieldInterface {
     'uiSchema.enum': dataSource,
   };
   filterable = {
-    operators: operators.enumType,
+    operators: 'enumType',
   };
   titleUsable = true;
-  schemaInitialize(schema: ISchema, { block }) {
-    const props = (schema['x-component-props'] = schema['x-component-props'] || {});
-    props.style = {
-      ...(props.style || {}),
-      width: '100%',
-    };
-
-    if (['Table', 'Kanban'].includes(block)) {
-      props['ellipsis'] = true;
-    }
-  }
 }

package/src/collection-manager/interfaces/snowflake-id.ts

@@ -8,7 +8,7 @@
  */
 
 import { CollectionFieldInterface } from '../../collection-field-interface/CollectionFieldInterface';
-import { defaultProps, operators, unique, primaryKey } from './properties';
+import { defaultProps, unique, primaryKey } from './properties';
 
 export class SnowflakeIdFieldInterface extends CollectionFieldInterface {
   name = 'snowflakeId';
@@ -52,7 +52,7 @@ export class SnowflakeIdFieldInterface extends CollectionFieldInterface {
     },
   };
   filterable = {
-    operators: operators.number,
+    operators: 'number',
   };
 
   description =

package/src/collection-manager/interfaces/tableoid.ts

@@ -8,7 +8,6 @@
  */
 
 import { CollectionFieldInterface } from '../../collection-field-interface/CollectionFieldInterface';
-import { operators } from './properties';
 
 export class TableoidFieldInterface extends CollectionFieldInterface {
   name = 'tableoid';
@@ -48,6 +47,6 @@ export class TableoidFieldInterface extends CollectionFieldInterface {
     },
   };
   filterable = {
-    operators: operators.tableoid,
+    operators: 'tableoid',
   };
 }

package/src/collection-manager/interfaces/textarea.ts

@@ -7,9 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { ISchema } from '@formily/react';
-import { i18n } from '../../i18n';
-import { defaultProps, operators } from './properties';
+import { defaultProps } from './properties';
 import { CollectionFieldInterface } from '../../collection-field-interface/CollectionFieldInterface';
 
 export class TextareaFieldInterface extends CollectionFieldInterface {
@@ -40,54 +38,7 @@ export class TextareaFieldInterface extends CollectionFieldInterface {
       'x-component': 'Checkbox',
     },
   };
-  schemaInitialize(schema: ISchema, { block }) {
-    if (['Table', 'Kanban'].includes(block)) {
-      schema['x-component-props'] = schema['x-component-props'] || {};
-      schema['x-component-props']['ellipsis'] = true;
-    }
-  }
-  validateSchema = (fieldSchema) => {
-    return {
-      max: {
-        type: 'number',
-        title: '{{ t("Max length") }}',
-        minimum: 0,
-        'x-decorator': 'FormItem',
-        'x-component': 'InputNumber',
-        'x-component-props': {
-          precision: 0,
-        },
-        'x-reactions': `{{(field) => {
-          const targetValue = field.query('.min').value();
-          field.selfErrors =
-            !!targetValue && !!field.value && targetValue > field.value ? '${i18n.t(
-              'Max length must greater than min length',
-            )}' : ''
-        }}}`,
-      },
-      min: {
-        type: 'number',
-        title: '{{ t("Min length") }}',
-        minimum: 0,
-        'x-decorator': 'FormItem',
-        'x-component': 'InputNumber',
-        'x-component-props': {
-          precision: 0,
-        },
-        'x-reactions': {
-          dependencies: ['.max'],
-          fulfill: {
-            state: {
-              selfErrors: `{{!!$deps[0] && !!$self.value && $deps[0] < $self.value ? '${i18n.t(
-                'Min length must less than max length',
-              )}' : ''}}`,
-            },
-          },
-        },
-      },
-    };
-  };
   filterable = {
-    operators: operators.string,
+    operators: 'string',
   };
 }

package/src/collection-manager/interfaces/time.ts

@@ -8,7 +8,7 @@
  */
 
 import { CollectionFieldInterface } from '../../collection-field-interface/CollectionFieldInterface';
-import { defaultProps, operators, timeProps } from './properties';
+import { defaultProps, timeProps } from './properties';
 
 export class TimeFieldInterface extends CollectionFieldInterface {
   name = 'time';
@@ -31,7 +31,7 @@ export class TimeFieldInterface extends CollectionFieldInterface {
     ...timeProps,
   };
   filterable = {
-    operators: operators.time,
+    operators: 'time',
   };
   titleUsable = true;
 }

package/src/collection-manager/interfaces/types.ts

@@ -9,6 +9,8 @@
 
 import { ISchema } from '@formily/react';
 
+import type { FieldFilterable, FieldFilterOperator } from '../filter-operators';
+
 interface IDefault {
   type: string;
   uiSchema?: ISchema;
@@ -19,22 +21,12 @@ export interface IField extends ISchema {
   group?: string;
   order?: number;
   default?: IDefault;
-  operators?: any[];
+  operators?: FieldFilterOperator[];
   /**
    * - 如果该值为空，则在 Filter 组件中该字段会被过滤掉
    * - 如果该值为空，则不会在变量列表中看到该字段
    */
-  filterable?: {
-    /**
-     * 字段所支持的操作符，会在 Filter 组件中显示，比如设置 `数据范围` 的时候可以看见
-     */
-    operators?: any[];
-    /**
-     * 为当前字段添加子选项，这个子选项会在 Filter 组件中显示，比如设置 `数据范围` 的时候可以看见
-     */
-    children?: any[];
-    [key: string]: any;
-  };
+  filterable?: FieldFilterable;
   // NOTE: set to `true` means field could be used as a title field
   titleUsable?: boolean;
   [key: string]: any;

package/src/collection-manager/interfaces/unixTimestamp.tsx

@@ -8,7 +8,7 @@
  */
 
 import { CollectionFieldInterface } from '../../collection-field-interface/CollectionFieldInterface';
-import { defaultProps, operators, dateTimeProps } from './properties';
+import { defaultProps, dateTimeProps } from './properties';
 export class UnixTimestampFieldInterface extends CollectionFieldInterface {
   name = 'unixTimestamp';
   type = 'object';
@@ -62,7 +62,7 @@ export class UnixTimestampFieldInterface extends CollectionFieldInterface {
     },
   };
   filterable = {
-    operators: operators.datetime,
+    operators: 'datetime',
   };
   titleUsable = true;
 }

package/src/collection-manager/interfaces/updatedAt.ts

@@ -8,7 +8,7 @@
  */
 
 import { CollectionFieldInterface } from '../../collection-field-interface/CollectionFieldInterface';
-import { dateTimeProps, defaultProps, operators } from './properties';
+import { dateTimeProps, defaultProps } from './properties';
 
 export class UpdatedAtFieldInterface extends CollectionFieldInterface {
   name = 'updatedAt';
@@ -35,7 +35,7 @@ export class UpdatedAtFieldInterface extends CollectionFieldInterface {
     ...dateTimeProps,
   };
   filterable = {
-    operators: operators.datetime,
+    operators: 'datetime',
   };
   titleUsable = true;
 }

package/src/collection-manager/interfaces/updatedBy.ts

@@ -7,10 +7,8 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { ISchema } from '@formily/react';
-import { cloneDeep } from 'lodash';
 import { CollectionFieldInterface } from '../../collection-field-interface/CollectionFieldInterface';
-import { defaultProps, recordPickerViewer } from './properties';
+import { defaultProps } from './properties';
 
 export class UpdatedByFieldInterface extends CollectionFieldInterface {
   name = 'updatedBy';
@@ -66,14 +64,5 @@ export class UpdatedByFieldInterface extends CollectionFieldInterface {
     //   },
     // ],
   };
-  schemaInitialize(schema: ISchema, { block }) {
-    schema['properties'] = {
-      viewer: cloneDeep(recordPickerViewer),
-    };
-    if (['Table', 'Kanban'].includes(block)) {
-      schema['x-component-props'] = schema['x-component-props'] || {};
-      schema['x-component-props']['ellipsis'] = true;
-    }
-  }
   description = '{{t("Store the last update user of each record")}}';
 }

package/src/collection-manager/interfaces/url.ts

@@ -7,8 +7,7 @@
  * For more information, please refer to: https://www.nocobase.com/agreement.
  */
 
-import { ISchema } from '@formily/react';
-import { defaultProps, operators } from './properties';
+import { defaultProps } from './properties';
 import { CollectionFieldInterface } from '../../collection-field-interface/CollectionFieldInterface';
 
 export class UrlFieldInterface extends CollectionFieldInterface {
@@ -35,7 +34,6 @@ export class UrlFieldInterface extends CollectionFieldInterface {
     },
   ];
   availableTypes = ['string', 'text'];
-  schemaInitialize(schema: ISchema, { block }) {}
   validationType = 'string';
   availableValidationOptions = ['uri', 'pattern'];
   properties = {
@@ -43,6 +41,6 @@ export class UrlFieldInterface extends CollectionFieldInterface {
   };
   titleUsable = true;
   filterable = {
-    operators: operators.string,
+    operators: 'string',
   };
 }

package/src/collection-manager/interfaces/uuid.ts

@@ -8,7 +8,7 @@
  */
 
 import { CollectionFieldInterface } from '../../collection-field-interface/CollectionFieldInterface';
-import { operators, autoFill, primaryKey, unique } from './properties';
+import { autoFill, primaryKey, unique } from './properties';
 
 export class UUIDFieldInterface extends CollectionFieldInterface {
   name = 'uuid';
@@ -66,7 +66,7 @@ export class UUIDFieldInterface extends CollectionFieldInterface {
     },
   };
   filterable = {
-    operators: operators.string,
+    operators: 'string',
   };
   titleUsable = true;
 }

package/src/collection-manager/template-fields.ts

@@ -0,0 +1,109 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+
+import { cloneDeep, merge } from 'lodash';
+import type { ReactNode } from 'react';
+
+export interface CollectionTemplateFieldOption {
+  label: ReactNode;
+  value: string | number | boolean;
+  [key: string]: unknown;
+}
+
+export interface CollectionTemplateField {
+  name: string;
+  interface?: string;
+  type?: string;
+  title?: ReactNode;
+  options?: CollectionTemplateFieldOption[];
+  component?: string;
+  componentProps?: Record<string, unknown>;
+  uiSchema?: Record<string, unknown>;
+  [key: string]: unknown;
+}
+
+interface FieldInterfaceConfigureLike {
+  default?: {
+    uiSchema?: Record<string, unknown>;
+    [key: string]: unknown;
+  };
+}
+
+interface FieldInterfaceLike {
+  default?: {
+    uiSchema?: Record<string, unknown>;
+    [key: string]: unknown;
+  };
+}
+
+export interface CollectionTemplateFieldNormalizeManager {
+  getFieldInterfaceConfigure?: (
+    name: string,
+    collectionInfo?: Record<string, unknown>,
+  ) => FieldInterfaceConfigureLike | undefined;
+  getFieldInterface?: (name: string) => FieldInterfaceLike | undefined;
+}
+
+export interface NormalizeCollectionTemplateFieldOptions {
+  collectionInfo?: Record<string, unknown>;
+}
+
+export function normalizeCollectionTemplateField(
+  field: CollectionTemplateField,
+  manager?: CollectionTemplateFieldNormalizeManager,
+  options: NormalizeCollectionTemplateFieldOptions = {},
+) {
+  const fieldInterfaceName = field.interface;
+  const fieldInterfaceDefault = fieldInterfaceName
+    ? manager?.getFieldInterfaceConfigure?.(fieldInterfaceName, options.collectionInfo)?.default ||
+      manager?.getFieldInterface?.(fieldInterfaceName)?.default
+    : undefined;
+
+  const normalized = merge({}, cloneDeep(fieldInterfaceDefault || {}), cloneDeep(field));
+  const uiSchema = merge({}, cloneDeep(fieldInterfaceDefault?.uiSchema || {}), cloneDeep(field.uiSchema || {}));
+
+  if (field.title !== undefined) {
+    uiSchema.title = field.title;
+  }
+
+  if (field.options !== undefined) {
+    uiSchema.enum = cloneDeep(field.options);
+  }
+
+  if (field.component !== undefined) {
+    uiSchema['x-component'] = field.component;
+  }
+
+  if (field.componentProps !== undefined) {
+    uiSchema['x-component-props'] = merge(
+      {},
+      cloneDeep(fieldInterfaceDefault?.uiSchema?.['x-component-props'] || {}),
+      cloneDeep(field.componentProps),
+    );
+  }
+
+  delete normalized.title;
+  delete normalized.options;
+  delete normalized.component;
+  delete normalized.componentProps;
+
+  if (Object.keys(uiSchema).length) {
+    normalized.uiSchema = uiSchema;
+  }
+
+  return normalized;
+}
+
+export function normalizeCollectionTemplateFields(
+  fields: CollectionTemplateField[] = [],
+  manager?: CollectionTemplateFieldNormalizeManager,
+  options?: NormalizeCollectionTemplateFieldOptions,
+) {
+  return fields.map((field) => normalizeCollectionTemplateField(field, manager, options));
+}